diff --git a/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs b/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs index 60518cc38e13..a2ede8e54a28 100644 --- a/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs @@ -20,15 +20,15 @@

__jhiTranslateTag__('activate.title')

- @if (success()) { -
- __jhiTranslateTag__('activate.messages.success') - __jhiTranslateTag__('global.messages.info.authenticated.link'). -
- } - @if (error()) { -
__jhiTranslateTag__('activate.messages.error')
- } + @if (success()) { +
+ __jhiTranslateTag__('activate.messages.success') + __jhiTranslateTag__('global.messages.info.authenticated.link'). +
+ } + @if (error()) { +
__jhiTranslateTag__('activate.messages.error')
+ }
diff --git a/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs index f2b8116967e4..d9249aea5c6b 100644 --- a/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs @@ -27,22 +27,20 @@ import ActivateComponent from './activate.component'; describe('ActivateComponent', () => { let comp: ActivateComponent; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ActivateComponent], - providers: [ - provideHttpClient(), - { - provide: ActivatedRoute, - useValue: { queryParams: of({ key: 'ABC123' }) }, - }, - ], - }) - .overrideTemplate(ActivateComponent, '') - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ActivateComponent], + providers: [ + provideHttpClient(), + { + provide: ActivatedRoute, + useValue: { queryParams: of({ key: 'ABC123' }) }, + }, + ], }) - ); + .overrideTemplate(ActivateComponent, '') + .compileComponents(); + })); beforeEach(() => { const fixture = TestBed.createComponent(ActivateComponent); @@ -58,7 +56,7 @@ describe('ActivateComponent', () => { tick(); expect(service.get).toHaveBeenCalledWith('ABC123'); - }) + }), )); it('should set set success to true upon successful activation', inject( @@ -71,7 +69,7 @@ describe('ActivateComponent', () => { expect(comp.error()).toBe(false); expect(comp.success()).toBe(true); - }) + }), )); it('should set set error to true upon activation failure', inject( @@ -84,6 +82,6 @@ describe('ActivateComponent', () => { expect(comp.error()).toBe(true); expect(comp.success()).toBe(false); - }) + }), )); }); diff --git a/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs index 3e4e04adf161..940a2eb36307 100644 --- a/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs @@ -39,7 +39,7 @@ export default class ActivateComponent implements OnInit { ngOnInit(): void { this.route.queryParams.pipe(mergeMap(params => this.activateService.get(params.key))).subscribe({ next: () => this.success.set(true), - error: () => this.error.set(true) + error: () => this.error.set(true), }); } } diff --git a/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs index 128ef950da54..dc1fa1f6ff5f 100644 --- a/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs @@ -93,7 +93,7 @@ describe('PasswordResetFinishComponent', () => { expect(service.save).toHaveBeenCalledWith('XYZPDQ', 'password'); expect(comp.success()).toBe(true); - }) + }), )); it('should notify of generic error', inject( @@ -111,6 +111,6 @@ describe('PasswordResetFinishComponent', () => { expect(service.save).toHaveBeenCalledWith('XYZPDQ', 'password'); expect(comp.success()).toBe(false); expect(comp.error()).toBe(true); - }) + }), )); }); diff --git a/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs index e82d8374c024..43c7976e31dd 100644 --- a/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs @@ -76,8 +76,8 @@ export default class PasswordResetFinishComponent implements OnInit, AfterViewIn this.doNotMatch.set(true); } else { this.passwordResetFinishService.save(this.key(), newPassword).subscribe({ - next: () => (this.success.set(true)), - error: () => (this.error.set(true)), + next: () => this.success.set(true), + error: () => this.error.set(true), }); } } diff --git a/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs index 04a2a3c05974..285fdc6296b4 100644 --- a/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs @@ -64,9 +64,7 @@ describe('PasswordResetInitComponent', () => { it('no notification of success upon error response', inject([PasswordResetInitService], (service: PasswordResetInitService) => { const err = { status: 503, data: 'something else' }; - jest.spyOn(service, 'save').mockReturnValue( - throwError(() => err) - ); + jest.spyOn(service, 'save').mockReturnValue(throwError(() => err)); comp.resetRequestForm.patchValue({ email: 'user@domain.com', }); diff --git a/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs index a4ee64b4fc5d..cf2ea11d6efc 100644 --- a/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs @@ -24,15 +24,13 @@ describe('PasswordStrengthBarComponent', () => { let comp: PasswordStrengthBarComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [PasswordStrengthBarComponent], - }) - .overrideTemplate(PasswordStrengthBarComponent, '') - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [PasswordStrengthBarComponent], }) - ); + .overrideTemplate(PasswordStrengthBarComponent, '') + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(PasswordStrengthBarComponent); diff --git a/generators/angular/templates/src/main/webapp/app/account/password/password.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/password/password.component.spec.ts.ejs index cf90e8ed3f3d..f6b36dbfb34c 100644 --- a/generators/angular/templates/src/main/webapp/app/account/password/password.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/password/password.component.spec.ts.ejs @@ -33,16 +33,14 @@ describe('PasswordComponent', () => { let fixture: ComponentFixture; let service: PasswordService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [PasswordComponent], - providers: [FormBuilder, AccountService, provideHttpClient()], - }) - .overrideTemplate(PasswordComponent, '') - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [PasswordComponent], + providers: [FormBuilder, AccountService, provideHttpClient()], }) - ); + .overrideTemplate(PasswordComponent, '') + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(PasswordComponent); diff --git a/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs index d2c142a1f321..12a35dc8e1b1 100644 --- a/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs @@ -66,8 +66,8 @@ export default class PasswordComponent implements OnInit { this.doNotMatch.set(true); } else { this.passwordService.save(newPassword, currentPassword).subscribe({ - next: () => (this.success.set(true)), - error: () => (this.error.set(true)), + next: () => this.success.set(true), + error: () => this.error.set(true), }); } } diff --git a/generators/angular/templates/src/main/webapp/app/account/password/password.service.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/password/password.service.spec.ts.ejs index c29b67f42b04..58ed05a15d58 100644 --- a/generators/angular/templates/src/main/webapp/app/account/password/password.service.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/password/password.service.spec.ts.ejs @@ -33,7 +33,10 @@ describe('Password Service', () => { // WHEN service.save(password2, password1).subscribe(); - const testRequest = httpMock.expectOne({ method: 'POST', url: applicationConfigService.getEndpointFor('api/account/change-password') }); + const testRequest = httpMock.expectOne({ + method: 'POST', + url: applicationConfigService.getEndpointFor('api/account/change-password'), + }); // THEN expect(testRequest.request.body).toEqual({ currentPassword: password1, newPassword: password2 }); diff --git a/generators/angular/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs index 53b1bc9afb1d..62007a6cbc0c 100644 --- a/generators/angular/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs @@ -90,16 +90,14 @@ describe('RegisterComponent', () => { expect(comp.errorUserExists()).toBe(false); expect(comp.errorEmailExists()).toBe(false); expect(comp.error()).toBe(false); - }) + }), )); it('should notify of user existence upon 400/login already in use', inject( [RegisterService], fakeAsync((service: RegisterService) => { const err = { status: 400, error: { type: LOGIN_ALREADY_USED_TYPE } }; - jest.spyOn(service, 'save').mockReturnValue( - throwError(() => err) - ); + jest.spyOn(service, 'save').mockReturnValue(throwError(() => err)); comp.registerForm.patchValue({ password: 'password', confirmPassword: 'password', @@ -111,16 +109,14 @@ describe('RegisterComponent', () => { expect(comp.errorUserExists()).toBe(true); expect(comp.errorEmailExists()).toBe(false); expect(comp.error()).toBe(false); - }) + }), )); it('should notify of email existence upon 400/email address already in use', inject( [RegisterService], fakeAsync((service: RegisterService) => { const err = { status: 400, error: { type: EMAIL_ALREADY_USED_TYPE } }; - jest.spyOn(service, 'save').mockReturnValue( - throwError(() => err) - ); + jest.spyOn(service, 'save').mockReturnValue(throwError(() => err)); comp.registerForm.patchValue({ password: 'password', confirmPassword: 'password', @@ -132,16 +128,14 @@ describe('RegisterComponent', () => { expect(comp.errorEmailExists()).toBe(true); expect(comp.errorUserExists()).toBe(false); expect(comp.error()).toBe(false); - }) + }), )); it('should notify of generic error', inject( [RegisterService], fakeAsync((service: RegisterService) => { const err = { status: 503 }; - jest.spyOn(service, 'save').mockReturnValue( - throwError(() => err) - ); + jest.spyOn(service, 'save').mockReturnValue(throwError(() => err)); comp.registerForm.patchValue({ password: 'password', confirmPassword: 'password', @@ -153,6 +147,6 @@ describe('RegisterComponent', () => { expect(comp.errorUserExists()).toBe(false); expect(comp.errorEmailExists()).toBe(false); expect(comp.error()).toBe(true); - }) + }), )); }); diff --git a/generators/angular/templates/src/main/webapp/app/account/register/register.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/register/register.model.ts.ejs index e46da7472469..ffe7029aaa67 100644 --- a/generators/angular/templates/src/main/webapp/app/account/register/register.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/register/register.model.ts.ejs @@ -17,5 +17,10 @@ limitations under the License. -%> export class Registration { - constructor(public login: string, public email: string, public password: string, public langKey: string) {} + constructor( + public login: string, + public email: string, + public password: string, + public langKey: string, + ) {} } diff --git a/generators/angular/templates/src/main/webapp/app/account/sessions/session.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/sessions/session.model.ts.ejs index 1d3535a55380..5f82bd7ebb34 100644 --- a/generators/angular/templates/src/main/webapp/app/account/sessions/session.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/sessions/session.model.ts.ejs @@ -21,6 +21,6 @@ export class Session { public series: string, public tokenDate: Date, public ipAddress: string, - public userAgent: string + public userAgent: string, ) {} } diff --git a/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs index a068b51e09c7..d27d3f394711 100644 --- a/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs @@ -69,7 +69,7 @@ describe('SessionsComponent', () => { expect(comp.error).toBe(false); expect(comp.account).toEqual(account); expect(comp.sessions).toEqual(sessions); - }) + }), )); it('should call delete on Sessions to invalidate a session', inject( @@ -84,7 +84,7 @@ describe('SessionsComponent', () => { tick(); expect(service.delete).toHaveBeenCalledWith('xyz'); - }) + }), )); it('should call delete on Sessions and notify of error', inject( @@ -100,7 +100,7 @@ describe('SessionsComponent', () => { expect(comp.success).toBe(false); expect(comp.error).toBe(true); - }) + }), )); it('should call notify of success upon session invalidation', inject( @@ -116,6 +116,6 @@ describe('SessionsComponent', () => { expect(comp.error).toBe(false); expect(comp.success).toBe(true); - }) + }), )); }); diff --git a/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs index 047f3a33fa0a..21cfd6ecd9ad 100644 --- a/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs @@ -40,9 +40,9 @@ export default class SessionsComponent implements OnInit { private accountService = inject(AccountService); ngOnInit(): void { - this.sessionsService.findAll().subscribe(sessions => this.sessions = sessions); + this.sessionsService.findAll().subscribe(sessions => (this.sessions = sessions)); - this.accountService.identity().subscribe(account => this.account = account); + this.accountService.identity().subscribe(account => (this.account = account)); } invalidate(series: string): void { @@ -52,9 +52,9 @@ export default class SessionsComponent implements OnInit { this.sessionsService.delete(encodeURIComponent(series)).subscribe( () => { this.success = true; - this.sessionsService.findAll().subscribe(sessions => this.sessions = sessions); + this.sessionsService.findAll().subscribe(sessions => (this.sessions = sessions)); }, - () => this.error = true + () => (this.error = true), ); } } diff --git a/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs index 230e501dc9ec..09e94d351865 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs @@ -29,16 +29,14 @@ describe('ConfigurationComponent', () => { let fixture: ComponentFixture; let service: ConfigurationService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ConfigurationComponent], - providers: [provideHttpClient(), ConfigurationService], - }) - .overrideTemplate(ConfigurationComponent, '') - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ConfigurationComponent], + providers: [provideHttpClient(), ConfigurationService], }) - ); + .overrideTemplate(ConfigurationComponent, '') + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ConfigurationComponent); diff --git a/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs index a77e3b58db8a..f8e4f8bf2c10 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs @@ -35,9 +35,9 @@ export class ConfigurationService { Object.values( Object.values(configProps.contexts) .map(context => context.beans) - .reduce((allBeans: Beans, contextBeans: Beans) => ({ ...allBeans, ...contextBeans }), {}) - ) - ) + .reduce((allBeans: Beans, contextBeans: Beans) => ({ ...allBeans, ...contextBeans }), {}), + ), + ), ); } diff --git a/generators/angular/templates/src/main/webapp/app/admin/docs/docs.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/docs/docs.component.html.ejs index 40cde1dc8326..2c19ae081970 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/docs/docs.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/docs/docs.component.html.ejs @@ -16,4 +16,13 @@ See the License for the specific language governing permissions and limitations under the License. -%> - + diff --git a/generators/angular/templates/src/main/webapp/app/admin/health/health.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/health/health.component.spec.ts.ejs index a3a710dbad97..fd59cb7760db 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/health/health.component.spec.ts.ejs @@ -29,16 +29,14 @@ describe('HealthComponent', () => { let fixture: ComponentFixture; let service: HealthService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [HealthComponent], - providers: [provideHttpClient()], - }) - .overrideTemplate(HealthComponent, '') - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [HealthComponent], + providers: [provideHttpClient()], }) - ); + .overrideTemplate(HealthComponent, '') + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(HealthComponent); diff --git a/generators/angular/templates/src/main/webapp/app/admin/health/health.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/health/health.component.ts.ejs index edde4a666ace..a7ae65495f83 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/health/health.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/health/health.component.ts.ejs @@ -55,7 +55,7 @@ export default class HealthComponent implements OnInit { if (error.status === 503) { this.health = error.error; } - } + }, }); } diff --git a/generators/angular/templates/src/main/webapp/app/admin/health/health.service.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/health/health.service.spec.ts.ejs index befd97a9940c..04d9885c3fa0 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/health/health.service.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/health/health.service.spec.ts.ejs @@ -47,7 +47,7 @@ describe('HealthService Service', () => { // GIVEN let expectedResult; const checkHealth = { - components: [] + components: [], }; // WHEN diff --git a/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs index d32c21b04ddf..017b71ece4a6 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs @@ -9,16 +9,14 @@ describe('HealthModalComponent', () => { let fixture: ComponentFixture; let mockActiveModal: NgbActiveModal; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [HealthModalComponent], - providers: [provideHttpClient(), NgbActiveModal], - }) - .overrideTemplate(HealthModalComponent, '') - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [HealthModalComponent], + providers: [provideHttpClient(), NgbActiveModal], }) - ); + .overrideTemplate(HealthModalComponent, '') + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(HealthModalComponent); @@ -32,7 +30,7 @@ describe('HealthModalComponent', () => { comp.health = undefined; // WHEN - const result = comp.readableValue({ 'name': 'jhipster' }); + const result = comp.readableValue({ name: 'jhipster' }); // THEN expect(result).toEqual('{"name":"jhipster"}'); @@ -54,8 +52,8 @@ describe('HealthModalComponent', () => { comp.health = { key: 'diskSpace', value: { - status: 'UP' - } + status: 'UP', + }, }; // WHEN @@ -70,8 +68,8 @@ describe('HealthModalComponent', () => { comp.health = { key: 'diskSpace', value: { - status: 'UP' - } + status: 'UP', + }, }; // WHEN @@ -86,8 +84,8 @@ describe('HealthModalComponent', () => { comp.health = { key: 'mail', value: { - status: 'UP' - } + status: 'UP', + }, }; // WHEN diff --git a/generators/angular/templates/src/main/webapp/app/admin/logs/log.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/logs/log.model.ts.ejs index af09758886a5..873b5db2982e 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/logs/log.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/logs/log.model.ts.ejs @@ -31,6 +31,6 @@ export interface LoggersResponse { export class Log { constructor( public name: string, - public level: Level + public level: Level, ) {} } diff --git a/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs index 8a4e274429a8..535f372c445d 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs @@ -67,7 +67,7 @@ describe('LogsComponent', () => { effectiveLevel: 'WARN', }, }, - } as unknown as LoggersResponse) + } as unknown as LoggersResponse), ); // WHEN @@ -91,7 +91,7 @@ describe('LogsComponent', () => { effectiveLevel: 'ERROR', }, }, - } as unknown as LoggersResponse) + } as unknown as LoggersResponse), ); // WHEN diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs index e5d34e0eac42..eb32a486445c 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs @@ -19,28 +19,25 @@

__jhiTranslateTag__('metrics.jvm.memory.title')

@if (!updating() && jvmMemoryMetrics()) { -
- @for (entry of jvmMemoryMetrics() | keyvalue; track $index) {
- @if (entry.value.max !== -1) { - - {{ entry.key }} - ({{ entry.value.used / 1048576 | number: '1.0-0' }}M / {{ entry.value.max / 1048576 | number: '1.0-0' }}M) - + @for (entry of jvmMemoryMetrics() | keyvalue; track $index) { +
+ @if (entry.value.max !== -1) { + + {{ entry.key }} + ({{ entry.value.used / 1048576 | number: '1.0-0' }}M / {{ entry.value.max / 1048576 | number: '1.0-0' }}M) + -
Committed : {{ entry.value.committed / 1048576 | number: '1.0-0' }}M
- - {{ (entry.value.used * 100) / entry.value.max | number: '1.0-0' }}% - - } @else { - {{ entry.key }} {{ entry.value.used / 1048576 | number: '1.0-0' }}M - } +
Committed : {{ entry.value.committed / 1048576 | number: '1.0-0' }}M
+ + {{ (entry.value.used * 100) / entry.value.max | number: '1.0-0' }}% + + } @else { + {{ entry.key }} {{ entry.value.used / 1048576 | number: '1.0-0' }}M + } +
+ }
- } -
} diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs index 85e97a6048ab..a75fd029eb17 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs @@ -19,46 +19,46 @@

__jhiTranslateTag__('metrics.cache.title')

@if (!updating() && cacheMetrics()) { -
- - - - - - - - - - - - - - - - @for (entry of cacheMetrics() | keyvalue; track entry.key) { - - - - - - - - - - - - } - -
__jhiTranslateTag__('metrics.cache.cachename')__jhiTranslateTag__('metrics.cache.hits')__jhiTranslateTag__('metrics.cache.misses')__jhiTranslateTag__('metrics.cache.gets')__jhiTranslateTag__('metrics.cache.puts')__jhiTranslateTag__('metrics.cache.removals')__jhiTranslateTag__('metrics.cache.evictions')__jhiTranslateTag__('metrics.cache.hitPercent')__jhiTranslateTag__('metrics.cache.missPercent')
{{ entry.key }}{{ entry.value['cache.gets.hit'] }}{{ entry.value['cache.gets.miss'] }}{{ entry.value['cache.gets.hit'] + entry.value['cache.gets.miss'] }}{{ entry.value['cache.puts'] }}{{ entry.value['cache.removals'] }}{{ entry.value['cache.evictions'] }} - {{ - filterNaN((100 * entry.value['cache.gets.hit']) / (entry.value['cache.gets.hit'] + entry.value['cache.gets.miss'])) - | number: '1.0-4' - }} - - {{ - filterNaN((100 * entry.value['cache.gets.miss']) / (entry.value['cache.gets.hit'] + entry.value['cache.gets.miss'])) - | number: '1.0-4' - }} -
-
+
+ + + + + + + + + + + + + + + + @for (entry of cacheMetrics() | keyvalue; track entry.key) { + + + + + + + + + + + + } + +
__jhiTranslateTag__('metrics.cache.cachename')__jhiTranslateTag__('metrics.cache.hits')__jhiTranslateTag__('metrics.cache.misses')__jhiTranslateTag__('metrics.cache.gets')__jhiTranslateTag__('metrics.cache.puts')__jhiTranslateTag__('metrics.cache.removals')__jhiTranslateTag__('metrics.cache.evictions')__jhiTranslateTag__('metrics.cache.hitPercent')__jhiTranslateTag__('metrics.cache.missPercent')
{{ entry.key }}{{ entry.value['cache.gets.hit'] }}{{ entry.value['cache.gets.miss'] }}{{ entry.value['cache.gets.hit'] + entry.value['cache.gets.miss'] }}{{ entry.value['cache.puts'] }}{{ entry.value['cache.removals'] }}{{ entry.value['cache.evictions'] }} + {{ + filterNaN((100 * entry.value['cache.gets.hit']) / (entry.value['cache.gets.hit'] + entry.value['cache.gets.miss'])) + | number: '1.0-4' + }} + + {{ + filterNaN((100 * entry.value['cache.gets.miss']) / (entry.value['cache.gets.hit'] + entry.value['cache.gets.miss'])) + | number: '1.0-4' + }} +
+
} diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs index 908c36430e8c..e19dfc63b60e 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs @@ -19,59 +19,59 @@

__jhiTranslateTag__('metrics.datasource.title')

@if (!updating() && datasourceMetrics()) { -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __jhiTranslateTag__('metrics.datasource.usage') (active: {{ datasourceMetrics()!.active.value }}, - min: {{ datasourceMetrics()!.min.value }}, max: {{ datasourceMetrics()!.max.value }}, idle: {{ datasourceMetrics()!.idle.value }}) - __jhiTranslateTag__('metrics.datasource.count')__jhiTranslateTag__('metrics.datasource.mean')__jhiTranslateTag__('metrics.servicesstats.table.min')__jhiTranslateTag__('metrics.servicesstats.table.p50')__jhiTranslateTag__('metrics.servicesstats.table.p75')__jhiTranslateTag__('metrics.servicesstats.table.p95')__jhiTranslateTag__('metrics.servicesstats.table.p99')__jhiTranslateTag__('metrics.datasource.max')
Acquire{{ datasourceMetrics()!.acquire.count }}{{ filterNaN(datasourceMetrics()!.acquire.mean) | number: '1.0-2' }}{{ datasourceMetrics()!.acquire['0.0'] | number: '1.0-3' }}{{ datasourceMetrics()!.acquire['0.5'] | number: '1.0-3' }}{{ datasourceMetrics()!.acquire['0.75'] | number: '1.0-3' }}{{ datasourceMetrics()!.acquire['0.95'] | number: '1.0-3' }}{{ datasourceMetrics()!.acquire['0.99'] | number: '1.0-3' }}{{ filterNaN(datasourceMetrics()!.acquire.max) | number: '1.0-2' }}
Creation{{ datasourceMetrics()!.creation.count }}{{ filterNaN(datasourceMetrics()!.creation.mean) | number: '1.0-2' }}{{ datasourceMetrics()!.creation['0.0'] | number: '1.0-3' }}{{ datasourceMetrics()!.creation['0.5'] | number: '1.0-3' }}{{ datasourceMetrics()!.creation['0.75'] | number: '1.0-3' }}{{ datasourceMetrics()!.creation['0.95'] | number: '1.0-3' }}{{ datasourceMetrics()!.creation['0.99'] | number: '1.0-3' }}{{ filterNaN(datasourceMetrics()!.creation.max) | number: '1.0-2' }}
Usage{{ datasourceMetrics()!.usage.count }}{{ filterNaN(datasourceMetrics()!.usage.mean) | number: '1.0-2' }}{{ datasourceMetrics()!.usage['0.0'] | number: '1.0-3' }}{{ datasourceMetrics()!.usage['0.5'] | number: '1.0-3' }}{{ datasourceMetrics()!.usage['0.75'] | number: '1.0-3' }}{{ datasourceMetrics()!.usage['0.95'] | number: '1.0-3' }}{{ datasourceMetrics()!.usage['0.99'] | number: '1.0-3' }}{{ filterNaN(datasourceMetrics()!.usage.max) | number: '1.0-2' }}
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ __jhiTranslateTag__('metrics.datasource.usage') (active: {{ datasourceMetrics()!.active.value }}, min: + {{ datasourceMetrics()!.min.value }}, max: {{ datasourceMetrics()!.max.value }}, idle: {{ datasourceMetrics()!.idle.value }}) + __jhiTranslateTag__('metrics.datasource.count')__jhiTranslateTag__('metrics.datasource.mean')__jhiTranslateTag__('metrics.servicesstats.table.min')__jhiTranslateTag__('metrics.servicesstats.table.p50')__jhiTranslateTag__('metrics.servicesstats.table.p75')__jhiTranslateTag__('metrics.servicesstats.table.p95')__jhiTranslateTag__('metrics.servicesstats.table.p99')__jhiTranslateTag__('metrics.datasource.max')
Acquire{{ datasourceMetrics()!.acquire.count }}{{ filterNaN(datasourceMetrics()!.acquire.mean) | number: '1.0-2' }}{{ datasourceMetrics()!.acquire['0.0'] | number: '1.0-3' }}{{ datasourceMetrics()!.acquire['0.5'] | number: '1.0-3' }}{{ datasourceMetrics()!.acquire['0.75'] | number: '1.0-3' }}{{ datasourceMetrics()!.acquire['0.95'] | number: '1.0-3' }}{{ datasourceMetrics()!.acquire['0.99'] | number: '1.0-3' }}{{ filterNaN(datasourceMetrics()!.acquire.max) | number: '1.0-2' }}
Creation{{ datasourceMetrics()!.creation.count }}{{ filterNaN(datasourceMetrics()!.creation.mean) | number: '1.0-2' }}{{ datasourceMetrics()!.creation['0.0'] | number: '1.0-3' }}{{ datasourceMetrics()!.creation['0.5'] | number: '1.0-3' }}{{ datasourceMetrics()!.creation['0.75'] | number: '1.0-3' }}{{ datasourceMetrics()!.creation['0.95'] | number: '1.0-3' }}{{ datasourceMetrics()!.creation['0.99'] | number: '1.0-3' }}{{ filterNaN(datasourceMetrics()!.creation.max) | number: '1.0-2' }}
Usage{{ datasourceMetrics()!.usage.count }}{{ filterNaN(datasourceMetrics()!.usage.mean) | number: '1.0-2' }}{{ datasourceMetrics()!.usage['0.0'] | number: '1.0-3' }}{{ datasourceMetrics()!.usage['0.5'] | number: '1.0-3' }}{{ datasourceMetrics()!.usage['0.75'] | number: '1.0-3' }}{{ datasourceMetrics()!.usage['0.95'] | number: '1.0-3' }}{{ datasourceMetrics()!.usage['0.99'] | number: '1.0-3' }}{{ filterNaN(datasourceMetrics()!.usage.max) | number: '1.0-2' }}
+
} diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs index a3c9b2dad137..bb4db77c13d4 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs @@ -19,28 +19,28 @@

Endpoints requests (time in millisecond)

@if (!updating() && endpointsRequestsMetrics()) { -
- - - - - - - - - - - @for (entry of endpointsRequestsMetrics() | keyvalue; track entry.key) { - @for (method of entry.value | keyvalue; track method.key) { - - - - - - - } - } - -
MethodEndpoint urlCountMean
{{ method.key }}{{ entry.key }}{{ method.value!.count }}{{ method.value!.mean | number: '1.0-3' }}
-
+
+ + + + + + + + + + + @for (entry of endpointsRequestsMetrics() | keyvalue; track entry.key) { + @for (method of entry.value | keyvalue; track method.key) { + + + + + + + } + } + +
MethodEndpoint urlCountMean
{{ method.key }}{{ entry.key }}{{ method.value!.count }}{{ method.value!.mean | number: '1.0-3' }}
+
} diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs index de1d2e6763b1..9113f6c354af 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs @@ -20,99 +20,100 @@
- @if (garbageCollectorMetrics()) { -
- - GC Live Data Size/GC Max Data Size ({{ garbageCollectorMetrics()!['jvm.gc.live.data.size'] / 1048576 | number: '1.0-0' }}M / - {{ garbageCollectorMetrics()!['jvm.gc.max.data.size'] / 1048576 | number: '1.0-0' }}M) - - - + @if (garbageCollectorMetrics()) { +
- {{ - (100 * garbageCollectorMetrics()!['jvm.gc.live.data.size']) / garbageCollectorMetrics()!['jvm.gc.max.data.size'] | number: '1.0-2' - }}% + GC Live Data Size/GC Max Data Size ({{ garbageCollectorMetrics()!['jvm.gc.live.data.size'] / 1048576 | number: '1.0-0' }}M / + {{ garbageCollectorMetrics()!['jvm.gc.max.data.size'] / 1048576 | number: '1.0-0' }}M) - -
- } + + + + {{ + (100 * garbageCollectorMetrics()!['jvm.gc.live.data.size']) / garbageCollectorMetrics()!['jvm.gc.max.data.size'] + | number: '1.0-2' + }}% + + +
+ }
- @if (garbageCollectorMetrics()) { -
- - GC Memory Promoted/GC Memory Allocated ({{ garbageCollectorMetrics()!['jvm.gc.memory.promoted'] / 1048576 | number: '1.0-0' }}M / - {{ garbageCollectorMetrics()!['jvm.gc.memory.allocated'] / 1048576 | number: '1.0-0' }}M) - - - + @if (garbageCollectorMetrics()) { +
- {{ - (100 * garbageCollectorMetrics()!['jvm.gc.memory.promoted']) / garbageCollectorMetrics()!['jvm.gc.memory.allocated'] - | number: '1.0-2' - }}% + GC Memory Promoted/GC Memory Allocated ({{ garbageCollectorMetrics()!['jvm.gc.memory.promoted'] / 1048576 | number: '1.0-0' }}M / + {{ garbageCollectorMetrics()!['jvm.gc.memory.allocated'] / 1048576 | number: '1.0-0' }}M) - -
- } + + + + {{ + (100 * garbageCollectorMetrics()!['jvm.gc.memory.promoted']) / garbageCollectorMetrics()!['jvm.gc.memory.allocated'] + | number: '1.0-2' + }}% + + +
+ }
- @if (garbageCollectorMetrics()) { -
-
Classes loaded
-
{{ garbageCollectorMetrics()!.classesLoaded }}
-
-
-
Classes unloaded
-
{{ garbageCollectorMetrics()!.classesUnloaded }}
-
- } + @if (garbageCollectorMetrics()) { +
+
Classes loaded
+
{{ garbageCollectorMetrics()!.classesLoaded }}
+
+
+
Classes unloaded
+
{{ garbageCollectorMetrics()!.classesUnloaded }}
+
+ }
-@if (!updating() && garbageCollectorMetrics()) { -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
__jhiTranslateTag__('metrics.servicesstats.table.count')__jhiTranslateTag__('metrics.servicesstats.table.mean')__jhiTranslateTag__('metrics.servicesstats.table.min')__jhiTranslateTag__('metrics.servicesstats.table.p50')__jhiTranslateTag__('metrics.servicesstats.table.p75')__jhiTranslateTag__('metrics.servicesstats.table.p95')__jhiTranslateTag__('metrics.servicesstats.table.p99')__jhiTranslateTag__('metrics.servicesstats.table.max')
jvm.gc.pause{{ garbageCollectorMetrics()!['jvm.gc.pause'].count }}{{ garbageCollectorMetrics()!['jvm.gc.pause'].mean | number: '1.0-3' }}{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.0'] | number: '1.0-3' }}{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.5'] | number: '1.0-3' }}{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.75'] | number: '1.0-3' }}{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.95'] | number: '1.0-3' }}{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.99'] | number: '1.0-3' }}{{ garbageCollectorMetrics()!['jvm.gc.pause'].max | number: '1.0-3' }}
-
-} + @if (!updating() && garbageCollectorMetrics()) { +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
__jhiTranslateTag__('metrics.servicesstats.table.count')__jhiTranslateTag__('metrics.servicesstats.table.mean')__jhiTranslateTag__('metrics.servicesstats.table.min')__jhiTranslateTag__('metrics.servicesstats.table.p50')__jhiTranslateTag__('metrics.servicesstats.table.p75')__jhiTranslateTag__('metrics.servicesstats.table.p95')__jhiTranslateTag__('metrics.servicesstats.table.p99')__jhiTranslateTag__('metrics.servicesstats.table.max')
jvm.gc.pause{{ garbageCollectorMetrics()!['jvm.gc.pause'].count }}{{ garbageCollectorMetrics()!['jvm.gc.pause'].mean | number: '1.0-3' }}{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.0'] | number: '1.0-3' }}{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.5'] | number: '1.0-3' }}{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.75'] | number: '1.0-3' }}{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.95'] | number: '1.0-3' }}{{ garbageCollectorMetrics()!['jvm.gc.pause']['0.99'] | number: '1.0-3' }}{{ garbageCollectorMetrics()!['jvm.gc.pause'].max | number: '1.0-3' }}
+
+ }
diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs index 90b25d02eb99..9b985c93f053 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs @@ -25,89 +25,113 @@
- - - -
-@for (thread of getThreads(); track $index) { -
-
- {{ thread.threadState }} + @for (thread of getThreads(); track $index) { +
+
+ {{ thread.threadState }} -  {{ thread.threadName }} (ID {{ thread.threadId }}) +  {{ thread.threadName }} (ID {{ thread.threadId }}) - - __jhiTranslateTag__('metrics.jvm.threads.dump.show') - __jhiTranslateTag__('metrics.jvm.threads.dump.hide') - -
+ + __jhiTranslateTag__('metrics.jvm.threads.dump.show') + __jhiTranslateTag__('metrics.jvm.threads.dump.hide') + +
-
-
- @for (st of thread.stackTrace; track $index) { -
- {{ st.className }}.{{ st.methodName }}({{ st.fileName }}:{{ st.lineNumber }}) - +
+
+ @for (st of thread.stackTrace; track $index) { +
+ {{ st.className }}.{{ st.methodName }}({{ st.fileName }}:{{ st.lineNumber }}) + +
+ }
- }
+ + + + + + + + + + + + + + + + + + + + +
+ Threads dump: + {{ + thread.threadName + }} +
__jhiTranslateTag__('metrics.jvm.threads.dump.blockedtime')__jhiTranslateTag__('metrics.jvm.threads.dump.blockedcount')__jhiTranslateTag__('metrics.jvm.threads.dump.waitedtime')__jhiTranslateTag__('metrics.jvm.threads.dump.waitedcount')__jhiTranslateTag__('metrics.jvm.threads.dump.lockname')
{{ thread.blockedTime }}{{ thread.blockedCount }}{{ thread.waitedTime }}{{ thread.waitedCount }} + {{ thread.lockName }} +
- - - - - - - - - - - - - - - - - - - - -
Threads dump: {{ thread.threadName }}
__jhiTranslateTag__('metrics.jvm.threads.dump.blockedtime')__jhiTranslateTag__('metrics.jvm.threads.dump.blockedcount')__jhiTranslateTag__('metrics.jvm.threads.dump.waitedtime')__jhiTranslateTag__('metrics.jvm.threads.dump.waitedcount')__jhiTranslateTag__('metrics.jvm.threads.dump.lockname')
{{ thread.blockedTime }}{{ thread.blockedCount }}{{ thread.waitedTime }}{{ thread.waitedCount }} - {{ thread.lockName }} -
-
-} + }
diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts.ejs index 8eead063e8be..9de99247641d 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts.ejs @@ -47,86 +47,86 @@ describe('MetricsModalThreadsComponent', () => { it('should count threads on init', () => { // GIVEN comp.threads = [ - { - threadName: '', - threadId: 1, - blockedTime: 1, - blockedCount: 1, - waitedTime: 1, - waitedCount: 1, - lockName: 'lock1', - lockOwnerId: 1, - lockOwnerName: 'lock1', - daemon: true, - inNative: true, - suspended: true, - threadState: ThreadState.Blocked, - priority: 1, - stackTrace: [], - lockedMonitors: [], - lockedSynchronizers: [], - lockInfo: null + { + threadName: '', + threadId: 1, + blockedTime: 1, + blockedCount: 1, + waitedTime: 1, + waitedCount: 1, + lockName: 'lock1', + lockOwnerId: 1, + lockOwnerName: 'lock1', + daemon: true, + inNative: true, + suspended: true, + threadState: ThreadState.Blocked, + priority: 1, + stackTrace: [], + lockedMonitors: [], + lockedSynchronizers: [], + lockInfo: null, }, - { - threadName: '', - threadId: 2, - blockedTime: 2, - blockedCount: 2, - waitedTime: 2, - waitedCount: 2, - lockName: 'lock2', - lockOwnerId: 2, - lockOwnerName: 'lock2', - daemon: false, - inNative: false, - suspended: false, - threadState: ThreadState.Runnable, - priority: 2, - stackTrace: [], - lockedMonitors: [], - lockedSynchronizers: [], - lockInfo: null + { + threadName: '', + threadId: 2, + blockedTime: 2, + blockedCount: 2, + waitedTime: 2, + waitedCount: 2, + lockName: 'lock2', + lockOwnerId: 2, + lockOwnerName: 'lock2', + daemon: false, + inNative: false, + suspended: false, + threadState: ThreadState.Runnable, + priority: 2, + stackTrace: [], + lockedMonitors: [], + lockedSynchronizers: [], + lockInfo: null, }, - { - threadName: '', - threadId: 3, - blockedTime: 3, - blockedCount: 3, - waitedTime: 3, - waitedCount: 3, - lockName: 'lock3', - lockOwnerId: 3, - lockOwnerName: 'lock3', - daemon: false, - inNative: false, - suspended: false, - threadState: ThreadState.TimedWaiting, - priority: 3, - stackTrace: [], - lockedMonitors: [], - lockedSynchronizers: [], - lockInfo: null + { + threadName: '', + threadId: 3, + blockedTime: 3, + blockedCount: 3, + waitedTime: 3, + waitedCount: 3, + lockName: 'lock3', + lockOwnerId: 3, + lockOwnerName: 'lock3', + daemon: false, + inNative: false, + suspended: false, + threadState: ThreadState.TimedWaiting, + priority: 3, + stackTrace: [], + lockedMonitors: [], + lockedSynchronizers: [], + lockInfo: null, + }, + { + threadName: '', + threadId: 4, + blockedTime: 4, + blockedCount: 4, + waitedTime: 4, + waitedCount: 4, + lockName: 'lock4', + lockOwnerId: 4, + lockOwnerName: 'lock4', + daemon: false, + inNative: false, + suspended: false, + threadState: ThreadState.Waiting, + priority: 4, + stackTrace: [], + lockedMonitors: [], + lockedSynchronizers: [], + lockInfo: null, }, - { - threadName: '', - threadId: 4, - blockedTime: 4, - blockedCount: 4, - waitedTime: 4, - waitedCount: 4, - lockName: 'lock4', - lockOwnerId: 4, - lockOwnerName: 'lock4', - daemon: false, - inNative: false, - suspended: false, - threadState: ThreadState.Waiting, - priority: 4, - stackTrace: [], - lockedMonitors: [], - lockedSynchronizers: [], - lockInfo: null - } ]; // WHEN @@ -201,7 +201,7 @@ describe('MetricsModalThreadsComponent', () => { describe('getThreads', () => { it('should return blocked threads', () => { // GIVEN - const thread1 = { + const thread1 = { threadName: '', threadId: 1, blockedTime: 1, @@ -219,9 +219,9 @@ describe('MetricsModalThreadsComponent', () => { stackTrace: [], lockedMonitors: [], lockedSynchronizers: [], - lockInfo: null + lockInfo: null, }; - const thread2 = { + const thread2 = { threadName: '', threadId: 2, blockedTime: 2, @@ -239,12 +239,9 @@ describe('MetricsModalThreadsComponent', () => { stackTrace: [], lockedMonitors: [], lockedSynchronizers: [], - lockInfo: null + lockInfo: null, }; - comp.threads = [ - thread1, - thread2 - ]; + comp.threads = [thread1, thread2]; comp.threadStateFilter = ThreadState.Blocked; // WHEN @@ -268,7 +265,7 @@ describe('MetricsModalThreadsComponent', () => { it('should return all threads if there is no filter', () => { // GIVEN - const thread1 = { + const thread1 = { threadName: '', threadId: 1, blockedTime: 1, @@ -286,9 +283,9 @@ describe('MetricsModalThreadsComponent', () => { stackTrace: [], lockedMonitors: [], lockedSynchronizers: [], - lockInfo: null + lockInfo: null, }; - const thread2 = { + const thread2 = { threadName: '', threadId: 2, blockedTime: 2, @@ -306,12 +303,9 @@ describe('MetricsModalThreadsComponent', () => { stackTrace: [], lockedMonitors: [], lockedSynchronizers: [], - lockInfo: null + lockInfo: null, }; - comp.threads = [ - thread1, - thread2 - ]; + comp.threads = [thread1, thread2]; comp.threadStateFilter = undefined; // WHEN @@ -323,7 +317,7 @@ describe('MetricsModalThreadsComponent', () => { it('should return an empty array if there are no threads to filter', () => { // GIVEN - comp.threads = undefined + comp.threads = undefined; comp.threadStateFilter = ThreadState.Blocked; // WHEN @@ -346,5 +340,4 @@ describe('MetricsModalThreadsComponent', () => { expect(mockActiveModal.dismiss).toHaveBeenCalled(); }); }); - }); diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs index 151289bb4321..51d1a22163ff 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs @@ -19,30 +19,36 @@

__jhiTranslateTag__('metrics.jvm.http.title')

@if (!updating() && requestMetrics()) { - - - - - - - - - - - @for (entry of requestMetrics()!['percode'] | keyvalue; track entry.key) { - - - - - - - } - -
__jhiTranslateTag__('metrics.jvm.http.table.code')__jhiTranslateTag__('metrics.jvm.http.table.count')__jhiTranslateTag__('metrics.jvm.http.table.mean')__jhiTranslateTag__('metrics.jvm.http.table.max')
{{ entry.key }} - - {{ entry.value.count }} - - - {{ filterNaN(entry.value.mean) | number: '1.0-2' }} - {{ entry.value.max | number: '1.0-2' }}
+ + + + + + + + + + + @for (entry of requestMetrics()!['percode'] | keyvalue; track entry.key) { + + + + + + + } + +
__jhiTranslateTag__('metrics.jvm.http.table.code')__jhiTranslateTag__('metrics.jvm.http.table.count')__jhiTranslateTag__('metrics.jvm.http.table.mean')__jhiTranslateTag__('metrics.jvm.http.table.max')
{{ entry.key }} + + {{ entry.value.count }} + + + {{ filterNaN(entry.value.mean) | number: '1.0-2' }} + {{ entry.value.max | number: '1.0-2' }}
} diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs index 0b7806c456a3..29811701d101 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs @@ -19,53 +19,53 @@

System

@if (!updating() && systemMetrics()) { - -
-
Uptime
-
{{ convertMillisecondsToDuration(systemMetrics()!['process.uptime']) }}
-
+ +
+
Uptime
+
{{ convertMillisecondsToDuration(systemMetrics()!['process.uptime']) }}
+
-
-
Start time
-
{{ systemMetrics()!['process.start.time'] | date: 'full' }}
-
+
+
Start time
+
{{ systemMetrics()!['process.start.time'] | date: 'full' }}
+
-
-
Process CPU usage
-
{{ 100 * systemMetrics()!['process.cpu.usage'] | number: '1.0-2' }} %
-
+
+
Process CPU usage
+
{{ 100 * systemMetrics()!['process.cpu.usage'] | number: '1.0-2' }} %
+
- - {{ 100 * systemMetrics()!['process.cpu.usage'] | number: '1.0-2' }} % - + + {{ 100 * systemMetrics()!['process.cpu.usage'] | number: '1.0-2' }} % + -
-
System CPU usage
-
{{ 100 * systemMetrics()!['system.cpu.usage'] | number: '1.0-2' }} %
-
+
+
System CPU usage
+
{{ 100 * systemMetrics()!['system.cpu.usage'] | number: '1.0-2' }} %
+
- - {{ 100 * systemMetrics()!['system.cpu.usage'] | number: '1.0-2' }} % - + + {{ 100 * systemMetrics()!['system.cpu.usage'] | number: '1.0-2' }} % + -
-
System CPU count
-
{{ systemMetrics()!['system.cpu.count'] }}
-
+
+
System CPU count
+
{{ systemMetrics()!['system.cpu.count'] }}
+
-
-
System 1m Load average
-
{{ systemMetrics()!['system.load.average.1m'] | number: '1.0-2' }}
-
+
+
System 1m Load average
+
{{ systemMetrics()!['system.load.average.1m'] | number: '1.0-2' }}
+
-
-
Process files max
-
{{ systemMetrics()!['process.files.max'] | number: '1.0-0' }}
-
+
+
Process files max
+
{{ systemMetrics()!['process.files.max'] | number: '1.0-0' }}
+
-
-
Process files open
-
{{ systemMetrics()!['process.files.open'] | number: '1.0-0' }}
-
- +
+
Process files open
+
{{ systemMetrics()!['process.files.open'] | number: '1.0-0' }}
+
+ } diff --git a/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs index f074c8688b28..b7fa0c5120e6 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs @@ -31,16 +31,14 @@ describe('MetricsComponent', () => { let service: MetricsService; let changeDetector: ChangeDetectorRef; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [MetricsComponent], - providers: [provideHttpClient()], - }) - .overrideTemplate(MetricsComponent, '') - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [MetricsComponent], + providers: [provideHttpClient()], }) - ); + .overrideTemplate(MetricsComponent, '') + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(MetricsComponent); @@ -64,8 +62,8 @@ describe('MetricsComponent', () => { }, }, } as unknown as Metrics; - const threadDump = { threads: [ { threadName: 'thread 1' } as Thread] } as ThreadDump; - + const threadDump = { threads: [{ threadName: 'thread 1' } as Thread] } as ThreadDump; + jest.spyOn(service, 'getMetrics').mockReturnValue(of(metrics)); jest.spyOn(service, 'threadDump').mockReturnValue(of(threadDump)); jest.spyOn(changeDetector.constructor.prototype, 'markForCheck'); diff --git a/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs index 8022f9e7061a..b50e33d3d620 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs @@ -33,16 +33,14 @@ describe('User Management Delete Component', () => { let service: UserManagementService; let mockActiveModal: NgbActiveModal; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [UserManagementDeleteDialogComponent], - providers: [provideHttpClient(), NgbActiveModal], - }) - .overrideTemplate(UserManagementDeleteDialogComponent, '') - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [UserManagementDeleteDialogComponent], + providers: [provideHttpClient(), NgbActiveModal], }) - ); + .overrideTemplate(UserManagementDeleteDialogComponent, '') + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(UserManagementDeleteDialogComponent); @@ -65,7 +63,7 @@ describe('User Management Delete Component', () => { // THEN expect(service.delete).toHaveBeenCalledWith('user'); expect(mockActiveModal.close).toHaveBeenCalledWith('deleted'); - }) + }), )); }); }); diff --git a/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs index 6095055f5c2d..a982f7b06e82 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs @@ -80,7 +80,7 @@ describe('User Management Detail Component', () => { langKey: 'en', authorities: [Authority.USER], createdBy: 'admin', - }) + }), ); }); }); diff --git a/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs index b30e80844618..c85e5b206975 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs @@ -45,19 +45,17 @@ describe('User Management Component', () => { page: '1', size: '1', sort: 'id,desc', - }) + }), ); - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [UserManagementComponent], - providers: [provideHttpClient(), { provide: ActivatedRoute, useValue: { data, queryParamMap } }, AccountService], - }) - .overrideTemplate(UserManagementComponent, '') - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [UserManagementComponent], + providers: [provideHttpClient(), { provide: ActivatedRoute, useValue: { data, queryParamMap } }, AccountService], }) - ); + .overrideTemplate(UserManagementComponent, '') + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(UserManagementComponent); @@ -105,8 +103,8 @@ describe('User Management Component', () => { new HttpResponse({ body: [user], headers, - }) - ) + }), + ), ); jest.spyOn(service, 'update').mockReturnValue(of(user)); diff --git a/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.spec.ts.ejs index ca2e0d84ad5d..e38e09e9f7ed 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.spec.ts.ejs @@ -78,7 +78,7 @@ describe('User Service', () => { let expectedResult = 0; service.find('user').subscribe({ - error: (error: HttpErrorResponse) => expectedResult = error.status + error: (error: HttpErrorResponse) => (expectedResult = error.status), }); const req = httpMock.expectOne({ method: 'GET' }); diff --git a/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs index ccafc9e48794..fd0d0d60dcbe 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs @@ -73,7 +73,7 @@ describe('User Management Update Component', () => { // THEN expect(service.authorities).toHaveBeenCalled(); expect(comp.authorities()).toEqual(['USER']); - }) + }), )); }); @@ -92,7 +92,7 @@ describe('User Management Update Component', () => { // THEN expect(service.update).toHaveBeenCalledWith(expect.objectContaining(entity)); expect(comp.isSaving()).toEqual(false); - }) + }), )); it('Should call create service on save for new user', inject( @@ -110,7 +110,7 @@ describe('User Management Update Component', () => { expect(comp.editForm.getRawValue().id).toBeNull(); expect(service.create).toHaveBeenCalledWith(expect.objectContaining(entity)); expect(comp.isSaving()).toEqual(false); - }) + }), )); }); }); diff --git a/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs index 1d7c1be8c5ca..bb52560fcc71 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs @@ -84,7 +84,7 @@ export default class UserManagementUpdateComponent implements OnInit { this.editForm.reset(newUser); } }); - this.userService.authorities().subscribe(authorities => (this.authorities.set(authorities))); + this.userService.authorities().subscribe(authorities => this.authorities.set(authorities)); } previousState(): void { diff --git a/generators/angular/templates/src/main/webapp/app/admin/user-management/user-management.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/user-management/user-management.model.ts.ejs index e534f4d0d4a0..b8f770592bc7 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/user-management/user-management.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/user-management/user-management.model.ts.ejs @@ -47,6 +47,6 @@ export class User implements IUser { public createdBy?: string, public createdDate?: Date, public lastModifiedBy?: string, - public lastModifiedDate?: Date + public lastModifiedDate?: Date, ) {} } diff --git a/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs b/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs index 4f6136ecff46..c818ec74cf74 100644 --- a/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs @@ -36,19 +36,21 @@ import routes from './app.routes'; import { NgbDateDayjsAdapter } from './config/datepicker-adapter'; import { AppPageTitleStrategy } from './app-page-title-strategy'; -const routerFeatures: Array = [withComponentInputBinding(), +const routerFeatures: Array = [ + withComponentInputBinding(), withNavigationErrorHandler((e: NavigationError) => { const router = inject(Router); if (e.error.status === 403) { - router.navigate(['/accessdenied']) + router.navigate(['/accessdenied']); } else if (e.error.status === 404) { - router.navigate(['/404']) + router.navigate(['/404']); } else if (e.error.status === 401) { router.navigate(['/login']); } else { router.navigate(['/error']); } - })]; + }), +]; if (DEBUG_INFO_ENABLED) { routerFeatures.push(withDebugTracing()); } diff --git a/generators/angular/templates/src/main/webapp/app/config/navigation.constants.ts.ejs b/generators/angular/templates/src/main/webapp/app/config/navigation.constants.ts.ejs index bdd16acb24e4..1a7456bae429 100644 --- a/generators/angular/templates/src/main/webapp/app/config/navigation.constants.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/config/navigation.constants.ts.ejs @@ -19,5 +19,5 @@ export const ASC = 'asc'; export const DESC = 'desc'; export const SORT = 'sort'; -export const ITEM_DELETED_EVENT = 'deleted' -export const DEFAULT_SORT_DATA = 'defaultSort' +export const ITEM_DELETED_EVENT = 'deleted'; +export const DEFAULT_SORT_DATA = 'defaultSort'; diff --git a/generators/angular/templates/src/main/webapp/app/core/auth/account.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/auth/account.model.ts.ejs index 02e06a1da376..6375210b759a 100644 --- a/generators/angular/templates/src/main/webapp/app/core/auth/account.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/auth/account.model.ts.ejs @@ -25,6 +25,6 @@ export class Account { public langKey: string, public lastName: string | null, public login: string, - public imageUrl: string | null + public imageUrl: string | null, ) {} } diff --git a/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs index 9be1c84ec4dc..dc41f189c243 100644 --- a/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs @@ -57,7 +57,7 @@ describe('Alert service test', () => { timeout: 3000, toast: true, position: 'top left', - }) + }), ).toEqual( expect.objectContaining({ type: 'success', @@ -66,7 +66,7 @@ describe('Alert service test', () => { timeout: 3000, toast: true, position: 'top left', - } as Alert) + } as Alert), ); expect(service.get().length).toBe(1); @@ -78,7 +78,7 @@ describe('Alert service test', () => { timeout: 3000, toast: true, position: 'top left', - } as Alert) + } as Alert), ); })); @@ -94,8 +94,8 @@ describe('Alert service test', () => { toast: true, position: 'top left', }, - extAlerts - ) + extAlerts, + ), ).toEqual( expect.objectContaining({ type: 'success', @@ -104,7 +104,7 @@ describe('Alert service test', () => { timeout: 3000, toast: true, position: 'top left', - } as Alert) + } as Alert), ); expect(extAlerts.length).toBe(1); @@ -116,9 +116,9 @@ describe('Alert service test', () => { timeout: 3000, toast: true, position: 'top left', - } as Alert) + } as Alert), ); - } + }, )); it('should produce an alert object with correct id', inject([AlertService], (service: AlertService) => { @@ -128,7 +128,7 @@ describe('Alert service test', () => { type: 'success', message: 'Hello JHipster success', id: 1, - } as Alert) + } as Alert), ); expect(service.get().length).toBe(2); @@ -137,7 +137,7 @@ describe('Alert service test', () => { type: 'success', message: 'Hello JHipster success', id: 1, - } as Alert) + } as Alert), ); })); @@ -150,7 +150,7 @@ describe('Alert service test', () => { type: 'success', message: 'Hello JHipster success', id: 2, - } as Alert) + } as Alert), ); expect(service.get().length).toBe(3); @@ -161,7 +161,7 @@ describe('Alert service test', () => { type: 'info', message: 'Hello Jhipster info 2', id: 1, - } as Alert) + } as Alert), ); alert2.close?.(service.get()); expect(service.get().length).toBe(1); @@ -170,7 +170,7 @@ describe('Alert service test', () => { type: 'success', message: 'Hello JHipster success', id: 2, - } as Alert) + } as Alert), ); alert0.close?.(service.get()); expect(service.get().length).toBe(0); @@ -205,8 +205,8 @@ describe('Alert service test', () => { toast: true, position: 'top left', }, - [] - ) + [], + ), ).toEqual( expect.objectContaining({ type: 'success', @@ -215,7 +215,7 @@ describe('Alert service test', () => { timeout: 3000, toast: true, position: 'top left', - } as Alert) + } as Alert), ); expect(service.get().length).toBe(0); @@ -226,7 +226,7 @@ describe('Alert service test', () => { expect.objectContaining({ type: 'success', message: 'Hello Jhipster', - } as Alert) + } as Alert), ); })); @@ -279,9 +279,9 @@ describe('Alert service test', () => { expect.objectContaining({ type: 'info', message: 'Translated message', - } as Alert) + } as Alert), ); - } + }, )); it('should produce a info message with provided message if key does not exists', inject( @@ -291,9 +291,9 @@ describe('Alert service test', () => { expect.objectContaining({ type: 'info', message: 'Hello Jhipster', - } as Alert) + } as Alert), ); - } + }, )); it('should produce a info message with provided key if translation key does not exist in translations and message is not provided', inject( diff --git a/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs index e2ffdb8d9ee3..c44e12ba5594 100644 --- a/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs @@ -60,9 +60,9 @@ export class DataUtils { }); const fileURL = window.URL.createObjectURL(blob); const win = window.open(fileURL); - win!.onload = function() { - URL.revokeObjectURL(fileURL); - } + win!.onload = function () { + URL.revokeObjectURL(fileURL); + }; } /** diff --git a/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs index 8fce62791675..505eaae0a584 100644 --- a/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs @@ -61,7 +61,7 @@ describe('Event Manager tests', () => { eventManager.broadcast({ name: 'modifier', content: 'modified something' }); // THEN expect(receivedEvent).toEqual({ name: 'modifier', content: 'modified something' }); - } + }, )); it('should create an observable and callback when broadcasted string', inject([EventManager], (eventManager: EventManager) => { diff --git a/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.ts.ejs index d161ad4e10ed..85569d51f8f2 100644 --- a/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.ts.ejs @@ -21,7 +21,10 @@ import { Observable, Observer, Subscription } from 'rxjs'; import { filter, share } from 'rxjs/operators'; export class EventWithContent { - constructor(public name: string, public content: T) {} + constructor( + public name: string, + public content: T, + ) {} } /** @@ -67,7 +70,7 @@ export class EventManager { } } return false; - }) + }), ) .subscribe(callback); } diff --git a/generators/angular/templates/src/main/webapp/app/core/util/operators.ts.ejs b/generators/angular/templates/src/main/webapp/app/core/util/operators.ts.ejs index 5cbd3ef112ee..e6095754fff9 100644 --- a/generators/angular/templates/src/main/webapp/app/core/util/operators.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/core/util/operators.ts.ejs @@ -16,7 +16,6 @@ See the License for the specific language governing permissions and limitations under the License. -%> - /* * Function used to workaround https://github.com/microsoft/TypeScript/issues/16069 * es2019 alternative `const filteredArr = myArr.flatMap((x) => x ? x : []);` @@ -25,4 +24,4 @@ export function isPresent(t: T | undefined | null | void): t is T { return t !== undefined && t !== null; } -export const filterNaN = (input: number): number => isNaN(input) ? 0 : input; +export const filterNaN = (input: number): number => (isNaN(input) ? 0 : input); diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.ts.ejs index afec4c4fb59f..c2ee6f092fe7 100644 --- a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.ts.ejs @@ -38,7 +38,7 @@ const <%= entityInstance %>Resolve = (route: ActivatedRouteSnapshot): Observable inject(Router).navigate(['404']); return EMPTY; } - }) + }), ); } return of(null); diff --git a/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.html.ejs b/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.html.ejs index 65d70e29f876..6ee4b363baf5 100644 --- a/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.html.ejs @@ -25,9 +25,9 @@

__jhiTranslateTag__('error.title')

- @if (errorMessage()) { -
{{ errorMessage() }}
- } + @if (errorMessage()) { +
{{ errorMessage() }}
+ }
diff --git a/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs index bfc347fdcf06..d3ecb50d8e97 100644 --- a/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs @@ -139,9 +139,7 @@ describe('MainComponent', () => { { path: 'home', title: parentRoutePageTitle, - children: [ - { path: '', title: childRoutePageTitle, component: BlankComponent }, - ], + children: [{ path: '', title: childRoutePageTitle, component: BlankComponent }], }, ]); @@ -159,9 +157,7 @@ describe('MainComponent', () => { { path: 'home', title: parentRoutePageTitle, - children: [ - { path: '', component: BlankComponent }, - ], + children: [{ path: '', component: BlankComponent }], }, ]); @@ -212,9 +208,7 @@ describe('MainComponent', () => { { path: 'home', title: parentRoutePageTitle, - children: [ - { path: '', title: childRoutePageTitle, component: BlankComponent }, - ], + children: [{ path: '', title: childRoutePageTitle, component: BlankComponent }], }, ]); @@ -241,9 +235,7 @@ describe('MainComponent', () => { { path: 'home', title: parentRoutePageTitle, - children: [ - { path: '', component: BlankComponent }, - ], + children: [{ path: '', component: BlankComponent }], }, ]); diff --git a/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs index 5a6810c8ef99..6011dbf4d6e6 100644 --- a/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs @@ -12,16 +12,14 @@ describe('Page Ribbon Component', () => { let fixture: ComponentFixture; let profileService: ProfileService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [PageRibbonComponent], - providers: [provideHttpClient()], - }) - .overrideTemplate(PageRibbonComponent, '') - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [PageRibbonComponent], + providers: [provideHttpClient()], }) - ); + .overrideTemplate(PageRibbonComponent, '') + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(PageRibbonComponent); diff --git a/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile-info.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile-info.model.ts.ejs index 8fe8238ecb61..9b0293216c95 100644 --- a/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile-info.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile-info.model.ts.ejs @@ -28,6 +28,6 @@ export class ProfileInfo { public activeProfiles?: string[], public ribbonEnv?: string, public inProduction?: boolean, - public openAPIEnabled?: boolean + public openAPIEnabled?: boolean, ) {} } diff --git a/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile.service.ts.ejs b/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile.service.ts.ejs index f0f8cb864815..ced901fc55d3 100644 --- a/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile.service.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile.service.ts.ejs @@ -53,7 +53,7 @@ export class ProfileService { } return profileInfo; }), - shareReplay() + shareReplay(), ); return this.profileInfo$; } diff --git a/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs b/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs index 4ea47544f938..9e7885ee4aa9 100644 --- a/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs @@ -20,11 +20,9 @@

__jhiTranslateTag__('login.title')

- @if (authenticationError()) { -
__jhiTranslateTag__('login.messages.error.authentication')
- } + @if (authenticationError()) { +
__jhiTranslateTag__('login.messages.error.authentication')
+ }
diff --git a/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs index 205055bf38ab..5a8e0ddb116c 100644 --- a/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs @@ -37,25 +37,23 @@ describe('LoginComponent', () => { let mockAccountService: AccountService; let mockLoginService: LoginService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [LoginComponent], - providers: [ - FormBuilder, - AccountService, - { - provide: LoginService, - useValue: { - login: jest.fn(() => of({})), - }, + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [LoginComponent], + providers: [ + FormBuilder, + AccountService, + { + provide: LoginService, + useValue: { + login: jest.fn(() => of({})), }, - ], - }) - .overrideTemplate(LoginComponent, '') - .compileComponents(); + }, + ], }) - ); + .overrideTemplate(LoginComponent, '') + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(LoginComponent); diff --git a/generators/angular/templates/src/main/webapp/app/login/login.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/login/login.component.ts.ejs index c00505e7554d..c0b05205bfbf 100644 --- a/generators/angular/templates/src/main/webapp/app/login/login.component.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/login/login.component.ts.ejs @@ -67,7 +67,7 @@ export default class LoginComponent implements OnInit, AfterViewInit { this.router.navigate(['']); } }, - error: () => (this.authenticationError.set(true)), + error: () => this.authenticationError.set(true), }); } } diff --git a/generators/angular/templates/src/main/webapp/app/login/login.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/login/login.model.ts.ejs index 251062fc244b..d90e8b2fb15c 100644 --- a/generators/angular/templates/src/main/webapp/app/login/login.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/login/login.model.ts.ejs @@ -17,5 +17,9 @@ limitations under the License. -%> export class Login { - constructor(public username: string, public password: string, public rememberMe: boolean) {} + constructor( + public username: string, + public password: string, + public rememberMe: boolean, + ) {} } diff --git a/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.html.ejs b/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.html.ejs index a8048bf03189..d03a01f23ccf 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.html.ejs @@ -17,13 +17,13 @@ limitations under the License. -%> diff --git a/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.html.ejs b/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.html.ejs index a8048bf03189..d03a01f23ccf 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.html.ejs @@ -17,13 +17,13 @@ limitations under the License. -%> diff --git a/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs index ff269e76a44c..0fb1e6f8e20e 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs @@ -29,16 +29,14 @@ describe('Alert Component', () => { let fixture: ComponentFixture; let mockAlertService: AlertService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [AlertComponent], - providers: [AlertService], - }) - .overrideTemplate(AlertComponent, '') - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [AlertComponent], + providers: [AlertService], }) - ); + .overrideTemplate(AlertComponent, '') + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(AlertComponent); diff --git a/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.ts.ejs index 74e380247f4e..268eb3cb8067 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.ts.ejs @@ -46,12 +46,15 @@ export default class HasAnyAuthorityDirective { const currentAccount = accountService.trackCurrentAccount(); const hasPermission = computed(() => currentAccount()?.authorities && accountService.hasAnyAuthority(this.authorities())); - effect(() => { - if (hasPermission()) { - this.viewContainerRef.createEmbeddedView(this.templateRef); - } else { - this.viewContainerRef.clear(); - } - }, { allowSignalWrites: true }); + effect( + () => { + if (hasPermission()) { + this.viewContainerRef.createEmbeddedView(this.templateRef); + } else { + this.viewContainerRef.clear(); + } + }, + { allowSignalWrites: true }, + ); } } diff --git a/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.html.ejs b/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.html.ejs index f7c6da43f86f..6494027478f7 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.html.ejs @@ -1,20 +1,20 @@ @if (filters.hasAnyFilterSet()) { -
- __jhiTranslateTag__('entity.filters.set') - -
    -@for (filterOption of filters.filterOptions; track filterOption.name) { - @for (value of filterOption.values; track value) { -
  • - {{ filterOption.name }}: {{ value }} - -
    • - } -} -
-
+
+ __jhiTranslateTag__('entity.filters.set') + +
    + @for (filterOption of filters.filterOptions; track filterOption.name) { + @for (value of filterOption.values; track value) { +
  • + {{ filterOption.name }}: {{ value }} + +
    • + } + } +
+
} diff --git a/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs index 5afc648bd4f7..794a0c096724 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs @@ -18,7 +18,10 @@ export interface IFilterOption { } export class FilterOption implements IFilterOption { - constructor(public name: string, public values: string[] = []) { + constructor( + public name: string, + public values: string[] = [], + ) { this.values = [...new Set(values)]; } diff --git a/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs index 7158f65e9e3f..21ddaa50366c 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs @@ -31,14 +31,12 @@ describe('TranslateDirective Tests', () => { let fixture: ComponentFixture; let translateService: TranslateService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [TranslateModule.forRoot(), TranslateDirective], - declarations: [TestTranslateDirectiveComponent], - }); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot(), TranslateDirective], + declarations: [TestTranslateDirectiveComponent], + }); + })); beforeEach(() => { translateService = TestBed.inject(TranslateService); diff --git a/generators/angular/templates/src/main/webapp/app/shared/sort/sort.directive.ts.ejs b/generators/angular/templates/src/main/webapp/app/shared/sort/sort.directive.ts.ejs index 3576c873905f..8b7c3a7175b8 100644 --- a/generators/angular/templates/src/main/webapp/app/shared/sort/sort.directive.ts.ejs +++ b/generators/angular/templates/src/main/webapp/app/shared/sort/sort.directive.ts.ejs @@ -36,7 +36,7 @@ export class SortDirective implements SortChangeDirective { sort(field: string): void { const { predicate, order } = this.sortState(); - const toggle = (): SortOrder => order === 'asc' ? 'desc' : 'asc'; + const toggle = (): SortOrder => (order === 'asc' ? 'desc' : 'asc'); this.sortChange.emit({ predicate: field, order: field !== predicate ? 'asc' : toggle() }); } } diff --git a/generators/angular/templates/src/main/webapp/bootstrap.ts.ejs b/generators/angular/templates/src/main/webapp/bootstrap.ts.ejs index a27c9cb4fc0b..e0ad4c857ef8 100644 --- a/generators/angular/templates/src/main/webapp/bootstrap.ts.ejs +++ b/generators/angular/templates/src/main/webapp/bootstrap.ts.ejs @@ -31,4 +31,4 @@ if (!DEBUG_INFO_ENABLED) { bootstrapApplication(AppComponent, appConfig) // eslint-disable-next-line no-console .then(() => console.log('Application started')) - .catch((err) => console.error(err)); + .catch(err => console.error(err)); diff --git a/generators/angular/templates/webpack/webpack.custom.js.ejs b/generators/angular/templates/webpack/webpack.custom.js.ejs index eec477ae8c5f..2a8ba5d95ac2 100644 --- a/generators/angular/templates/webpack/webpack.custom.js.ejs +++ b/generators/angular/templates/webpack/webpack.custom.js.ejs @@ -97,8 +97,8 @@ module.exports = async (config, options, targetOptions) => { }, { reload: targetOptions.target === 'build', // enabled for build --watch - } - ) + }, + ), ); } diff --git a/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberIT.java.ejs b/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberIT.java.ejs index f6fa235ca829..dedb55dee8b3 100644 --- a/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberIT.java.ejs +++ b/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberIT.java.ejs @@ -23,6 +23,4 @@ import io.cucumber.junit.platform.engine.Cucumber; @Cucumber @IntegrationTest -class CucumberIT { - -} +class CucumberIT {} diff --git a/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberTestContextConfiguration.java.ejs b/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberTestContextConfiguration.java.ejs index 7dea2a966ede..2cf62e3719e7 100644 --- a/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberTestContextConfiguration.java.ejs +++ b/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberTestContextConfiguration.java.ejs @@ -25,6 +25,4 @@ import org.springframework.test.context.web.WebAppConfiguration; @CucumberContextConfiguration @IntegrationTest @WebAppConfiguration -public class CucumberTestContextConfiguration { - -} +public class CucumberTestContextConfiguration {} diff --git a/generators/docker/templates/docker/grafana/provisioning/datasources/datasource.yml.ejs b/generators/docker/templates/docker/grafana/provisioning/datasources/datasource.yml.ejs index 992425314878..3c918b2addd1 100644 --- a/generators/docker/templates/docker/grafana/provisioning/datasources/datasource.yml.ejs +++ b/generators/docker/templates/docker/grafana/provisioning/datasources/datasource.yml.ejs @@ -55,14 +55,14 @@ datasources: isDefault: true # fields that will be converted to json and stored in json_data jsonData: - graphiteVersion: "1.1" + graphiteVersion: '1.1' tlsAuth: false tlsAuthWithCACert: false # json object of data that will be encrypted. secureJsonData: - tlsCACert: "..." - tlsClientCert: "..." - tlsClientKey: "..." + tlsCACert: '...' + tlsClientCert: '...' + tlsClientKey: '...' version: 1 # allow users to edit datasources from the UI. editable: true diff --git a/generators/docker/templates/docker/monitoring.yml.ejs b/generators/docker/templates/docker/monitoring.yml.ejs index a872bd12197f..b75b647feb23 100644 --- a/generators/docker/templates/docker/monitoring.yml.ejs +++ b/generators/docker/templates/docker/monitoring.yml.ejs @@ -46,4 +46,4 @@ services: - 127.0.0.1:3000:3000 # On MacOS, remove next line and replace localhost by host.docker.internal in prometheus/prometheus.yml and # grafana/provisioning/datasources/datasource.yml - network_mode: "host" # to test locally running service + network_mode: 'host' # to test locally running service diff --git a/generators/docker/templates/docker/prometheus/prometheus.yml.ejs b/generators/docker/templates/docker/prometheus/prometheus.yml.ejs index 33e97e6afeca..bcc51c5406f7 100644 --- a/generators/docker/templates/docker/prometheus/prometheus.yml.ejs +++ b/generators/docker/templates/docker/prometheus/prometheus.yml.ejs @@ -18,7 +18,7 @@ -%> # Sample global config for monitoring JHipster applications global: - scrape_interval: 15s # By default, scrape targets every 15 seconds. + scrape_interval: 15s # By default, scrape targets every 15 seconds. evaluation_interval: 15s # By default, scrape targets every 15 seconds. # scrape_timeout is set to the global default (10s). diff --git a/generators/docker/templates/docker/sonar.yml.ejs b/generators/docker/templates/docker/sonar.yml.ejs index c5ed7c786cab..7296f15cd008 100644 --- a/generators/docker/templates/docker/sonar.yml.ejs +++ b/generators/docker/templates/docker/sonar.yml.ejs @@ -30,4 +30,4 @@ services: # remove the "127.0.0.1:" prefix ports: - 127.0.0.1:9001:9000 - - 127.0.0.1:9000:9000 \ No newline at end of file + - 127.0.0.1:9000:9000 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 12d537f22a0a..118d39643810 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,10 +25,9 @@ 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/server/support/needles.spec.ts b/generators/server/support/needles.spec.ts index b8653225d6fd..26c97347e8ad 100644 --- a/generators/server/support/needles.spec.ts +++ b/generators/server/support/needles.spec.ts @@ -94,7 +94,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; */ @ConfigurationProperties(prefix = "application", ignoreUnknownFields = false) public class ApplicationProperties { - private Foo foo; // jhipster-needle-application-properties-property diff --git a/generators/server/templates/src/main/java/_package_/Application.java.ejs b/generators/server/templates/src/main/java/_package_/Application.java.ejs index 0d3b3994bdb4..36dcaf5f7823 100644 --- a/generators/server/templates/src/main/java/_package_/Application.java.ejs +++ b/generators/server/templates/src/main/java/_package_/Application.java.ejs @@ -64,13 +64,21 @@ public class <%= mainClass %> { @PostConstruct public void initApplication() { Collection activeProfiles = Arrays.asList(env.getActiveProfiles()); - if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT) && activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_PRODUCTION)) { - LOG.error("You have misconfigured your application! It should not run " + - "with both the 'dev' and 'prod' profiles at the same time."); + if ( + activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT) && + activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_PRODUCTION) + ) { + LOG.error( + "You have misconfigured your application! It should not run " + "with both the 'dev' and 'prod' profiles at the same time." + ); } - if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT) && activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_CLOUD)) { - LOG.error("You have misconfigured your application! It should not " + - "run with both the 'dev' and 'cloud' profiles at the same time."); + if ( + activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT) && + activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_CLOUD) + ) { + LOG.error( + "You have misconfigured your application! It should not " + "run with both the 'dev' and 'cloud' profiles at the same time." + ); } } @@ -90,7 +98,9 @@ public class <%= mainClass %> { String protocol = Optional.ofNullable(env.getProperty("server.ssl.key-store")).map(key -> "https").orElse("http"); String applicationName = env.getProperty("spring.application.name"); String serverPort = env.getProperty("server.port"); - String contextPath = Optional.ofNullable(env.getProperty("server.servlet.context-path")).filter(StringUtils::isNotBlank).orElse("/"); + String contextPath = Optional.ofNullable(env.getProperty("server.servlet.context-path")) + .filter(StringUtils::isNotBlank) + .orElse("/"); String hostAddress = "localhost"; try { hostAddress = InetAddress.getLocalHost().getHostAddress(); @@ -101,12 +111,12 @@ public class <%= mainClass %> { CRLFLogConverter.CRLF_SAFE_MARKER, """ - ---------------------------------------------------------- - \tApplication '{}' is running! Access URLs: - \tLocal: \t\t{}://localhost:{}{} - \tExternal: \t{}://{}:{}{} - \tProfile(s): \t{} - ----------------------------------------------------------""", + ---------------------------------------------------------- + \tApplication '{}' is running! Access URLs: + \tLocal: \t\t{}://localhost:{}{} + \tExternal: \t{}://{}:{}{} + \tProfile(s): \t{} + ----------------------------------------------------------""", applicationName, protocol, serverPort, diff --git a/generators/server/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs b/generators/server/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs index a0321d0dff8e..b6192ecbd250 100644 --- a/generators/server/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs +++ b/generators/server/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs @@ -86,21 +86,19 @@ public class LoggingAspect { @AfterThrowing(pointcut = "applicationPackagePointcut() && springBeanPointcut()", throwing = "e") public void logAfterThrowing(JoinPoint joinPoint, Throwable e) { if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) { - logger(joinPoint) - .error( - "Exception in {}() with cause = '{}' and exception = '{}'", - joinPoint.getSignature().getName(), - e.getCause() != null ? e.getCause() : "NULL", - e.getMessage(), - e - ); + logger(joinPoint).error( + "Exception in {}() with cause = '{}' and exception = '{}'", + joinPoint.getSignature().getName(), + e.getCause() != null ? e.getCause() : "NULL", + e.getMessage(), + e + ); } else { - logger(joinPoint) - .error( - "Exception in {}() with cause = {}", - joinPoint.getSignature().getName(), - e.getCause() != null ? String.valueOf(e.getCause()) : "NULL" - ); + logger(joinPoint).error( + "Exception in {}() with cause = {}", + joinPoint.getSignature().getName(), + e.getCause() != null ? String.valueOf(e.getCause()) : "NULL" + ); } } diff --git a/generators/server/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs b/generators/server/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs index 32be6d27c572..c04b05dfdbce 100644 --- a/generators/server/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs +++ b/generators/server/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs @@ -28,7 +28,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; */ @ConfigurationProperties(prefix = "application", ignoreUnknownFields = false) public class ApplicationProperties { - // jhipster-needle-application-properties-property // jhipster-needle-application-properties-property-getter diff --git a/generators/server/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs b/generators/server/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs index 4fdaaca640aa..bd1540e5d139 100644 --- a/generators/server/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs +++ b/generators/server/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs @@ -23,6 +23,7 @@ import org.springframework.boot.ansi.AnsiStyle; * @see JHipster issue */ public class CRLFLogConverter extends CompositeConverter { + public static final Marker CRLF_SAFE_MARKER = MarkerFactory.getMarker("CRLF_SAFE"); private static final String[] SAFE_LOGS = { @@ -32,17 +33,17 @@ public class CRLFLogConverter extends CompositeConverter { }; private static final Map ELEMENTS; - static { - Map ansiElements = new HashMap<>(); - ansiElements.put("faint", AnsiStyle.FAINT); - ansiElements.put("red", AnsiColor.RED); - ansiElements.put("green", AnsiColor.GREEN); - ansiElements.put("yellow", AnsiColor.YELLOW); - ansiElements.put("blue", AnsiColor.BLUE); - ansiElements.put("magenta", AnsiColor.MAGENTA); - ansiElements.put("cyan", AnsiColor.CYAN); - ELEMENTS = Collections.unmodifiableMap(ansiElements); - } + static { + Map ansiElements = new HashMap<>(); + ansiElements.put("faint", AnsiStyle.FAINT); + ansiElements.put("red", AnsiColor.RED); + ansiElements.put("green", AnsiColor.GREEN); + ansiElements.put("yellow", AnsiColor.YELLOW); + ansiElements.put("blue", AnsiColor.BLUE); + ansiElements.put("magenta", AnsiColor.MAGENTA); + ansiElements.put("cyan", AnsiColor.CYAN); + ELEMENTS = Collections.unmodifiableMap(ansiElements); + } @Override protected String transform(ILoggingEvent event, String in) { @@ -64,7 +65,7 @@ public class CRLFLogConverter extends CompositeConverter { return false; } - protected String toAnsiString(String in, AnsiElement element) { - return AnsiOutput.toString(element, in); - } + protected String toAnsiString(String in, AnsiElement element) { + return AnsiOutput.toString(element, in); + } } diff --git a/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs b/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs index b81a53f948b5..9b83d3627225 100644 --- a/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs +++ b/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs @@ -323,7 +323,7 @@ public class SecurityConfiguration { */ @Bean public GrantedAuthoritiesMapper userAuthoritiesMapper() { - return (authorities) -> { + return authorities -> { Set mappedAuthorities = new HashSet<>(); authorities.forEach(authority -> { @@ -365,6 +365,7 @@ public class SecurityConfiguration { * @see CSRF protection not working with Spring Security 6 */ static final class SpaCsrfTokenRequestHandler extends CsrfTokenRequestAttributeHandler { + private final CsrfTokenRequestHandler delegate = new XorCsrfTokenRequestAttributeHandler(); @Override diff --git a/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs b/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs index a5a650883251..486011bc7b87 100644 --- a/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs +++ b/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs @@ -340,20 +340,26 @@ public class SecurityConfiguration { public ReactiveOAuth2UserService oidcUserService() { final OidcReactiveOAuth2UserService delegate = new OidcReactiveOAuth2UserService(); - return (userRequest) -> { + return userRequest -> { // Delegate to the default implementation for loading a user - return delegate.loadUser(userRequest).map(user -> { - Set mappedAuthorities = new HashSet<>(); - - user.getAuthorities().forEach(authority -> { - if (authority instanceof OidcUserAuthority) { - OidcUserAuthority oidcUserAuthority = (OidcUserAuthority) authority; - mappedAuthorities.addAll(SecurityUtils.extractAuthorityFromClaims(oidcUserAuthority.getUserInfo().getClaims())); - } + return delegate + .loadUser(userRequest) + .map(user -> { + Set mappedAuthorities = new HashSet<>(); + + user + .getAuthorities() + .forEach(authority -> { + if (authority instanceof OidcUserAuthority) { + OidcUserAuthority oidcUserAuthority = (OidcUserAuthority) authority; + mappedAuthorities.addAll( + SecurityUtils.extractAuthorityFromClaims(oidcUserAuthority.getUserInfo().getClaims()) + ); + } + }); + + return new DefaultOidcUser(mappedAuthorities, user.getIdToken(), user.getUserInfo(), PREFERRED_USERNAME); }); - - return new DefaultOidcUser(mappedAuthorities, user.getIdToken(), user.getUserInfo(), PREFERRED_USERNAME); - }); }; } diff --git a/generators/server/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs b/generators/server/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs index 53702ecaef52..fa195888df2b 100644 --- a/generators/server/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs @@ -63,5 +63,4 @@ public class StaticResourcesWebConfiguration implements WebMvcConfigurer { private int getJHipsterHttpCacheProperty() { return jhipsterProperties.getHttp().getCache().getTimeToLiveInDays(); } - } diff --git a/generators/server/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs b/generators/server/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs index 6f0f667e4aa5..573109ee6285 100644 --- a/generators/server/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs +++ b/generators/server/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs @@ -29,6 +29,5 @@ public final class AuthoritiesConstants { public static final String ANONYMOUS = "ROLE_ANONYMOUS"; - private AuthoritiesConstants() { - } + private AuthoritiesConstants() {} } diff --git a/generators/server/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs b/generators/server/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs index 24af1b4aaeb6..cd593704c402 100644 --- a/generators/server/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs +++ b/generators/server/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs @@ -78,8 +78,7 @@ import java.util.*; * couldn't be cleanly extended. */ @Service -public class PersistentTokenRememberMeServices extends - AbstractRememberMeServices { +public class PersistentTokenRememberMeServices extends AbstractRememberMeServices { private static final Logger LOG = LoggerFactory.getLogger(PersistentTokenRememberMeServices.class); @@ -96,10 +95,12 @@ public class PersistentTokenRememberMeServices extends private final UserRepository userRepository; - public PersistentTokenRememberMeServices(JHipsterProperties jHipsterProperties, - org.springframework.security.core.userdetails.UserDetailsService userDetailsService, - PersistentTokenRepository persistentTokenRepository, UserRepository userRepository) { - + public PersistentTokenRememberMeServices( + JHipsterProperties jHipsterProperties, + org.springframework.security.core.userdetails.UserDetailsService userDetailsService, + PersistentTokenRepository persistentTokenRepository, + UserRepository userRepository + ) { super(jHipsterProperties.getSecurity().getRememberMe().getKey(), userDetailsService); this.persistentTokenRepository = persistentTokenRepository; this.userRepository = userRepository; @@ -107,9 +108,7 @@ public class PersistentTokenRememberMeServices extends } @Override - protected UserDetails processAutoLoginCookie(String[] cookieTokens, HttpServletRequest request, - HttpServletResponse response) { - + protected UserDetails processAutoLoginCookie(String[] cookieTokens, HttpServletRequest request, HttpServletResponse response) { synchronized (this) { // prevent 2 authentication requests from the same user in parallel String login = null; UpgradedRememberMeToken upgradedToken = upgradedTokenCache.get(cookieTokens[0]); @@ -272,9 +271,7 @@ public class PersistentTokenRememberMeServices extends } private void addCookie(PersistentToken token, HttpServletRequest request, HttpServletResponse response) { - setCookie( - new String[]{token.getSeries(), token.getTokenValue()}, - TOKEN_VALIDITY_SECONDS, request, response); + setCookie(new String[] { token.getSeries(), token.getTokenValue() }, TOKEN_VALIDITY_SECONDS, request, response); } private static class UpgradedRememberMeToken implements Serializable { @@ -291,8 +288,7 @@ public class PersistentTokenRememberMeServices extends } String getUserLoginIfValid(String[] currentToken) { - if (currentToken[0].equals(this.upgradedToken[0]) && - currentToken[1].equals(this.upgradedToken[1])) { + if (currentToken[0].equals(this.upgradedToken[0]) && currentToken[1].equals(this.upgradedToken[1])) { return this.userLogin; } return null; diff --git a/generators/server/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs b/generators/server/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs index f2c466e5509d..43909fb9bb63 100644 --- a/generators/server/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs +++ b/generators/server/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs @@ -84,7 +84,12 @@ public class CustomClaimConverter implements Converter, Map< // Retrieve user info from OAuth provider if not already loaded ObjectNode user = users.get(claims.get("sub").toString(), s -> { - ResponseEntity userInfo = restTemplate.exchange(registration.getProviderDetails().getUserInfoEndpoint().getUri(), HttpMethod.GET, new HttpEntity(headers), ObjectNode.class); + ResponseEntity userInfo = restTemplate.exchange( + registration.getProviderDetails().getUserInfoEndpoint().getUri(), + HttpMethod.GET, + new HttpEntity(headers), + ObjectNode.class + ); return userInfo.getBody(); }); @@ -105,19 +110,15 @@ public class CustomClaimConverter implements Converter, Map< String[] name = user.get("name").asText().split("\\s+"); if (name.length > 0) { convertedClaims.put("given_name", name[0]); - convertedClaims.put("family_name", - String.join(" ", Arrays.copyOfRange(name, 1, name.length))); + convertedClaims.put("family_name", String.join(" ", Arrays.copyOfRange(name, 1, name.length))); } } if (user.has("groups")) { - List groups = StreamSupport.stream(user.get("groups").spliterator(), false) - .map(JsonNode::asText) - .toList(); + List groups = StreamSupport.stream(user.get("groups").spliterator(), false).map(JsonNode::asText).toList(); convertedClaims.put("groups", groups); } if (user.has(SecurityUtils.CLAIMS_NAMESPACE + "roles")) { - List roles = StreamSupport - .stream(user.get(SecurityUtils.CLAIMS_NAMESPACE + "roles").spliterator(), false) + List roles = StreamSupport.stream(user.get(SecurityUtils.CLAIMS_NAMESPACE + "roles").spliterator(), false) .map(JsonNode::asText) .toList(); convertedClaims.put("roles", roles); diff --git a/generators/server/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs b/generators/server/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs index e981b387f9ba..3eba0e3c73bf 100644 --- a/generators/server/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs +++ b/generators/server/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs @@ -25,5 +25,4 @@ public class EmailAlreadyUsedException extends RuntimeException { public EmailAlreadyUsedException() { super("Email is already in use!"); } - } diff --git a/generators/server/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs b/generators/server/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs index e9c341904a56..b2f80f3b26ec 100644 --- a/generators/server/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs +++ b/generators/server/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs @@ -25,5 +25,4 @@ public class InvalidPasswordException extends RuntimeException { public InvalidPasswordException() { super("Incorrect password"); } - } diff --git a/generators/server/templates/src/main/java/_package_/service/MailService.java.ejs b/generators/server/templates/src/main/java/_package_/service/MailService.java.ejs index d7d3b407a11b..21879b927f14 100644 --- a/generators/server/templates/src/main/java/_package_/service/MailService.java.ejs +++ b/generators/server/templates/src/main/java/_package_/service/MailService.java.ejs @@ -70,9 +70,12 @@ public class MailService { private final SpringTemplateEngine templateEngine; - public MailService(JHipsterProperties jHipsterProperties, JavaMailSender javaMailSender, - MessageSource messageSource, SpringTemplateEngine templateEngine) { - + public MailService( + JHipsterProperties jHipsterProperties, + JavaMailSender javaMailSender, + MessageSource messageSource, + SpringTemplateEngine templateEngine + ) { this.jHipsterProperties = jHipsterProperties; this.javaMailSender = javaMailSender; this.messageSource = messageSource; @@ -107,7 +110,7 @@ public class MailService { message.setText(content, isHtml); javaMailSender.send(mimeMessage); LOG.debug("Sent email to User '{}'", to); - } catch (MailException | MessagingException e) { + } catch (MailException | MessagingException e) { LOG.warn("Email could not be sent to user '{}'", to, e); } } diff --git a/generators/server/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs b/generators/server/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs index 9d3c6dfb1c5c..3ca6aef1d17e 100644 --- a/generators/server/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs +++ b/generators/server/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs @@ -25,5 +25,4 @@ public class UsernameAlreadyUsedException extends RuntimeException { public UsernameAlreadyUsedException() { super("Login name already used!"); } - } diff --git a/generators/server/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs b/generators/server/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs index b3582511ed93..ea0a1ddbfab9 100644 --- a/generators/server/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs +++ b/generators/server/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs @@ -24,6 +24,7 @@ import java.io.Serializable; * A DTO representing a password change required data - current and new password. */ public class PasswordChangeDTO implements Serializable { + private static final long serialVersionUID = 1L; private String currentPassword; @@ -39,7 +40,6 @@ public class PasswordChangeDTO implements Serializable { } public String getCurrentPassword() { - return currentPassword; } diff --git a/generators/server/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs b/generators/server/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs index ccbff60e2da8..508368e4e7da 100644 --- a/generators/server/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs +++ b/generators/server/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs @@ -52,8 +52,7 @@ public class OAuth2ReactiveRefreshTokensWebFilter implements WebFilter { private Mono authorizedClient(ServerWebExchange exchange, OAuth2AuthenticationToken oauth2Authentication) { String clientRegistrationId = oauth2Authentication.getAuthorizedClientRegistrationId(); - OAuth2AuthorizeRequest request = OAuth2AuthorizeRequest - .withClientRegistrationId(clientRegistrationId) + OAuth2AuthorizeRequest request = OAuth2AuthorizeRequest.withClientRegistrationId(clientRegistrationId) .principal(oauth2Authentication) .attribute(ServerWebExchange.class.getName(), exchange) .build(); diff --git a/generators/server/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs b/generators/server/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs index c6dbe70a8e23..5ac57d70f3a7 100644 --- a/generators/server/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs +++ b/generators/server/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs @@ -59,11 +59,10 @@ public class OAuth2RefreshTokensWebFilter extends OncePerRequestFilter { ) { this.clientManager = clientManager; this.authorizedClientRepository = authorizedClientRepository; - this.authorizationRequestResolver = - new DefaultOAuth2AuthorizationRequestResolver( - clientRegistrationRepository, - OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI - ); + this.authorizationRequestResolver = new DefaultOAuth2AuthorizationRequestResolver( + clientRegistrationRepository, + OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI + ); } @Override @@ -88,8 +87,7 @@ public class OAuth2RefreshTokensWebFilter extends OncePerRequestFilter { private OAuth2AuthorizedClient authorizedClient(OAuth2AuthenticationToken oauth2Authentication) { String clientRegistrationId = oauth2Authentication.getAuthorizedClientRegistrationId(); - OAuth2AuthorizeRequest request = OAuth2AuthorizeRequest - .withClientRegistrationId(clientRegistrationId) + OAuth2AuthorizeRequest request = OAuth2AuthorizeRequest.withClientRegistrationId(clientRegistrationId) .principal(oauth2Authentication) .build(); if (clientManager == null) { diff --git a/generators/server/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs index 191543ed392c..3f4c271fb47c 100644 --- a/generators/server/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs +++ b/generators/server/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs @@ -241,9 +241,11 @@ public class AccountResource { @GetMapping("/account/sessions") public List getCurrentSessions() { return persistentTokenRepository.findByUser( - userRepository.findOneByLogin(SecurityUtils.getCurrentUserLogin() - .orElseThrow(() -> new AccountResourceException("Current user login not found"))) - .orElseThrow(() -> new AccountResourceException("User could not be found")) + userRepository + .findOneByLogin( + SecurityUtils.getCurrentUserLogin().orElseThrow(() -> new AccountResourceException("Current user login not found")) + ) + .orElseThrow(() -> new AccountResourceException("User could not be found")) ); } diff --git a/generators/server/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs index e594c03c5557..b5c8750c8e45 100644 --- a/generators/server/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs +++ b/generators/server/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs @@ -112,7 +112,9 @@ public class AccountResource { } else { throw new AccountResourceException(); } - Set authorities = authentication.getAuthorities().stream() + Set authorities = authentication + .getAuthorities() + .stream() .map(GrantedAuthority::getAuthority) .collect(Collectors.toSet()); return new UserVM(login, authorities); diff --git a/generators/server/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs index ef0ba8a468c5..e71f99e237db 100644 --- a/generators/server/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs +++ b/generators/server/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs @@ -32,16 +32,17 @@ public class AuthInfoResource { @Value("${spring.security.oauth2.client.provider.oidc.issuer-uri:}") private String issuer; + @Value("${spring.security.oauth2.client.registration.oidc.client-id:}") private String clientId; - @GetMapping("/auth-info") public AuthInfoVM getAuthInfo() { return new AuthInfoVM(issuer, clientId); } class AuthInfoVM { + private String issuer; private String clientId; diff --git a/generators/server/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs index e3874b00989c..73d029eb53fd 100644 --- a/generators/server/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs +++ b/generators/server/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs @@ -82,9 +82,11 @@ 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(); @@ -102,9 +104,10 @@ public class AuthenticateController { @PostMapping("/authenticate") public ResponseEntity authorize(@Valid @RequestBody LoginVM loginVM) { - - UsernamePasswordAuthenticationToken authenticationToken = - new UsernamePasswordAuthenticationToken(loginVM.getUsername(), loginVM.getPassword()); + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken( + loginVM.getUsername(), + loginVM.getPassword() + ); Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken); SecurityContextHolder.getContext().setAuthentication(authentication); diff --git a/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs index 622deb5acbe1..f5bd33401c9d 100644 --- a/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs +++ b/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs @@ -48,18 +48,16 @@ public class LogoutResource { * @return the {@link ResponseEntity} with status {@code 200 (OK)} and a body with a global logout URL. */ @PostMapping("/api/logout") - public ResponseEntity logout(HttpServletRequest request, - @AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken) { + public ResponseEntity logout(HttpServletRequest request, @AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken) { StringBuilder logoutUrl = new StringBuilder(); logoutUrl.append(this.registration.getProviderDetails().getConfigurationMetadata().get("end_session_endpoint").toString()); - + String originUrl = request.getHeader(HttpHeaders.ORIGIN); logoutUrl.append("?id_token_hint=").append(idToken.getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl); - + request.getSession().invalidate(); return ResponseEntity.ok().body(Map.of("logoutUrl", logoutUrl.toString())); } - } diff --git a/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs index 792c9b73369f..ca7b99b7c771 100644 --- a/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs +++ b/generators/server/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs @@ -49,12 +49,12 @@ public class LogoutResource { * @return status {@code 200 (OK)} and a body with a global logout URL. */ @PostMapping("/api/logout") - public Mono> logout(@AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken, ServerHttpRequest request, WebSession session) { - return session - .invalidate() - .then( - this.registration.map(oidc -> prepareLogoutUri(request, oidc, idToken)) - ); + public Mono> logout( + @AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken, + ServerHttpRequest request, + WebSession session + ) { + return session.invalidate().then(this.registration.map(oidc -> prepareLogoutUri(request, oidc, idToken))); } private Map prepareLogoutUri(ServerHttpRequest request, ClientRegistration clientRegistration, OidcIdToken idToken) { @@ -65,7 +65,7 @@ public class LogoutResource { String originUrl = request.getHeaders().getOrigin(); logoutUrl.append("?id_token_hint=").append(idToken.getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl); - + return Map.of("logoutUrl", logoutUrl.toString()); } } diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs index b45f13adafc8..d6f32c85b767 100644 --- a/generators/server/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs +++ b/generators/server/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs @@ -39,13 +39,17 @@ public class BadRequestAlertException extends ErrorResponseException { } public BadRequestAlertException(URI type, String defaultMessage, String entityName, String errorKey) { - super(HttpStatus.BAD_REQUEST, ProblemDetailWithCauseBuilder.instance() + super( + HttpStatus.BAD_REQUEST, + ProblemDetailWithCauseBuilder.instance() .withStatus(HttpStatus.BAD_REQUEST.value()) .withType(type) .withTitle(defaultMessage) .withProperty("message", "error." + errorKey) .withProperty("params", entityName) - .build(), null); + .build(), + null + ); this.entityName = entityName; this.errorKey = errorKey; } @@ -59,6 +63,6 @@ public class BadRequestAlertException extends ErrorResponseException { } public ProblemDetailWithCause getProblemDetailWithCause() { - return (ProblemDetailWithCause) this.getBody(); + return (ProblemDetailWithCause) this.getBody(); } } diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs index 155927369414..10ba3896c452 100644 --- a/generators/server/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs +++ b/generators/server/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs @@ -47,5 +47,4 @@ public class FieldErrorVM implements Serializable { public String getMessage() { return message; } - } diff --git a/generators/server/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs b/generators/server/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs index 8515134079fb..94090bd0b1cc 100644 --- a/generators/server/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs +++ b/generators/server/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs @@ -28,10 +28,14 @@ public class InvalidPasswordException extends ErrorResponseException { private static final long serialVersionUID = 1L; public InvalidPasswordException() { - super(HttpStatus.BAD_REQUEST, ProblemDetailWithCauseBuilder.instance() + super( + HttpStatus.BAD_REQUEST, + ProblemDetailWithCauseBuilder.instance() .withStatus(HttpStatus.BAD_REQUEST.value()) .withType(ErrorConstants.INVALID_PASSWORD_TYPE) .withTitle("Incorrect password") - .build(), null); + .build(), + null + ); } } diff --git a/generators/server/templates/src/main/resources/config/application-dev.yml.ejs b/generators/server/templates/src/main/resources/config/application-dev.yml.ejs index 4b9117fb3621..5977627d4844 100644 --- a/generators/server/templates/src/main/resources/config/application-dev.yml.ejs +++ b/generators/server/templates/src/main/resources/config/application-dev.yml.ejs @@ -106,7 +106,7 @@ spring: config: fail-fast: false # if not in "prod" profile, do not force to use Spring Cloud Config format: yaml - profile-separator: "-" + profile-separator: '-' discovery: prefer-ip-address: true tags: @@ -339,7 +339,6 @@ jhipster: host: localhost port: 5000 ring-buffer-size: 512 - # =================================================================== # Application specific properties # Add your own application properties here, see the ApplicationProperties class diff --git a/generators/server/templates/src/main/resources/config/application-prod.yml.ejs b/generators/server/templates/src/main/resources/config/application-prod.yml.ejs index d810d1aaebb0..a46242b647dd 100644 --- a/generators/server/templates/src/main/resources/config/application-prod.yml.ejs +++ b/generators/server/templates/src/main/resources/config/application-prod.yml.ejs @@ -321,7 +321,6 @@ jhipster: host: localhost port: 5000 ring-buffer-size: 512 - # =================================================================== # Application specific properties # Add your own application properties here, see the ApplicationProperties class diff --git a/generators/server/templates/src/main/resources/config/application.yml.ejs b/generators/server/templates/src/main/resources/config/application.yml.ejs index 6d5b5e18dd06..bb003f2bfa58 100644 --- a/generators/server/templates/src/main/resources/config/application.yml.ejs +++ b/generators/server/templates/src/main/resources/config/application.yml.ejs @@ -402,7 +402,7 @@ springdoc: # Properties to be exposed on the /info management endpoint info: # Comma separated list of profiles that will trigger the ribbon to show - display-ribbon-on-profiles: "dev" + display-ribbon-on-profiles: 'dev' # =================================================================== # JHipster specific properties diff --git a/generators/server/templates/src/main/resources/config/bootstrap-prod.yml.ejs b/generators/server/templates/src/main/resources/config/bootstrap-prod.yml.ejs index b52b27eb448c..7a193e33bb6f 100644 --- a/generators/server/templates/src/main/resources/config/bootstrap-prod.yml.ejs +++ b/generators/server/templates/src/main/resources/config/bootstrap-prod.yml.ejs @@ -37,7 +37,7 @@ spring: config: fail-fast: true format: yaml # set this to "files" if using git2consul - profile-separator: "-" + profile-separator: '-' retry: initial-interval: 1000 max-interval: 2000 diff --git a/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs b/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs index 5315fd8337b1..0de7ea411745 100644 --- a/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs +++ b/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs @@ -37,7 +37,7 @@ spring: config: fail-fast: false # if not in "prod" profile, do not force to use Spring Cloud Config format: yaml - profile-separator: "-" + profile-separator: '-' discovery: tags: - profile=${spring.profiles.active} diff --git a/generators/server/templates/src/main/resources/templates/error.html.ejs b/generators/server/templates/src/main/resources/templates/error.html.ejs index 690e85607cf6..31ee9d7d13a4 100644 --- a/generators/server/templates/src/main/resources/templates/error.html.ejs +++ b/generators/server/templates/src/main/resources/templates/error.html.ejs @@ -1,4 +1,4 @@ - + + JHipster activation diff --git a/generators/server/templates/src/main/resources/templates/mail/creationEmail.html.ejs b/generators/server/templates/src/main/resources/templates/mail/creationEmail.html.ejs index 4e528980e24a..ab466216642a 100644 --- a/generators/server/templates/src/main/resources/templates/mail/creationEmail.html.ejs +++ b/generators/server/templates/src/main/resources/templates/mail/creationEmail.html.ejs @@ -1,4 +1,4 @@ - + JHipster creation diff --git a/generators/server/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs b/generators/server/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs index 290ca6dcc03a..eb74196f31ec 100644 --- a/generators/server/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs +++ b/generators/server/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs @@ -1,4 +1,4 @@ - + JHipster password reset diff --git a/generators/server/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs b/generators/server/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs index 4b428b66ab55..b28109984a7f 100644 --- a/generators/server/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs +++ b/generators/server/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs @@ -53,13 +53,10 @@ class StaticResourcesWebConfigurerTest { @Test void shouldAppendResourceHandlerAndInitializeIt() { - staticResourcesWebConfiguration.addResourceHandlers(resourceHandlerRegistry); - verify(resourceHandlerRegistry, times(1)) - .addResourceHandler(RESOURCE_PATHS); - verify(staticResourcesWebConfiguration, times(1)) - .initializeResourceHandler(any(ResourceHandlerRegistration.class)); + verify(resourceHandlerRegistry, times(1)).addResourceHandler(RESOURCE_PATHS); + verify(staticResourcesWebConfiguration, times(1)).initializeResourceHandler(any(ResourceHandlerRegistration.class)); for (String testingPath : RESOURCE_PATHS) { assertThat(resourceHandlerRegistry.hasMappingForPattern(testingPath)).isTrue(); } @@ -78,7 +75,6 @@ class StaticResourcesWebConfigurerTest { verify(resourceHandlerRegistration, times(1)).addResourceLocations(RESOURCE_LOCATIONS); } - @Test void shouldCreateCacheControlBasedOnJhipsterDefaultProperties() { CacheControl cacheExpected = CacheControl.maxAge(JHipsterDefaults.Http.Cache.timeToLiveInDays, TimeUnit.DAYS).cachePublic(); diff --git a/generators/server/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs b/generators/server/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs index 8703dd58007d..64ea619274bb 100644 --- a/generators/server/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs +++ b/generators/server/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs @@ -65,10 +65,8 @@ class WebConfigurerTest { @BeforeEach public void setup() { servletContext = spy(new MockServletContext()); - doReturn(mock(FilterRegistration.Dynamic.class)) - .when(servletContext).addFilter(anyString(), any(Filter.class)); - doReturn(mock(ServletRegistration.Dynamic.class)) - .when(servletContext).addServlet(anyString(), any(Servlet.class)); + doReturn(mock(FilterRegistration.Dynamic.class)).when(servletContext).addFilter(anyString(), any(Filter.class)); + doReturn(mock(ServletRegistration.Dynamic.class)).when(servletContext).addServlet(anyString(), any(Servlet.class)); env = new MockEnvironment(); props = new JHipsterProperties(); @@ -99,14 +97,14 @@ class WebConfigurerTest { props.getCors().setMaxAge(1800L); props.getCors().setAllowCredentials(true); - MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController()) - .addFilters(webConfigurer.corsFilter()) - .build(); + MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController()).addFilters(webConfigurer.corsFilter()).build(); - mockMvc.perform( - options("/api/test-cors") - .header(HttpHeaders.ORIGIN, "other.domain.com") - .header(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "POST")) + mockMvc + .perform( + options("/api/test-cors") + .header(HttpHeaders.ORIGIN, "other.domain.com") + .header(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "POST") + ) .andExpect(status().isOk()) .andExpect(header().string(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, "other.domain.com")) .andExpect(header().string(HttpHeaders.VARY, "Origin")) @@ -140,9 +138,7 @@ class WebConfigurerTest { void shouldCorsFilterDeactivatedForNullAllowedOrigins() throws Exception { props.getCors().setAllowedOrigins(null); - MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController()) - .addFilters(webConfigurer.corsFilter()) - .build(); + MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController()).addFilters(webConfigurer.corsFilter()).build(); mockMvc .perform(get("/api/test-cors").header(HttpHeaders.ORIGIN, "other.domain.com")) @@ -154,9 +150,7 @@ class WebConfigurerTest { void shouldCorsFilterDeactivatedForEmptyAllowedOrigins() throws Exception { props.getCors().setAllowedOrigins(new ArrayList<>()); - MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController()) - .addFilters(webConfigurer.corsFilter()) - .build(); + MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController()).addFilters(webConfigurer.corsFilter()).build(); mockMvc .perform(get("/api/test-cors").header(HttpHeaders.ORIGIN, "other.domain.com")) diff --git a/generators/server/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs b/generators/server/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs index 56bedf2c6a2f..37939b35ec55 100644 --- a/generators/server/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs +++ b/generators/server/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs @@ -25,10 +25,8 @@ import org.springframework.web.bind.annotation.RestController; public class WebConfigurerTestController { @GetMapping("/api/test-cors") - public void testCorsOnApiPath() { - } + public void testCorsOnApiPath() {} @GetMapping("/test/test-cors") - public void testCorsOnOtherPath() { - } + public void testCorsOnOtherPath() {} } diff --git a/generators/server/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs b/generators/server/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs index e791d369bfca..31dbad76fdd6 100644 --- a/generators/server/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs +++ b/generators/server/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs @@ -46,21 +46,13 @@ class SecurityMetersServiceTests { void testInvalidTokensCountersByCauseAreCreated() { meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).counter(); - meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME) - .tag("cause", "expired") - .counter(); + meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "expired").counter(); - meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME) - .tag("cause", "unsupported") - .counter(); + meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "unsupported").counter(); - meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME) - .tag("cause", "invalid-signature") - .counter(); + meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter(); - meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME) - .tag("cause", "malformed") - .counter(); + meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "malformed").counter(); Collection counters = meterRegistry.find(INVALID_TOKENS_METER_EXPECTED_NAME).counters(); @@ -69,45 +61,28 @@ class SecurityMetersServiceTests { @Test void testCountMethodsShouldBeBoundToCorrectCounters() { - assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME) - .tag("cause", "expired") - .counter().count()).isZero(); + assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "expired").counter().count()).isZero(); securityMetersService.trackTokenExpired(); - assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME) - .tag("cause", "expired") - .counter().count()).isEqualTo(1); + assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "expired").counter().count()).isEqualTo(1); - assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME) - .tag("cause", "unsupported") - .counter().count()).isZero(); + assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "unsupported").counter().count()).isZero(); securityMetersService.trackTokenUnsupported(); - assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME) - .tag("cause", "unsupported") - .counter().count()).isEqualTo(1); + assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "unsupported").counter().count()).isEqualTo(1); - assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME) - .tag("cause", "invalid-signature") - .counter().count()).isZero(); + assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter().count()).isZero(); securityMetersService.trackTokenInvalidSignature(); - assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME) - .tag("cause", "invalid-signature") - .counter().count()).isEqualTo(1); + assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter().count()).isEqualTo(1); - assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME) - .tag("cause", "malformed") - .counter().count()).isZero(); + assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "malformed").counter().count()).isZero(); securityMetersService.trackTokenMalformed(); - assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME) - .tag("cause", "malformed") - .counter().count()).isEqualTo(1); + assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "malformed").counter().count()).isEqualTo(1); } - } diff --git a/generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs b/generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs index d379f3c59ee2..a385cd5ba420 100644 --- a/generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs +++ b/generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs @@ -73,8 +73,7 @@ class SecurityUtilsUnitTest { claims.put("groups", AuthoritiesConstants.USER); claims.put("sub", 123); claims.put("preferred_username", "admin"); - OidcIdToken idToken = new OidcIdToken(ID_TOKEN, Instant.now(), - Instant.now().plusSeconds(60), claims); + OidcIdToken idToken = new OidcIdToken(ID_TOKEN, Instant.now(), Instant.now().plusSeconds(60), claims); Collection authorities = new ArrayList<>(); authorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.USER)); OidcUser user = new DefaultOidcUser(authorities, idToken); diff --git a/generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs b/generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs index 44612ff39c60..30daf3c349e8 100644 --- a/generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs +++ b/generators/server/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs @@ -89,9 +89,7 @@ class SecurityUtilsUnitTest { authorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.ANONYMOUS)); Boolean isAuthenticated = SecurityUtils.isAuthenticated() .contextWrite( - ReactiveSecurityContextHolder.withAuthentication( - new UsernamePasswordAuthenticationToken("admin", "admin", authorities) - ) + ReactiveSecurityContextHolder.withAuthentication(new UsernamePasswordAuthenticationToken("admin", "admin", authorities)) ) .block(); assertThat(isAuthenticated).isFalse(); @@ -104,12 +102,18 @@ class SecurityUtilsUnitTest { Context context = ReactiveSecurityContextHolder.withAuthentication( new UsernamePasswordAuthenticationToken("admin", "admin", authorities) ); - Boolean hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserAnyOfAuthorities(AuthoritiesConstants.USER, AuthoritiesConstants.ADMIN) + Boolean hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserAnyOfAuthorities( + AuthoritiesConstants.USER, + AuthoritiesConstants.ADMIN + ) .contextWrite(context) .block(); assertThat(hasCurrentUserThisAuthority).isTrue(); - hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserAnyOfAuthorities(AuthoritiesConstants.ANONYMOUS, AuthoritiesConstants.ADMIN) + hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserAnyOfAuthorities( + AuthoritiesConstants.ANONYMOUS, + AuthoritiesConstants.ADMIN + ) .contextWrite(context) .block(); assertThat(hasCurrentUserThisAuthority).isFalse(); @@ -122,12 +126,18 @@ class SecurityUtilsUnitTest { Context context = ReactiveSecurityContextHolder.withAuthentication( new UsernamePasswordAuthenticationToken("admin", "admin", authorities) ); - Boolean hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserNoneOfAuthorities(AuthoritiesConstants.USER, AuthoritiesConstants.ADMIN) + Boolean hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserNoneOfAuthorities( + AuthoritiesConstants.USER, + AuthoritiesConstants.ADMIN + ) .contextWrite(context) .block(); assertThat(hasCurrentUserThisAuthority).isFalse(); - hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserNoneOfAuthorities(AuthoritiesConstants.ANONYMOUS, AuthoritiesConstants.ADMIN) + hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserNoneOfAuthorities( + AuthoritiesConstants.ANONYMOUS, + AuthoritiesConstants.ADMIN + ) .contextWrite(context) .block(); assertThat(hasCurrentUserThisAuthority).isTrue(); @@ -145,9 +155,7 @@ class SecurityUtilsUnitTest { .block(); assertThat(hasCurrentUserThisAuthority).isTrue(); - hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserThisAuthority(AuthoritiesConstants.ADMIN) - .contextWrite(context) - .block(); + hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserThisAuthority(AuthoritiesConstants.ADMIN).contextWrite(context).block(); assertThat(hasCurrentUserThisAuthority).isFalse(); } } diff --git a/generators/server/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs b/generators/server/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs index c86d7b7bfb21..d1704f4ab07c 100644 --- a/generators/server/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs +++ b/generators/server/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs @@ -72,8 +72,7 @@ public class JwtAuthenticationTestUtils { var now = Instant.now(); - JwtClaimsSet claims = JwtClaimsSet - .builder() + JwtClaimsSet claims = JwtClaimsSet.builder() .issuedAt(now) .expiresAt(now.plusSeconds(60)) .subject(user) diff --git a/generators/server/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs b/generators/server/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs index 51fe6ce9d738..c3aed5b1f010 100644 --- a/generators/server/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs +++ b/generators/server/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs @@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api") public class TestAuthenticationResource { + /** * {@code GET /authenticate} : check if the authentication token correctly validates * diff --git a/generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs b/generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs index 22d504f7bd75..a5b7ec2518b9 100644 --- a/generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs +++ b/generators/server/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs @@ -68,8 +68,9 @@ class TokenAuthenticationSecurityMetersIT { tryToAuthenticate(createTokenWithDifferentSignature()); - assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter().count()) - .isEqualTo(count + 1); + assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter().count()).isEqualTo( + count + 1 + ); } @Test diff --git a/generators/server/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs b/generators/server/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs index 2d2d40e34bb9..04de0bd51727 100644 --- a/generators/server/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs +++ b/generators/server/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs @@ -77,8 +77,7 @@ class CustomClaimConverterIT { any(HttpEntity.class), ArgumentMatchers.>any() ) - ) - .thenReturn(ResponseEntity.ok(userInfo)); + ).thenReturn(ResponseEntity.ok(userInfo)); } @Test @@ -157,11 +156,9 @@ class CustomClaimConverterIT { user.put("preferred_username", USERNAME); mockHttpGetUserInfo(user); - assertThatCode(() -> { + assertThatCode(() -> { Map convertedClaims = customClaimConverter.convert(claims); - assertThat(convertedClaims) - .containsEntry("preferred_username", USERNAME) - .doesNotContainKeys("given_name", "family_name"); + assertThat(convertedClaims).containsEntry("preferred_username", USERNAME).doesNotContainKeys("given_name", "family_name"); }).doesNotThrowAnyException(); } @@ -176,7 +173,7 @@ class CustomClaimConverterIT { user.put("name", FULL_NAME); mockHttpGetUserInfo(user); - assertThatCode(() -> { + assertThatCode(() -> { Map convertedClaims = customClaimConverter.convert(claims); assertThat(convertedClaims) .containsEntry("preferred_username", USERNAME) @@ -196,7 +193,7 @@ class CustomClaimConverterIT { user.put("name", FULL_NAME + " " + NAME_SUFFIX); mockHttpGetUserInfo(user); - assertThatCode(() -> { + assertThatCode(() -> { Map convertedClaims = customClaimConverter.convert(claims); System.out.println(convertedClaims); assertThat(convertedClaims) @@ -217,11 +214,9 @@ class CustomClaimConverterIT { user.put("email", EMAIL); mockHttpGetUserInfo(user); - assertThatCode(() -> { + assertThatCode(() -> { Map convertedClaims = customClaimConverter.convert(claims); - assertThat(convertedClaims) - .containsEntry("preferred_username", USERNAME) - .containsEntry("email", EMAIL); + assertThat(convertedClaims).containsEntry("preferred_username", USERNAME).containsEntry("email", EMAIL); }).doesNotThrowAnyException(); } } diff --git a/generators/server/templates/src/test/java/_package_/service/MailServiceIT.java.ejs b/generators/server/templates/src/test/java/_package_/service/MailServiceIT.java.ejs index 021dabc5cac2..d2be54bf8b25 100644 --- a/generators/server/templates/src/test/java/_package_/service/MailServiceIT.java.ejs +++ b/generators/server/templates/src/test/java/_package_/service/MailServiceIT.java.ejs @@ -78,7 +78,7 @@ class MailServiceIT { @BeforeEach public void setup() { doNothing().when(javaMailSender).send(any(MimeMessage.class)); - when(javaMailSender.createMimeMessage()).thenReturn(new MimeMessage((Session)null)); + when(javaMailSender.createMimeMessage()).thenReturn(new MimeMessage((Session) null)); } @Test @@ -233,7 +233,9 @@ class MailServiceIT { String emailTitle = (String) properties.get("email.test.title"); assertThat(message.getSubject()).isEqualTo(emailTitle); - assertThat(message.getContent().toString()).isEqualToNormalizingNewlines("" + emailTitle + ", http://127.0.0.1:8080, john\n"); + assertThat(message.getContent().toString()).isEqualToNormalizingNewlines( + "" + emailTitle + ", http://127.0.0.1:8080, john\n" + ); } } @@ -244,7 +246,7 @@ class MailServiceIT { String javaLangKey = langKey; Matcher matcher2 = PATTERN_LOCALE_2.matcher(langKey); if (matcher2.matches()) { - javaLangKey = matcher2.group(1) + "_"+ matcher2.group(2).toUpperCase(); + javaLangKey = matcher2.group(1) + "_" + matcher2.group(2).toUpperCase(); } Matcher matcher3 = PATTERN_LOCALE_3.matcher(langKey); if (matcher3.matches()) { diff --git a/generators/server/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs b/generators/server/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs index f38bb5caba97..28555f164a24 100644 --- a/generators/server/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs +++ b/generators/server/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs @@ -41,6 +41,7 @@ import org.springframework.security.oauth2.core.oidc.OidcUserInfo; import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser; public class OAuth2TestUtil { + public static final String TEST_USER_LOGIN = "test"; public static final String ID_TOKEN = diff --git a/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs b/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs index 405f6512b9b8..ed48391330c8 100644 --- a/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs +++ b/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs @@ -60,11 +60,7 @@ class SpaWebFilterIT { @Test void testFilterDoesNotForwardToIndexForDotFile() { - webTestClient - .get() - .uri("/file.js") - .exchange() - .expectStatus().isNotFound(); + webTestClient.get().uri("/file.js").exchange().expectStatus().isNotFound(); } @Test @@ -73,9 +69,12 @@ class SpaWebFilterIT { .get() .uri("/test") .exchange() - .expectStatus().isOk() - .expectHeader().contentType("text/html;charset=UTF-8") - .expectBody(String.class).isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT); + .expectStatus() + .isOk() + .expectHeader() + .contentType("text/html;charset=UTF-8") + .expectBody(String.class) + .isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT); } @Test @@ -84,9 +83,12 @@ class SpaWebFilterIT { .get() .uri("/first-level") .exchange() - .expectStatus().isOk() - .expectHeader().contentType("text/html;charset=UTF-8") - .expectBody(String.class).isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT); + .expectStatus() + .isOk() + .expectHeader() + .contentType("text/html;charset=UTF-8") + .expectBody(String.class) + .isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT); } @Test @@ -95,9 +97,12 @@ class SpaWebFilterIT { .get() .uri("/first-level/second-level") .exchange() - .expectStatus().isOk() - .expectHeader().contentType("text/html;charset=UTF-8") - .expectBody(String.class).isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT); + .expectStatus() + .isOk() + .expectHeader() + .contentType("text/html;charset=UTF-8") + .expectBody(String.class) + .isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT); } @Test @@ -106,9 +111,12 @@ class SpaWebFilterIT { .get() .uri("/first-level/second-level/third-level") .exchange() - .expectStatus().isOk() - .expectHeader().contentType("text/html;charset=UTF-8") - .expectBody(String.class).isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT); + .expectStatus() + .isOk() + .expectHeader() + .contentType("text/html;charset=UTF-8") + .expectBody(String.class) + .isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT); } @Test @@ -117,19 +125,17 @@ class SpaWebFilterIT { .get() .uri("/1/2/3/4/5/6/7/8/9/10") .exchange() - .expectStatus().isOk() - .expectHeader().contentType("text/html;charset=UTF-8") - .expectBody(String.class).isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT); + .expectStatus() + .isOk() + .expectHeader() + .contentType("text/html;charset=UTF-8") + .expectBody(String.class) + .isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT); } @Test void getUnmappedFirstLevelFile() { - webTestClient - .get() - .uri("/foo.js") - .exchange() - .expectStatus() - .isNotFound(); + webTestClient.get().uri("/foo.js").exchange().expectStatus().isNotFound(); } /** @@ -139,21 +145,11 @@ class SpaWebFilterIT { */ @Test void getUnmappedSecondLevelFile() { - webTestClient - .get() - .uri("/foo/bar.js") - .exchange() - .expectStatus() - .isForbidden(); + webTestClient.get().uri("/foo/bar.js").exchange().expectStatus().isForbidden(); } @Test void getUnmappedThirdLevelFile() { - webTestClient - .get() - .uri("/foo/another/bar.js") - .exchange() - .expectStatus() - .isForbidden(); + webTestClient.get().uri("/foo/another/bar.js").exchange().expectStatus().isForbidden(); } } diff --git a/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs b/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs index f811f3a0b995..9a876ed09855 100644 --- a/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs +++ b/generators/server/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs @@ -13,5 +13,4 @@ public class SpaWebFilterTestController { public String getIndexHtmlTestContent() { return INDEX_HTML_TEST_CONTENT; } - } diff --git a/generators/server/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs b/generators/server/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs index d43a452ef06e..558803f89383 100644 --- a/generators/server/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs +++ b/generators/server/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs @@ -108,11 +108,9 @@ public final class TestUtil { } return true; } catch (DateTimeParseException e) { - mismatchDescription.appendText("was ").appendValue(item) - .appendText(", which could not be parsed as a ZonedDateTime"); + mismatchDescription.appendText("was ").appendValue(item).appendText(", which could not be parsed as a ZonedDateTime"); return false; } - } @Override @@ -169,9 +167,9 @@ public final class TestUtil { } else { return BigDecimal.valueOf(item.doubleValue()); } - } } + /** * Creates a matcher that matches when the examined number represents the same value as the reference BigDecimal. * @@ -208,7 +206,7 @@ public final class TestUtil { * @return the {@link FormattingConversionService}. */ public static FormattingConversionService createFormattingConversionService() { - DefaultFormattingConversionService dfcs = new DefaultFormattingConversionService (); + DefaultFormattingConversionService dfcs = new DefaultFormattingConversionService(); DateTimeFormatterRegistrar registrar = new DateTimeFormatterRegistrar(); registrar.setUseIsoFormat(true); registrar.registerFormatters(dfcs); diff --git a/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs b/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs index a83bab5182d9..7423bd17f899 100644 --- a/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs +++ b/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs @@ -88,7 +88,5 @@ public class ExceptionTranslatorTestController { @ResponseStatus(value = HttpStatus.BAD_REQUEST, reason = "test response status") @SuppressWarnings("serial") - public static class TestResponseStatusException extends RuntimeException { - } - + public static class TestResponseStatusException extends RuntimeException {} } diff --git a/generators/server/templates/src/test/resources/config/bootstrap.yml.ejs b/generators/server/templates/src/test/resources/config/bootstrap.yml.ejs index f4c9935f3bcf..0506b877d8ca 100644 --- a/generators/server/templates/src/test/resources/config/bootstrap.yml.ejs +++ b/generators/server/templates/src/test/resources/config/bootstrap.yml.ejs @@ -13,19 +13,19 @@ limitations under the License. -%> <%_ if (serviceDiscoveryEureka) { _%> - spring: - cloud: - config: - enabled: false +spring: + cloud: + config: + enabled: false <%_ } _%> <%_ if (serviceDiscoveryConsul) { _%> - spring: - cloud: - consul: - discovery: - enabled: false - instanceId: ${spring.application.name}:${spring.application.instance-id:${random.value}} - config: - enabled: false +spring: + cloud: + consul: + discovery: + enabled: false + instanceId: ${spring.application.name}:${spring.application.instance-id:${random.value}} + config: enabled: false + enabled: false <%_ } _%> diff --git a/generators/server/templates/src/test/resources/templates/mail/activationEmail.html.ejs b/generators/server/templates/src/test/resources/templates/mail/activationEmail.html.ejs index 01ad64c79ca5..6db87f68dfb9 100644 --- a/generators/server/templates/src/test/resources/templates/mail/activationEmail.html.ejs +++ b/generators/server/templates/src/test/resources/templates/mail/activationEmail.html.ejs @@ -1,4 +1,4 @@ - + JHipster activation diff --git a/generators/server/templates/src/test/resources/templates/mail/creationEmail.html.ejs b/generators/server/templates/src/test/resources/templates/mail/creationEmail.html.ejs index e96075f4c3e3..07075e0e4f92 100644 --- a/generators/server/templates/src/test/resources/templates/mail/creationEmail.html.ejs +++ b/generators/server/templates/src/test/resources/templates/mail/creationEmail.html.ejs @@ -1,4 +1,4 @@ - + JHipster creation diff --git a/generators/server/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs b/generators/server/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs index ca7727a8e96c..6ddc5d29f93d 100644 --- a/generators/server/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs +++ b/generators/server/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs @@ -1,4 +1,4 @@ - + JHipster password reset diff --git a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/repository/UserRepository.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/repository/UserRepository.java.ejs index d013fce6abfd..49e92841c785 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/repository/UserRepository.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/repository/UserRepository.java.ejs @@ -424,20 +424,17 @@ class UserRepositoryInternalImpl implements UserRepositoryInternal { tuples .stream() .filter(t -> t.getT2().isPresent()) - .map( - t -> { - Authority authority = new Authority(); - authority.setName(t.getT2().orElseThrow()); - return authority; - } - ) + .map(t -> { + Authority authority = new Authority(); + authority.setName(t.getT2().orElseThrow()); + return authority; + }) .collect(Collectors.toSet()) ); return user; } } - <%_ } else if (databaseTypeCassandra) { _%> @Repository public class UserRepository { diff --git a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/UserResource.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/UserResource.java.ejs index 9a2a87848cc4..c4db9621ac62 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/UserResource.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/UserResource.java.ejs @@ -112,8 +112,22 @@ import java.util.stream.StreamSupport; @RestController @RequestMapping("/api/admin") public class UserResource { - private static final List ALLOWED_ORDERED_PROPERTIES = Collections.unmodifiableList(Arrays.asList( - "id", "login", "firstName", "lastName", "email", "activated", "langKey", "createdBy", "createdDate", "lastModifiedBy", "lastModifiedDate")); + + private static final List ALLOWED_ORDERED_PROPERTIES = Collections.unmodifiableList( + Arrays.asList( + "id", + "login", + "firstName", + "lastName", + "email", + "activated", + "langKey", + "createdBy", + "createdDate", + "lastModifiedBy", + "lastModifiedDate" + ) + ); private static final Logger LOG = LoggerFactory.getLogger(UserResource.class); diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/repository/EntityManager_reactive.java.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/repository/EntityManager_reactive.java.ejs index 76257cdd2e52..20a0f3b32611 100644 --- a/generators/spring-data-relational/templates/src/main/java/_package_/repository/EntityManager_reactive.java.ejs +++ b/generators/spring-data-relational/templates/src/main/java/_package_/repository/EntityManager_reactive.java.ejs @@ -42,7 +42,6 @@ import org.springframework.data.relational.core.sql.render.SqlRenderer; import org.springframework.r2dbc.core.Parameter; import org.springframework.stereotype.Component; import org.springframework.util.Assert; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -52,10 +51,12 @@ import reactor.core.publisher.Mono; */ @Component public class EntityManager { - public final static String ENTITY_ALIAS = "e"; - public final static String ALIAS_PREFIX = "e_"; + + public static final String ENTITY_ALIAS = "e"; + public static final String ALIAS_PREFIX = "e_"; public static class LinkTable { + final String tableName; final String idColumn; final String referenceColumn; @@ -125,9 +126,17 @@ public class EntityManager { public String createSelect(SelectFromAndJoinCondition selectFrom, Class entityType, Pageable pageable, Condition where) { if (pageable != null) { if (where != null) { - return createSelectImpl(selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()).where(where), entityType, pageable.getSort()); + return createSelectImpl( + selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()).where(where), + entityType, + pageable.getSort() + ); } else { - return createSelectImpl(selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()), entityType, pageable.getSort()); + return createSelectImpl( + selectFrom.limitOffset(pageable.getPageSize(), pageable.getOffset()), + entityType, + pageable.getSort() + ); } } else { if (where != null) { @@ -184,30 +193,28 @@ public class EntityManager { * @return the number of inserted rows. */ public Mono updateLinkTable(LinkTable table, Object entityId, Stream referencedIds) { - return deleteFromLinkTable(table, entityId) - .then( - Flux.fromStream(referencedIds) - .flatMap((Object referenceId) -> { - StatementMapper.InsertSpec insert = r2dbcEntityTemplate - .getDataAccessStrategy() - .getStatementMapper() - .createInsert(table.tableName) - .withColumn(table.idColumn, Parameter.from(entityId)) - .withColumn(table.referenceColumn, Parameter.from(referenceId)); - - return r2dbcEntityTemplate - .getDatabaseClient() - .sql(statementMapper.getMappedObject(insert)) - .fetch() - .rowsUpdated(); - }) - .collectList() - .map((List updates) -> updates.stream().reduce(Long::sum).orElse(0l))); + return deleteFromLinkTable(table, entityId).then( + Flux.fromStream(referencedIds) + .flatMap((Object referenceId) -> { + StatementMapper.InsertSpec insert = r2dbcEntityTemplate + .getDataAccessStrategy() + .getStatementMapper() + .createInsert(table.tableName) + .withColumn(table.idColumn, Parameter.from(entityId)) + .withColumn(table.referenceColumn, Parameter.from(referenceId)); + + return r2dbcEntityTemplate.getDatabaseClient().sql(statementMapper.getMappedObject(insert)).fetch().rowsUpdated(); + }) + .collectList() + .map((List updates) -> updates.stream().reduce(Long::sum).orElse(0l)) + ); } public Mono deleteFromLinkTable(LinkTable table, Object entityId) { Assert.notNull(entityId, "entityId is null"); - StatementMapper.DeleteSpec deleteSpec = r2dbcEntityTemplate.getDataAccessStrategy().getStatementMapper() + StatementMapper.DeleteSpec deleteSpec = r2dbcEntityTemplate + .getDataAccessStrategy() + .getStatementMapper() .createDelete(table.tableName) .withCriteria(Criteria.from(Criteria.where(table.idColumn).is(entityId))); return r2dbcEntityTemplate.getDatabaseClient().sql(statementMapper.getMappedObject(deleteSpec)).then(); @@ -218,7 +225,9 @@ public class EntityManager { RelationalPersistentEntity entity = getPersistentEntity(entityType); if (entity != null) { Sort sort = updateMapper.getMappedObject(sortParameter, entity); - selectFrom = selectFrom.orderBy(createOrderByFields(Table.create(entity.getTableName()).as(EntityManager.ENTITY_ALIAS), sort)); + selectFrom = selectFrom.orderBy( + createOrderByFields(Table.create(entity.getTableName()).as(EntityManager.ENTITY_ALIAS), sort) + ); } } return createSelect(selectFrom.build()); @@ -229,11 +238,9 @@ public class EntityManager { } private static Collection createOrderByFields(Table table, Sort sortToUse) { - List fields = new ArrayList<>(); for (Sort.Order order : sortToUse) { - String propertyName = order.getProperty(); OrderByField orderByField = !propertyName.contains(".") ? OrderByField.from(table.column(propertyName).as(EntityManager.ALIAS_PREFIX + propertyName)) diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/repository/UserSqlHelper_reactive.java.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/repository/UserSqlHelper_reactive.java.ejs index c96b3f77c59d..1aed0031837f 100644 --- a/generators/spring-data-relational/templates/src/main/java/_package_/repository/UserSqlHelper_reactive.java.ejs +++ b/generators/spring-data-relational/templates/src/main/java/_package_/repository/UserSqlHelper_reactive.java.ejs @@ -25,6 +25,7 @@ import org.springframework.data.relational.core.sql.Expression; import org.springframework.data.relational.core.sql.Table; public class UserSqlHelper { + public static List getColumns(Table table, String columnPrefix) { List columns = new ArrayList<>(); columns.add(Column.aliased("id", table, columnPrefix + "_id")); diff --git a/generators/spring-data-relational/templates/src/main/java/_package_/repository/rowmapper/ColumnConverter_reactive.java.ejs b/generators/spring-data-relational/templates/src/main/java/_package_/repository/rowmapper/ColumnConverter_reactive.java.ejs index 000a5b376e8b..78e0dc0e4603 100644 --- a/generators/spring-data-relational/templates/src/main/java/_package_/repository/rowmapper/ColumnConverter_reactive.java.ejs +++ b/generators/spring-data-relational/templates/src/main/java/_package_/repository/rowmapper/ColumnConverter_reactive.java.ejs @@ -52,7 +52,6 @@ public class ColumnConverter implements ColumnConverterReactive { @Override @SuppressWarnings("unchecked") public T convert(@Nullable Object value, @Nullable Class target) { - if (value == null || target == null || ClassUtils.isAssignableValue(target, value)) { return (T) value; } @@ -85,5 +84,4 @@ public class ColumnConverter implements ColumnConverterReactive { return convert(obj, target); } } - } diff --git a/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainer.java.ejs b/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainer.java.ejs index 49e25a9ad9cb..8c6150e0992b 100644 --- a/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainer.java.ejs +++ b/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainer.java.ejs @@ -23,6 +23,5 @@ import org.springframework.beans.factory.InitializingBean; import org.testcontainers.containers.JdbcDatabaseContainer; public interface SqlTestContainer extends InitializingBean, DisposableBean { - JdbcDatabaseContainer getTestContainer(); } diff --git a/generators/spring-data-relational/templates/src/test/java/_package_/repository/timezone/DateTimeWrapperRepository.java.ejs b/generators/spring-data-relational/templates/src/test/java/_package_/repository/timezone/DateTimeWrapperRepository.java.ejs index 46ff015beacc..1c6b48de3502 100644 --- a/generators/spring-data-relational/templates/src/test/java/_package_/repository/timezone/DateTimeWrapperRepository.java.ejs +++ b/generators/spring-data-relational/templates/src/test/java/_package_/repository/timezone/DateTimeWrapperRepository.java.ejs @@ -25,6 +25,4 @@ import org.springframework.stereotype.Repository; * Spring Data JPA repository for the {@link DateTimeWrapper} entity. */ @Repository -public interface DateTimeWrapperRepository extends JpaRepository { - -} +public interface DateTimeWrapperRepository extends JpaRepository {}