Code cleanup and REST improvements

Author: marzn

src/main/java/com/patternpedia/api/config/ResourceServerConfig.java

@@ -4,6 +4,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;

src/main/java/com/patternpedia/api/entities/designmodel/ConcreteSolution.java

@@ -29,9 +29,7 @@ public class ConcreteSolution {
     @ElementCollection
     private List<String> properties;
 
-    private String templateRef;
+    private String templateUri;
 
     private String aggregatorType;
-
-    private Integer priority;
 }

src/main/java/com/patternpedia/api/entities/designmodel/ConcreteSolutionOption.java

@@ -31,31 +31,4 @@ public class DesignModel extends EntityWithURI {
     @JsonIgnore
     @OneToMany(mappedBy = "designModel", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<DesignModelUndirectedEdge> undirectedEdges;
-
-//    public void removePattern(Pattern pattern) {
-//        for (Iterator<DesignModelPattern> iterator = this.patterns.iterator(); iterator.hasNext(); ) {
-//            DesignModelPattern designModelPattern = iterator.next();
-//            if (designModelPattern.getDesignModel().equals(this) && designModelPattern.getPattern().equals(pattern)) {
-//                iterator.remove();
-//                designModelPattern.getPattern().getDesignModels().remove(designModelPattern);
-//                designModelPattern.setPattern(null);
-//                designModelPattern.setDesignModel(null);
-//                break;
-//            }
-//        }
-//    }
-//
-//    public void removeDirectedEdge(DirectedEdge directedEdge) {
-//        for (Iterator<DesignModelDirectedEdge> iterator = this.directedEdges.iterator(); iterator.hasNext(); ) {
-//            DesignModelDirectedEdge designModelDirectedEdge = iterator.next();
-//            if (designModelDirectedEdge.getDesignModel().equals(this) &&
-//                    designModelDirectedEdge.getDirectedEdge().equals(directedEdge)) {
-//                iterator.remove();
-//                designModelDirectedEdge.getDirectedEdge().getDesignModels().remove(designModelDirectedEdge);
-//                designModelDirectedEdge.setDirectedEdge(null);
-//                designModelDirectedEdge.setDesignModel(null);
-//                break;
-//            }
-//        }
-//    }
 }

src/main/java/com/patternpedia/api/entities/designmodel/DesignModel.java

@@ -0,0 +1,16 @@
+package com.patternpedia.api.entities.designmodel;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+@Data
+public class DesignModelEdgeType {
+
+    @Id
+    private String name;
+
+    private Boolean swap;
+}

src/main/java/com/patternpedia/api/entities/designmodel/DesignModelEdgeType.java

@@ -0,0 +1,8 @@
+package com.patternpedia.api.exception;
+
+public class AggregationException extends RuntimeException {
+
+    public AggregationException(String message) {
+        super(message);
+    }
+}

src/main/java/com/patternpedia/api/exception/AggregationException.java

@@ -0,0 +1,11 @@
+package com.patternpedia.api.repositories;
+
+import com.patternpedia.api.entities.designmodel.DesignModelEdgeType;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface DesignModelEdgeTypeRepository extends JpaRepository<DesignModelEdgeType, String> {
+
+    Optional<DesignModelEdgeType> findTopByName(String name);
+}