Skip to content

Commit

Permalink
update getObject methods (#53)
Browse files Browse the repository at this point in the history 
* update getObject methods

* fix errors
  • Loading branch information
@bischoffz
bischoffz committed Jun 5, 2024
1 parent bd99dee commit 9e71c46
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 13 deletions.
33 changes: 28 additions & 5 deletions core/src/main/java/gov/hhs/aspr/ms/taskit/core/TranslationController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public Builder addTranslationEngine(TranslationEngine translationEngine) {

this.data.parentChildClassRelationshipMap.put(childClassRef, parentClassRef);
}

return this;
}
}
Expand Down Expand Up @@ -412,10 +412,19 @@ <M extends U, U> void writeOutput(Path path, M object, Optional<Class<U>> superC
* </ul>
*/
public <T> T getFirstObject(Class<T> classRef) {
for (Object object : this.objects) {
int index = -1;
for (int i = 0; i < this.objects.size(); i++) {
Object object = this.objects.get(i);

if (classRef.isAssignableFrom(object.getClass())) {
return classRef.cast(object);
index = i;
break;
}

}

if (index > -1) {
return classRef.cast(this.objects.remove(index));
}

throw new ContractException(CoreTranslationError.UNKNOWN_CLASSREF);
Expand All @@ -429,20 +438,34 @@ public <T> T getFirstObject(Class<T> classRef) {
*/
public <T> List<T> getObjects(Class<T> classRef) {
List<T> objects = new ArrayList<>();
for (Object object : this.objects) {
for (int i = 0; i < this.objects.size(); i++) {
Object object = this.objects.get(i);

if (classRef.isAssignableFrom(object.getClass())) {
objects.add(classRef.cast(object));
}

}

this.objects.removeAll(objects);

return objects;
}

/**
* Returns the entire list of read in objects
*/
public List<Object> getObjects() {
return this.objects;
List<Object> objects = new ArrayList<>(this.objects);

this.objects.clear();

return objects;
}

// package access for testing
int getNumObjects() {
return this.objects.size();
}

}
33 changes: 25 additions & 8 deletions core/src/test/java/gov/hhs/aspr/ms/taskit/core/AT_TranslationController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import gov.hhs.aspr.ms.taskit.core.testsupport.TestTranslationEngine;
import gov.hhs.aspr.ms.taskit.core.testsupport.testcomplexobject.TestComplexAppObject;
import gov.hhs.aspr.ms.taskit.core.testsupport.testcomplexobject.TestComplexObjectTranslator;
import gov.hhs.aspr.ms.taskit.core.testsupport.testcomplexobject.input.TestComplexInputObject;
import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.TestAppChildObject;
import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.TestAppObject;
import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.TestObjectTranslator;
Expand Down Expand Up @@ -176,7 +177,7 @@ public void testReadInput() {

translationController.readInput();

assertTrue(translationController.getObjects().size() == 1);
assertEquals(1, translationController.getNumObjects());

TestAppObject actualTestAppObject = translationController.getFirstObject(TestAppObject.class);

Expand Down Expand Up @@ -350,8 +351,10 @@ public void testWriteOutput_Base() {
@UnitTestMethod(target = TranslationController.class, name = "getFirstObject", args = { Class.class })
public void testGetFirstObject() throws IOException {
String fileName = "getFirstObject-testOutput.json";
String fileName2 = "getFirstObject-testOutput2.json";

ResourceHelper.createFile(filePath, fileName);
ResourceHelper.createFile(filePath, fileName2);

TestTranslationEngine testTranslationEngine = TestTranslationEngine.builder()
.addTranslator(TestObjectTranslator.getTranslator())
Expand All @@ -360,18 +363,24 @@ public void testGetFirstObject() throws IOException {
TranslationController translationController = TranslationController.builder()
.addInputFilePath(filePath.resolve(fileName), TestInputObject.class,
TranslationEngineType.CUSTOM)
.addInputFilePath(filePath.resolve(fileName2), TestComplexInputObject.class,
TranslationEngineType.CUSTOM)
.addTranslationEngine(testTranslationEngine).build();

TestAppObject expectedAppObject = TestObjectUtil.generateTestAppObject();
TestComplexAppObject expectedComplexAppObject = TestObjectUtil.generateTestComplexAppObject();

translationController.writeOutput(expectedAppObject, filePath.resolve(fileName),
TranslationEngineType.CUSTOM);

translationController.readInput();
translationController.writeOutput(expectedComplexAppObject, filePath.resolve(fileName2),
TranslationEngineType.CUSTOM);

assertTrue(translationController.getObjects().size() == 1);
translationController.readInput();

assertEquals(2, translationController.getNumObjects());
TestAppObject actualTestAppObject = translationController.getFirstObject(TestAppObject.class);
assertEquals(1, translationController.getNumObjects());

assertNotNull(actualTestAppObject);

Expand All @@ -389,9 +398,11 @@ public void testGetFirstObject() throws IOException {
public void testGetObjects_OfClass() throws IOException {
String fileName = "GetObjects_OfClass_1-testOutput.json";
String fileName2 = "GetObjects_OfClass_2-testOutput.json";
String fileName3 = "GetObjects_OfClass_3-testOutput.json";

ResourceHelper.createFile(filePath, fileName);
ResourceHelper.createFile(filePath, fileName2);
ResourceHelper.createFile(filePath, fileName3);

TestTranslationEngine testTranslationEngine = TestTranslationEngine.builder()
.addTranslator(TestObjectTranslator.getTranslator())
Expand All @@ -402,27 +413,33 @@ public void testGetObjects_OfClass() throws IOException {
TranslationEngineType.CUSTOM)
.addInputFilePath(filePath.resolve(fileName2), TestInputObject.class,
TranslationEngineType.CUSTOM)
.addInputFilePath(filePath.resolve(fileName3), TestComplexInputObject.class,
TranslationEngineType.CUSTOM)
.addTranslationEngine(testTranslationEngine).build();

List<TestAppObject> expectedObjects = TestObjectUtil.getListOfAppObjects(2);
TestComplexAppObject expectedComplexAppObject = TestObjectUtil.generateTestComplexAppObject();

translationController.writeOutput(expectedObjects.get(0), filePath.resolve(fileName),
TranslationEngineType.CUSTOM);
translationController.writeOutput(expectedObjects.get(1), filePath.resolve(fileName2),
TranslationEngineType.CUSTOM);
translationController.writeOutput(expectedComplexAppObject, filePath.resolve(fileName3),
TranslationEngineType.CUSTOM);

translationController.readInput();

assertEquals(2, translationController.getObjects().size());
assertEquals(3, translationController.getNumObjects());

List<TestAppObject> actualObjects = translationController.getObjects(TestAppObject.class);
assertEquals(1, translationController.getNumObjects());

assertEquals(2, actualObjects.size());

assertTrue(actualObjects.containsAll(expectedObjects));

List<TestComplexAppObject> actualObjects2 = translationController
.getObjects(TestComplexAppObject.class);
List<TestAppObject> actualObjects2 = translationController
.getObjects(TestAppObject.class);
assertTrue(actualObjects2.isEmpty());
}

Expand Down Expand Up @@ -455,10 +472,10 @@ public void testGetObjects() throws IOException {

translationController.readInput();

assertEquals(2, translationController.getObjects().size());
assertEquals(2, translationController.getNumObjects());

List<Object> actualObjects = translationController.getObjects();

assertEquals(0, translationController.getNumObjects());
assertEquals(2, actualObjects.size());

assertTrue(actualObjects.containsAll(expectedObjects));
Expand Down

0 comments on commit 9e71c46

Please sign in to comment.