[ofbiz-framework] branch trunk updated: Improved: Corrected all checkstyle formatting issues: Line has trailing spaces in framework component. (OFBIZ-11880) Thanks Jacques for review.
Locked
 
|
This is an automated email from the ASF dual-hosted git repository.
surajk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new 0c37e80 Improved: Corrected all checkstyle formatting issues: Line has trailing spaces in framework component. (OFBIZ-11880) Thanks Jacques for review. 0c37e80 is described below commit 0c37e800360c0e0f3046cb8524111f1384930f42 Author: Suraj Khurana <[hidden email]> AuthorDate: Mon Jul 13 14:18:24 2020 +0530 Improved: Corrected all checkstyle formatting issues: Line has trailing spaces in framework component. (OFBIZ-11880) Thanks Jacques for review. --- .../apache/ofbiz/base/crypto/BlowFishCrypt.java | 2 +- .../ofbiz/base/html/CustomPermissivePolicy.java | 4 +- .../apache/ofbiz/base/html/CustomSafePolicy.java | 4 +- .../java/org/apache/ofbiz/base/util/FileUtil.java | 8 ++-- .../org/apache/ofbiz/base/util/ObjectType.java | 11 ++---- .../java/org/apache/ofbiz/base/util/SSLUtil.java | 2 +- .../java/org/apache/ofbiz/base/util/UtilCodec.java | 33 ++++++++--------- .../java/org/apache/ofbiz/base/util/UtilHttp.java | 6 +-- .../java/org/apache/ofbiz/base/util/UtilMisc.java | 2 +- .../org/apache/ofbiz/base/util/UtilNumber.java | 4 +- .../org/apache/ofbiz/base/util/UtilProperties.java | 2 +- .../java/org/apache/ofbiz/base/util/UtilXml.java | 22 +++++------ .../ofbiz/base/util/collections/MapComparator.java | 2 +- .../ofbiz/base/util/template/XslTransform.java | 4 +- .../org/apache/ofbiz/common/CommonServices.java | 2 +- .../ofbiz/common/JsLanguageFileMappingCreator.java | 2 +- .../apache/ofbiz/common/email/EmailServices.java | 17 ++++----- .../org/apache/ofbiz/common/geo/GeoWorker.java | 2 +- .../apache/ofbiz/common/login/LoginServices.java | 2 +- .../apache/ofbiz/common/qrcode/QRCodeServices.java | 3 +- .../ofbiz/common/scripting/ContextHelper.java | 3 -- .../ofbiz/entity/condition/EntityWhereString.java | 2 +- .../org/apache/ofbiz/entity/jdbc/DatabaseUtil.java | 2 +- .../apache/ofbiz/entity/jdbc/JdbcValueHandler.java | 8 +--- .../org/apache/ofbiz/entity/model/ModelEntity.java | 2 +- .../org/apache/ofbiz/entity/model/ModelField.java | 4 -- .../org/apache/ofbiz/entity/model/ModelIndex.java | 2 - .../org/apache/ofbiz/entity/model/ModelInfo.java | 2 - .../org/apache/ofbiz/entity/model/ModelReader.java | 4 -- .../apache/ofbiz/entity/model/ModelRelation.java | 2 - .../ofbiz/entity/test/EntityQueryTestSuite.java | 8 ++-- .../ofbiz/entity/util/EntityFindOptions.java | 2 +- .../ofbiz/entity/util/EntityListIterator.java | 6 --- .../org/apache/ofbiz/entity/util/EntityQuery.java | 39 ++------------------ .../ofbiz/entity/util/EntityStoreOptions.java | 3 -- .../org/apache/ofbiz/entity/util/EntityUtil.java | 2 +- .../ofbiz/entity/util/EntityUtilProperties.java | 2 +- .../ofbiz/entityext/eca/EntityEcaCondition.java | 3 +- .../permission/EntityPermissionChecker.java | 4 +- .../synchronization/EntitySyncContext.java | 3 +- .../org/apache/ofbiz/minilang/MiniLangUtil.java | 5 --- .../apache/ofbiz/minilang/MiniLangValidate.java | 43 +++++++--------------- .../org/apache/ofbiz/minilang/SimpleMethod.java | 1 - .../apache/ofbiz/minilang/SimpleServiceEngine.java | 2 - .../ofbiz/minilang/method/MethodContext.java | 3 -- .../ofbiz/minilang/method/MethodOperation.java | 1 - .../ofbiz/minilang/method/conditional/Compare.java | 3 +- .../conditional/ValidateMethodCondition.java | 1 - .../method/entityops/ClearEntityCaches.java | 1 - .../ofbiz/minilang/method/entityops/EntityOne.java | 1 - .../minilang/method/entityops/GetRelated.java | 1 - .../minilang/method/entityops/GetRelatedOne.java | 1 - .../minilang/method/entityops/MakeNextSeqId.java | 1 - .../minilang/method/entityops/RemoveByAnd.java | 1 - .../method/entityops/TransactionCommit.java | 1 - .../method/entityops/TransactionRollback.java | 1 - .../apache/ofbiz/minilang/method/envops/While.java | 1 - .../ofbiz/minilang/method/otherops/Calculate.java | 2 - .../ofbiz/service/LocalDispatcherFactory.java | 1 - .../service/config/ServiceConfigListener.java | 1 - .../ofbiz/service/config/ServiceConfigUtil.java | 8 ++-- .../ofbiz/service/config/model/Notification.java | 2 +- .../ofbiz/service/engine/EntityAutoEngine.java | 4 +- .../org/apache/ofbiz/service/job/JobServices.java | 2 +- .../ofbiz/service/rmi/RmiServiceContainer.java | 2 +- .../ofbiz/service/test/ServiceEntityAutoTests.java | 2 +- .../ofbiz/testtools/EntityXmlAssertTest.java | 2 +- .../org/apache/ofbiz/testtools/ServiceTest.java | 2 +- .../org/apache/ofbiz/webapp/OfbizUrlBuilder.java | 7 +--- .../java/org/apache/ofbiz/webapp/WebAppUtil.java | 5 --- .../apache/ofbiz/webapp/control/JWTManager.java | 4 +- .../apache/ofbiz/webapp/control/LoginWorker.java | 4 +- .../ofbiz/webapp/control/RequestHandler.java | 12 +++--- .../ofbiz/webapp/control/SameSiteFilter.java | 2 +- .../apache/ofbiz/webapp/control/TokenFilter.java | 6 +-- .../org/apache/ofbiz/webapp/event/CoreEvents.java | 2 +- .../ofbiz/webapp/ftl/OfbizCurrencyTransform.java | 2 +- .../apache/ofbiz/webapp/stats/ServerHitBin.java | 6 +-- .../apache/ofbiz/webapp/view/ApacheFopWorker.java | 4 -- .../apache/ofbiz/webapp/webdav/ResponseHelper.java | 2 +- .../ofbiz/webapp/website/WebSiteProperties.java | 2 - .../apache/ofbiz/webtools/WebToolsServices.java | 8 ++-- .../ofbiz/webtools/artifactinfo/RunTestEvents.java | 2 +- .../webtools/labelmanager/LabelManagerFactory.java | 10 ++--- .../webtools/labelmanager/SaveLabelsToXmlFile.java | 2 +- .../org/apache/ofbiz/widget/WidgetFactory.java | 2 - .../java/org/apache/ofbiz/widget/WidgetWorker.java | 2 +- .../widget/artifact/ArtifactInfoGatherer.java | 6 +-- .../ofbiz/widget/model/AbstractModelAction.java | 2 - .../apache/ofbiz/widget/model/ModelFormField.java | 10 ++--- .../apache/ofbiz/widget/model/ModelMenuAction.java | 2 +- .../ofbiz/widget/portal/PortalPageWorker.java | 7 ++-- .../apache/ofbiz/widget/renderer/FormRenderer.java | 2 +- .../ofbiz/widget/renderer/ScreenRenderer.java | 2 +- .../widget/renderer/html/HtmlTreeRenderer.java | 2 +- .../widget/renderer/macro/MacroFormRenderer.java | 4 +- .../widget/renderer/macro/MacroScreenRenderer.java | 2 +- .../widget/renderer/macro/MacroTreeRenderer.java | 2 +- 98 files changed, 158 insertions(+), 300 deletions(-) diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/BlowFishCrypt.java b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/BlowFishCrypt.java index 0501319..1111416 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/BlowFishCrypt.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/BlowFishCrypt.java @@ -159,7 +159,7 @@ public class BlowFishCrypt { byte[] key = generateKey(); if (testKey(key)) { - try (FileOutputStream fos = new FileOutputStream(args[0]); + try (FileOutputStream fos = new FileOutputStream(args[0]); ObjectOutputStream os = new ObjectOutputStream(fos)) { String keyString = new String(key, StandardCharsets.UTF_8); os.writeObject(keyString); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java b/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java index fca5c22..d07455b 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java @@ -138,7 +138,7 @@ public class CustomPermissivePolicy implements SanitizerCustomPolicy { .onElements("table") .allowAttributes("noresize").matching(Pattern.compile("(?i)noresize")) .onElements("table") - .allowAttributes("bgcolor").matching(COLOR_NAME_OR_COLOR_CODE) + .allowAttributes("bgcolor").matching(COLOR_NAME_OR_COLOR_CODE) .onElements("td", "th") .allowAttributes("abbr").matching(PARAGRAPH) .onElements("td", "th") @@ -156,7 +156,7 @@ public class CustomPermissivePolicy implements SanitizerCustomPolicy { .allowAttributes("valign").matching(VALIGN) .onElements("thead", "tbody", "tfoot", "td", "th", "tr", "colgroup", "col") .allowAttributes("charoff").matching(NUMBER_OR_PERCENT) - .onElements("td", "th", "tr", "colgroup", "col","thead", "tbody", "tfoot") + .onElements("td", "th", "tr", "colgroup", "col", "thead", "tbody", "tfoot") .allowAttributes("char").matching(ONE_CHAR) .onElements("td", "th", "tr", "colgroup", "col", "thead", "tbody", "tfoot") .allowAttributes("colspan", "rowspan").matching(NUMBER) diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java b/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java index 59ea32a..68562ff 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java @@ -61,9 +61,9 @@ public class CustomSafePolicy implements SanitizerCustomPolicy { .matching(true, "center", "left", "right", "justify", "char") .onElements("p") // These elements are allowed. - .allowElements("a", "p", "div", "i", "b", "em", "blockquote", "tt", "strong","br", "ul", "ol", "li") + .allowElements("a", "p", "div", "i", "b", "em", "blockquote", "tt", "strong", "br", "ul", "ol", "li") .toFactory(); - + @Override public PolicyFactory getSanitizerPolicy() { return POLICY_DEFINITION; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java index dc5749a..67c6d06 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java @@ -488,7 +488,6 @@ public final class FileUtil { zis.closeEntry(); zis.close(); } - /** * Creates a File with a normalized file path * This useful to prevent path traversal security issues @@ -498,9 +497,8 @@ public final class FileUtil { * @return A File with a normalized file path */ public static File createFileWithNormalizedPath(String filePath) { - return new File(filePath).toPath().normalize().toFile(); + return new File(filePath).toPath().normalize().toFile(); } - /** * Normalizes a file path * This useful to prevent path traversal security issues @@ -509,7 +507,7 @@ public final class FileUtil { * @return A normalized file path */ public static String normalizeFilePath(String filePath) { - return createFileWithNormalizedPath(filePath).toString(); + return createFileWithNormalizedPath(filePath).toString(); } - + } diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java index dce2e3f..f7e74ff 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java @@ -155,7 +155,7 @@ public class ObjectType { * @throws ClassNotFoundException * @throws InstantiationException * @throws IllegalAccessException - * @throws NoSuchMethodException + * @throws NoSuchMethodException * @throws InvocationTargetException */ public static Object getInstance(String className) throws ClassNotFoundException, InstantiationException, @@ -256,19 +256,14 @@ public class ObjectType { } /** - * Converts the passed object to the named type. + * Converts the passed object to the named type. * Initially created for only simple types but actually handle more types and not all simple types. * See ObjectTypeTests class for more, and (normally) up to date information - * - * Supported types: + * Supported types: * - All primitives - * * - Simple types: String, Boolean, Double, Float, Long, Integer, BigDecimal. - * * - Other Objects: List, Map, Set, Calendar, Date (java.sql.Date), Time, Timestamp, TimeZone, Date (util.Date and sql.Date) - * * - Simple types (maybe) not handled: Short, BigInteger, Byte, Character, ObjectName and Void... - * * @param obj Object to convert * @param type Optional Java class name of type to convert to. A <code>null</code> or empty <code>String</code> will return the original object. * @param format Optional (can be null) format string for Date, Time, Timestamp diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java index 732bb74..22a8953 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java @@ -310,7 +310,7 @@ public final class SSLUtil { } if (debug) { - System.setProperty("javax.net.debug","ssl:handshake"); + System.setProperty("javax.net.debug", "ssl:handshake"); } loadedProps = true; } diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java index 58fbd34..0eed5c5 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java @@ -121,7 +121,7 @@ public class UtilCodec { * This method will start a configurable sanitizing process. The sanitizer can * be turns off through "sanitizer.enable=false", the default value is true. It * is possible to configure a custom policy using the properties - * "sanitizer.permissive.policy" and "sanitizer.custom.permissive.policy.class". + * "sanitizer.permissive.policy" and "sanitizer.custom.permissive.policy.class". * The custom policy has to implement * {@link org.apache.ofbiz.base.html.SanitizerCustomPolicy}. * @@ -177,9 +177,9 @@ public class UtilCodec { // 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. - // Note that I was unable to render </html> and </body>. I guess because <html> and <body> + // 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... + // 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. // If you want another example: https://android.googlesource.com/platform/packages/apps/UnifiedEmail/+/ec0fa48/src/com/android/mail/utils/HtmlSanitizer.java @@ -193,7 +193,7 @@ public class UtilCodec { // 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. + // 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 public static final PolicyFactory BIRT_FLEXIBLE_REPORT_POLICY = new HtmlPolicyBuilder() .allowWithoutAttributes("html", "body") @@ -204,7 +204,7 @@ public class UtilCodec { .allowAttributes("cols", "rows").onElements("textarea") .allowAttributes("class").onElements("td") .allowAttributes("method").onElements("form") - .allowAttributes("accept", "action", "accept-charset", "autocomplete", "enctype", "method", + .allowAttributes("accept", "action", "accept-charset", "autocomplete", "enctype", "method", "name", "novalidate", "target").onElements("form") .toFactory(); } @@ -377,7 +377,6 @@ public class UtilCodec { * Uses a black-list approach for necessary characters for HTML. * Does not allow various characters (after canonicalization), including * "<", ">", "&" and "%" (if not followed by a space). - * * Also does not allow js events as in OFBIZ-10054 * * @param valueName field name checked @@ -385,7 +384,7 @@ public class UtilCodec { * @param errorMessageList an empty list passed by and modified in case of issues * @param locale */ - public static String checkStringForHtmlStrictNone(String valueName, String value, List<String> errorMessageList, + public static String checkStringForHtmlStrictNone(String valueName, String value, List<String> errorMessageList, Locale locale) { if (UtilValidate.isEmpty(value)) { return value; @@ -404,7 +403,7 @@ public class UtilCodec { issueMsg = "In field [" + valueName + "] found character escaping (mixed or double) " + "that is not allowed or other format consistency error: "; } else { - issueMsg = UtilProperties.getMessage("SecurityUiLabels","PolicyNoneMixedOrDouble", + issueMsg = UtilProperties.getMessage("SecurityUiLabels", "PolicyNoneMixedOrDouble", UtilMisc.toMap("valueName", valueName), locale); } errorMessageList.add(issueMsg + e.toString()); @@ -416,21 +415,21 @@ public class UtilCodec { if (locale.equals(new Locale("test"))) { issueMsg = "In field [" + valueName + "] less-than (<) and greater-than (>) symbols are not allowed."; } else { - issueMsg = UtilProperties.getMessage("SecurityUiLabels","PolicyNoneLess-thanGreater-than", + issueMsg = UtilProperties.getMessage("SecurityUiLabels", "PolicyNoneLess-thanGreater-than", UtilMisc.toMap("valueName", valueName), locale); } errorMessageList.add(issueMsg); } - + // check for js events String onEvent = "on" + StringUtils.substringBetween(value, " on", "="); - if (jsEventList.stream().anyMatch(str -> StringUtils.containsIgnoreCase(str, onEvent)) + if (jsEventList.stream().anyMatch(str -> StringUtils.containsIgnoreCase(str, onEvent)) || value.contains("seekSegmentTime")) { String issueMsg = null; if (locale.equals(new Locale("test"))) { issueMsg = "In field [" + valueName + "] Javascript events are not allowed."; } else { - issueMsg = UtilProperties.getMessage("SecurityUiLabels","PolicyNoneJsEvents", + issueMsg = UtilProperties.getMessage("SecurityUiLabels", "PolicyNoneJsEvents", UtilMisc.toMap("valueName", valueName), locale); } errorMessageList.add(issueMsg); @@ -442,7 +441,7 @@ public class UtilCodec { // But all our Tomcat connectors use UTF-8 // We don't care about Flash now rather deprecated // AFAIK all others need less-than (<) and greater-than (>) symbols - + return value; } @@ -458,7 +457,7 @@ public class UtilCodec { * @param errorMessageList an empty list passed by and modified in case of issues * @param locale */ - public static String checkStringForHtmlSafe(String valueName, String value, List<String> errorMessageList, + public static String checkStringForHtmlSafe(String valueName, String value, List<String> errorMessageList, Locale locale, boolean enableSanitizer) { if (!enableSanitizer) { return value; @@ -492,16 +491,16 @@ public class UtilCodec { issueMsg = "In field [" + valueName + "] by our input policy, your input has not been accepted " + "for security reason. Please check and modify accordingly, thanks."; } else { - issueMsg = UtilProperties.getMessage("SecurityUiLabels","PolicySafe", + issueMsg = UtilProperties.getMessage("SecurityUiLabels", "PolicySafe", UtilMisc.toMap("valueName", valueName), locale); } errorMessageList.add(issueMsg); } } - + return value; } - + /** * A simple Map wrapper class that will do HTML encoding. * To be used for passing a Map to something that will expand Strings with it as a context, etc. diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java index b2c380c..f1de55a 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java @@ -1125,7 +1125,7 @@ public final class UtilHttp { response.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, private"); // HTTP/1.1 response.setHeader("Pragma", "no-cache"); // HTTP/1.0 } - + public static void setResponseBrowserDefaultSecurityHeaders(HttpServletResponse resp, ConfigXMLReader.ViewMap viewMap) { // See https://cwiki.apache.org/confluence/display/OFBIZ/How+to+Secure+HTTP+Headers for details and how to test String xFrameOption = null; @@ -1154,11 +1154,11 @@ public final class UtilHttp { resp.addHeader("strict-transport-security", "max-age=31536000; includeSubDomains"); } } - + /** The only x-content-type-options defined value, "nosniff", prevents Internet Explorer from MIME-sniffing a response away from the declared content-type. This also applies to Google Chrome, when downloading extensions. */ resp.addHeader("x-content-type-options", "nosniff"); - + /** This header enables the Cross-site scripting (XSS) filter built into most recent web browsers. It's usually enabled by default anyway, so the role of this header is to re-enable the filter for this particular website if it was disabled by the user. This header is supported in IE 8+, and in Chrome (not sure which versions). The anti-XSS filter was added in Chrome 4. Its unknown if that version honored this header. diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java index 799b004..5b7f770 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java @@ -189,7 +189,7 @@ public final class UtilMisc { if (Debug.verboseOn()) { Debug.logVerbose("Found Map value that is not Serializable: " + mapEntry.getKey() + "=" + mapEntry.getValue(), MODULE); } - + } } for (String keyToRemove: keysToRemove) { map.remove(keyToRemove); } diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java index 8eafa6a..5b3b167 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java @@ -187,7 +187,7 @@ public final class UtilNumber { if (UtilValidate.isEmpty(file) || UtilValidate.isEmpty(property)) { return DEFAULT_BD_SCALE; } - + int scale = -1; String value = UtilProperties.getPropertyValue(file, property); try { @@ -336,13 +336,11 @@ public final class UtilNumber { /** * Method to turn a number such as "0.9853" into a nicely formatted percent, "98.53%". - * * @param number The number object to format * @param scale How many places after the decimal to include * @param roundingMode The BigDecimal rounding mode to apply * @return The formatted string or "" if there were errors. * @deprecated Use {@link #toPercentString(Number number, int scale, RoundingMode roundingMode)} instead - * */ @Deprecated public static String toPercentString(Number number, int scale, int roundingMode) { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java index be964bd..1cb6244 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java @@ -530,7 +530,7 @@ public final class UtilProperties implements Serializable { if (bundle.containsKey(name)) { value = bundle.getString(name); } else { - if (Debug.warningOn()) { + if (Debug.warningOn()) { Debug.logWarning(name + " is missing in " + resource + " for locale " + locale, MODULE); } return name; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java index 2c57cf4..bbd3cb1 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java @@ -86,15 +86,15 @@ public final class UtilXml { private static XStream createXStream() { XStream xstream = new XStream(); - /* This method is a pure helper method for XStream 1.4.x. + /* This method is a pure helper method for XStream 1.4.x. * It initializes an XStream instance with a white list of well-known and simple types of the Java runtime * as it is done in XStream 1.5.x by default. This method will do therefore nothing in XStream 1.5 - * and could be removed them - */ - XStream.setupDefaultSecurity(xstream); - /* You may want to enhance the white list created by XStream::setupDefaultSecurity (or by default with XStream 1.5) + * and could be removed them + */ + XStream.setupDefaultSecurity(xstream); + /* You may want to enhance the white list created by XStream::setupDefaultSecurity (or by default with XStream 1.5) * using xstream::allowTypesByWildcard with your own classes - */ + */ return xstream; } @@ -110,7 +110,7 @@ public final class UtilXml { */ public static DOMImplementationLS getDomLsImplementation() throws ClassCastException, ClassNotFoundException, InstantiationException, IllegalAccessException { DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance(); - return (DOMImplementationLS)registry.getDOMImplementation("LS"); + return (DOMImplementationLS) registry.getDOMImplementation("LS"); } /** Returns a <code>LSOutput</code> instance. @@ -1173,7 +1173,7 @@ public final class UtilXml { * @return nodeName */ public static String getNodeNameIgnorePrefix(Node node) { - if (node==null) { + if (node == null) { return null; } String nodeName = node.getNodeName(); @@ -1188,9 +1188,9 @@ public final class UtilXml { * get tag name without any prefix * @param element * @return tagName - */ + */ public static String getTagNameIgnorePrefix(Element element) { - if (element==null) { + if (element == null) { return null; } String tagName = element.getTagName(); @@ -1207,7 +1207,7 @@ public final class UtilXml { * @return The value of the node, depending on its type; see the table Node class */ public static String getAttributeValueIgnorePrefix(Element element, String attributeName) { - if (element==null) { + if (element == null) { return ""; } diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java index 9130407..6578871 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java @@ -48,7 +48,7 @@ public class MapComparator implements Comparator<Map<Object, Object>> { */ @Override public boolean equals(Object obj) { - if (obj==null) { + if (obj == null) { return false; } return obj.equals(this); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java index 9c4ed51..21be661 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java @@ -113,7 +113,7 @@ public final class XslTransform { if (translet == null) { String templateUrl = (String) context.get("templateUrl"); String templateString = (String) context.get("templateString"); - Document templateDocument = (Document)context.get("templateDocument"); + Document templateDocument = (Document) context.get("templateDocument"); Source templateSource = getSource(templateDocument, templateUrl, templateString); translet = tFactory.newTemplates(templateSource); if (UtilValidate.isNotEmpty(templateName)) { @@ -134,7 +134,7 @@ public final class XslTransform { String inputUrl = (String) context.get("inputUrl"); String inputString = (String) context.get("inputString"); - Document inputDocument = (Document)context.get("inputDocument"); + Document inputDocument = (Document) context.get("inputDocument"); Source inputSource = getSource(inputDocument, inputUrl, inputString); transformer.transform(inputSource, outputResult); diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java index c7f838c..a27c82f 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java @@ -530,7 +530,7 @@ public class CommonServices { public static Map<String, Object> resetMetric(DispatchContext dctx, Map<String, ?> context) { String originalName = (String) context.get("name"); - Locale locale = (Locale)context.get("locale"); + Locale locale = (Locale) context.get("locale"); String name = UtilCodec.getDecoder("url").decode(originalName); if (name == null) { return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonExceptionThrownWhileDecodingMetric", UtilMisc.toMap("originalName", originalName), locale)); diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java b/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java index d9d17be..4245920 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java @@ -225,7 +225,7 @@ public class JsLanguageFileMappingCreator { } catch (IOException | TemplateException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage("CommonUiLabels", "CommonOutputFileCouldNotBeCreated", UtilMisc.toMap("errorString", e.getMessage()), (Locale)context.get("locale"))); + return ServiceUtil.returnError(UtilProperties.getMessage("CommonUiLabels", "CommonOutputFileCouldNotBeCreated", UtilMisc.toMap("errorString", e.getMessage()), (Locale) context.get("locale"))); } return result; diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java index 112a6b7..803448c 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java @@ -118,7 +118,7 @@ public class EmailServices { results.put("communicationEventId", communicationEventId); results.put("partyId", partyId); results.put("subject", subject); - + if (UtilValidate.isNotEmpty(orderId)) { results.put("orderId", orderId); } @@ -566,12 +566,12 @@ public class EmailServices { // store in the list of maps for sendmail.... bodyParts.add(UtilMisc.<String, Object>toMap("content", baos.toByteArray(), "type", attachmentType, "filename", attachmentName)); - + } catch (GeneralException|IOException|SAXException|ParserConfigurationException |TemplateException ge) { Debug.logError(ge, "Error rendering PDF attachment for email: " + ge.toString(), MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "CommonEmailSendRenderingScreenPdfError", UtilMisc.toMap("errorString", ge.toString()), locale)); } - + serviceContext.put("bodyParts", bodyParts); } } else { @@ -603,14 +603,13 @@ public class EmailServices { serviceContext.put("partyId", partyId); if (UtilValidate.isNotEmpty(orderId)) { serviceContext.put("orderId", orderId); - } + } if (UtilValidate.isNotEmpty(returnId)) { serviceContext.put("returnId", returnId); } if (UtilValidate.isNotEmpty(custRequestId)) { serviceContext.put("custRequestId", custRequestId); - } - + } if (Debug.verboseOn()) { Debug.logVerbose("sendMailFromScreen sendMail context: " + serviceContext, MODULE); } @@ -646,13 +645,13 @@ public class EmailServices { result.put("communicationEventId", sendMailResult.get("communicationEventId")); if (UtilValidate.isNotEmpty(orderId)) { result.put("orderId", orderId); - } + } if (UtilValidate.isNotEmpty(returnId)) { result.put("returnId", returnId); } if (UtilValidate.isNotEmpty(custRequestId)) { result.put("custRequestId", custRequestId); - } + } return result; } @@ -665,7 +664,7 @@ public class EmailServices { */ public static Map<String, Object> sendMailHiddenInLogFromScreen(DispatchContext dctx, Map<String, ? extends Object> rServiceContext) { Map<String, Object> serviceContext = UtilMisc.makeMapWritable(rServiceContext); - serviceContext.put("hideInLog", true); + serviceContext.put("hideInLog", true); return sendMailFromScreen(dctx, serviceContext); } public static void sendFailureNotification(DispatchContext dctx, Map<String, ? extends Object> context, MimeMessage message, List<SMTPAddressFailedException> failures) { diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java b/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java index d3ddf8d..bac6c64 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java @@ -76,7 +76,7 @@ public final class GeoWorker { } geoList.addAll(expandGeoGroup(nextGeo)); } - } + } return geoList; } diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java index 5ac8d9d..d7948ae 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java @@ -607,7 +607,7 @@ public class LoginServices { } // save this password in history - GenericValue userLoginPwdHistToCreate = delegator.makeValue("UserLoginPasswordHistory", UtilMisc.toMap("userLoginId", userLoginId,"fromDate", nowTimestamp)); + GenericValue userLoginPwdHistToCreate = delegator.makeValue("UserLoginPasswordHistory", UtilMisc.toMap("userLoginId", userLoginId, "fromDate", nowTimestamp)); userLoginPwdHistToCreate.set("currentPassword", currentPassword); userLoginPwdHistToCreate.create(); } diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java index 2a3a8de..7e2dd16 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java @@ -98,7 +98,7 @@ public class QRCodeServices { height = Integer.parseInt(EntityUtilProperties.getPropertyValue("qrcode", "qrcode.default.height", "200", delegator)); } if (height < MIN_SIZE || height > MAX_SIZE) { - return ServiceUtil.returnError(UtilProperties.getMessage("QRCodeUiLabels", "SizeOutOfBorderError", + return ServiceUtil.returnError(UtilProperties.getMessage("QRCodeUiLabels", "SizeOutOfBorderError", new Object[] { "height", String.valueOf(height), String.valueOf(MIN_SIZE), String.valueOf(MAX_SIZE) }, locale)); } if (UtilValidate.isEmpty(format)) { @@ -214,7 +214,6 @@ public class QRCodeServices { /** * Renders a {@link BitMatrix} as an image, where "false" bits are rendered * as white, and "true" bits are rendered as black. - * * This is to replace MatrixToImageWriter.toBufferedImage(bitMatrix) if you * find the output image is not right, you can change BufferedImage image = * new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); to diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java b/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java index 8a328b2..cf8d29e 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java @@ -98,7 +98,6 @@ public final class ContextHelper { * Map members and the "[]" (bracket) syntax to access List entries. This value is * expanded, supporting the insertion of other environment values using the "${}" * notation. - * * @param key * The name of the environment value to get. Can contain "." and "[]" * syntax elements as described above. @@ -221,7 +220,6 @@ public final class ContextHelper { * sign) is included inside the square brackets before the index number the value will * inserted/added at that index instead of set at that index. This value is expanded, * supporting the insertion of other environment values using the "${}" notation. - * * @param key * The name of the environment value to get. Can contain "." syntax * elements as described above. @@ -259,7 +257,6 @@ public final class ContextHelper { * access Map members and the "[]" (bracket) syntax to access List entries. This value * is expanded, supporting the insertion of other environment values using the "${}" * notation. - * * @param key * The name of the environment value to get. Can contain "." syntax * elements as described above. diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java index b735b5a..4a2a651 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityWhereString.java @@ -66,7 +66,7 @@ public final class EntityWhereString implements EntityCondition { } @Override - public void checkCondition(ModelEntity modelEntity) throws GenericModelException {// no nothing, this is always assumed to be fine... could do funky SQL syntax checking, but hey this is a HACK anyway + public void checkCondition(ModelEntity modelEntity) throws GenericModelException { // no nothing, this is always assumed to be fine... could do funky SQL syntax checking, but hey this is a HACK anyway } @Override diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java index 96d2c72..43de9b9 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java @@ -227,7 +227,7 @@ public class DatabaseUtil { String entMessage = "(" + timer.timeSinceLast() + "ms) NOT Checking #" + curEnt + "/" + totalEnt + " View Entity " + entity.getEntityName(); Debug.logVerbose(entMessage, MODULE); if (messages != null) messages.add(entMessage); - continue; + continue; // if never-check is set then don't check it either } else if (entity.getNeverCheck()) { String entMessage = "(" + timer.timeSinceLast() + "ms) NOT Checking #" + curEnt + "/" + totalEnt + " Entity " + entity.getEntityName(); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java index 4816840..22a0e96 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java @@ -164,7 +164,6 @@ public abstract class JdbcValueHandler<T> { /** Returns the <code>JdbcValueHandler</code> that corresponds to a field * type. - * * @param javaType The Java type specified in fieldtype*.xml * @param sqlType The SQL type specified in fieldtype*.xml * @return A <code>JdbcValueHandler</code> instance @@ -214,7 +213,6 @@ public abstract class JdbcValueHandler<T> { * type. Subclasses override this method to cast <code>obj</code> * to the correct data type and call the appropriate * <code>PreparedStatement.setXxx</code> method. - * * @param ps * @param parameterIndex * @param obj @@ -241,7 +239,6 @@ public abstract class JdbcValueHandler<T> { /** Returns a value from a <code>ResultSet</code>. The returned * object is converted to the Java data type specified in the fieldtype * file. - * * @param rs the ResultSet object * @param columnIndex the column index * @return get value from result set @@ -262,7 +259,6 @@ public abstract class JdbcValueHandler<T> { /** Sets a value in a <code>PreparedStatement</code>. The * <code>obj</code> argument is converted to the correct data * type. - * * @param ps * @param parameterIndex * @param obj @@ -441,7 +437,7 @@ public abstract class JdbcValueHandler<T> { return null; } try (Reader clobReader = clob.getCharacterStream()) { - + int clobLength = (int) clob.length(); char[] charBuffer = new char[clobLength]; int offset = 0; @@ -612,7 +608,7 @@ public abstract class JdbcValueHandler<T> { public Object getValue(ResultSet rs, int columnIndex) throws SQLException { ObjectInputStream in = null; try (InputStream bis = rs.getBinaryStream(columnIndex)) { - + if (bis == null) { return null; } diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java index 4e6db54..4fb0fca 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java @@ -462,7 +462,7 @@ public class ModelEntity implements Comparable<ModelEntity>, Serializable { /** * An indicator to specific if this entity should ignore automatic DB checks. * This should be set when the entity is mapped to a database view to prevent - * warnings and attempts to modify the schema. + * warnings and attempts to modify the schema. */ public boolean getNeverCheck() { return neverCheck; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java index b44bec4..29d98a0 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java @@ -51,7 +51,6 @@ public final class ModelField extends ModelChild { /** * Returns a new <code>ModelField</code> instance, initialized with the specified values. - * * @param modelEntity The <code>ModelEntity</code> this field is a member of. * @param name The field name. * @param type The field type. @@ -63,7 +62,6 @@ public final class ModelField extends ModelChild { /** * Returns a new <code>ModelField</code> instance, initialized with the specified values. - * * @param modelEntity The <code>ModelEntity</code> this field is a member of. * @param description The field description. * @param name The field name. @@ -115,7 +113,6 @@ public final class ModelField extends ModelChild { /** * Returns a new <code>ModelField</code> instance, initialized with the specified values. - * * @param modelEntity The <code>ModelEntity</code> this field is a member of. * @param fieldElement The <code><field></code> element containing the values for this field. * @param isPk <code>true</code> if this field is part of the primary key. @@ -153,7 +150,6 @@ public final class ModelField extends ModelChild { /** * Returns a new <code>ModelField</code> instance, initialized with the specified values. - * * @param modelEntity The <code>ModelEntity</code> this field is a member of. * @param ccInfo The <code>ColumnCheckInfo</code> containing the values for this field. * @param modelFieldTypeReader diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelIndex.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelIndex.java index 377062d..2037c88 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelIndex.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelIndex.java @@ -39,7 +39,6 @@ public final class ModelIndex extends ModelChild { /** * Returns a new <code>ModelIndex</code> instance, initialized with the specified values. - * * @param modelEntity The <code>ModelEntity</code> this index is a member of. * @param description The index description. * @param name The index name. @@ -63,7 +62,6 @@ public final class ModelIndex extends ModelChild { /** * Returns a new <code>ModelIndex</code> instance, initialized with the specified values. - * * @param modelEntity The <code>ModelEntity</code> this index is a member of. * @param indexElement The <code><index></code> element containing the values for this index. */ diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelInfo.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelInfo.java index f775a23..6981bdc 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelInfo.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelInfo.java @@ -38,7 +38,6 @@ public final class ModelInfo { /** * Returns a new <code>ModelInfo</code> instance initialized to the values found in <code>element</code> attributes. - * * @param defaultInfo A <code>ModelInfo</code> instance that will provide default values for missing attributes. * @param element */ @@ -72,7 +71,6 @@ public final class ModelInfo { /** * Returns a new <code>ModelInfo</code> instance initialized to the values found in <code>element</code> child elements. - * * @param defaultInfo A <code>ModelInfo</code> instance that will provide default values for missing child elements. * @param element */ diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java index 4573873..8886d6f 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java @@ -491,7 +491,6 @@ public class ModelReader implements Serializable { /** * Gets an Entity object based on a definition from the specified XML Entity descriptor file. - * * @param entityName * The entityName of the Entity definition to use. * @return An Entity object describing the specified entity of the specified descriptor file. @@ -529,7 +528,6 @@ public class ModelReader implements Serializable { /** * Creates a Iterator with the entityName of each Entity defined in the specified XML Entity Descriptor file. - * * @return A Iterator of entityName Strings */ public Iterator<String> getEntityNamesIterator() throws GenericEntityException { @@ -543,7 +541,6 @@ public class ModelReader implements Serializable { /** * Creates a Set with the entityName of each Entity defined in the specified XML Entity Descriptor file. - * * @return A Set of entityName Strings */ public Set<String> getEntityNames() throws GenericEntityException { @@ -602,7 +599,6 @@ public class ModelReader implements Serializable { * characters are stripped from the beginning of the name until a valid entity * name is found. It is intended to be used to determine the entity name from a * relation name. - * * @return A valid entityName or null */ public String validateEntityName(String entityName) throws GenericEntityException { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelRelation.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelRelation.java index 3443789..893bfea 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelRelation.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelRelation.java @@ -41,7 +41,6 @@ public final class ModelRelation extends ModelChild { /** * Returns a new <code>ModelRelation</code> instance, initialized with the specified values. - * * @param modelEntity The <code>ModelEntity</code> this relation is a member of. * @param description The relation description. * @param type The relation type. @@ -77,7 +76,6 @@ public final class ModelRelation extends ModelChild { /** * Returns a new <code>ModelRelation</code> instance, initialized with the specified values. - * * @param modelEntity The <code>ModelEntity</code> this relation is a member of. * @param relationElement The <code><relation></code> element containing the values for this relation. * @param isAutoRelation <code>true</code> if this relation was generated automatically by the entity engine. diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java index cfd0ab0..21d2740 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java @@ -245,10 +245,10 @@ public class EntityQueryTestSuite extends EntityTestCase { delegator.create("TestingNode", "testingNodeId", "testingNode-3"); delegator.create("TestingNode", "testingNodeId", "testingNode-4"); - delegator.create("TestingNodeMember", "testingNodeId", "testingNode-1","testingId", "testing-1", "fromDate", UtilDateTime.nowTimestamp(), "thruDate", UtilDateTime.getNextDayStart(UtilDateTime.nowTimestamp())); - delegator.create("TestingNodeMember", "testingNodeId", "testingNode-2","testingId", "testing-2", "fromDate", UtilDateTime.nowTimestamp(), "thruDate", UtilDateTime.getNextDayStart(UtilDateTime.nowTimestamp())); - delegator.create("TestingNodeMember", "testingNodeId", "testingNode-3","testingId", "testing-3", "fromDate", UtilDateTime.getNextDayStart(UtilDateTime.nowTimestamp()), "thruDate", UtilDateTime.getWeekEnd(UtilDateTime.nowTimestamp())); - delegator.create("TestingNodeMember", "testingNodeId", "testingNode-4","testingId", "testing-4", "fromDate", UtilDateTime.getMonthStart(UtilDateTime.nowTimestamp()), "thruDate", UtilDateTime.getMonthStart(UtilDateTime.nowTimestamp())); + delegator.create("TestingNodeMember", "testingNodeId", "testingNode-1", "testingId", "testing-1", "fromDate", UtilDateTime.nowTimestamp(), "thruDate", UtilDateTime.getNextDayStart(UtilDateTime.nowTimestamp())); + delegator.create("TestingNodeMember", "testingNodeId", "testingNode-2", "testingId", "testing-2", "fromDate", UtilDateTime.nowTimestamp(), "thruDate", UtilDateTime.getNextDayStart(UtilDateTime.nowTimestamp())); + delegator.create("TestingNodeMember", "testingNodeId", "testingNode-3", "testingId", "testing-3", "fromDate", UtilDateTime.getNextDayStart(UtilDateTime.nowTimestamp()), "thruDate", UtilDateTime.getWeekEnd(UtilDateTime.nowTimestamp())); + delegator.create("TestingNodeMember", "testingNodeId", "testingNode-4", "testingId", "testing-4", "fromDate", UtilDateTime.getMonthStart(UtilDateTime.nowTimestamp()), "thruDate", UtilDateTime.getMonthStart(UtilDateTime.nowTimestamp())); List<GenericValue> filteredByEntityUtil = EntityUtil.filterByDate(delegator.findList("TestingNodeMember", null, null, UtilMisc.toList("testingNodeId"), null, false)); List<GenericValue> filteredByEntityQuery = EntityQuery.use(delegator).from("TestingNodeMember").filterByDate().orderBy("testingNodeId").queryList(); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityFindOptions.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityFindOptions.java index 781bac2..aa5841e 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityFindOptions.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityFindOptions.java @@ -50,7 +50,7 @@ public class EntityFindOptions implements java.io.Serializable { /** LIMIT option */ protected int limit = -1; - + /** OFFSET option */ protected int offset = -1; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java index 4fc0dd8..a2f30b9 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java @@ -91,7 +91,6 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa /** * Sets the cursor position to just after the last result so that previous() will return the last result. - * * @throws GenericEntityException * if a database error occurs. */ @@ -106,7 +105,6 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa /** * Sets the cursor position to just before the first result so that next() will return the first result. - * * @throws GenericEntityException * if a database error occurs. */ @@ -121,7 +119,6 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa /** * Sets the cursor position to last result. - * * @return true if the result set is not empty. * @throws GenericEntityException * if a database error occurs. @@ -137,7 +134,6 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa /** * Sets the cursor position to first result. - * * @return true if the result set is not empty. * @throws GenericEntityException * in case of a database error. @@ -253,7 +249,6 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa * performs the same function as the {@link ResultSet#relative(int)} method. * if rows is positive, goes forward relative to the current position; * if rows is negative, goes backward relative to the current position; - * * @param rows * the amount of rows to move. * @return true if the cursor is on a row. @@ -387,7 +382,6 @@ public class EntityListIterator implements AutoCloseable, ListIterator<GenericVa /** * Sets the fetch size of the result set to the given value. - * * @param rows * the fetch size * @throws GenericEntityException diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java index f759134..ba4929c 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityQuery.java @@ -90,8 +90,7 @@ public class EntityQuery { } /** Set the fields to be returned when the query is executed. - * - * Note that the select methods are not additive, if a subsequent + * Note that the select methods are not additive, if a subsequent * call is made to select then the existing fields for selection * will be replaced. * @param fieldsToSelect - A Set of Strings containing the field names to be selected @@ -103,9 +102,8 @@ public class EntityQuery { } /** Set the fields to be returned when the query is executed. - * - * Note that the select methods are not additive, if a subsequent - * call is made to select then the existing fields for selection + * Note that the select methods are not additive, if a subsequent + * call is made to select then the existing fields for selection * will be replaced. * @param fields - Strings containing the field names to be selected * @return this EntityQuery object, to enable chaining @@ -136,7 +134,6 @@ public class EntityQuery { } /** Set the EntityCondition to be used as the WHERE clause for the query - * * NOTE: Each successive call to any of the where(...) methods will replace the currently set condition for the query. * @param entityCondition - An EntityCondition object to be used as the where clause for this query * @return this EntityQuery object, to enable chaining @@ -147,7 +144,6 @@ public class EntityQuery { } /** Set a Map of field name/values to be ANDed together as the WHERE clause for the query - * * NOTE: Each successive call to any of the where(...) methods will replace the currently set condition for the query. * @param fieldMap - A Map of field names/values to be ANDed together as the where clause for the query * @return this EntityQuery object, to enable chaining @@ -158,7 +154,6 @@ public class EntityQuery { } /** Set a series of field name/values to be ANDed together as the WHERE clause for the query - * * NOTE: Each successive call to any of the where(...) methods will replace the currently set condition for the query. * @param fields - A series of field names/values to be ANDed together as the where clause for the query * @return this EntityQuery object, to enable chaining @@ -169,7 +164,6 @@ public class EntityQuery { } /** Set a series of EntityConditions to be ANDed together as the WHERE clause for the query - * * NOTE: Each successive call to any of the where(...) methods will replace the currently set condition for the query. * @param entityCondition - A series of EntityConditions to be ANDed together as the where clause for the query * @return this EntityQuery object, to enable chaining @@ -180,7 +174,6 @@ public class EntityQuery { } /** Set a list of EntityCondition objects to be ANDed together as the WHERE clause for the query - * * NOTE: Each successive call to any of the where(...) methods will replace the currently set condition for the query. * @param andConditions - A list of EntityCondition objects to be ANDed together as the WHERE clause for the query * @return this EntityQuery object, to enable chaining @@ -191,7 +184,6 @@ public class EntityQuery { } /** Set the EntityCondition to be used as the HAVING clause for the query. - * * NOTE: Each successive call to any of the having(...) methods will replace the currently set condition for the query. * @param entityCondition - The EntityCondition object that specifies how to constrain * this query after any groupings are done (if this is a view @@ -204,7 +196,6 @@ public class EntityQuery { } /** The fields of the named entity to order the resultset by; optionally add a " ASC" for ascending or " DESC" for descending - * * NOTE: Each successive call to any of the orderBy(...) methods will replace the currently set orderBy fields for the query. * @param orderBy - The fields of the named entity to order the resultset by * @return this EntityQuery object, to enable chaining @@ -215,7 +206,6 @@ public class EntityQuery { } /** The fields of the named entity to order the resultset by; optionally add a " ASC" for ascending or " DESC" for descending - * * NOTE: Each successive call to any of the orderBy(...) methods will replace the currently set orderBy fields for the query. * @param fields - The fields of the named entity to order the resultset by * @return this EntityQuery object, to enable chaining @@ -226,7 +216,6 @@ public class EntityQuery { } /** Indicate that the ResultSet object's cursor may move only forward (this is the default behavior) - * * @return this EntityQuery object, to enable chaining */ public EntityQuery cursorForwardOnly() { @@ -235,7 +224,6 @@ public class EntityQuery { } /** Indicate that the ResultSet object's cursor is scrollable but generally sensitive to changes to the data that underlies the ResultSet. - * * @return this EntityQuery object, to enable chaining */ public EntityQuery cursorScrollSensitive() { @@ -244,7 +232,6 @@ public class EntityQuery { } /** Indicate that the ResultSet object's cursor is scrollable but generally not sensitive to changes to the data that underlies the ResultSet. - * * @return this EntityQuery object, to enable chaining */ public EntityQuery cursorScrollInsensitive() { @@ -253,7 +240,6 @@ public class EntityQuery { } /** Specifies the fetch size for this query. -1 will fall back to datasource settings. - * * @param fetchSize - The fetch size for this query * @return this EntityQuery object, to enable chaining */ @@ -263,7 +249,6 @@ public class EntityQuery { } /** Specifies the max number of rows to return, 0 means all rows. - * * @param maxRows - the max number of rows to return * @return this EntityQuery object, to enable chaining */ @@ -291,7 +276,6 @@ public class EntityQuery { } /** Specifies that the values returned should be filtered to remove duplicate values. - * * @return this EntityQuery object, to enable chaining */ public EntityQuery distinct() { @@ -300,7 +284,6 @@ public class EntityQuery { } /** Specifies whether the values returned should be filtered to remove duplicate values. - * * @param distinct - boolean indicating whether the values returned should be filtered to remove duplicate values * @return this EntityQuery object, to enable chaining */ @@ -310,7 +293,6 @@ public class EntityQuery { } /** Specifies whether results should be read from the cache (or written to the cache if the results have not yet been cached) - * * @return this EntityQuery object, to enable chaining */ public EntityQuery cache() { @@ -319,7 +301,6 @@ public class EntityQuery { } /** Specifies whether results should be read from the cache (or written to the cache if the results have not yet been cached) - * * @param useCache - boolean to indicate if the cache should be used or not * @return this EntityQuery object, to enable chaining */ @@ -329,7 +310,6 @@ public class EntityQuery { } /** Specifies whether the query should return only values that are currently active using from/thruDate fields. - * * @return this EntityQuery object, to enable chaining */ public EntityQuery filterByDate() { @@ -340,7 +320,6 @@ public class EntityQuery { } /** Specifies whether the query should return only values that are active during the specified moment using from/thruDate fields. - * * @param moment - Timestamp representing the moment in time that the values should be active during * @return this EntityQuery object, to enable chaining */ @@ -359,7 +338,6 @@ public class EntityQuery { } /** Specifies whether the query should return only values that are active during the specified moment using from/thruDate fields. - * * @param moment - Date representing the moment in time that the values should be active during * @return this EntityQuery object, to enable chaining */ @@ -369,7 +347,6 @@ public class EntityQuery { } /** Specifies whether the query should return only values that are currently active using the specified from/thru field name pairs. - * * @param filterByFieldName - String pairs representing the from/thru date field names e.g. "fromDate", "thruDate", "contactFromDate", "contactThruDate" * @return this EntityQuery object, to enable chaining */ @@ -378,7 +355,6 @@ public class EntityQuery { } /** Specifies whether the query should return only values that are active during the specified moment using the specified from/thru field name pairs. - * * @param moment - Timestamp representing the moment in time that the values should be active during * @param filterByFieldName - String pairs representing the from/thru date field names e.g. "fromDate", "thruDate", "contactFromDate", "contactThruDate" * @return this EntityQuery object, to enable chaining @@ -394,19 +370,16 @@ public class EntityQuery { } /** Executes the EntityQuery and returns a list of results - * * @return Returns a List of GenericValues representing the results of the query */ public List<GenericValue> queryList() throws GenericEntityException { return query(null); } - /** Executes the EntityQuery and returns an EntityListIterator representing the result of the query. - * + /** Executes the EntityQuery and returns an EntityListIterator representing the result of the query. * NOTE: THAT THIS MUST BE CLOSED (preferably in a finally block) WHEN YOU * ARE DONE WITH IT, AND DON'T LEAVE IT OPEN TOO LONG BEACUSE IT * WILL MAINTAIN A DATABASE CONNECTION. - * * @return Returns an EntityListIterator representing the result of the query */ public EntityListIterator queryIterator() throws GenericEntityException { @@ -425,7 +398,6 @@ public class EntityQuery { } /** Executes the EntityQuery and returns the first result - * * @return GenericValue representing the first result record from the query */ public GenericValue queryFirst() throws GenericEntityException { @@ -439,7 +411,6 @@ public class EntityQuery { } /** Executes the EntityQuery and a single result record - * * @return GenericValue representing the only result record from the query */ public GenericValue queryOne() throws GenericEntityException { @@ -449,9 +420,7 @@ public class EntityQuery { } /** Executes the EntityQuery and returns the result count - * * If the query generates more than a single result then an exception is thrown - * * @return GenericValue representing the only result record from the query */ public long queryCount() throws GenericEntityException { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityStoreOptions.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityStoreOptions.java index 437a587..8d5c464 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityStoreOptions.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityStoreOptions.java @@ -35,7 +35,6 @@ public class EntityStoreOptions implements java.io.Serializable { /** * Optional constructor with options to specify. - * * @param createDummyFks */ public EntityStoreOptions(boolean createDummyFks) { @@ -44,7 +43,6 @@ public class EntityStoreOptions implements java.io.Serializable { /** * If true, missing entries in FK referenced entities will be created while storing the given GenericValues. - * * @return boolean */ public boolean isCreateDummyFks() { @@ -53,7 +51,6 @@ public class EntityStoreOptions implements java.io.Serializable { /** * If true, missing entries in FK referenced entities will be created while storing the given GenericValues. - * * @param createDummyFks */ public void setCreateDummyFks(boolean createDummyFks) { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java index ed7c693..438cd08 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtil.java @@ -308,7 +308,7 @@ public final class EntityUtil { .filter(value -> exprs.stream().anyMatch(condition -> condition.entityMatches(value))) .collect(toList()); } - + /** *returns the values in the order specified after with localized value * diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java index 1e6aab6..5b525b2 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityUtilProperties.java @@ -100,7 +100,7 @@ public final class EntityUtilProperties implements Serializable { return UtilProperties.getPropertyValue(resource, name, defaultValue); } } - + public static String getPropertyValueFromDelegatorName(String resource, String name, String defaultValue, String delegatorName) { Delegator delegator = DelegatorFactory.getDelegator(delegatorName); if (delegator == null) { // This should not happen, but in case... diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java index f210c2a..af46d88 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java @@ -181,7 +181,7 @@ public final class EntityEcaCondition implements java.io.Serializable { return false; } } - + protected List<String> getFieldNames() { List<String> fieldNameList = new ArrayList<>(); if ( UtilValidate.isNotEmpty(lhsValueName) ) { @@ -192,5 +192,4 @@ public final class EntityEcaCondition implements java.io.Serializable { } return fieldNameList; } - } diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java index 16e20b4..1263eca 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/permission/EntityPermissionChecker.java @@ -113,7 +113,7 @@ public class EntityPermissionChecker { entityIdList = new LinkedList<>(); } String entityName = entityNameExdr.expandString(context); - HttpServletRequest request = (HttpServletRequest)context.get("request"); + HttpServletRequest request = (HttpServletRequest) context.get("request"); GenericValue userLogin = null; String partyId = null; Delegator delegator = null; @@ -655,7 +655,7 @@ public class EntityPermissionChecker { public static boolean hasMatch(String entityName, List<GenericValue> targetOperations, List<String> roles, boolean hasPurposeOp, List<String> purposes, boolean hasStatusOp, String targStatusId) { boolean isMatch = false; - + // if (UtilValidate.isNotEmpty(targPrivilegeEnumId) && !targPrivilegeEnumId.equals("_NA_") && !targPrivilegeEnumId.equals("_00_")) { // need to do a lookup here to find the seq value of targPrivilegeEnumId. // The lookup could be a static store or it could be done on Enumeration entity. diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java index 8de124d..aba721d 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java @@ -610,7 +610,7 @@ public class EntitySyncContext { } Debug.logInfo(toStoreInfo.toString(), MODULE); } - + // As the this.nextUpdateTxTime calculation is only based on entities without values to store, if there at least one value to store returned // this calculation is false, so it needs to be nullified if (valuesToStore.size() > 0) { @@ -733,7 +733,6 @@ public class EntitySyncContext { if (keysToRemove.size() > 0) { this.nextRemoveTxTime = null; } - return keysToRemove; } diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java index 507cb7b..dac846e 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java @@ -202,7 +202,6 @@ public final class MiniLangUtil { * suitable for use with the conversion framework. If the argument is * <code>null</code> or a <code>String</code>, the method returns the * {@link PlainString} class. - * * @param object * @return A <code>Class</code> that is * suitable for use with the conversion framework @@ -226,7 +225,6 @@ public final class MiniLangUtil { /** * Returns <code>true</code> if <code>attributeValue</code> is a * constant value (it does not contain an expression). - * * @param attributeValue The value to test * @return <code>true</code> if <code>attributeValue</code> is a * constant value @@ -242,7 +240,6 @@ public final class MiniLangUtil { * Returns <code>true</code> if <code>attributeValue</code> is a * constant value (it does not contain an expression) or a constant * plus expression value. - * * @param attributeValue The value to test * @return <code>true</code> if <code>attributeValue</code> is a * constant value or a constant plus expression value @@ -265,7 +262,6 @@ public final class MiniLangUtil { /** * Returns <code>true</code> if <code>document</code> contains corrections. - * * @param document The document to test * @return <code>true</code> if <code>document</code> contains corrections */ @@ -276,7 +272,6 @@ public final class MiniLangUtil { /** * Writes a Mini-language <code>Document</code> to disk. The XML file is styled by the * config/MiniLang.xslt style sheet. - * * @param xmlURL * @param document */ diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java index dcbcf81..3493a10 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java @@ -37,8 +37,7 @@ public final class MiniLangValidate { /** * Tests <code>element</code> for invalid attribute names. - * - * @param method The <code><simple-method></code> that contains <code>element</code> + * @param method The <code><simple-method></code> that contains <code>element</code> * @param element The <code>element</code> to test * @param validAttributeNames The valid attribute names * @throws ValidationException If an invalid attribute name is found and <code>validation.level=strict</code> @@ -60,7 +59,6 @@ public final class MiniLangValidate { /** * Returns <code>attributeValue</code> if it is not empty, else returns <code>defaultValue</code>. * No <code>null</code> checks are performed. - * * @param attributeValue * @param defaultValue * @return <code>attributeValue</code> if it is not empty, else returns <code>defaultValue</code> @@ -71,8 +69,7 @@ public final class MiniLangValidate { /** * Tests <code>element</code> for invalid child elements. - * - * @param method The <code><simple-method></code> that contains <code>element</code> + * @param method The <code><simple-method></code> that contains <code>element</code> * @param element The <code>element</code> to test * @param validChildElementNames The valid child element tag names * @throws ValidationException If an invalid child element is found and <code>validation.level=strict</code> @@ -96,8 +93,7 @@ public final class MiniLangValidate { /** * Tests if element attributes are constant type. - * - * @param method The <code><simple-method></code> that contains <code>element</code> + * @param method The <code><simple-method></code> that contains <code>element</code> * @param element The <code>element</code> to test * @param attributeNames The attributes to test * @throws ValidationException If an invalid attribute is found and <code>validation.level=strict</code> @@ -113,8 +109,7 @@ public final class MiniLangValidate { /** * Tests if element attributes are constant+expr type. - * - * @param method The <code><simple-method></code> that contains <code>element</code> + * @param method The <code><simple-method></code> that contains <code>element</code> * @param element The <code>element</code> to test * @param attributeNames The attributes to test * @throws ValidationException If an invalid attribute is found and <code>validation.level=strict</code> @@ -133,8 +128,7 @@ public final class MiniLangValidate { /** * Tests <code>element</code> for a deprecated attribute. - * - * @param method The <code><simple-method></code> that contains <code>element</code> + * @param method The <code><simple-method></code> that contains <code>element</code> * @param element The <code>element</code> to test * @param attributeName The name of the deprecated attribute * @param fixInstruction Instructions to fix the deprecated attribute @@ -149,8 +143,7 @@ public final class MiniLangValidate { /** * Tests if element attributes are expression type. - * - * @param method The <code><simple-method></code> that contains <code>element</code> + * @param method The <code><simple-method></code> that contains <code>element</code> * @param element The <code>element</code> to test * @param attributeNames The attributes to test * @throws ValidationException If an invalid attribute is found and <code>validation.level=strict</code> @@ -171,9 +164,8 @@ public final class MiniLangValidate { /** * Handles a Mini-language validation error. - * * @param errorMessage The error message - * @param method The <code><simple-method></code> that contains <code>element</code> + * @param method The <code><simple-method></code> that contains <code>element</code> * @param element The <code>element</code> that contains the error * @throws ValidationException If <code>validation.level=strict</code>, otherwise a warning is logged */ @@ -188,7 +180,6 @@ public final class MiniLangValidate { /** * Returns <code>true</code> if <code>validation.level=lenient</code>. - * * @return <code>true</code> if <code>validation.level=lenient</code> */ public static boolean lenientOn() { @@ -197,8 +188,7 @@ public final class MiniLangValidate { /** * Tests <code>element</code> for child elements. - * - * @param method The <code><simple-method></code> that contains <code>element</code> + * @param method The <code><simple-method></code> that contains <code>element</code> * @param element The <code>element</code> to test * @throws ValidationException If a child element is found and <code>validation.level=strict</code> */ @@ -215,8 +205,7 @@ public final class MiniLangValidate { /** * Tests <code>element</code> for any one required attribute from a set of attribute names. - * - * @param method The <code><simple-method></code> that contains <code>element</code> + * @param method The <code><simple-method></code> that contains <code>element</code> * @param element The <code>element</code> to test * @param attributeNames The required attribute names * @throws ValidationException If none of the required attributes are found and <code>validation.level=strict</code> @@ -238,8 +227,7 @@ public final class MiniLangValidate { /** * Tests <code>element</code> for any one required child element from a set of tag names. - * - * @param method The <code><simple-method></code> that contains <code>element</code> + * @param method The <code><simple-method></code> that contains <code>element</code> * @param element The <code>element</code> to test * @param elementNames The required child element tag names * @throws ValidationException If none of the required child elements are found and <code>validation.level=strict</code> @@ -269,8 +257,7 @@ public final class MiniLangValidate { /** * Tests <code>element</code> for required attributes. - * - * @param method The <code><simple-method></code> that contains <code>element</code> + * @param method The <code><simple-method></code> that contains <code>element</code> * @param element The <code>element</code> to test * @param attributeNames The required attribute names * @throws ValidationException If any of the required attributes are not found and <code>validation.level=strict</code> @@ -286,8 +273,7 @@ public final class MiniLangValidate { /** * Tests <code>element</code> for required child elements. - * - * @param method The <code><simple-method></code> that contains <code>element</code> + * @param method The <code><simple-method></code> that contains <code>element</code> * @param element The <code>element</code> to test * @param elementNames The required child element tag names * @throws ValidationException If any of the required child elements are not found and <code>validation.level=strict</code> @@ -311,8 +297,7 @@ public final class MiniLangValidate { /** * Tests if element attributes are script type. - * - * @param method The <code><simple-method></code> that contains <code>element</code> + * @param method The <code><simple-method></code> that contains <code>element</code> * @param element The <code>element</code> to test * @param attributeNames The attributes to test * @throws ValidationException If an invalid attribute is found and <code>validation.level=strict</code> @@ -341,7 +326,6 @@ public final class MiniLangValidate { /** * Returns <code>true</code> if <code>validation.level=strict</code>. - * * @return <code>true</code> if <code>validation.level=strict</code> */ public static boolean strictOn() { @@ -350,7 +334,6 @@ public final class MiniLangValidate { /** * Returns <code>true</code> if <code>validation.level</code> is set to lenient or strict. - * * @return <code>true</code> if <code>validation.level</code> is set to lenient or strict */ public static boolean validationOn() { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java index 4c316d8..787581c 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java @@ -211,7 +211,6 @@ public final class SimpleMethod extends MiniLangElement { * The ordering in the List is the same as the XML file. * <p>This method is used by unit test framework to run tests in the order they appear in the XML file. * Method caching is bypassed since the methods are executed only once.</p> - * * @param xmlResource * @param loader * @return diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleServiceEngine.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleServiceEngine.java index 8e96986..e829ace 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleServiceEngine.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleServiceEngine.java @@ -38,7 +38,6 @@ public final class SimpleServiceEngine extends GenericAsyncEngine { /** * Run the service synchronously and return the result - * * @param context * Map of name, value pairs composing the context * @return Map of name, value pairs composing the result @@ -53,7 +52,6 @@ public final class SimpleServiceEngine extends GenericAsyncEngine { /** * Run the service synchronously and IGNORE the result - * * @param context * Map of name, value pairs composing the context */ diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java index 596cf2c..a443366 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java @@ -160,7 +160,6 @@ public final class MethodContext { /** * Gets the named value from the environment. Supports the "." (dot) syntax to access Map members and the "[]" (bracket) syntax to access List entries. This value is expanded, supporting the * insertion of other environment values using the "${}" notation. - * * @param key * The name of the environment value to get. Can contain "." and "[]" syntax elements as described above. * @return The environment value if found, otherwise null. @@ -248,7 +247,6 @@ public final class MethodContext { * Puts the named value in the environment. Supports the "." (dot) syntax to access Map members and the "[]" (bracket) syntax to access List entries. If the brackets for a list are empty the value * will be appended to end of the list, otherwise the value will be set in the position of the number in the brackets. If a "+" (plus sign) is included inside the square brackets before the index * number the value will inserted/added at that index instead of set at that index. This value is expanded, supporting the insertion of other environment values using the "${}" notation. - * * @param key * The name of the environment value to get. Can contain "." syntax elements as described above. * @param value @@ -275,7 +273,6 @@ public final class MethodContext { /** * Removes the named value from the environment. Supports the "." (dot) syntax to access Map members and the "[]" (bracket) syntax to access List entries. This value is expanded, supporting the * insertion of other environment values using the "${}" notation. - * * @param key * The name of the environment value to get. Can contain "." syntax elements as described above. */ diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodOperation.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodOperation.java index 8c27a38..9579ffb 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodOperation.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodOperation.java @@ -43,7 +43,6 @@ public abstract class MethodOperation extends MiniLangElement { * Executes the operation. * Returns <code>true</code> if script execution should continue, or * <code>false</code> if script execution should stop. - * * @throws MiniLangException */ public abstract boolean exec(MethodContext methodContext) throws MiniLangException; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java index a9e7f8e..5fb06d6 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java @@ -64,7 +64,6 @@ public abstract class Compare { /** * Returns a <code>Compare</code> instance for the specified operator. - * * @param operator * @return A <code>Compare</code> instance for the specified operator */ @@ -75,7 +74,7 @@ public abstract class Compare { /** * Returns the result of this comparison. - * + * * @param lValue The object being compared * @param rValue The object being compared to * @param type The Java class to be used in the comparison diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java index e6386b7..8241963 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java @@ -36,7 +36,6 @@ import org.w3c.dom.Element; /** * Implements the <if-validate-method> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class ValidateMethodCondition extends MethodOperation implements Conditional { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java index 38b83a9..f7f3b3c 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearEntityCaches.java @@ -27,7 +27,6 @@ import org.w3c.dom.Element; /** * Implements the <clear-entity-caches> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class ClearEntityCaches extends EntityOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java index be9c03e..1e19db2 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <entity-one> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class EntityOne extends EntityOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java index e8322c2..61665a5 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java @@ -37,7 +37,6 @@ import org.w3c.dom.Element; /** * Implements the <get-related> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class GetRelated extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java index da7b144..2e11021 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java @@ -34,7 +34,6 @@ import org.w3c.dom.Element; /** * Implements the <get-related-one> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class GetRelatedOne extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java index da3b95f..a5a93d4 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <make-next-seq-id> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class MakeNextSeqId extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java index e228edd..e5c5a4f 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java @@ -35,7 +35,6 @@ import org.w3c.dom.Element; /** * Implements the <remove-by-and> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class RemoveByAnd extends EntityOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java index b5448d8..a3a93cd 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <transaction-commit> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class TransactionCommit extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java index 7a63aa1..d071219 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <transaction-rollback> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class TransactionRollback extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java index 111261b..707636a 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/While.java @@ -95,7 +95,6 @@ public final class While extends MethodOperation { /** * A factory for the <while> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public static final class WhileFactory implements Factory<While> { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java index 9271074..8d788a5 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Calculate.java @@ -202,7 +202,6 @@ public final class Calculate extends MethodOperation { /** * Implements the <calcop> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CalcOp extends MiniLangElement implements SubCalc { @@ -306,7 +305,6 @@ public final class Calculate extends MethodOperation { /** * Implements the <number> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class NumberOp extends MiniLangElement implements SubCalc { diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/LocalDispatcherFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/LocalDispatcherFactory.java index d757e15..381a174 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/LocalDispatcherFactory.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/LocalDispatcherFactory.java @@ -27,7 +27,6 @@ public interface LocalDispatcherFactory { /** * Creates a <code>LocalDispatcher</code> instance based on <code>name</code> and <code>delegator</code>. * If a matching <code>LocalDispatcher</code> was already created, then it will be returned. - * * @param name * @param delegator */ diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigListener.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigListener.java index 46b1ea5..6c26c61 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigListener.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigListener.java @@ -27,7 +27,6 @@ public interface ServiceConfigListener { /** * Processes <code>serviceengine.xml</code> changes. - * * @param serviceConfig The new <code>ServiceConfig</code> instance. */ void onServiceConfigChange(ServiceConfig serviceConfig); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java index 8878f3e..5e3df79 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java @@ -57,7 +57,7 @@ public final class ServiceConfigUtil { /** * Returns the specified parameter value from the specified engine, or <code>null</code> * if the engine or parameter are not found. - * + * * @param engineName * @param parameterName * @return @@ -104,7 +104,6 @@ public final class ServiceConfigUtil { /** * Returns the specified <code>ServiceEngine</code> configuration instance, * or <code>null</code> if the configuration does not exist. - * * @throws GenericConfigException */ public static ServiceEngine getServiceEngine(String name) throws GenericConfigException { @@ -126,18 +125,17 @@ public final class ServiceConfigUtil { /** * Register a <code>ServiceConfigListener</code> instance. The instance will be notified * when the <code>serviceengine.xml</code> file is reloaded. - * * @param listener */ public static void registerServiceConfigListener(ServiceConfigListener listener) { Assert.notNull("listener", listener); configListeners.add(listener); } - + public static String getEngine() { return engine; } - + public static String getServiceEngineXmlFileName() { return SERVICE_ENGINE_XML_FILENAME; } diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Notification.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Notification.java index e66164e..877280e 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Notification.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Notification.java @@ -48,7 +48,7 @@ public final class Notification { service = "sendMailFromScreen"; } this.service = service; - + } public String getScreen() { diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java index 3346c85..40d7644 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java @@ -136,7 +136,7 @@ public final class EntityAutoEngine extends GenericAsyncEngine { } } catch (GeneralException e) { Debug.logError(e, "Error doing entity-auto operation for entity [" + modelEntity.getEntityName() + "] in service [" + modelService.name + "]: " + e.toString(), MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ServiceEntityAutoOperation", UtilMisc.toMap("entityName", modelEntity.getEntityName(), "serviceName", modelService.name,"errorString", e.toString()), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ServiceEntityAutoOperation", UtilMisc.toMap("entityName", modelEntity.getEntityName(), "serviceName", modelService.name, "errorString", e.toString()), locale)); } result.put(ModelService.SUCCESS_MESSAGE, ServiceUtil.makeSuccessMessage(result, "", "", "", "")); return result; @@ -224,7 +224,7 @@ public final class EntityAutoEngine extends GenericAsyncEngine { if (pkValue instanceof String) { StringBuffer errorDetails = new StringBuffer(); if (!UtilValidate.isValidDatabaseId((String) pkValue, errorDetails)) { - return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ServiceParameterValueNotValid", UtilMisc.toMap("parameterName", singlePkModelParam.name,"errorDetails", errorDetails), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ServiceParameterValueNotValid", UtilMisc.toMap("parameterName", singlePkModelParam.name, "errorDetails", errorDetails), locale)); } } } diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java index d40168a..44b487b 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java @@ -111,7 +111,7 @@ public class JobServices { } public static Map<String, Object> purgeOldJobs(DispatchContext dctx, Map<String, ? extends Object> context) { - Locale locale = (Locale)context.get("locale"); + Locale locale = (Locale) context.get("locale"); String sendPool = (String) context.get("poolId"); Integer daysToKeep = (Integer) context.get("daysToKeep"); Integer limit = (Integer) context.get("limit"); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java index 956d5b3..5a65ae0 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java @@ -89,7 +89,7 @@ public class RmiServiceContainer implements Container { Integer portValue = Integer.valueOf(port); portValue += Start.getInstance().getConfig().portOffset; port = portValue.toString(); - } + } String keystore = ContainerConfig.getPropertyValue(cfg, "ssl-keystore", null); String ksType = ContainerConfig.getPropertyValue(cfg, "ssl-keystore-type", "JKS"); String ksPass = ContainerConfig.getPropertyValue(cfg, "ssl-keystore-pass", null); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEntityAutoTests.java b/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEntityAutoTests.java index 084e2c9..a13f96c 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEntityAutoTests.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEntityAutoTests.java @@ -216,7 +216,7 @@ public class ServiceEntityAutoTests extends OFBizTestCase { results = dispatcher.runSync("testEntityAutoCreateTestingStatus", testingStatusCreateMap, 10, true); assertTrue(ServiceUtil.isError(results)); } catch (GenericServiceException e) { - assertEquals(e.toString(),"You call a creation on entity that require the userLogin to track the activity, please controle that your service definition has auth='true'"); + assertEquals(e.toString(), "You call a creation on entity that require the userLogin to track the activity, please controle that your service definition has auth='true'"); } //test update testingStatus diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java index 16e5874..65f42a5 100644 --- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java +++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java @@ -43,7 +43,7 @@ public class EntityXmlAssertTest extends OFBizTestCase { /** * Tests of entity xml * @param caseName test case name - * @param mainElement DOM main element + * @param mainElement DOM main element */ public EntityXmlAssertTest(String caseName, Element mainElement) { super(caseName); diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java index 76cce24..ff1f364 100644 --- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java +++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java @@ -41,7 +41,7 @@ public class ServiceTest extends OFBizTestCase { /** * Tests of Service * @param caseName test case name - * @param mainElement DOM main element + * @param mainElement DOM main element */ public ServiceTest(String caseName, Element mainElement) { super(caseName); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java index 0c21587..ebf7774 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java @@ -45,7 +45,6 @@ public final class OfbizUrlBuilder { /** * Returns an <code>OfbizUrlBuilder</code> instance. - * * @param request * @throws GenericEntityException * @throws WebAppConfigurationException @@ -67,7 +66,6 @@ public final class OfbizUrlBuilder { /** * Returns an <code>OfbizUrlBuilder</code> instance. Use this method when you * don't have a <code>HttpServletRequest</code> object - like in scheduled jobs. - * * @param webAppInfo Optional - if <code>null</code>, the builder can only build the host part, * and that will be based only on the settings in <code>url.properties</code> (the WebSite * entity will be ignored). @@ -111,7 +109,6 @@ public final class OfbizUrlBuilder { /** * Builds a full URL - including scheme, host, servlet path and resource. - * * @param buffer * @param url * @param useSSL Default value to use - will be replaced by request-map setting @@ -125,10 +122,9 @@ public final class OfbizUrlBuilder { buildPathPart(buffer, url); return makeSecure; } - + /** * Builds a partial URL - including the scheme and host, but not the servlet path or resource. - * * @param buffer * @param url * @param useSSL Default value to use - will be replaced by request-map setting @@ -181,7 +177,6 @@ public final class OfbizUrlBuilder { /** * Builds a partial URL - including the servlet path and resource, but not the scheme or host. - * * @param buffer * @param url * @throws WebAppConfigurationException diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java index 737dc69..e4be866 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/WebAppUtil.java @@ -73,7 +73,6 @@ public final class WebAppUtil { * Returns the control servlet path. The path consists of the web application's mount-point * specified in the <code>ofbiz-component.xml</code> file and the servlet mapping specified * in the web application's <code>web.xml</code> file. - * * @param webAppInfo * @throws IOException * @throws SAXException @@ -112,7 +111,6 @@ public final class WebAppUtil { /** * Returns the <code>WebappInfo</code> instance associated to the specified web site ID. * Throws <code>IllegalArgumentException</code> if the web site ID was not found. - * * @param webSiteId * @throws IOException * @throws SAXException @@ -130,7 +128,6 @@ public final class WebAppUtil { /** * Returns the web site ID - as configured in the web application's <code>web.xml</code> file, * or <code>null</code> if no web site ID was found. - * * @param webAppInfo * @throws IOException * @throws SAXException @@ -229,7 +226,6 @@ public final class WebAppUtil { /** * Returns a <code>WebXml</code> instance that models the web application's <code>web.xml</code> file. - * * @param webAppInfo * @throws IOException * @throws SAXException @@ -242,7 +238,6 @@ public final class WebAppUtil { /** * Parses the specified <code>web.xml</code> file into a <code>WebXml</code> instance. - * * @param webXmlLocation * @param validate * @throws IOException diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java index 70c23e3..1d51793 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java @@ -137,13 +137,13 @@ public class JWTManager { public static String getJWTKey(Delegator delegator) { return getJWTKey(delegator, null); } - + /** * Get the JWT secret key from database or security.properties. * @param delegator the delegator * @return the JWT secret key */ - + public static String getJWTKey(Delegator delegator, String salt) { String key = EntityUtilProperties.getPropertyValue("security", "security.token.key", delegator); if (salt != null) { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java index 2f47e58..b418047 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java @@ -620,7 +620,7 @@ public final class LoginWorker { GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); LocalDispatcher dispatcher; - if (UtilProperties.getPropertyAsBoolean("security","security.disable.impersonation", true)) { + if (UtilProperties.getPropertyAsBoolean("security", "security.disable.impersonation", true)) { String errMsg = UtilProperties.getMessage(RESOURCE, "loginevents.impersonation_disabled", UtilHttp.getLocale(request)); request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; @@ -672,7 +672,7 @@ public final class LoginWorker { String visitId = VisitHandler.getVisitId(session); result = dispatcher.runSync("userImpersonate", UtilMisc.toMap("userLoginIdToImpersonate", userLoginIdToImpersonate, - "userLogin", userLogin,"visitId", visitId, "locale", UtilHttp.getLocale(request))); + "userLogin", userLogin, "visitId", visitId, "locale", UtilHttp.getLocale(request))); } catch (GenericServiceException e) { Debug.logError(e, "Error calling userImpersonate service", MODULE); Map<String, String> messageMap = UtilMisc.toMap("errorMessage", e.getMessage()); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java index 7ee514f..bd97f29 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java @@ -218,7 +218,7 @@ public class RequestHandler { throw new RequestHandlerException("Domain " + request.getServerName() + " not accepted to prevent host header injection." + " You need to set host-headers-allowed property in security.properties file."); } - + final boolean throwRequestHandlerExceptionOnMissingLocalRequest = EntityUtilProperties.propertyValueEqualsIgnoreCase( "requestHandler", "throwRequestHandlerExceptionOnMissingLocalRequest", "Y", delegator); long startTime = System.currentTimeMillis(); @@ -446,7 +446,7 @@ public class RequestHandler { request.setAttribute("requestMapMap", getControllerConfig().getRequestMapMap()); // Perform CSRF token check when request not on chain - if (chain==null && originalRequestMap.securityCsrfToken) { + if (chain == null && originalRequestMap.securityCsrfToken) { CsrfUtil.checkToken(request, path); } @@ -496,7 +496,7 @@ public class RequestHandler { // run the request event eventReturn = this.runEvent(request, response, requestMap.event, requestMap, "request"); - + if (requestMap.event.metrics != null) { requestMap.event.metrics.recordServiceRate(1, System.currentTimeMillis() - startTime); } @@ -1004,10 +1004,10 @@ public class RequestHandler { } else { resp.setHeader("Cache-Control", "Set-Cookie"); } - + //Security Headers UtilHttp.setResponseBrowserDefaultSecurityHeaders(resp, viewMap); - + try { if (Debug.verboseOn()) Debug.logVerbose("Rendering view [" + nextPage + "] of type [" + viewMap.type + "]", MODULE); ViewHandler vh = viewFactory.getViewHandler(viewMap.type); @@ -1320,7 +1320,7 @@ public class RequestHandler { public boolean trackVisit(HttpServletRequest request) { return track(request, trackVisit, rmap -> rmap.trackVisit); } - + private static String showSessionId(HttpServletRequest request) { Delegator delegator = (Delegator) request.getAttribute("delegator"); boolean showSessionIdInLog = EntityUtilProperties.propertyValueEqualsIgnoreCase("requestHandler", "show-sessionId-in-log", "Y", delegator); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/SameSiteFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/SameSiteFilter.java index ffb3cf4..9bfdd7b 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/SameSiteFilter.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/SameSiteFilter.java @@ -32,7 +32,7 @@ import org.apache.ofbiz.entity.util.EntityUtilProperties; public class SameSiteFilter implements javax.servlet.Filter { - + private static final String SameSiteCookieAttribute = EntityUtilProperties.getPropertyValueFromDelegatorName("security.properties", "SameSiteCookieAttribute", "strict", "default"); @Override public void init(FilterConfig filterConfig) throws ServletException { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java index f2f9e7d..5bebf35 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java @@ -62,7 +62,7 @@ public class TokenFilter implements Filter { String userLoginId = (String) result.get("userLoginId"); if (UtilValidate.isNotEmpty(result.get(ModelService.ERROR_MESSAGE))) { httpResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED); - httpRequest.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("SecurityextUiLabels","loginservices.sorry_problem_processing_request_error", locale)); + httpRequest.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("SecurityextUiLabels", "loginservices.sorry_problem_processing_request_error", locale)); CommonEvents.jsonResponseFromRequestAttributes(httpRequest, httpResponse); } else if (UtilValidate.isNotEmpty(userLoginId)) { try { @@ -74,12 +74,12 @@ public class TokenFilter implements Filter { chain.doFilter(httpRequest, httpResponse); } else { httpResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED); - httpRequest.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("SecurityextUiLabels","loginservices.sorry_problem_processing_request_error", locale)); + httpRequest.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("SecurityextUiLabels", "loginservices.sorry_problem_processing_request_error", locale)); CommonEvents.jsonResponseFromRequestAttributes(httpRequest, httpResponse); } } catch (GenericEntityException e) { Debug.logError(e, MODULE); - httpRequest.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("SecurityextUiLabels","loginservices.sorry_problem_processing_request_error_try_later", locale)); + httpRequest.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("SecurityextUiLabels", "loginservices.sorry_problem_processing_request_error_try_later", locale)); CommonEvents.jsonResponseFromRequestAttributes(httpRequest, httpResponse); } } diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java index 512c924..6d5a038 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java @@ -351,7 +351,7 @@ public class CoreEvents { HttpSession session = request.getSession(); Locale locale = UtilHttp.getLocale(request); Map<String, Object> syncServiceResult = checkMap(session.getAttribute("_RUN_SYNC_RESULT_"), String.class, Object.class); - if (null==syncServiceResult) { + if (null == syncServiceResult) { String errMsg = UtilProperties.getMessage(CoreEvents.err_resource, "coreEvents.no_fields_in_session", locale); request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java index c88cb79..09c4bbb 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCurrencyTransform.java @@ -155,7 +155,7 @@ public class OfbizCurrencyTransform implements TemplateTransformModel { } } final int rounding = roundingNumber; - + return new Writer(out) { @Override public void write(char cbuf[], int off, int len) { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java index 5da1588..45c474a 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java @@ -143,7 +143,7 @@ public class ServerHitBin { if (delegator == null) { throw new IllegalArgumentException("In countHit could not find a delegator or delegatorName to work from"); } - + String id = makeIdTenantAware(baseId, delegator); ServerHitBin bin = null; @@ -496,9 +496,9 @@ public class ServerHitBin { Debug.logInfo("The Visit GenericValue stored in the client session does not exist in the database, not storing server hit.", MODULE); return; } - + Debug.logInfo("Visit delegatorName=" + visit.getDelegator().getDelegatorName() + ", ServerHitBin delegatorName=" + this.delegator.getDelegatorName(), MODULE); - + GenericValue serverHit = delegator.makeValue("ServerHit"); serverHit.set("visitId", visitId); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java index 4a670ae..2971ebd 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java @@ -60,9 +60,7 @@ public final class ApacheFopWorker { private static final String tempFilePrefix = "org.apache.ofbiz.webapp.view.ApacheFopWorker-"; private static FopFactory fopFactory = null; - private static final int encryptionLengthBitsDefault = 128; - private static final String encryptionLengthDefault = UtilProperties.getPropertyValue("fop", "fop.encryption-length.default", String.valueOf(encryptionLengthBitsDefault)); private static final String userPasswordDefault = UtilProperties.getPropertyValue("fop", "fop.userPassword.default"); @@ -86,9 +84,7 @@ public final class ApacheFopWorker { private static final String allowPrintHqDefault = UtilProperties.getPropertyValue("fop", "fop.allowPrintHq.default", "true"); private static final String encryptMetadataDefault = UtilProperties.getPropertyValue("fop", "fop.encrypt-metadata.default", "true"); - private static final String fopPath = UtilProperties.getPropertyValue("fop", "fop.path", "/framework/webapp/config"); - private static final String fopFontBaseProperty = UtilProperties.getPropertyValue("fop", "fop.font.base.url", "/framework/webapp/config/"); private ApacheFopWorker() { } diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java index 947bfba..ba7836d 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java @@ -34,7 +34,7 @@ import org.w3c.dom.Element; public class ResponseHelper { private static final String MODULE = ResponseHelper.class.getName(); - + public static final String DAV_NAMESPACE_URI = "DAV:"; public static final String STATUS_200 = "HTTP/1.1 200 OK"; public static final String STATUS_400 = "HTTP/1.1 400 Bad Request"; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java index 6f6d028..0b3e907 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java @@ -49,7 +49,6 @@ public final class WebSiteProperties { * in the application's WebSite entity value. If the application does not have a * WebSite entity value then the instance is initialized to the settings found * in the <code>url.properties</code> file. - * * @param request * @throws GenericEntityException */ @@ -130,7 +129,6 @@ public final class WebSiteProperties { /** * Returns a <code>WebSiteProperties</code> instance initialized to the settings found * in the WebSite entity value. - * * @param webSiteValue */ public static WebSiteProperties from(GenericValue webSiteValue) { diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java index a2dd6e5..a1366b0 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java @@ -121,7 +121,7 @@ public class WebToolsServices { String checkDataOnly = (String) context.get("checkDataOnly"); Map<String, Object> placeholderValues = UtilGenerics.cast(context.get("placeholderValues")); - Integer txTimeout = (Integer)context.get("txTimeout"); + Integer txTimeout = (Integer) context.get("txTimeout"); if (txTimeout == null) { txTimeout = 7200; } @@ -222,8 +222,8 @@ public class WebToolsServices { String checkDataOnly = (String) context.get("checkDataOnly"); Map<String, Object> placeholderValues = UtilGenerics.cast(context.get("placeholderValues")); - Integer txTimeout = (Integer)context.get("txTimeout"); - Long filePause = (Long)context.get("filePause"); + Integer txTimeout = (Integer) context.get("txTimeout"); + Long filePause = (Long) context.get("filePause"); if (txTimeout == null) { txTimeout = 7200; @@ -463,7 +463,7 @@ public class WebToolsServices { Locale locale = (Locale) context.get("locale"); String outpath = (String) context.get("outpath"); // mandatory Timestamp fromDate = (Timestamp) context.get("fromDate"); - Integer txTimeout = (Integer)context.get("txTimeout"); + Integer txTimeout = (Integer) context.get("txTimeout"); if (txTimeout == null) { txTimeout = 7200; } diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java index 07cf33b..4438f17 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java @@ -37,7 +37,7 @@ public class RunTestEvents { private static final String MODULE = RunTestEvents.class.getName(); public static String runTest(HttpServletRequest request, HttpServletResponse response) throws ContainerException { - + String component = request.getParameter("compName"); String suiteName = request.getParameter("suiteName"); String caseName = request.getParameter("caseName"); diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java index 8292807..b7c742d 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java @@ -93,7 +93,7 @@ public class LabelManagerFactory { } } - public void findMatchingLabels(String component, String fileName, String key, String locale, boolean onlyNotUsedLabels) + public void findMatchingLabels(String component, String fileName, String key, String locale, boolean onlyNotUsedLabels) throws MalformedURLException, SAXException, ParserConfigurationException, IOException, GeneralException { if (UtilValidate.isEmpty(component) && UtilValidate.isEmpty(fileName) && UtilValidate.isEmpty(key) && UtilValidate.isEmpty(locale)) { // Important! Don't allow unparameterized queries - doing so will result in loading the entire project into memory @@ -116,8 +116,8 @@ public class LabelManagerFactory { if (propertyNode instanceof Element) { Element propertyElem = (Element) propertyNode; String labelKey = UtilCodec.canonicalize(propertyElem.getAttribute("key")); - if (onlyNotUsedLabels - && (labelKey.contains(".description.") + if (onlyNotUsedLabels + && (labelKey.contains(".description.") || labelKey.contains(".transitionName.") || labelKey.contains(".partyRelationshipName.") || labelKey.contains(".geoName.") @@ -136,7 +136,7 @@ public class LabelManagerFactory { || (labelKey.length() == 2) // These are languages Ids || labelKey.contains("pt_") // These are languages Ids || labelKey.contains("en_") // These are languages Ids - )) { + )) { continue; // OFBIZ-8154 WIP } String labelComment = ""; @@ -148,7 +148,7 @@ public class LabelManagerFactory { String localeName = valueElem.getAttribute("xml:lang"); if ( localeName.contains("_")) { GeneralException e = new GeneralException("Confusion in labels with the separator used between languages and countries. Please use a dash instead of an underscore."); - throw e; + throw e; } String labelValue = UtilCodec.canonicalize(UtilXml.nodeValue(valueElem.getFirstChild())); LabelInfo label = labels.get(labelKey + keySeparator + fileInfo.getFileName()); diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java index c3b560f..a8e44f4 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java @@ -113,7 +113,7 @@ public class SaveLabelsToXmlFile { Document resourceDocument = UtilXml.makeEmptyXmlDocument("resource"); Element resourceElem = resourceDocument.getDocumentElement(); resourceElem.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance"); - resourceElem.setAttribute("xsi:noNamespaceSchemaLocation","http://ofbiz.apache.org/dtds/ofbiz-properties.xsd"); + resourceElem.setAttribute("xsi:noNamespaceSchemaLocation", "http://ofbiz.apache.org/dtds/ofbiz-properties.xsd"); for (String labelKey : labelsList) { LabelInfo labelInfo = labels.get(labelKey); if (!(labelInfo.getFileName().equalsIgnoreCase(fileName))) { diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java index c16dd58..9185d36 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java @@ -61,7 +61,6 @@ public class WidgetFactory { /** * Returns a <code>ModelScreenWidget</code> instance that implements the specified * XML element. - * * @param modelScreen The containing screen for the widget * @param element The widget XML element * @return a <code>ModelScreenWidget</code> instance that implements the specified @@ -119,7 +118,6 @@ public class WidgetFactory { * registered, the new widget replaces the existing one.<p>The class supplied * to the method must have a public two-argument constructor that takes a * <code>ModelScreen</code> instance and an <code>Element</code> instance.</p> - * * @param tagName The XML element tag name for this widget * @param widgetClass The class that implements the widget element * @throws SecurityException diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java index 4a7b040..2251052 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java @@ -354,7 +354,7 @@ public final class WidgetWorker { public static int getPaginatorNumber(Map<String, Object> context) { int paginator_number = 0; if (context != null) { - Integer paginateNumberInt= (Integer)context.get("PAGINATOR_NUMBER"); + Integer paginateNumberInt= (Integer) context.get("PAGINATOR_NUMBER"); if (paginateNumberInt == null) { paginateNumberInt = 0; context.put("PAGINATOR_NUMBER", paginateNumberInt); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/artifact/ArtifactInfoGatherer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/artifact/ArtifactInfoGatherer.java index 0ea3393..c7eb569 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/artifact/ArtifactInfoGatherer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/artifact/ArtifactInfoGatherer.java @@ -460,12 +460,12 @@ public final class ArtifactInfoGatherer implements ModelWidgetVisitor, ModelActi public void visit(MenuField menuField) { //TODO } - + @Override public void visit(FormField formField) { //TODO } - + @Override public void visit(GridField gridField) { //TODO @@ -503,7 +503,7 @@ public final class ArtifactInfoGatherer implements ModelWidgetVisitor, ModelActi @Override public void visit(ResetField resetField) { } - + @Override public void visit(ScreenField screenField) { //TODO diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java index d823546..fea14a5 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java @@ -127,7 +127,6 @@ public abstract class AbstractModelAction implements Serializable, ModelAction { /** * Executes the actions contained in <code>actions</code>. - * * @param actions * @param context */ @@ -163,7 +162,6 @@ public abstract class AbstractModelAction implements Serializable, ModelAction { /** * Returns the <code>ModelWidget</code> that contains the <actions> element. - * * @return The <code>ModelWidget</code> that contains the <actions> element */ public ModelWidget getModelWidget() { diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java index 64b1ed5..858e346 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java @@ -2317,8 +2317,8 @@ public class ModelFormField { String location = this.getFormLocation(context); ModelForm modelForm = null; try { - org.apache.ofbiz.entity.model.ModelReader entityModelReader = ((org.apache.ofbiz.entity.Delegator)context.get("delegator")).getModelReader(); - org.apache.ofbiz.service.DispatchContext dispatchContext = ((org.apache.ofbiz.service.LocalDispatcher)context.get("dispatcher")).getDispatchContext(); + org.apache.ofbiz.entity.model.ModelReader entityModelReader = ((org.apache.ofbiz.entity.Delegator) context.get("delegator")).getModelReader(); + org.apache.ofbiz.service.DispatchContext dispatchContext = ((org.apache.ofbiz.service.LocalDispatcher) context.get("dispatcher")).getDispatchContext(); VisualTheme visualTheme = (VisualTheme) context.get("visualTheme"); modelForm = FormFactory.getFormFromLocation(location, name, entityModelReader, visualTheme, dispatchContext); } catch (RuntimeException e) { @@ -2399,8 +2399,8 @@ public class ModelFormField { String location = this.getGridLocation(context); ModelForm modelForm = null; try { - org.apache.ofbiz.entity.model.ModelReader entityModelReader = ((org.apache.ofbiz.entity.Delegator)context.get("delegator")).getModelReader(); - org.apache.ofbiz.service.DispatchContext dispatchContext = ((org.apache.ofbiz.service.LocalDispatcher)context.get("dispatcher")).getDispatchContext(); + org.apache.ofbiz.entity.model.ModelReader entityModelReader = ((org.apache.ofbiz.entity.Delegator) context.get("delegator")).getModelReader(); + org.apache.ofbiz.service.DispatchContext dispatchContext = ((org.apache.ofbiz.service.LocalDispatcher) context.get("dispatcher")).getDispatchContext(); VisualTheme visualTheme = (VisualTheme) context.get("visualTheme"); modelForm = GridFactory.getGridFromLocation(location, name, entityModelReader, visualTheme, dispatchContext); } catch (RuntimeException e) { @@ -3614,7 +3614,7 @@ public class ModelFormField { String name = this.getScreenName(context); String location = this.getScreenLocation(context); try { - ScreenRenderer renderer = (ScreenRenderer)context.get("screens"); + ScreenRenderer renderer = (ScreenRenderer) context.get("screens"); if (renderer != null) { MapStack<String> mapStack = UtilGenerics.cast(context); ScreenRenderer subRenderer = new ScreenRenderer(writer, mapStack, renderer.getScreenStringRenderer()); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java index 8c938cf..2c489da 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java @@ -104,7 +104,7 @@ public abstract class ModelMenuAction { String originalName = this.fromField.getOriginalName(); String currentWidgetTrail = (String) context.get("_WIDGETTRAIL_"); String newKey = currentWidgetTrail + "|" + originalName; - HttpSession session = (HttpSession)context.get("session"); + HttpSession session = (HttpSession) context.get("session"); newValue = session.getAttribute(newKey); if (Debug.verboseOn()) { Debug.logVerbose("In user getting value for field from [" + this.fromField.getOriginalName() + "]: " + newValue, MODULE); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java index a0606b1..dced116 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java @@ -72,7 +72,7 @@ public class PortalPageWorker { portalPages = EntityQuery.use(delegator).from("PortalPage").where(cond).queryList(); List<GenericValue> userPortalPages = new ArrayList<>(); if (UtilValidate.isNotEmpty(context.get("userLogin"))) { // check if a user is logged in - String userLoginId = ((GenericValue)context.get("userLogin")).getString("userLoginId"); + String userLoginId = ((GenericValue) context.get("userLogin")).getString("userLoginId"); // replace with private pages for (GenericValue portalPage : portalPages) { List<GenericValue> privatePortalPages = EntityQuery.use(delegator) @@ -111,7 +111,7 @@ public class PortalPageWorker { // Get the current userLoginId String userLoginId = "_NA_"; if (UtilValidate.isNotEmpty(context.get("userLogin"))) { // check if a user is logged in - userLoginId = ((GenericValue)context.get("userLogin")).getString("userLoginId"); + userLoginId = ((GenericValue) context.get("userLogin")).getString("userLoginId"); } // Get the PortalPage ensuring that it is either owned by the user or a system page @@ -170,7 +170,6 @@ public class PortalPageWorker { } } - return userIsAllowed; + return userIsAllowed; } - } diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java index 36d3ad7..56fb3d4 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java @@ -324,7 +324,7 @@ public class FormRenderer { for (ModelFormField modelFormField : mainFieldList) { FieldInfo fieldInfo = modelFormField.getFieldInfo(); - // if the field's title is explicitly set to "" (title="") then + // if the field's title is explicitly set to "" (title= "") then // the header is not created for it; this is useful for position list // where one line can be rendered with more than one row, and we // only want to display the title header for the main row diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java index 6551667..5aeb8ed 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java @@ -227,7 +227,7 @@ public class ScreenRenderer { VisualTheme visualTheme = UtilHttp.getVisualTheme(request); if (visualTheme == null) { String defaultVisualThemeId = EntityUtilProperties.getPropertyValue("general", "VISUAL_THEME", (Delegator) request.getAttribute("delegator")); - visualTheme = ThemeFactory.getVisualThemeFromId(defaultVisualThemeId); + visualTheme = ThemeFactory.getVisualThemeFromId(defaultVisualThemeId); } context.put("visualTheme", visualTheme); context.put("modelTheme", visualTheme.getModelTheme()); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java index 270b29e..1a1e134 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java @@ -342,7 +342,7 @@ public class HtmlTreeRenderer extends HtmlWidgetRenderer implements TreeStringRe public ScreenStringRenderer getScreenStringRenderer(Map<String, Object> context) { VisualTheme visualTheme = (VisualTheme) context.get("visualTheme"); ModelTheme modelTheme = visualTheme.getModelTheme(); - ScreenRenderer screenRenderer = (ScreenRenderer)context.get("screens"); + ScreenRenderer screenRenderer = (ScreenRenderer) context.get("screens"); if (screenRenderer != null) { screenStringRenderer = screenRenderer.getScreenStringRenderer(); } else { diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java index 6e69c72..cc258fd 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java @@ -433,7 +433,7 @@ public final class MacroFormRenderer implements FormStringRenderer { sr.append("\" tabindex=\""); sr.append(tabindex); sr.append("\" delegatorName=\""); - sr.append(((HttpSession)context.get("session")).getAttribute("delegatorName").toString()); + sr.append(((HttpSession) context.get("session")).getAttribute("delegatorName").toString()); sr.append("\" />"); executeMacro(writer, sr.toString()); ModelFormField.SubHyperlink subHyperlink = textField.getSubHyperlink(); @@ -2379,7 +2379,7 @@ public final class MacroFormRenderer implements FormStringRenderer { sr.append("\" tabindex=\""); sr.append(tabindex); sr.append("\" delegatorName=\""); - sr.append(((HttpSession)context.get("session")).getAttribute("delegatorName").toString()); + sr.append(((HttpSession) context.get("session")).getAttribute("delegatorName").toString()); sr.append("\" />"); executeMacro(writer, sr.toString()); this.addAsterisks(writer, context, modelFormField); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java index 886f6f4..3133796 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java @@ -296,7 +296,7 @@ public class MacroScreenRenderer implements ScreenStringRenderer { StringWriter sr = new StringWriter(); sr.append("<@renderLink "); sr.append("parameterList="); - sr.append(parameters.length()==0?"\"\"":parameters.toString()); + sr.append(parameters.length() == 0 ? "\"\"" : parameters.toString()); sr.append(" targetWindow=\""); sr.append(targetWindow); sr.append("\" target=\""); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java index 9e8148b..b8b0601 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java @@ -364,7 +364,7 @@ public class MacroTreeRenderer implements TreeStringRenderer { @Override public ScreenStringRenderer getScreenStringRenderer(Map<String, Object> context) { - ScreenRenderer screenRenderer = (ScreenRenderer)context.get("screens"); + ScreenRenderer screenRenderer = (ScreenRenderer) context.get("screens"); if (screenRenderer != null) { return screenRenderer.getScreenStringRenderer(); } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |