Remove questionable use of NumberUtils

src/main/java/danta/aem/contextprocessors/AddAllResourceContentPropertiesContextProcessor.java

@@ -31,6 +31,7 @@
 import org.apache.sling.api.resource.Resource;
 
 import javax.jcr.Node;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -52,9 +53,11 @@
 public class AddAllResourceContentPropertiesContextProcessor
         extends AbstractCheckComponentCategoryContextProcessor<TemplateContentModelImpl> {
 
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(CONTENT_CATEGORY));
+
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(CONTENT_CATEGORY);
+        return ANY_OF;
     }
 
     @Override

src/main/java/danta/aem/contextprocessors/AddBasicResourcePropertiesContextProcessor.java

@@ -30,6 +30,7 @@
 import org.apache.sling.api.resource.Resource;
 
 import javax.jcr.Node;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -50,9 +51,11 @@
 public class AddBasicResourcePropertiesContextProcessor
         extends AbstractCheckComponentCategoryContextProcessor<TemplateContentModelImpl> {
 
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(CONTENT_CATEGORY));
+
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(CONTENT_CATEGORY);
+        return ANY_OF;
     }
 
     @Override

src/main/java/danta/aem/contextprocessors/AddComponentPropertiesContextProcessor.java

@@ -35,6 +35,7 @@
 import org.apache.sling.api.resource.ResourceResolverFactory;
 
 import javax.jcr.Node;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -55,14 +56,16 @@
 public class AddComponentPropertiesContextProcessor
         extends AbstractCheckComponentCategoryContextProcessor<TemplateContentModelImpl> {
 
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY, policy = ReferencePolicy.STATIC)
-    private ResourceResolverFactory resourceResolverFactory;
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(COMPONENT_CATEGORY));
 
     private static final String CONFIG_SERVICE = "config-service";
 
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY, policy = ReferencePolicy.STATIC)
+    private ResourceResolverFactory resourceResolverFactory;
+
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(COMPONENT_CATEGORY);
+        return ANY_OF;
     }
 
     @Override

src/main/java/danta/aem/contextprocessors/AddDesignPropertiesContextProcessor.java

@@ -32,6 +32,7 @@
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -52,9 +53,11 @@
 public class AddDesignPropertiesContextProcessor
         extends AbstractCheckComponentCategoryContextProcessor<TemplateContentModelImpl>  {
 
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(DESIGN_CATEGORY));
+
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(DESIGN_CATEGORY);
+        return ANY_OF;
     }
 
     @Override

src/main/java/danta/aem/contextprocessors/AddGlobalPropertiesContextProcessor.java

@@ -31,6 +31,7 @@
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -50,9 +51,11 @@
 public class AddGlobalPropertiesContextProcessor
         extends AbstractCheckComponentCategoryContextProcessor<TemplateContentModelImpl> {
 
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(GLOBAL_CATEGORY));
+
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(GLOBAL_CATEGORY);
+        return ANY_OF;
     }
 
     @Override

src/main/java/danta/aem/contextprocessors/AddPagePropertiesContextProcessor.java

@@ -42,6 +42,7 @@
 
 import javax.jcr.Node;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
@@ -63,12 +64,14 @@
 public class AddPagePropertiesContextProcessor
         extends AbstractCheckComponentCategoryContextProcessor<TemplateContentModelImpl> {
 
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(PAGE_CATEGORY));
+
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY, policy = ReferencePolicy.STATIC)
     protected AssetPathService assetPathService;
 
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(PAGE_CATEGORY);
+        return ANY_OF;
     }
 
     @Override

src/main/java/danta/aem/contextprocessors/AddSlingModelsPropertiesContextProcessor.java

@@ -35,7 +35,14 @@
 
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 
 import static danta.Constants.DOT;
 import static danta.Constants.HIGHEST_PRIORITY;
@@ -56,14 +63,16 @@
 public class AddSlingModelsPropertiesContextProcessor
         extends AbstractCheckComponentCategoryContextProcessor<TemplateContentModel> {
 
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(SLING_MODELS_CATEGORY));
+
+    @Reference
+    private ModelFactory modelFactory;
+
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(SLING_MODELS_CATEGORY);
+        return ANY_OF;
     }
 
-    @Reference
-    private ModelFactory modelFactory = null;
-
     @Override
     public int priority() {
         return HIGHEST_PRIORITY;

src/main/java/danta/aem/contextprocessors/AddStylingContextProcessor.java

@@ -31,6 +31,7 @@
 import org.apache.sling.api.SlingHttpServletRequest;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -80,9 +81,11 @@
 public class AddStylingContextProcessor
         extends AbstractCheckComponentCategoryContextProcessor<TemplateContentModelImpl> {
 
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(STYLING_CATEGORY));
+
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(STYLING_CATEGORY);
+        return ANY_OF;
     }
 
     @Override

src/main/java/danta/aem/contextprocessors/DeserializeJSONPropertyValuesContextProcessor.java

@@ -31,6 +31,7 @@
 import org.apache.sling.api.SlingHttpServletRequest;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Set;
 
 import static danta.Constants.COMPONENT_CATEGORY;
@@ -76,9 +77,11 @@
 public class DeserializeJSONPropertyValuesContextProcessor
         extends AbstractCheckComponentCategoryContextProcessor<TemplateContentModelImpl> {
 
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(COMPONENT_CATEGORY));
+
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(COMPONENT_CATEGORY);
+        return ANY_OF;
     }
 
     @Override

src/main/java/danta/aem/contextprocessors/images/AbstractImageContextProcessor.java

@@ -24,6 +24,7 @@
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Service;
 
+import java.util.Collections;
 import java.util.Set;
 
 import static danta.Constants.IMAGE_CATEGORY;
@@ -41,8 +42,10 @@ public abstract class AbstractImageContextProcessor<C extends ContentModel>
         extends AbstractCheckComponentCategoryContextProcessor<C>
         implements ImageContextProcessor<C> {
 
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(IMAGE_CATEGORY));
+
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(IMAGE_CATEGORY);
+        return ANY_OF;
     }
 }

src/main/java/danta/aem/contextprocessors/images/AddMultipleTransformedImagePathsFromResourcesContextProcessor.java

@@ -33,6 +33,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -54,12 +55,14 @@
 public class AddMultipleTransformedImagePathsFromResourcesContextProcessor
         extends AbstractImageContextProcessor<TemplateContentModel> {
 
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(MULTIPLE_IMAGE_RESOURCES_CATEGORY));
+
     @Reference
     AssetPathService assetPathService;
 
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(MULTIPLE_IMAGE_RESOURCES_CATEGORY);
+        return ANY_OF;
     }
 
     private final Predicate<Resource> IMAGE_RESOURCES_PREDICATE = new Predicate<Resource>() {

src/main/java/danta/aem/contextprocessors/images/AddTransformedImagePathContextProcessor.java

@@ -28,6 +28,7 @@
 import org.apache.felix.scr.annotations.Service;
 import org.apache.sling.api.SlingHttpServletRequest;
 
+import java.util.Collections;
 import java.util.Set;
 
 import static danta.Constants.*;
@@ -45,12 +46,14 @@
 public class AddTransformedImagePathContextProcessor
         extends AbstractImageContextProcessor<TemplateContentModel> {
 
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(CONTENT_IMAGE_CATEGORY));
+
     @Reference
     AssetPathService assetPathService;
 
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(CONTENT_IMAGE_CATEGORY);
+        return ANY_OF;
     }
 
     @Override

src/main/java/danta/aem/contextprocessors/images/AddTransformedImagePathFromDesignContextProcessor.java

@@ -32,6 +32,7 @@
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 
+import java.util.Collections;
 import java.util.Set;
 
 import static danta.Constants.*;
@@ -49,12 +50,14 @@
 public class AddTransformedImagePathFromDesignContextProcessor
         extends AbstractImageContextProcessor<TemplateContentModel> {
 
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(DESIGN_IMAGE_CATEGORY));
+
     @Reference
     private AssetPathService assetPathService;
 
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(DESIGN_IMAGE_CATEGORY);
+        return ANY_OF;
     }
 
     @Override

src/main/java/danta/aem/contextprocessors/images/AddTransformedImagePathFromGlobalContextProcessor.java

@@ -30,6 +30,7 @@
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
 
+import java.util.Collections;
 import java.util.Set;
 
 import static danta.Constants.*;
@@ -48,15 +49,17 @@
 public class AddTransformedImagePathFromGlobalContextProcessor
         extends AbstractImageContextProcessor<TemplateContentModel> {
 
-    public static final String CONFIG_GLOBAL_IMAGE_KEY = CONFIG_PROPERTIES_KEY + DOT + "xk_globalImagePath";
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(GLOBAL_IMAGE_CATEGORY));
+
+    private static final String CONFIG_GLOBAL_IMAGE_KEY = CONFIG_PROPERTIES_KEY + DOT + "xk_globalImagePath";
     private static final String COMPONENT_GLOBAL_DIALOG_PATH = COMPONENT_PROPERTIES_KEY + DOT + GLOBAL_PATH_PROPERTY_KEY;
 
     @Reference
     AssetPathService assetPathService;
 
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(GLOBAL_IMAGE_CATEGORY);
+        return ANY_OF;
     }
 
     @Override

src/main/java/danta/aem/contextprocessors/images/AddTransformedImagePathsContextProcessor.java

@@ -31,6 +31,7 @@
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -54,12 +55,14 @@
 public class AddTransformedImagePathsContextProcessor
         extends AbstractImageContextProcessor<TemplateContentModel> {
 
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(IMAGES_BY_KEY_CATEGORY));
+
     @Reference
     AssetPathService assetPathService;
 
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(IMAGES_BY_KEY_CATEGORY);
+        return ANY_OF;
     }
 
     private final Predicate<Resource> IMAGE_RESOURCES_PREDICATE = new Predicate<Resource>() {

src/main/java/danta/aem/contextprocessors/images/AddTransformedMultipleImagePathsContextProcessor.java

@@ -32,6 +32,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Set;
 
 import static danta.Constants.*;
@@ -49,12 +50,14 @@
 public class AddTransformedMultipleImagePathsContextProcessor
         extends AbstractImageContextProcessor<TemplateContentModel> {
 
+    private static final Set<String> ANY_OF = Collections.unmodifiableSet(Sets.newHashSet(MULTIPLE_IMAGE_CATEGORY));
+
     @Reference
     AssetPathService assetPathService;
 
     @Override
     public Set<String> anyOf() {
-        return Sets.newHashSet(MULTIPLE_IMAGE_CATEGORY);
+        return ANY_OF;
     }
 
     @Override