SHIBUI-521(545): Refactoring to polymorphic JSON serialization of met…

…adata resolvers

Work in progress...

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/DynamicHttpMetadataResolver.java

@@ -21,6 +21,8 @@
 @ToString
 public class DynamicHttpMetadataResolver extends MetadataResolver {
 
+
+
     public static final String DEFAULT_TIMEOUT = "PT5S";
 
     @Embedded
@@ -38,6 +40,7 @@ public class DynamicHttpMetadataResolver extends MetadataResolver {
     private List<String> supportedContentTypes;
 
     public DynamicHttpMetadataResolver() {
+        type = "DynamicHttpMetadataResolver";
         this.httpMetadataResolverAttributes = new HttpMetadataResolverAttributes();
         this.httpMetadataResolverAttributes.setConnectionRequestTimeout(DEFAULT_TIMEOUT);
         this.httpMetadataResolverAttributes.setConnectionTimeout(DEFAULT_TIMEOUT);

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FileBackedHttpMetadataResolver.java

@@ -11,12 +11,15 @@
 
 @Entity
 @EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
 @Getter
 @Setter
 @ToString
 public class FileBackedHttpMetadataResolver extends MetadataResolver {
 
+    public FileBackedHttpMetadataResolver() {
+        type = "FileBackedHttpMetadataResolver";
+    }
+
     private String metadataURL;
 
     private String backingFile;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/LocalDynamicMetadataResolver.java

@@ -2,7 +2,6 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
@@ -11,12 +10,15 @@
 
 @Entity
 @EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
 @Getter
 @Setter
 @ToString
 public class LocalDynamicMetadataResolver extends MetadataResolver {
 
+    public LocalDynamicMetadataResolver() {
+        type = "LocalDynamicMetadataResolver";
+    }
+
     private String sourceDirectory;
 
     private String sourceManagerRef;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java

@@ -1,5 +1,8 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable;
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.MetadataFilter;
 import lombok.EqualsAndHashCode;
@@ -22,17 +25,25 @@
 
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-@EqualsAndHashCode(callSuper = true, exclude={"version"})
+@EqualsAndHashCode(callSuper = true, exclude = {"version"})
 @NoArgsConstructor
 @Getter
 @Setter
 @ToString
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "@type", visible = true)
+@JsonSubTypes({@JsonSubTypes.Type(value = LocalDynamicMetadataResolver.class, name = "LocalDynamicMetadataResolver"),
+        @JsonSubTypes.Type(value = FileBackedHttpMetadataResolver.class, name = "FileBackedHttpMetadataResolver"),
+        @JsonSubTypes.Type(value = DynamicHttpMetadataResolver.class, name = "DynamicHttpMetadataResolver")})
 public class MetadataResolver extends AbstractAuditable {
 
-    @Column(unique=true)
+    @JsonProperty("@type")
+    @Transient
+    String type;
+
+    @Column(unique = true)
     private String name;
 
-    @Column(unique=true)
+    @Column(unique = true)
     private String resourceId = UUID.randomUUID().toString();
 
     private Boolean requireValidMetadata = true;