upgrade dependencies (including spring) && gradle wrapper

JKatzwinkel · Jan 6, 2022 · eaca681 · eaca681
1 parent 8751617
commit eaca681
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,13 +6,13 @@ plugins {
     id 'maven-publish'
     id 'co.uzzu.dotenv.gradle' version '1.2.0'
     id 'de.undercouch.download' version '4.1.2'
-    id 'org.springframework.boot' version '2.6.1'
-    id 'com.github.ben-manes.versions' version '0.39.0'
+    id 'org.springframework.boot' version '2.6.2'
+    id 'com.github.ben-manes.versions' version '0.41.0'
     id 'com.github.dawnwords.jacoco.badge' version '0.2.4'
 }
 
 group = 'org.bbaw.aaew.tla'
-version = '0.0.822'
+version = '0.0.823'
 sourceCompatibility = '11'
 
 ext {
@@ -75,11 +75,11 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok:1.18.22'
     testAnnotationProcessor 'org.projectlombok:lombok:1.18.22'
 
-    implementation 'org.modelmapper:modelmapper:2.4.5'
+    implementation 'org.modelmapper:modelmapper:3.0.0'
     implementation 'org.jooq:jool:0.9.14'
 
-    implementation 'org.springframework.boot:spring-boot-starter-web:2.6.1'
-    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:2.6.1'
+    implementation 'org.springframework.boot:spring-boot-starter-web:2.6.2'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:2.6.2'
     implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.0.0'
     implementation 'org.slf4j:slf4j-simple:2.0.0-alpha5'
     implementation 'org.apache.commons:commons-lang3:3.12.0'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/tla/web/mvc/EditorialContentController.java b/src/main/java/tla/web/mvc/EditorialContentController.java
@@ -30,7 +30,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
-import org.springframework.web.servlet.mvc.method.RequestMappingInfo.BuilderConfiguration;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
 import lombok.extern.slf4j.Slf4j;
@@ -194,19 +193,6 @@ public String renderEditorial(
     }
 
 
-    // TODO: this is a workaround snatched from
-    // TODO: https://github.com/qaware/openapi-generator-for-spring/blob/5b95aefe436fc5e4c9e36a5df829e0f43c2ca5aa/openapi-generator-for-spring-webmvc/src/main/java/de/qaware/openapigeneratorforspring/autoconfigure/OpenApiGeneratorWebMvcAutoConfiguration.java#L61-L76
-    // TODO: once spring 5.3.14 is out, replace with RequestMappingHandlerMapping#getRequestMappingInfoBuilderConfiguration from
-    // TODO: https://github.com/spring-projects/spring-framework/pull/27723/files
-    public static BuilderConfiguration handlerMappingBuilderConfig(RequestMappingHandlerMapping handlerMapping) {
-        BuilderConfiguration config = new BuilderConfiguration();
-        config.setTrailingSlashMatch(handlerMapping.useTrailingSlashMatch());
-        config.setContentNegotiationManager(handlerMapping.getContentNegotiationManager());
-        config.setPatternParser(handlerMapping.getPatternParser());
-        return config;
-    }
-
-
     /**
      * Creates request handler mappings for editorial pages previously registered in the
      * {@link EditorialRegistry}.
@@ -226,7 +212,7 @@ public void onApplicationReady(ApplicationReadyEvent event) throws NoSuchMethodE
                 (path, supportedLanguages) -> {
                     handlerMapping.registerMapping(
                         RequestMappingInfo.paths(path).methods(RequestMethod.GET).options(
-                            handlerMappingBuilderConfig(handlerMapping)
+                            handlerMapping.getBuilderConfiguration()
                         ).build(),
                         this,
                         handlerMethod

diff --git a/src/main/java/tla/web/mvc/ObjectController.java b/src/main/java/tla/web/mvc/ObjectController.java
@@ -187,7 +187,6 @@ public ResponseEntity<?> autoComplete(
         @RequestParam(required = false) Optional<String> term,
         @RequestParam(required = false) Optional<String> type
     ) {
-        log.info("term: {}", term.get());
         return getService().autoComplete(
             term.orElse(""), type.orElse("")
         );

diff --git a/src/main/java/tla/web/mvc/SearchController.java b/src/main/java/tla/web/mvc/SearchController.java
@@ -184,7 +184,7 @@ public void onApplicationReady(ApplicationReadyEvent event) {
                     RequestMappingInfo.paths(
                         this.getSearchResultsPageRoute(controller)
                     ).methods(RequestMethod.GET).options(
-                        EditorialContentController.handlerMappingBuilderConfig(handlerMapping)
+                        handlerMapping.getBuilderConfiguration()
                     ).build(),
                     controller,
                     method