Skip to content

Commit

Permalink
Merge pull request #9820 from qmonmert/renamefield
Browse files Browse the repository at this point in the history 
Sonar: Rename field which hides the field declared at line
  • Loading branch information
@pascalgrimaud
pascalgrimaud authored May 16, 2024
2 parents 4790f19 + 2bf3ad9 commit d6aa01e
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 30 deletions.
4 changes: 2 additions & 2 deletions src/test/java/tech/jhipster/lite/cucumber/rest/CucumberRestTestContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
43 changes: 19 additions & 24 deletions .../tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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()
);

Expand All @@ -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()
);

Expand Down Expand Up @@ -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()
);

Expand All @@ -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()
);
Expand All @@ -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()
);

Expand All @@ -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()
);

Expand All @@ -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()
);

Expand All @@ -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()
);

Expand All @@ -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()
);

Expand All @@ -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()
);

Expand All @@ -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()
);

Expand All @@ -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()
);

Expand Down Expand Up @@ -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()
);

Expand All @@ -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()
);

Expand All @@ -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()
);

Expand All @@ -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()
);

Expand All @@ -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()
);

Expand Down
8 changes: 4 additions & 4 deletions ...tech/jhipster/lite/project/infrastructure/secondary/FileSystemProjectsRepositoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d6aa01e

Please sign in to comment.