Merge pull request Sage-Bionetworks#47 from john-hill/PLFM-6906

throw IllegalArgument for wrong concreteType

Author: marcomarasca

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.sagebionetworks</groupId>
 	<artifactId>schema-to-pojo</artifactId>
-	<version>0.6.7</version>
+	<version>0.6.8</version>
 	<packaging>pom</packaging>
 	<name>schema-to-pojo</name>
 	<description>Container for the rest of the sub-projects</description>

schema-to-pojo-core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>schema-to-pojo</artifactId>
 		<groupId>org.sagebionetworks</groupId>
-		<version>0.6.7</version>
+		<version>0.6.8</version>
 	</parent>
 	<artifactId>schema-to-pojo-core</artifactId>
 	<name>schema-to-pojo-core</name>

schema-to-pojo-gwt/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>schema-to-pojo</artifactId>
 		<groupId>org.sagebionetworks</groupId>
-		<version>0.6.7</version>
+		<version>0.6.8</version>
 	</parent>
 	<artifactId>schema-to-pojo-gwt</artifactId>
 	<packaging>jar</packaging>

schema-to-pojo-integration-tests/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>schema-to-pojo</artifactId>
 		<groupId>org.sagebionetworks</groupId>
-		<version>0.6.7</version>
+		<version>0.6.8</version>
 	</parent>
 	<artifactId>schema-to-pojo-integration-tests</artifactId>
 	<name>schema-to-pojo-integration-tests</name>

schema-to-pojo-integration-tests/src/test/java/org/sagebionetworks/jstp20/InterfaceTest.java

@@ -45,12 +45,12 @@ public void testInterfaceWithMissingConcreteType() throws IOException, JSONObjec
 		// The interfaceField should have a concreteType since it's defined as a SomeInterface that does not have a default concrete type
 		String json = "{\"interfaceField\":{\"fromOne\":\"123\"}}";
 
-		JSONObjectAdapterException ex = assertThrows(JSONObjectAdapterException.class, () -> {
+		String message = assertThrows(IllegalArgumentException.class, () -> {
 			// Call under test
 			EntityFactory.createEntityFromJSONString(json, HasInterfaceField.class);
-		});
+		}).getMessage();
 
-		assertEquals("Missing 'concreteType' property, cannot discriminate polymorphic type org.sagebionetworks.jstp20.SomeInterface", ex.getCause().getMessage());
+		assertEquals("Missing 'concreteType' property, cannot discriminate polymorphic type org.sagebionetworks.jstp20.SomeInterface", message);
 
 	}
 
@@ -105,12 +105,12 @@ public void testArraOfInterfaces() throws JSONObjectAdapterException{
 	public void testArrayOfInterfacesWithMissingConcreteType() throws JSONObjectAdapterException {
 		String json = "{\"list\":[{\"concreteType\":\"org.sagebionetworks.jstp20.OneImpl\",\"fromOne\":\"123\"},{\"fromOne\":\"456\"}]}";
 
-		JSONObjectAdapterException ex = assertThrows(JSONObjectAdapterException.class, () -> {
+		String message = assertThrows(IllegalArgumentException.class, () -> {
 			// Call under test
 			EntityFactory.createEntityFromJSONString(json, HasListOfInterface.class);
-		});
+		}).getMessage();
 
-		assertEquals("Missing 'concreteType' property, cannot discriminate polymorphic type org.sagebionetworks.jstp20.SomeInterface", ex.getCause().getMessage());
+		assertEquals("Missing 'concreteType' property, cannot discriminate polymorphic type org.sagebionetworks.jstp20.SomeInterface", message);
 
 	}
 

schema-to-pojo-lib/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>schema-to-pojo</artifactId>
 		<groupId>org.sagebionetworks</groupId>
-		<version>0.6.7</version>
+		<version>0.6.8</version>
 	</parent>
 	<artifactId>schema-to-pojo-lib</artifactId>
 	<name>schema-to-pojo-lib</name>

schema-to-pojo-maven-plugin/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>schema-to-pojo</artifactId>
 		<groupId>org.sagebionetworks</groupId>
-		<version>0.6.7</version>
+		<version>0.6.8</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>schema-to-pojo-maven-plugin</artifactId>

schema-to-pojo-org-json/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>schema-to-pojo</artifactId>
 		<groupId>org.sagebionetworks</groupId>
-		<version>0.6.7</version>
+		<version>0.6.8</version>
 	</parent>
 	<artifactId>schema-to-pojo-org-json</artifactId>
 	<name>schema-to-pojo-org-json</name>

schema-to-pojo-org-json/src/main/java/org/sagebionetworks/schema/adapter/org/json/EntityFactory.java

@@ -159,12 +159,18 @@ private static <T extends JSONEntity> T createEntityFromAdapter(Class<? extends
 			if(clazz.isInterface()){
 				String concreteType = extractConcreteType(adapter, clazz);
 				// Use the concrete type to instantiate the object.
-				newInstance = (T) Class.forName(concreteType).newInstance();
+				try {
+					newInstance = (T) Class.forName(concreteType).newInstance();
+				} catch (ClassNotFoundException e) {
+					throw new IllegalArgumentException(String.format("Unknown %s : '%s'",ObjectSchema.CONCRETE_TYPE, concreteType), e);
+				}
 			}else{
 				newInstance = clazz.newInstance();
 			}
 			newInstance.initializeFromJSONObject(adapter);
 			return newInstance;
+		}  catch (IllegalArgumentException e) {
+			throw e;
 		} catch (Exception e) {
 			throw new JSONObjectAdapterException(e);
 		}

schema-to-pojo-org-json/src/test/java/org/sagebionetworks/schema/adapter/org/json/EntityFactoryTest.java

@@ -10,6 +10,7 @@
 
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
+import org.sagebionetworks.schema.ObjectSchema;
 import org.sagebionetworks.schema.adapter.JSONEntity;
 import org.sagebionetworks.schema.adapter.JSONObjectAdapterException;
 
@@ -221,4 +222,18 @@ public void testReadFromJSONArrayStringWithNullClazz() throws JSONObjectAdapterE
 		}).getMessage();
 		assertEquals("JSONEntity class cannot be null", message);
 	}
+	
+	/**
+	 * Test added for PLFM-6906
+	 * @throws JSONObjectAdapterException
+	 */
+	@Test
+	public void testCreateEntityFromJSONStringWithClassNotFound() throws JSONObjectAdapterException {
+		JSONObject jsonEntity = new JSONObject();
+		jsonEntity.put(ObjectSchema.CONCRETE_TYPE, "not.a.real.class");
+		String message = assertThrows(IllegalArgumentException.class, ()->{
+			EntityFactory.createEntityFromJSONObject(jsonEntity, SimpleInterface.class);
+		}).getMessage();
+		assertEquals("Unknown concreteType : 'not.a.real.class'", message);
+	}
 }