svn commit: r1818495 [2/4] - /ofbiz/ofbiz-framework/trunk/f
Locked
 
|
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java?rev=1818495&r1=1818494&r2=1818495&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java Sun Dec 17 16:57:56 2017 @@ -49,7 +49,7 @@ public class StringUtil { private static final Map<String, Pattern> substitutionPatternMap = createSubstitutionPatternMap(); private static Map<String, Pattern> createSubstitutionPatternMap() { - Map<String, Pattern> substitutionPatternMap = new LinkedHashMap<String, Pattern>(); // Preserve insertion order + Map<String, Pattern> substitutionPatternMap = new LinkedHashMap<>(); // Preserve insertion order substitutionPatternMap.put("&&", Pattern.compile("@and", Pattern.LITERAL)); substitutionPatternMap.put("||", Pattern.compile("@or", Pattern.LITERAL)); substitutionPatternMap.put("<=", Pattern.compile("@lteq", Pattern.LITERAL)); @@ -86,7 +86,9 @@ public class StringUtil { int i = mainString.lastIndexOf(oldString); - if (i < 0) return mainString; + if (i < 0) { + return mainString; + } StringBuilder mainSb = new StringBuilder(mainString); @@ -114,15 +116,17 @@ public class StringUtil { * @return a String of all values in the collection seperated by the delimiter */ public static String join(Collection<?> col, String delim) { - if (UtilValidate.isEmpty(col)) + if (UtilValidate.isEmpty(col)) { return null; + } StringBuilder buf = new StringBuilder(); Iterator<?> i = col.iterator(); while (i.hasNext()) { buf.append(i.next()); - if (i.hasNext()) + if (i.hasNext()) { buf.append(delim); + } } return buf.toString(); } @@ -137,15 +141,18 @@ public class StringUtil { List<String> splitList = null; StringTokenizer st; - if (str == null) return null; + if (str == null) { + return null; + } st = (delim != null? new StringTokenizer(str, delim): new StringTokenizer(str)); if (st.hasMoreTokens()) { splitList = new LinkedList<>(); - while (st.hasMoreTokens()) + while (st.hasMoreTokens()) { splitList.add(st.nextToken()); + } } return splitList; } @@ -161,15 +168,22 @@ public class StringUtil { List<String> splitList = null; String[] st = null; - if (str == null) return splitList; + if (str == null) { + return splitList; + } - if (delim != null) st = Pattern.compile(delim).split(str, limit); - else st = str.split("\\s"); + if (delim != null) { + st = Pattern.compile(delim).split(str, limit); + } else { + st = str.split("\\s"); + } if (st != null && st.length > 0) { - splitList = new LinkedList<String>(); - for (int i=0; i < st.length; i++) splitList.add(st[i]); + splitList = new LinkedList<>(); + for (String element : st) { + splitList.add(element); + } } return splitList; @@ -182,7 +196,7 @@ public class StringUtil { public static List<String> quoteStrList(List<String> list) { List<String> tmpList = list; - list = new LinkedList<String>(); + list = new LinkedList<>(); for (String str: tmpList) { str = "'" + str + "'"; list.add(str); @@ -212,8 +226,10 @@ public class StringUtil { * @return a Map of name/value pairs */ public static Map<String, String> strToMap(String str, String delim, boolean trim, String pairsSeparator) { - if (str == null) return null; - Map<String, String> decodedMap = new HashMap<String, String>(); + if (str == null) { + return null; + } + Map<String, String> decodedMap = new HashMap<>(); List<String> elements = split(str, delim); pairsSeparator = pairsSeparator == null ? "=" : pairsSeparator; @@ -281,7 +297,9 @@ public class StringUtil { * @return String The encoded String */ public static String mapToStr(Map<? extends Object, ? extends Object> map) { - if (map == null) return null; + if (map == null) { + return null; + } StringBuilder buf = new StringBuilder(); boolean first = true; @@ -289,8 +307,9 @@ public class StringUtil { Object key = entry.getKey(); Object value = entry.getValue(); - if (!(key instanceof String) || !(value instanceof String)) + if (!(key instanceof String) || !(value instanceof String)) { continue; + } String encodedName = null; try { encodedName = URLEncoder.encode((String) key, "UTF-8"); @@ -304,10 +323,11 @@ public class StringUtil { Debug.logError(e, module); } - if (first) + if (first) { first = false; - else + } else { buf.append("|"); + } buf.append(encodedName); buf.append("="); @@ -325,7 +345,7 @@ public class StringUtil { * @return new Map */ public static Map<String, String> toMap(String s) { - Map<String, String> newMap = new HashMap<String, String>(); + Map<String, String> newMap = new HashMap<>(); if (s.startsWith("{") && s.endsWith("}")) { s = s.substring(1, s.length() - 1); String[] entries = s.split("\\,\\s"); @@ -349,7 +369,7 @@ public class StringUtil { * @return new List */ public static List<String> toList(String s) { - List<String> newList = new LinkedList<String>(); + List<String> newList = new LinkedList<>(); if (s.startsWith("[") && s.endsWith("]")) { s = s.substring(1, s.length() - 1); String[] entries = s.split("\\,\\s"); @@ -370,7 +390,7 @@ public class StringUtil { * @return new List */ public static Set<String> toSet(String s) { - Set<String> newSet = new LinkedHashSet<String>(); + Set<String> newSet = new LinkedHashSet<>(); if (s.startsWith("[") && s.endsWith("]")) { s = s.substring(1, s.length() - 1); String[] entries = s.split("\\,\\s"); @@ -395,7 +415,7 @@ public class StringUtil { if (keys == null || values == null || keys.size() != values.size()) { throw new IllegalArgumentException("Keys and Values cannot be null and must be the same size"); } - Map<K, V> newMap = new HashMap<K, V>(); + Map<K, V> newMap = new HashMap<>(); for (int i = 0; i < keys.size(); i++) { newMap.put(keys.get(i), values.get(i)); } @@ -404,7 +424,9 @@ public class StringUtil { /** Make sure the string starts with a forward slash but does not end with one; converts back-slashes to forward-slashes; if in String is null or empty, returns zero length string. */ public static String cleanUpPathPrefix(String prefix) { - if (UtilValidate.isEmpty(prefix)) return ""; + if (UtilValidate.isEmpty(prefix)) { + return ""; + } StringBuilder cppBuff = new StringBuilder(prefix.replace('\\', '/')); @@ -495,7 +517,9 @@ public class StringUtil { * @return the new value */ public static String addToNumberString(String numberString, long addAmount) { - if (numberString == null) return null; + if (numberString == null) { + return null; + } int origLength = numberString.length(); long number = Long.parseLong(numberString); return padNumberString(Long.toString(number + addAmount), origLength); @@ -585,8 +609,12 @@ public class StringUtil { return makeStringWrapper(theString); } public static StringWrapper makeStringWrapper(String theString) { - if (theString == null) return null; - if (theString.length() == 0) return StringWrapper.EMPTY_STRING_WRAPPER; + if (theString == null) { + return null; + } + if (theString.length() == 0) { + return StringWrapper.EMPTY_STRING_WRAPPER; + } return new StringWrapper(theString); } @@ -597,13 +625,21 @@ public class StringUtil { public static StringBuilder appendTo(StringBuilder sb, Iterable<? extends Appender<StringBuilder>> iterable, String prefix, String suffix, String sepPrefix, String sep, String sepSuffix) { Iterator<? extends Appender<StringBuilder>> it = iterable.iterator(); while (it.hasNext()) { - if (prefix != null) sb.append(prefix); + if (prefix != null) { + sb.append(prefix); + } it.next().appendTo(sb); - if (suffix != null) sb.append(suffix); + if (suffix != null) { + sb.append(suffix); + } if (it.hasNext() && sep != null) { - if (sepPrefix != null) sb.append(sepPrefix); + if (sepPrefix != null) { + sb.append(sepPrefix); + } sb.append(sep); - if (sepSuffix != null) sb.append(sepSuffix); + if (sepSuffix != null) { + sb.append(sepSuffix); + } } } return sb; @@ -616,13 +652,21 @@ public class StringUtil { public static StringBuilder append(StringBuilder sb, Iterable<? extends Object> iterable, String prefix, String suffix, String sepPrefix, String sep, String sepSuffix) { Iterator<? extends Object> it = iterable.iterator(); while (it.hasNext()) { - if (prefix != null) sb.append(prefix); + if (prefix != null) { + sb.append(prefix); + } sb.append(it.next()); - if (suffix != null) sb.append(suffix); + if (suffix != null) { + sb.append(suffix); + } if (it.hasNext() && sep != null) { - if (sepPrefix != null) sb.append(sepPrefix); + if (sepPrefix != null) { + sb.append(sepPrefix); + } sb.append(sep); - if (sepSuffix != null) sb.append(sepSuffix); + if (sepSuffix != null) { + sb.append(sepSuffix); + } } } return sb; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java?rev=1818495&r1=1818494&r2=1818495&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java Sun Dec 17 16:57:56 2017 @@ -69,10 +69,9 @@ public class URLConnector { if (connection != null) { return connection; - } else { - timedOut = true; - throw new IOException("Connection timed out"); } + timedOut = true; + throw new IOException("Connection timed out"); } // trusted certs only @@ -126,9 +125,7 @@ public class URLConnector { if (hv != null) { scon.setHostnameVerifier(hv); } - } catch (GeneralSecurityException e) { - Debug.logError(e, module); - } catch (GenericConfigException e) { + } catch (GeneralSecurityException | GenericConfigException e) { Debug.logError(e, module); } } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java?rev=1818495&r1=1818494&r2=1818495&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java Sun Dec 17 16:57:56 2017 @@ -45,7 +45,7 @@ public class UtilCodec { private static final UrlCodec urlCodec = new UrlCodec(); private static final List<Codec> codecs; static { - List<Codec> tmpCodecs = new ArrayList<Codec>(); + List<Codec> tmpCodecs = new ArrayList<>(); tmpCodecs.add(new HTMLEntityCodec()); tmpCodecs.add(new PercentCodec()); codecs = Collections.unmodifiableList(tmpCodecs); @@ -63,8 +63,8 @@ public class UtilCodec { /** * @deprecated Use {@link #sanitize(String,String)} instead */ - public String sanitize(String outString); // Only really useful with HTML, else it simply calls encode() method - public String sanitize(String outString, String contentTypeId); // Only really useful with HTML, else it simply calls encode() method + public String sanitize(String outString); // Only really useful with HTML, else it simply calls encode() method + public String sanitize(String outString, String contentTypeId); // Only really useful with HTML, else it simply calls encode() method } public static interface SimpleDecoder { @@ -93,7 +93,7 @@ public class UtilCodec { PolicyFactory sanitizer = Sanitizers.FORMATTING.and(Sanitizers.BLOCKS).and(Sanitizers.IMAGES).and(Sanitizers.LINKS).and(Sanitizers.STYLES); // TODO to be improved to use a (or several) contentTypeId/s when necessary. Below is an example with BIRT_FLEXIBLE_REPORT_POLICY - if (UtilProperties.getPropertyAsBoolean("owasp", "sanitizer.permissive.policy", false)) { + if (UtilProperties.getPropertyAsBoolean("owasp", "sanitizer.permissive.policy", false)) { sanitizer = sanitizer.and(PERMISSIVE_POLICY); } if ("FLEXIBLE_REPORT".equals(contentTypeId)) { @@ -101,9 +101,9 @@ public class UtilCodec { } return sanitizer.sanitize(original); } - + // Given as an example based on rendering cmssite as it was before using the sanitizer. - // To use the PERMISSIVE_POLICY set sanitizer.permissive.policy to true. + // To use the PERMISSIVE_POLICY set sanitizer.permissive.policy to true. // Note that I was unable to render </html> and </body>. I guess because <html> and <body> are not sanitized in 1st place (else the sanitizer makes some damages I found) // You might even want to adapt the PERMISSIVE_POLICY to your needs... Be sure to check https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet before... // And https://github.com/OWASP/java-html-sanitizer/blob/master/docs/getting_started.md for examples. @@ -115,7 +115,7 @@ public class UtilCodec { .allowWithoutAttributes("html", "body", "div", "span", "table", "td") .allowAttributes("width").onElements("table") .toFactory(); - + // This is the PolicyFactory used for the Birt Report Builder usage feature. ("FLEXIBLE_REPORT" contentTypeId) // It allows to use the OOTB Birt Report Builder example. // You might need to enhance it for your needs (when using a new REPORT_MASTER) but normally you should not. See PERMISSIVE_POLICY above for documentation and examples @@ -219,9 +219,8 @@ public class UtilCodec { public static SimpleDecoder getDecoder(String type) { if ("url".equals(type)) { return urlCodec; - } else { - return null; } + return null; } public static String canonicalize(String value) throws IntrusionException { @@ -268,21 +267,18 @@ public class UtilCodec { if (foundCount >= 2 && mixedCount > 1) { if (restrictMultiple || restrictMixed) { throw new IntrusionException("Input validation failure"); - } else { - Debug.logWarning("Multiple (" + foundCount + "x) and mixed encoding (" + mixedCount + "x) detected in " + input, module); } + Debug.logWarning("Multiple (" + foundCount + "x) and mixed encoding (" + mixedCount + "x) detected in " + input, module); } else if (foundCount >= 2) { if (restrictMultiple) { throw new IntrusionException("Input validation failure"); - } else { - Debug.logWarning("Multiple (" + foundCount + "x) encoding detected in " + input, module); } + Debug.logWarning("Multiple (" + foundCount + "x) encoding detected in " + input, module); } else if (mixedCount > 1) { if (restrictMixed) { throw new IntrusionException("Input validation failure"); - } else { - Debug.logWarning("Mixed encoding (" + mixedCount + "x) detected in " + input, module); } + Debug.logWarning("Mixed encoding (" + mixedCount + "x) detected in " + input, module); } return working; } @@ -291,14 +287,16 @@ public class UtilCodec { * Uses a black-list approach for necessary characters for HTML. * <p> * Does not allow various characters (after canonicalization), including - * "<", ">", "&" (if not followed by a space), and "%" (if not + * "<", ">", "&" (if not followed by a space), and "%" (if not * followed by a space). * * @param value * @param errorMessageList */ public static String checkStringForHtmlStrictNone(String valueName, String value, List<String> errorMessageList) { - if (UtilValidate.isEmpty(value)) return value; + if (UtilValidate.isEmpty(value)) { + return value; + } // canonicalize, strict (error on double-encoding) try { @@ -324,9 +322,11 @@ public class UtilCodec { */ public static class HtmlEncodingMapWrapper<K> implements Map<K, Object> { public static <K> HtmlEncodingMapWrapper<K> getHtmlEncodingMapWrapper(Map<K, Object> mapToWrap, SimpleEncoder encoder) { - if (mapToWrap == null) return null; + if (mapToWrap == null) { + return null; + } - HtmlEncodingMapWrapper<K> mapWrapper = new HtmlEncodingMapWrapper<K>(); + HtmlEncodingMapWrapper<K> mapWrapper = new HtmlEncodingMapWrapper<>(); mapWrapper.setup(mapToWrap, encoder); return mapWrapper; } @@ -353,9 +353,8 @@ public class UtilCodec { if (theObject instanceof String) { if (this.encoder != null) { return encoder.encode((String) theObject); - } else { - return UtilCodec.getEncoder("html").encode((String) theObject); } + return UtilCodec.getEncoder("html").encode((String) theObject); } else if (theObject instanceof Map<?, ?>) { return HtmlEncodingMapWrapper.getHtmlEncodingMapWrapper(UtilGenerics.<K, Object>checkMap(theObject), this.encoder); } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java?rev=1818495&r1=1818494&r2=1818495&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java Sun Dec 17 16:57:56 2017 @@ -114,7 +114,7 @@ public final class UtilDateTime { } public static String formatInterval(double interval, int count, Locale locale) { - List<Double> parts = new ArrayList<Double>(timevals.length); + List<Double> parts = new ArrayList<>(timevals.length); for (String[] timeval: timevals) { int value = Integer.parseInt(timeval[0]); double remainder = interval % value; @@ -128,8 +128,12 @@ public final class UtilDateTime { for (int i = parts.size() - 1; i >= 0 && count > 0; i--) { Double D = parts.get(i); double d = D.doubleValue(); - if (d < 1) continue; - if (sb.length() > 0) sb.append(", "); + if (d < 1) { + continue; + } + if (sb.length() > 0) { + sb.append(", "); + } count--; sb.append(count == 0 ? df.format(d) : Integer.toString(D.intValue())); sb.append(' '); @@ -312,9 +316,8 @@ public final class UtilDateTime { if (newDate != null) { return new java.sql.Date(newDate.getTime()); - } else { - return null; } + return null; } /** @@ -330,9 +333,8 @@ public final class UtilDateTime { if (newDate != null) { return new java.sql.Date(newDate.getTime()); - } else { - return null; } + return null; } /** @@ -348,9 +350,8 @@ public final class UtilDateTime { if (newDate != null) { return new java.sql.Date(newDate.getTime()); - } else { - return null; } + return null; } /** @@ -364,9 +365,8 @@ public final class UtilDateTime { if (newDate != null) { return new java.sql.Time(newDate.getTime()); - } else { - return null; } + return null; } /** @@ -382,9 +382,8 @@ public final class UtilDateTime { if (newDate != null) { return new java.sql.Time(newDate.getTime()); - } else { - return null; } + return null; } /** @@ -400,9 +399,8 @@ public final class UtilDateTime { if (newDate != null) { return new java.sql.Time(newDate.getTime()); - } else { - return null; } + return null; } /** @@ -416,9 +414,8 @@ public final class UtilDateTime { if (newDate != null) { return new java.sql.Timestamp(newDate.getTime()); - } else { - return null; } + return null; } /** @@ -433,9 +430,8 @@ public final class UtilDateTime { if (newDate != null) { return new java.sql.Timestamp(newDate.getTime()); - } else { - return null; } + return null; } /** @@ -455,9 +451,8 @@ public final class UtilDateTime { if (newDate != null) { return new java.sql.Timestamp(newDate.getTime()); - } else { - return null; } + return null; } /** @@ -476,13 +471,14 @@ public final class UtilDateTime { if (newDate != null) { return new java.sql.Timestamp(newDate.getTime()); - } else { - return null; } + return null; } public static java.sql.Timestamp toTimestamp(Date date) { - if (date == null) return null; + if (date == null) { + return null; + } return new Timestamp(date.getTime()); } @@ -511,7 +507,9 @@ public final class UtilDateTime { * @return A Date made from the date and time Strings */ public static java.util.Date toDate(String date, String time) { - if (date == null || time == null) return null; + if (date == null || time == null) { + return null; + } String month; String day; String year; @@ -522,11 +520,15 @@ public final class UtilDateTime { int dateSlash1 = date.indexOf("/"); int dateSlash2 = date.lastIndexOf("/"); - if (dateSlash1 <= 0 || dateSlash1 == dateSlash2) return null; + if (dateSlash1 <= 0 || dateSlash1 == dateSlash2) { + return null; + } int timeColon1 = time.indexOf(":"); int timeColon2 = time.lastIndexOf(":"); - if (timeColon1 <= 0) return null; + if (timeColon1 <= 0) { + return null; + } month = date.substring(0, dateSlash1); day = date.substring(dateSlash1 + 1, dateSlash2); year = date.substring(dateSlash2 + 1); @@ -603,7 +605,9 @@ public final class UtilDateTime { * @return A date String in the given format */ public static String toDateString(java.util.Date date, String format) { - if (date == null) return ""; + if (date == null) { + return ""; + } SimpleDateFormat dateFormat = null; if (format != null) { dateFormat = new SimpleDateFormat(format); @@ -634,7 +638,9 @@ public final class UtilDateTime { * @return A time String in the format HH:MM:SS or HH:MM */ public static String toTimeString(java.util.Date date) { - if (date == null) return ""; + if (date == null) { + return ""; + } Calendar calendar = Calendar.getInstance(); calendar.setTime(date); @@ -671,9 +677,8 @@ public final class UtilDateTime { } if (second == 0) { return hourStr + ":" + minuteStr; - } else { - return hourStr + ":" + minuteStr + ":" + secondStr; } + return hourStr + ":" + minuteStr + ":" + secondStr; } /** @@ -683,15 +688,16 @@ public final class UtilDateTime { * @return A combined data and time string in the format "MM/DD/YYYY HH:MM:SS" where the seconds are left off if they are 0. */ public static String toDateTimeString(java.util.Date date) { - if (date == null) return ""; + if (date == null) { + return ""; + } String dateString = toDateString(date); String timeString = toTimeString(date); if (!dateString.isEmpty() && !timeString.isEmpty()) { return dateString + " " + timeString; - } else { - return ""; } + return ""; } public static String toGmtTimestampString(Timestamp timestamp) { @@ -926,7 +932,7 @@ public final class UtilDateTime { Calendar tempCal = Calendar.getInstance(locale); tempCal.set(Calendar.DAY_OF_WEEK, tempCal.getFirstDayOfWeek()); SimpleDateFormat dateFormat = new SimpleDateFormat("EEEE", locale); - List<String> resultList = new ArrayList<String>(); + List<String> resultList = new ArrayList<>(); for (int i = 0; i < 7; i++) { resultList.add(dateFormat.format(tempCal.getTime())); tempCal.roll(Calendar.DAY_OF_WEEK, 1); @@ -944,7 +950,7 @@ public final class UtilDateTime { Calendar tempCal = Calendar.getInstance(locale); tempCal.set(Calendar.MONTH, Calendar.JANUARY); SimpleDateFormat dateFormat = new SimpleDateFormat("MMMM", locale); - List<String> resultList = new ArrayList<String>(); + List<String> resultList = new ArrayList<>(); for (int i = Calendar.JANUARY; i <= tempCal.getActualMaximum(Calendar.MONTH); i++) { resultList.add(dateFormat.format(tempCal.getTime())); tempCal.roll(Calendar.MONTH, 1); @@ -1040,12 +1046,12 @@ public final class UtilDateTime { return dateFormat.format(stamp); } - // Private lazy-initializer class + // Private lazy-initializer class private static class TimeZoneHolder { private static final List<TimeZone> availableTimeZoneList = getTimeZones(); private static List<TimeZone> getTimeZones() { - ArrayList<TimeZone> availableTimeZoneList = new ArrayList<TimeZone>(); + ArrayList<TimeZone> availableTimeZoneList = new ArrayList<>(); List<String> idList = null; String tzString = UtilProperties.getPropertyValue("general", "timeZones.available"); if (UtilValidate.isNotEmpty(tzString)) { @@ -1077,9 +1083,8 @@ public final class UtilDateTime { public static TimeZone toTimeZone(String tzId) { if (UtilValidate.isEmpty(tzId)) { return TimeZone.getDefault(); - } else { - return TimeZone.getTimeZone(tzId); } + return TimeZone.getTimeZone(tzId); } /** Returns a TimeZone object based upon an hour offset from GMT. @@ -1166,7 +1171,7 @@ public final class UtilDateTime { * Returns a copy of <code>date</code> that cannot be modified. * Attempts to modify the returned date will result in an * <tt>UnsupportedOperationException</tt>. - * + * * @param date */ public static Date unmodifiableDate(Date date) { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java?rev=1818495&r1=1818494&r2=1818495&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java Sun Dec 17 16:57:56 2017 @@ -32,7 +32,7 @@ import java.util.TimeZone; public final class UtilFormatOut { public static final String module = UtilFormatOut.class.getName(); - + // ------------------- price format handlers ------------------- // FIXME: This is not thread-safe! DecimalFormat is not synchronized. private static final DecimalFormat priceDecimalFormat = new DecimalFormat(UtilProperties.getPropertyValue("general", "currency.decimal.format", "#,##0.00")); @@ -48,9 +48,8 @@ public final class UtilFormatOut { public static String safeToString(Object obj) { if (obj != null) { return obj.toString(); - } else { - return ""; } + return ""; } /** Formats a Double representing a price into a string @@ -58,7 +57,9 @@ public final class UtilFormatOut { * @return A String with the formatted price */ public static String formatPrice(Double price) { - if (price == null) return ""; + if (price == null) { + return ""; + } return formatPrice(price.doubleValue()); } @@ -67,7 +68,9 @@ public final class UtilFormatOut { * @return A String with the formatted price */ public static String formatPrice(BigDecimal price) { - if (price == null) return ""; + if (price == null) { + return ""; + } return priceDecimalFormat.format(price); } @@ -100,7 +103,9 @@ public final class UtilFormatOut { if (isoCode != null && isoCode.length() > 1) { nf.setCurrency(com.ibm.icu.util.Currency.getInstance(isoCode)); } else { - if (Debug.verboseOn()) Debug.logVerbose("No isoCode specified to format currency value:" + price, module); + if (Debug.verboseOn()) { + Debug.logVerbose("No isoCode specified to format currency value:" + price, module); + } } if (maximumFractionDigits >= 0) { nf.setMaximumFractionDigits(maximumFractionDigits); @@ -180,7 +185,9 @@ public final class UtilFormatOut { * @return A String with the formatted percentage */ public static String formatPercentage(Double percentage) { - if (percentage == null) return ""; + if (percentage == null) { + return ""; + } return formatPercentage(percentage.doubleValue()); } @@ -189,7 +196,9 @@ public final class UtilFormatOut { * @return A String with the formatted percentage */ public static String formatPercentage(BigDecimal percentage) { - if (percentage == null) return ""; + if (percentage == null) { + return ""; + } return percentageDecimalFormat.format(percentage); } @@ -206,10 +215,10 @@ public final class UtilFormatOut { * @return A String with the formatted quantity */ public static String formatQuantity(Long quantity) { - if (quantity == null) + if (quantity == null) { return ""; - else - return formatQuantity(quantity.doubleValue()); + } + return formatQuantity(quantity.doubleValue()); } /** Formats an int representing a quantity into a string @@ -225,10 +234,10 @@ public final class UtilFormatOut { * @return A String with the formatted quantity */ public static String formatQuantity(Integer quantity) { - if (quantity == null) + if (quantity == null) { return ""; - else - return formatQuantity(quantity.doubleValue()); + } + return formatQuantity(quantity.doubleValue()); } /** Formats an int representing a quantity into a string @@ -244,10 +253,10 @@ public final class UtilFormatOut { * @return A String with the formatted quantity */ public static String formatQuantity(Float quantity) { - if (quantity == null) + if (quantity == null) { return ""; - else - return formatQuantity(quantity.doubleValue()); + } + return formatQuantity(quantity.doubleValue()); } /** Formats a float representing a quantity into a string @@ -263,10 +272,10 @@ public final class UtilFormatOut { * @return A String with the formatted quantity */ public static String formatQuantity(Double quantity) { - if (quantity == null) + if (quantity == null) { return ""; - else - return formatQuantity(quantity.doubleValue()); + } + return formatQuantity(quantity.doubleValue()); } /** Formats an BigDecimal representing a quantity into a string @@ -274,10 +283,10 @@ public final class UtilFormatOut { * @return A String with the formatted quantity */ public static String formatQuantity(BigDecimal quantity) { - if (quantity == null) + if (quantity == null) { return ""; - else - return quantityDecimalFormat.format(quantity); + } + return quantityDecimalFormat.format(quantity); } /** Formats an double representing a quantity into a string @@ -297,7 +306,9 @@ public final class UtilFormatOut { } public static String formatPaddingRemove(String original) { - if (original == null) return null; + if (original == null) { + return null; + } StringBuilder orgBuf = new StringBuilder(original); while (orgBuf.length() > 0 && orgBuf.charAt(0) == '0') { orgBuf.deleteCharAt(0); @@ -313,8 +324,9 @@ public final class UtilFormatOut { * @return A <code>String</code> with the formatted date/time, or an empty <code>String</code> if <code>timestamp</code> is <code>null</code> */ public static String formatDate(java.sql.Timestamp timestamp) { - if (timestamp == null) + if (timestamp == null) { return ""; + } DateFormat df = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.FULL); java.util.Date date = timestamp; return df.format(date); @@ -372,10 +384,10 @@ public final class UtilFormatOut { * @return The passed String if not null, otherwise an empty non-null String */ public static String checkNull(String string1) { - if (string1 != null) + if (string1 != null) { return string1; - else - return ""; + } + return ""; } /** Returns the first passed String if not null, otherwise the second if not null, otherwise an empty but non-null String. @@ -384,12 +396,13 @@ public final class UtilFormatOut { * @return The first passed String if not null, otherwise the second if not null, otherwise an empty but non-null String */ public static String checkNull(String string1, String string2) { - if (string1 != null) + if (string1 != null) { return string1; - else if (string2 != null) + } else if (string2 != null) { return string2; - else + } else { return ""; + } } /** Returns the first passed String if not null, otherwise the second if not null, otherwise the third if not null, otherwise an empty but non-null String. @@ -399,14 +412,15 @@ public final class UtilFormatOut { * @return The first passed String if not null, otherwise the second if not null, otherwise the third if not null, otherwise an empty but non-null String */ public static String checkNull(String string1, String string2, String string3) { - if (string1 != null) + if (string1 != null) { return string1; - else if (string2 != null) + } else if (string2 != null) { return string2; - else if (string3 != null) + } else if (string3 != null) { return string3; - else + } else { return ""; + } } /** Returns the first passed String if not null, otherwise the second if not null, otherwise the third if not null, otherwise the fourth if not null, otherwise an empty but non-null String. @@ -417,16 +431,17 @@ public final class UtilFormatOut { * @return The first passed String if not null, otherwise the second if not null, otherwise the third if not null, otherwise the fourth if not null, otherwise an empty but non-null String */ public static String checkNull(String string1, String string2, String string3, String string4) { - if (string1 != null) + if (string1 != null) { return string1; - else if (string2 != null) + } else if (string2 != null) { return string2; - else if (string3 != null) + } else if (string3 != null) { return string3; - else if (string4 != null) + } else if (string4 != null) { return string4; - else + } else { return ""; + } } /** Returns <code>pre + base + post</code> if base String is not null or empty, otherwise an empty but non-null String. @@ -436,10 +451,10 @@ public final class UtilFormatOut { * @return <code>pre + base + post</code> if base String is not null or empty, otherwise an empty but non-null String. */ public static String ifNotEmpty(String base, String pre, String post) { - if (UtilValidate.isNotEmpty(base)) + if (UtilValidate.isNotEmpty(base)) { return pre + base + post; - else - return ""; + } + return ""; } /** Returns the first passed String if not empty, otherwise the second if not empty, otherwise an empty but non-null String. @@ -448,12 +463,13 @@ public final class UtilFormatOut { * @return The first passed String if not empty, otherwise the second if not empty, otherwise an empty but non-null String */ public static String checkEmpty(String string1, String string2) { - if (UtilValidate.isNotEmpty(string1)) + if (UtilValidate.isNotEmpty(string1)) { return string1; - else if (UtilValidate.isNotEmpty(string2)) + } else if (UtilValidate.isNotEmpty(string2)) { return string2; - else + } else { return ""; + } } /** Returns the first passed String if not empty, otherwise the second if not empty, otherwise the third if not empty, otherwise an empty but non-null String. @@ -463,18 +479,19 @@ public final class UtilFormatOut { * @return The first passed String if not empty, otherwise the second if not empty, otherwise the third if not empty, otherwise an empty but non-null String */ public static String checkEmpty(String string1, String string2, String string3) { - if (UtilValidate.isNotEmpty(string1)) + if (UtilValidate.isNotEmpty(string1)) { return string1; - else if (UtilValidate.isNotEmpty(string2)) + } else if (UtilValidate.isNotEmpty(string2)) { return string2; - else if (UtilValidate.isNotEmpty(string3)) + } else if (UtilValidate.isNotEmpty(string3)) { return string3; - else + } else { return ""; + } } // ------------------- web encode handlers ------------------- - /** + /** * Encodes an HTTP URL query String, replacing characters used for other * things in HTTP URL query strings, but not touching the separator * characters '?', '=', and '&' @@ -530,7 +547,7 @@ public final class UtilFormatOut { } // ------------------- web encode handlers ------------------- - /** + /** * Encodes an XML string replacing the characters '<', '>', '"', ''', '&' * @param inString The plain value String * @return The encoded String @@ -557,27 +574,30 @@ public final class UtilFormatOut { int diff = setLen - stringLen; if (diff < 0) { return str.substring(0, setLen); - } else { - StringBuilder newString = new StringBuilder(); - if (padEnd) { - newString.append(str); - } - for (int i = 0; i < diff; i++) { - newString.append(padChar); - } - if (!padEnd) { - newString.append(str); - } - return newString.toString(); } + StringBuilder newString = new StringBuilder(); + if (padEnd) { + newString.append(str); + } + for (int i = 0; i < diff; i++) { + newString.append(padChar); + } + if (!padEnd) { + newString.append(str); + } + return newString.toString(); } public static String makeSqlSafe(String unsafeString) { return unsafeString.replaceAll("'","''"); } public static String formatPrintableCreditCard(String original) { - if (original == null) return null; - if (original.length() <= 4) return original; + if (original == null) { + return null; + } + if (original.length() <= 4) { + return original; + } StringBuilder buffer = new StringBuilder(); for (int i=0; i < original.length()-4 ; i++) { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java?rev=1818495&r1=1818494&r2=1818495&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java Sun Dec 17 16:57:56 2017 @@ -42,7 +42,9 @@ public final class UtilGenerics { public static <C extends Collection<?>> void checkCollectionContainment(Object object, Class<C> clz, Class<?> type) { if (object != null) { - if (!(clz.isInstance(object))) throw new ClassCastException("Not a " + clz.getName()); + if (!(clz.isInstance(object))) { + throw new ClassCastException("Not a " + clz.getName()); + } int i = 0; for (Object value: (Collection<?>) object) { if (value != null && !type.isInstance(value)) { @@ -55,7 +57,7 @@ public final class UtilGenerics { @SuppressWarnings("unchecked") public static <T> Collection<T> checkCollection(Object object) { - return (Collection<T>) checkCollectionCast(object, Collection.class); + return checkCollectionCast(object, Collection.class); } public static <T> Collection<T> checkCollection(Object object, Class<T> type) { @@ -65,7 +67,7 @@ public final class UtilGenerics { @SuppressWarnings("unchecked") public static <T> List<T> checkList(Object object) { - return (List<T>) checkCollectionCast(object, List.class); + return checkCollectionCast(object, List.class); } public static <T> List<T> checkList(Object object, Class<T> type) { @@ -75,13 +77,17 @@ public final class UtilGenerics { @SuppressWarnings("unchecked") public static <K, V> Map<K, V> checkMap(Object object) { - if (object != null && !(object instanceof Map)) throw new ClassCastException("Not a map"); + if (object != null && !(object instanceof Map)) { + throw new ClassCastException("Not a map"); + } return (Map<K, V>) object; } public static <K, V> Map<K, V> checkMap(Object object, Class<K> keyType, Class<V> valueType) { if (object != null) { - if (!(object instanceof Map<?, ?>)) throw new ClassCastException("Not a map"); + if (!(object instanceof Map<?, ?>)) { + throw new ClassCastException("Not a map"); + } Map<?, ?> map = (Map<?,?>) object; int i = 0; for (Map.Entry<?, ?> entry: map.entrySet()) { @@ -99,7 +105,7 @@ public final class UtilGenerics { @SuppressWarnings("unchecked") public static <T> Stack<T> checkStack(Object object) { - return (Stack<T>) checkCollectionCast(object, Stack.class); + return checkCollectionCast(object, Stack.class); } public static <T> Stack<T> checkStack(Object object, Class<T> type) { @@ -109,7 +115,7 @@ public final class UtilGenerics { @SuppressWarnings("unchecked") public static <T> Set<T> checkSet(Object object) { - return (Set<T>) checkCollectionCast(object, Set.class); + return checkCollectionCast(object, Set.class); } public static <T> Set<T> checkSet(Object object, Class<T> type) { @@ -122,7 +128,9 @@ public final class UtilGenerics { */ @SuppressWarnings("unchecked") public static <T> List<T> toList(Object object) { - if (object != null && !(object instanceof List)) return null; + if (object != null && !(object instanceof List)) { + return null; + } return (List<T>) object; } @@ -131,7 +139,9 @@ public final class UtilGenerics { */ @SuppressWarnings("unchecked") public static <K, V> Map<K, V> toMap(Object object) { - if (object != null && !(object instanceof Map)) return null; + if (object != null && !(object instanceof Map)) { + return null; + } return (Map<K, V>) object; } @@ -142,13 +152,17 @@ public final class UtilGenerics { if (data.length % 2 == 1) { throw new IllegalArgumentException("You must pass an even sized array to the toMap method"); } - Map<K, V> map = new LinkedHashMap<K, V>(); + Map<K, V> map = new LinkedHashMap<>(); for (int i = 0; i < data.length;) { Object key = data[i]; - if (key != null && !(keyType.isInstance(key))) throw new IllegalArgumentException("Key(" + i + ") is not a " + keyType.getName() + ", was(" + key.getClass().getName() + ")"); + if (key != null && !(keyType.isInstance(key))) { + throw new IllegalArgumentException("Key(" + i + ") is not a " + keyType.getName() + ", was(" + key.getClass().getName() + ")"); + } i++; Object value = data[i]; - if (value != null && !(valueType.isInstance(value))) throw new IllegalArgumentException("Value(" + i + ") is not a " + keyType.getName() + ", was(" + key.getClass().getName() + ")"); + if (value != null && !(valueType.isInstance(value))) { + throw new IllegalArgumentException("Value(" + i + ") is not a " + keyType.getName() + ", was(" + key.getClass().getName() + ")"); + } i++; map.put(keyType.cast(key), valueType.cast(value)); } @@ -163,10 +177,12 @@ public final class UtilGenerics { if (data.length % 2 == 1) { throw new IllegalArgumentException("You must pass an even sized array to the toMap method"); } - Map<K, Object> map = new LinkedHashMap<K, Object>(); + Map<K, Object> map = new LinkedHashMap<>(); for (int i = 0; i < data.length;) { Object key = data[i]; - if (key != null && !(keyType.isInstance(key))) throw new IllegalArgumentException("Key(" + i + ") is not a " + keyType.getName() + ", was(" + key.getClass().getName() + ")"); + if (key != null && !(keyType.isInstance(key))) { + throw new IllegalArgumentException("Key(" + i + ") is not a " + keyType.getName() + ", was(" + key.getClass().getName() + ")"); + } i++; Object value = data[i]; map.put(keyType.cast(key), value); Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java?rev=1818495&r1=1818494&r2=1818495&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java Sun Dec 17 16:57:56 2017 @@ -97,7 +97,7 @@ public final class UtilHttp { * @return The resulting Map */ public static Map<String, Object> getCombinedMap(HttpServletRequest request, Set<? extends String> namesToSkip) { - Map<String, Object> combinedMap = new HashMap<String, Object>(); + Map<String, Object> combinedMap = new HashMap<>(); combinedMap.putAll(getParameterMap(request)); // parameters override nothing combinedMap.putAll(getServletContextMap(request, namesToSkip)); // bottom level application attributes combinedMap.putAll(getSessionMap(request, namesToSkip)); // session overrides application @@ -125,7 +125,7 @@ public final class UtilHttp { */ public static Map<String, Object> getParameterMap(HttpServletRequest request, Set<? extends String> nameSet, Boolean onlyIncludeOrSkip) { boolean onlyIncludeOrSkipPrim = onlyIncludeOrSkip == null ? true : onlyIncludeOrSkip.booleanValue(); - Map<String, Object> paramMap = new HashMap<String, Object>(); + Map<String, Object> paramMap = new HashMap<>(); // add all the actual HTTP request parameters Enumeration<String> e = UtilGenerics.cast(request.getParameterNames()); @@ -160,14 +160,13 @@ public final class UtilHttp { if (Debug.verboseOn()) { Debug.logVerbose("Made Request Parameter Map with [" + paramMap.size() + "] Entries", module); - //Debug.logVerbose("Request Parameter Map Entries: " + System.getProperty("line.separator") + UtilMisc.printMap(paramMap), module); see OFBIZ-9310 } return canonicalizeParameterMap(paramMap); } public static Map<String, Object> getQueryStringOnlyParameterMap(String queryString) { - Map<String, Object> paramMap = new HashMap<String, Object>(); + Map<String, Object> paramMap = new HashMap<>(); if (UtilValidate.isNotEmpty(queryString)) { StringTokenizer queryTokens = new StringTokenizer(queryString, "&"); while (queryTokens.hasMoreTokens()) { @@ -192,14 +191,16 @@ public final class UtilHttp { public static Map<String, Object> getPathInfoOnlyParameterMap(String pathInfoStr, Set<? extends String> nameSet, Boolean onlyIncludeOrSkip) { boolean onlyIncludeOrSkipPrim = onlyIncludeOrSkip == null ? true : onlyIncludeOrSkip.booleanValue(); - Map<String, Object> paramMap = new HashMap<String, Object>(); + Map<String, Object> paramMap = new HashMap<>(); // now add in all path info parameters /~name1=value1/~name2=value2/ // note that if a parameter with a given name already exists it will be put into a list with all values if (UtilValidate.isNotEmpty(pathInfoStr)) { // make sure string ends with a trailing '/' so we get all values - if (!pathInfoStr.endsWith("/")) pathInfoStr += "/"; + if (!pathInfoStr.endsWith("/")) { + pathInfoStr += "/"; + } int current = pathInfoStr.indexOf('/'); int last = current; @@ -221,7 +222,7 @@ public final class UtilHttp { paramList.add(value); } else { String paramString = (String) curValue; - paramList = new LinkedList<String>(); + paramList = new LinkedList<>(); paramList.add(paramString); paramList.add(value); } @@ -248,7 +249,7 @@ public final class UtilHttp { if (paramEntry.getValue() instanceof String) { paramEntry.setValue(canonicalizeParameter((String) paramEntry.getValue())); } else if (paramEntry.getValue() instanceof Collection<?>) { - List<String> newList = new LinkedList<String>(); + List<String> newList = new LinkedList<>(); for (String listEntry: UtilGenerics.<String>checkCollection(paramEntry.getValue())) { newList.add(canonicalizeParameter(listEntry)); } @@ -262,7 +263,9 @@ public final class UtilHttp { try { /** calling canonicalize with strict flag set to false so we only get warnings about double encoding, etc; can be set to true for exceptions and more security */ String cannedStr = UtilCodec.canonicalize(paramValue, false); - if (Debug.verboseOn()) Debug.logVerbose("Canonicalized parameter with " + (cannedStr.equals(paramValue) ? "no " : "") + "change: original [" + paramValue + "] canned [" + cannedStr + "]", module); + if (Debug.verboseOn()) { + Debug.logVerbose("Canonicalized parameter with " + (cannedStr.equals(paramValue) ? "no " : "") + "change: original [" + paramValue + "] canned [" + cannedStr + "]", module); + } return cannedStr; } catch (Exception e) { Debug.logError(e, "Error in canonicalize parameter value [" + paramValue + "]: " + e.toString(), module); @@ -275,7 +278,7 @@ public final class UtilHttp { * @return The resulting Map */ public static Map<String, Object> getJSONAttributeMap(HttpServletRequest request) { - Map<String, Object> returnMap = new HashMap<String, Object>(); + Map<String, Object> returnMap = new HashMap<>(); Map<String, Object> attrMap = getAttributeMap(request); for (Map.Entry<String, Object> entry : attrMap.entrySet()) { String key = entry.getKey(); @@ -284,7 +287,9 @@ public final class UtilHttp { val = val.toString(); } if (val instanceof String || val instanceof Number || val instanceof Map<?, ?> || val instanceof List<?> || val instanceof Boolean) { - if (Debug.verboseOn()) Debug.logVerbose("Adding attribute to JSON output: " + key, module); + if (Debug.verboseOn()) { + Debug.logVerbose("Adding attribute to JSON output: " + key, module); + } returnMap.put(key, val); } } @@ -305,14 +310,15 @@ public final class UtilHttp { * @return The resulting Map */ public static Map<String, Object> getAttributeMap(HttpServletRequest request, Set<? extends String> namesToSkip) { - Map<String, Object> attributeMap = new HashMap<String, Object>(); + Map<String, Object> attributeMap = new HashMap<>(); // look at all request attributes Enumeration<String> requestAttrNames = UtilGenerics.cast(request.getAttributeNames()); while (requestAttrNames.hasMoreElements()) { String attrName = requestAttrNames.nextElement(); - if (namesToSkip != null && namesToSkip.contains(attrName)) + if (namesToSkip != null && namesToSkip.contains(attrName)) { continue; + } Object attrValue = request.getAttribute(attrName); attributeMap.put(attrName, attrValue); @@ -339,15 +345,16 @@ public final class UtilHttp { * @return The resulting Map */ public static Map<String, Object> getSessionMap(HttpServletRequest request, Set<? extends String> namesToSkip) { - Map<String, Object> sessionMap = new HashMap<String, Object>(); + Map<String, Object> sessionMap = new HashMap<>(); HttpSession session = request.getSession(); // look at all the session attributes Enumeration<String> sessionAttrNames = UtilGenerics.cast(session.getAttributeNames()); while (sessionAttrNames.hasMoreElements()) { String attrName = sessionAttrNames.nextElement(); - if (namesToSkip != null && namesToSkip.contains(attrName)) + if (namesToSkip != null && namesToSkip.contains(attrName)) { continue; + } Object attrValue = session.getAttribute(attrName); sessionMap.put(attrName, attrValue); @@ -374,15 +381,16 @@ public final class UtilHttp { * @return The resulting Map */ public static Map<String, Object> getServletContextMap(HttpServletRequest request, Set<? extends String> namesToSkip) { - Map<String, Object> servletCtxMap = new HashMap<String, Object>(); + Map<String, Object> servletCtxMap = new HashMap<>(); // look at all servlet context attributes ServletContext servletContext = (ServletContext) request.getAttribute("servletContext"); Enumeration<String> applicationAttrNames = UtilGenerics.cast(servletContext.getAttributeNames()); while (applicationAttrNames.hasMoreElements()) { String attrName = applicationAttrNames.nextElement(); - if (namesToSkip != null && namesToSkip.contains(attrName)) + if (namesToSkip != null && namesToSkip.contains(attrName)) { continue; + } Object attrValue = servletContext.getAttribute(attrName); servletCtxMap.put(attrName, attrValue); @@ -405,7 +413,7 @@ public final class UtilHttp { } public static Map<String, Object> makeParamMapWithPrefix(Map<String, ? extends Object> context, Map<String, ? extends Object> additionalFields, String prefix, String suffix) { - Map<String, Object> paramMap = new HashMap<String, Object>(); + Map<String, Object> paramMap = new HashMap<>(); for (Map.Entry<String, ? extends Object> entry: context.entrySet()) { String parameterName = entry.getKey(); if (parameterName.startsWith(prefix)) { @@ -500,7 +508,7 @@ public final class UtilHttp { } public static List<Object> makeParamListWithSuffix(HttpServletRequest request, Map<String, ? extends Object> additionalFields, String suffix, String prefix) { - List<Object> paramList = new ArrayList<Object>(); + List<Object> paramList = new ArrayList<>(); Enumeration<String> parameterNames = UtilGenerics.cast(request.getParameterNames()); while (parameterNames.hasMoreElements()) { String parameterName = parameterNames.nextElement(); @@ -584,8 +592,9 @@ public final class UtilHttp { StringBuilder requestUrl = new StringBuilder(); requestUrl.append(request.getScheme()); requestUrl.append("://" + request.getServerName()); - if (request.getServerPort() != 80 && request.getServerPort() != 443) + if (request.getServerPort() != 80 && request.getServerPort() != 443) { requestUrl.append(":" + request.getServerPort()); + } return requestUrl; } @@ -637,7 +646,9 @@ public final class UtilHttp { * @return Locale The current Locale to use */ public static Locale getLocale(HttpServletRequest request) { - if (request == null) return Locale.getDefault(); + if (request == null) { + return Locale.getDefault(); + } return getLocale(request, request.getSession(), null); } @@ -648,7 +659,9 @@ public final class UtilHttp { * @return Locale The current Locale to use */ public static Locale getLocale(HttpSession session) { - if (session == null) return Locale.getDefault(); + if (session == null) { + return Locale.getDefault(); + } return getLocale(null, session, null); } @@ -700,7 +713,7 @@ public final class UtilHttp { public static TimeZone getTimeZone(HttpServletRequest request, HttpSession session, String appDefaultTimeZoneString) { // check session first, should override all if anything set there TimeZone timeZone = session != null ? (TimeZone) session.getAttribute(SESSION_KEY_TIMEZONE) : null; - + // next see if the userLogin has a value if (timeZone == null) { Map<String, Object> userLogin = UtilGenerics.checkMap(session.getAttribute("userLogin"), String.class, Object.class); @@ -861,7 +874,9 @@ public final class UtilHttp { } public static String getRequestUriFromTarget(String target) { - if (UtilValidate.isEmpty(target)) return null; + if (UtilValidate.isEmpty(target)) { + return null; + } int endOfRequestUri = target.length(); if (target.indexOf('?') > 0) { endOfRequestUri = target.indexOf('?'); @@ -882,7 +897,9 @@ public final class UtilHttp { * @return The query string */ public static String getQueryStringFromTarget(String target) { - if (UtilValidate.isEmpty(target)) return ""; + if (UtilValidate.isEmpty(target)) { + return ""; + } int queryStart = target.indexOf('?'); if (queryStart != -1) { return target.substring(queryStart); @@ -896,7 +913,9 @@ public final class UtilHttp { * @return The request target string */ public static String removeQueryStringFromTarget(String target) { - if (UtilValidate.isEmpty(target)) return null; + if (UtilValidate.isEmpty(target)) { + return null; + } int queryStart = target.indexOf('?'); if (queryStart < 0) { return target; @@ -906,8 +925,12 @@ public final class UtilHttp { public static String getWebappMountPointFromTarget(String target) { int firstChar = 0; - if (UtilValidate.isEmpty(target)) return null; - if (target.charAt(0) == '/') firstChar = 1; + if (UtilValidate.isEmpty(target)) { + return null; + } + if (target.charAt(0) == '/') { + firstChar = 1; + } int pathSep = target.indexOf('/', 1); String webappMountPoint = null; if (pathSep > 0) { @@ -1102,7 +1125,7 @@ public final class UtilHttp { } public static String stripViewParamsFromQueryString(String queryString, String paginatorNumber) { - Set<String> paramNames = new HashSet<String>(); + Set<String> paramNames = new HashSet<>(); if (UtilValidate.isNotEmpty(paginatorNumber)) { paginatorNumber = "_" + paginatorNumber; } @@ -1148,21 +1171,28 @@ public final class UtilHttp { * index of the row. */ public static Collection<Map<String, Object>> parseMultiFormData(Map<String, Object> parameters) { - Map<Integer, Map<String, Object>> rows = new HashMap<Integer, Map<String, Object>>(); // stores the rows keyed by row number + Map<Integer, Map<String, Object>> rows = new HashMap<>(); // stores the rows keyed by row number // first loop through all the keys and create a hashmap for each ${ROW_SUBMIT_PREFIX}${N} = Y for (Map.Entry<String, Object> entry : parameters.entrySet()) { String key = entry.getKey(); // skip everything that is not ${ROW_SUBMIT_PREFIX}N - if (key == null || key.length() <= ROW_SUBMIT_PREFIX_LENGTH) continue; - if (key.indexOf(MULTI_ROW_DELIMITER) <= 0) continue; - if (!key.substring(0, ROW_SUBMIT_PREFIX_LENGTH).equals(ROW_SUBMIT_PREFIX)) continue; - if (!"Y".equals(entry.getValue())) + if (key == null || key.length() <= ROW_SUBMIT_PREFIX_LENGTH) { continue; + } + if (key.indexOf(MULTI_ROW_DELIMITER) <= 0) { + continue; + } + if (!key.substring(0, ROW_SUBMIT_PREFIX_LENGTH).equals(ROW_SUBMIT_PREFIX)) { + continue; + } + if (!"Y".equals(entry.getValue())) { + continue; + } // decode the value of N and create a new map for it Integer n = Integer.decode(key.substring(ROW_SUBMIT_PREFIX_LENGTH, key.length())); - Map<String, Object> m = new HashMap<String, Object>(); + Map<String, Object> m = new HashMap<>(); m.put("row", n); // special "row" = N tuple rows.put(n, m); // key it to N } @@ -1171,15 +1201,23 @@ public final class UtilHttp { for (Map.Entry<String, Object> entry : parameters.entrySet()) { String key = entry.getKey(); // skip keys without DELIMITER and skip ROW_SUBMIT_PREFIX - if (key == null) continue; + if (key == null) { + continue; + } int index = key.indexOf(MULTI_ROW_DELIMITER); - if (index <= 0) continue; - if (key.length() > ROW_SUBMIT_PREFIX_LENGTH && key.substring(0, ROW_SUBMIT_PREFIX_LENGTH).equals(ROW_SUBMIT_PREFIX)) continue; + if (index <= 0) { + continue; + } + if (key.length() > ROW_SUBMIT_PREFIX_LENGTH && key.substring(0, ROW_SUBMIT_PREFIX_LENGTH).equals(ROW_SUBMIT_PREFIX)) { + continue; + } // get the map with index N Integer n = Integer.decode(key.substring(index + MULTI_ROW_DELIMITER_LENGTH, key.length())); // N from ${param}${DELIMITER}${N} Map<String, Object> map = rows.get(n); - if (map == null) continue; + if (map == null) { + continue; + } // get the key without the <DELIMITER>N suffix and store it and its value String newKey = key.substring(0, index); @@ -1194,7 +1232,7 @@ public final class UtilHttp { * multi form parameters (usually named according to the ${param}_o_N notation). */ public static <V> Map<String, V> removeMultiFormParameters(Map<String, V> parameters) { - Map<String, V> filteredParameters = new HashMap<String, V>(); + Map<String, V> filteredParameters = new HashMap<>(); for (Map.Entry<String, V> entry : parameters.entrySet()) { String key = entry.getKey(); if (key != null && (key.indexOf(MULTI_ROW_DELIMITER) != -1 || key.indexOf("_useRowSubmit") != -1 || key.indexOf("_rowCount") != -1)) { @@ -1245,13 +1283,17 @@ public final class UtilHttp { */ public static Object makeParamValueFromComposite(HttpServletRequest request, String prefix, Locale locale) { String compositeType = request.getParameter(makeCompositeParam(prefix, "compositeType")); - if (UtilValidate.isEmpty(compositeType)) return null; + if (UtilValidate.isEmpty(compositeType)) { + return null; + } // collect the composite fields into a map - Map<String, String> data = new HashMap<String, String>(); + Map<String, String> data = new HashMap<>(); for (Enumeration<String> names = UtilGenerics.cast(request.getParameterNames()); names.hasMoreElements();) { String name = names.nextElement(); - if (!name.startsWith(prefix + COMPOSITE_DELIMITER)) continue; + if (!name.startsWith(prefix + COMPOSITE_DELIMITER)) { + continue; + } // extract the suffix of the composite name String suffix = name.substring(name.indexOf(COMPOSITE_DELIMITER) + COMPOSITE_DELIMITER_LENGTH); @@ -1270,9 +1312,15 @@ public final class UtilHttp { String hour = data.get("hour"); String minutes = data.get("minutes"); String ampm = data.get("ampm"); - if (date == null || date.length() < 10) return null; - if (UtilValidate.isEmpty(hour)) return null; - if (UtilValidate.isEmpty(minutes)) return null; + if (date == null || date.length() < 10) { + return null; + } + if (UtilValidate.isEmpty(hour)) { + return null; + } + if (UtilValidate.isEmpty(minutes)) { + return null; + } boolean isTwelveHour = UtilValidate.isNotEmpty(ampm); // create the timestamp from the data @@ -1283,8 +1331,12 @@ public final class UtilHttp { cal.setTime(timestamp); if (isTwelveHour) { boolean isAM = ("AM".equals(ampm) ? true : false); - if (isAM && h == 12) h = 0; - if (!isAM && h < 12) h += 12; + if (isAM && h == 12) { + h = 0; + } + if (!isAM && h < 12) { + h += 12; + } } cal.set(Calendar.HOUR_OF_DAY, h); cal.set(Calendar.MINUTE, Integer.parseInt(minutes)); @@ -1317,27 +1369,25 @@ public final class UtilHttp { if (UtilValidate.isNotEmpty(spiderRequest)) { if ("Y".equals(spiderRequest)) { return true; - } else { - return false; } - } else { - String initialUserAgent = request.getHeader("User-Agent") != null ? request.getHeader("User-Agent") : ""; - List<String> spiderList = StringUtil.split(UtilProperties.getPropertyValue("url", "link.remove_lsessionid.user_agent_list"), ","); + return false; + } + String initialUserAgent = request.getHeader("User-Agent") != null ? request.getHeader("User-Agent") : ""; + List<String> spiderList = StringUtil.split(UtilProperties.getPropertyValue("url", "link.remove_lsessionid.user_agent_list"), ","); - if (UtilValidate.isNotEmpty(spiderList)) { - for (String spiderNameElement : spiderList) { - Pattern pattern = null; - try { - pattern = PatternFactory.createOrGetPerl5CompiledPattern(spiderNameElement, false); - } catch (MalformedPatternException e) { - Debug.logError(e, module); - } - PatternMatcher matcher = new Perl5Matcher(); - if (matcher.contains(initialUserAgent, pattern)) { - request.setAttribute("_REQUEST_FROM_SPIDER_", "Y"); - result = true; - break; - } + if (UtilValidate.isNotEmpty(spiderList)) { + for (String spiderNameElement : spiderList) { + Pattern pattern = null; + try { + pattern = PatternFactory.createOrGetPerl5CompiledPattern(spiderNameElement, false); + } catch (MalformedPatternException e) { + Debug.logError(e, module); + } + PatternMatcher matcher = new Perl5Matcher(); + if (matcher.contains(initialUserAgent, pattern)) { + request.setAttribute("_REQUEST_FROM_SPIDER_", "Y"); + result = true; + break; } } } @@ -1403,7 +1453,7 @@ public final class UtilHttp { HttpSession session = request.getSession(); Map<String, Map<String, Object>> paramMapStore = UtilGenerics.checkMap(session.getAttribute("_PARAM_MAP_STORE_")); if (paramMapStore == null) { - paramMapStore = new HashMap<String, Map<String, Object>>(); + paramMapStore = new HashMap<>(); session.setAttribute("_PARAM_MAP_STORE_", paramMapStore); } Map<String, Object> parameters = getParameterMap(request); Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilIO.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilIO.java?rev=1818495&r1=1818494&r2=1818495&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilIO.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilIO.java Sun Dec 17 16:57:56 2017 @@ -53,10 +53,14 @@ public final class UtilIO { try { IOUtils.copy(in, out); } finally { - if (closeIn) IOUtils.closeQuietly(in); + if (closeIn) { + IOUtils.closeQuietly(in); + } } } finally { - if (closeOut) IOUtils.closeQuietly(out); + if (closeOut) { + IOUtils.closeQuietly(out); + } } } @@ -74,10 +78,14 @@ public final class UtilIO { try { IOUtils.copy(reader, writer); } finally { - if (closeIn) IOUtils.closeQuietly(reader); + if (closeIn) { + IOUtils.closeQuietly(reader); + } } } finally { - if (closeOut) IOUtils.closeQuietly(writer); + if (closeOut) { + IOUtils.closeQuietly(writer); + } } } @@ -97,7 +105,9 @@ public final class UtilIO { out.append(buffer); } } finally { - if (closeIn) IOUtils.closeQuietly(reader); + if (closeIn) { + IOUtils.closeQuietly(reader); + } } } @@ -108,7 +118,7 @@ public final class UtilIO { * @return the converted string, with platform line endings converted * to \n */ - public static final String readString(byte[] bytes) throws IOException { + public static final String readString(byte[] bytes) { return readString(bytes, 0, bytes.length, UTF8); } @@ -122,7 +132,7 @@ public final class UtilIO { * @return the converted string, with platform line endings converted * to \n */ - public static final String readString(byte[] bytes, int offset, int length) throws IOException { + public static final String readString(byte[] bytes, int offset, int length) { return readString(bytes, offset, length, UTF8); } @@ -135,7 +145,7 @@ public final class UtilIO { * @return the converted string, with platform line endings converted * to \n */ - public static final String readString(byte[] bytes, String charset) throws IOException { + public static final String readString(byte[] bytes, String charset) { return readString(bytes, 0, bytes.length, Charset.forName(charset)); } @@ -151,7 +161,7 @@ public final class UtilIO { * @return the converted string, with platform line endings converted * to \n */ - public static final String readString(byte[] bytes, int offset, int length, String charset) throws IOException { + public static final String readString(byte[] bytes, int offset, int length, String charset) { return readString(bytes, 0, bytes.length, Charset.forName(charset)); } @@ -163,7 +173,7 @@ public final class UtilIO { * @return the converted string, with platform line endings converted * to \n */ - public static final String readString(byte[] bytes, Charset charset) throws IOException { + public static final String readString(byte[] bytes, Charset charset) { return readString(bytes, 0, bytes.length, charset); } @@ -179,7 +189,7 @@ public final class UtilIO { * @return the converted string, with platform line endings converted * to \n */ - public static final String readString(byte[] bytes, int offset, int length, Charset charset) throws IOException { + public static final String readString(byte[] bytes, int offset, int length, Charset charset) { ByteBuffer buf = ByteBuffer.allocate(length); buf.put(bytes, offset, length); buf.flip(); @@ -299,7 +309,7 @@ public final class UtilIO { * @param out where to write the converted bytes to * @param charset the charset to use to convert the raw bytes * @param value the value to write - * @throws IOException + * @throws IOException */ public static void writeString(OutputStream out, Charset charset, String value) throws IOException { try (Writer writer = new OutputStreamWriter(out, charset)) { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilJavaParse.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilJavaParse.java?rev=1818495&r1=1818494&r2=1818495&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilJavaParse.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilJavaParse.java Sun Dec 17 16:57:56 2017 @@ -37,8 +37,8 @@ public final class UtilJavaParse { public static final String module = UtilJavaParse.class.getName(); // FIXME: Not thread safe - private static Set<String> serviceMethodNames = new HashSet<String>(); - private static Set<String> entityMethodNames = new HashSet<String>(); + private static Set<String> serviceMethodNames = new HashSet<>(); + private static Set<String> entityMethodNames = new HashSet<>(); static { serviceMethodNames.add("runSync"); serviceMethodNames.add("runSyncIgnore"); @@ -48,7 +48,7 @@ public final class UtilJavaParse { serviceMethodNames.add("schedule"); // NOTE: the service name may be the 1st, 2nd or 3rd param for variations on this serviceMethodNames.add("addRollbackService"); serviceMethodNames.add("addCommitService"); - + entityMethodNames.add("getModelEntity"); entityMethodNames.add("getEntityGroupName"); entityMethodNames.add("getModelEntityMapByGroup"); @@ -101,7 +101,9 @@ public final class UtilJavaParse { Collection<ComponentConfig> allComponentConfigs = ComponentConfig.getAllComponents(); for (ComponentConfig cc: allComponentConfigs) { String rootDirectory = cc.getRootLocation(); - if (!rootDirectory.endsWith(File.separatorChar + "")) rootDirectory += File.separatorChar; + if (!rootDirectory.endsWith(File.separatorChar + "")) { + rootDirectory += File.separatorChar; + } rootDirectory += "src" + File.separatorChar; File rootDirFile = new File(rootDirectory); @@ -120,7 +122,9 @@ public final class UtilJavaParse { String fullPathAndFile = classDir + File.separatorChar + classFileName; File classFile = new File(fullPathAndFile); if (classFile.exists()) { - if (Debug.verboseOn()) Debug.logVerbose("In findRealPathAndFileForClass for [" + fullyQualifiedClassName + "]: [" + fullPathAndFile + "]", module); + if (Debug.verboseOn()) { + Debug.logVerbose("In findRealPathAndFileForClass for [" + fullyQualifiedClassName + "]: [" + fullPathAndFile + "]", module); + } return fullPathAndFile; } } @@ -129,28 +133,41 @@ public final class UtilJavaParse { } public static int findServiceMethodBlockStart(String methodName, String javaFile) { - if (Debug.verboseOn()) Debug.logVerbose("In findServiceMethodBlockStart for " + methodName, module); + if (Debug.verboseOn()) { + Debug.logVerbose("In findServiceMethodBlockStart for " + methodName, module); + } // starts with something like this: public static Map exportServiceEoModelBundle(DispatchContext dctx, Map context) { // start with the main pattern int methodNameIndex = javaFile.indexOf("public static Map " + methodName + "(DispatchContext dctx, Map context) {"); // try a little less... and some nice messy variations... - if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + "(DispatchContext "); - if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + "(DispatchContext "); - if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + " (DispatchContext "); - if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + "(DispatchContext "); - if (methodNameIndex < 0) methodNameIndex = javaFile.indexOf(" Map " + methodName + " (DispatchContext "); + if (methodNameIndex < 0) { + methodNameIndex = javaFile.indexOf(" Map " + methodName + "(DispatchContext "); + } + if (methodNameIndex < 0) { + methodNameIndex = javaFile.indexOf(" Map " + methodName + "(DispatchContext "); + } + if (methodNameIndex < 0) { + methodNameIndex = javaFile.indexOf(" Map " + methodName + " (DispatchContext "); + } + if (methodNameIndex < 0) { + methodNameIndex = javaFile.indexOf(" Map " + methodName + "(DispatchContext "); + } + if (methodNameIndex < 0) { + methodNameIndex = javaFile.indexOf(" Map " + methodName + " (DispatchContext "); + } // not found! - if (methodNameIndex < 0) return -1; + if (methodNameIndex < 0) { + return -1; + } // find the open brace and return its position return javaFile.indexOf("{", methodNameIndex); } public static int findEndOfBlock(int blockStart, String javaFile) { - //Debug.logInfo("In findEndOfBlock for blockStart " + blockStart, module); int nextOpen = javaFile.indexOf("{", blockStart+1); int nextClose = javaFile.indexOf("}", blockStart+1); @@ -158,11 +175,15 @@ public final class UtilJavaParse { javaFile = javaFile.substring(nextOpen, nextClose); } // if no close, end with couldn't find - if (nextClose < 0) return -1; + if (nextClose < 0) { + return -1; + } // while nextOpen is found and is before the next close, then recurse (list while (nextOpen > -1 && nextOpen < nextClose) { int endOfSubBlock = findEndOfBlock(nextOpen, javaFile); - if (endOfSubBlock < 0) return -1; + if (endOfSubBlock < 0) { + return -1; + } nextOpen = javaFile.indexOf("{", endOfSubBlock+1); nextClose = javaFile.indexOf("}", endOfSubBlock+1); } @@ -172,7 +193,7 @@ public final class UtilJavaParse { } public static Set<String> findServiceCallsInBlock(int blockStart, int blockEnd, String javaFile) { - Set<String> serviceNameSet = new HashSet<String>(); + Set<String> serviceNameSet = new HashSet<>(); int dispatcherIndex = javaFile.indexOf("dispatcher.", blockStart+1); while (dispatcherIndex > 0 && dispatcherIndex < blockEnd) { @@ -197,7 +218,7 @@ public final class UtilJavaParse { } public static Set<String> findEntityUseInBlock(int blockStart, int blockEnd, String javaFile) { - Set<String> entityNameSet = new HashSet<String>(); + Set<String> entityNameSet = new HashSet<>(); int delegatorIndex = javaFile.indexOf("delegator.", blockStart+1); while (delegatorIndex > 0 && delegatorIndex < blockEnd) { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |