Merge pull request #6884 from pascalgrimaud/refactoring-improve-engin…

…e-code

Refactoring improve engine code

src/main/java/tech/jhipster/lite/common/domain/Enums.java

@@ -45,6 +45,6 @@ private <From extends Enum<From>, To extends Enum<To>> To get(Enum<From> from, C
       };
     }
 
-    private static record CacheKey<From extends Enum<From>, To extends Enum<To>>(Class<From> from, Class<To> to) {}
+    private record CacheKey<From extends Enum<From>, To extends Enum<To>>(Class<From> from, Class<To> to) {}
   }
 }

src/main/java/tech/jhipster/lite/common/domain/Memoizers.java

@@ -40,8 +40,8 @@ private MemoizedResult<Result> toMemoizedResult(MemoizedInput<Input> input) {
       return new MemoizedResult<>(function.apply(input.input()));
     }
 
-    private static record MemoizedInput<Input>(Input input) {}
+    private record MemoizedInput<Input>(Input input) {}
 
-    private static record MemoizedResult<Result>(Result result) {}
+    private record MemoizedResult<Result>(Result result) {}
   }
 }

src/main/java/tech/jhipster/lite/error/infrastructure/primary/GeneratorErrorsHandler.java

@@ -1,6 +1,7 @@
 package tech.jhipster.lite.error.infrastructure.primary;
 
 import java.util.Locale;
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -33,7 +34,7 @@ public GeneratorErrorsHandler(@Qualifier("generatorErrorMessageSource") MessageS
 
   @ExceptionHandler(GeneratorException.class)
   ProblemDetail handleGeneratorException(GeneratorException exception) {
-    HttpStatus status = Enums.map(exception.status(), HttpStatus.class);
+    HttpStatus status = Optional.ofNullable(Enums.map(exception.status(), HttpStatus.class)).orElse(HttpStatus.INTERNAL_SERVER_ERROR);
     ProblemDetail problem = ProblemDetail.forStatusAndDetail(status, buildDetail(exception));
 
     problem.setTitle(getMessage(exception.key(), "title"));

src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoccore/domain/SpringdocModuleFactory.java

@@ -62,7 +62,7 @@ private JHipsterModule buildModule(JHipsterModuleProperties properties, SpringDo
     //@formatter:on
   }
 
-  private static record SpringDocDependencies(JavaDependency ui, JavaDependency api) {
+  private record SpringDocDependencies(JavaDependency ui, JavaDependency api) {
     private static final String SPRINGDOC_GROUP_ID = "org.springdoc";
     private static final String SPRINGDOC_OPENAPI_WEBMVC_VERSION_KEY = "springdoc-openapi-starter-webmvc";
     private static final String SPRINGDOC_OPENAPI_WEBFLUX_VERSION_KEY = "springdoc-openapi-starter-webflux";

src/main/java/tech/jhipster/lite/module/domain/JHipsterModule.java

@@ -554,5 +554,5 @@ public JHipsterModule build() {
     }
   }
 
-  private static record PropertiesKey(SpringProfile profile, SpringPropertyType type) {}
+  private record PropertiesKey(SpringProfile profile, SpringPropertyType type) {}
 }

src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterServerPort.java

@@ -19,7 +19,7 @@ private int buildPort(Integer port) {
       return DEFAULT_PORT;
     }
 
-    return port.intValue();
+    return port;
   }
 
   public int get() {

src/main/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleMandatoryReplacementsFactory.java

@@ -53,7 +53,7 @@ protected ContentReplacer buildReplacer(JHipsterProjectFilePath file, ElementRep
     }
   }
 
-  private static record MandatoryFileReplacer(JHipsterProjectFilePath file, MandatoryReplacer replacement) implements ContentReplacer {
+  private record MandatoryFileReplacer(JHipsterProjectFilePath file, MandatoryReplacer replacement) implements ContentReplacer {
     public MandatoryFileReplacer {
       Assert.notNull("file", file);
       Assert.notNull("replacement", replacement);
@@ -70,7 +70,7 @@ public void handleError(Throwable e) {
     }
   }
 
-  private static record MandatoryReplacer(ElementReplacer replacer, String updatedValue) {
+  private record MandatoryReplacer(ElementReplacer replacer, String updatedValue) {
     public MandatoryReplacer {
       Assert.notNull("replacer", replacer);
       Assert.notNull("updatedValue", updatedValue);

src/main/resources/generator/server/javatool/enums/main/Enums.java.mustache

@@ -45,6 +45,6 @@ public final class Enums {
       };
     }
 
-    private static record CacheKey<From extends Enum<From>, To extends Enum<To>>(Class<From> from, Class<To> to) {}
+    private record CacheKey<From extends Enum<From>, To extends Enum<To>>(Class<From> from, Class<To> to) {}
   }
 }

src/main/resources/generator/server/javatool/memoizers/Memoizers.java.mustache

@@ -40,8 +40,8 @@ public final class Memoizers {
       return new MemoizedResult<>(function.apply(input.input()));
     }
 
-    private static record MemoizedInput<Input>(Input input) {}
+    private record MemoizedInput<Input>(Input input) {}
 
-    private static record MemoizedResult<Result>(Result result) {}
+    private record MemoizedResult<Result>(Result result) {}
   }
 }

src/main/resources/generator/server/springboot/mvc/internationalized-errors/main/ApplicationErrorsHandler.java.mustache

@@ -1,6 +1,7 @@
 package {{ packageName }}.error.infrastructure.primary;
 
 import java.util.Locale;
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -33,7 +34,7 @@ class {{ baseName }}ErrorsHandler {
 
   @ExceptionHandler({{ baseName }}Exception.class)
   ProblemDetail handle{{ baseName }}Exception({{ baseName }}Exception exception) {
-    HttpStatus status = Enums.map(exception.status(), HttpStatus.class);
+    HttpStatus status = Optional.ofNullable(Enums.map(exception.status(), HttpStatus.class)).orElse(HttpStatus.INTERNAL_SERVER_ERROR);
     ProblemDetail problem = ProblemDetail.forStatusAndDetail(status, buildDetail(exception));
 
     problem.setTitle(getMessage(exception.key(), "title"));