Merge pull request #418 from jhipster/somesonar

Sonar issues
jhipster · Sep 17, 2023 · 9be1842 · 9be1842
2 parents 0cfd528 + a15a4d5
commit 9be1842
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 22 deletions.
diff --git a/src/main/java/io/github/jhipster/online/JhonlineApp.java b/src/main/java/io/github/jhipster/online/JhonlineApp.java
@@ -93,6 +93,7 @@ private static void logApplicationStartup(Environment env) {
             protocol = "https";
         }
         String serverPort = env.getProperty("server.port");
+        String applicationName = env.getProperty("spring.application.name");
         String contextPath = env.getProperty("server.servlet.context-path");
         if (StringUtils.isBlank(contextPath)) {
             contextPath = "/";
@@ -109,7 +110,7 @@ private static void logApplicationStartup(Environment env) {
             "Local: \t\t{}://localhost:{}{}\n\t" +
             "External: \t{}://{}:{}{}\n\t" +
             "Profile(s): \t{}\n----------------------------------------------------------",
-            env.getProperty("spring.application.name"),
+            applicationName,
             protocol,
             serverPort,
             contextPath,

diff --git a/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts b/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts
@@ -30,7 +30,7 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
     return next.handle(request).pipe(
       tap({
         error: (err: HttpErrorResponse) => {
-          if (!(err.status === 401 && (err.message === '' || (err.url && err.url.includes('api/account'))))) {
+          if (!(err.status === 401 && (err.message === '' || err.url?.includes('api/account')))) {
             this.eventManager.broadcast(new JhiEventWithContent('jhonlineApp.httpError', err));
           }
         }

diff --git a/src/main/webapp/app/home/ci-cd/ci-cd.output.component.ts b/src/main/webapp/app/home/ci-cd/ci-cd.output.component.ts
@@ -63,10 +63,8 @@ export class CiCdOutputDialogComponent implements OnInit {
             setTimeout(() => {
               this.updateLogsData();
             }, 2000);
-          } else {
-            if (data.endsWith('Generation finished\n')) {
-              this.displayApplicationUrl = true;
-            }
+          } else if (data.endsWith('Generation finished\n')) {
+            this.displayApplicationUrl = true;
           }
         },
         () => {

diff --git a/src/main/webapp/app/home/generator/generator.output.component.ts b/src/main/webapp/app/home/generator/generator.output.component.ts
@@ -66,10 +66,8 @@ export class GeneratorOutputDialogComponent implements OnInit {
             setTimeout(() => {
               this.updateLogsData();
             }, 500);
-          } else {
-            if (data.endsWith('Generation finished\n')) {
-              this.displayApplicationUrl = true;
-            }
+          } else if (data.endsWith('Generation finished\n')) {
+            this.displayApplicationUrl = true;
           }
         },
         () => {

diff --git a/src/main/webapp/app/home/jdl-metadata/jdl-metadata.service.ts b/src/main/webapp/app/home/jdl-metadata/jdl-metadata.service.ts
@@ -51,6 +51,6 @@ export class JdlMetadataService {
   }
 
   private convert(jdlMetadata: JdlMetadata): JdlMetadata {
-    return Object.assign({}, jdlMetadata);
+    return { ...jdlMetadata };
   }
 }
diff --git a/src/main/webapp/app/home/jdl-metadata/jdl.output.component.ts b/src/main/webapp/app/home/jdl-metadata/jdl.output.component.ts
@@ -62,10 +62,8 @@ export class JdlOutputDialogComponent implements OnInit {
             setTimeout(() => {
               this.updateLogsData();
             }, 2000);
-          } else {
-            if (data.endsWith('Generation finished\n')) {
-              this.displayBranchUrl = true;
-            }
+          } else if (data.endsWith('Generation finished\n')) {
+            this.displayBranchUrl = true;
           }
         },
         () => {

diff --git a/src/main/webapp/app/layouts/main/main.component.ts b/src/main/webapp/app/layouts/main/main.component.ts
@@ -44,7 +44,7 @@ export class MainComponent implements OnInit {
   }
 
   private getPageTitle(routeSnapshot: ActivatedRouteSnapshot): string {
-    let title: string = routeSnapshot.data && routeSnapshot.data['pageTitle'] ? routeSnapshot.data['pageTitle'] : '';
+    let title: string = routeSnapshot.data?.pageTitle ?? '';
     if (routeSnapshot.firstChild) {
       title = this.getPageTitle(routeSnapshot.firstChild) || title;
     }

diff --git a/src/main/webapp/app/layouts/profiles/profile.service.ts b/src/main/webapp/app/layouts/profiles/profile.service.ts
@@ -39,14 +39,12 @@ export class ProfileService {
       map((response: InfoResponse) => {
         const profileInfo: ProfileInfo = {
           activeProfiles: response.activeProfiles,
-          inProduction: response.activeProfiles && response.activeProfiles.includes('prod'),
-          swaggerEnabled: response.activeProfiles && response.activeProfiles.includes('swagger')
+          inProduction: response.activeProfiles?.includes('prod'),
+          swaggerEnabled: response.activeProfiles?.includes('swagger')
         };
         if (response.activeProfiles && response['display-ribbon-on-profiles']) {
           const displayRibbonOnProfiles = response['display-ribbon-on-profiles'].split(',');
-          const ribbonProfiles = displayRibbonOnProfiles.filter(
-            profile => response.activeProfiles && response.activeProfiles.includes(profile)
-          );
+          const ribbonProfiles = displayRibbonOnProfiles.filter(profile => response.activeProfiles?.includes(profile));
           if (ribbonProfiles.length > 0) {
             profileInfo.ribbonEnv = ribbonProfiles[0];
           }

diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -78,7 +78,7 @@ <h1>You must enable javascript to view this page.</h1>
         }
         function showError() {
             var errorElm = document.getElementById("jhipster-error");
-            if (errorElm && errorElm.style) {
+            if (errorElm?.style) {
                 errorElm.style.display = "block";
             }
         }