From 2bf3ad905290e3e2242b29e93ab0ce13f218eff3 Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 15 May 2024 20:01:52 +0200 Subject: [PATCH] Sonar: Rename field which hides the field declared at line --- .../rest/CucumberRestTestContext.java | 4 +- .../FileSystemPackageJsonHandlerTest.java | 43 ++++++++----------- .../FileSystemProjectsRepositoryTest.java | 8 ++-- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/src/test/java/tech/jhipster/lite/cucumber/rest/CucumberRestTestContext.java b/src/test/java/tech/jhipster/lite/cucumber/rest/CucumberRestTestContext.java index 08706d60d5f..0fc55c175fc 100644 --- a/src/test/java/tech/jhipster/lite/cucumber/rest/CucumberRestTestContext.java +++ b/src/test/java/tech/jhipster/lite/cucumber/rest/CucumberRestTestContext.java @@ -196,9 +196,9 @@ private boolean forUri(String uri) { private void retry() { try { - ClientHttpResponse response = execution.execute(request, body); + ClientHttpResponse clientHttpResponse = execution.execute(request, body); - addResponse(request, response, execution, body); + addResponse(request, clientHttpResponse, execution, body); } catch (IOException e) { throw new AssertionError("Error while retrying last call: " + e.getMessage(), e); } diff --git a/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandlerTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandlerTest.java index 2ec26115a38..f2edffa8234 100644 --- a/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandlerTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandlerTest.java @@ -49,7 +49,7 @@ void shouldNotHandleCommandsOnProjectWithoutPackageJson() { packageJson.handle( Indentation.DEFAULT, emptyFolder(), - packageJson(packageJson -> packageJson.addScript(scriptKey("key"), scriptCommand("value"))), + packageJson(p -> p.addScript(scriptKey("key"), scriptCommand("value"))), emptyModuleContext() ) ).isExactlyInstanceOf(MissingPackageJsonException.class); @@ -68,7 +68,7 @@ void shouldNotAddNotNeededBlock() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson(packageJson -> packageJson.addDevDependency(packageName("@playwright/test"), VersionSource.COMMON)), + packageJson(p -> p.addDevDependency(packageName("@playwright/test"), VersionSource.COMMON)), emptyModuleContext() ); @@ -82,7 +82,7 @@ void shouldNotGreedExistingBlocks() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson(packageJson -> packageJson.addScript(scriptKey("@prettier/plugin-xml"), scriptCommand("test"))), + packageJson(p -> p.addScript(scriptKey("@prettier/plugin-xml"), scriptCommand("test"))), emptyModuleContext() ); @@ -116,7 +116,7 @@ void shouldAddScriptToPackageJsonWithoutScriptSection() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson(packageJson -> packageJson.addScript(scriptKey("key"), scriptCommand("value"))), + packageJson(p -> p.addScript(scriptKey("key"), scriptCommand("value"))), emptyModuleContext() ); @@ -139,8 +139,8 @@ void shouldAddScriptsToPackageJsonWithScriptSection() { Indentation.DEFAULT, folder, packageJson( - packageJson -> packageJson.addScript(scriptKey("key"), scriptCommand("value")), - packageJson -> packageJson.addScript(scriptKey("key2"), scriptCommand("value2")) + p -> p.addScript(scriptKey("key"), scriptCommand("value")), + p -> p.addScript(scriptKey("key2"), scriptCommand("value2")) ), emptyModuleContext() ); @@ -163,7 +163,7 @@ void shouldAddScriptsToPackageJsonWithScriptsTemplate() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson(packageJson -> packageJson.addScript(scriptKey("key"), scriptCommand("value"))), + packageJson(p -> p.addScript(scriptKey("key"), scriptCommand("value"))), emptyModuleContext() ); @@ -184,7 +184,7 @@ void shouldReplaceOnlyExistingScript() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson(packageJson -> packageJson.addScript(scriptKey("build"), scriptCommand("test"))), + packageJson(p -> p.addScript(scriptKey("build"), scriptCommand("test"))), emptyModuleContext() ); @@ -207,7 +207,7 @@ void shouldReplaceExistingScript() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson(packageJson -> packageJson.addScript(scriptKey("build"), scriptCommand("test"))), + packageJson(p -> p.addScript(scriptKey("build"), scriptCommand("test"))), emptyModuleContext() ); @@ -234,7 +234,7 @@ void shouldAddDevDependencyToPackageJsonWithoutDevDependencySection() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson(packageJson -> packageJson.addDevDependency(packageName("@prettier/plugin-xmll"), VersionSource.COMMON)), + packageJson(p -> p.addDevDependency(packageName("@prettier/plugin-xmll"), VersionSource.COMMON)), emptyModuleContext() ); @@ -258,7 +258,7 @@ void shouldAddDevDependencyToPackageJsonWithDevDependencySection() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson(packageJson -> packageJson.addDevDependency(packageName("@prettier/plugin-xmll"), VersionSource.COMMON)), + packageJson(p -> p.addDevDependency(packageName("@prettier/plugin-xmll"), VersionSource.COMMON)), emptyModuleContext() ); @@ -281,10 +281,7 @@ void shouldAddDevDependencyToPackageJsonUsingVersionSourcePackage() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson( - packageJson -> - packageJson.addDevDependency(packageName("@angular/animations"), VersionSource.ANGULAR, packageName("@angular/core")) - ), + packageJson(p -> p.addDevDependency(packageName("@angular/animations"), VersionSource.ANGULAR, packageName("@angular/core"))), emptyModuleContext() ); @@ -306,7 +303,7 @@ void shouldReplaceExistingDevDependency() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson(packageJson -> packageJson.addDevDependency(packageName("@prettier/plugin-xml"), VersionSource.COMMON)), + packageJson(p -> p.addDevDependency(packageName("@prettier/plugin-xml"), VersionSource.COMMON)), emptyModuleContext() ); @@ -329,7 +326,7 @@ void shouldRemoveExistingDevDependency() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson(packageJson -> packageJson.removeDevDependency(packageName("@prettier/plugin-xml"), VersionSource.COMMON)), + packageJson(p -> p.removeDevDependency(packageName("@prettier/plugin-xml"), VersionSource.COMMON)), emptyModuleContext() ); @@ -359,7 +356,7 @@ void shouldAddDependencyToPackageJsonWithoutDependencySection() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson(packageJson -> packageJson.addDependency(packageName("@fortawesome/fontawesome-svg-core"), VersionSource.COMMON)), + packageJson(p -> p.addDependency(packageName("@fortawesome/fontawesome-svg-core"), VersionSource.COMMON)), emptyModuleContext() ); @@ -383,7 +380,7 @@ void shouldAddDependencyToPackageJsonWithDependencySection() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson(packageJson -> packageJson.addDependency(packageName("@fortawesome/fontawesome-svg-coree"), VersionSource.COMMON)), + packageJson(p -> p.addDependency(packageName("@fortawesome/fontawesome-svg-coree"), VersionSource.COMMON)), emptyModuleContext() ); @@ -406,9 +403,7 @@ void shouldAddDependencyToPackageJsonUsingVersionSourcePackage() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson( - packageJson -> packageJson.addDependency(packageName("@angular/animations"), VersionSource.ANGULAR, packageName("@angular/core")) - ), + packageJson(p -> p.addDependency(packageName("@angular/animations"), VersionSource.ANGULAR, packageName("@angular/core"))), emptyModuleContext() ); @@ -430,7 +425,7 @@ void shouldReplaceExistingDependency() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson(packageJson -> packageJson.addDependency(packageName("@fortawesome/fontawesome-svg-core"), VersionSource.COMMON)), + packageJson(p -> p.addDependency(packageName("@fortawesome/fontawesome-svg-core"), VersionSource.COMMON)), emptyModuleContext() ); @@ -453,7 +448,7 @@ void shouldRemoveExistingDependency() { packageJson.handle( Indentation.DEFAULT, folder, - packageJson(packageJson -> packageJson.removeDependency(packageName("@fortawesome/fontawesome-svg-core"), VersionSource.COMMON)), + packageJson(p -> p.removeDependency(packageName("@fortawesome/fontawesome-svg-core"), VersionSource.COMMON)), emptyModuleContext() ); diff --git a/src/test/java/tech/jhipster/lite/project/infrastructure/secondary/FileSystemProjectsRepositoryTest.java b/src/test/java/tech/jhipster/lite/project/infrastructure/secondary/FileSystemProjectsRepositoryTest.java index 70e1bf31100..38ff6d9bdb3 100644 --- a/src/test/java/tech/jhipster/lite/project/infrastructure/secondary/FileSystemProjectsRepositoryTest.java +++ b/src/test/java/tech/jhipster/lite/project/infrastructure/secondary/FileSystemProjectsRepositoryTest.java @@ -139,9 +139,9 @@ void shouldHandleSerializationError() throws JsonProcessingException { ObjectMapper json = mock(ObjectMapper.class); when(json.writerWithDefaultPrettyPrinter()).thenReturn(writer); - FileSystemProjectsRepository projects = new FileSystemProjectsRepository(json, mock(ProjectFormatter.class)); + FileSystemProjectsRepository fileSystemProjectsRepository = new FileSystemProjectsRepository(json, mock(ProjectFormatter.class)); - assertThatThrownBy(() -> projects.save(projectHistory())).isExactlyInstanceOf(GeneratorException.class); + assertThatThrownBy(() -> fileSystemProjectsRepository.save(projectHistory())).isExactlyInstanceOf(GeneratorException.class); } @Test @@ -178,9 +178,9 @@ void shouldHandleDeserializationErrors() throws IOException { ObjectMapper json = mock(ObjectMapper.class); when(json.readValue(any(byte[].class), eq(PersistedProjectHistory.class))).thenThrow(IOException.class); - FileSystemProjectsRepository projects = new FileSystemProjectsRepository(json, mock(ProjectFormatter.class)); + FileSystemProjectsRepository fileSystemProjectsRepository = new FileSystemProjectsRepository(json, mock(ProjectFormatter.class)); - assertThatThrownBy(() -> projects.getHistory(path)).isExactlyInstanceOf(GeneratorException.class); + assertThatThrownBy(() -> fileSystemProjectsRepository.getHistory(path)).isExactlyInstanceOf(GeneratorException.class); } @Test