Merge pull request #23 from PatternAtlas/spring-boot-2.4.1-and-hateoas-link-fix

Upgrade to Spring Boot 2.4.1 and fix generation of HATEOAS links for Design Models

Author: mbeisel

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.RELEASE</version>
+        <version>2.4.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -16,7 +16,7 @@
     <properties>
         <java.version>1.8</java.version>
         <springdoc-ui.version>1.4.0</springdoc-ui.version>
-        <spring-oauth2.version>2.1.2.RELEASE</spring-oauth2.version>
+        <spring-oauth2.version>2.3.6.RELEASE</spring-oauth2.version>
     </properties>
 
     <dependencies>
@@ -32,7 +32,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.4.1</version>
         </dependency>
 
         <dependency>
@@ -55,9 +54,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.hateoas</groupId>
-            <artifactId>spring-hateoas</artifactId>
-            <version>1.2.2</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-hateoas</artifactId>
         </dependency>
 
         <!-- Persistence -->

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

@@ -4,8 +4,6 @@
 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;
@@ -61,7 +59,7 @@ public FilterRegistrationBean customCorsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         CorsConfiguration config = new CorsConfiguration();
         config.setAllowCredentials(true);
-        config.addAllowedOrigin("*");
+        config.addAllowedOriginPattern("*");
         config.addAllowedHeader("*");
         config.addAllowedMethod("*");
         source.registerCorsConfiguration("/**", config);

src/main/java/com/patternpedia/api/rest/controller/DesignModelController.java

@@ -13,6 +13,7 @@
 import org.springframework.hateoas.CollectionModel;
 import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.Link;
+import org.springframework.hateoas.server.mvc.WebMvcLinkBuilder;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -52,24 +53,24 @@ private static List<Link> getDesignModelCollectionLinks() {
 
 
     private static List<Link> getDesignModelLinks(UUID designModelId, String selfRel) {
-        Map<String, Object> linkMap = new HashMap<>();
+        Map<String, WebMvcLinkBuilder> linkMap = new HashMap<>();
 
-        linkMap.put("designModels", methodOn(DesignModelController.class).getDesignModels());
-        linkMap.put("designModel", methodOn(DesignModelController.class).getDesignModel(designModelId));
-        linkMap.put("patterns", methodOn(DesignModelController.class).getDesignModelPatternInstances(designModelId));
-        linkMap.put("edges", methodOn(DesignModelController.class).getDesignModelPatternEdges(designModelId));
-        linkMap.put("edgeTypes", methodOn(DesignModelController.class).getDesignModelPatternEdgeTypes());
-        linkMap.put("concreteSolutions", methodOn(DesignModelController.class).checkConcreteSolutions(designModelId));
-        linkMap.put("aggregate", methodOn(DesignModelController.class).aggregateConcreteSolutions(designModelId, null));
+        linkMap.put("designModels", linkTo(methodOn(DesignModelController.class).getDesignModels()));
+        linkMap.put("designModel", linkTo(methodOn(DesignModelController.class).getDesignModel(designModelId)));
+        linkMap.put("patterns", linkTo(methodOn(DesignModelController.class).getDesignModelPatternInstances(designModelId)));
+        linkMap.put("edges", linkTo(methodOn(DesignModelController.class).getDesignModelPatternEdges(designModelId)));
+        linkMap.put("edgeTypes", linkTo(methodOn(DesignModelController.class).getDesignModelPatternEdgeTypes()));
+        linkMap.put("concreteSolutions",linkTo( methodOn(DesignModelController.class).checkConcreteSolutions(designModelId)));
+        linkMap.put("aggregate", linkTo(methodOn(DesignModelController.class).aggregateConcreteSolutions(designModelId, null)));
 
         List<Link> linkList = new ArrayList<>();
         if (linkMap.containsKey(selfRel)) {
-            linkList.add(linkTo(linkMap.get(selfRel)).withSelfRel());
+            linkList.add(linkMap.get(selfRel).withSelfRel());
         } else {
             log.error("_self link for " + selfRel + " not found in linkMap");
         }
-        for (Map.Entry<String, Object> linkPair : linkMap.entrySet()) {
-            linkList.add(linkTo(linkPair.getValue()).withRel(linkPair.getKey()));
+        for (Map.Entry<String, WebMvcLinkBuilder> linkPair : linkMap.entrySet()) {
+            linkList.add(linkPair.getValue().withRel(linkPair.getKey()));
         }
 
         return linkList;