From 0a82406299bef00a73f7841e93759928ef412057 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Fri, 31 Jan 2025 12:14:12 +0100
Subject: [PATCH] fix: supprimer des avertissements Checkstyle et PMD
---
pom.xml | 2 +-
sido-cli/config/checkstyle-suppressions.xml | 1 +
.../config/checkstyle-suppressions.xml | 1 +
sido-eml/config/checkstyle-suppressions.xml | 3 +-
sido-eml/pom.xml | 35 ++++++++++++++++++-
sido-gwt/config/checkstyle-suppressions.xml | 1 +
.../sido/gwt/server/metadata/License.java | 9 +++++
.../sido/gwt/server/metadata/Licenses.java | 9 ++++-
sido-rs/config/checkstyle-suppressions.xml | 1 +
.../config/checkstyle-suppressions.xml | 4 ++-
10 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 170d2ed4..c43c5f0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -478,7 +478,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.version}</version>
+ <version>${checkstyle.version}</version>
</plugin>
<!-- Generates a cross-reference of the project's sources. -->
diff --git a/sido-cli/config/checkstyle-suppressions.xml b/sido-cli/config/checkstyle-suppressions.xml
index 9be671d5..139d48d6 100644
--- a/sido-cli/config/checkstyle-suppressions.xml
+++ b/sido-cli/config/checkstyle-suppressions.xml
@@ -22,4 +22,5 @@
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
<suppressions>
+ <suppress checks="JavadocPackageCheck" files="[\\/]src[\\/]test[\\/]" />
</suppressions>
\ No newline at end of file
diff --git a/sido-createSchemaTable/config/checkstyle-suppressions.xml b/sido-createSchemaTable/config/checkstyle-suppressions.xml
index d6a812c7..2acc4a05 100644
--- a/sido-createSchemaTable/config/checkstyle-suppressions.xml
+++ b/sido-createSchemaTable/config/checkstyle-suppressions.xml
@@ -22,4 +22,5 @@
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
<suppressions>
+ <suppress checks="JavadocPackageCheck" files="[\\/]src[\\/]test[\\/]" />
</suppressions>
\ No newline at end of file
diff --git a/sido-eml/config/checkstyle-suppressions.xml b/sido-eml/config/checkstyle-suppressions.xml
index 252a6c89..d7e09c53 100644
--- a/sido-eml/config/checkstyle-suppressions.xml
+++ b/sido-eml/config/checkstyle-suppressions.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- sido-gwt - Phenological data submission tool for TEMPO
+ sido-eml - Phenological data submission tool for TEMPO
Copyright © 2018 TEMPO (contact-tempo@inrae.fr)
This program is free software: you can redistribute it and/or modify
@@ -22,5 +22,4 @@
"-//Checkstyle//DTD Suppressions 1.1//EN"
"https://checkstyle.org/dtds/suppressions_1_1.dtd">
<suppressions>
- <suppress checks=".*" files="org[\\/]ecoinformatics[\\/]eml"/>
</suppressions>
diff --git a/sido-eml/pom.xml b/sido-eml/pom.xml
index 08b4c27e..05290853 100644
--- a/sido-eml/pom.xml
+++ b/sido-eml/pom.xml
@@ -10,7 +10,8 @@
<artifactId>sido-eml</artifactId>
<name>sido-eml</name>
<properties>
- <!-- No properties -->
+ <!-- No properties -->
+ <checkstyle.skip>true</checkstyle.skip>
</properties>
<dependencies>
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
@@ -20,4 +21,36 @@
<version>2.3.1</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <analysisCache>true</analysisCache>
+ <excludes>
+ <exclude>**/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
\ No newline at end of file
diff --git a/sido-gwt/config/checkstyle-suppressions.xml b/sido-gwt/config/checkstyle-suppressions.xml
index db301397..c23aa97a 100644
--- a/sido-gwt/config/checkstyle-suppressions.xml
+++ b/sido-gwt/config/checkstyle-suppressions.xml
@@ -22,6 +22,7 @@
"-//Checkstyle//DTD Suppressions 1.1//EN"
"https://checkstyle.org/dtds/suppressions_1_1.dtd">
<suppressions>
+ <suppress checks="[a-zA-Z0-9]*" files="[\\/]src[\\/]test[\\/]" />
<suppress checks="VisibilityModifier"
files="PreviewViewImpl.java|ProfileViewImpl.java|MailEditModal.java|HomeViewImpl.java|MainPageImpl.java|VerificationViewImpl.java|ManageDatasourceViewImpl.java|ManageDatasetViewImpl.java|ListWorkbooksViewImpl.java|DatasetCreationModal.java|DatasetInfosModal.java|DatasourceAdminModal.java|DatasetAdminModal.java" />
</suppressions>
diff --git a/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/License.java b/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/License.java
index 2d0c0e85..fdee8184 100644
--- a/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/License.java
+++ b/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/License.java
@@ -7,7 +7,16 @@ import lombok.Data;
*/
@Data
public class License {
+ /**
+ * License name.
+ */
private String name;
+ /**
+ * URI for the license icon.
+ */
private String iconUri;
+ /**
+ * URI for the license text.
+ */
private String uri;
}
diff --git a/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/Licenses.java b/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/Licenses.java
index 9e4880e7..68b67f6e 100644
--- a/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/Licenses.java
+++ b/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/Licenses.java
@@ -18,7 +18,7 @@ import lombok.extern.log4j.Log4j2;
* Licenses definitions for ERDG.
*/
@Log4j2
-public class Licenses {
+public final class Licenses {
/**
* Available licenses.
@@ -54,4 +54,11 @@ public class Licenses {
}
return Optional.empty();
}
+
+ /**
+ * No constructor.
+ */
+ private Licenses() {
+
+ }
}
diff --git a/sido-rs/config/checkstyle-suppressions.xml b/sido-rs/config/checkstyle-suppressions.xml
index b810de91..e3da79c2 100644
--- a/sido-rs/config/checkstyle-suppressions.xml
+++ b/sido-rs/config/checkstyle-suppressions.xml
@@ -22,4 +22,5 @@
"-//Checkstyle//DTD Suppressions 1.1//EN"
"https://checkstyle.org/dtds/suppressions_1_1.dtd">
<suppressions>
+ <suppress checks="JavadocPackageCheck" files="[\\/]src[\\/]test[\\/]" />
</suppressions>
diff --git a/verification/config/checkstyle-suppressions.xml b/verification/config/checkstyle-suppressions.xml
index 1392111b..7b72b678 100644
--- a/verification/config/checkstyle-suppressions.xml
+++ b/verification/config/checkstyle-suppressions.xml
@@ -22,4 +22,6 @@
"-//Checkstyle//DTD Suppressions 1.1//EN"
"https://checkstyle.org/dtds/suppressions_1_1.dtd">
<suppressions>
-</suppressions>
\ No newline at end of file
+ <suppress checks="JavadocPackageCheck" files="[\\/]src[\\/]test[\\/]" />
+ <suppress checks="[a-zA-Z0-9]*" files="[\\/]src[\\/]test[\\/]" />
+</suppressions>
--
GitLab