summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToine Siebelink <toine.siebelink@est.tech>2021-07-15 13:28:30 +0000
committerGerrit Code Review <gerrit@onap.org>2021-07-15 13:28:30 +0000
commita5d8ca42affd04c0cab589a83c8c95b0712f0874 (patch)
tree1bb6f8834e33418fea279791736b47f681ef3d10
parent08fe971ba3012e913b9c9f28aee688a5c581756a (diff)
parentff5f74dcdc0d889aabed8351223a71ddd55f8ccc (diff)
Merge "Review checkstyle configuration"
-rw-r--r--pom.xml38
-rw-r--r--src/main/java/org/onap/cps/ncmp/rest/controller/DmiRestController.java2
2 files changed, 39 insertions, 1 deletions
diff --git a/pom.xml b/pom.xml
index 699f79d2..26a7b4e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,6 +208,44 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<executions>
<execution>
+ <id>onap-license</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>process-sources</phase>
+ <configuration>
+ <configLocation>onap-checkstyle/check-license.xml</configLocation>
+ <includeResources>false</includeResources>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <includeTestResources>false</includeTestResources>
+ <sourceDirectories>
+ <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ </sourceDirectories>
+ <consoleOutput>false</consoleOutput>
+ <violationSeverity>warning</violationSeverity>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
+ </execution>
+ <execution>
+ <id>onap-java-style</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>process-sources</phase>
+ <configuration>
+ <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+ <sourceDirectories>
+ <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ </sourceDirectories>
+ <includeResources>true</includeResources>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <includeTestResources>true</includeTestResources>
+ <consoleOutput>false</consoleOutput>
+ <violationSeverity>warning</violationSeverity>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
+ </execution>
+ <execution>
<id>cps-java-style</id>
<goals>
<goal>check</goal>
diff --git a/src/main/java/org/onap/cps/ncmp/rest/controller/DmiRestController.java b/src/main/java/org/onap/cps/ncmp/rest/controller/DmiRestController.java
index 57542102..16fb73a8 100644
--- a/src/main/java/org/onap/cps/ncmp/rest/controller/DmiRestController.java
+++ b/src/main/java/org/onap/cps/ncmp/rest/controller/DmiRestController.java
@@ -37,7 +37,7 @@ public class DmiRestController implements DmiPluginApi {
@Override
public ResponseEntity<Object> helloWorld() {
- final var helloWorld = dmiService.getHelloWorld() ;
+ final var helloWorld = dmiService.getHelloWorld();
return new ResponseEntity<>(helloWorld, HttpStatus.OK);
}