Remove dependency of Resource on CatalogResource

Author: kylstevenson

src/main/java/io/github/jpmorganchase/fusion/model/CatalogResource.java

@@ -1,7 +1,11 @@
 package io.github.jpmorganchase.fusion.model;
 
+import static io.github.jpmorganchase.fusion.model.VarArgsHelper.copyMap;
+
+import com.google.gson.annotations.Expose;
 import io.github.jpmorganchase.fusion.Fusion;
 import java.util.Arrays;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import lombok.EqualsAndHashCode;
@@ -14,36 +18,41 @@
 @Getter
 @ToString
 @EqualsAndHashCode
-public abstract class CatalogResource extends Resource {
+public abstract class CatalogResource {
 
     private final String identifier;
 
+    private final Map<String, Object> varArgs;
+
+    @Expose(serialize = false, deserialize = false)
+    private final Fusion fusion;
+
     private final String catalogIdentifier;
 
     public CatalogResource(String identifier, Map<String, Object> varArgs, Fusion fusion, String catalogIdentifier) {
-        super(varArgs, fusion);
+        this.varArgs = copyMap(varArgs);
         this.identifier = identifier;
+        this.fusion = fusion;
         this.catalogIdentifier = catalogIdentifier;
     }
 
     protected String getCatalogIdentifier() {
-        Fusion fusion = getFusion();
         if (catalogIdentifier == null && fusion != null) {
             return fusion.getDefaultCatalog();
         }
         return catalogIdentifier;
     }
 
     public String create() {
-        return this.getFusion().create(getApiPath(), this);
+        return this.fusion.create(getApiPath(), this);
     }
 
     public String update() {
-        return this.getFusion().update(getApiPath(), this);
+        return this.fusion.update(getApiPath(), this);
     }
 
     public String delete() {
-        return this.getFusion().delete(getApiPath());
+        return this.fusion.delete(getApiPath());
     }
 
     /**
@@ -54,14 +63,18 @@ public String delete() {
      */
     protected abstract String getApiPath();
 
+    public Map<String, Object> getVarArgs() {
+        return copyMap(varArgs);
+    }
+
     /**
      * Returns the registered attributes pertaining to this catalog resource.
      * A 'registered' attribute is essentially member variables belonging to the class.
      * It is expected that child classes will override, calling super to initialise and register attributes
      * @return set of attributes registered against this CatalogResource
      */
     public Set<String> getRegisteredAttributes() {
-        Set<String> registered = super.getRegisteredAttributes();
+        Set<String> registered = new LinkedHashSet<>();
         registered.addAll(VarArgsHelper.getFieldNames(CatalogResource.class));
         registered.addAll(Arrays.asList("@id", "@context", "@base"));
         return registered;

src/main/java/io/github/jpmorganchase/fusion/model/Resource.java

@@ -26,7 +26,7 @@ public static Map<String, Object> initializeMap() {
         return new HashMap<>();
     }
 
-    public static Set<String> getFieldNames(Class<? extends Resource> resourceClass) {
+    public static Set<String> getFieldNames(Class<? extends CatalogResource> resourceClass) {
         if (resourceClass == null) {
             // Explicitly return an empty set to handle null input
             return Collections.emptySet();

src/main/java/io/github/jpmorganchase/fusion/model/VarArgsHelper.java

@@ -215,7 +215,7 @@ private ParsingException generateNoResourceException() {
         return new ParsingException(message);
     }
 
-    private <T extends Resource> T parseResourceWithVarArgs(
+    private <T extends CatalogResource> T parseResourceWithVarArgs(
             Set<String> excludes, T obj, Map<String, Object> untypedResource, ResourceMutationFactory<T> mutator) {
 
         Map<String, Object> varArgs = getVarArgsToInclude(untypedResource, excludes);

src/main/java/io/github/jpmorganchase/fusion/parsing/GsonAPIResponseParser.java

@@ -1,8 +1,8 @@
 package io.github.jpmorganchase.fusion.serializing.mutation;
 
-import io.github.jpmorganchase.fusion.model.Resource;
+import io.github.jpmorganchase.fusion.model.CatalogResource;
 
 @FunctionalInterface
-public interface ResourceMutationFactory<T extends Resource> {
+public interface ResourceMutationFactory<T extends CatalogResource> {
     T mutate(T resource, MutationContext mc);
 }