diff --git a/src/main/resources/generator/server/javatool/base/test/error/MissingMandatoryValueExceptionTest.java.mustache b/src/main/resources/generator/server/javatool/base/test/error/MissingMandatoryValueExceptionTest.java.mustache index d29801c75fb..2d42f17f304 100644 --- a/src/main/resources/generator/server/javatool/base/test/error/MissingMandatoryValueExceptionTest.java.mustache +++ b/src/main/resources/generator/server/javatool/base/test/error/MissingMandatoryValueExceptionTest.java.mustache @@ -12,7 +12,7 @@ class MissingMandatoryValueExceptionTest { @Test void shouldGetExceptionForBlankValue() { - MissingMandatoryValueException exception = MissingMandatoryValueException.forBlankValue(FIELD); + var exception = MissingMandatoryValueException.forBlankValue(FIELD); assertDefaultInformation(exception); assertThat(exception.getMessage()).isEqualTo("The field \"field\" is mandatory and wasn't set (blank)"); @@ -20,7 +20,7 @@ class MissingMandatoryValueExceptionTest { @Test void shouldGetExceptionForNullValue() { - MissingMandatoryValueException exception = MissingMandatoryValueException.forNullValue(FIELD); + var exception = MissingMandatoryValueException.forNullValue(FIELD); assertDefaultInformation(exception); assertThat(exception.getMessage()).isEqualTo("The field \"field\" is mandatory and wasn't set (null)"); @@ -28,7 +28,7 @@ class MissingMandatoryValueExceptionTest { @Test void shouldGetExceptionForEmptyCollection() { - MissingMandatoryValueException exception = MissingMandatoryValueException.forEmptyValue(FIELD); + var exception = MissingMandatoryValueException.forEmptyValue(FIELD); assertDefaultInformation(exception); assertThat(exception.getMessage()).isEqualTo("The field \"field\" is mandatory and wasn't set (empty)"); diff --git a/src/main/resources/generator/server/javatool/base/test/error/NullElementInCollectionExceptionTest.java.mustache b/src/main/resources/generator/server/javatool/base/test/error/NullElementInCollectionExceptionTest.java.mustache index c4e5014136f..1d40bf16346 100644 --- a/src/main/resources/generator/server/javatool/base/test/error/NullElementInCollectionExceptionTest.java.mustache +++ b/src/main/resources/generator/server/javatool/base/test/error/NullElementInCollectionExceptionTest.java.mustache @@ -10,7 +10,7 @@ class NullElementInCollectionExceptionTest { @Test void shouldGetExceptionInformation() { - NullElementInCollectionException exception = new NullElementInCollectionException("myField"); + var exception = new NullElementInCollectionException("myField"); assertThat(exception.type()).isEqualTo(AssertionErrorType.NULL_ELEMENT_IN_COLLECTION); assertThat(exception.field()).isEqualTo("myField"); diff --git a/src/main/resources/generator/server/pagination/domain/test/AppPageableTest.java.mustache b/src/main/resources/generator/server/pagination/domain/test/AppPageableTest.java.mustache index b6a476f0348..b00cc866779 100644 --- a/src/main/resources/generator/server/pagination/domain/test/AppPageableTest.java.mustache +++ b/src/main/resources/generator/server/pagination/domain/test/AppPageableTest.java.mustache @@ -33,7 +33,7 @@ class {{baseName}}PageableTest { @Test void shouldGetFirstPageInformation() { - {{baseName}}Pageable pageable = new {{baseName}}Pageable(0, 15); + var pageable = new {{baseName}}Pageable(0, 15); assertThat(pageable.page()).isZero(); assertThat(pageable.pageSize()).isEqualTo(15); @@ -42,7 +42,7 @@ class {{baseName}}PageableTest { @Test void shouldGetPageableInformation() { - {{baseName}}Pageable pageable = new {{baseName}}Pageable(2, 15); + var pageable = new {{baseName}}Pageable(2, 15); assertThat(pageable.page()).isEqualTo(2); assertThat(pageable.pageSize()).isEqualTo(15); diff --git a/src/main/resources/generator/server/springboot/dbmigration/liquibase/main/SpringLiquibaseUtil.java.mustache b/src/main/resources/generator/server/springboot/dbmigration/liquibase/main/SpringLiquibaseUtil.java.mustache index 45379a1c0e7..3275e80bc05 100644 --- a/src/main/resources/generator/server/springboot/dbmigration/liquibase/main/SpringLiquibaseUtil.java.mustache +++ b/src/main/resources/generator/server/springboot/dbmigration/liquibase/main/SpringLiquibaseUtil.java.mustache @@ -68,7 +68,7 @@ final class SpringLiquibaseUtil { DataSource dataSource, DataSourceProperties dataSourceProperties ) { - AsyncSpringLiquibase liquibase = new AsyncSpringLiquibase(executor, env, liquibaseProperties); + var liquibase = new AsyncSpringLiquibase(executor, env, liquibaseProperties); var liquibaseDataSource = getDataSource(liquibaseDatasource, liquibaseProperties, dataSource); if (liquibaseDataSource != null) { liquibase.setCloseDataSourceOnceMigrated(false); diff --git a/src/main/resources/generator/server/springboot/dbmigration/liquibase/test/LiquibaseConfigurationIT.java.mustache b/src/main/resources/generator/server/springboot/dbmigration/liquibase/test/LiquibaseConfigurationIT.java.mustache index 921070fbfea..f32019c27b5 100644 --- a/src/main/resources/generator/server/springboot/dbmigration/liquibase/test/LiquibaseConfigurationIT.java.mustache +++ b/src/main/resources/generator/server/springboot/dbmigration/liquibase/test/LiquibaseConfigurationIT.java.mustache @@ -21,7 +21,7 @@ class LiquibaseConfigurationIT { @Test void shouldGetLiquibaseAsync() { - SpringLiquibase springLiquibase = (SpringLiquibase) applicationContext.getBean("liquibase"); + var springLiquibase = (SpringLiquibase) applicationContext.getBean("liquibase"); assertThat(springLiquibase).isNotNull(); } @@ -36,7 +36,7 @@ class LiquibaseConfigurationIT { @Test void shouldGetLiquibaseSync() { - SpringLiquibase springLiquibase = (SpringLiquibase) applicationContext.getBean("liquibase"); + var springLiquibase = (SpringLiquibase) applicationContext.getBean("liquibase"); assertThat(springLiquibase).isNotNull(); } diff --git a/src/main/resources/generator/server/springboot/logging/logstash/test/LogstashTcpConfigurationIT.java.mustache b/src/main/resources/generator/server/springboot/logging/logstash/test/LogstashTcpConfigurationIT.java.mustache index 5122c01bcaf..0c08134fdc2 100644 --- a/src/main/resources/generator/server/springboot/logging/logstash/test/LogstashTcpConfigurationIT.java.mustache +++ b/src/main/resources/generator/server/springboot/logging/logstash/test/LogstashTcpConfigurationIT.java.mustache @@ -49,7 +49,7 @@ class LogstashTcpConfigurationIT { assertThat(appender).isInstanceOf(LogstashTcpSocketAppender.class); - LogstashTcpSocketAppender logstashTcpSocketAppender = (LogstashTcpSocketAppender) appender; + var logstashTcpSocketAppender = (LogstashTcpSocketAppender) appender; assertThat(logstashTcpSocketAppender.getDestinations()).contains(new InetSocketAddress("127.0.0.1", 50000)); assertThat(logstashTcpSocketAppender.getRingBufferSize()).isEqualTo(4096); diff --git a/src/main/resources/generator/server/springboot/logging/logstash/test/LogstashTcpConfigurationTest.java.mustache b/src/main/resources/generator/server/springboot/logging/logstash/test/LogstashTcpConfigurationTest.java.mustache index 7b521ef8d7d..c1b725f2757 100644 --- a/src/main/resources/generator/server/springboot/logging/logstash/test/LogstashTcpConfigurationTest.java.mustache +++ b/src/main/resources/generator/server/springboot/logging/logstash/test/LogstashTcpConfigurationTest.java.mustache @@ -20,7 +20,7 @@ class LogstashTcpConfigurationTest { @Test void shouldAddAppNameOnly() throws IOException { - LogstashTcpConfiguration c = new LogstashTcpConfiguration("jhipster-lite", null, new LogstashTcpProperties()); + var c = new LogstashTcpConfiguration("jhipster-lite", null, new LogstashTcpProperties()); ObjectContent> parsed = json.parse(c.logstashTcpLifeCycle().serializedFields()); assertThat(parsed.getObject()).hasSize(1); diff --git a/src/main/resources/generator/server/springboot/mvc/sample/feature/main/domain/beer/BeersCreator.java.mustache b/src/main/resources/generator/server/springboot/mvc/sample/feature/main/domain/beer/BeersCreator.java.mustache index 73d1655f3c2..23004b45626 100644 --- a/src/main/resources/generator/server/springboot/mvc/sample/feature/main/domain/beer/BeersCreator.java.mustache +++ b/src/main/resources/generator/server/springboot/mvc/sample/feature/main/domain/beer/BeersCreator.java.mustache @@ -13,7 +13,7 @@ public class BeersCreator { } public Beer create(BeerToCreate beerToCreate) { - Beer createdBeer = beerToCreate.create(); + var createdBeer = beerToCreate.create(); beers.save(createdBeer); diff --git a/src/main/resources/generator/server/springboot/mvc/sample/feature/main/infrastructure/primary/beer/BeersResource.java.mustache b/src/main/resources/generator/server/springboot/mvc/sample/feature/main/infrastructure/primary/beer/BeersResource.java.mustache index 3d84d8d8467..37d97a222a1 100644 --- a/src/main/resources/generator/server/springboot/mvc/sample/feature/main/infrastructure/primary/beer/BeersResource.java.mustache +++ b/src/main/resources/generator/server/springboot/mvc/sample/feature/main/infrastructure/primary/beer/BeersResource.java.mustache @@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import {{packageName}}.sample.application.BeersApplicationService; import {{packageName}}.sample.domain.BeerId; -import {{packageName}}.sample.domain.beer.Beer; @RestController @Tag(name = "Beers") @@ -33,7 +32,7 @@ class BeersResource { @Operation(summary = "Add a beer to the catalog") @ApiResponse(description = "Beer added to the catalog", responseCode = "201") ResponseEntity addBeer(@Validated @RequestBody RestBeerToCreate beerToCreate) { - Beer createdBeer = beers.create(beerToCreate.toDomain()); + var createdBeer = beers.create(beerToCreate.toDomain()); return new ResponseEntity<>(RestBeer.from(createdBeer), HttpStatus.CREATED); } diff --git a/src/main/resources/generator/server/springboot/mvc/sample/feature/test/sample/domain/beer/BeersTest.java.mustache b/src/main/resources/generator/server/springboot/mvc/sample/feature/test/sample/domain/beer/BeersTest.java.mustache index 9d2293386d5..671e5c4af23 100644 --- a/src/main/resources/generator/server/springboot/mvc/sample/feature/test/sample/domain/beer/BeersTest.java.mustache +++ b/src/main/resources/generator/server/springboot/mvc/sample/feature/test/sample/domain/beer/BeersTest.java.mustache @@ -20,7 +20,7 @@ class BeersTest { .sellingState(BeerSellingState.SOLD) .build(); - Beers beers = new Beers(List.of(beer(), anteMeridiem)); + var beers = new Beers(List.of(beer(), anteMeridiem)); assertThat(beers.get()).usingRecursiveFieldByFieldElementComparator().containsExactly(anteMeridiem, beer()); } diff --git a/src/main/resources/generator/server/springboot/mvc/security/jwt/authentication/main/infrastructure/primary/JWTConfigurer.java.mustache b/src/main/resources/generator/server/springboot/mvc/security/jwt/authentication/main/infrastructure/primary/JWTConfigurer.java.mustache index bc8d8383086..2b4b3c4cea4 100644 --- a/src/main/resources/generator/server/springboot/mvc/security/jwt/authentication/main/infrastructure/primary/JWTConfigurer.java.mustache +++ b/src/main/resources/generator/server/springboot/mvc/security/jwt/authentication/main/infrastructure/primary/JWTConfigurer.java.mustache @@ -15,7 +15,7 @@ class JWTConfigurer extends SecurityConfigurerAdapter authorize(@Valid @RequestBody RestAuthenticationQuery authenticationQuery) { - Token token = authenticator.authenticate(authenticationQuery); + var token = authenticator.authenticate(authenticationQuery); var httpHeaders = new HttpHeaders(); httpHeaders.add(HttpHeaders.AUTHORIZATION, token.bearer()); diff --git a/src/main/resources/generator/server/springboot/mvc/security/jwt/basic-auth/main/infrastructure/primary/Authenticator.java.mustache b/src/main/resources/generator/server/springboot/mvc/security/jwt/basic-auth/main/infrastructure/primary/Authenticator.java.mustache index e8347ddad56..4058b30d05c 100644 --- a/src/main/resources/generator/server/springboot/mvc/security/jwt/basic-auth/main/infrastructure/primary/Authenticator.java.mustache +++ b/src/main/resources/generator/server/springboot/mvc/security/jwt/basic-auth/main/infrastructure/primary/Authenticator.java.mustache @@ -1,7 +1,6 @@ package {{packageName}}.account.infrastructure.primary; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; import {{packageName}}.account.application.AccountApplicationService; @@ -20,7 +19,7 @@ class Authenticator { } Token authenticate(RestAuthenticationQuery query) { - Authentication authentication = authenticationManagerBuilder.getObject().authenticate(query.authenticationToken()); + var authentication = authenticationManagerBuilder.getObject().authenticate(query.authenticationToken()); SecurityContextHolder.getContext().setAuthentication(authentication); diff --git a/src/main/resources/generator/server/springboot/mvc/security/kipe/authorization/main/RolesAccesses.java.mustache b/src/main/resources/generator/server/springboot/mvc/security/kipe/authorization/main/RolesAccesses.java.mustache index 81de221ade1..8c62e7f21ec 100644 --- a/src/main/resources/generator/server/springboot/mvc/security/kipe/authorization/main/RolesAccesses.java.mustache +++ b/src/main/resources/generator/server/springboot/mvc/security/kipe/authorization/main/RolesAccesses.java.mustache @@ -38,7 +38,7 @@ public final class RolesAccesses { private Predicate allAuthorized(Action action, Resource resource) { return role -> { - Accesses accesses = roles.get(role); + var accesses = roles.get(role); if (accesses == null) { return false; @@ -58,7 +58,7 @@ public final class RolesAccesses { private Predicate specificAuthorized(Action action, Resource resource) { return role -> { - Accesses accesses = roles.get(role); + var accesses = roles.get(role); if (accesses == null) { return false; diff --git a/src/main/resources/generator/server/springboot/mvc/security/kipe/expression/main/KipeMethodSecurityExpressionHandler.java.mustache b/src/main/resources/generator/server/springboot/mvc/security/kipe/expression/main/KipeMethodSecurityExpressionHandler.java.mustache index 66864443d3f..50bd71d033b 100755 --- a/src/main/resources/generator/server/springboot/mvc/security/kipe/expression/main/KipeMethodSecurityExpressionHandler.java.mustache +++ b/src/main/resources/generator/server/springboot/mvc/security/kipe/expression/main/KipeMethodSecurityExpressionHandler.java.mustache @@ -23,7 +23,7 @@ class KipeMethodSecurityExpressionHandler extends DefaultMethodSecurityExpressio public EvaluationContext createEvaluationContext(Supplier authentication, MethodInvocation mi) { MethodSecurityExpressionOperations root = buildExpressionRoot(authentication, mi); - MethodBasedEvaluationContext ctx = new MethodBasedEvaluationContext( + var ctx = new MethodBasedEvaluationContext( root, getSpecificMethod(mi), mi.getArguments(), @@ -40,7 +40,7 @@ class KipeMethodSecurityExpressionHandler extends DefaultMethodSecurityExpressio } private MethodSecurityExpressionOperations buildExpressionRoot(Supplier authentication, MethodInvocation invocation) { - KipeMethodSecurityExpressionRoot root = new KipeMethodSecurityExpressionRoot(authentication, evaluator); + var root = new KipeMethodSecurityExpressionRoot(authentication, evaluator); root.setThis(invocation.getThis()); root.setPermissionEvaluator(getPermissionEvaluator()); diff --git a/src/main/resources/generator/server/springboot/mvc/security/kipe/expression/test/AccessEvaluatorTest.java.mustache b/src/main/resources/generator/server/springboot/mvc/security/kipe/expression/test/AccessEvaluatorTest.java.mustache index 322cf090726..5b8de626f0b 100755 --- a/src/main/resources/generator/server/springboot/mvc/security/kipe/expression/test/AccessEvaluatorTest.java.mustache +++ b/src/main/resources/generator/server/springboot/mvc/security/kipe/expression/test/AccessEvaluatorTest.java.mustache @@ -34,7 +34,7 @@ class AccessEvaluatorTest { @Test void shouldResolveOnDefaultCheckerForNullObject() { - AccessEvaluator canEvaluator = new AccessEvaluator(List.of(new ObjectAccessChecker())); + var canEvaluator = new AccessEvaluator(List.of(new ObjectAccessChecker())); boolean can = canEvaluator.can(authentication, "action", null); @@ -44,7 +44,7 @@ class AccessEvaluatorTest { @Test void shouldResolveOnDefaultCheckerForUnknownType() { - AccessEvaluator canEvaluator = new AccessEvaluator(List.of(new ObjectAccessChecker())); + var canEvaluator = new AccessEvaluator(List.of(new ObjectAccessChecker())); boolean can = canEvaluator.can(authentication, "action", "yo"); @@ -54,14 +54,14 @@ class AccessEvaluatorTest { @Test void shouldGetMatchingEvaluator() { - AccessEvaluator canEvaluator = new AccessEvaluator(List.of(new ObjectAccessChecker(), new KipeDummyAccessChecker())); + var canEvaluator = new AccessEvaluator(List.of(new ObjectAccessChecker(), new KipeDummyAccessChecker())); assertThat(canEvaluator.can(authentication, "action", new KipeDummy("authorized"))).isTrue(); } @Test void shouldGetMatchingEvaluatorForChildClass() { - AccessEvaluator canEvaluator = new AccessEvaluator(List.of(new ObjectAccessChecker(), new KipeDummyAccessChecker())); + var canEvaluator = new AccessEvaluator(List.of(new ObjectAccessChecker(), new KipeDummyAccessChecker())); assertThat(canEvaluator.can(authentication, "action", new KipeDummyChild("authorized"))).isTrue(); logs.shouldHave(Level.INFO, "evaluator", 1); diff --git a/src/test/java/tech/jhipster/lite/shared/error/domain/MissingMandatoryValueExceptionTest.java b/src/test/java/tech/jhipster/lite/shared/error/domain/MissingMandatoryValueExceptionTest.java index e634815a981..9d8e0d0c00d 100644 --- a/src/test/java/tech/jhipster/lite/shared/error/domain/MissingMandatoryValueExceptionTest.java +++ b/src/test/java/tech/jhipster/lite/shared/error/domain/MissingMandatoryValueExceptionTest.java @@ -12,21 +12,21 @@ class MissingMandatoryValueExceptionTest { @Test void shouldGetExceptionForBlankValue() { - MissingMandatoryValueException exception = MissingMandatoryValueException.forBlankValue(FIELD); + var exception = MissingMandatoryValueException.forBlankValue(FIELD); assertThat(exception.getMessage()).isEqualTo("The field \"field\" is mandatory and wasn't set (blank)"); } @Test void shouldGetExceptionForNullValue() { - MissingMandatoryValueException exception = MissingMandatoryValueException.forNullValue(FIELD); + var exception = MissingMandatoryValueException.forNullValue(FIELD); assertThat(exception.getMessage()).isEqualTo("The field \"field\" is mandatory and wasn't set (null)"); } @Test void shouldGetExceptionForEmptyCollection() { - MissingMandatoryValueException exception = MissingMandatoryValueException.forEmptyValue(FIELD); + var exception = MissingMandatoryValueException.forEmptyValue(FIELD); assertThat(exception.getMessage()).isEqualTo("The field \"field\" is mandatory and wasn't set (empty)"); }