Merge pull request #759 from Backbase/issue_656_deprecated_code

walaniam · web-flow · commit 4b139b6580c2 · 2024-02-20T14:00:32.000+01:00
Issue 656 deprecated code
diff --git a/boat-maven-plugin/src/it/example/pom.xml b/boat-maven-plugin/src/it/example/pom.xml
@@ -56,7 +56,7 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.18.24</version>
+                <version>1.18.30</version>
             </dependency>
 
             <dependency>
diff --git a/boat-scaffold/src/main/templates/boat-java/libraries/microprofile/enumOuterClass.mustache b/boat-scaffold/src/main/templates/boat-java/libraries/microprofile/enumOuterClass.mustache
@@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
   {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
   {{/gson}}
 
-  private {{{dataType}}} value;
+  private final {{{dataType}}} value;
 
   {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{{dataType}}} value) {
     this.value = value;
diff --git a/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache b/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache
@@ -14,7 +14,6 @@ import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRequest;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.InvalidMediaTypeException;
 import org.springframework.http.MediaType;
 import org.springframework.http.RequestEntity;
@@ -650,7 +649,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
                     }
                 }
             } catch (UnsupportedEncodingException e) {
-
+                throw new RuntimeException(e);
             }
         });
         return queryBuilder.toString();
@@ -678,8 +677,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<String, Object> pathParams, MultiValueMap<String, String> queryParams, Object body, HttpHeaders headerParams, MultiValueMap<String, String> cookieParams, MultiValueMap<String, Object> formParams, List<MediaType> accept, MediaType contentType, String[] authNames, ParameterizedTypeReference<T> returnType) throws RestClientException {
         updateParamsForAuth(authNames, queryParams, headerParams, cookieParams);
 
-        Map<String,Object> uriParams = new HashMap<>();
-        uriParams.putAll(pathParams);
+        Map<String,Object> uriParams = new HashMap<>(pathParams);
 
         String finalUri = path;
 
@@ -813,7 +811,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
         }
     }
 
-    private class ApiClientHttpRequestInterceptor implements ClientHttpRequestInterceptor {
+    private static class ApiClientHttpRequestInterceptor implements ClientHttpRequestInterceptor {
         private final Log log = LogFactory.getLog(ApiClientHttpRequestInterceptor.class);
 
         @Override
@@ -824,22 +822,22 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
             return response;
         }
 
-        private void logRequest(HttpRequest request, byte[] body) throws UnsupportedEncodingException {
+        private void logRequest(HttpRequest request, byte[] body) {
             log.info("URI: " + request.getURI());
             log.info("HTTP Method: " + request.getMethod());
             log.info("HTTP Headers: " + headersToString(request.getHeaders()));
             log.info("Request Body: " + new String(body, StandardCharsets.UTF_8));
         }
 
         private void logResponse(ClientHttpResponse response) throws IOException {
-            log.info("HTTP Status Code: " + response.getRawStatusCode());
+            log.info("HTTP Status Code: " + response.getStatusCode().value());
             log.info("Status Text: " + response.getStatusText());
             log.info("HTTP Headers: " + headersToString(response.getHeaders()));
             log.info("Response Body: " + bodyToString(response.getBody()));
         }
 
         private String headersToString(HttpHeaders headers) {
-            if(headers == null || headers.isEmpty()) {
+            if (headers == null || headers.isEmpty()) {
                 return "";
             }
             StringBuilder builder = new StringBuilder();
diff --git a/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/auth/HttpBasicAuth.mustache b/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/auth/HttpBasicAuth.mustache
@@ -1,10 +1,9 @@
 package {{invokerPackage}}.auth;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 import org.springframework.http.HttpHeaders;
-import org.springframework.util.Base64Utils;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
@@ -34,6 +33,6 @@ public class HttpBasicAuth implements Authentication {
             return;
         }
         String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
-        headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64Utils.encodeToString(str.getBytes(StandardCharsets.UTF_8)));
+        headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8)));
     }
 }
diff --git a/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/auth/HttpBearerAuth.mustache b/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/auth/HttpBearerAuth.mustache
@@ -1,10 +1,6 @@
 package {{invokerPackage}}.auth;
 
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-
 import org.springframework.http.HttpHeaders;
-import org.springframework.util.Base64Utils;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
diff --git a/boat-scaffold/src/main/templates/boat-java/libraries/webclient/ApiClient.mustache b/boat-scaffold/src/main/templates/boat-java/libraries/webclient/ApiClient.mustache
@@ -659,8 +659,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
         final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
 
         String finalUri = builder.build(false).toUriString();
-        Map<String, Object> uriParams = new HashMap<>();
-        uriParams.putAll(pathParams);
+        Map<String, Object> uriParams = new HashMap<>(pathParams);
 
         if (queryParams != null && !queryParams.isEmpty()) {
             //Include queryParams in uriParams taking into account the paramName
diff --git a/boat-scaffold/src/main/templates/boat-java/libraries/webclient/auth/HttpBasicAuth.mustache b/boat-scaffold/src/main/templates/boat-java/libraries/webclient/auth/HttpBasicAuth.mustache
@@ -1,10 +1,9 @@
 package {{invokerPackage}}.auth;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 import org.springframework.http.HttpHeaders;
-import org.springframework.util.Base64Utils;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
@@ -34,6 +33,6 @@ public class HttpBasicAuth implements Authentication {
             return;
         }
         String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
-        headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64Utils.encodeToString(str.getBytes(StandardCharsets.UTF_8)));
+        headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8)));
     }
 }
diff --git a/boat-scaffold/src/main/templates/boat-java/libraries/webclient/auth/HttpBearerAuth.mustache b/boat-scaffold/src/main/templates/boat-java/libraries/webclient/auth/HttpBearerAuth.mustache
@@ -1,10 +1,6 @@
 package {{invokerPackage}}.auth;
 
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-
 import org.springframework.http.HttpHeaders;
-import org.springframework.util.Base64Utils;
 import org.springframework.util.MultiValueMap;
 
 {{>generatedAnnotation}}
diff --git a/boat-scaffold/src/main/templates/boat-java/modelEnum.mustache b/boat-scaffold/src/main/templates/boat-java/modelEnum.mustache
@@ -33,7 +33,7 @@ import com.google.gson.stream.JsonWriter;
   {{{name}}}({{{value}}}){{^-last}},
   {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
 
-  private {{{dataType}}} value;
+  private final {{{dataType}}} value;
 
   {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{{dataType}}} value) {
     this.value = value;
diff --git a/boat-scaffold/src/main/templates/boat-java/modelInnerEnum.mustache b/boat-scaffold/src/main/templates/boat-java/modelInnerEnum.mustache
@@ -28,7 +28,7 @@
       {{/enumVars}}
     {{/allowableValues}}
 
-    private {{{dataType}}} value;
+    private final {{{dataType}}} value;
 
     {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{{dataType}}} value) {
       this.value = value;
diff --git a/boat-scaffold/src/main/templates/boat-spring/enumClass.mustache b/boat-scaffold/src/main/templates/boat-spring/enumClass.mustache
@@ -20,7 +20,7 @@
         {{/allowableValues}}
     {{/gson}}
 
-    private {{{dataType}}} value;
+    private final {{{dataType}}} value;
 
     {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{{dataType}}} value) {
       this.value = value;
diff --git a/boat-scaffold/src/main/templates/boat-spring/enumOuterClass.mustache b/boat-scaffold/src/main/templates/boat-spring/enumOuterClass.mustache
@@ -21,7 +21,7 @@ public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatyp
   {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
   {{/gson}}
 
-  private {{{dataType}}} value;
+  private final {{{dataType}}} value;
 
   {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{{dataType}}} value) {
     this.value = value;
diff --git a/boat-scaffold/src/main/templates/boat-spring/libraries/spring-boot/pom-sb3.mustache b/boat-scaffold/src/main/templates/boat-spring/libraries/spring-boot/pom-sb3.mustache
@@ -230,7 +230,7 @@
         <dependency>
           <groupId>org.projectlombok</groupId>
           <artifactId>lombok</artifactId>
-          <version>1.18.28</version>
+          <version>1.18.30</version>
           <scope>provided</scope>
         </dependency>
 {{/useLombokAnnotations}}
diff --git a/boat-scaffold/src/main/templates/boat-spring/libraries/spring-boot/pom.mustache b/boat-scaffold/src/main/templates/boat-spring/libraries/spring-boot/pom.mustache
@@ -135,7 +135,7 @@
         <dependency>
           <groupId>org.projectlombok</groupId>
           <artifactId>lombok</artifactId>
-          <version>1.18.24</version>
+          <version>1.18.30</version>
         </dependency>
       {{/useLombokAnnotations}}
         <dependency>

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`	`1`	`package {{invokerPackage}}.auth;`
`2`	`2`
`3`		`-import java.io.UnsupportedEncodingException;`
`4`	`3`	`import java.nio.charset.StandardCharsets;`
	`4`	`+import java.util.Base64;`
`5`	`5`
`6`	`6`	`import org.springframework.http.HttpHeaders;`
`7`		`-import org.springframework.util.Base64Utils;`
`8`	`7`	`import org.springframework.util.MultiValueMap;`
`9`	`8`
`10`	`9`	`{{>generatedAnnotation}}`
`@@ -34,6 +33,6 @@ public class HttpBasicAuth implements Authentication {`
`34`	`33`	`return;`
`35`	`34`	`}`
`36`	`35`	`String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);`
`37`		`- headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64Utils.encodeToString(str.getBytes(StandardCharsets.UTF_8)));`
	`36`	`+ headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8)));`
`38`	`37`	`}`
`39`	`38`	`}`