Reorder the modifiers to comply with the Java Language Specification. squid:ModifiersOrderCheck

wildone · wildone · commit 61996977eedc · 2019-07-24T17:02:36.000+10:00
diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/common/Timing.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/common/Timing.java
@@ -65,7 +65,6 @@ public static byte[] compress(String str) throws Exception {
         GZIPOutputStream gzip = new GZIPOutputStream(obj);
         gzip.write(str.getBytes(charsetName));
         gzip.close();
-        String outStr = obj.toString(charsetName);
 
         return obj.toByteArray();
     }
diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java
@@ -26,16 +26,16 @@
 public class ContactDetails extends GenericDetails {
     protected static final Logger LOGGER = LoggerFactory.getLogger(ContactDetails.class);
 
-    final static String COMPONENT_DETAILS_NAME = "contact-details";
-
-    final static String DEFAULT_FORMAT_TITLE = "${honorificPrefix} ${givenName} ${familyName}";
-    final static String DEFAULT_FORMAT_DESCRIPTION = "${jobTitle}";
-    final static String FIELD_FORMAT_TITLE = "titleFormat";
-    final static String FIELD_FORMAT_DESCRIPTION = "descriptionFormat";
-    final static String FIELD_FORMATTED_TITLE = "titleFormatted";
-    final static String FIELD_FORMATTED_TITLE_TEXT = "titleFormattedText";
-    final static String FIELD_FORMATTED_DESCRIPTION = "descriptionFormatted";
-    final static String I18N_CATEGORY = "contact-detail";
+    static final String COMPONENT_DETAILS_NAME = "contact-details";
+
+    static final String DEFAULT_FORMAT_TITLE = "${honorificPrefix} ${givenName} ${familyName}";
+    static final String DEFAULT_FORMAT_DESCRIPTION = "${jobTitle}";
+    static final String FIELD_FORMAT_TITLE = "titleFormat";
+    static final String FIELD_FORMAT_DESCRIPTION = "descriptionFormat";
+    static final String FIELD_FORMATTED_TITLE = "titleFormatted";
+    static final String FIELD_FORMATTED_TITLE_TEXT = "titleFormattedText";
+    static final String FIELD_FORMATTED_DESCRIPTION = "descriptionFormatted";
+    static final String I18N_CATEGORY = "contact-detail";
 
 
     @Override
diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/EventDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/EventDetails.java
@@ -27,22 +27,22 @@
 public class EventDetails extends GenericDetails {
 
     // default values for the component
-    final static String EVENT_DISPLAY_DATE_FORMAT = "EEE d MMMMM";
-    final static String EVENT_DISPLAY_DATE_FORMAT_ISO = "yyyy-MM-dd'T'HH:mm:ss'Z'";
-    final static String EVENT_TIME_DEFAULT_FORMAT = "h:mm a";
-    final static String HOURS_TIME_FORMAT = "h a";
-    final static String MINUTES_TIME_FORMAT = "mm";
-    final static String TIME_ZERO_FORMAT = "00";
-    final static String DEFAULT_FORMAT_TITLE = "${title}";
-    final static String FIELD_FORMAT_TITLE = "titleFormat";
-    final static String FIELD_FORMATTED_TITLE = "titleFormatted";
-    final static String FIELD_FORMATTED_TITLE_TEXT = "titleFormattedText";
-    final static String DEFAULT_FORMAT_SUBTITLE = "${eventStartDateText} to ${eventEndDateText}";
-    final static String DEFAULT_FORMAT_DISPLAYDATE = "${eventStartDateText} to ${eventEndDateText}";
-    final static String DEFAULT_FORMAT_DISPLAYTIME = "${eventStartTimeText} to ${eventEndTimeText}";
-
-    final static String FIELD_EVENT_START_DATE = "eventStartDate";
-    final static String FIELD_EVENT_END_DATE = "eventEndDate";
+    static final String EVENT_DISPLAY_DATE_FORMAT = "EEE d MMMMM";
+    static final String EVENT_DISPLAY_DATE_FORMAT_ISO = "yyyy-MM-dd'T'HH:mm:ss'Z'";
+    static final String EVENT_TIME_DEFAULT_FORMAT = "h:mm a";
+    static final String HOURS_TIME_FORMAT = "h a";
+    static final String MINUTES_TIME_FORMAT = "mm";
+    static final String TIME_ZERO_FORMAT = "00";
+    static final String DEFAULT_FORMAT_TITLE = "${title}";
+    static final String FIELD_FORMAT_TITLE = "titleFormat";
+    static final String FIELD_FORMATTED_TITLE = "titleFormatted";
+    static final String FIELD_FORMATTED_TITLE_TEXT = "titleFormattedText";
+    static final String DEFAULT_FORMAT_SUBTITLE = "${eventStartDateText} to ${eventEndDateText}";
+    static final String DEFAULT_FORMAT_DISPLAYDATE = "${eventStartDateText} to ${eventEndDateText}";
+    static final String DEFAULT_FORMAT_DISPLAYTIME = "${eventStartTimeText} to ${eventEndTimeText}";
+
+    static final String FIELD_EVENT_START_DATE = "eventStartDate";
+    static final String FIELD_EVENT_END_DATE = "eventEndDate";
 
 
     @Override
diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/AssetList.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/AssetList.java
@@ -74,7 +74,7 @@ public ComponentProperties getComponentProperties() {
     private static final String FIELD_IMAGE_OPTION_DEFAULT = "responsive";
 
 
-    private final static String ASSET_LICENSEINFO = "© {4} {0} {1} {2} {3}";
+    private static final String ASSET_LICENSEINFO = "© {4} {0} {1} {2} {3}";
 
     private long totalMatches;
     private long hitsPerPage;
diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/SearchList.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/SearchList.java
@@ -58,7 +58,7 @@ public ComponentProperties getComponentProperties() {
     @Default(intValues = 0)
     protected int listSplitEvery;
 
-    private final static String ASSET_LICENSEINFO = "© {4} {0} {1} {2} {3}";
+    private static final String ASSET_LICENSEINFO = "© {4} {0} {1} {2} {3}";
 
     @SuppressWarnings("Duplicates")
     protected void ready() {
diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ConstantsUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ConstantsUtil.java
@@ -108,16 +108,16 @@ public class ConstantsUtil {
 
     public static final String INHERITED_RESOURCE = "inheritedResource";
 
-    public final static String IMAGE_OPTION_GENERATED = "generated";
-    public final static String IMAGE_OPTION_RENDITION = "rendition";
-    public final static String IMAGE_OPTION_RESPONSIVE = "responsive";
-    public final static String IMAGE_OPTION_ADAPTIVE = "adaptive";
-    public final static String IMAGE_OPTION_MEDIAQUERYRENDITION = "mediaqueryrendition";
+    public static final String IMAGE_OPTION_GENERATED = "generated";
+    public static final String IMAGE_OPTION_RENDITION = "rendition";
+    public static final String IMAGE_OPTION_RESPONSIVE = "responsive";
+    public static final String IMAGE_OPTION_ADAPTIVE = "adaptive";
+    public static final String IMAGE_OPTION_MEDIAQUERYRENDITION = "mediaqueryrendition";
 
-    public final static String FIELD_ASSET_RENDITION_PATH_SUFFIX = "/jcr:content/renditions/";
+    public static final String FIELD_ASSET_RENDITION_PATH_SUFFIX = "/jcr:content/renditions/";
 
-    public final static String BADGE_REQUEST_ATTRIBUTES = "badgeRequestAttributes";
-    public final static String COMPONENT_PROPERTIES = "componentProperties";
+    public static final String BADGE_REQUEST_ATTRIBUTES = "badgeRequestAttributes";
+    public static final String COMPONENT_PROPERTIES = "componentProperties";
 
     public static final String DEFAULT_RSS_DATE_FORMAT = "EEE, dd MMM yyyy HH:mm:ss";
     public static final String DEFAULT_ICS_DATE_FORMAT = "yyyyMMdd'T'HHmmss";
diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ImagesUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ImagesUtil.java
@@ -420,7 +420,7 @@ public static String getResourceImagePath(Resource resource, String imageResourc
                 }
             }
         } catch (Exception ex) {
-            LOGGER.error("Exception occurred: {}", ex);
+            LOGGER.error("getResourceImagePath: Exception occurred: {}", ex);
         }
         return fileReferencPath;
     }
@@ -446,7 +446,7 @@ public static String getAssetPropertyValueWithDefault(Asset asset, String name,
             }
 
         } catch (Exception ex) {
-            LOGGER.error("Exception occurred: {}", ex);
+            LOGGER.error("getAssetPropertyValueWithDefault: Exception occurred: {}", ex);
         }
 
         return defaultValue;
@@ -488,7 +488,7 @@ public static String getAssetCopyrightInfo(Asset asset, String format) {
                 copyrightInfo = MessageFormat.format(format, assetCreator, assetContributor, assetLicense, assetCopyrightOwner, assetExpiresYear);
             }
         } catch (Exception ex) {
-            LOGGER.error("Exception occurred: {}", ex);
+            LOGGER.error("getAssetCopyrightInfo: Exception occurred: {}", ex);
         }
 
         return copyrightInfo;
diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ParagraphUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ParagraphUtil.java
@@ -12,7 +12,6 @@
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ValueMap;
 
-import javax.jcr.RepositoryException;
 import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
 import javax.servlet.jsp.JspWriter;
@@ -189,9 +188,8 @@ public static void closeCol(Paragraph par, JspWriter out) throws IOException {
      * @param par current par child of parSys being processed
      * @param out html output
      * @return last item in the column
-     * @throws IOException when can't write to jsp output
      */
-    public static Paragraph getLastItemInColumn(Object parSys, Paragraph par, JspWriter out) throws IOException {
+    public static Paragraph getLastItemInColumn(Object parSys, Paragraph par, JspWriter out) {
         Paragraph lastItemPar = null;
 
         int parPosition = getListPosition(parSys, par);
@@ -206,8 +204,10 @@ public static Paragraph getLastItemInColumn(Object parSys, Paragraph par, JspWri
             if (lpar != null) {
                 //check if the component is a column, if it is stop
                 Resource rpar = lpar.getResource();
-                if (rpar.getResourceType().endsWith("/colctrl")) {
-                    break;
+                if (rpar != null) {
+                    if (rpar.getResourceType().endsWith("/colctrl")) {
+                        break;
+                    }
                 }
             }
         }
@@ -440,14 +440,12 @@ public static Resource getFirstElement(final Iterator<Resource> itr) {
 
     /**
      * write opening tags for the column for Resource component, also check if base alignment is required based
-     * @param resContainer container for the current col
-     * @param resCol current resource
      * @param out html output
      * @param componentStyle style of container resource
      * @param currColNumber current column number
      * @throws IOException when can't write to jsp output
      */
-    public static void openCol(Resource resContainer, Resource resCol, JspWriter out, HashMap<String, Object> componentStyle, Integer currColNumber) throws IOException {
+    public static void openCol(JspWriter out, HashMap<String, Object> componentStyle, Integer currColNumber) throws IOException {
         String layout = (String) componentStyle.get(COL_CTL_LAYOUT);
 
         //expected width format: col-md-,4,4,4
diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ResolverUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ResolverUtil.java
@@ -21,8 +21,8 @@ public class ResolverUtil {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ResolverUtil.class);
 
-    public final static String DEFAULT_MAP_CONFIG_SCHEMA = "http";
-    public final static String SECURE_MAP_CONFIG_SCHEMA = "https";
+    public static final String DEFAULT_MAP_CONFIG_SCHEMA = "http";
+    public static final String SECURE_MAP_CONFIG_SCHEMA = "https";
 
     /**
      * map path using resolver
diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/TagUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/TagUtil.java
@@ -27,9 +27,9 @@ public class TagUtil {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TagUtil.class);
 
-    public final static String TAG_VALUE = "value";
-    final static String TAG_ISDEFAULT = "isdefault";
-    final static String TAG_ISDEFAULT_VALUE = "false";
+    public static final String TAG_VALUE = "value";
+    static final String TAG_ISDEFAULT = "isdefault";
+    static final String TAG_ISDEFAULT_VALUE = "false";
 
 
     /***
diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/TenantUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/TenantUtil.java
@@ -14,7 +14,7 @@ public class TenantUtil {
     // System config located
     // http://localhost:4502/system/console/configMgr/org.apache.sling.tenant.internal.TenantProviderImpl
     @SuppressWarnings({"squid:S4784"})
-    private final static List<Pattern> tenantPathPatterns = Arrays.asList(
+    private static final List<Pattern> tenantPathPatterns = Arrays.asList(
             Pattern.compile("(?:cq:tags/)([^/]+)"),
             Pattern.compile("(?:experience-fragments/)([^/]+)"),
             Pattern.compile("^/content/([^/]+)"),

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ public static byte[] compress(String str) throws Exception {`
`65`	`65`	`GZIPOutputStream gzip = new GZIPOutputStream(obj);`
`66`	`66`	`gzip.write(str.getBytes(charsetName));`
`67`	`67`	`gzip.close();`
`68`		`- String outStr = obj.toString(charsetName);`
`69`	`68`
`70`	`69`	`return obj.toByteArray();`
`71`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ public static String getResourceImagePath(Resource resource, String imageResourc`
`420`	`420`	`}`
`421`	`421`	`}`
`422`	`422`	`} catch (Exception ex) {`
`423`		`- LOGGER.error("Exception occurred: {}", ex);`
	`423`	`+ LOGGER.error("getResourceImagePath: Exception occurred: {}", ex);`
`424`	`424`	`}`
`425`	`425`	`return fileReferencPath;`
`426`	`426`	`}`
`@@ -446,7 +446,7 @@ public static String getAssetPropertyValueWithDefault(Asset asset, String name,`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`} catch (Exception ex) {`
`449`		`- LOGGER.error("Exception occurred: {}", ex);`
	`449`	`+ LOGGER.error("getAssetPropertyValueWithDefault: Exception occurred: {}", ex);`
`450`	`450`	`}`
`451`	`451`
`452`	`452`	`return defaultValue;`
`@@ -488,7 +488,7 @@ public static String getAssetCopyrightInfo(Asset asset, String format) {`
`488`	`488`	`copyrightInfo = MessageFormat.format(format, assetCreator, assetContributor, assetLicense, assetCopyrightOwner, assetExpiresYear);`
`489`	`489`	`}`
`490`	`490`	`} catch (Exception ex) {`
`491`		`- LOGGER.error("Exception occurred: {}", ex);`
	`491`	`+ LOGGER.error("getAssetCopyrightInfo: Exception occurred: {}", ex);`
`492`	`492`	`}`
`493`	`493`
`494`	`494`	`return copyrightInfo;`