Skip to content

Verification for microservices w/ checkstyle #3213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: integration
Choose a base branch
from
Draft

Verification for microservices w/ checkstyle #3213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions microservices/configcheck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
<spotbugs.excludes.file />
<surefire.forkCount>1C</surefire.forkCount>
<version.jackson>2.13.2</version.jackson>
<version.log4j.bom>2.19.0</version.log4j.bom>
<version.spring.boot>2.7.1</version.spring.boot>
<version.junit5>5.12.0</version.junit5>
<version.junit5.platform>1.12.0</version.junit5.platform>
<version.log4j.bom>2.19.0</version.log4j.bom>
<version.spring.boot>2.7.1</version.spring.boot>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -289,6 +289,29 @@
</execution>
</executions>
</plugin>
<plugin>
<!-- This was added to ensure project only uses public API -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<configLocation>../../checkstyle.xml</configLocation>
<failsOnError>true</failsOnError>
<failOnViolation>false</failOnViolation>
<consoleOutput>true</consoleOutput>
<propertyExpansion>basedir=${maven.multiModuleProjectDirectory}</propertyExpansion>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
<executions>
<execution>
<id>check-style</id>
<goals>
<goal>check</goal>
</goals>
<phase>compile</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand Down
1 change: 0 additions & 1 deletion ...ices/configcheck/src/main/java/datawave/microservice/configcheck/util/XmlRenderUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import static datawave.microservice.configcheck.util.FileUtils.getFilePath;

import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.List;
Expand Down
26 changes: 26 additions & 0 deletions microservices/microservice-parent/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<module name="Checker">
<property name="charset" value="UTF-8"/>
<property name="severity" value="info"/>
<property name="basedir" value="${basedir}"/>
<module name="TreeWalker">
<!--check that only Accumulo 2.1.x public APIs are imported-->
<module name="ImportControl">
<!--Allows per-package enforcement for importing Accumulo 2.1.x public APIs -->
<property name="file" value="${basedir}/import-control-accumulo.xml"/>
<property name="severity" value="warning"/>
</module>
<!-- Check that forbidden classes are not imported anywhere. -->
<module name="IllegalImport">
<property name="regexp" value="true"/>
<property name="illegalClasses"
value="^org\.apache\.accumulo\.core\.util\.Pair"/>
<property name="severity" value="error"/>
</module>
<!-- Do not allow any unused imports. -->
<module name="UnusedImports">
<property name="severity" value="error"/>
</module>
</module>
</module>
34 changes: 17 additions & 17 deletions microservices/microservice-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,29 +333,25 @@
</executions>
</plugin>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.23.0</version>
<!-- This was added to ensure project only uses public API -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<configFile>eclipse/Eclipse-Datawave-Codestyle.xml</configFile>
<lineEnding>LF</lineEnding>
<removeTrailingWhitespace>true</removeTrailingWhitespace>
<compilerSource>${maven.compiler.source}</compilerSource>
<compilerCompliance>${maven.compiler.source}</compilerCompliance>
<compilerTargetPlatform>${maven.compiler.target}</compilerTargetPlatform>
<configLocation>checkstyle.xml</configLocation>
<failsOnError>true</failsOnError>
<failOnViolation>false</failOnViolation>
<consoleOutput>true</consoleOutput>
<propertyExpansion>basedir=${maven.multiModuleProjectDirectory}</propertyExpansion>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
<dependencies>
<dependency>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-code-style</artifactId>
<version>1.0.1</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>check-style</id>
<goals>
<goal>format</goal>
<goal>check</goal>
</goals>
<phase>compile</phase>
</execution>
</executions>
</plugin>
Expand Down Expand Up @@ -531,6 +527,10 @@
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand Down
23 changes: 23 additions & 0 deletions microservices/microservice-service-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,29 @@
</resources>
<pluginManagement>
<plugins>
<plugin>
<!-- This was added to ensure project only uses public API -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<configLocation>checkstyle2.xml</configLocation>
<failsOnError>true</failsOnError>
<failOnViolation>false</failOnViolation>
<consoleOutput>true</consoleOutput>
<propertyExpansion>basedir=${maven.multiModuleProjectDirectory}</propertyExpansion>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
<executions>
<execution>
<id>check-style</id>
<goals>
<goal>check</goal>
</goals>
<phase>compile</phase>
</execution>
</executions>
</plugin>
<!-- Apply more sensible defaults for user projects -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
22 changes: 22 additions & 0 deletions microservices/services/dictionary/api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,28 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<configLocation>../../../../checkstyle.xml</configLocation>
<failsOnError>true</failsOnError>
<failOnViolation>false</failOnViolation>
<consoleOutput>true</consoleOutput>
<propertyExpansion>basedir=${maven.multiModuleProjectDirectory}</propertyExpansion>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
<executions>
<execution>
<id>check-style</id>
<goals>
<goal>check</goal>
</goals>
<phase>compile</phase>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
Expand Down
2 changes: 2 additions & 0 deletions ...ctionary/api/src/main/java/datawave/webservice/dictionary/data/DefaultDataDictionary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;

import org.apache.accumulo.core.data.Key;

import com.google.common.collect.Lists;

import datawave.webservice.HtmlProvider;
Expand Down
23 changes: 23 additions & 0 deletions microservices/services/dictionary/service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,29 @@
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
</plugin>
<plugin>
<!-- This was added to ensure project only uses public API -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<configLocation>../../../../checkstyle.xml</configLocation>
<failsOnError>true</failsOnError>
<failOnViolation>false</failOnViolation>
<consoleOutput>true</consoleOutput>
<propertyExpansion>basedir=${maven.multiModuleProjectDirectory}</propertyExpansion>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
<executions>
<execution>
<id>check-style</id>
<goals>
<goal>check</goal>
</goals>
<phase>compile</phase>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
Expand Down
26 changes: 26 additions & 0 deletions microservices/services/hazelcast/client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,30 @@
<url>https://maven.pkg.github.com/NationalSecurityAgency/datawave</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<configLocation>../../../../checkstyle.xml</configLocation>
<failsOnError>true</failsOnError>
<failOnViolation>false</failOnViolation>
<consoleOutput>true</consoleOutput>
<propertyExpansion>basedir=${maven.multiModuleProjectDirectory}</propertyExpansion>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
<executions>
<execution>
<id>check-style</id>
<goals>
<goal>check</goal>
</goals>
<phase>compile</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading