Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngel Avila2015-03-19 17:36:42 -0400
committerAngel Avila2015-03-19 17:36:42 -0400
commitf59f6b612e3dead575276cd8d046c73c2222aee6 (patch)
treee25b5861684e0266ca2b690b2478d3023d0ee7ec
parent76f64a5c20ce97c0d6a6cca11d6ea27d8b758e91 (diff)
downloadorg.eclipse.osee-f59f6b612e3dead575276cd8d046c73c2222aee6.tar.gz
org.eclipse.osee-f59f6b612e3dead575276cd8d046c73c2222aee6.tar.xz
org.eclipse.osee-f59f6b612e3dead575276cd8d046c73c2222aee6.zip
feature[ats_ATS146069]: Remove BranchManagerServlet
Change-Id: I2a695f9072755cc71a7a5473456ad27600a56f87 Signed-off-by: Angel Avila <angel.avila2@boeing.com>
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitRequestTest.java80
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java58
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/DataTestSuite.java7
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/PurgeBranchRequestTest.java54
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java87
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockRequestFactory.java26
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeArchivedStateRequestTranslatorTest.java54
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeStateRequestTranslatorTest.java52
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeTypeRequestTranslatorTest.java54
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitRequestTranslatorTest.java53
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java55
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCreationRequestTranslatorTest.java52
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCreationResponseTranslatorTest.java52
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeReportResponseTranslatorTest.java63
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DataTranslationServiceFactoryTest.java15
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/PurgeBranchRequestTranslatorTest.java52
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TranslationTestSuite.java11
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCommitRequest.java46
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCommitResponse.java31
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationRequest.java104
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationResponse.java36
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchArchiveStateRequest.java36
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchStateRequest.java36
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchTypeRequest.java36
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeReportRequest.java33
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeReportResponse.java45
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/PurgeBranchRequest.java33
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java25
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeArchivedStateRequestTranslator.java44
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeStateRequestTranslator.java44
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeTypeRequestTranslator.java44
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCommitRequestTranslator.java50
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCommitResponseTranslator.java43
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java87
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationResponseTranslator.java38
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ChangeReportRequestTranslator.java42
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ChangeReportResponseTranslator.java175
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/PurgeBranchRequestTranslator.java42
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreTranslatorId.java13
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchManagerServlet.java108
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/AbstractBranchCallable.java143
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ArchiveBranchCallable.java46
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchStateCallable.java42
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchTypeCallable.java43
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java57
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java53
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java72
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/PurgeBranchCallable.java43
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java3
49 files changed, 2 insertions, 2516 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitRequestTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitRequestTest.java
deleted file mode 100644
index cedf1e3cc5..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitRequestTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.test.data;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import org.junit.Assert;
-import org.eclipse.osee.framework.core.message.BranchCommitRequest;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test Case for {@link BranchCommitRequest}
- *
- * @author Roberto E. Escobar
- */
-@RunWith(Parameterized.class)
-public class BranchCommitRequestTest {
-
- private final BranchCommitRequest item;
-
- private final int expectedUser;
- private final int expectedSrcBranch;
- private final int expectedDestBranch;
- private final boolean expectedArchive;
-
- public BranchCommitRequestTest(int expectedUser, int expectedSrcBranch, int expectedDestBranch, boolean expectedArchive) {
- super();
- this.item = new BranchCommitRequest(expectedUser, expectedSrcBranch, expectedDestBranch, expectedArchive);
- this.expectedUser = expectedUser;
- this.expectedSrcBranch = expectedSrcBranch;
- this.expectedDestBranch = expectedDestBranch;
- this.expectedArchive = expectedArchive;
- }
-
- @Test
- public void testGetDestinationBranch() {
- Assert.assertEquals(expectedDestBranch, item.getDestinationBranchId());
- }
-
- @Test
- public void testGetSourceBranch() {
- Assert.assertEquals(expectedSrcBranch, item.getSourceBranchId());
- }
-
- @Test
- public void testGetUser() {
- Assert.assertEquals(expectedUser, item.getUserArtId());
- }
-
- @Test
- public void testIsArchive() {
- Assert.assertEquals(expectedArchive, item.isArchiveAllowed());
- }
-
- @Parameters
- public static Collection<Object[]> getData() {
- Collection<Object[]> data = new ArrayList<Object[]>();
- boolean archiveIt = false;
- for (int index = 1; index <= 2; index++) {
- int sourceBranch = index * 7;
- int destinationBranch = index * 9;
- int userArt = index * 11;
- archiveIt ^= archiveIt;
- data.add(new Object[] {userArt, sourceBranch, destinationBranch, archiveIt});
- }
- return data;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java
deleted file mode 100644
index 7829e740a8..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.test.data;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import org.eclipse.osee.framework.core.message.BranchCommitResponse;
-import org.eclipse.osee.framework.core.message.test.mocks.MockDataFactory;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test Case for {@link BranchCommitResponse}
- *
- * @author Roberto E. Escobar
- */
-@RunWith(Parameterized.class)
-public class BranchCommitResponseTest {
-
- private final BranchCommitResponse response;
- private final TransactionRecord transaction;
-
- public BranchCommitResponseTest(BranchCommitResponse response, TransactionRecord transaction) {
- this.response = response;
- this.transaction = transaction;
- }
-
- @Test
- public void testGetSetTransaction() {
- Assert.assertNull(response.getTransactionId());
- response.setTransactionId(transaction.getGuid());
-
- Assert.assertNotNull(response.getTransactionId());
- Assert.assertEquals(transaction.getGuid(), response.getTransactionId());
- }
-
- @Parameters
- public static Collection<Object[]> getData() {
- Collection<Object[]> data = new ArrayList<Object[]>();
- for (int index = 1; index <= 2; index++) {
- TransactionRecord transaction = MockDataFactory.createTransaction(index, 2);
- data.add(new Object[] {new BranchCommitResponse(), transaction});
- }
- return data;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/DataTestSuite.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/DataTestSuite.java
index 22abe7ac5b..c59cf11c89 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/DataTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/DataTestSuite.java
@@ -15,12 +15,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({
- BranchCommitRequestTest.class,
- BranchCommitResponseTest.class,
- CacheUpdateRequestTest.class,
- PurgeBranchRequestTest.class,
- TransactionCacheUpdateResponseTest.class,})
+@Suite.SuiteClasses({CacheUpdateRequestTest.class, TransactionCacheUpdateResponseTest.class,})
/**
* @author Roberto E. Escobar
*/
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/PurgeBranchRequestTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/PurgeBranchRequestTest.java
deleted file mode 100644
index 32b5b23532..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/PurgeBranchRequestTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.test.data;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import org.eclipse.osee.framework.core.message.PurgeBranchRequest;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test Case for {@link PurgeBranchRequest}
- *
- * @author Megumi Telles
- * @author Jeff C. Phillips
- */
-@RunWith(Parameterized.class)
-public class PurgeBranchRequestTest {
-
- private final PurgeBranchRequest request;
- private final int branchUuid;
-
- public PurgeBranchRequestTest(int expectedBranchId) {
- this.request = new PurgeBranchRequest(expectedBranchId, false);
- this.branchUuid = expectedBranchId;
- }
-
- @Test
- public void testGetBranchId() {
- Assert.assertEquals(branchUuid, request.getBranchId());
- }
-
- @Parameters
- public static Collection<Object[]> getData() {
- Collection<Object[]> data = new ArrayList<Object[]>();
- for (int index = 1; index <= 2; index++) {
- int branchUuid = index * 7;
- data.add(new Object[] {branchUuid});
- }
- return data;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java
index 486ee2b3f4..80328dfa09 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java
@@ -11,16 +11,8 @@
package org.eclipse.osee.framework.core.message.test.mocks;
import java.util.List;
-import org.eclipse.osee.framework.core.message.BranchCommitRequest;
-import org.eclipse.osee.framework.core.message.BranchCommitResponse;
-import org.eclipse.osee.framework.core.message.BranchCreationRequest;
-import org.eclipse.osee.framework.core.message.BranchCreationResponse;
import org.eclipse.osee.framework.core.message.CacheUpdateRequest;
-import org.eclipse.osee.framework.core.message.ChangeBranchArchiveStateRequest;
-import org.eclipse.osee.framework.core.message.ChangeBranchStateRequest;
-import org.eclipse.osee.framework.core.message.ChangeBranchTypeRequest;
import org.eclipse.osee.framework.core.message.DatastoreInitRequest;
-import org.eclipse.osee.framework.core.message.PurgeBranchRequest;
import org.eclipse.osee.framework.core.model.AbstractOseeType;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
@@ -116,25 +108,6 @@ public final class DataAsserts {
}
}
- public static void assertEquals(BranchCommitRequest expected, BranchCommitRequest actual) {
- if (expected == null) {
- Assert.assertNull(actual);
- } else {
- Assert.assertEquals(expected.getUserArtId(), actual.getUserArtId());
- Assert.assertEquals(expected.isArchiveAllowed(), actual.isArchiveAllowed());
- Assert.assertEquals(expected.getSourceBranchId(), actual.getSourceBranchId());
- Assert.assertEquals(expected.getDestinationBranchId(), actual.getDestinationBranchId());
- }
- }
-
- public static void assertEquals(BranchCommitResponse expected, BranchCommitResponse actual) {
- if (expected == null) {
- Assert.assertNull(actual);
- } else {
- Assert.assertEquals(expected.getTransactionId(), actual.getTransactionId());
- }
- }
-
public static void assertEquals(CacheUpdateRequest expected, CacheUpdateRequest actual) {
if (expected == null) {
Assert.assertNull(actual);
@@ -170,31 +143,6 @@ public final class DataAsserts {
}
}
- public static void assertEquals(BranchCreationRequest expected, BranchCreationRequest actual) {
- if (expected == null) {
- Assert.assertNull(actual);
- } else {
- Assert.assertEquals(expected.getAssociatedArtifactId(), actual.getAssociatedArtifactId());
- Assert.assertEquals(expected.getAuthorId(), actual.getAuthorId());
- Assert.assertEquals(expected.getBranchUuid(), actual.getBranchUuid());
- Assert.assertEquals(expected.getBranchName(), actual.getBranchName());
- Assert.assertEquals(expected.getCreationComment(), actual.getCreationComment());
- Assert.assertEquals(expected.getMergeDestinationBranchId(), actual.getMergeDestinationBranchId());
- Assert.assertEquals(expected.getParentBranchId(), actual.getParentBranchId());
- Assert.assertEquals(expected.getMergeAddressingQueryId(), actual.getMergeAddressingQueryId());
- Assert.assertEquals(expected.getSourceTransactionId(), actual.getSourceTransactionId());
- Assert.assertEquals(expected.getBranchType(), actual.getBranchType());
- }
- }
-
- public static void assertEquals(BranchCreationResponse expected, BranchCreationResponse actual) {
- if (expected == null) {
- Assert.assertNull(actual);
- } else {
- Assert.assertEquals(expected.getBranchId(), actual.getBranchId());
- }
- }
-
public static void assertEquals(ChangeVersion expected, ChangeVersion actual) {
if (expected == null) {
Assert.assertNull(actual);
@@ -232,47 +180,12 @@ public final class DataAsserts {
}
}
- public static void assertEquals(PurgeBranchRequest expected, PurgeBranchRequest actual) {
- if (expected == null) {
- Assert.assertNull(actual);
- } else {
- Assert.assertEquals(expected.getBranchId(), actual.getBranchId());
- }
- }
-
public static void assertEquals(TableData expected, TableData actual) {
Assert.assertEquals(expected.getTitle(), actual.getTitle());
Assert.assertFalse(Compare.isDifferent(expected.getColumns(), actual.getColumns()));
Assert.assertFalse(Compare.isDifferent(expected.getRows(), actual.getRows()));
}
- public static void assertEquals(ChangeBranchTypeRequest expected, ChangeBranchTypeRequest actual) {
- if (expected == null) {
- Assert.assertNull(actual);
- } else {
- Assert.assertEquals(expected.getBranchId(), actual.getBranchId());
- Assert.assertEquals(expected.getType(), actual.getType());
- }
- }
-
- public static void assertEquals(ChangeBranchArchiveStateRequest expected, ChangeBranchArchiveStateRequest actual) {
- if (expected == null) {
- Assert.assertNull(actual);
- } else {
- Assert.assertEquals(expected.getBranchId(), actual.getBranchId());
- Assert.assertEquals(expected.getState(), actual.getState());
- }
- }
-
- public static void assertEquals(ChangeBranchStateRequest expected, ChangeBranchStateRequest actual) {
- if (expected == null) {
- Assert.assertNull(actual);
- } else {
- Assert.assertEquals(expected.getBranchId(), actual.getBranchId());
- Assert.assertEquals(expected.getState(), actual.getState());
- }
- }
-
public static void assertEquals(DatastoreInitRequest expected, DatastoreInitRequest actual) {
Assert.assertEquals(expected.getIndexDataSpace(), actual.getIndexDataSpace());
Assert.assertEquals(expected.getTableDataSpace(), actual.getTableDataSpace());
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockRequestFactory.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockRequestFactory.java
index 833df1c07e..45b5a18051 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockRequestFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockRequestFactory.java
@@ -12,11 +12,8 @@ package org.eclipse.osee.framework.core.message.test.mocks;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.OseeCacheEnum;
-import org.eclipse.osee.framework.core.message.BranchCreationRequest;
-import org.eclipse.osee.framework.core.message.BranchCreationResponse;
import org.eclipse.osee.framework.core.message.CacheUpdateRequest;
import org.eclipse.osee.framework.core.model.BranchFactory;
import org.eclipse.osee.framework.core.model.OseeModelFactoryService;
@@ -30,7 +27,6 @@ import org.eclipse.osee.framework.core.model.type.OseeEnumTypeFactory;
import org.eclipse.osee.framework.core.model.type.RelationTypeFactory;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
public final class MockRequestFactory {
@@ -75,26 +71,4 @@ public final class MockRequestFactory {
return new CacheUpdateRequest(cacheEnum, guids);
}
- public static BranchCreationRequest createBranchCreateRequest(int index) {
- BranchType branchType = BranchType.values()[Math.abs(index % BranchType.values().length)];
- String branchName = "branch_" + index;
- int parentBranchId = index;
- int associatedArtifactId = index * 3;
- int sourceTransactionId = index * 7;
- long branchUuid = Lib.generateUuid();
-
- int authorId = index * 7;
-
- String creationComment = "creation_comment_" + index;
-
- int mergeFromAddressingQueryId = -1;
- int destinationBranchId = -1;
-
- return new BranchCreationRequest(branchType, sourceTransactionId, parentBranchId, branchName, branchUuid,
- associatedArtifactId, authorId, creationComment, mergeFromAddressingQueryId, destinationBranchId);
- }
-
- public static Object createBranchCreateResponse(int index) {
- return new BranchCreationResponse(index);
- }
}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeArchivedStateRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeArchivedStateRequestTranslatorTest.java
deleted file mode 100644
index 8549d12147..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeArchivedStateRequestTranslatorTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.test.translation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.osee.framework.core.enums.BranchArchivedState;
-import org.eclipse.osee.framework.core.message.ChangeBranchArchiveStateRequest;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchChangeArchivedStateRequestTranslator;
-import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test Case for {@link BranchChangeArchivedStateRequestTranslator}
- *
- * @author Megumi Telles
- */
-@RunWith(Parameterized.class)
-public class BranchChangeArchivedStateRequestTranslatorTest extends BaseTranslatorTest<ChangeBranchArchiveStateRequest> {
-
- public BranchChangeArchivedStateRequestTranslatorTest(ChangeBranchArchiveStateRequest data, ITranslator<ChangeBranchArchiveStateRequest> translator) {
- super(data, translator);
- }
-
- @Override
- protected void checkEquals(ChangeBranchArchiveStateRequest expected, ChangeBranchArchiveStateRequest actual) {
- DataAsserts.assertEquals(expected, actual);
- }
-
- @Parameters
- public static Collection<Object[]> data() {
- List<Object[]> data = new ArrayList<Object[]>();
- ITranslator<ChangeBranchArchiveStateRequest> translator = new BranchChangeArchivedStateRequestTranslator();
- int state = 0;
- for (int index = 1; index <= 2; index++) {
- data.add(new Object[] {
- new ChangeBranchArchiveStateRequest(index * 3, BranchArchivedState.valueOf(state++)),
- translator});
- }
- return data;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeStateRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeStateRequestTranslatorTest.java
deleted file mode 100644
index 1d44c79dd5..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeStateRequestTranslatorTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.test.translation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.osee.framework.core.enums.BranchState;
-import org.eclipse.osee.framework.core.message.ChangeBranchStateRequest;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchChangeStateRequestTranslator;
-import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test Case for {@link BranchChangeStateRequestTranslator}
- *
- * @author Megumi Telles
- */
-@RunWith(Parameterized.class)
-public class BranchChangeStateRequestTranslatorTest extends BaseTranslatorTest<ChangeBranchStateRequest> {
-
- public BranchChangeStateRequestTranslatorTest(ChangeBranchStateRequest data, ITranslator<ChangeBranchStateRequest> translator) {
- super(data, translator);
- }
-
- @Override
- protected void checkEquals(ChangeBranchStateRequest expected, ChangeBranchStateRequest actual) {
- DataAsserts.assertEquals(expected, actual);
- }
-
- @Parameters
- public static Collection<Object[]> data() {
- List<Object[]> data = new ArrayList<Object[]>();
- ITranslator<ChangeBranchStateRequest> translator = new BranchChangeStateRequestTranslator();
-
- for (int index = 1; index <= 2; index++) {
- data.add(new Object[] {new ChangeBranchStateRequest(index * 3, BranchState.getBranchState(index)), translator});
- }
- return data;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeTypeRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeTypeRequestTranslatorTest.java
deleted file mode 100644
index c0240192dd..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeTypeRequestTranslatorTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.test.translation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.message.ChangeBranchTypeRequest;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchChangeStateRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchChangeTypeRequestTranslator;
-import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test Case for {@link BranchChangeStateRequestTranslator}
- *
- * @author Megumi Telles
- */
-@RunWith(Parameterized.class)
-public class BranchChangeTypeRequestTranslatorTest extends BaseTranslatorTest<ChangeBranchTypeRequest> {
-
- public BranchChangeTypeRequestTranslatorTest(ChangeBranchTypeRequest data, ITranslator<ChangeBranchTypeRequest> translator) {
- super(data, translator);
- }
-
- @Override
- protected void checkEquals(ChangeBranchTypeRequest expected, ChangeBranchTypeRequest actual) {
- DataAsserts.assertEquals(expected, actual);
- }
-
- @Parameters
- public static Collection<Object[]> data() throws OseeCoreException {
- List<Object[]> data = new ArrayList<Object[]>();
- ITranslator<ChangeBranchTypeRequest> translator = new BranchChangeTypeRequestTranslator();
-
- for (int index = 1; index <= 2; index++) {
- data.add(new Object[] {new ChangeBranchTypeRequest(index * 3, BranchType.valueOf(++index)), translator});
- }
- return data;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitRequestTranslatorTest.java
deleted file mode 100644
index 09d43d24ff..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitRequestTranslatorTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.test.translation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.osee.framework.core.message.BranchCommitRequest;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchCommitRequestTranslator;
-import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test Case for {@link BranchCommitRequestTranslator}
- *
- * @author Megumi Telles
- */
-@RunWith(Parameterized.class)
-public class BranchCommitRequestTranslatorTest extends BaseTranslatorTest<BranchCommitRequest> {
-
- public BranchCommitRequestTranslatorTest(BranchCommitRequest data, ITranslator<BranchCommitRequest> translator) {
- super(data, translator);
- }
-
- @Override
- protected void checkEquals(BranchCommitRequest expected, BranchCommitRequest actual) {
- DataAsserts.assertEquals(expected, actual);
- }
-
- @Parameters
- public static Collection<Object[]> data() {
- List<Object[]> data = new ArrayList<Object[]>();
- ITranslator<BranchCommitRequest> translator = new BranchCommitRequestTranslator();
-
- boolean archive = false;
- for (int index = 1; index <= 2; index++) {
- archive ^= archive;
- data.add(new Object[] {new BranchCommitRequest(index * 3, index * 2, index * 4, archive), translator});
- }
- return data;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java
deleted file mode 100644
index e8b0de7dd2..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.test.translation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.osee.framework.core.message.BranchCommitResponse;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchCommitResponseTranslator;
-import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test Case for {@link BranchCommitResponseTranslator}
- *
- * @author Megumi Telles
- */
-@RunWith(Parameterized.class)
-public class BranchCommitResponseTranslatorTest extends BaseTranslatorTest<BranchCommitResponse> {
-
- public BranchCommitResponseTranslatorTest(BranchCommitResponse data, ITranslator<BranchCommitResponse> translator) {
- super(data, translator);
- }
-
- @Override
- protected void checkEquals(BranchCommitResponse expected, BranchCommitResponse actual) {
- DataAsserts.assertEquals(expected, actual);
- }
-
- @Parameters
- public static Collection<Object[]> data() throws OseeCoreException {
-
- List<Object[]> data = new ArrayList<Object[]>();
-
- ITranslator<BranchCommitResponse> translator = new BranchCommitResponseTranslator();
- for (int index = 1; index <= 2; index++) {
- BranchCommitResponse response = new BranchCommitResponse();
- response.setTransactionId(index);
- data.add(new Object[] {response, translator});
- }
- return data;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCreationRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCreationRequestTranslatorTest.java
deleted file mode 100644
index ed869295f1..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCreationRequestTranslatorTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.test.translation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.osee.framework.core.message.BranchCreationRequest;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchCreationRequestTranslator;
-import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
-import org.eclipse.osee.framework.core.message.test.mocks.MockRequestFactory;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.junit.Assert;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test Case for {@link BranchCreationRequestTranslator}
- *
- * @author Roberto E. Escobar
- */
-@RunWith(Parameterized.class)
-public class BranchCreationRequestTranslatorTest extends BaseTranslatorTest<BranchCreationRequest> {
-
- public BranchCreationRequestTranslatorTest(BranchCreationRequest data, ITranslator<BranchCreationRequest> translator) {
- super(data, translator);
- }
-
- @Override
- protected void checkEquals(BranchCreationRequest expected, BranchCreationRequest actual) {
- Assert.assertNotSame(expected, actual);
- DataAsserts.assertEquals(expected, actual);
- }
-
- @Parameters
- public static Collection<Object[]> data() {
- List<Object[]> data = new ArrayList<Object[]>();
- ITranslator<BranchCreationRequest> translator = new BranchCreationRequestTranslator();
-
- data.add(new Object[] {MockRequestFactory.createBranchCreateRequest(45), translator});
- return data;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCreationResponseTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCreationResponseTranslatorTest.java
deleted file mode 100644
index 46d82f625a..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCreationResponseTranslatorTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.test.translation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.osee.framework.core.message.BranchCreationResponse;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchCreationResponseTranslator;
-import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
-import org.eclipse.osee.framework.core.message.test.mocks.MockRequestFactory;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.junit.Assert;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test Case for {@link BranchCreationResponseTranslator}
- *
- * @author Roberto E. Escobar
- */
-@RunWith(Parameterized.class)
-public class BranchCreationResponseTranslatorTest extends BaseTranslatorTest<BranchCreationResponse> {
-
- public BranchCreationResponseTranslatorTest(BranchCreationResponse data, ITranslator<BranchCreationResponse> translator) {
- super(data, translator);
- }
-
- @Override
- protected void checkEquals(BranchCreationResponse expected, BranchCreationResponse actual) {
- Assert.assertNotSame(expected, actual);
- DataAsserts.assertEquals(expected, actual);
- }
-
- @Parameters
- public static Collection<Object[]> data() {
- List<Object[]> data = new ArrayList<Object[]>();
- ITranslator<BranchCreationResponse> translator = new BranchCreationResponseTranslator();
-
- data.add(new Object[] {MockRequestFactory.createBranchCreateResponse(55), translator});
- return data;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeReportResponseTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeReportResponseTranslatorTest.java
deleted file mode 100644
index a68e779619..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeReportResponseTranslatorTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.osee.framework.core.message.test.translation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.osee.framework.core.message.ChangeReportResponse;
-import org.eclipse.osee.framework.core.message.internal.translation.ChangeReportResponseTranslator;
-import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
-import org.eclipse.osee.framework.core.message.test.mocks.MockRequestFactory;
-import org.eclipse.osee.framework.core.model.change.ChangeItem;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test Case For {@link ChangeReportResponseTranslator}
- *
- * @author Jeff C. Phillips
- */
-@RunWith(Parameterized.class)
-public class ChangeReportResponseTranslatorTest extends BaseTranslatorTest<ChangeReportResponse> {
-
- public ChangeReportResponseTranslatorTest(ChangeReportResponse data, ITranslator<ChangeReportResponse> translator) {
- super(data, translator);
- }
-
- @Override
- protected void checkEquals(ChangeReportResponse expected, ChangeReportResponse actual) {
- List<ChangeItem> expectedChangeItems = expected.getChangeItems();
- List<ChangeItem> actualChangeItems = actual.getChangeItems();
-
- for (int i = 0; i < expected.getChangeItems().size(); i++) {
- DataAsserts.assertEquals(expectedChangeItems.get(i), actualChangeItems.get(i));
- }
- }
-
- @Parameters
- public static Collection<Object[]> data() throws OseeCoreException {
- ChangeReportResponse response = new ChangeReportResponse();
- response.addItem(MockRequestFactory.createArtifactChangeItem());
- response.addItem(MockRequestFactory.createArtifactChangeItem());
- response.addItem(MockRequestFactory.createArtifactChangeItem());
-
- List<Object[]> data = new ArrayList<Object[]>();
- ITranslator<ChangeReportResponse> translator = new ChangeReportResponseTranslator();
-
- data.add(new Object[] {response, translator});
- return data;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DataTranslationServiceFactoryTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DataTranslationServiceFactoryTest.java
index 614ecc32b3..1c1d07d524 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DataTranslationServiceFactoryTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DataTranslationServiceFactoryTest.java
@@ -15,13 +15,7 @@ import org.eclipse.osee.framework.core.message.internal.DataTranslationService;
import org.eclipse.osee.framework.core.message.internal.DataTranslationServiceFactory;
import org.eclipse.osee.framework.core.message.internal.translation.ArtifactTypeCacheUpdateResponseTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.AttributeTypeCacheUpdateResponseTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchCommitRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchCommitResponseTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchCreationRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchCreationResponseTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.CacheUpdateRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.ChangeReportRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.ChangeReportResponseTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.DatastoreInitRequestTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.OseeEnumTypeCacheUpdateResponseTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.OseeImportModelRequestTranslator;
@@ -55,15 +49,6 @@ public class DataTranslationServiceFactoryTest {
srvc.setModelFactory(new MockModelFactoryService());
srvc.start();
- checkExists(srvc, BranchCreationRequestTranslator.class, CoreTranslatorId.BRANCH_CREATION_REQUEST);
- checkExists(srvc, BranchCreationResponseTranslator.class, CoreTranslatorId.BRANCH_CREATION_RESPONSE);
-
- checkExists(srvc, BranchCommitRequestTranslator.class, CoreTranslatorId.BRANCH_COMMIT_REQUEST);
- checkExists(srvc, BranchCommitResponseTranslator.class, CoreTranslatorId.BRANCH_COMMIT_RESPONSE);
-
- checkExists(srvc, ChangeReportRequestTranslator.class, CoreTranslatorId.CHANGE_REPORT_REQUEST);
- checkExists(srvc, ChangeReportResponseTranslator.class, CoreTranslatorId.CHANGE_REPORT_RESPONSE);
-
checkExists(srvc, CacheUpdateRequestTranslator.class, CoreTranslatorId.OSEE_CACHE_UPDATE_REQUEST);
checkExists(srvc, ArtifactTypeCacheUpdateResponseTranslator.class,
CoreTranslatorId.ARTIFACT_TYPE_CACHE_UPDATE_RESPONSE);
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/PurgeBranchRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/PurgeBranchRequestTranslatorTest.java
deleted file mode 100644
index b0f649b832..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/PurgeBranchRequestTranslatorTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.test.translation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.osee.framework.core.message.PurgeBranchRequest;
-import org.eclipse.osee.framework.core.message.internal.translation.PurgeBranchRequestTranslator;
-import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test Case for {@link PurgeBranchRequestTranslator}
- *
- * @author Megumi Telles
- * @author Jeff C. Phillips
- */
-@RunWith(Parameterized.class)
-public class PurgeBranchRequestTranslatorTest extends BaseTranslatorTest<PurgeBranchRequest> {
-
- public PurgeBranchRequestTranslatorTest(PurgeBranchRequest data, ITranslator<PurgeBranchRequest> translator) {
- super(data, translator);
- }
-
- @Override
- protected void checkEquals(PurgeBranchRequest expected, PurgeBranchRequest actual) {
- DataAsserts.assertEquals(expected, actual);
- }
-
- @Parameters
- public static Collection<Object[]> data() {
- List<Object[]> data = new ArrayList<Object[]>();
- ITranslator<PurgeBranchRequest> translator = new PurgeBranchRequestTranslator();
-
- for (int index = 1; index <= 2; index++) {
- data.add(new Object[] {new PurgeBranchRequest(index * 3, false), translator});
- }
- return data;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TranslationTestSuite.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TranslationTestSuite.java
index 4e327c7504..1537cd8971 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TranslationTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TranslationTestSuite.java
@@ -15,22 +15,13 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({
- BranchCommitRequestTranslatorTest.class,
- BranchCommitResponseTranslatorTest.class,
- BranchCreationRequestTranslatorTest.class,
- BranchCreationResponseTranslatorTest.class,
CacheUpdateRequestTranslatorTest.class,
- ChangeReportResponseTranslatorTest.class,
DatastoreInitRequestTranslatorTest.class,
DataTranslationServiceFactoryTest.class,
DataTranslationServiceTest.class,
OseeImportModelRequestTranslatorTest.class,
OseeImportModelResponseTranslatorTest.class,
- TableDataTranslatorTest.class,
- PurgeBranchRequestTranslatorTest.class,
- BranchChangeTypeRequestTranslatorTest.class,
- BranchChangeStateRequestTranslatorTest.class,
- BranchChangeArchivedStateRequestTranslatorTest.class})
+ TableDataTranslatorTest.class})
/**
* @author Roberto E. Escobar
*/
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCommitRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCommitRequest.java
deleted file mode 100644
index 065cc1ed57..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCommitRequest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message;
-
-/**
- * @author Roberto E. Escobar
- */
-public class BranchCommitRequest {
-
- private final int userArtifact;
- private final long sourceBranch;
- private final long destinationBranch;
- private final boolean isArchiveAllowed;
-
- public BranchCommitRequest(int userArtifact, long sourceBranch, long destinationBranch, boolean isArchiveAllowed) {
- super();
- this.userArtifact = userArtifact;
- this.sourceBranch = sourceBranch;
- this.destinationBranch = destinationBranch;
- this.isArchiveAllowed = isArchiveAllowed;
- }
-
- public int getUserArtId() {
- return userArtifact;
- }
-
- public long getSourceBranchId() {
- return sourceBranch;
- }
-
- public long getDestinationBranchId() {
- return destinationBranch;
- }
-
- public boolean isArchiveAllowed() {
- return isArchiveAllowed;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCommitResponse.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCommitResponse.java
deleted file mode 100644
index e106f5591a..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCommitResponse.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message;
-
-
-/**
- * @author Megumi Telles
- */
-public class BranchCommitResponse {
- private Integer transactionId;
-
- public BranchCommitResponse() {
- this.transactionId = null;
- }
-
- public Integer getTransactionId() {
- return transactionId;
- }
-
- public void setTransactionId(Integer transactionId) {
- this.transactionId = transactionId;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationRequest.java
deleted file mode 100644
index 59563e03ff..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationRequest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message;
-
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
-
-/**
- * @author Roberto E. Escobar
- */
-public class BranchCreationRequest {
- private final String branchName;
- private final long parentBranchId;
- private final int associatedArtifactId;
-
- private final BranchType branchType;
- private final int sourceTransactionId;
-
- private final int authorId;
-
- private final String creationComment;
- private final int mergeAddressingQueryId;
- private final long mergeDestinationBranchId;
- private boolean isTxCopyBranchType;
- private final long branchUuid;
-
- public BranchCreationRequest(BranchType branchType, int sourceTransactionId, long parentBranchId, String branchName, long branchUuid, int associatedArtifactId, int authorId, String creationComment, int mergeAddressingQueryId, long destinationBranchId) {
- this.parentBranchId = parentBranchId;
- this.branchName = branchName;
- if (branchUuid <= 0) {
- throw new OseeArgumentException("branchUuid [%d] uuid must be > 0", branchUuid);
- }
- this.branchUuid = branchUuid;
- this.associatedArtifactId = associatedArtifactId;
- this.branchType = branchType;
- this.sourceTransactionId = sourceTransactionId;
- this.authorId = authorId;
- this.creationComment = creationComment;
- this.mergeAddressingQueryId = mergeAddressingQueryId;
- this.mergeDestinationBranchId = destinationBranchId;
- this.isTxCopyBranchType = false;
- }
-
- public String getBranchName() {
- return branchName;
- }
-
- public long getParentBranchId() {
- return parentBranchId;
- }
-
- public int getAssociatedArtifactId() {
- return associatedArtifactId;
- }
-
- public BranchType getBranchType() {
- return branchType;
- }
-
- public int getSourceTransactionId() {
- return sourceTransactionId;
- }
-
- public int getAuthorId() {
- return authorId;
- }
-
- public String getCreationComment() {
- return creationComment;
- }
-
- public int getMergeAddressingQueryId() {
- return mergeAddressingQueryId;
- }
-
- public long getMergeDestinationBranchId() {
- return mergeDestinationBranchId;
- }
-
- public boolean txIsCopied() {
- return isTxCopyBranchType;
- }
-
- public void setTxIsCopied(boolean value) {
- isTxCopyBranchType = value;
- }
-
- @Override
- public String toString() {
- return "Branch [associatedArtifactId=" + associatedArtifactId + ", branchUuid=" + branchUuid + ", branchType=" + branchType + ", name=" + branchName + ", parentBranchId=" + parentBranchId + ", parentTransactionId=" + sourceTransactionId + "]";
- }
-
- public long getBranchUuid() {
- return branchUuid;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationResponse.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationResponse.java
deleted file mode 100644
index 5c54306c69..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationResponse.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message;
-
-/**
- * @author Roberto E. Escobar
- */
-public class BranchCreationResponse {
-
- private long branchUuid;
-
- public BranchCreationResponse(long branchUuid) {
- this.branchUuid = branchUuid;
- }
-
- public long getBranchId() {
- return branchUuid;
- }
-
- public void setBranchId(long branchUuid) {
- this.branchUuid = branchUuid;
- }
-
- @Override
- public String toString() {
- return "BranchCreationResponse [branchUuid=" + branchUuid + "]";
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchArchiveStateRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchArchiveStateRequest.java
deleted file mode 100644
index e6e98eba1e..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchArchiveStateRequest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message;
-
-import org.eclipse.osee.framework.core.enums.BranchArchivedState;
-
-/**
- * @author Megumi Telles
- */
-public class ChangeBranchArchiveStateRequest {
- private final long branchUuid;
- private final BranchArchivedState state;
-
- public ChangeBranchArchiveStateRequest(long branchUuid, BranchArchivedState state) {
- super();
- this.branchUuid = branchUuid;
- this.state = state;
- }
-
- public long getBranchId() {
- return branchUuid;
- }
-
- public BranchArchivedState getState() {
- return state;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchStateRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchStateRequest.java
deleted file mode 100644
index 0302c1ab93..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchStateRequest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message;
-
-import org.eclipse.osee.framework.core.enums.BranchState;
-
-/**
- * @author Megumi Telles
- */
-public class ChangeBranchStateRequest {
- private final long branchUuid;
- private final BranchState state;
-
- public ChangeBranchStateRequest(long branchUuid, BranchState state) {
- super();
- this.branchUuid = branchUuid;
- this.state = state;
- }
-
- public long getBranchId() {
- return branchUuid;
- }
-
- public BranchState getState() {
- return state;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchTypeRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchTypeRequest.java
deleted file mode 100644
index caf9536f80..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeBranchTypeRequest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message;
-
-import org.eclipse.osee.framework.core.enums.BranchType;
-
-/**
- * @author Megumi Telles
- */
-public class ChangeBranchTypeRequest {
- private final long branchUuid;
- private final BranchType type;
-
- public ChangeBranchTypeRequest(long branchUuid, BranchType type) {
- super();
- this.branchUuid = branchUuid;
- this.type = type;
- }
-
- public long getBranchId() {
- return branchUuid;
- }
-
- public BranchType getType() {
- return type;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeReportRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeReportRequest.java
deleted file mode 100644
index 3bf8a0b8d4..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeReportRequest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message;
-
-/**
- * @author Jeff C. Phillips
- */
-public class ChangeReportRequest {
- private final int srcTx;
- private final int destTx;
-
- public ChangeReportRequest(int srcTx, int destTx) {
- super();
- this.srcTx = srcTx;
- this.destTx = destTx;
- }
-
- public int getSourceTx() {
- return srcTx;
- }
-
- public int getDestinationTx() {
- return destTx;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeReportResponse.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeReportResponse.java
deleted file mode 100644
index 3bd4ef3f3a..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ChangeReportResponse.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.osee.framework.core.model.change.ChangeItem;
-
-/**
- * @author Jeff C. Phillips
- */
-public class ChangeReportResponse {
-
- private final List<ChangeItem> changeItems;
-
- public ChangeReportResponse() {
- super();
- this.changeItems = new ArrayList<ChangeItem>();
- }
-
- public void setChangeItems(Collection<ChangeItem> items) {
- this.changeItems.addAll(items);
- }
-
- public void addItem(ChangeItem item) {
- this.changeItems.add(item);
- }
-
- public List<ChangeItem> getChangeItems() {
- return changeItems;
- }
-
- public boolean wasSuccessful() {
- return !changeItems.isEmpty();
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/PurgeBranchRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/PurgeBranchRequest.java
deleted file mode 100644
index 977fef72fc..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/PurgeBranchRequest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message;
-
-/**
- * @author Jeff C. Phillips
- * @author Megumi Telles
- */
-public class PurgeBranchRequest {
- private final long branchUuid;
- private final boolean recursive;
-
- public PurgeBranchRequest(long branchUuid, boolean recursive) {
- this.branchUuid = branchUuid;
- this.recursive = recursive;
- }
-
- public long getBranchId() {
- return branchUuid;
- }
-
- public boolean isRecursive() {
- return recursive;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java
index 02010a6996..d6e70b3381 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java
@@ -13,21 +13,11 @@ package org.eclipse.osee.framework.core.message.internal;
import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
import org.eclipse.osee.framework.core.message.internal.translation.ArtifactTypeCacheUpdateResponseTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.AttributeTypeCacheUpdateResponseTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchChangeArchivedStateRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchChangeStateRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchChangeTypeRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchCommitRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchCommitResponseTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchCreationRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.BranchCreationResponseTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.CacheUpdateRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.ChangeReportRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.ChangeReportResponseTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.DatastoreInitRequestTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.OseeEnumTypeCacheUpdateResponseTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.OseeImportModelRequestTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.OseeImportModelResponseTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.PurgeBranchRequestTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.RelationTypeCacheUpdateResponseTranslator;
import org.eclipse.osee.framework.core.message.internal.translation.TableDataTranslator;
import org.eclipse.osee.framework.core.model.type.AttributeTypeFactory;
@@ -45,21 +35,6 @@ public class DataTranslationServiceFactory {
}
public void configureService(IDataTranslationService service, AttributeTypeFactory attributeTypeFactory) throws OseeCoreException {
- service.addTranslator(new BranchCreationRequestTranslator(), CoreTranslatorId.BRANCH_CREATION_REQUEST);
- service.addTranslator(new BranchCreationResponseTranslator(), CoreTranslatorId.BRANCH_CREATION_RESPONSE);
-
- service.addTranslator(new BranchCommitRequestTranslator(), CoreTranslatorId.BRANCH_COMMIT_REQUEST);
- service.addTranslator(new BranchCommitResponseTranslator(), CoreTranslatorId.BRANCH_COMMIT_RESPONSE);
-
- service.addTranslator(new BranchChangeTypeRequestTranslator(), CoreTranslatorId.CHANGE_BRANCH_TYPE);
- service.addTranslator(new BranchChangeStateRequestTranslator(), CoreTranslatorId.CHANGE_BRANCH_STATE);
- service.addTranslator(new BranchChangeArchivedStateRequestTranslator(),
- CoreTranslatorId.CHANGE_BRANCH_ARCHIVE_STATE);
-
- service.addTranslator(new ChangeReportRequestTranslator(), CoreTranslatorId.CHANGE_REPORT_REQUEST);
- service.addTranslator(new ChangeReportResponseTranslator(), CoreTranslatorId.CHANGE_REPORT_RESPONSE);
- service.addTranslator(new PurgeBranchRequestTranslator(), CoreTranslatorId.PURGE_BRANCH_REQUEST);
-
service.addTranslator(new CacheUpdateRequestTranslator(), CoreTranslatorId.OSEE_CACHE_UPDATE_REQUEST);
service.addTranslator(new ArtifactTypeCacheUpdateResponseTranslator(),
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeArchivedStateRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeArchivedStateRequestTranslator.java
deleted file mode 100644
index 1a535d2f84..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeArchivedStateRequestTranslator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.internal.translation;
-
-import org.eclipse.osee.framework.core.enums.BranchArchivedState;
-import org.eclipse.osee.framework.core.message.ChangeBranchArchiveStateRequest;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-
-/**
- * @author Megumi Telles
- */
-public final class BranchChangeArchivedStateRequestTranslator implements ITranslator<ChangeBranchArchiveStateRequest> {
-
- private static enum Entry {
- BRANCH_ID,
- BRANCH_ARCHIVED_STATE,
- }
-
- @Override
- public ChangeBranchArchiveStateRequest convert(PropertyStore propertyStore) {
- long branchUuid = propertyStore.getLong(Entry.BRANCH_ID.name());
- BranchArchivedState state = BranchArchivedState.valueOf(propertyStore.get(Entry.BRANCH_ARCHIVED_STATE.name()));
- ChangeBranchArchiveStateRequest data = new ChangeBranchArchiveStateRequest(branchUuid, state);
- return data;
- }
-
- @Override
- public PropertyStore convert(ChangeBranchArchiveStateRequest data) {
- PropertyStore store = new PropertyStore();
- store.put(Entry.BRANCH_ID.name(), data.getBranchId());
- store.put(Entry.BRANCH_ARCHIVED_STATE.name(), data.getState().name());
- return store;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeStateRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeStateRequestTranslator.java
deleted file mode 100644
index 51ea0c219f..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeStateRequestTranslator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.internal.translation;
-
-import org.eclipse.osee.framework.core.enums.BranchState;
-import org.eclipse.osee.framework.core.message.ChangeBranchStateRequest;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-
-/**
- * @author Megumi Telles
- */
-public final class BranchChangeStateRequestTranslator implements ITranslator<ChangeBranchStateRequest> {
-
- private static enum Entry {
- BRANCH_ID,
- BRANCH_STATE,
- }
-
- @Override
- public ChangeBranchStateRequest convert(PropertyStore propertyStore) {
- long branchUuid = propertyStore.getLong(Entry.BRANCH_ID.name());
- BranchState state = BranchState.valueOf(propertyStore.get(Entry.BRANCH_STATE.name()));
- ChangeBranchStateRequest data = new ChangeBranchStateRequest(branchUuid, state);
- return data;
- }
-
- @Override
- public PropertyStore convert(ChangeBranchStateRequest data) {
- PropertyStore store = new PropertyStore();
- store.put(Entry.BRANCH_ID.name(), data.getBranchId());
- store.put(Entry.BRANCH_STATE.name(), data.getState().name());
- return store;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeTypeRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeTypeRequestTranslator.java
deleted file mode 100644
index 3f4244763e..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchChangeTypeRequestTranslator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.internal.translation;
-
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.message.ChangeBranchTypeRequest;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-
-/**
- * @author Megumi Telles
- */
-public final class BranchChangeTypeRequestTranslator implements ITranslator<ChangeBranchTypeRequest> {
-
- private static enum Entry {
- BRANCH_ID,
- BRANCH_TYPE,
- }
-
- @Override
- public ChangeBranchTypeRequest convert(PropertyStore propertyStore) {
- long branchUuid = propertyStore.getLong(Entry.BRANCH_ID.name());
- BranchType type = BranchType.valueOf(propertyStore.get(Entry.BRANCH_TYPE.name()));
- ChangeBranchTypeRequest data = new ChangeBranchTypeRequest(branchUuid, type);
- return data;
- }
-
- @Override
- public PropertyStore convert(ChangeBranchTypeRequest data) {
- PropertyStore store = new PropertyStore();
- store.put(Entry.BRANCH_ID.name(), data.getBranchId());
- store.put(Entry.BRANCH_TYPE.name(), data.getType().name());
- return store;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCommitRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCommitRequestTranslator.java
deleted file mode 100644
index d109e98e25..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCommitRequestTranslator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.internal.translation;
-
-import org.eclipse.osee.framework.core.message.BranchCommitRequest;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-
-/**
- * @author Roberto E. Escobar
- */
-public final class BranchCommitRequestTranslator implements ITranslator<BranchCommitRequest> {
-
- private static enum Entry {
- USER_ART_ID,
- SRC_BRANCH_ID,
- DEST_BRANCH_ID,
- IS_ARCHIVE_ALLOWED;
- }
-
- @Override
- public BranchCommitRequest convert(PropertyStore propertyStore) {
- long srcBranchId = propertyStore.getLong(Entry.SRC_BRANCH_ID.name());
- long destBranchId = propertyStore.getLong(Entry.DEST_BRANCH_ID.name());
- int userArtifactId = propertyStore.getInt(Entry.USER_ART_ID.name());
-
- boolean isArchiveAllowed = propertyStore.getBoolean(Entry.IS_ARCHIVE_ALLOWED.name());
- BranchCommitRequest data = new BranchCommitRequest(userArtifactId, srcBranchId, destBranchId, isArchiveAllowed);
- return data;
- }
-
- @Override
- public PropertyStore convert(BranchCommitRequest data) {
- PropertyStore store = new PropertyStore();
- store.put(Entry.IS_ARCHIVE_ALLOWED.name(), data.isArchiveAllowed());
- store.put(Entry.USER_ART_ID.name(), data.getUserArtId());
- store.put(Entry.SRC_BRANCH_ID.name(), data.getSourceBranchId());
- store.put(Entry.DEST_BRANCH_ID.name(), data.getDestinationBranchId());
- return store;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCommitResponseTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCommitResponseTranslator.java
deleted file mode 100644
index 41f77b083f..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCommitResponseTranslator.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.internal.translation;
-
-import org.eclipse.osee.framework.core.message.BranchCommitResponse;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-
-/**
- * @author Megumi Telles
- */
-public class BranchCommitResponseTranslator implements ITranslator<BranchCommitResponse> {
-
- private static enum Entry {
- TRANSACTION_NUMBER
- }
-
- @Override
- public BranchCommitResponse convert(PropertyStore propertyStore) throws OseeCoreException {
- BranchCommitResponse response = new BranchCommitResponse();
- Integer transactionRecord = propertyStore.getInt(Entry.TRANSACTION_NUMBER.name());
- response.setTransactionId(transactionRecord);
- return response;
- }
-
- @Override
- public PropertyStore convert(BranchCommitResponse data) throws OseeCoreException {
- PropertyStore store = new PropertyStore();
- Integer record = data.getTransactionId();
- store.put(Entry.TRANSACTION_NUMBER.name(), record);
- return store;
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java
deleted file mode 100644
index 15c83637c9..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.internal.translation;
-
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.message.BranchCreationRequest;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-
-/**
- * @author Roberto E. Escobar
- */
-public class BranchCreationRequestTranslator implements ITranslator<BranchCreationRequest> {
-
- private static enum Fields {
- BRANCH_NAME,
- PARENT_BRANCH_ID,
- ASSOCIATED_ART_ID,
-
- BRANCH_TYPE,
- SOURCE_TX_ID,
- BRANCH_UUID,
-
- AUTHOR_ID,
-
- CREATION_COMMENT,
- MERGE_ADDRESSING_QUERY_ID,
- MERGE_DESTINATION_BRANCH_ID,
- TX_COPY_BRANCH_TYPE;
- }
-
- @Override
- public BranchCreationRequest convert(PropertyStore store) {
- String branchName = store.get(Fields.BRANCH_NAME.name());
- long parentBranchId = store.getLong(Fields.PARENT_BRANCH_ID.name());
- int associatedArtifactId = store.getInt(Fields.ASSOCIATED_ART_ID.name());
-
- BranchType branchType = BranchType.valueOf(store.get(Fields.BRANCH_TYPE.name()));
- int sourceTransactionId = store.getInt(Fields.SOURCE_TX_ID.name());
-
- int authorId = store.getInt(Fields.AUTHOR_ID.name());
-
- String creationComment = store.get(Fields.CREATION_COMMENT.name());
-
- boolean isTxCopy = store.getBoolean(Fields.TX_COPY_BRANCH_TYPE.name());
-
- int mergeAddressingQueryId = store.getInt(Fields.MERGE_ADDRESSING_QUERY_ID.name());
- long destinationBranchId = store.getLong(Fields.MERGE_DESTINATION_BRANCH_ID.name());
- long branchUuid = store.getLong(Fields.BRANCH_UUID.name());
-
- BranchCreationRequest branchCreationRequest =
- new BranchCreationRequest(branchType, sourceTransactionId, parentBranchId, branchName, branchUuid,
- associatedArtifactId, authorId, creationComment, mergeAddressingQueryId, destinationBranchId);
-
- branchCreationRequest.setTxIsCopied(isTxCopy);
-
- return branchCreationRequest;
- }
-
- @Override
- public PropertyStore convert(BranchCreationRequest object) {
- PropertyStore store = new PropertyStore();
- store.put(Fields.BRANCH_NAME.name(), object.getBranchName());
- store.put(Fields.PARENT_BRANCH_ID.name(), object.getParentBranchId());
- store.put(Fields.ASSOCIATED_ART_ID.name(), object.getAssociatedArtifactId());
- store.put(Fields.BRANCH_TYPE.name(), object.getBranchType().name());
- store.put(Fields.SOURCE_TX_ID.name(), object.getSourceTransactionId());
- store.put(Fields.BRANCH_UUID.name(), object.getBranchUuid());
- store.put(Fields.AUTHOR_ID.name(), object.getAuthorId());
- store.put(Fields.CREATION_COMMENT.name(), object.getCreationComment());
-
- store.put(Fields.MERGE_ADDRESSING_QUERY_ID.name(), object.getMergeAddressingQueryId());
- store.put(Fields.MERGE_DESTINATION_BRANCH_ID.name(), object.getMergeDestinationBranchId());
- store.put(Fields.TX_COPY_BRANCH_TYPE.name(), object.txIsCopied());
-
- return store;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationResponseTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationResponseTranslator.java
deleted file mode 100644
index f6e5e61f8b..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationResponseTranslator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.internal.translation;
-
-import org.eclipse.osee.framework.core.message.BranchCreationResponse;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-
-/**
- * @author Roberto E. Escobar
- */
-public class BranchCreationResponseTranslator implements ITranslator<BranchCreationResponse> {
-
- private static enum Fields {
- BRANCH_ID;
- }
-
- @Override
- public BranchCreationResponse convert(PropertyStore store) {
- long branchUuid = store.getLong(Fields.BRANCH_ID.name());
- return new BranchCreationResponse(branchUuid);
- }
-
- @Override
- public PropertyStore convert(BranchCreationResponse object) {
- PropertyStore store = new PropertyStore();
- store.put(Fields.BRANCH_ID.name(), object.getBranchId());
- return store;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ChangeReportRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ChangeReportRequestTranslator.java
deleted file mode 100644
index 6a89cbcdd7..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ChangeReportRequestTranslator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.internal.translation;
-
-import org.eclipse.osee.framework.core.message.ChangeReportRequest;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-
-/**
- * @author Jeff C. Phillips
- */
-public class ChangeReportRequestTranslator implements ITranslator<ChangeReportRequest> {
- private static enum Entry {
- SRC_TRANSACTION,
- DEST_TRANSACTION,
- }
-
- @Override
- public ChangeReportRequest convert(PropertyStore propertyStore) {
- int srcTx = propertyStore.getInt(Entry.SRC_TRANSACTION.name());
- int destTx = propertyStore.getInt(Entry.DEST_TRANSACTION.name());
-
- ChangeReportRequest data = new ChangeReportRequest(srcTx, destTx);
- return data;
- }
-
- @Override
- public PropertyStore convert(ChangeReportRequest data) {
- PropertyStore store = new PropertyStore();
- store.put(Entry.SRC_TRANSACTION.name(), data.getSourceTx());
- store.put(Entry.DEST_TRANSACTION.name(), data.getDestinationTx());
- return store;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ChangeReportResponseTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ChangeReportResponseTranslator.java
deleted file mode 100644
index e9cdc59d2f..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ChangeReportResponseTranslator.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.internal.translation;
-
-import java.util.List;
-import org.eclipse.osee.framework.core.enums.ChangeItemType;
-import org.eclipse.osee.framework.core.enums.ModificationType;
-import org.eclipse.osee.framework.core.message.ChangeReportResponse;
-import org.eclipse.osee.framework.core.message.TranslationUtil;
-import org.eclipse.osee.framework.core.model.change.ChangeItem;
-import org.eclipse.osee.framework.core.model.change.ChangeItemUtil;
-import org.eclipse.osee.framework.core.model.change.ChangeVersion;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-
-/**
- * @author Jeff C. Phillips
- */
-public class ChangeReportResponseTranslator implements ITranslator<ChangeReportResponse> {
-
- private enum Fields {
- COUNT,
- ROW,
- CURR,
- BASE,
- FIRST,
- DEST,
- NET;
- }
-
- public ChangeReportResponseTranslator() {
- super();
- }
-
- @Override
- public ChangeReportResponse convert(PropertyStore store) throws OseeCoreException {
- ChangeReportResponse response = new ChangeReportResponse();
-
- int rowCount = store.getInt(Fields.COUNT.name());
- for (int index = 0; index < rowCount; index++) {
- String key = TranslationUtil.createKey(Fields.ROW, index);
- String[] rowData = store.getArray(key);
-
- ChangeItem item = fromArray(rowData);
- load(store, Fields.CURR, index, item.getCurrentVersion());
- load(store, Fields.BASE, index, item.getBaselineVersion());
- load(store, Fields.FIRST, index, item.getFirstNonCurrentChange());
- load(store, Fields.DEST, index, item.getDestinationVersion());
- load(store, Fields.NET, index, item.getNetChange());
-
- response.addItem(item);
- }
- return response;
- }
-
- @Override
- public PropertyStore convert(ChangeReportResponse data) throws OseeCoreException {
- PropertyStore store = new PropertyStore();
-
- List<ChangeItem> items = data.getChangeItems();
- for (int index = 0; index < items.size(); index++) {
- ChangeItem item = items.get(index);
- String key = TranslationUtil.createKey(Fields.ROW, index);
- store.put(key, toArray(item));
-
- store(store, Fields.CURR, index, item.getCurrentVersion());
- store(store, Fields.BASE, index, item.getBaselineVersion());
- store(store, Fields.FIRST, index, item.getFirstNonCurrentChange());
- store(store, Fields.DEST, index, item.getDestinationVersion());
- store(store, Fields.NET, index, item.getNetChange());
- }
- store.put(Fields.COUNT.name(), items.size());
- return store;
- }
-
- private static void load(PropertyStore store, Enum<?> prefix, int index, ChangeVersion version) throws OseeArgumentException, NumberFormatException {
- String key = TranslationUtil.createKey(prefix, index);
- String[] data = store.getArray(key);
- if (data != null && data.length > 0) {
- Long gammaId = Long.parseLong(data[0]);
- ModificationType modificationType = ModificationType.getMod(Integer.parseInt(data[1]));
- String value = data[2];
-
- version.setGammaId(gammaId);
- version.setModType(modificationType);
- version.setValue(value);
- }
- }
-
- private static void store(PropertyStore store, Enum<?> prefix, int index, ChangeVersion version) {
- if (version != null && version.isValid()) {
- String[] row = new String[3];
- row[0] = String.valueOf(version.getGammaId());
- row[1] = String.valueOf(version.getModType().getValue());
- row[2] = version.getValue();
-
- String key = TranslationUtil.createKey(prefix, index);
- store.put(key, row);
- }
- }
-
- private static String[] toArray(ChangeItem item) throws OseeStateException {
- String[] row;
- switch (item.getChangeType()) {
- case ARTIFACT_CHANGE:
- row = new String[4];
- row[0] = ChangeItemType.ARTIFACT.name();
- row[1] = String.valueOf(item.getItemId());
- row[2] = String.valueOf(item.getItemTypeId());
- row[3] = String.valueOf(item.isSynthetic());
- break;
- case ATTRIBUTE_CHANGE:
- row = new String[4];
- row[0] = ChangeItemType.ATTRIBUTE.name();
- row[1] = String.valueOf(item.getItemId());
- row[2] = String.valueOf(item.getItemTypeId());
- row[3] = String.valueOf(item.getArtId());
- break;
- case RELATION_CHANGE:
- row = new String[6];
- row[0] = ChangeItemType.RELATION.name();
- row[1] = String.valueOf(item.getItemId());
- row[2] = String.valueOf(item.getItemTypeId());
- row[3] = String.valueOf(item.getArtId());
- row[4] = String.valueOf(item.getArtIdB());
- row[5] = item.getCurrentVersion().getValue();
- break;
- default:
- throw new OseeStateException("Invalid change item type");
- }
- return row;
-
- }
-
- private static ChangeItem fromArray(String[] row) throws OseeStateException {
- ChangeItem changeItem = null;
-
- ChangeItemType type = ChangeItemType.getType(row[0]);
- int itemId = Integer.parseInt(row[1]);
- long itemTypeId = Long.parseLong(row[2]);
- switch (type) {
- case ARTIFACT:
- boolean synthetic = Boolean.parseBoolean(row[3]);
- changeItem = ChangeItemUtil.newArtifactChange(itemId, itemTypeId, -1, ModificationType.NEW);
- changeItem.setSynthetic(synthetic);
- break;
- case ATTRIBUTE:
- int artId = Integer.parseInt(row[3]);
- changeItem = ChangeItemUtil.newAttributeChange(itemId, itemTypeId, artId, -1, ModificationType.NEW, null);
- break;
- case RELATION:
- int aArtId = Integer.parseInt(row[3]);
- int bArtId = Integer.parseInt(row[4]);
- String rationale = row[5];
-
- changeItem =
- ChangeItemUtil.newRelationChange(itemId, itemTypeId, -1, ModificationType.NEW, aArtId, bArtId, rationale);
- break;
- default:
- throw new OseeStateException("Invalid change item type");
- }
- return changeItem;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/PurgeBranchRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/PurgeBranchRequestTranslator.java
deleted file mode 100644
index 235ecb19fd..0000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/PurgeBranchRequestTranslator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.message.internal.translation;
-
-import org.eclipse.osee.framework.core.message.PurgeBranchRequest;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-
-/**
- * @author Megumi Telles
- * @author Jeff C. Phillips
- */
-public class PurgeBranchRequestTranslator implements ITranslator<PurgeBranchRequest> {
- private static enum Entry {
- BRANCH_ID,
- RECURSIVE
- }
-
- @Override
- public PurgeBranchRequest convert(PropertyStore propertyStore) {
- long branchUuid = propertyStore.getLong(Entry.BRANCH_ID.name());
- boolean recursive = propertyStore.getBoolean(Entry.RECURSIVE.name());
- PurgeBranchRequest request = new PurgeBranchRequest(branchUuid, recursive);
- return request;
- }
-
- @Override
- public PropertyStore convert(PurgeBranchRequest data) {
- PropertyStore store = new PropertyStore();
- store.put(Entry.BRANCH_ID.name(), data.getBranchId());
- store.put(Entry.RECURSIVE.name(), data.isRecursive());
- return store;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreTranslatorId.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreTranslatorId.java
index 9db161681d..4b5e4df1a0 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreTranslatorId.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreTranslatorId.java
@@ -17,17 +17,6 @@ import org.eclipse.osee.framework.core.translation.ITranslatorId;
* @author Roberto E. Escobar
*/
public enum CoreTranslatorId implements ITranslatorId {
- BRANCH_COMMIT_REQUEST,
- BRANCH_COMMIT_RESPONSE,
- PURGE_BRANCH_REQUEST,
-
- CHANGE_BRANCH_TYPE,
- CHANGE_BRANCH_STATE,
- CHANGE_BRANCH_ARCHIVE_STATE,
-
- CHANGE_REPORT_REQUEST,
- CHANGE_REPORT_RESPONSE,
-
OSEE_DATASTORE_INIT_REQUEST,
OSEE_IMPORT_MODEL_REQUEST,
@@ -40,8 +29,6 @@ public enum CoreTranslatorId implements ITranslatorId {
OSEE_ENUM_TYPE_CACHE_UPDATE_RESPONSE,
TRANSACTION_RECORD,
- BRANCH_CREATION_REQUEST,
- BRANCH_CREATION_RESPONSE,
TABLE_DATA,
STATUS_RESPONSE;
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchManagerServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchManagerServlet.java
deleted file mode 100644
index 11337cd4f1..0000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchManagerServlet.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.osee.framework.manager.servlet;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.enums.Function;
-import org.eclipse.osee.framework.core.server.ISessionManager;
-import org.eclipse.osee.framework.core.server.SecureOseeHttpServlet;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.eclipse.osee.framework.manager.servlet.branch.AbstractBranchCallable;
-import org.eclipse.osee.framework.manager.servlet.branch.ArchiveBranchCallable;
-import org.eclipse.osee.framework.manager.servlet.branch.ChangeBranchStateCallable;
-import org.eclipse.osee.framework.manager.servlet.branch.ChangeBranchTypeCallable;
-import org.eclipse.osee.framework.manager.servlet.branch.CommitBranchCallable;
-import org.eclipse.osee.framework.manager.servlet.branch.CompareBranchCallable;
-import org.eclipse.osee.framework.manager.servlet.branch.CreateBranchCallable;
-import org.eclipse.osee.framework.manager.servlet.branch.PurgeBranchCallable;
-import org.eclipse.osee.framework.manager.servlet.internal.ApplicationContextFactory;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-
-/**
- * @author Andrew M. Finkbeiner
- */
-public class BranchManagerServlet extends SecureOseeHttpServlet {
-
- private static final long serialVersionUID = 226986283540461526L;
-
- private final OrcsApi orcsApi;
- private final IDataTranslationService translationService;
-
- public BranchManagerServlet(Log logger, ISessionManager sessionManager, IDataTranslationService translationService, OrcsApi orcsApi) {
- super(logger, sessionManager);
- this.translationService = translationService;
- this.orcsApi = orcsApi;
- }
-
- @Override
- protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- try {
- Callable<?> callable = createCallable(req, resp);
- if (callable != null) {
- callable.call();
- }
- } catch (Exception ex) {
- getLogger().error(ex, "Branch servlet request error: [%s]", req.toString());
- resp.setStatus(HttpURLConnection.HTTP_INTERNAL_ERROR);
- resp.setContentType("text/plain");
- resp.getWriter().write(Lib.exceptionToString(ex));
- resp.getWriter().flush();
- resp.getWriter().close();
- }
- }
-
- private ApplicationContext getContext(HttpServletRequest req) {
- return ApplicationContextFactory.createContext(getSessionId(req));
- }
-
- private Callable<?> createCallable(HttpServletRequest req, HttpServletResponse resp) throws Exception {
- String rawFunction = req.getParameter("function");
- Function function = Function.fromString(rawFunction);
-
- ApplicationContext applicationContext = getContext(req);
-
- AbstractBranchCallable<?, ?> callable = null;
- switch (function) {
- case BRANCH_COMMIT:
- callable = new CommitBranchCallable(applicationContext, req, resp, translationService, orcsApi);
- break;
- case CREATE_BRANCH:
- callable = new CreateBranchCallable(applicationContext, req, resp, translationService, orcsApi);
- break;
- case CHANGE_REPORT:
- callable = new CompareBranchCallable(applicationContext, req, resp, translationService, orcsApi);
- break;
- case PURGE_BRANCH:
- callable = new PurgeBranchCallable(applicationContext, req, resp, translationService, orcsApi);
- break;
- case UPDATE_ARCHIVE_STATE:
- callable = new ArchiveBranchCallable(applicationContext, req, resp, translationService, orcsApi);
- break;
- case UPDATE_BRANCH_TYPE:
- callable = new ChangeBranchTypeCallable(applicationContext, req, resp, translationService, orcsApi);
- break;
- case UPDATE_BRANCH_STATE:
- callable = new ChangeBranchStateCallable(applicationContext, req, resp, translationService, orcsApi);
- break;
- default:
- throw new UnsupportedOperationException();
- }
- return callable;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/AbstractBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/AbstractBranchCallable.java
deleted file mode 100644
index 34edc93b6c..0000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/AbstractBranchCallable.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.manager.servlet.branch;
-
-import java.io.InputStream;
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.executor.admin.CancellableCallable;
-import org.eclipse.osee.framework.core.enums.CoreBranches;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.OrcsBranch;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.BranchReadable;
-import org.eclipse.osee.orcs.search.BranchQuery;
-import org.eclipse.osee.orcs.search.QueryFactory;
-import org.eclipse.osee.orcs.search.TransactionQuery;
-
-/**
- * @author Roberto E. Escobar
- */
-public abstract class AbstractBranchCallable<REQ_TYPE, RESP_TYPE> extends CancellableCallable<RESP_TYPE> {
-
- private final ApplicationContext context;
- private final HttpServletRequest req;
- private final HttpServletResponse resp;
- private final IDataTranslationService translationService;
- private final OrcsApi orcsApi;
- private final String mediaType;
- private final CoreTranslatorId reqType;
- private final CoreTranslatorId respType;
- private Callable<?> innerWorker;
- private final OrcsBranch branchOps;
-
- public AbstractBranchCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi, String mediaType, CoreTranslatorId reqType, CoreTranslatorId respType) {
- super();
- this.context = context;
- this.req = req;
- this.resp = resp;
- this.translationService = translationService;
- this.orcsApi = orcsApi;
- this.mediaType = mediaType;
- this.reqType = reqType;
- this.respType = respType;
- this.branchOps = getOrcsApi().getBranchOps(context);
- }
-
- @Override
- public final RESP_TYPE call() throws Exception {
- REQ_TYPE request = translationService.convert(req.getInputStream(), reqType);
- RESP_TYPE response = executeCall(request);
-
- resp.setStatus(HttpServletResponse.SC_ACCEPTED);
- resp.setContentType(mediaType);
- resp.setCharacterEncoding("UTF-8");
-
- if (response != null && respType != null) {
- InputStream inputStream = translationService.convertToStream(response, respType);
- Lib.inputStreamToOutputStream(inputStream, resp.getOutputStream());
- } else {
- resp.getWriter().flush();
- }
- return response;
- }
-
- protected abstract RESP_TYPE executeCall(REQ_TYPE request) throws Exception;
-
- protected <K> K callAndCheckForCancel(Callable<K> callable) throws Exception {
- checkForCancelled();
- setInnerWorker(callable);
- K result = callable.call();
- setInnerWorker(null);
- return result;
- }
-
- private synchronized void setInnerWorker(Callable<?> callable) {
- innerWorker = callable;
- }
-
- @Override
- public void setCancel(boolean isCancelled) {
- super.setCancel(isCancelled);
- final Callable<?> inner = innerWorker;
- if (inner != null) {
- synchronized (inner) {
- if (inner instanceof CancellableCallable) {
- ((CancellableCallable<?>) inner).setCancel(isCancelled);
- }
- }
- }
- }
-
- private OrcsApi getOrcsApi() {
- return orcsApi;
- }
-
- protected OrcsBranch getBranchOps() {
- return branchOps;
- }
-
- protected QueryFactory getQueryFactory() {
- return orcsApi.getQueryFactory(getContext());
- }
-
- protected BranchReadable getBranchFromUuid(long uuid) {
- BranchQuery branchQuery = orcsApi.getQueryFactory(getContext()).branchQuery();
- branchQuery.andUuids(uuid);
- return branchQuery.getResults().getExactlyOne();
- }
-
- protected ApplicationContext getContext() {
- return context;
- }
-
- protected ArtifactReadable getArtifactById(int id) throws OseeCoreException {
- ArtifactReadable artifact = null;
- if (id > 0) {
- QueryFactory factory = getOrcsApi().getQueryFactory(getContext());
- artifact = factory.fromBranch(CoreBranches.COMMON).andLocalId(id).getResults().getExactlyOne();
- }
- return artifact;
- }
-
- protected Long getBranchUuidFromTxId(int tx) {
- TransactionQuery txQuery = getQueryFactory().transactionQuery();
- Long branchId = txQuery.andTxId(tx).getResults().getExactlyOne().getBranchId();
- return branchId;
- }
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ArchiveBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ArchiveBranchCallable.java
deleted file mode 100644
index b3a42a1501..0000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ArchiveBranchCallable.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.manager.servlet.branch;
-
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.ChangeBranchArchiveStateRequest;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.data.ArchiveOperation;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ArchiveBranchCallable extends AbstractBranchCallable<ChangeBranchArchiveStateRequest, Object> {
-
- public ArchiveBranchCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi) {
- super(context, req, resp, translationService, orcsApi, "text/plain",
- CoreTranslatorId.CHANGE_BRANCH_ARCHIVE_STATE, null);
- }
-
- @Override
- protected Object executeCall(ChangeBranchArchiveStateRequest request) throws Exception {
- IOseeBranch toArchive = getBranchFromUuid(request.getBranchId());
- ArchiveOperation archiveOp =
- request.getState().isArchived() ? ArchiveOperation.ARCHIVE : ArchiveOperation.UNARCHIVE;
-
- Callable<Void> callable = getBranchOps().archiveUnarchiveBranch(toArchive, archiveOp);
- callAndCheckForCancel(callable);
-
- return Boolean.TRUE;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchStateCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchStateCallable.java
deleted file mode 100644
index c5931e0e68..0000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchStateCallable.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.manager.servlet.branch;
-
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.enums.BranchState;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.ChangeBranchStateRequest;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ChangeBranchStateCallable extends AbstractBranchCallable<ChangeBranchStateRequest, Object> {
-
- public ChangeBranchStateCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi) {
- super(context, req, resp, translationService, orcsApi, "text/plain", CoreTranslatorId.CHANGE_BRANCH_STATE, null);
- }
-
- @Override
- protected Object executeCall(ChangeBranchStateRequest request) throws Exception {
- IOseeBranch toModify = getBranchFromUuid(request.getBranchId());
- BranchState newBranchState = request.getState();
-
- Callable<Void> callable = getBranchOps().changeBranchState(toModify, newBranchState);
- callAndCheckForCancel(callable);
- return Boolean.TRUE;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchTypeCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchTypeCallable.java
deleted file mode 100644
index 39f87f24d2..0000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchTypeCallable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.manager.servlet.branch;
-
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.ChangeBranchTypeRequest;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ChangeBranchTypeCallable extends AbstractBranchCallable<ChangeBranchTypeRequest, Object> {
-
- public ChangeBranchTypeCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi) {
- super(context, req, resp, translationService, orcsApi, "text/plain", CoreTranslatorId.CHANGE_BRANCH_TYPE, null);
- }
-
- @Override
- protected Object executeCall(ChangeBranchTypeRequest request) throws Exception {
- IOseeBranch toModify = getBranchFromUuid(request.getBranchId());
- BranchType newBranchType = request.getType();
-
- Callable<Void> callable = getBranchOps().changeBranchType(toModify, newBranchType);
- callAndCheckForCancel(callable);
- return Boolean.TRUE;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java
deleted file mode 100644
index f5a896c614..0000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.manager.servlet.branch;
-
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.BranchCommitRequest;
-import org.eclipse.osee.framework.core.message.BranchCommitResponse;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.data.ArchiveOperation;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.TransactionReadable;
-
-/**
- * @author Roberto E. Escobar
- */
-public class CommitBranchCallable extends AbstractBranchCallable<BranchCommitRequest, BranchCommitResponse> {
-
- public CommitBranchCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi) {
- super(context, req, resp, translationService, orcsApi, "text/xml", CoreTranslatorId.BRANCH_COMMIT_REQUEST,
- CoreTranslatorId.BRANCH_COMMIT_RESPONSE);
- }
-
- @Override
- protected BranchCommitResponse executeCall(BranchCommitRequest request) throws Exception {
- IOseeBranch source = getBranchFromUuid(request.getSourceBranchId());
- IOseeBranch destination = getBranchFromUuid(request.getDestinationBranchId());
-
- ArtifactReadable committer = getArtifactById(request.getUserArtId());
-
- Callable<TransactionReadable> callable = getBranchOps().commitBranch(committer, source, destination);
- TransactionReadable transactionRecord = callAndCheckForCancel(callable);
-
- BranchCommitResponse responseData = new BranchCommitResponse();
- responseData.setTransactionId(transactionRecord.getGuid());
-
- if (request.isArchiveAllowed()) {
- Callable<Void> archiveCallable = getBranchOps().archiveUnarchiveBranch(source, ArchiveOperation.ARCHIVE);
- callAndCheckForCancel(archiveCallable);
- }
- return responseData;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java
deleted file mode 100644
index 3c5b2db30f..0000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.manager.servlet.branch;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.ChangeReportRequest;
-import org.eclipse.osee.framework.core.message.ChangeReportResponse;
-import org.eclipse.osee.framework.core.model.change.ChangeItem;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.data.TransactionReadable;
-import org.eclipse.osee.orcs.search.QueryFactory;
-
-/**
- * @author Roberto E. Escobar
- */
-public class CompareBranchCallable extends AbstractBranchCallable<ChangeReportRequest, ChangeReportResponse> {
-
- public CompareBranchCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi) {
- super(context, req, resp, translationService, orcsApi, "text/xml", CoreTranslatorId.CHANGE_REPORT_REQUEST,
- CoreTranslatorId.CHANGE_REPORT_RESPONSE);
- }
-
- @Override
- protected ChangeReportResponse executeCall(ChangeReportRequest request) throws Exception {
- QueryFactory queryFactory = getQueryFactory();
- TransactionReadable sourceTx =
- queryFactory.transactionQuery().andTxId(request.getSourceTx()).getResults().getExactlyOne();
- TransactionReadable destinationTx =
- queryFactory.transactionQuery().andTxId(request.getDestinationTx()).getResults().getExactlyOne();
-
- Callable<List<ChangeItem>> callable = getBranchOps().compareBranch(sourceTx, destinationTx);
- List<ChangeItem> items = callAndCheckForCancel(callable);
-
- ChangeReportResponse response = new ChangeReportResponse();
- response.setChangeItems(items);
-
- return response;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java
deleted file mode 100644
index 103b3369f9..0000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.manager.servlet.branch;
-
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.data.TokenFactory;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.BranchCreationRequest;
-import org.eclipse.osee.framework.core.message.BranchCreationResponse;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.BranchReadable;
-import org.eclipse.osee.orcs.data.CreateBranchData;
-
-/**
- * @author Roberto E. Escobar
- */
-public class CreateBranchCallable extends AbstractBranchCallable<BranchCreationRequest, BranchCreationResponse> {
-
- public CreateBranchCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi) {
- super(context, req, resp, translationService, orcsApi, "text/xml", CoreTranslatorId.BRANCH_CREATION_REQUEST,
- CoreTranslatorId.BRANCH_CREATION_RESPONSE);
- }
-
- @Override
- protected BranchCreationResponse executeCall(BranchCreationRequest request) throws Exception {
- CreateBranchData createData = new CreateBranchData();
-
- createData.setUuid(request.getBranchUuid());
- createData.setName(request.getBranchName());
- if (Long.valueOf(request.getBranchUuid()) > 0) {
- createData.setUuid(request.getBranchUuid());
- }
- createData.setBranchType(request.getBranchType());
- createData.setCreationComment(request.getCreationComment());
-
- createData.setFromTransaction(TokenFactory.createTransaction(request.getSourceTransactionId()));
-
- ArtifactReadable createdBy = getArtifactById(request.getAuthorId());
- ArtifactReadable associatedWith = getArtifactById(request.getAssociatedArtifactId());
-
- createData.setUserArtifact(createdBy);
- createData.setAssociatedArtifact(associatedWith);
-
- createData.setMergeDestinationBranchId(request.getMergeDestinationBranchId());
- Long parentBranch = getBranchUuidFromTxId(request.getSourceTransactionId());
- createData.setParentBranchUuid(parentBranch);
- createData.setMergeAddressingQueryId(request.getMergeAddressingQueryId());
- createData.setTxCopyBranchType(request.txIsCopied());
- Callable<BranchReadable> callable;
-
- callable = getBranchOps().createBranch(createData);
-
- BranchReadable newBranch = callAndCheckForCancel(callable);
-
- BranchCreationResponse creationResponse = new BranchCreationResponse(newBranch.getUuid());
- return creationResponse;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/PurgeBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/PurgeBranchCallable.java
deleted file mode 100644
index 19b853acae..0000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/PurgeBranchCallable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.manager.servlet.branch;
-
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.PurgeBranchRequest;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-
-/**
- * @author Roberto E. Escobar
- */
-public class PurgeBranchCallable extends AbstractBranchCallable<PurgeBranchRequest, Object> {
-
- public PurgeBranchCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi) {
- super(context, req, resp, translationService, orcsApi, "text/plain", CoreTranslatorId.PURGE_BRANCH_REQUEST, null);
- }
-
- @Override
- public Object executeCall(PurgeBranchRequest request) throws Exception {
- IOseeBranch toPurge = getBranchFromUuid(request.getBranchId());
- boolean recurse = request.isRecursive();
-
- Callable<?> callable = getBranchOps().purgeBranch(toPurge, recurse);
- callAndCheckForCancel(callable);
-
- return Boolean.TRUE;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java
index c7f4428a9e..523265b583 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java
@@ -23,7 +23,6 @@ import org.eclipse.osee.framework.manager.servlet.AdminServlet;
import org.eclipse.osee.framework.manager.servlet.ArtifactFileServlet;
import org.eclipse.osee.framework.manager.servlet.AtsServlet;
import org.eclipse.osee.framework.manager.servlet.BranchExchangeServlet;
-import org.eclipse.osee.framework.manager.servlet.BranchManagerServlet;
import org.eclipse.osee.framework.manager.servlet.ConfigurationServlet;
import org.eclipse.osee.framework.manager.servlet.DataServlet;
import org.eclipse.osee.framework.manager.servlet.OseeCacheServlet;
@@ -120,8 +119,6 @@ public class ServletRegistrationHandler {
register(new ArtifactFileServlet(logger, resourceManager, orcsApi, jdbcClient), "index");
register(new BranchExchangeServlet(logger, sessionManager, resourceManager, orcsApi),
OseeServerContext.BRANCH_EXCHANGE_CONTEXT);
- register(new BranchManagerServlet(logger, sessionManager, translationService, orcsApi),
- OseeServerContext.BRANCH_CONTEXT);
register(new SearchEngineTaggerServlet(logger, sessionManager, orcsApi), OseeServerContext.SEARCH_TAGGING_CONTEXT);
register(new SessionManagementServlet(logger, sessionManager, authenticationManager, activityLog),
OseeServerContext.SESSION_CONTEXT);

Back to the top