Manual upgrade to JHLite v1.23.0

.jhipster/modules/history.json

@@ -194,6 +194,19 @@
         "indentSize": 2,
         "baseName": "jhliteExtensionSample"
       }
+    },
+    {
+      "module": "custom-jhlite",
+      "date": "2024-12-09T15:09:55.910860780Z",
+      "properties": {
+        "endOfLine": "lf",
+        "springConfigurationFormat": "yaml",
+        "packageName": "tech.jhipster.lite.extension",
+        "projectName": "JHLite Extension Sample",
+        "serverPort": 8080,
+        "indentSize": 2,
+        "baseName": "jhliteExtensionSample"
+      }
     }
   ]
 }

documentation/cucumber.md

@@ -106,12 +106,15 @@ Behind the scene, your last service will be recalled until the assertions are OK
 
 ## Mocking beans
 
-You may need to mock beans for your component tests, but you won't be able to do it in a "classic" way (using `@MockBean`) since the application context will be already loaded. A way to achieve that is to overload beans to have mocks:
+You may need to mock beans for your component tests, but you won't be able to do it in a "classic" way (using `@MockitoBean`) since the application context will be already loaded. A way to achieve that is to overload beans to have mocks:
 
 ```java
 @ActiveProfiles("test")
 @CucumberContextConfiguration
-@SpringBootTest(classes = { JhliteExtensionSampleApp.class, CucumberMocksConfiguration.class }, webEnvironment = WebEnvironment.RANDOM_PORT)
+@SpringBootTest(
+  classes = { JhipsterSampleApplicationApp.class, CucumberMocksConfiguration.class },
+  webEnvironment = WebEnvironment.RANDOM_PORT
+)
 public class CucumberConfiguration {
 
   // other code omitted

documentation/module-creation.md

@@ -33,12 +33,12 @@ class MyModuleFactoryTest {
   @Test
   void shouldBuildModule() {
     JHipsterModuleProperties properties = JHipsterModulesFixture.propertiesBuilder(TestFileUtils.tmpDirForTest())
-      .basePackage("com.jhipster.test")
+      .basePackage("tech.jhipster.jhlitest")
       .build();
 
     JHipsterModule module = factory.buildModule(properties);
 
-    assertThatModule(module).hasPrefixedFiles("src/main/java/com/jhipster/test/my_package", "Dummy.java");
+    assertThatModule(module).hasPrefixedFiles("src/main/java/tech/jhipster/jhlitest/my_package", "Dummy.java");
   }
 }
 
@@ -207,8 +207,8 @@ In your `JHipsterModuleResource` you can define additional properties and an org
 
 You can hide modules from your custom instance in project configuration with:
 
-- `jhlite-hidden-resources.slugs`: To disable including its dependencies by slugs
-- `jhlite-hidden-resources.tags`: To disable by tags
+- `jhlite.hidden-resources.slugs`: To disable including its dependencies by slugs
+- `jhlite.hidden-resources.tags`: To disable by tags
 
 ## Docker versions
 

pom.xml

@@ -101,7 +101,7 @@
     <failsafe-plugin.version>3.5.2</failsafe-plugin.version>
     <spring-boot.version>3.4.0</spring-boot.version>
     <cucumber.version>7.20.1</cucumber.version>
-    <jhlite.version>1.22.0</jhlite.version>
+    <jhlite.version>1.23.0</jhlite.version>
     <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
     <jacoco.version>0.8.12</jacoco.version>
     <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>

sonar-project.properties

@@ -16,7 +16,7 @@ sonar.junit.reportPaths=target/surefire-reports,target/failsafe-reports
 sonar.sourceEncoding=UTF-8
 sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/webapp/content/**/*.*, src/main/webapp/i18n/*.js, target/classes/static/**/*.*, src/main/webapp/app/index.tsx
 
-sonar.issue.ignore.multicriteria=S117,S119,S125,S3437,S4502,S4684,S4032,S5778,S1133,S6206,S2699,S6548,S6471,UndocumentedApi
+sonar.issue.ignore.multicriteria=S117,S119,S125_1,S125_2,S3437,S4502,S4684,S4032,S5778,S1133,S6206,S2699,S6548,S6471,UndocumentedApi
 
 # Rule: Local variable and method parameter names should comply with a naming convention
 # Handled with checkstyle. Should be revisited with java 25 once Unnamed Patterns and Variables are available (JEP 443)
@@ -64,9 +64,11 @@ sonar.issue.ignore.multicriteria.S6206.ruleKey=java:S6206
 sonar.issue.ignore.multicriteria.S2699.resourceKey=src/test/javascript/**
 sonar.issue.ignore.multicriteria.S2699.ruleKey=typescript:S2699
 
-# Rule: Delete commented out code in liquibase example
-sonar.issue.ignore.multicriteria.S125.resourceKey=src/main/resources/config/liquibase/master.xml
-sonar.issue.ignore.multicriteria.S125.ruleKey=xml:S125
+# Rule: Sections of code should not be commented out
+sonar.issue.ignore.multicriteria.S125_1.ruleKey=xml:S125
+sonar.issue.ignore.multicriteria.S125_1.resourceKey=**/logback-spring.xml
+sonar.issue.ignore.multicriteria.S125_2.ruleKey=xml:S125
+sonar.issue.ignore.multicriteria.S125_2.resourceKey=**/config/liquibase/master.xml
 
 # Rule: Use Singleton pattern with care
 sonar.issue.ignore.multicriteria.S6548.resourceKey=src/main/java/**

src/main/java/tech/jhipster/lite/extension/shared/slug/domain/JhliteExtensionSampleFeatureSlug.java

@@ -7,6 +7,7 @@ public enum JhliteExtensionSampleFeatureSlug implements JHipsterFeatureSlugFacto
 
   private final String slug;
 
+  @SuppressWarnings("java:S1144")
   JhliteExtensionSampleFeatureSlug(String slug) {
     this.slug = slug;
   }

src/main/java/tech/jhipster/lite/extension/shared/slug/domain/JhliteExtensionSampleModuleSlug.java

@@ -1,7 +1,14 @@
 package tech.jhipster.lite.extension.shared.slug.domain;
 
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import tech.jhipster.lite.extension.shared.generation.domain.ExcludeFromGeneratedCodeCoverage;
 import tech.jhipster.lite.module.domain.resource.JHipsterModuleSlugFactory;
 
+@ExcludeFromGeneratedCodeCoverage
 public enum JhliteExtensionSampleModuleSlug implements JHipsterModuleSlugFactory {
   BANNER_JHIPSTER_V2("banner-jhipster-v2"),
   BANNER_JHIPSTER_V3("banner-jhipster-v3"),
@@ -11,8 +18,12 @@ public enum JhliteExtensionSampleModuleSlug implements JHipsterModuleSlugFactory
   PRETTIER_PLUGIN_PROPERTIES("prettier-plugin-properties"),
   SPRING_BOOT_STARTUP_REPORT("spring-boot-startup-report");
 
+  private static final Map<String, JhliteExtensionSampleModuleSlug> moduleSlugMap = Stream.of(values()).collect(
+    Collectors.toMap(JhliteExtensionSampleModuleSlug::get, Function.identity())
+  );
   private final String slug;
 
+  @SuppressWarnings("java:S1144")
   JhliteExtensionSampleModuleSlug(String slug) {
     this.slug = slug;
   }
@@ -21,4 +32,8 @@ public enum JhliteExtensionSampleModuleSlug implements JHipsterModuleSlugFactory
   public String get() {
     return slug;
   }
+
+  public static Optional<JhliteExtensionSampleModuleSlug> fromString(String slug) {
+    return Optional.ofNullable(moduleSlugMap.get(slug));
+  }
 }

src/main/resources/config/application.yml

@@ -12,8 +12,9 @@ logging:
       jhipster:
         lite:
           extension: INFO
-jhlite-hidden-resources:
-  # Disable the modules and its dependencies by slugs
-  slugs: custom-jhlite
+jhlite:
+  hidden-resources:
+    # Disable the modules and its dependencies by slugs
+    slugs: custom-jhlite
 server:
   port: 8080

src/main/resources/logback-spring.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE configuration>
 <configuration scan="true">
+  <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
   <springProperty name="log.level" source="logging.level.root" defaultValue="INFO" />
   <include resource="org/springframework/boot/logging/logback/defaults.xml" />
   <include resource="org/springframework/boot/logging/logback/console-appender.xml" />

src/test/java/tech/jhipster/lite/extension/cucumber/CucumberConfiguration.java

@@ -4,7 +4,6 @@
 import io.cucumber.spring.CucumberContextConfiguration;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.context.TestConfiguration;
@@ -31,8 +30,11 @@
 )
 public class CucumberConfiguration {
 
-  @Autowired
-  private TestRestTemplate rest;
+  private final TestRestTemplate rest;
+
+  CucumberConfiguration(TestRestTemplate rest) {
+    this.rest = rest;
+  }
 
   @Before
   public void resetTestContext() {
@@ -46,7 +48,7 @@ public void loadInterceptors() {
     RestTemplate template = rest.getRestTemplate();
     template.setRequestFactory(requestFactory);
     template.setInterceptors(List.of(saveLastResultInterceptor()));
-    template.getMessageConverters().add(0, new StringHttpMessageConverter(StandardCharsets.UTF_8));
+    template.getMessageConverters().addFirst(new StringHttpMessageConverter(StandardCharsets.UTF_8));
   }
 
   private ClientHttpRequestInterceptor saveLastResultInterceptor() {
@@ -62,11 +64,8 @@ private ClientHttpRequestInterceptor saveLastResultInterceptor() {
   @TestConfiguration
   static class CucumberRestTemplateConfiguration {
 
-    @Autowired
-    private TestRestTemplate rest;
-
     @Bean
-    CucumberRestTemplate cucumberRestTemplate() {
+    CucumberRestTemplate cucumberRestTemplate(TestRestTemplate rest) {
       return new CucumberRestTemplate(rest);
     }
   }

src/test/resources/logback.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE configuration>
 <configuration scan="true">
+  <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
   <include resource="org/springframework/boot/logging/logback/base.xml" />
 
   <logger name="tech.jhipster.lite.extension" level="OFF" />