From b1d3b9ef7fe8526acaddbff7fdac881d630d1409 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 15 Jul 2024 20:37:01 -0300 Subject: [PATCH] apply prettier --- .../admin/gateway/gateway-route.model.ts.ejs | 2 +- .../admin/gateway/gateway.component.html.ejs | 84 ++++++++++--------- .../admin/gateway/gateway.component.ts.ejs | 2 +- .../shared/language/translation.module.ts.ejs | 4 +- .../templates/webpack/webpack.custom.js.ejs | 6 +- .../webapp/app/shared/jhipster/headers.ts.ejs | 2 +- .../shared/jhipster/problem-details.ts.ejs | 2 +- .../_package_/domain/AssertUtils.java.ejs | 4 +- .../service/UserService.java.ejs | 7 +- .../web/rest/AuthenticateController.java.ejs | 9 +- .../service/UserServiceIT.java.ejs | 6 +- .../config/CacheConfiguration.java.ejs | 5 +- 12 files changed, 69 insertions(+), 64 deletions(-) diff --git a/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway-route.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway-route.model.ts.ejs index 98f5d366a8b..1925a7622aa 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway-route.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway-route.model.ts.ejs @@ -20,6 +20,6 @@ export class GatewayRoute { constructor( public path: string, public serviceId: string, - public serviceInstances: any[] + public serviceInstances: any[], ) {} } diff --git a/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs index 4c917369824..b18a1e17d36 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs @@ -20,7 +20,7 @@

__jhiTranslateTag__('gateway.title') -

@@ -37,46 +37,50 @@ - @for (route of gatewayRoutes; track route.path) { - - {{ route.path }} - {{ route.serviceId }} - - @if (route.serviceInstances.length === 0) { -
__jhiTranslateTag__('gateway.routes.error')
- } - -
- @if (route) { - - @for (instance of route.serviceInstances; track instance.uri) { - - - - - + @for (route of gatewayRoutes; track route.path) { + + + +
{{ instance.uri }} - @if (instance.instanceInfo) { -
{{ instance.instanceInfo.status }}
- } @else { -
?
- } - 		- @for (entry of (instance.metadata | keyvalue ); track entry.key) { - - - {{ entry.key }} - {{ entry.value }} - - - } -
{{ route.path }}{{ route.serviceId }} + @if (route.serviceInstances.length === 0) { +
__jhiTranslateTag__('gateway.routes.error')
} -
- } -
- - - } + +
+ @if (route) { + + @for (instance of route.serviceInstances; track instance.uri) { + + + + + + } +
+ {{ instance.uri }} + + @if (instance.instanceInfo) { +
+ {{ instance.instanceInfo.status }} +
+ } @else { +
?
+ } + 		+ @for (entry of instance.metadata | keyvalue; track entry.key) { + + + {{ entry.key }} + {{ entry.value }} + + + } +
+ } +
+ + + } diff --git a/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs index 8f7f61f2880..b2e06351141 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs @@ -52,7 +52,7 @@ export default class GatewayComponent implements OnInit { ) { serviceInstance.instanceInfo = { status: 'UP' }; } else { - serviceInstance.instanceInfo = { status: 'DOWN'} ; + serviceInstance.instanceInfo = { status: 'DOWN' }; } } return serviceInstance as object; diff --git a/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs index 31f0f57cf55..1410fab0b88 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs @@ -33,8 +33,8 @@ function lazyTranslatePartialLoader(http: HttpClient): TranslateLoader { TranslateModule.forChild({ loader: { provide: TranslateLoader, - useFactory: (lazyTranslatePartialLoader), - deps: [HttpClient] + useFactory: lazyTranslatePartialLoader, + deps: [HttpClient], }, isolate: false, extend: true, diff --git a/generators/angular/templates/webpack/webpack.custom.js.ejs b/generators/angular/templates/webpack/webpack.custom.js.ejs index 61ba77fc332..748604bb131 100644 --- a/generators/angular/templates/webpack/webpack.custom.js.ejs +++ b/generators/angular/templates/webpack/webpack.custom.js.ejs @@ -78,12 +78,12 @@ module.exports = async (config, options, targetOptions) => { changeOrigin: false, //pass the Host header to the backend unchanged https://github.com/Browsersync/browser-sync/issues/430 }, proxyReq: [ - function(proxyReq) { + function (proxyReq) { // URI that will be retrieved by the ForwardedHeaderFilter on the server side proxyReq.setHeader('X-Forwarded-Host', 'localhost:9000'); proxyReq.setHeader('X-Forwarded-Proto', 'https'); - } - ] + }, + ], }, socket: { clients: { diff --git a/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs b/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs index 046d6ce4d69..e79957332cf 100644 --- a/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs +++ b/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs @@ -36,7 +36,7 @@ const headerToString = (headerValue: any): string => { throw new Error('Header value is not a string'); } return headerValue; -} +}; const decodeHeaderValue = (headerValue: string): string => decodeURIComponent(headerValue.replace(/\+/g, ' ')); diff --git a/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs b/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs index 89953b4c6d1..6341e9a2cd7 100644 --- a/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs +++ b/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs @@ -31,7 +31,7 @@ export type ProblemDetails = { detail: string; /** A URI reference that identifies the specific occurrence of the problem */ instance: string; -} +}; export const ProblemWithMessageType = 'https://www.jhipster.tech/problem/problem-with-message'; diff --git a/generators/java/generators/domain/templates/src/test/java/_package_/domain/AssertUtils.java.ejs b/generators/java/generators/domain/templates/src/test/java/_package_/domain/AssertUtils.java.ejs index 118d3964381..1b19c8e611c 100644 --- a/generators/java/generators/domain/templates/src/test/java/_package_/domain/AssertUtils.java.ejs +++ b/generators/java/generators/domain/templates/src/test/java/_package_/domain/AssertUtils.java.ejs @@ -25,8 +25,8 @@ import java.util.Comparator; public class AssertUtils { - public static Comparator zonedDataTimeSameInstant = Comparator.nullsFirst( - (e1, a2) -> e1.withZoneSameInstant(ZoneOffset.UTC).compareTo(a2.withZoneSameInstant(ZoneOffset.UTC)) + public static Comparator zonedDataTimeSameInstant = Comparator.nullsFirst((e1, a2) -> + e1.withZoneSameInstant(ZoneOffset.UTC).compareTo(a2.withZoneSameInstant(ZoneOffset.UTC)) ); public static Comparator bigDecimalCompareTo = Comparator.nullsFirst((e1, a2) -> e1.compareTo(a2)); diff --git a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs index e870079e423..6d5649ac052 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs @@ -917,14 +917,11 @@ public class UserService { } if (idpModifiedDate.isAfter(dbModifiedDate)) { LOG.debug("Updating user '{}' in local database", user.getLogin()); - return updateUser(user.getFirstName(), user.getLastName(), user.getEmail(), - user.getLangKey(), user.getImageUrl()); + return updateUser(user.getFirstName(), user.getLastName(), user.getEmail(), user.getLangKey(), user.getImageUrl()); } - // no last updated info, blindly update } else { LOG.debug("Updating user '{}' in local database", user.getLogin()); - return updateUser(user.getFirstName(), user.getLastName(), user.getEmail(), - user.getLangKey(), user.getImageUrl()); + return updateUser(user.getFirstName(), user.getLastName(), user.getEmail(), user.getLangKey(), user.getImageUrl()); } return Mono.empty(); }) diff --git a/generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs index 73d029eb53f..1c72f38af00 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs @@ -82,11 +82,10 @@ public class AuthenticateController { @PostMapping("/authenticate") public Mono> authorize(@Valid @RequestBody Mono loginVM) { return loginVM - .flatMap( - login -> - authenticationManager - .authenticate(new UsernamePasswordAuthenticationToken(login.getUsername(), login.getPassword())) - .flatMap(auth -> Mono.fromCallable(() -> this.createToken(auth, login.isRememberMe()))) + .flatMap(login -> + authenticationManager + .authenticate(new UsernamePasswordAuthenticationToken(login.getUsername(), login.getPassword())) + .flatMap(auth -> Mono.fromCallable(() -> this.createToken(auth, login.isRememberMe()))) ) .map(jwt -> { HttpHeaders httpHeaders = new HttpHeaders(); diff --git a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs index 9f5188226d4..a991adf903c 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs @@ -547,7 +547,11 @@ class UserServiceIT { private OAuth2AuthenticationToken createMockOAuth2AuthenticationToken(Map userDetails) { Collection authorities = Collections.singletonList(new SimpleGrantedAuthority(AuthoritiesConstants.ANONYMOUS)); - UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken("anonymous", "anonymous", authorities); + UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken( + "anonymous", + "anonymous", + authorities + ); usernamePasswordAuthenticationToken.setDetails(userDetails); OAuth2User user = new DefaultOAuth2User(authorities, userDetails, "sub"); diff --git a/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs b/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs index 34b7a0893f7..875db25f9ad 100644 --- a/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs +++ b/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs @@ -310,8 +310,9 @@ public class CacheConfiguration { LOG.debug("Configuring Hazelcast clustering for instanceId: {}", serviceId); // In development, everything goes through 127.0.0.1, with a different port if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) { - LOG.debug("Application is running with the \"dev\" profile, Hazelcast " + - "cluster will only work with localhost instances"); + LOG.debug( + "Application is running with the \"dev\" profile, Hazelcast " + "cluster will only work with localhost instances" + ); config.getNetworkConfig().setPort(serverProperties.getPort() + 5701); config.getNetworkConfig().getJoin().getTcpIpConfig().setEnabled(true);