Copy properties when cloning a ModelObject (#110)

* Copy properties when cloning a ModelObject

Fixes #107

Signed-off-by: Gary O'Neall <[email protected]>

Author: goneall

src/main/java/org/spdx/library/model/ModelObject.java

@@ -1002,8 +1002,20 @@ public boolean equals(Object o) {
 	 * @return
 	 */
 	public ModelObject clone(IModelStore modelStore) {
+		if (Objects.isNull(this.copyManager)) {
+			throw new IllegalStateException("A copy manager must be provided to clone");
+		}
+		if (this.modelStore.equals(modelStore)) {
+			throw new IllegalStateException("Can not clone to the same model store");
+		}
+		Objects.requireNonNull(modelStore, "Model store for clone must not be null");
+		if (modelStore.exists(this.documentUri, this.id)) {
+			throw new IllegalStateException("Can not clone - "+this.id+" already exists.");
+		}
 		try {
-			return SpdxModelFactory.createModelObject(modelStore, this.documentUri, this.id, this.getType(), this.copyManager);
+			ModelObject retval = SpdxModelFactory.createModelObject(modelStore, this.documentUri, this.id, this.getType(), this.copyManager);
+			retval.copyFrom(this);
+			return retval;
 		} catch (InvalidSPDXAnalysisException e) {
 			throw new RuntimeException(e);
 		}

src/test/java/org/spdx/library/model/ModelObjectTest.java

@@ -715,6 +715,8 @@ public void testClone() throws InvalidSPDXAnalysisException {
 		ModelObject result = gmo.clone(store2);
 		assertTrue(result instanceof GenericModelObject);
 		assertEquals(result, gmo);
+		assertTrue(result.equivalent(gmo));
+		assertTrue(gmo.equivalent(result));
 	}
 
 	/**