Angular oauth2 / clean code

jhipster · May 17, 2022 · dae6982 · dae6982
1 parent ba158bb
commit dae6982
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 25 deletions.
diff --git a/src/main/java/tech/jhipster/lite/generator/client/angular/common/domain/AngularCommon.java b/src/main/java/tech/jhipster/lite/generator/client/angular/common/domain/AngularCommon.java
@@ -4,6 +4,8 @@
 
 public class AngularCommon {
 
+  protected static final String ANGULAR_JSON_FILE_NAME = "angular.json";
+
   protected static final String IMPORT_REGEX = "(^import[\\s]+[^;]+;)";
   protected static final String EXISTING_IMPORT_PATTERN = "^(import[\\s]+\\{[^\\}]+)\\} from '[%s]+';";
 

diff --git a/...tech/jhipster/lite/generator/client/angular/common/domain/AngularCommonDomainService.java b/...tech/jhipster/lite/generator/client/angular/common/domain/AngularCommonDomainService.java
@@ -2,6 +2,7 @@
 
 import static tech.jhipster.lite.common.domain.WordUtils.indent;
 import static tech.jhipster.lite.generator.client.angular.common.domain.AngularCommon.ALLOWED_COMMON_JS_DEPENDENCIES_REGEX_LIST;
+import static tech.jhipster.lite.generator.client.angular.common.domain.AngularCommon.ANGULAR_JSON_FILE_NAME;
 import static tech.jhipster.lite.generator.client.angular.common.domain.AngularCommon.COMA;
 import static tech.jhipster.lite.generator.client.angular.common.domain.AngularCommon.C_BRACKET;
 import static tech.jhipster.lite.generator.client.angular.common.domain.AngularCommon.DECLARATIONS_REGEX;
@@ -112,7 +113,7 @@ public void addTest(Project project, String specTsFilePath, String testToAdd, St
 
   @Override
   public void addAllowedCommonJsDependenciesAngularJson(Project project, String libToAdd) {
-    String fullFilePath = FileUtils.getPath(project.getFolder(), "angular.json");
+    String fullFilePath = FileUtils.getPath(project.getFolder(), ANGULAR_JSON_FILE_NAME);
     String fileContent = getFileContent(fullFilePath);
     String newFileContent = getFirstMatchInFile(ALLOWED_COMMON_JS_DEPENDENCIES_REGEX_LIST, fileContent)
       .map(dependenciesPrefix -> appendValuesInList(fileContent, dependenciesPrefix, libToAdd, project.getEndOfLine()))

diff --git a/...ster/lite/generator/client/angular/security/oauth2/domain/AngularOauth2DomainService.java b/...ster/lite/generator/client/angular/security/oauth2/domain/AngularOauth2DomainService.java
@@ -83,10 +83,10 @@ private void updateAppModuleTsFile(Project project) {
       project,
       APP_MODULE_TS_FILE_PATH,
       """
-        import {HTTP_INTERCEPTORS} from '@angular/common/http';
-        import {LoginComponent} from './login/login.component';
-        import {Oauth2AuthService} from './auth/oauth2-auth.service';
-        import {HttpAuthInterceptor} from './auth/http-auth.interceptor';
+        import { HTTP_INTERCEPTORS } from '@angular/common/http';
+        import { LoginComponent } from './login/login.component';
+        import { Oauth2AuthService } from './auth/oauth2-auth.service';
+        import { HttpAuthInterceptor } from './auth/http-auth.interceptor';
         """
     );
 
@@ -151,8 +151,8 @@ private void addTestInAppSpecTsFile(Project project) {
       project,
       APP_COMPONENT_SPEC_TS_FILE_PATH,
       """
-        import {By} from '@angular/platform-browser';
-        import {LoginComponent} from './login/login.component';
+        import { By } from '@angular/platform-browser';
+        import { LoginComponent } from './login/login.component';
         """
     );
     angularCommonService.addDeclarations(project, APP_COMPONENT_SPEC_TS_FILE_PATH, """

diff --git a/...esources/generator/client/angular/core/src/main/webapp/app/app.component.spec.ts.mustache b/...esources/generator/client/angular/core/src/main/webapp/app/app.component.spec.ts.mustache
@@ -1,7 +1,7 @@
-import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
-import {RouterTestingModule} from '@angular/router/testing';
-import {MatToolbarModule} from '@angular/material/toolbar';
-import {MatIconModule} from '@angular/material/icon';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { MatToolbarModule } from '@angular/material/toolbar';
+import { MatIconModule } from '@angular/material/icon';
 
 import { AppComponent } from './app.component';
 

diff --git a/...tor/client/angular/security/oauth2/src/main/webapp/app/auth/http-auth.interceptor.spec.ts b/...tor/client/angular/security/oauth2/src/main/webapp/app/auth/http-auth.interceptor.spec.ts
@@ -1,9 +1,10 @@
 import { TestBed } from '@angular/core/testing';
+import { HttpHandler, HttpRequest } from '@angular/common/http';
+import { lastValueFrom, of } from 'rxjs';
 
 import { HttpAuthInterceptor } from './http-auth.interceptor';
 import { Oauth2AuthService } from './oauth2-auth.service';
-import { HttpHandler, HttpRequest } from '@angular/common/http';
-import { lastValueFrom, of } from 'rxjs';
+
 import Mock = jest.Mock;
 
 const URL = 'http://localhost:8080/api/dummy';

diff --git a/...ipster/lite/generator/client/angular/security/oauth2/application/AngularOauth2Assert.java b/...ipster/lite/generator/client/angular/security/oauth2/application/AngularOauth2Assert.java
@@ -44,10 +44,10 @@ public static void assertUpdatedFiles(Project project) throws IOException {
       """
         import { NgModule, APP_INITIALIZER} from '@angular/core';
         import { MatButtonToggleModule } from '@angular/material/button-toggle';
-        import {HTTP_INTERCEPTORS} from '@angular/common/http';
-        import {LoginComponent} from './login/login.component';
-        import {Oauth2AuthService} from './auth/oauth2-auth.service';
-        import {HttpAuthInterceptor} from './auth/http-auth.interceptor';
+        import { HTTP_INTERCEPTORS } from '@angular/common/http';
+        import { LoginComponent } from './login/login.component';
+        import { Oauth2AuthService } from './auth/oauth2-auth.service';
+        import { HttpAuthInterceptor } from './auth/http-auth.interceptor';
 
         const initializeApp = (oauth2AuthService: Oauth2AuthService) => {
           return () => {
@@ -127,8 +127,8 @@ public static void assertUpdatedFiles(Project project) throws IOException {
     expectedContentLines =
       """
         import { AppComponent } from './app.component';
-        import {By} from '@angular/platform-browser';
-        import {LoginComponent} from './login/login.component';
+        import { By } from '@angular/platform-browser';
+        import { LoginComponent } from './login/login.component';
 
           beforeEach(
             waitForAsync(() => {

diff --git a/.../lite/generator/client/angular/security/oauth2/domain/AngularOauth2DomainServiceTest.java b/.../lite/generator/client/angular/security/oauth2/domain/AngularOauth2DomainServiceTest.java
@@ -113,10 +113,10 @@ private void verifyUpdatedFiles(Project project) {
         project,
         APP_MODULE_TS_FILE_PATH,
         """
-        import {HTTP_INTERCEPTORS} from '@angular/common/http';
-        import {LoginComponent} from './login/login.component';
-        import {Oauth2AuthService} from './auth/oauth2-auth.service';
-        import {HttpAuthInterceptor} from './auth/http-auth.interceptor';
+        import { HTTP_INTERCEPTORS } from '@angular/common/http';
+        import { LoginComponent } from './login/login.component';
+        import { Oauth2AuthService } from './auth/oauth2-auth.service';
+        import { HttpAuthInterceptor } from './auth/http-auth.interceptor';
         """
       );
 
@@ -177,8 +177,8 @@ private void verifyUpdatedFiles(Project project) {
         project,
         APP_COMPONENT_SPEC_TS_FILE_PATH,
         """
-        import {By} from '@angular/platform-browser';
-        import {LoginComponent} from './login/login.component';
+        import { By } from '@angular/platform-browser';
+        import { LoginComponent } from './login/login.component';
         """
       );