codeclimate feedback

Author: justinedelson

.codeclimate.yml

@@ -24,7 +24,6 @@ checks:
 plugins:
   sonar-java:
     enabled: true
-    channel: "beta"
     exclude_patterns:
       - "**/src/test/"
     config:

bundle/src/main/java/com/adobe/acs/commons/analysis/jcrchecksum/impl/ChecksumGeneratorImpl.java

@@ -164,6 +164,7 @@ private boolean isChecksumable(Node node, ChecksumGeneratorOptions options) thro
      * @throws RepositoryException
      * @throws IOException
      */
+    @SuppressWarnings("squid:S3776")
     protected String generatedNodeChecksum(final String aggregateNodePath,
                                                   final Node node,
                                                   final ChecksumGeneratorOptions options)

bundle/src/main/java/com/adobe/acs/commons/httpcache/engine/impl/TeeServletOutputStream.java

@@ -105,7 +105,6 @@ public void setWriteListener(WriteListener writeListener) {
             writeListener.onWritePossible();
         } catch (IOException e) {
             listener.onError(e);
-            e.printStackTrace();
         }
     }
 }

bundle/src/main/java/com/adobe/acs/commons/logging/impl/JsonEventLogger.java

@@ -61,6 +61,7 @@
             name = "webconsole.configurationFactory.nameHint",
             value = "Logger: {event.logger.category} for events matching '{event.filter}' on '{event.topics}'")
 })
+@SuppressWarnings("PMD.MoreThanOneLogger")
 public class JsonEventLogger implements EventHandler {
 
     /**

bundle/src/main/java/com/adobe/acs/commons/redirectmaps/impl/FakeSlingHttpServletRequest.java

@@ -279,12 +279,12 @@ public String getServletPath() {
     }
 
     @Override
-    public HttpSession getSession() {
+    public String changeSessionId() {
         return null;
     }
 
     @Override
-    public String changeSessionId() {
+    public HttpSession getSession() {
         return null;
     }
 

bundle/src/main/java/com/adobe/acs/commons/util/ParameterUtil.java

@@ -136,6 +136,7 @@ public static Map<String, String> toMap(final String[] values, final String sepa
      *                                If false, entries with multiple separators are considered invalid
      * @return
      */
+    @SuppressWarnings("squid:S3776")
     public static Map<String, String> toMap(final String[] values, final String separator,
                                             final boolean allowValuelessKeys, final String defaultValue,
                                             final boolean allowMultipleSeparators) {

bundle/src/main/java/com/adobe/acs/commons/workflow/process/impl/SyncSmartTagsToXmpMetadataNodeProcess.java

@@ -77,6 +77,7 @@ public class SyncSmartTagsToXmpMetadataNodeProcess implements WorkflowProcess {
     @Reference
     private WorkflowPackageManager workflowPackageManager;
 
+    @SuppressWarnings("squid:S1141")
     public final void execute(WorkItem workItem, WorkflowSession workflowSession, MetaDataMap metaDataMap)
             throws WorkflowException {
 

bundle/src/test/java/com/adobe/acs/commons/it/build/ScrMetadataIT.java

@@ -51,6 +51,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+@SuppressWarnings("PMD.SystemPrintln")
 public class ScrMetadataIT {
 
     private static final Set<String> PROPERTIES_TO_IGNORE;
@@ -114,26 +115,24 @@ public void test() throws Exception {
     private List<String> compareDescriptors(Descriptor current, Descriptor latestRelease) {
         List<String> problems = new ArrayList<>();
 
-        current.properties.stream().filter(cp -> !PROPERTIES_TO_IGNORE.contains(cp.name)).
-            filter(cp -> !COMPONENT_PROPERTIES_TO_IGNORE.contains(current.name + ":" + cp.name)).forEach(cp -> {
+        current.properties.stream().filter(cp -> !PROPERTIES_TO_IGNORE.contains(cp.name))
+            .filter(cp -> !COMPONENT_PROPERTIES_TO_IGNORE.contains(current.name + ":" + cp.name)).forEach(cp -> {
             Optional<Property> fromLatest = latestRelease.properties.stream().filter(p -> p.name.equals(cp.name)).findFirst();
             if (fromLatest.isPresent()) {
                 Property lp = fromLatest.get();
                 if (!StringUtils.equals(cp.value, lp.value)) {
                     problems.add(String.format("Property %s on component %s has different values (was: {%s}, is: {%s})", cp.name, current.name, lp.value, cp.value));
                 }
-                if (!COMPONENT_PROPERTIES_TO_IGNORE_FOR_TYPE_CHANGE.contains(current.name + ":" + cp.name)) {
-                    if (!StringUtils.equals(cp.type, lp.type)) {
-                        problems.add(String.format("Property %s on component %s has different types (was: {%s}, is: {%s})", cp.name, current.name, lp.type, cp.type));
-                    }
+                if (!COMPONENT_PROPERTIES_TO_IGNORE_FOR_TYPE_CHANGE.contains(current.name + ":" + cp.name) && !StringUtils.equals(cp.type, lp.type)) {
+                    problems.add(String.format("Property %s on component %s has different types (was: {%s}, is: {%s})", cp.name, current.name, lp.type, cp.type));
                 }
             } else {
                 System.out.printf("Property %s on component %s is only in current. Assuming OK.\n", cp.name, current.name);
             }
         });
 
-        latestRelease.properties.stream().filter(lp -> !PROPERTIES_TO_IGNORE.contains(lp.name)).
-            filter(lp -> !COMPONENT_PROPERTIES_TO_IGNORE.contains(latestRelease.name + ":" + lp.name)).forEach(lp -> {
+        latestRelease.properties.stream().filter(lp -> !PROPERTIES_TO_IGNORE.contains(lp.name))
+            .filter(lp -> !COMPONENT_PROPERTIES_TO_IGNORE.contains(latestRelease.name + ":" + lp.name)).forEach(lp -> {
             Optional<Property> fromCurrent = current.properties.stream().filter(p -> p.name.equals(lp.name)).findFirst();
             if (!fromCurrent.isPresent()) {
                 problems.add(String.format("Property %s on component %s has been removed.", lp.name, latestRelease.name));
@@ -334,6 +333,11 @@ private class InputStreamFacade extends InputStream {
             this.zis = zis;
         }
 
+        @Override
+        public int read() throws IOException {
+            return zis.read();
+        }
+
         @Override
         public int read(@NotNull byte[] b) throws IOException {
             return zis.read(b);
@@ -374,10 +378,6 @@ public boolean markSupported() {
             return zis.markSupported();
         }
 
-        @Override
-        public int read() throws IOException {
-            return zis.read();
-        }
     }
 
 

bundle/src/test/java/com/adobe/acs/commons/replication/status/impl/JcrPackageReplicationStatusEventHandlerTest.java

@@ -26,8 +26,16 @@
 import com.day.cq.replication.ReplicationActionType;
 import com.day.cq.replication.ReplicationEvent;
 import org.apache.jackrabbit.JcrConstants;
-import org.apache.jackrabbit.vault.packaging.*;
-import org.apache.sling.api.resource.*;
+import org.apache.jackrabbit.vault.packaging.JcrPackage;
+import org.apache.jackrabbit.vault.packaging.JcrPackageDefinition;
+import org.apache.jackrabbit.vault.packaging.PackageId;
+import org.apache.jackrabbit.vault.packaging.Packaging;
+import org.apache.jackrabbit.vault.packaging.VaultPackage;
+import org.apache.sling.api.resource.LoginException;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceResolverFactory;
+import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.api.wrappers.ValueMapDecorator;
 import org.apache.sling.event.jobs.Job;
 import org.apache.sling.event.jobs.JobManager;
@@ -42,7 +50,11 @@
 import org.osgi.service.event.Event;
 
 import javax.jcr.Node;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.regex.Pattern;
 import org.apache.sling.discovery.InstanceDescription;
 import org.apache.sling.discovery.TopologyEvent;
@@ -136,7 +148,7 @@ public void setUp() throws Exception {
         when(jcrPackage.getPackage()).thenReturn(vaultPackage);
         when(vaultPackage.getCreated()).thenReturn(calendar);
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put(JcrConstants.JCR_LASTMODIFIED, calendar);
         when(jcrPackageJcrContent.adaptTo(ValueMap.class)).thenReturn(new ValueMapDecorator(properties));