Merge pull request #100 from com-pas/sonar-issues

Dennis Labordus · web-flow · commit 6b1ff1442312 · 2022-08-11T16:01:22.000+02:00
Fixed sonar code smells.
diff --git a/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/collector/AbstractFileCollector.java b/riseclipse/validator-riseclipse/src/main/java/org/lfenergy/compas/scl/validator/collector/AbstractFileCollector.java
@@ -15,7 +15,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import static org.lfenergy.compas.scl.validator.exception.SclValidatorErrorCode.LOADING_CUSTOM_OCL_FILES_FAILED;
 import static org.lfenergy.compas.scl.validator.exception.SclValidatorErrorCode.LOADING_OCL_FILES_FAILED;
@@ -54,7 +53,7 @@ protected List<URI> getDefaultOclFilesFromClasspath() {
                         try (var walk = Files.walk(oclDirectoryPath)) {
                             return walk.filter(filter)
                                     .map(path -> URI.createURI(path.toUri().toString()))
-                                    .collect(Collectors.toList());
+                                    .toList();
                         }
                     }
                 } else {
@@ -64,7 +63,7 @@ protected List<URI> getDefaultOclFilesFromClasspath() {
                                 .map(Path::toFile)
                                 .filter(File::isFile)
                                 .map(file -> URI.createFileURI(file.getAbsolutePath()))
-                                .collect(Collectors.toList());
+                                .toList();
                     }
                 }
             } else {
@@ -93,7 +92,7 @@ protected List<URI> getFilesFromDirectory(String directoryName, Predicate<Path>
                             .map(Path::toFile)
                             .filter(File::isFile)
                             .map(file -> URI.createFileURI(file.getAbsolutePath()))
-                            .collect(Collectors.toList());
+                            .toList();
                 }
             }
             return Collections.emptyList();
diff --git a/service/src/main/java/org/lfenergy/compas/scl/validator/common/NsdocFinder.java b/service/src/main/java/org/lfenergy/compas/scl/validator/common/NsdocFinder.java
@@ -76,7 +76,7 @@ public Collection<NsdocFile> getNsdocFiles() {
         return nsdocFiles.values()
                 .stream()
                 .sorted(Comparator.comparing(NsdocFile::getNsdocId))
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public String getNsdocFile(UUID id) {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`import java.util.Collections;`
`16`	`16`	`import java.util.List;`
`17`	`17`	`import java.util.function.Predicate;`
`18`		`-import java.util.stream.Collectors;`
`19`	`18`
`20`	`19`	`import static org.lfenergy.compas.scl.validator.exception.SclValidatorErrorCode.LOADING_CUSTOM_OCL_FILES_FAILED;`
`21`	`20`	`import static org.lfenergy.compas.scl.validator.exception.SclValidatorErrorCode.LOADING_OCL_FILES_FAILED;`
`@@ -54,7 +53,7 @@ protected List<URI> getDefaultOclFilesFromClasspath() {`
`54`	`53`	`try (var walk = Files.walk(oclDirectoryPath)) {`
`55`	`54`	`return walk.filter(filter)`
`56`	`55`	`.map(path -> URI.createURI(path.toUri().toString()))`
`57`		`- .collect(Collectors.toList());`
	`56`	`+ .toList();`
`58`	`57`	`}`
`59`	`58`	`}`
`60`	`59`	`} else {`
`@@ -64,7 +63,7 @@ protected List<URI> getDefaultOclFilesFromClasspath() {`
`64`	`63`	`.map(Path::toFile)`
`65`	`64`	`.filter(File::isFile)`
`66`	`65`	`.map(file -> URI.createFileURI(file.getAbsolutePath()))`
`67`		`- .collect(Collectors.toList());`
	`66`	`+ .toList();`
`68`	`67`	`}`
`69`	`68`	`}`
`70`	`69`	`} else {`
`@@ -93,7 +92,7 @@ protected List<URI> getFilesFromDirectory(String directoryName, Predicate<Path>`
`93`	`92`	`.map(Path::toFile)`
`94`	`93`	`.filter(File::isFile)`
`95`	`94`	`.map(file -> URI.createFileURI(file.getAbsolutePath()))`
`96`		`- .collect(Collectors.toList());`
	`95`	`+ .toList();`
`97`	`96`	`}`
`98`	`97`	`}`
`99`	`98`	`return Collections.emptyList();`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public Collection<NsdocFile> getNsdocFiles() {`
`76`	`76`	`return nsdocFiles.values()`
`77`	`77`	`.stream()`
`78`	`78`	`.sorted(Comparator.comparing(NsdocFile::getNsdocId))`
`79`		`- .collect(Collectors.toList());`
	`79`	`+ .toList();`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`public String getNsdocFile(UUID id) {`