Merge pull request #26935 from mshima/prettier-templates

apply prettier to templates
jhipster · Aug 9, 2024 · ecad4e7 · ecad4e7
2 parents c5d22fb + b1d3b9e
commit ecad4e7
Show file tree

Hide file tree

Showing 12 changed files with 69 additions and 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
@@ -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
@@ -20,7 +20,7 @@
   <h2>
     <span id="gateway-page-heading">__jhiTranslateTag__('gateway.title')</span>
 
-    <button class="btn btn-primary float-end" (click)="refresh()" (disabled)="updatingRoutes">
+    <button class="btn btn-primary float-end" (click)="refresh()" (disabled)="(updatingRoutes)">
       <fa-icon icon="sync"></fa-icon> <span>__jhiTranslateTag__('gateway.refresh.button')</span>
     </button>
   </h2>
@@ -37,46 +37,50 @@
         </tr>
       </thead>
       <tbody>
-      @for (route of gatewayRoutes; track route.path) {
-        <tr>
-          <td>{{ route.path }}</td>
-          <td>{{ route.serviceId }}</td>
-          <td>
-          @if (route.serviceInstances.length === 0) {
-            <div class="label label-danger">__jhiTranslateTag__('gateway.routes.error')</div>
-          }
-
-            <div class="table-responsive">
-            @if (route) {
-              <table class="table table-striped">
-              @for (instance of route.serviceInstances; track instance.uri) {
-                <tr>
-                  <td><a href="{{ instance.uri }}" target="_blank">{{ instance.uri }}</a></td>
-                  <td>
-                  @if (instance.instanceInfo) {
-                    <div class="badge bg-{{ instance.instanceInfo.status === 'UP' ? 'success' : 'danger' }}">{{ instance.instanceInfo.status }}</div>
-                  } @else {
-                    <div class="badge bg-warning">?</div>
-                  }
-                  </td>
-                  <td>
-                  @for (entry of (instance.metadata | keyvalue ); track entry.key) {
-                    <span>
-                      <span class="badge bg-default fw-normal">
-                        <span class="badge rounded-pill bg-info fw-normal">{{ entry.key }}</span>
-                        <span class="text-secondary">{{ entry.value }}</span>
-                      </span>
-                    </span>
-                  }
-                  </td>
-                </tr>
+        @for (route of gatewayRoutes; track route.path) {
+          <tr>
+            <td>{{ route.path }}</td>
+            <td>{{ route.serviceId }}</td>
+            <td>
+              @if (route.serviceInstances.length === 0) {
+                <div class="label label-danger">__jhiTranslateTag__('gateway.routes.error')</div>
               }
-              </table>
-            }
-            </div>
-          </td>
-        </tr>
-      }
+
+              <div class="table-responsive">
+                @if (route) {
+                  <table class="table table-striped">
+                    @for (instance of route.serviceInstances; track instance.uri) {
+                      <tr>
+                        <td>
+                          <a href="{{ instance.uri }}" target="_blank">{{ instance.uri }}</a>
+                        </td>
+                        <td>
+                          @if (instance.instanceInfo) {
+                            <div class="badge bg-{{ instance.instanceInfo.status === 'UP' ? 'success' : 'danger' }}">
+                              {{ instance.instanceInfo.status }}
+                            </div>
+                          } @else {
+                            <div class="badge bg-warning">?</div>
+                          }
+                        </td>
+                        <td>
+                          @for (entry of instance.metadata | keyvalue; track entry.key) {
+                            <span>
+                              <span class="badge bg-default fw-normal">
+                                <span class="badge rounded-pill bg-info fw-normal">{{ entry.key }}</span>
+                                <span class="text-secondary">{{ entry.value }}</span>
+                              </span>
+                            </span>
+                          }
+                        </td>
+                      </tr>
+                    }
+                  </table>
+                }
+              </div>
+            </td>
+          </tr>
+        }
       </tbody>
     </table>
   </div>

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
@@ -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
@@ -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
@@ -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/...ors/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs b/...ors/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/...nt/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs b/...nt/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/...tors/java/generators/domain/templates/src/test/java/_package_/domain/AssertUtils.java.ejs b/...tors/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<ZonedDateTime> zonedDataTimeSameInstant = Comparator.nullsFirst(
-        (e1, a2) -> e1.withZoneSameInstant(ZoneOffset.UTC).compareTo(a2.withZoneSameInstant(ZoneOffset.UTC))
+    public static Comparator<ZonedDateTime> zonedDataTimeSameInstant = Comparator.nullsFirst((e1, a2) ->
+        e1.withZoneSameInstant(ZoneOffset.UTC).compareTo(a2.withZoneSameInstant(ZoneOffset.UTC))
     );
 
     public static Comparator<BigDecimal> bigDecimalCompareTo = Comparator.nullsFirst((e1, a2) -> e1.compareTo(a2));

diff --git a/...pring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs b/...pring-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/...rs/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs b/...rs/spring-boot/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs
@@ -82,11 +82,10 @@ public class AuthenticateController {
     @PostMapping("/authenticate")
     public Mono<ResponseEntity<JWTToken>> authorize(@Valid @RequestBody Mono<LoginVM> 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/...ing-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs b/...ing-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs
@@ -547,7 +547,11 @@ class UserServiceIT {
 
     private OAuth2AuthenticationToken createMockOAuth2AuthenticationToken(Map<String, Object> userDetails) {
         Collection<GrantedAuthority> 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
@@ -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);