Merge remote-tracking branch 'origin/violation-decorators' into violation-decorators

pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageModule.java

@@ -10,7 +10,6 @@ import net.sourceforge.pmd.lang.BaseLanguageModule;
 import net.sourceforge.pmd.lang.Language;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.apex.internal.ApexHandler;
-import net.sourceforge.pmd.util.CollectionUtil;
 
 import apex.jorje.services.Version;
 

pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java

@@ -48,6 +48,10 @@ public final class StringUtil {
         return "'" + s + "'";
     }
 
+    public static @NonNull String inDoubleQuotes(String expected) {
+        return "\"" + expected + "\"";
+    }
+
 
     /**
      * Returns the (1-based) line number of the character at the given index.
@@ -551,9 +555,6 @@ public final class StringUtil {
         return str.replaceAll("'", "''");
     }
 
-    public static @NonNull String inDoubleQuotes(String expected) {
-        return "\"" + expected + "\"";
-    }
 
     /** Return the empty string if the parameter is null. */
     public static String nullToEmpty(final String value) {