Merge pull request #6930 from pascalgrimaud/prettier-format-templates

Prettier: format some templates
jhipster · Jul 19, 2023 · 09ff7b1 · 09ff7b1
2 parents 5a3799d + 88d871f
commit 09ff7b1
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 34 deletions.
diff --git a/...tor/server/springboot/apidocumentation/springdoccore/SpringdocConfiguration.java.mustache b/...tor/server/springboot/apidocumentation/springdoccore/SpringdocConfiguration.java.mustache
@@ -1,14 +1,13 @@
 package {{packageName}}.technical.infrastructure.primary.springdoc;
 
-import org.springdoc.core.models.GroupedOpenApi;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
 import io.swagger.v3.oas.models.ExternalDocumentation;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
+import org.springdoc.core.models.GroupedOpenApi;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import {{packageName}}.common.domain.ExcludeFromGeneratedCodeCoverage;
 
 @Configuration

diff --git a/.../database/hibernate2ndlevelcache/test/Hibernate2ndLevelCacheConfigurationIT.java.mustache b/.../database/hibernate2ndlevelcache/test/Hibernate2ndLevelCacheConfigurationIT.java.mustache
@@ -1,10 +1,10 @@
 package {{packageName}}.technical.infrastructure.secondary.cache;
 
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnit;
 import org.assertj.core.api.Assertions;
 import org.hibernate.cache.internal.EnabledCaching;
 import org.junit.jupiter.api.Test;
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.PersistenceUnit;
 import {{packageName}}.IntegrationTest;
 
 @IntegrationTest

diff --git a/...esources/generator/server/springboot/database/mariadb/DatabaseConfiguration.java.mustache b/...esources/generator/server/springboot/database/mariadb/DatabaseConfiguration.java.mustache
@@ -6,5 +6,5 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
 @EnableTransactionManagement
-@EnableJpaRepositories(basePackages =  { "{{packageName}}" }, enableDefaultTransactions = false)
+@EnableJpaRepositories(basePackages = { "{{packageName}}" }, enableDefaultTransactions = false)
 public class DatabaseConfiguration {}
diff --git a/.../resources/generator/server/springboot/database/mssql/DatabaseConfiguration.java.mustache b/.../resources/generator/server/springboot/database/mssql/DatabaseConfiguration.java.mustache
@@ -6,5 +6,5 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
 @EnableTransactionManagement
-@EnableJpaRepositories(basePackages =  { "{{packageName}}" }, enableDefaultTransactions = false)
+@EnableJpaRepositories(basePackages = { "{{packageName}}" }, enableDefaultTransactions = false)
 public class DatabaseConfiguration {}
diff --git a/.../resources/generator/server/springboot/database/mysql/DatabaseConfiguration.java.mustache b/.../resources/generator/server/springboot/database/mysql/DatabaseConfiguration.java.mustache
@@ -6,5 +6,5 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
 @EnableTransactionManagement
-@EnableJpaRepositories(basePackages =  { "{{packageName}}" }, enableDefaultTransactions = false)
+@EnableJpaRepositories(basePackages = { "{{packageName}}" }, enableDefaultTransactions = false)
 public class DatabaseConfiguration {}
diff --git a/...urces/generator/server/springboot/database/postgresql/DatabaseConfiguration.java.mustache b/...urces/generator/server/springboot/database/postgresql/DatabaseConfiguration.java.mustache
@@ -6,5 +6,5 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
 @EnableTransactionManagement
-@EnableJpaRepositories(basePackages =  { "{{packageName}}" }, enableDefaultTransactions = false)
+@EnableJpaRepositories(basePackages = { "{{packageName}}" }, enableDefaultTransactions = false)
 public class DatabaseConfiguration {}
diff --git a/...generator/server/springboot/dbmigration/liquibase/main/AsyncSpringLiquibase.java.mustache b/...generator/server/springboot/dbmigration/liquibase/main/AsyncSpringLiquibase.java.mustache
@@ -42,7 +42,7 @@ public class AsyncSpringLiquibase extends DataSourceClosingSpringLiquibase {
    * @param liquibaseProperties
    */
   public AsyncSpringLiquibase(Executor executor, Environment env, LiquibaseProperties liquibaseProperties) {
-      this(executor, env, liquibaseProperties, Duration.ofSeconds(5));
+    this(executor, env, liquibaseProperties, Duration.ofSeconds(5));
   }
 
   /**
@@ -53,10 +53,10 @@ public class AsyncSpringLiquibase extends DataSourceClosingSpringLiquibase {
    * @param slownessThreshold
    */
   protected AsyncSpringLiquibase(Executor executor, Environment env, LiquibaseProperties liquibaseProperties, Duration slownessThreshold) {
-      this.executor = executor;
-      this.env = env;
-      this.liquibaseProperties = liquibaseProperties;
-      this.slownessThreshold = slownessThreshold;
+    this.executor = executor;
+    this.env = env;
+    this.liquibaseProperties = liquibaseProperties;
+    this.slownessThreshold = slownessThreshold;
   }
 
   @Override

diff --git a/...rator/server/springboot/dbmigration/liquibase/test/AsyncSpringLiquibaseTest.java.mustache b/...rator/server/springboot/dbmigration/liquibase/test/AsyncSpringLiquibaseTest.java.mustache
@@ -1,14 +1,7 @@
 package {{packageName}}.technical.infrastructure.secondary.liquibase;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 import ch.qos.logback.classic.Level;
 import java.sql.Connection;
@@ -115,9 +108,9 @@ class AsyncSpringLiquibaseTest {
     void shouldWarnWhenLiquibaseExecutionIsSlow() throws LiquibaseException, SQLException {
       liquibaseProperties.setEnabled(true);
       Duration slownessThreshold = Duration.ofMillis(50);
-      TestAsyncSpringLiquibase asyncSpringLiquibase = spy(new TestAsyncSpringLiquibase(executor, environment, liquibaseProperties,
-        slownessThreshold
-      ));
+      TestAsyncSpringLiquibase asyncSpringLiquibase = spy(
+        new TestAsyncSpringLiquibase(executor, environment, liquibaseProperties, slownessThreshold)
+      );
       asyncSpringLiquibase.setFakeDuration(slownessThreshold.plusMillis(1));
 
       asyncSpringLiquibase.initDb();
@@ -140,7 +133,12 @@ class AsyncSpringLiquibaseTest {
 
     private Duration fakeDuration = Duration.ZERO;
 
-    public TestAsyncSpringLiquibase(Executor executor, Environment environment, LiquibaseProperties liquibaseProperties, Duration slownessThreshold) {
+    public TestAsyncSpringLiquibase(
+      Executor executor,
+      Environment environment,
+      LiquibaseProperties liquibaseProperties,
+      Duration slownessThreshold
+    ) {
       super(executor, environment, liquibaseProperties, slownessThreshold);
     }
 
@@ -176,6 +174,5 @@ class AsyncSpringLiquibaseTest {
         throw new Error(x);
       }
     }
-
   }
 }
diff --git a/...resources/generator/server/springboot/mvc/web/test/BeanValidationAssertions.java.mustache b/...resources/generator/server/springboot/mvc/web/test/BeanValidationAssertions.java.mustache
@@ -2,14 +2,12 @@ package {{packageName}};
 
 import static org.assertj.core.api.Assertions.*;
 
-import java.util.Set;
-import java.util.function.Predicate;
-
-import {{packageName}}.error.domain.Assert;
-
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.Validation;
 import jakarta.validation.Validator;
+import java.util.Set;
+import java.util.function.Predicate;
+import {{packageName}}.error.domain.Assert;
 
 public final class BeanValidationAssertions {