Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrescobar2010-09-15 20:36:16 -0400
committerRyan D. Brooks2010-09-15 20:36:16 -0400
commitb4556476ff9a54a6ea475be9ad17686a03649c4a (patch)
tree3391f2fb90401008050ce6684d60143e6311683d /plugins
parent08eee9aefa627a8d6455e556da0d74b1d3776d4b (diff)
downloadorg.eclipse.osee-b4556476ff9a54a6ea475be9ad17686a03649c4a.tar.gz
org.eclipse.osee-b4556476ff9a54a6ea475be9ad17686a03649c4a.tar.xz
org.eclipse.osee-b4556476ff9a54a6ea475be9ad17686a03649c4a.zip
refactor: Warnings clean-up for framework.core.message.test
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/AllCoreMessageTestSuite.java7
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/ChangeItemUtilTest.java3
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/DataTestSuite.java21
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/ChangeTestUtility.java3
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java23
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockOseeModelFactoryServiceProvider.java3
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeArchivedStateRequestTranslatorTest.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeStateRequestTranslatorTest.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchChangeTypeRequestTranslatorTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitRequestTranslatorTest.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCommitResponseTranslatorTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCreationRequestTranslatorTest.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/BranchCreationResponseTranslatorTest.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/CacheUpdateRequestTranslatorTest.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeItemTranslatorTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeReportResponseTranslatorTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeVersionTranslatorTest.java3
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DatastoreInitRequestTranslatorTest.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelResponseTranslatorTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/PurgeBranchRequestTranslatorTest.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/SearchRequestTranslatorTest.java54
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TableDataTranslatorTest.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java3
-rw-r--r--plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java3
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchOptions.java (renamed from plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/SearchOptions.java)0
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpSearchInfo.java74
27 files changed, 109 insertions, 148 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/AllCoreMessageTestSuite.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/AllCoreMessageTestSuite.java
index dd5c9cf69c..14cccaf0ac 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/AllCoreMessageTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/AllCoreMessageTestSuite.java
@@ -16,13 +16,10 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({//
-DataTestSuite.class, //
- TranslationTestSuite.class, //
-})
+@Suite.SuiteClasses({DataTestSuite.class, TranslationTestSuite.class,})
/**
* @author Roberto E. Escobar
*/
public class AllCoreMessageTestSuite {
-
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/ChangeItemUtilTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/ChangeItemUtilTest.java
index 780bd873e7..8285509df3 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/ChangeItemUtilTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/ChangeItemUtilTest.java
@@ -35,9 +35,6 @@ import org.junit.Test;
*/
public class ChangeItemUtilTest {
- public ChangeItemUtilTest() {
- }
-
@Test
public void testGetSet() {
ChangeVersion base = ChangeTestUtility.createChange(1111L, ModificationType.NEW);
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 9ecbc18e80..09d9b18bdc 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,19 +15,18 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({ //
-BranchCommitRequestTest.class, //
- BranchCommitResponseTest.class, //
- CacheUpdateRequestTest.class, //
- ChangeItemTest.class, //
- ChangeItemUtilTest.class, //
- ChangeVersionTest.class, //
- PurgeBranchRequestTest.class, //
- TransactionCacheUpdateResponseTest.class, //
-})
+@Suite.SuiteClasses({
+ BranchCommitRequestTest.class,
+ BranchCommitResponseTest.class,
+ CacheUpdateRequestTest.class,
+ ChangeItemTest.class,
+ ChangeItemUtilTest.class,
+ ChangeVersionTest.class,
+ PurgeBranchRequestTest.class,
+ TransactionCacheUpdateResponseTest.class,})
/**
* @author Roberto E. Escobar
*/
public class DataTestSuite {
-
+ // Test Suite
}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/ChangeTestUtility.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/ChangeTestUtility.java
index e2fff09d6b..a8dc8a891b 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/ChangeTestUtility.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/ChangeTestUtility.java
@@ -18,9 +18,10 @@ import org.junit.Assert;
/**
* @author Roberto E. Escobar
*/
-public class ChangeTestUtility {
+public final class ChangeTestUtility {
private ChangeTestUtility() {
+ // Utility Class
}
public static ChangeVersion createChange(Long long1, ModificationType mod1) {
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 0ac02c9f26..9355cf2a0a 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
@@ -43,9 +43,10 @@ import org.eclipse.osee.framework.jdk.core.util.Compare;
public final class DataAsserts {
private DataAsserts() {
+ // Utility Class
}
- public static void assertEquals(ChangeItem expected, ChangeItem actual) throws OseeCoreException {
+ public static void assertEquals(ChangeItem expected, ChangeItem actual) {
if (expected == null) {
Assert.assertNull(actual);
} else {
@@ -60,7 +61,7 @@ public final class DataAsserts {
}
}
- public static void assertEquals(AttributeType expected, AttributeType actual) throws OseeCoreException {
+ public static void assertEquals(AttributeType expected, AttributeType actual) {
Assert.assertEquals(expected.getAttributeProviderId(), actual.getAttributeProviderId());
Assert.assertEquals(expected.getBaseAttributeTypeId(), actual.getBaseAttributeTypeId());
Assert.assertEquals(expected.getDefaultValue(), actual.getDefaultValue());
@@ -74,7 +75,7 @@ public final class DataAsserts {
Assert.assertEquals(expected.getOseeEnumType(), actual.getOseeEnumType());
}
- public static void assertEquals(ArtifactType expected, ArtifactType actual) throws OseeCoreException {
+ public static void assertEquals(ArtifactType expected, ArtifactType actual) {
Assert.assertEquals(expected.getId(), actual.getId());
Assert.assertEquals(expected.getName(), actual.getName());
Assert.assertEquals(expected.isAbstract(), actual.isAbstract());
@@ -96,7 +97,7 @@ public final class DataAsserts {
}
}
- public static void assertEquals(TransactionRecord expected, TransactionRecord actual) throws OseeCoreException {
+ public static void assertEquals(TransactionRecord expected, TransactionRecord actual) {
if (expected == null) {
Assert.assertNull(actual);
} else {
@@ -121,7 +122,7 @@ public final class DataAsserts {
}
}
- public static void assertEquals(BranchCommitRequest expected, BranchCommitRequest actual) throws OseeCoreException {
+ public static void assertEquals(BranchCommitRequest expected, BranchCommitRequest actual) {
if (expected == null) {
Assert.assertNull(actual);
} else {
@@ -132,7 +133,7 @@ public final class DataAsserts {
}
}
- public static void assertEquals(BranchCommitResponse expected, BranchCommitResponse actual) throws OseeCoreException {
+ public static void assertEquals(BranchCommitResponse expected, BranchCommitResponse actual) {
if (expected == null) {
Assert.assertNull(actual);
} else {
@@ -149,7 +150,7 @@ public final class DataAsserts {
}
}
- public static void assertEquals(RelationType expected, RelationType actual) throws OseeCoreException {
+ public static void assertEquals(RelationType expected, RelationType actual) {
if (expected == null) {
Assert.assertNull(actual);
} else {
@@ -239,7 +240,7 @@ public final class DataAsserts {
}
}
- public static void assertEquals(PurgeBranchRequest expected, PurgeBranchRequest actual) throws OseeCoreException {
+ public static void assertEquals(PurgeBranchRequest expected, PurgeBranchRequest actual) {
if (expected == null) {
Assert.assertNull(actual);
} else {
@@ -253,7 +254,7 @@ public final class DataAsserts {
Assert.assertFalse(Compare.isDifferent(expected.getRows(), actual.getRows()));
}
- public static void assertEquals(ChangeBranchTypeRequest expected, ChangeBranchTypeRequest actual) throws OseeCoreException {
+ public static void assertEquals(ChangeBranchTypeRequest expected, ChangeBranchTypeRequest actual) {
if (expected == null) {
Assert.assertNull(actual);
} else {
@@ -262,7 +263,7 @@ public final class DataAsserts {
}
}
- public static void assertEquals(ChangeBranchArchiveStateRequest expected, ChangeBranchArchiveStateRequest actual) throws OseeCoreException {
+ public static void assertEquals(ChangeBranchArchiveStateRequest expected, ChangeBranchArchiveStateRequest actual) {
if (expected == null) {
Assert.assertNull(actual);
} else {
@@ -271,7 +272,7 @@ public final class DataAsserts {
}
}
- public static void assertEquals(ChangeBranchStateRequest expected, ChangeBranchStateRequest actual) throws OseeCoreException {
+ public static void assertEquals(ChangeBranchStateRequest expected, ChangeBranchStateRequest actual) {
if (expected == null) {
Assert.assertNull(actual);
} else {
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockOseeModelFactoryServiceProvider.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockOseeModelFactoryServiceProvider.java
index a89d69e451..5ab0bdaf6a 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockOseeModelFactoryServiceProvider.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockOseeModelFactoryServiceProvider.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.message.test.mocks;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryServiceProvider;
@@ -26,7 +25,7 @@ public class MockOseeModelFactoryServiceProvider implements IOseeModelFactorySer
}
@Override
- public IOseeModelFactoryService getOseeFactoryService() throws OseeCoreException {
+ public IOseeModelFactoryService getOseeFactoryService() {
return service;
}
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
index 8aa299f182..8549d12147 100644
--- 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
@@ -14,7 +14,6 @@ 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.exception.OseeCoreException;
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;
@@ -36,12 +35,12 @@ public class BranchChangeArchivedStateRequestTranslatorTest extends BaseTranslat
}
@Override
- protected void checkEquals(ChangeBranchArchiveStateRequest expected, ChangeBranchArchiveStateRequest actual) throws OseeCoreException {
+ protected void checkEquals(ChangeBranchArchiveStateRequest expected, ChangeBranchArchiveStateRequest actual) {
DataAsserts.assertEquals(expected, actual);
}
@Parameters
- public static Collection<Object[]> data() throws OseeCoreException {
+ public static Collection<Object[]> data() {
List<Object[]> data = new ArrayList<Object[]>();
ITranslator<ChangeBranchArchiveStateRequest> translator = new BranchChangeArchivedStateRequestTranslator();
int state = 0;
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
index d019387bc7..1d44c79dd5 100644
--- 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
@@ -14,7 +14,6 @@ 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.exception.OseeCoreException;
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;
@@ -36,12 +35,12 @@ public class BranchChangeStateRequestTranslatorTest extends BaseTranslatorTest<C
}
@Override
- protected void checkEquals(ChangeBranchStateRequest expected, ChangeBranchStateRequest actual) throws OseeCoreException {
+ protected void checkEquals(ChangeBranchStateRequest expected, ChangeBranchStateRequest actual) {
DataAsserts.assertEquals(expected, actual);
}
@Parameters
- public static Collection<Object[]> data() throws OseeCoreException {
+ public static Collection<Object[]> data() {
List<Object[]> data = new ArrayList<Object[]>();
ITranslator<ChangeBranchStateRequest> translator = new BranchChangeStateRequestTranslator();
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
index dfaab4c660..a188459de0 100644
--- 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
@@ -37,7 +37,7 @@ public class BranchChangeTypeRequestTranslatorTest extends BaseTranslatorTest<Ch
}
@Override
- protected void checkEquals(ChangeBranchTypeRequest expected, ChangeBranchTypeRequest actual) throws OseeCoreException {
+ protected void checkEquals(ChangeBranchTypeRequest expected, ChangeBranchTypeRequest actual) {
DataAsserts.assertEquals(expected, actual);
}
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
index 50bebf48e9..09d43d24ff 100644
--- 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
@@ -13,7 +13,6 @@ 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.exception.OseeCoreException;
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;
@@ -35,12 +34,12 @@ public class BranchCommitRequestTranslatorTest extends BaseTranslatorTest<Branch
}
@Override
- protected void checkEquals(BranchCommitRequest expected, BranchCommitRequest actual) throws OseeCoreException {
+ protected void checkEquals(BranchCommitRequest expected, BranchCommitRequest actual) {
DataAsserts.assertEquals(expected, actual);
}
@Parameters
- public static Collection<Object[]> data() throws OseeCoreException {
+ public static Collection<Object[]> data() {
List<Object[]> data = new ArrayList<Object[]>();
ITranslator<BranchCommitRequest> translator = new BranchCommitRequestTranslator();
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
index 6d3d3c8dd0..46c5a62e0a 100644
--- 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
@@ -42,7 +42,7 @@ public class BranchCommitResponseTranslatorTest extends BaseTranslatorTest<Branc
}
@Override
- protected void checkEquals(BranchCommitResponse expected, BranchCommitResponse actual) throws OseeCoreException {
+ protected void checkEquals(BranchCommitResponse expected, BranchCommitResponse actual) {
DataAsserts.assertEquals(expected, actual);
}
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
index a73645ec5a..ed869295f1 100644
--- 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
@@ -13,7 +13,6 @@ 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.exception.OseeCoreException;
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;
@@ -37,13 +36,13 @@ public class BranchCreationRequestTranslatorTest extends BaseTranslatorTest<Bran
}
@Override
- protected void checkEquals(BranchCreationRequest expected, BranchCreationRequest actual) throws OseeCoreException {
+ protected void checkEquals(BranchCreationRequest expected, BranchCreationRequest actual) {
Assert.assertNotSame(expected, actual);
DataAsserts.assertEquals(expected, actual);
}
@Parameters
- public static Collection<Object[]> data() throws OseeCoreException {
+ public static Collection<Object[]> data() {
List<Object[]> data = new ArrayList<Object[]>();
ITranslator<BranchCreationRequest> translator = new BranchCreationRequestTranslator();
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
index 8ac629bd5a..46d82f625a 100644
--- 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
@@ -13,7 +13,6 @@ 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.exception.OseeCoreException;
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;
@@ -37,13 +36,13 @@ public class BranchCreationResponseTranslatorTest extends BaseTranslatorTest<Bra
}
@Override
- protected void checkEquals(BranchCreationResponse expected, BranchCreationResponse actual) throws OseeCoreException {
+ protected void checkEquals(BranchCreationResponse expected, BranchCreationResponse actual) {
Assert.assertNotSame(expected, actual);
DataAsserts.assertEquals(expected, actual);
}
@Parameters
- public static Collection<Object[]> data() throws OseeCoreException {
+ public static Collection<Object[]> data() {
List<Object[]> data = new ArrayList<Object[]>();
ITranslator<BranchCreationResponse> translator = new BranchCreationResponseTranslator();
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/CacheUpdateRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/CacheUpdateRequestTranslatorTest.java
index 51e3e0c7bd..5e0e0980f5 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/CacheUpdateRequestTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/CacheUpdateRequestTranslatorTest.java
@@ -15,7 +15,6 @@ import java.util.Collection;
import java.util.List;
import junit.framework.Assert;
import org.eclipse.osee.framework.core.enums.OseeCacheEnum;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.message.CacheUpdateRequest;
import org.eclipse.osee.framework.core.message.internal.translation.CacheUpdateRequestTranslator;
import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
@@ -39,13 +38,13 @@ public class CacheUpdateRequestTranslatorTest extends BaseTranslatorTest<CacheUp
}
@Override
- protected void checkEquals(CacheUpdateRequest expected, CacheUpdateRequest actual) throws OseeCoreException {
+ protected void checkEquals(CacheUpdateRequest expected, CacheUpdateRequest actual) {
Assert.assertNotSame(expected, actual);
DataAsserts.assertEquals(expected, actual);
}
@Parameters
- public static Collection<Object[]> data() throws OseeCoreException {
+ public static Collection<Object[]> data() {
CacheUpdateRequestTranslator translator = new CacheUpdateRequestTranslator();
List<Object[]> data = new ArrayList<Object[]>();
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeItemTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeItemTranslatorTest.java
index eef6db873a..24b0cbf4af 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeItemTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeItemTranslatorTest.java
@@ -41,7 +41,7 @@ public class ChangeItemTranslatorTest extends BaseTranslatorTest<ChangeItem> {
}
@Override
- protected void checkEquals(ChangeItem expected, ChangeItem actual) throws OseeCoreException {
+ protected void checkEquals(ChangeItem expected, ChangeItem actual) {
Assert.assertNotSame(expected, actual);
DataAsserts.assertEquals(expected, actual);
}
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
index 3ed3ccdc00..3465fec5d6 100644
--- 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
@@ -42,7 +42,7 @@ public class ChangeReportResponseTranslatorTest extends BaseTranslatorTest<Chang
}
@Override
- protected void checkEquals(ChangeReportResponse expected, ChangeReportResponse actual) throws OseeCoreException {
+ protected void checkEquals(ChangeReportResponse expected, ChangeReportResponse actual) {
List<ChangeItem> expectedChangeItems = expected.getChangeItems();
List<ChangeItem> actualChangeItems = actual.getChangeItems();
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeVersionTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeVersionTranslatorTest.java
index 19a79d2036..a3b2b67644 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeVersionTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/ChangeVersionTranslatorTest.java
@@ -15,7 +15,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import junit.framework.Assert;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.message.ChangeVersion;
import org.eclipse.osee.framework.core.message.internal.translation.ChangeVersionTranslator;
import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
@@ -38,7 +37,7 @@ public class ChangeVersionTranslatorTest extends BaseTranslatorTest<ChangeVersio
}
@Override
- protected void checkEquals(ChangeVersion expected, ChangeVersion actual) throws OseeCoreException {
+ protected void checkEquals(ChangeVersion expected, ChangeVersion actual) {
Assert.assertNotSame(expected, actual);
DataAsserts.assertEquals(expected, actual);
}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DatastoreInitRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DatastoreInitRequestTranslatorTest.java
index e13c204ba3..e1b775a28f 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DatastoreInitRequestTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DatastoreInitRequestTranslatorTest.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import junit.framework.Assert;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.message.DatastoreInitRequest;
import org.eclipse.osee.framework.core.message.TableData;
import org.eclipse.osee.framework.core.message.internal.translation.DatastoreInitRequestTranslator;
@@ -37,13 +36,13 @@ public class DatastoreInitRequestTranslatorTest extends BaseTranslatorTest<Datas
}
@Override
- protected void checkEquals(DatastoreInitRequest expected, DatastoreInitRequest actual) throws OseeCoreException {
+ protected void checkEquals(DatastoreInitRequest expected, DatastoreInitRequest actual) {
Assert.assertNotSame(expected, actual);
DataAsserts.assertEquals(expected, actual);
}
@Parameters
- public static Collection<Object[]> data() throws OseeCoreException {
+ public static Collection<Object[]> data() {
ITranslator<DatastoreInitRequest> translator = new DatastoreInitRequestTranslator();
List<Object[]> data = new ArrayList<Object[]>();
data.add(new Object[] {new DatastoreInitRequest("tableData", "indexData", true), translator});
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java
index 1c78113b7d..abe41484c7 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import junit.framework.Assert;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.message.OseeImportModelRequest;
import org.eclipse.osee.framework.core.message.internal.translation.OseeImportModelRequestTranslator;
import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
@@ -36,13 +35,13 @@ public class OseeImportModelRequestTranslatorTest extends BaseTranslatorTest<Ose
}
@Override
- protected void checkEquals(OseeImportModelRequest expected, OseeImportModelRequest actual) throws OseeCoreException {
+ protected void checkEquals(OseeImportModelRequest expected, OseeImportModelRequest actual) {
Assert.assertNotSame(expected, actual);
DataAsserts.assertEquals(expected, actual);
}
@Parameters
- public static Collection<Object[]> data() throws OseeCoreException {
+ public static Collection<Object[]> data() {
ITranslator<OseeImportModelRequest> translator = new OseeImportModelRequestTranslator();
List<Object[]> data = new ArrayList<Object[]>();
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelResponseTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelResponseTranslatorTest.java
index 8d3385cee7..97bdf7d053 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelResponseTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelResponseTranslatorTest.java
@@ -42,7 +42,7 @@ public class OseeImportModelResponseTranslatorTest extends BaseTranslatorTest<Os
}
@Override
- protected void checkEquals(OseeImportModelResponse expected, OseeImportModelResponse actual) throws OseeCoreException {
+ protected void checkEquals(OseeImportModelResponse expected, OseeImportModelResponse actual) {
Assert.assertNotSame(expected, actual);
Assert.assertNotNull(actual);
DataAsserts.assertEquals(expected, actual);
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
index 748ffb1c1e..d8b179b8f5 100644
--- 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
@@ -13,7 +13,6 @@ 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.exception.OseeCoreException;
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;
@@ -36,12 +35,12 @@ public class PurgeBranchRequestTranslatorTest extends BaseTranslatorTest<PurgeBr
}
@Override
- protected void checkEquals(PurgeBranchRequest expected, PurgeBranchRequest actual) throws OseeCoreException {
+ protected void checkEquals(PurgeBranchRequest expected, PurgeBranchRequest actual) {
DataAsserts.assertEquals(expected, actual);
}
@Parameters
- public static Collection<Object[]> data() throws OseeCoreException {
+ public static Collection<Object[]> data() {
List<Object[]> data = new ArrayList<Object[]>();
ITranslator<PurgeBranchRequest> translator = new PurgeBranchRequestTranslator();
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/SearchRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/SearchRequestTranslatorTest.java
new file mode 100644
index 0000000000..ba3ee640e7
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/SearchRequestTranslatorTest.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * 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.internal.translation.TransactionRecordTranslator;
+import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
+import org.eclipse.osee.framework.core.model.TransactionRecord;
+import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
+import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory;
+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 TransactionRecordTranslator}
+ *
+ * @author Roberto E. Escobar
+ */
+@RunWith(Parameterized.class)
+public class SearchRequestTranslatorTest extends BaseTranslatorTest<TransactionRecord> {
+
+ public SearchRequestTranslatorTest(TransactionRecord data, ITranslator<TransactionRecord> translator) {
+ super(data, translator);
+ }
+
+ @Override
+ protected void checkEquals(TransactionRecord expected, TransactionRecord actual) {
+ Assert.assertNotSame(expected, actual);
+ DataAsserts.assertEquals(expected, actual);
+ }
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ ITranslator<TransactionRecord> translator = new TransactionRecordTranslator(new TransactionRecordFactory());
+ List<Object[]> data = new ArrayList<Object[]>();
+ for (int index = 1; index <= 2; index++) {
+ data.add(new Object[] {MockDataFactory.createTransaction(index * 10, index * 3), translator});
+ }
+ return data;
+ }
+}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TableDataTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TableDataTranslatorTest.java
index 7b24288042..5a4594d110 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TableDataTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TableDataTranslatorTest.java
@@ -15,7 +15,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import junit.framework.Assert;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.message.TableData;
import org.eclipse.osee.framework.core.message.internal.translation.TableDataTranslator;
import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
@@ -37,13 +36,13 @@ public class TableDataTranslatorTest extends BaseTranslatorTest<TableData> {
}
@Override
- protected void checkEquals(TableData expected, TableData actual) throws OseeCoreException {
+ protected void checkEquals(TableData expected, TableData actual) {
Assert.assertNotSame(expected, actual);
DataAsserts.assertEquals(expected, actual);
}
@Parameters
- public static Collection<Object[]> data() throws OseeCoreException {
+ public static Collection<Object[]> data() {
ITranslator<TableData> translator = new TableDataTranslator();
List<Object[]> data = new ArrayList<Object[]>();
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java
index 0c649a5378..16de15c8f4 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import junit.framework.Assert;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.message.TransactionCacheUpdateResponse;
import org.eclipse.osee.framework.core.message.internal.translation.TransactionCacheUpdateResponseTranslator;
import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
@@ -39,7 +38,7 @@ public class TransactionCacheUpdateResponseTranslatorTest extends BaseTranslator
}
@Override
- protected void checkEquals(TransactionCacheUpdateResponse expected, TransactionCacheUpdateResponse actual) throws OseeCoreException {
+ protected void checkEquals(TransactionCacheUpdateResponse expected, TransactionCacheUpdateResponse actual) {
Assert.assertNotSame(expected, actual);
List<TransactionRecord> expectedRows = expected.getTxRows();
List<TransactionRecord> actualRows = actual.getTxRows();
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java
index b55f2e5d24..c3762220f6 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionRecordTranslatorTest.java
@@ -13,7 +13,6 @@ 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.exception.OseeCoreException;
import org.eclipse.osee.framework.core.message.internal.translation.TransactionRecordTranslator;
import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
import org.eclipse.osee.framework.core.model.TransactionRecord;
@@ -38,7 +37,7 @@ public class TransactionRecordTranslatorTest extends BaseTranslatorTest<Transact
}
@Override
- protected void checkEquals(TransactionRecord expected, TransactionRecord actual) throws OseeCoreException {
+ protected void checkEquals(TransactionRecord expected, TransactionRecord actual) {
Assert.assertNotSame(expected, actual);
DataAsserts.assertEquals(expected, actual);
}
diff --git a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/SearchOptions.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchOptions.java
index 008806c58f..008806c58f 100644
--- a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/SearchOptions.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchOptions.java
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpSearchInfo.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpSearchInfo.java
deleted file mode 100644
index c1fff8941b..0000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpSearchInfo.java
+++ /dev/null
@@ -1,74 +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.data;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStoreWriter;
-import org.eclipse.osee.framework.search.engine.SearchOptions;
-import org.eclipse.osee.framework.search.engine.SearchOptions.SearchOptionsEnum;
-
-/**
- * @author Roberto E. Escobar
- */
-public class HttpSearchInfo {
-
- private final String branchId;
- private final String queryString;
- private final SearchOptions options;
- private final String[] attributeTypeGuids;
-
- private HttpSearchInfo(String branchId, SearchOptions options, String queryString, String... attributeTypeGuids) {
- super();
- this.branchId = branchId;
- this.options = options;
- this.queryString = queryString;
- this.attributeTypeGuids = attributeTypeGuids;
- }
-
- public String getQuery() {
- return queryString;
- }
-
- @Override
- public String toString() {
- return queryString;
- }
-
- public int getId() {
- return Integer.parseInt(this.branchId);
- }
-
- public SearchOptions getOptions() {
- return options;
- }
-
- public String[] getAttributeTypeGuids() {
- return attributeTypeGuids;
- }
-
- public static HttpSearchInfo loadFromPost(HttpServletRequest request) throws Exception {
- PropertyStore propertyStore = new PropertyStore(request.getParameter("sessionId"));
-
- PropertyStoreWriter propertyStoreWriter = new PropertyStoreWriter();
- propertyStoreWriter.load(propertyStore, request.getInputStream());
-
- SearchOptions options = new SearchOptions();
- options.put(SearchOptionsEnum.include_deleted.asStringOption(), propertyStore.get("include deleted"));
- options.put(SearchOptionsEnum.match_word_order.asStringOption(), propertyStore.get("match word order"));
- options.put(SearchOptionsEnum.as_xml.asStringOption(), propertyStore.get("as xml"));
- options.put(SearchOptionsEnum.find_all_locations.asStringOption(), propertyStore.get("find all locations"));
- options.put(SearchOptionsEnum.case_sensitive.asStringOption(), propertyStore.get("case sensitive"));
-
- String[] attributeTypeStrs = propertyStore.getArray("attributeType");
- return new HttpSearchInfo(propertyStore.get("branchId"), options, propertyStore.get("query"), attributeTypeStrs);
- }
-}

Back to the top