Add encoding to environment

pnatashap · May 11, 2024 · 8a9dda4 · 8a9dda4
1 parent ebf4355
commit 8a9dda4
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 4 deletions.
diff --git a/.github/workflows/mvn.yml b/.github/workflows/mvn.yml
@@ -1,8 +1,5 @@
 ---
 name: mvn
-env:
-  JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF8"
-  JAVA_OPTS: "%JAVA_OPTS% -Dfile.encoding=UTF-8"
 on:
   push:
     branches:
@@ -29,4 +26,4 @@ jobs:
           key: ${{ runner.os }}-jdk-${{ matrix.java }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-jdk-${{ matrix.java }}-maven-
-      - run: mvn -B install -Pqulice
+      - run: mvn -B install -Pqulice
diff --git a/qulice-maven-plugin/src/main/java/com/qulice/maven/DefaultMavenEnvironment.java b/qulice-maven-plugin/src/main/java/com/qulice/maven/DefaultMavenEnvironment.java
@@ -41,6 +41,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.charset.Charset;
 import java.security.PrivilegedAction;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -292,6 +293,18 @@ public void setAsser(final Collection<String> ass) {
         this.asser.addAll(ass);
     }
 
+    /**
+     * Get source files encoding.
+     * @return Charset of the source files
+     */
+    public Charset encoding() {
+        String charset = this.iproperties.getProperty("project.build.sourceEncoding");
+        if (charset == null) {
+            charset = "UTF-8";
+        }
+        return Charset.forName(charset);
+    }
+
     /**
      * Creates URL ClassLoader in privileged block.
      *

diff --git a/qulice-maven-plugin/src/main/java/com/qulice/maven/MavenEnvironment.java b/qulice-maven-plugin/src/main/java/com/qulice/maven/MavenEnvironment.java
@@ -32,6 +32,7 @@
 
 import com.qulice.spi.Environment;
 import java.io.File;
+import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.Properties;
 import org.apache.maven.project.MavenProject;
@@ -182,5 +183,10 @@ public boolean exclude(final String check, final String name) {
         public Collection<String> excludes(final String checker) {
             return this.env.excludes(checker);
         }
+
+        @Override
+        public Charset encoding() {
+            return this.env.encoding();
+        }
     }
 }
diff --git a/qulice-pmd/src/main/java/com/qulice/pmd/SourceValidator.java b/qulice-pmd/src/main/java/com/qulice/pmd/SourceValidator.java
@@ -33,6 +33,7 @@
 import com.jcabi.log.Logger;
 import com.qulice.spi.Environment;
 import java.io.File;
+import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -70,6 +71,11 @@ final class SourceValidator {
      */
     private final PMDConfiguration config;
 
+    /**
+     * Source files encoding.
+     */
+    private final Charset encoding;
+
     /**
      * Creates new instance of <code>SourceValidator</code>.
      * @param env Environment
@@ -79,6 +85,7 @@ final class SourceValidator {
         this.listener = new PmdListener(env);
         this.renderer = new PmdRenderer();
         this.config = new PMDConfiguration();
+        this.encoding = env.encoding();
     }
 
     /**
@@ -95,6 +102,7 @@ public Collection<PmdError> validate(
         this.config.setMinimumPriority(RulePriority.LOW);
         this.config.setIgnoreIncrementalAnalysis(true);
         this.config.setShowSuppressedViolations(true);
+        this.config.setSourceEncoding(this.encoding.name());
         final Report report = new Report();
         report.addListener(this.listener);
         this.context.setReport(report);

diff --git a/qulice-spi/src/main/java/com/qulice/spi/Environment.java b/qulice-spi/src/main/java/com/qulice/spi/Environment.java
@@ -32,6 +32,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collection;
@@ -122,6 +123,12 @@ public interface Environment {
      */
     Collection<String> excludes(String checker);
 
+    /**
+     * Encoding for the files.
+     * @return Source files charset
+     */
+    Charset encoding();
+
     /**
      * Mock of {@link Environment}.
      *
@@ -323,5 +330,10 @@ public Collection<String> excludes(final String checker) {
             }
             return exc;
         }
+
+        @Override
+        public Charset encoding() {
+            return StandardCharsets.UTF_8;
+        }
     }
 }