Merge pull request #130 from shreelakshmijoshi/resolving-checkstyle-i…

…ssues Resolving checkstyle issues
datakaveri · Nov 14, 2024 · c10968b · c10968b
2 parents a6d29c3 + ad84505
commit c10968b
Show file tree

Hide file tree

Showing 107 changed files with 2,259 additions and 2,212 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -43,7 +43,7 @@ pipeline {
           thresholds: [ skipped(failureThreshold: '0'), failed(failureThreshold: '40') ],
           tools: [ JUnit(pattern: 'target/surefire-reports/*.xml') ]
         )
-        jacoco classPattern: 'target/classes', execPattern: 'target/jacoco.exec', sourcePattern: 'src/main/java', exclusionPattern:'iudx/data/marketplace/apiserver/ApiServerVerticle.class, **/*VertxEBProxy.class, **/*Constants.class, **/*VertxProxyHandler.class, **/*Verticle.class, **/JwtDataConverter.class, iudx/data/marketplace/apiserver/ProviderApis.class, iudx/data/marketplace/apiserver/ConsumerApis.class,iudx/data/marketplace/deploy/*.class, **/*Service.class, **/PolicyServiceImpl.class'
+        jacoco classPattern: 'target/classes', execPattern: 'target/jacoco.exec', sourcePattern: 'src/main/java', exclusionPattern:'iudx/data/marketplace/apiserver/ApiServerVerticle.class, **/*VertxEBProxy.class, **/*Constants.class, **/*VertxProxyHandler.class, **/*Verticle.class, **/JwtDataConverter.class, iudx/data/marketplace/apiserver/ProviderApis.class, iudx/data/marketplace/apiserver/ConsumerApis.class,iudx/data/marketplace/deploy/*.class, **/*Service.class, **/PolicyServiceImpl.class, **/package-info.class'
 
         recordIssues(
           enabledForFailure: true,

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -12,6 +12,8 @@ services:
       - /home/ubuntu/configs/dmp-apd-server-config.json:/usr/share/app/configs/dmp-apd-server.json
       - /home/ubuntu/configs/dmp-apd-server-keystore.jks:/usr/share/app/configs/keystore.jks
       - dmp-apd-server-volume:/usr/share/app/storage/temp-dir
+      - ./iudx-pmd-ruleset.xml:/usr/share/app/iudx-pmd-ruleset.xml
+      - ./google_checks.xml:/usr/share/app/google_checks.xml
     depends_on:
       - zookeeper
     ports:
@@ -34,4 +36,4 @@ services:
       - dmp-apd-server-net
 
 volumes:
-  dmp-apd-server-volume:
+  dmp-apd-server-volume:
diff --git a/docker/depl.dockerfile b/docker/depl.dockerfile
@@ -20,6 +20,8 @@ ENV JAR="iudx.data.marketplace-cluster-${VERSION}-fat.jar"
 WORKDIR /usr/share/app
 # Copying openapi docs
 COPY docs docs
+COPY iudx-pmd-ruleset.xml iudx-pmd-ruleset.xml
+COPY google_checks.xml google_checks.xml
 # Copying dev fatjar from builder stage to final image
 COPY --from=builder /usr/share/app/target/${JAR} ./fatjar.jar
 EXPOSE 8080 8443

diff --git a/docker/dev.dockerfile b/docker/dev.dockerfile
@@ -20,6 +20,8 @@ ENV JAR="iudx.data.marketplace-dev-${VERSION}-fat.jar"
 WORKDIR /usr/share/app
 # Copying openapi docs
 COPY docs docs
+COPY iudx-pmd-ruleset.xml iudx-pmd-ruleset.xml
+COPY google_checks.xml google_checks.xml
 # Copying dev fatjar from builder stage to final image
 COPY --from=builder /usr/share/app/target/${JAR} ./fatjar.jar
 EXPOSE 8080 8443

diff --git a/pom.xml b/pom.xml
@@ -272,6 +272,43 @@
                 <artifactId>flyway-maven-plugin</artifactId>
                 <version>8.5.13</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>${maven-pmd-plugin.version}</version>
+                <configuration>
+                    <targetJdk>${openjdk.version}</targetJdk>
+                    <rulesets>
+                        <ruleset>./iudx-pmd-ruleset.xml</ruleset>
+                    </rulesets>
+                    <printFailingErrors>true</printFailingErrors>
+                    <!--<maxAllowedViolations>622</maxAllowedViolations>-->
+                    <excludeRoots>
+                        <excludeRoot>target/generated-sources</excludeRoot>
+                    </excludeRoots>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>${maven-checkstyle-plugin-google.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>${checkstyle.version}</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <!--  <violationSeverity>warning</violationSeverity>  -->
+                    <consoleOutput>true</consoleOutput>
+                    <encoding>UTF-8</encoding>
+                    <configLocation>./google_checks.xml</configLocation>
+                    <sourceDirectories>
+                        <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                    </sourceDirectories>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
@@ -327,6 +364,8 @@
                         <exclude>**/*Service.class</exclude>
 
 
+                        <!-- Excluding package info -->
+                        <exclude>**/package-info.class</exclude>
                         <!-- Caller class for policy  -->
                         <exclude>iudx/data/marketplace/policies/PolicyServiceImpl.class</exclude>
                         <!-- deployment helper classes -->
@@ -490,22 +529,6 @@
 
     <reporting>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <version>${maven-pmd-plugin.version}</version>
-                <configuration>
-                    <targetJdk>${openjdk.version}</targetJdk>
-                    <rulesets>
-                        <ruleset>./iudx-pmd-ruleset.xml</ruleset>
-                    </rulesets>
-                    <printFailingErrors>true</printFailingErrors>
-                    <!--<maxAllowedViolations>622</maxAllowedViolations>-->
-                    <excludeRoots>
-                        <excludeRoot>target/generated-sources</excludeRoot>
-                    </excludeRoots>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
@@ -538,22 +561,6 @@
                     </reportSet>
                 </reportSets>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <version>${maven-pmd-plugin.version}</version>
-                <configuration>
-                    <targetJdk>${openjdk.version}</targetJdk>
-                    <rulesets>
-                        <ruleset>./iudx-pmd-ruleset.xml</ruleset>
-                    </rulesets>
-                    <printFailingErrors>true</printFailingErrors>
-                    <!--<maxAllowedViolations>622</maxAllowedViolations>-->
-                    <excludeRoots>
-                        <excludeRoot>target/generated-sources</excludeRoot>
-                    </excludeRoots>
-                </configuration>
-            </plugin>
 
 
         </plugins>