[ofbiz-framework] branch trunk updated: Improved: Corrected some single line statements to fix checkstyle issues, also removed some remaining extra spaces from code to avoid checkstyle erros in framework component. (OFBIZ-11886)
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 7b251e4 Improved: Corrected some single line statements to fix checkstyle issues, also removed some remaining extra spaces from code to avoid checkstyle erros in framework component. (OFBIZ-11886) 7b251e4 is described below commit 7b251e43d96dea3a4d98c3e77955575a90353ae3 Author: Suraj Khurana <[hidden email]> AuthorDate: Tue Jul 21 12:25:20 2020 +0530 Improved: Corrected some single line statements to fix checkstyle issues, also removed some remaining extra spaces from code to avoid checkstyle erros in framework component. (OFBIZ-11886) --- .../ofbiz/base/component/ComponentConfig.java | 2 +- .../ofbiz/base/container/AdminServerContainer.java | 31 ++--- .../ofbiz/base/container/ContainerConfig.java | 150 +++++++++++--------- .../base/container/NamingServiceContainer.java | 2 +- .../apache/ofbiz/base/conversion/Converters.java | 4 +- .../ofbiz/base/conversion/MiscConverters.java | 2 +- .../apache/ofbiz/base/html/CustomSafePolicy.java | 1 - .../org/apache/ofbiz/base/metrics/Metrics.java | 34 ++--- .../org/apache/ofbiz/base/util/ObjectType.java | 2 +- .../java/org/apache/ofbiz/base/util/UtilCodec.java | 2 +- .../org/apache/ofbiz/base/util/UtilProperties.java | 4 +- .../java/org/apache/ofbiz/base/util/UtilTimer.java | 2 +- .../ofbiz/base/util/string/UelFunctions.java | 4 +- .../org/apache/ofbiz/common/CommonServices.java | 8 +- .../java/org/apache/ofbiz/common/FindServices.java | 6 +- .../apache/ofbiz/common/email/EmailServices.java | 4 +- .../ofbiz/common/email/NotificationServices.java | 4 +- .../org/apache/ofbiz/common/geo/GeoWorker.java | 4 +- .../apache/ofbiz/common/image/ImageTransform.java | 12 +- .../common/login/LdapAuthenticationServices.java | 32 +++-- .../apache/ofbiz/common/login/LoginServices.java | 5 - .../ofbiz/common/preferences/PreferenceWorker.java | 2 +- .../apache/ofbiz/common/qrcode/QRCodeServices.java | 4 +- .../ofbiz/common/scripting/ContextHelper.java | 4 +- .../apache/ofbiz/common/status/StatusServices.java | 2 +- .../org/apache/ofbiz/common/uom/UomWorker.java | 2 +- .../org/apache/ofbiz/entity/GenericDelegator.java | 6 +- .../entity/connection/DBCPConnectionFactory.java | 1 - .../entity/connection/DebugManagedDataSource.java | 4 +- .../apache/ofbiz/entity/datasource/GenericDAO.java | 60 ++++++-- .../ofbiz/entity/datasource/GenericHelperDAO.java | 12 +- .../org/apache/ofbiz/entity/jdbc/DatabaseUtil.java | 152 +++++++++++++++------ .../org/apache/ofbiz/entity/jdbc/SQLProcessor.java | 72 +++++++--- .../org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java | 28 ++-- .../ofbiz/entity/model/ModelEntityChecker.java | 2 +- .../org/apache/ofbiz/entity/model/ModelReader.java | 4 +- .../apache/ofbiz/entity/model/ModelViewEntity.java | 4 +- .../ofbiz/entity/transaction/TransactionUtil.java | 8 +- .../apache/ofbiz/entity/util/EntityDataAssert.java | 4 +- .../apache/ofbiz/entity/util/EntityDataLoader.java | 4 +- .../org/apache/ofbiz/entity/util/EntityQuery.java | 4 +- .../apache/ofbiz/entity/util/EntitySaxReader.java | 12 +- .../org/apache/ofbiz/entity/util/EntityUtil.java | 4 +- .../org/apache/ofbiz/entity/util/SequenceUtil.java | 4 +- .../ofbiz/entityext/cache/EntityCacheServices.java | 32 +++-- .../ofbiz/entityext/eca/EntityEcaCondition.java | 8 +- .../apache/ofbiz/entityext/eca/EntityEcaRule.java | 2 +- .../permission/EntityPermissionChecker.java | 40 ++++-- .../synchronization/EntitySyncContext.java | 24 +++- .../synchronization/EntitySyncServices.java | 12 +- .../org/apache/ofbiz/minilang/SimpleMethod.java | 9 +- .../apache/ofbiz/minilang/method/FieldObject.java | 1 - .../minilang/method/callops/CallClassMethod.java | 1 - .../minilang/method/callops/CallObjectMethod.java | 1 - .../ofbiz/minilang/method/callops/CallScript.java | 1 - .../ofbiz/minilang/method/callops/CallService.java | 1 - .../minilang/method/callops/CallServiceAsynch.java | 1 - .../method/callops/CallSimpleMapProcessor.java | 1 - .../minilang/method/callops/CallSimpleMethod.java | 1 - .../ofbiz/minilang/method/callops/Return.java | 1 - .../minilang/method/callops/SetServiceFields.java | 1 - .../method/conditional/CombinedCondition.java | 1 - .../method/conditional/CompareCondition.java | 1 - .../method/conditional/CompareFieldCondition.java | 1 - .../ofbiz/minilang/method/conditional/ElseIf.java | 1 - .../method/conditional/EmptyCondition.java | 1 - .../method/conditional/HasPermissionCondition.java | 1 - .../minilang/method/entityops/ClearCacheLine.java | 1 - .../minilang/method/entityops/CloneValue.java | 1 - .../minilang/method/entityops/CreateValue.java | 1 - .../ofbiz/minilang/method/entityops/EntityAnd.java | 1 - .../minilang/method/entityops/EntityCondition.java | 1 - .../minilang/method/entityops/EntityCount.java | 1 - .../minilang/method/entityops/EntityData.java | 1 - .../minilang/method/entityops/FilterListByAnd.java | 1 - .../method/entityops/FilterListByDate.java | 1 - .../ofbiz/minilang/method/entityops/FindByAnd.java | 1 - .../method/entityops/FindByPrimaryKey.java | 1 - .../ofbiz/minilang/method/entityops/MakeValue.java | 1 - .../minilang/method/entityops/OrderValueList.java | 1 - .../minilang/method/entityops/RefreshValue.java | 1 - .../minilang/method/entityops/RemoveList.java | 1 - .../minilang/method/entityops/RemoveRelated.java | 1 - .../minilang/method/entityops/RemoveValue.java | 1 - .../method/entityops/SequencedIdToEnv.java | 1 - .../method/entityops/SetCurrentUserLogin.java | 1 - .../minilang/method/entityops/SetNonpkFields.java | 1 - .../minilang/method/entityops/SetPkFields.java | 1 - .../ofbiz/minilang/method/entityops/StoreList.java | 1 - .../minilang/method/entityops/StoreValue.java | 1 - .../method/entityops/TransactionBegin.java | 1 - .../ofbiz/minilang/method/envops/AddError.java | 1 - .../ofbiz/minilang/method/envops/Assert.java | 1 - .../apache/ofbiz/minilang/method/envops/Break.java | 1 - .../ofbiz/minilang/method/envops/CheckErrors.java | 1 - .../ofbiz/minilang/method/envops/CheckId.java | 1 - .../ofbiz/minilang/method/envops/ClearField.java | 1 - .../ofbiz/minilang/method/envops/Continue.java | 1 - .../ofbiz/minilang/method/envops/CreateObject.java | 1 - .../ofbiz/minilang/method/envops/FieldToList.java | 1 - .../minilang/method/envops/FirstFromList.java | 1 - .../ofbiz/minilang/method/envops/Iterate.java | 1 - .../ofbiz/minilang/method/envops/IterateMap.java | 1 - .../ofbiz/minilang/method/envops/ListToList.java | 1 - .../apache/ofbiz/minilang/method/envops/Loop.java | 1 - .../ofbiz/minilang/method/envops/MapToMap.java | 1 - .../apache/ofbiz/minilang/method/envops/Now.java | 1 - .../ofbiz/minilang/method/envops/OrderMapList.java | 1 - .../ofbiz/minilang/method/envops/SetCalendar.java | 1 - .../ofbiz/minilang/method/envops/SetOperation.java | 1 - .../ofbiz/minilang/method/envops/StringAppend.java | 1 - .../ofbiz/minilang/method/envops/StringToList.java | 1 - .../ofbiz/minilang/method/envops/ToString.java | 1 - .../apache/ofbiz/minilang/method/envops/While.java | 1 - .../minilang/method/eventops/FieldToRequest.java | 1 - .../minilang/method/eventops/FieldToSession.java | 1 - .../method/eventops/RequestParametersToList.java | 1 - .../minilang/method/eventops/RequestToField.java | 1 - .../minilang/method/eventops/SessionToField.java | 1 - .../method/eventops/WebappPropertyToField.java | 1 - .../minilang/method/ifops/CheckPermission.java | 1 - .../ofbiz/minilang/method/ifops/IfInstanceOf.java | 1 - .../ofbiz/minilang/method/ifops/IfNotEmpty.java | 1 - .../ofbiz/minilang/method/otherops/Calculate.java | 1 - .../apache/ofbiz/minilang/method/otherops/Log.java | 1 - .../minilang/method/otherops/PropertyToField.java | 1 - .../ofbiz/minilang/method/otherops/Trace.java | 1 - .../minilang/method/serviceops/FieldToResult.java | 1 - .../org/apache/ofbiz/service/DispatchContext.java | 16 +-- .../ofbiz/service/GenericDispatcherFactory.java | 4 +- .../apache/ofbiz/service/GenericResultWaiter.java | 12 +- .../java/org/apache/ofbiz/service/ModelParam.java | 4 +- .../org/apache/ofbiz/service/ModelService.java | 34 +++-- .../apache/ofbiz/service/ServiceDispatcher.java | 24 +++- .../org/apache/ofbiz/service/ServiceXaWrapper.java | 58 ++++---- .../ofbiz/service/calendar/RecurrenceRule.java | 12 +- .../ofbiz/service/eca/ServiceEcaCondition.java | 8 +- .../apache/ofbiz/service/eca/ServiceEcaUtil.java | 4 +- .../org/apache/ofbiz/service/group/GroupModel.java | 4 +- .../ofbiz/service/jms/AbstractJmsListener.java | 12 +- .../ofbiz/service/jms/JmsListenerFactory.java | 8 +- .../apache/ofbiz/service/jms/JmsServiceEngine.java | 12 +- .../apache/ofbiz/service/jms/JmsTopicListener.java | 4 +- .../org/apache/ofbiz/service/job/JobManager.java | 3 +- .../rmi/socket/ssl/SSLServerSocketFactory.java | 2 +- .../ofbiz/base/start/StartupControlPanel.java | 2 +- .../java/org/apache/ofbiz/webapp/WebAppUtil.java | 4 +- .../apache/ofbiz/webapp/control/ContextFilter.java | 4 +- .../apache/ofbiz/webapp/control/LoginWorker.java | 3 - .../ofbiz/webapp/control/RequestHandler.java | 107 +++++++++++---- .../control/WebAppConfigurationException.java | 1 - .../org/apache/ofbiz/webapp/event/CoreEvents.java | 2 +- .../ofbiz/webapp/event/JavaEventHandler.java | 12 +- .../ofbiz/webapp/event/SOAPEventHandler.java | 12 +- .../webapp/event/ServiceMultiEventHandler.java | 12 +- .../ofbiz/webapp/event/SimpleEventHandler.java | 12 +- .../ofbiz/webapp/ftl/OfbizContentTransform.java | 4 +- .../ofbiz/webapp/ftl/OfbizCurrencyTransform.java | 18 ++- .../ofbiz/webapp/ftl/OfbizNumberTransform.java | 12 +- .../apache/ofbiz/webapp/ftl/OfbizUrlTransform.java | 1 - .../apache/ofbiz/webapp/stats/VisitHandler.java | 8 +- .../apache/ofbiz/webapp/view/HttpViewHandler.java | 4 +- .../org/apache/ofbiz/webapp/webdav/WebDavUtil.java | 4 +- .../apache/ofbiz/webtools/WebToolsServices.java | 4 +- .../ofbiz/widget/model/AbstractModelAction.java | 8 +- .../apache/ofbiz/widget/model/ModelFormField.java | 4 +- .../widget/renderer/fo/ScreenFopViewHandler.java | 4 +- 167 files changed, 877 insertions(+), 504 deletions(-) diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java b/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java index 7a0450d..a8ec716 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java @@ -1117,7 +1117,7 @@ public final class ComponentConfig { this.basePermission = basePermStr.split(","); } else { // default base permission is NONE - this.basePermission = new String[] { "NONE" }; + this.basePermission = new String[] {"NONE" }; } // trim the permissions (remove spaces) for (int i = 0; i < this.basePermission.length; i++) { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/container/AdminServerContainer.java b/framework/base/src/main/java/org/apache/ofbiz/base/container/AdminServerContainer.java index bf41f23..e13821c 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/container/AdminServerContainer.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/container/AdminServerContainer.java @@ -121,7 +121,6 @@ public final class AdminServerContainer implements Container { } } } - private OfbizSocketCommand determineClientCommand(String request) { if (!isValidRequest(request)) { return OfbizSocketCommand.FAIL; @@ -140,25 +139,23 @@ public final class AdminServerContainer implements Container { && request.substring(0, request.indexOf(':')).equals(cfg.adminKey) && !request.substring(request.indexOf(':') + 1).isEmpty(); } - - private static String prepareResponseToClient(OfbizSocketCommand control) { String response = null; ServerState state = Start.getInstance().getCurrentState(); - switch(control) { - case SHUTDOWN: - if (state == ServerState.STOPPING) { - response = "IN-PROGRESS"; - } else { - response = "OK"; - } - break; - case STATUS: - response = state.toString(); - break; - case FAIL: - response = "FAIL"; - break; + switch (control) { + case SHUTDOWN: + if (state == ServerState.STOPPING) { + response = "IN-PROGRESS"; + } else { + response = "OK"; + } + break; + case STATUS: + response = state.toString(); + break; + case FAIL: + response = "FAIL"; + break; } return response; } diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerConfig.java b/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerConfig.java index 05e7226..8246d29 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerConfig.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerConfig.java @@ -36,7 +36,9 @@ import org.w3c.dom.Element; * A container configuration. */ public final class ContainerConfig { - /** The global container configuration store. */ + /** + * The global container configuration store. + */ private static final Map<String, Configuration> CONFIGURATIONS = new LinkedHashMap<>(); private ContainerConfig() { } @@ -44,12 +46,12 @@ public final class ContainerConfig { /** * Retrieves the container configuration element corresponding to a container name. * - * @param containerName the name of the container to retrieve - * @param configFile the file name corresponding to the global container configuration file + * @param containerName the name of the container to retrieve + * @param configFile the file name corresponding to the global container configuration file * @return the corresponding configuration element. * @throws ContainerException when no configuration element are found. * @deprecated Use {@link #getConfiguration(String)} instead. - */ + */ @Deprecated public static Configuration getConfiguration(String containerName, String configFile) throws ContainerException { @@ -59,7 +61,7 @@ public final class ContainerConfig { /** * Retrieves the container configuration element corresponding to a container name. * - * @param containerName the name of the container to retrieve + * @param containerName the name of the container to retrieve * @return the corresponding configuration element. * @throws ContainerException when no configuration element are found. */ @@ -74,7 +76,7 @@ public final class ContainerConfig { /** * Finds the {@code <container>} configuration elements in a XML element. * - * @param root the XML element which cannot be {@code null} + * @param root the XML element which cannot be {@code null} * @return a list of container configuration */ public static List<Configuration> getConfigurations(Element root) { @@ -87,16 +89,6 @@ public final class ContainerConfig { return res; } - interface PropertyChildren { - /** - * Provides the child property corresponding to a specified identifier. - * - * @param name the child property identifier - * @return the property corresponding to {@code name} or {@code null} if the identifier is absent. - */ - Configuration.Property getProperty(String name); - } - public static String getPropertyValue(PropertyChildren parentProp, String name, String defaultValue) { Configuration.Property prop = parentProp.getProperty(name); if (prop == null || UtilValidate.isEmpty(prop.value())) { @@ -125,25 +117,47 @@ public final class ContainerConfig { return "true".equalsIgnoreCase(prop.value); } + interface PropertyChildren { + /** + * Provides the child property corresponding to a specified identifier. + * + * @param name the child property identifier + * @return the property corresponding to {@code name} or {@code null} if the identifier is absent. + */ + Configuration.Property getProperty(String name); + } + /** * A container configuration. */ public static final class Configuration implements PropertyChildren { //ALLOW PUBLIC FIELDS - /** The identifier of the configuration. */ - @Deprecated public final String name; - /** The name of class the configuration. */ - @Deprecated public final String className; - /** The list of loader names triggering the launch of the container. */ - @Deprecated public final List<String> loaders; - /** The container property elements. */ - @Deprecated public final Map<String, Property> properties; + /** + * The identifier of the configuration. + */ + @Deprecated + public final String name; + /** + * The name of class the configuration. + */ + @Deprecated + public final String className; + /** + * The list of loader names triggering the launch of the container. + */ + @Deprecated + public final List<String> loaders; + /** + * The container property elements. + */ + @Deprecated + public final Map<String, Property> properties; //FORBID PUBLIC FIELDS /** * Constructs a container configuration. * - * @param element the {@code <container>} XML element to parse + * @param element the {@code <container>} XML element to parse */ public Configuration(Element element) { name = element.getAttribute("name"); @@ -165,7 +179,6 @@ public final class ContainerConfig { public String className() { return className; } - /** * @return the loaders */ @@ -179,35 +192,40 @@ public final class ContainerConfig { public Map<String, Property> properties() { return properties; } - @Override public Configuration.Property getProperty(String name) { return properties().get(name); } - /** * Provides all the child properties whose values are equal a specified value. * - * @param value the value to match + * @param value the value to match * @return a list of matching properties */ public List<Property> getPropertiesWithValue(String value) { return Property.getPropertiesWithValue(properties(), value); } - /** * A tree of container configuration properties. */ public static final class Property implements PropertyChildren { //ALLOW PUBLIC FIELDS - /** The identifier of the configuration element */ - @Deprecated public final String name; - /** The value associated with the {@code name} identifier. */ - @Deprecated public final String value; - /** The properties children */ - @Deprecated public final Map<String, Property> properties; + /** + * The identifier of the configuration element + */ + @Deprecated + public final String name; + /** + * The value associated with the {@code name} identifier. + */ + @Deprecated + public final String value; + /** + * The properties children + */ + @Deprecated + public final Map<String, Property> properties; //FORBID PUBLIC FIELDS - /** * Constructs a container configuration element. * @@ -222,7 +240,32 @@ public final class ContainerConfig { this.value = value; this.properties = parseProps(element); } - + /** + * Aggregates the {@code <property>} XML elements in a Map. + * + * @param root the root XML Element containing {@code <property>} children + * @return a map of property elements + */ + private static Map<String, Property> parseProps(Element root) { + LinkedHashMap<String, Property> res = new LinkedHashMap<>(); + UtilXml.childElementList(root, "property").forEach(el -> { + Property p = new Property(el); + res.put(p.name(), p); + }); + return Collections.unmodifiableMap(res); + } + /** + * Provides all the child properties whose values are equal a specified value. + * + * @param value the value to match + * @return a list of matching properties + */ + private static List<Property> getPropertiesWithValue(Map<String, Property> propkvs, String value) { + return propkvs.values().stream() + .filter(Objects::nonNull) + .filter(p -> value.equals(p.value())) + .collect(toList()); + } /** * @return the name */ @@ -248,44 +291,15 @@ public final class ContainerConfig { public Configuration.Property getProperty(String name) { return properties().get(name); } - /** * Provides all the child properties whose values are equal a specified value. * - * @param value the value to match + * @param value the value to match * @return a list of matching properties */ public List<Property> getPropertiesWithValue(String value) { return getPropertiesWithValue(properties(), value); } - - /** - * Aggregates the {@code <property>} XML elements in a Map. - * - * @param root the root XML Element containing {@code <property>} children - * @return a map of property elements - */ - private static Map<String, Property> parseProps(Element root) { - LinkedHashMap<String, Property> res = new LinkedHashMap<>(); - UtilXml.childElementList(root, "property").forEach(el -> { - Property p = new Property(el); - res.put(p.name(), p); - }); - return Collections.unmodifiableMap(res); - } - - /** - * Provides all the child properties whose values are equal a specified value. - * - * @param value the value to match - * @return a list of matching properties - */ - private static List<Property> getPropertiesWithValue(Map<String, Property> propkvs, String value) { - return propkvs.values().stream() - .filter(Objects::nonNull) - .filter(p -> value.equals(p.value())) - .collect(toList()); - } } } } diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/container/NamingServiceContainer.java b/framework/base/src/main/java/org/apache/ofbiz/base/container/NamingServiceContainer.java index 866559a..a7c66bc 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/container/NamingServiceContainer.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/container/NamingServiceContainer.java @@ -71,7 +71,7 @@ public class NamingServiceContainer implements Container { // get the naming (JNDI) server Configuration.Property host = cfg.getProperty("host"); if (host != null && host.value() != null) { - this.namingHost = host.value(); + this.namingHost = host.value(); } try { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java index e26dbca..9c52ad0 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java @@ -193,7 +193,9 @@ OUTER: sb.append(targetClass.getName()); String key = sb.toString(); if (converterMap.putIfAbsent(key, converter) == null) { - if (Debug.verboseOn()) Debug.logVerbose("Registered converter " + converter.getClass().getName(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Registered converter " + converter.getClass().getName(), MODULE); + } } } diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java index 4611400..39abccf 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java @@ -123,7 +123,7 @@ public class MiscConverters implements ConverterLoader { StringBuilder strBuf = new StringBuilder(); char[] inCharBuffer = new char[CHAR_BUFFER_SIZE]; int charsRead = 0; - try (Reader clobReader = obj.getCharacterStream()) { + try (Reader clobReader = obj.getCharacterStream()) { while ((charsRead = clobReader.read(inCharBuffer, 0, CHAR_BUFFER_SIZE)) > 0) { strBuf.append(inCharBuffer, 0, charsRead); } 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 68562ff..5bb2f8f 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 @@ -34,7 +34,6 @@ import org.owasp.html.PolicyFactory; * (please don't go look it up). The rules for Slashdot are fairly strict: users * can only submit the following HTML tags and no CSS: {@code <b>}, {@code <u>}, * {@code <i>}, {@code <a>}, {@code <blockquote>}. - * * Accordingly, we've built a policy file that allows fairly similar * functionality. All text-formatting tags that operate directly on the font, * color or emphasis have been allowed. diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java b/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java index d1e715c..cc93d0a 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/metrics/Metrics.java @@ -1,19 +1,21 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/******************************************************************************* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + *******************************************************************************/ /* Copyright (c) 2002 by Matt Welsh and The Regents of the University of California. All rights reserved. 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 f7e74ff..cbb2139 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 @@ -286,7 +286,7 @@ public class ObjectType { Node node = (Node) obj; - String nodeValue = node.getTextContent(); + String nodeValue = node.getTextContent(); if (nodeValue == null) { /* We can't get the text value of Document, Document Type and Notation Node, 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 0eed5c5..f2fc4fd 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 @@ -53,7 +53,7 @@ public class UtilCodec { private static final UrlCodec urlCodec = new UrlCodec(); private static final List<Codec> codecs; // From https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Event_Handlers - private static final List<String> jsEventList = Arrays.asList(new String[] { "onAbort", "onActivate", + private static final List<String> jsEventList = Arrays.asList(new String[] {"onAbort", "onActivate", "onAfterPrint", "onAfterUpdate", "onBeforeActivate", "onBeforeCopy", "onBeforeCut", "onBeforeDeactivate", "onBeforeEditFocus", "onBeforePaste", "onBeforePrint", "onBeforeUnload", "onBeforeUpdate", "onBegin", "onBlur", "onBounce", "onCellChange", "onChange", "onClick", "onContextMenu", "onControlSelect", "onCopy", 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 a7d9574..16f0fbd 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 @@ -140,7 +140,9 @@ public final class UtilProperties implements Serializable { private static Number getPropertyNumber(String resource, String name, Number defaultNumber, String type) { String str = getPropertyValue(resource, name); if (UtilValidate.isEmpty(str)) { - if (Debug.verboseOn()) Debug.logVerbose("The property " + resource + ":" + name + " is empty, using defaultNumber " + defaultNumber + ".", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("The property " + resource + ":" + name + " is empty, using defaultNumber " + defaultNumber + ".", MODULE); + } return defaultNumber; } try { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilTimer.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilTimer.java index 3c2f2ab..d2a06c9 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilTimer.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilTimer.java @@ -173,7 +173,7 @@ public class UtilTimer { * @return A String with the timing information, the timer String */ public String timerString(int level, String message) { - // String retString = "[[" + message + ": seconds since start: " + secondsSinceStart() + ",since last(" + lastMessage + "):" + secondsSinceLast() + "]]"; + // String retString = "[[" + message + ": seconds since start: " + secondsSinceStart() + ",since last(" + lastMessage + "):" + secondsSinceLast() + "]]"; StringBuilder retStringBuf = new StringBuilder(); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java index 53c688c..5b51a28 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java @@ -270,7 +270,9 @@ public class UelFunctions { } catch (NoSuchMethodException | NullPointerException | SecurityException e) { Debug.logError(e, "Error while initializing UelFunctions.Functions instance", MODULE); } - if (Debug.verboseOn()) Debug.logVerbose("UelFunctions.Functions loaded " + this.functionMap.size() + " functions", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("UelFunctions.Functions loaded " + this.functionMap.size() + " functions", MODULE); + } } @Override public Method resolveFunction(String prefix, String localName) { 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 6b8c9e5..587e138 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 @@ -227,7 +227,7 @@ public class CommonServices { * This service does not have required parameters and does not validate */ public static Map<String, Object> echoService(DispatchContext dctx, Map<String, ?> context) { - Map<String, Object> result = new LinkedHashMap<>(); + Map<String, Object> result = new LinkedHashMap<>(); result.putAll(context); result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); return result; @@ -385,7 +385,7 @@ public class CommonServices { String fileName = (String) context.get("_uploadFile_fileName"); String contentType = (String) context.get("_uploadFile_contentType"); - Map<String, Object> createCtx = new LinkedHashMap<>(); + Map<String, Object> createCtx = new LinkedHashMap<>(); createCtx.put("binData", array); createCtx.put("dataResourceTypeId", "OFBIZ_FILE"); createCtx.put("dataResourceName", fileName); @@ -407,7 +407,7 @@ public class CommonServices { GenericValue dataResource = (GenericValue) createResp.get("dataResource"); if (dataResource != null) { - Map<String, Object> contentCtx = new LinkedHashMap<>(); + Map<String, Object> contentCtx = new LinkedHashMap<>(); contentCtx.put("dataResourceId", dataResource.getString("dataResourceId")); contentCtx.put("localeString", ((Locale) context.get("locale")).toString()); contentCtx.put("contentTypeId", "DOCUMENT"); @@ -516,7 +516,7 @@ public class CommonServices { List<Map<String, Object>> metricsMapList = new LinkedList<>(); Collection<Metrics> metricsList = MetricsFactory.getMetrics(); for (Metrics metrics : metricsList) { - Map<String, Object> metricsMap = new LinkedHashMap<>(); + Map<String, Object> metricsMap = new LinkedHashMap<>(); metricsMap.put("name", metrics.getName()); metricsMap.put("serviceRate", metrics.getServiceRate()); metricsMap.put("threshold", metrics.getThreshold()); diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java index a04c619..80a0f13 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java @@ -72,7 +72,7 @@ public class FindServices { public static final Map<String, EntityComparisonOperator<?, ?>> entityOperators; static { - entityOperators = new LinkedHashMap<>(); + entityOperators = new LinkedHashMap<>(); entityOperators.put("between", EntityOperator.BETWEEN); entityOperators.put("equals", EntityOperator.EQUALS); entityOperators.put("greaterThan", EntityOperator.GREATER_THAN); @@ -504,7 +504,7 @@ public class FindServices { Map<String, ?> inputFields = checkMap(context.get("inputFields"), String.class, Object.class); // Input String noConditionFind = (String) context.get("noConditionFind"); String distinct = (String) context.get("distinct"); - List<String> fieldList = UtilGenerics.cast(context.get("fieldList")); + List<String> fieldList = UtilGenerics.cast(context.get("fieldList")); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); @@ -671,7 +671,7 @@ public class FindServices { List<String> orderByList = checkCollection(context.get("orderByList"), String.class); boolean noConditionFind = "Y".equals(context.get("noConditionFind")); boolean distinct = "Y".equals(context.get("distinct")); - List<String> fieldList = UtilGenerics.cast(context.get("fieldList")); + List<String> fieldList = UtilGenerics.cast(context.get("fieldList")); Locale locale = (Locale) context.get("locale"); Set<String> fieldSet = null; if (fieldList != null) { 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 3ccbbb9..3b00945 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 @@ -323,7 +323,9 @@ public class EmailServices { if (!"Y".equalsIgnoreCase(mailEnabled)) { // no error; just return as if we already processed Debug.logImportant("Mail notifications disabled in general.properties; mail with subject [" + subject + "] not sent to addressee [" + sendTo + "]", MODULE); - if (Debug.verboseOn()) Debug.logVerbose("What would have been sent, the addressee: " + sendTo + " subject: " + subject + " context: " + context, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("What would have been sent, the addressee: " + sendTo + " subject: " + subject + " context: " + context, MODULE); + } results.put("messageWrapper", new MimeMessageWrapper(session, mail)); return results; } diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java index 460f6c6..75fe2ca 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/email/NotificationServices.java @@ -145,7 +145,7 @@ public class NotificationServices { // make sure we have a valid body before sending if (body != null) { // retain only the required attributes for the sendMail service - Map<String, Object> emailContext = new LinkedHashMap<>(); + Map<String, Object> emailContext = new LinkedHashMap<>(); emailContext.put("sendTo", context.get("sendTo")); emailContext.put("body", body); emailContext.put("sendCc", context.get("sendCc")); @@ -193,7 +193,7 @@ public class NotificationServices { Locale locale = (Locale) context.get("locale"); Map<String, Object> result = null; if (templateData == null) { - templateData = new LinkedHashMap<>(); + templateData = new LinkedHashMap<>(); } try { 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 bac6c64..c8c9ea3 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 @@ -84,7 +84,7 @@ public final class GeoWorker { if (UtilValidate.isEmpty(geoIdByTypeMapOrig)) { return geoIdByTypeMapOrig; } - Map<String, String> geoIdByTypeMapTemp = new LinkedHashMap<>(); + Map<String, String> geoIdByTypeMapTemp = new LinkedHashMap<>(); for (Map.Entry<String, String> geoIdByTypeEntry: geoIdByTypeMapOrig.entrySet()) { List<GenericValue> geoAssocList = EntityQuery.use(delegator) .from("GeoAssoc") @@ -97,7 +97,7 @@ public final class GeoWorker { } } geoIdByTypeMapTemp = expandGeoRegionDeep(geoIdByTypeMapTemp, delegator); - Map<String, String> geoIdByTypeMapNew = new LinkedHashMap<>(); + Map<String, String> geoIdByTypeMapNew = new LinkedHashMap<>(); // add the temp Map first, then the original over top of it, ie give the original priority over the sub/expanded values geoIdByTypeMapNew.putAll(geoIdByTypeMapTemp); geoIdByTypeMapNew.putAll(geoIdByTypeMapOrig); diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java b/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java index d079378..5d5a1ba 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java @@ -71,7 +71,7 @@ public class ImageTransform { /* VARIABLES */ BufferedImage bufImg; - Map<String, Object> result = new LinkedHashMap<>(); + Map<String, Object> result = new LinkedHashMap<>(); /* BUFFERED IMAGE */ try { @@ -111,7 +111,7 @@ public class ImageTransform { /* VARIABLES */ BufferedImage bufNewImg; double defaultHeight, defaultWidth, scaleFactor; - Map<String, Object> result = new LinkedHashMap<>(); + Map<String, Object> result = new LinkedHashMap<>(); /* DIMENSIONS from ImageProperties */ // A missed dimension is authorized @@ -218,8 +218,8 @@ public class ImageTransform { /* VARIABLES */ Document document; Element rootElt; - Map<String, Map<String, String>> valueMap = new LinkedHashMap<>(); - Map<String, Object> result = new LinkedHashMap<>(); + Map<String, Map<String, String>> valueMap = new LinkedHashMap<>(); + Map<String, Object> result = new LinkedHashMap<>(); /* PARSING */ try { @@ -248,10 +248,10 @@ public class ImageTransform { /* get NAME and VALUE */ List<? extends Element> children = UtilXml.childElementList(rootElt); // FIXME : despite upgrading to jdom 1.1, it seems that getChildren is pre 1.5 java code (ie getChildren does not retun List<Element> but only List) for (Element currentElt : children) { - Map<String, String> eltMap = new LinkedHashMap<>(); + Map<String, String> eltMap = new LinkedHashMap<>(); List<? extends Element> children2 = UtilXml.childElementList(currentElt); if (children2.size() > 0) { - Map<String, String> childMap = new LinkedHashMap<>(); + Map<String, String> childMap = new LinkedHashMap<>(); // loop over Children 1st level for (Element currentChild : children2) { childMap.put(currentChild.getAttribute("name"), currentChild.getAttribute("value")); diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java index cfc7205..14c01a1 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java @@ -48,7 +48,9 @@ public class LdapAuthenticationServices { private static final String MODULE = LdapAuthenticationServices.class.getName(); public static boolean userLogin(DispatchContext ctx, Map<String, ?> context) { - if (Debug.verboseOn()) Debug.logVerbose("Starting LDAP authentication", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Starting LDAP authentication", MODULE); + } Properties env = UtilProperties.getProperties("jndiLdap"); String username = (String) context.get("login.username"); if (username == null) { @@ -75,9 +77,13 @@ public class LdapAuthenticationServices { if (dnTemplate != null) { dn = dnTemplate.replace("%u", username); } - if (Debug.verboseOn()) Debug.logVerbose("Using DN template: " + dn, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Using DN template: " + dn, MODULE); + } } else { - if (Debug.verboseOn()) Debug.logVerbose("Using UserLogin.userLdapDn: " + dn, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Using UserLogin.userLdapDn: " + dn, MODULE); + } } env.put(Context.SECURITY_PRINCIPAL, dn); env.put(Context.SECURITY_CREDENTIALS, password); @@ -86,10 +92,14 @@ public class LdapAuthenticationServices { DirContext ldapCtx = new InitialDirContext(env); ldapCtx.close(); } catch (NamingException e) { - if (Debug.verboseOn()) Debug.logVerbose("LDAP authentication failed: " + e.getMessage(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("LDAP authentication failed: " + e.getMessage(), MODULE); + } return false; } - if (Debug.verboseOn()) Debug.logVerbose("LDAP authentication succeeded", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("LDAP authentication succeeded", MODULE); + } if (!"true".equals(env.get("ldap.synchronize.passwords"))) { return true; } @@ -104,7 +114,9 @@ public class LdapAuthenticationServices { samePassword = currentPassword.equals(password); } if (!samePassword) { - if (Debug.verboseOn()) Debug.logVerbose("Starting password synchronization", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Starting password synchronization", MODULE); + } userLogin.set("currentPassword", useEncryption ? HashCrypt.cryptUTF8(LoginServices.getHashType(), null, password) : password, false); Transaction parentTx = null; boolean beganTransaction = false; @@ -127,7 +139,9 @@ public class LdapAuthenticationServices { } finally { try { TransactionUtil.commit(beganTransaction); - if (Debug.verboseOn()) Debug.logVerbose("Password synchronized", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Password synchronized", MODULE); + } } catch (GenericTransactionException e) { Debug.logError(e, "Could not commit nested transaction: " + e.getMessage(), MODULE); } @@ -136,7 +150,9 @@ public class LdapAuthenticationServices { if (parentTx != null) { try { TransactionUtil.resume(parentTx); - if (Debug.verboseOn()) Debug.logVerbose("Resumed the parent transaction.", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Resumed the parent transaction.", MODULE); + } } catch (GenericTransactionException e) { Debug.logError(e, "Could not resume parent nested transaction: " + e.getMessage(), MODULE); } 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 ea41d7a..fbc9ed6 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 @@ -73,7 +73,6 @@ public class LoginServices { /** * Login service to authenticate username and password - * * @return Map of results including (userLogin) GenericValue object */ public static Map<String, Object> userLogin(DispatchContext ctx, Map<String, ?> context) { @@ -611,7 +610,6 @@ public class LoginServices { /** * Creates a UserLogin - * * @param ctx * The DispatchContext that this service is operating in * @param context @@ -716,7 +714,6 @@ public class LoginServices { /** * Updates UserLogin Password info - * * @param ctx * The DispatchContext that this service is operating in * @param context @@ -855,7 +852,6 @@ public class LoginServices { /** * Updates the UserLoginId for a party, replicating password, etc from current login and expiring the old login. - * * @param ctx * The DispatchContext that this service is operating in * @param context @@ -963,7 +959,6 @@ public class LoginServices { /** * Updates UserLogin Security info - * * @param ctx * The DispatchContext that this service is operating in * @param context diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceWorker.java b/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceWorker.java index f5ce506..9e98a90 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceWorker.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceWorker.java @@ -143,7 +143,7 @@ public final class PreferenceWorker { * @return user preference map */ public static Map<String, Object> createUserPrefMap(List<GenericValue> recList) throws GeneralException { - Map<String, Object> userPrefMap = new LinkedHashMap<>(); + Map<String, Object> userPrefMap = new LinkedHashMap<>(); if (recList != null) { for (GenericValue value: recList) { addPrefToMap(value, userPrefMap); 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 7e2dd16..31b3ff6 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 @@ -86,7 +86,7 @@ public class QRCodeServices { Delegator delegator = ctx.getDelegator(); if (UtilValidate.isEmpty(message)) { - return ServiceUtil.returnError(UtilProperties.getMessage("QRCodeUiLabels", "ParameterCannotEmpty", new Object[] { "message" }, locale)); + return ServiceUtil.returnError(UtilProperties.getMessage("QRCodeUiLabels", "ParameterCannotEmpty", new Object[] {"message" }, locale)); } if (width == null) { width = Integer.parseInt(EntityUtilProperties.getPropertyValue("qrcode", "qrcode.default.width", "200", delegator)); @@ -99,7 +99,7 @@ public class QRCodeServices { } if (height < MIN_SIZE || height > MAX_SIZE) { return ServiceUtil.returnError(UtilProperties.getMessage("QRCodeUiLabels", "SizeOutOfBorderError", - new Object[] { "height", String.valueOf(height), String.valueOf(MIN_SIZE), String.valueOf(MAX_SIZE) }, locale)); + new Object[] {"height", String.valueOf(height), String.valueOf(MIN_SIZE), String.valueOf(MAX_SIZE) }, locale)); } if (UtilValidate.isEmpty(format)) { format = EntityUtilProperties.getPropertyValue("qrcode", "qrcode.default.format", "jpg", delegator); 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 cf8d29e..f31b8e9 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 @@ -146,7 +146,7 @@ public final class ContextHelper { public Map<String, Object> getParameters() { Map<String, Object> parameters = UtilGenerics.cast(this.context.getAttribute(ScriptUtil.PARAMETERS_KEY)); if (parameters == null) { - parameters = new LinkedHashMap<>(); + parameters = new LinkedHashMap<>(); this.context.setAttribute(ScriptUtil.PARAMETERS_KEY, parameters, ScriptContext.ENGINE_SCOPE); } return parameters; @@ -167,7 +167,7 @@ public final class ContextHelper { public Map<String, Object> getResults() { Map<String, Object> results = UtilGenerics.cast(this.context.getAttribute(ScriptUtil.RESULT_KEY)); if (results == null) { - results = new LinkedHashMap<>(); + results = new LinkedHashMap<>(); this.context.setAttribute(ScriptUtil.RESULT_KEY, results, ScriptContext.ENGINE_SCOPE); } return results; diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java index 322eb8b..540a287 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java @@ -65,7 +65,7 @@ public class StatusServices { Debug.logError(e, MODULE); } } - Map<String, Object> ret = new LinkedHashMap<>(); + Map<String, Object> ret = new LinkedHashMap<>(); ret.put("statusItems", statusItems); return ret; } diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/uom/UomWorker.java b/framework/common/src/main/java/org/apache/ofbiz/common/uom/UomWorker.java index bbc5121..d95cdd7 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/uom/UomWorker.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/uom/UomWorker.java @@ -99,7 +99,7 @@ public class UomWorker { if (originalValue == null || uomId == null || uomIdTo == null) return null; if (uomId.equals(uomIdTo)) return originalValue; - Map<String, Object> svcInMap = new LinkedHashMap<>(); + Map<String, Object> svcInMap = new LinkedHashMap<>(); svcInMap.put("originalValue", originalValue); svcInMap.put("uomId", uomId); svcInMap.put("uomIdTo", uomIdTo); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java index 64ef3bb..81c9c2f 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java @@ -1179,7 +1179,7 @@ public class GenericDelegator implements Delegator { updatedEntities = this.findList(entityName, condition, null, null, null, false); } - int rowsAffected = helper.storeByCondition(this, modelEntity, fieldsToSet, condition); + int rowsAffected = helper.storeByCondition(this, modelEntity, fieldsToSet, condition); if (rowsAffected > 0) { this.clearCacheLine(entityName); } @@ -2662,7 +2662,9 @@ public class GenericDelegator implements Delegator { Debug.logWarning(e, "DistributedCacheClear class with name " + distributedCacheClearClassName + " does not implement the DistributedCacheClear interface, distributed cache clearing will be disabled", MODULE); } } else { - if (Debug.verboseOn()) Debug.logVerbose("Distributed Cache Clear System disabled for delegator [" + delegatorFullName + "]", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Distributed Cache Clear System disabled for delegator [" + delegatorFullName + "]", MODULE); + } } return null; } diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java index 856fcdc..42e0791 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java @@ -48,7 +48,6 @@ import org.apache.ofbiz.entity.transaction.TransactionUtil; /** * Apache Commons DBCP connection factory. - * * @see <a href="http://commons.apache.org/proper/commons-dbcp/">Apache Commons DBCP</a> */ public class DBCPConnectionFactory implements ConnectionFactory { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java index 751e3fa..af2980a 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java @@ -45,7 +45,9 @@ public class DebugManagedDataSource<C extends Connection> extends ManagedDataSou GenericObjectPool<?> objectPool = (GenericObjectPool<?>) super.getPool(); Debug.logVerbose("Borrowing a connection from the pool; used/idle/total: " + objectPool.getNumActive() + "/" + objectPool.getNumIdle() + "/" + (objectPool.getNumActive() + objectPool.getNumIdle()) + "; min idle/max idle/max total: " + objectPool.getMinIdle() + "/" + objectPool.getMaxIdle() + "/" + objectPool.getMaxTotal(), MODULE); } else { - if (Debug.verboseOn()) Debug.logVerbose("Borrowing a connection from the pool; used/idle/total: " + super.getPool().getNumActive() + "/" + super.getPool().getNumIdle() + "/" + (super.getPool().getNumActive() + super.getPool().getNumIdle()), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Borrowing a connection from the pool; used/idle/total: " + super.getPool().getNumActive() + "/" + super.getPool().getNumIdle() + "/" + (super.getPool().getNumActive() + super.getPool().getNumIdle()), MODULE); + } } } return super.getConnection(); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java index 0c7f1d3..b585261 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java @@ -216,7 +216,9 @@ public class GenericDAO { // no non-primaryKey fields, update doesn't make sense, so don't do it if (fieldsToSave.size() <= 0) { - if (Debug.verboseOn()) Debug.logVerbose("Trying to do an update on an entity with no non-PK fields, returning having done nothing; entity=" + entity, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Trying to do an update on an entity with no non-PK fields, returning having done nothing; entity=" + entity, MODULE); + } // returning one because it was effectively updated, ie the same thing, so don't trigger any errors elsewhere return 1; } @@ -343,7 +345,9 @@ public class GenericDAO { String meName = modelMemberEntity.getEntityName(); String meAlias = modelMemberEntity.getEntityAlias(); - if (Debug.verboseOn()) Debug.logVerbose("[singleUpdateView]: Processing MemberEntity " + meName + " with Alias " + meAlias, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[singleUpdateView]: Processing MemberEntity " + meName + " with Alias " + meAlias, MODULE); + } try { memberModelEntity = delegator.getModelReader().getModelEntity(meName); } catch (GenericEntityException e) { @@ -373,15 +377,21 @@ public class GenericDAO { fieldName = keyMap.getRelFieldName(); } - if (Debug.verboseOn()) Debug.logVerbose("[singleUpdateView]: --- Found field to set: " + meAlias + "." + fieldName, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[singleUpdateView]: --- Found field to set: " + meAlias + "." + fieldName, MODULE); + } Object value = null; if (modelViewEntity.isField(keyMap.getFieldName())) { value = entity.get(keyMap.getFieldName()); - if (Debug.verboseOn()) Debug.logVerbose("[singleUpdateView]: --- Found map value: " + value.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[singleUpdateView]: --- Found map value: " + value.toString(), MODULE); + } } else if (modelViewEntity.isField(keyMap.getRelFieldName())) { value = entity.get(keyMap.getRelFieldName()); - if (Debug.verboseOn()) Debug.logVerbose("[singleUpdateView]: --- Found map value: " + value.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[singleUpdateView]: --- Found map value: " + value.toString(), MODULE); + } } else { throw new GenericNotImplementedException("Update on view entities: no direct link found, unable to update"); } @@ -399,7 +409,9 @@ public class GenericDAO { } catch (GenericEntityException e) { throw new GenericEntityException("Error while retrieving partial results for entity member: " + meName, e); } - if (Debug.verboseOn()) Debug.logVerbose("[singleUpdateView]: --- Found " + meResult.size() + " results for entity member " + meName, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[singleUpdateView]: --- Found " + meResult.size() + " results for entity member " + meName, MODULE); + } // Got results 0 -> INSERT, 1 -> UPDATE, >1 -> View is nor updatable GenericValue meGenericValue = null; @@ -428,7 +440,9 @@ public class GenericDAO { if (meModelField != null) { meGenericValue.set(meModelField.getName(), entity.get(modelField.getName())); meFieldsToSave.add(meModelField); - if (Debug.verboseOn()) Debug.logVerbose("[singleUpdateView]: --- Added field to save: " + meModelField.getName() + " with value " + meGenericValue.get(meModelField.getName()), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[singleUpdateView]: --- Added field to save: " + meModelField.getName() + " with value " + meGenericValue.get(meModelField.getName()), MODULE); + } } else { throw new GenericEntityException("Could not get field " + modelField.getName() + " from model entity " + memberModelEntity.getEntityName()); } @@ -449,7 +463,9 @@ public class GenericDAO { if (meFieldsToSave.size() > 0) { retVal += singleUpdate(meGenericValue, memberModelEntity, meFieldsToSave, sqlP); } else { - if (Debug.verboseOn()) Debug.logVerbose("[singleUpdateView]: No update on member entity " + memberModelEntity.getEntityName() + " needed", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[singleUpdateView]: No update on member entity " + memberModelEntity.getEntityName() + " needed", MODULE); + } } } } @@ -591,7 +607,9 @@ public class GenericDAO { if (verboseOn) { // put this inside an if statement so that we don't have to generate the string when not used... - if (Debug.verboseOn()) Debug.logVerbose("Doing selectListIteratorByCondition with whereEntityCondition: " + whereEntityCondition, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Doing selectListIteratorByCondition with whereEntityCondition: " + whereEntityCondition, MODULE); + } } // make two ArrayLists of fields, one for fields to select and the other for where clause fields (to find by) @@ -714,7 +732,9 @@ public class GenericDAO { if (verboseOn) { // put this inside an if statement so that we don't have to generate the string when not used... - if (Debug.verboseOn()) Debug.logVerbose("Setting the whereEntityConditionParams: " + whereEntityConditionParams, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Setting the whereEntityConditionParams: " + whereEntityConditionParams, MODULE); + } } // set all of the values from the Where EntityCondition for (EntityConditionParam whereEntityConditionParam: whereEntityConditionParams) { @@ -722,7 +742,9 @@ public class GenericDAO { } if (verboseOn) { // put this inside an if statement so that we don't have to generate the string when not used... - if (Debug.verboseOn()) Debug.logVerbose("Setting the havingEntityConditionParams: " + havingEntityConditionParams, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Setting the havingEntityConditionParams: " + havingEntityConditionParams, MODULE); + } } // set all of the values from the Having EntityCondition for (EntityConditionParam havingEntityConditionParam: havingEntityConditionParams) { @@ -963,7 +985,9 @@ public class GenericDAO { if (verboseOn) { // put this inside an if statement so that we don't have to generate the string when not used... - if (Debug.verboseOn()) Debug.logVerbose("Doing selectListIteratorByCondition with whereEntityCondition: " + whereEntityCondition, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Doing selectListIteratorByCondition with whereEntityCondition: " + whereEntityCondition, MODULE); + } } boolean isGroupBy = false; @@ -1043,14 +1067,18 @@ public class GenericDAO { } String sql = sqlBuffer.toString(); - if (Debug.verboseOn()) Debug.logVerbose("Count select sql: " + sql, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Count select sql: " + sql, MODULE); + } try (SQLProcessor sqlP = new SQLProcessor(delegator, helperInfo)) { sqlP.prepareStatement(sql, findOptions.getSpecifyTypeAndConcur(), findOptions.getResultSetType(), findOptions.getResultSetConcurrency(), findOptions.getFetchSize(), findOptions.getMaxRows()); if (verboseOn) { // put this inside an if statement so that we don't have to generate the string when not used... - if (Debug.verboseOn()) Debug.logVerbose("Setting the whereEntityConditionParams: " + whereEntityConditionParams, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Setting the whereEntityConditionParams: " + whereEntityConditionParams, MODULE); + } } // set all of the values from the Where EntityCondition for (EntityConditionParam whereEntityConditionParam: whereEntityConditionParams) { @@ -1058,7 +1086,9 @@ public class GenericDAO { } if (verboseOn) { // put this inside an if statement so that we don't have to generate the string when not used... - if (Debug.verboseOn()) Debug.logVerbose("Setting the havingEntityConditionParams: " + havingEntityConditionParams, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Setting the havingEntityConditionParams: " + havingEntityConditionParams, MODULE); + } } // set all of the values from the Having EntityCondition for (EntityConditionParam havingEntityConditionParam: havingEntityConditionParams) { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java index 6e7816b..b2281ce 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java @@ -66,7 +66,9 @@ public class GenericHelperDAO implements GenericHelper { return null; } int retVal = genericDAO.insert(value); - if (Debug.verboseOn()) Debug.logVerbose("Insert Return Value : " + retVal, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Insert Return Value : " + retVal, MODULE); + } return value; } @@ -126,8 +128,12 @@ public class GenericHelperDAO implements GenericHelper { */ @Override public int removeByPrimaryKey(GenericPK primaryKey) throws GenericEntityException { - if (primaryKey == null) return 0; - if (Debug.verboseOn()) Debug.logVerbose("Removing GenericPK: " + primaryKey.toString(), MODULE); + if (primaryKey == null) { + return 0; + } + if (Debug.verboseOn()) { + Debug.logVerbose("Removing GenericPK: " + primaryKey.toString(), MODULE); + } return genericDAO.delete(primaryKey); } 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 43de9b9..b185b89 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 @@ -489,7 +489,9 @@ public class DatabaseUtil { if (refTableInfoMap == null) { // uh oh, something happened while getting info... - if (Debug.verboseOn()) Debug.logVerbose("Ref Table Info Map is null", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Ref Table Info Map is null", MODULE); + } } else { for (ModelEntity entity: modelEntityList) { String entityName = entity.getEntityName(); @@ -534,7 +536,9 @@ public class DatabaseUtil { // if not, create one String noFkMessage = "No Foreign Key Constraint [" + relConstraintName + "] found for entity [" + entityName + "]"; if (messages != null) messages.add(noFkMessage); - if (Debug.infoOn()) Debug.logInfo(noFkMessage, MODULE); + if (Debug.infoOn()) { + Debug.logInfo(noFkMessage, MODULE); + } if (addMissing) { String errMsg = createForeignKey(entity, modelRelation, relModelEntity, datasourceInfo.getConstraintNameClipLength(), datasourceInfo.getFkStyle(), datasourceInfo.getUseFkInitiallyDeferred()); @@ -568,7 +572,9 @@ public class DatabaseUtil { } } } - if (Debug.infoOn()) Debug.logInfo("Created " + numFksCreated + " fk refs", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Created " + numFksCreated + " fk refs", MODULE); + } } // make sure each one-relation has an index @@ -585,7 +591,9 @@ public class DatabaseUtil { if (tableIndexListMap == null) { // uh oh, something happened while getting info... - if (Debug.verboseOn()) Debug.logVerbose("Ref Table Info Map is null", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Ref Table Info Map is null", MODULE); + } } else { for (ModelEntity entity: modelEntityList) { String entityName = entity.getEntityName(); @@ -629,7 +637,9 @@ public class DatabaseUtil { // if not, create one String noIdxMessage = "No Index [" + relConstraintName + "] found for entity [" + entityName + "]"; if (messages != null) messages.add(noIdxMessage); - if (Debug.infoOn()) Debug.logInfo(noIdxMessage, MODULE); + if (Debug.infoOn()) { + Debug.logInfo(noIdxMessage, MODULE); + } if (addMissing) { String errMsg = createForeignKeyIndex(entity, modelRelation, datasourceInfo.getConstraintNameClipLength()); @@ -669,7 +679,9 @@ public class DatabaseUtil { // if not, create one String noIdxMessage = "No Index [" + relIndexName + "] found for entity [" + entityName + "]"; if (messages != null) messages.add(noIdxMessage); - if (Debug.infoOn()) Debug.logInfo(noIdxMessage, MODULE); + if (Debug.infoOn()) { + Debug.logInfo(noIdxMessage, MODULE); + } if (addMissing) { String errMsg = createDeclaredIndex(entity, modelIndex); @@ -922,7 +934,9 @@ public class DatabaseUtil { } printDbMiscData(dbData, connection); - if (Debug.infoOn()) Debug.logInfo("Getting Table Info From Database", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Getting Table Info From Database", MODULE); + } // get ALL tables from this database TreeSet<String> tableNames = new TreeSet<>(); @@ -988,11 +1002,8 @@ public class DatabaseUtil { && !"BASE TABLE".equalsIgnoreCase(tableType)) { continue; } - // String remarks = tableSet.getString("REMARKS"); tableNames.add(tableName); - // if (Debug.infoOn()) Debug.logInfo("Found table named [" + tableName + "] - // of type [" + tableType + "] with remarks: " + remarks, MODULE); } catch (SQLException e) { String message = "Error getting table information... Error was:" + e.toString(); Debug.logError(message, MODULE); @@ -1056,7 +1067,9 @@ public class DatabaseUtil { return null; } - if (Debug.infoOn()) Debug.logInfo("Getting Column Info From Database", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Getting Column Info From Database", MODULE); + } Map<String, Map<String, ColumnCheckInfo>> colInfo = new HashMap<>(); try { @@ -1263,7 +1276,9 @@ public class DatabaseUtil { } */ - if (Debug.infoOn()) Debug.logInfo("Getting Foreign Key (Reference) Info From Database", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Getting Foreign Key (Reference) Info From Database", MODULE); + } Map<String, Map<String, ReferenceCheckInfo>> refInfo = new HashMap<>(); @@ -1318,13 +1333,17 @@ public class DatabaseUtil { rcInfo.fkName = rcInfo.fkName.toUpperCase(); } - if (Debug.verboseOn()) Debug.logVerbose("Got: " + rcInfo.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Got: " + rcInfo.toString(), MODULE); + } Map<String, ReferenceCheckInfo> tableRefInfo = refInfo.get(rcInfo.fkTableName); if (tableRefInfo == null) { tableRefInfo = new HashMap<>(); refInfo.put(rcInfo.fkTableName, tableRefInfo); - if (Debug.verboseOn()) Debug.logVerbose("Adding new Map for table: " + rcInfo.fkTableName, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Adding new Map for table: " + rcInfo.fkTableName, MODULE); + } } if (!tableRefInfo.containsKey(rcInfo.fkName)) totalFkRefs++; tableRefInfo.put(rcInfo.fkName, rcInfo); @@ -1336,7 +1355,9 @@ public class DatabaseUtil { } } - // if (Debug.infoOn()) Debug.logInfo("There are " + totalFkRefs + " in the database", MODULE); + // if (Debug.infoOn()) { + // Debug.logInfo("There are " + totalFkRefs + " in the database", MODULE) + // }; try { rsCols.close(); } catch (SQLException e) { @@ -1344,8 +1365,9 @@ public class DatabaseUtil { Debug.logError(message, MODULE); if (messages != null) messages.add(message); } - // } - if (Debug.infoOn()) Debug.logInfo("There are " + totalFkRefs + " foreign key refs in the database", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("There are " + totalFkRefs + " foreign key refs in the database", MODULE); + } } catch (SQLException e) { String message = "Error getting fk reference meta data Error was:" + e.toString() + ". Not checking fk refs."; @@ -1397,7 +1419,9 @@ public class DatabaseUtil { if (messages != null) messages.add(message); } - if (Debug.infoOn()) Debug.logInfo("Getting Index Info From Database", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Getting Index Info From Database", MODULE); + } Map<String, Set<String>> indexInfo = new HashMap<>(); try { @@ -1446,7 +1470,9 @@ public class DatabaseUtil { if (tableIndexList == null) { tableIndexList = new TreeSet<>(); indexInfo.put(tableName, tableIndexList); - if (Debug.verboseOn()) Debug.logVerbose("Adding new Map for table: " + tableName, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Adding new Map for table: " + tableName, MODULE); + } } // Need the check here, because an index can contain multiple columns, // and this is represented by having multiple rows in rsCols. @@ -1460,7 +1486,9 @@ public class DatabaseUtil { } } - // if (Debug.infoOn()) Debug.logInfo("There are " + totalIndices + " indices in the database", MODULE); + // if (Debug.infoOn()) { + // Debug.logInfo("There are " + totalIndices + " indices in the database", MODULE); + //} if (rsCols != null) { try { rsCols.close(); @@ -1471,7 +1499,9 @@ public class DatabaseUtil { } } } - if (Debug.infoOn()) Debug.logInfo("There are " + totalIndices + " indices in the database", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("There are " + totalIndices + " indices in the database", MODULE); + } } catch (SQLException e) { String message = "Error getting fk reference meta data Error was:" + e.toString() + ". Not checking fk refs."; @@ -1484,7 +1514,9 @@ public class DatabaseUtil { } catch (SQLException e) { String message = "Unable to close database connection, continuing anyway... Error was:" + e.toString(); Debug.logError(message, MODULE); - if (messages != null) messages.add(message); + if (messages != null) { + messages.add(message); + } } } return indexInfo; @@ -1664,7 +1696,9 @@ public class DatabaseUtil { sqlBuf.append(this.datasourceInfo.getCollate()); } - if (Debug.verboseOn()) Debug.logVerbose("[createTable] sql=" + sqlBuf.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[createTable] sql=" + sqlBuf.toString(), MODULE); + } try (Connection connection = getConnection(); Statement stmt = connection.createStatement()) { stmt.executeUpdate(sqlBuf.toString()); } catch (SQLException e) { @@ -1699,7 +1733,9 @@ public class DatabaseUtil { StringBuilder sqlBuf = new StringBuilder("DROP TABLE "); sqlBuf.append(entity.getTableName(datasourceInfo)); - if (Debug.verboseOn()) Debug.logVerbose("[deleteTable] sql=" + sqlBuf.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[deleteTable] sql=" + sqlBuf.toString(), MODULE); + } try (Connection connection = getConnectionLogged(messages); Statement stmt = connection.createStatement()) { stmt.executeUpdate(sqlBuf.toString()); } catch (SQLException e) { @@ -1744,7 +1780,9 @@ public class DatabaseUtil { } String sql = sqlBuf.toString(); - if (Debug.infoOn()) Debug.logInfo("[addColumn] sql=" + sql, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("[addColumn] sql=" + sql, MODULE); + } try (Connection connection = getConnection(); Statement stmt = connection.createStatement()) { stmt.executeUpdate(sql); } catch (SQLException e) { @@ -1771,7 +1809,9 @@ public class DatabaseUtil { } String sql2 = sql2Buf.toString(); - if (Debug.infoOn()) Debug.logInfo("[addColumn] sql failed, trying sql2=" + sql2, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("[addColumn] sql failed, trying sql2=" + sql2, MODULE); + } try (Connection connection = getConnection(); Statement stmt = connection.createStatement()) { stmt.executeUpdate(sql2); } catch (SQLException e2) { @@ -1811,7 +1851,9 @@ public class DatabaseUtil { sqlBuf.append(newName); String sql = sqlBuf.toString(); - if (Debug.infoOn()) Debug.logInfo("[renameColumn] sql=" + sql, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("[renameColumn] sql=" + sql, MODULE); + } try (Connection connection = getConnection(); Statement stmt = connection.createStatement()) { stmt.executeUpdate(sql); } catch (SQLException e) { @@ -1853,10 +1895,14 @@ public class DatabaseUtil { sqlBuf1.append(tempName); String sql1 = sqlBuf1.toString(); - if (Debug.infoOn()) Debug.logInfo("[moveData] sql=" + sql1, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("[moveData] sql=" + sql1, MODULE); + } try (Connection connection = getConnectionLogged(messages); Statement stmt = connection.createStatement()) { int changed = stmt.executeUpdate(sql1); - if (Debug.infoOn()) Debug.logInfo("[moveData] " + changed + " records updated", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("[moveData] " + changed + " records updated", MODULE); + } } catch (SQLException e) { String thisMsg = "SQL Exception while executing the following:\n" + sql1 + "\nError was: " + e.toString(); if (messages != null) @@ -1872,7 +1918,9 @@ public class DatabaseUtil { sqlBuf2.append(tempName); String sql2 = sqlBuf2.toString(); - if (Debug.infoOn()) Debug.logInfo("[dropColumn] sql=" + sql2, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("[dropColumn] sql=" + sql2, MODULE); + } try (Connection connection = getConnectionLogged(messages); Statement stmt = connection.createStatement()) { stmt.executeUpdate(sql2); } catch (SQLException e) { @@ -2020,7 +2068,9 @@ public class DatabaseUtil { } sqlBuf.append(fkConstraintClause); - if (Debug.verboseOn()) Debug.logVerbose("[createForeignKey] sql=" + sqlBuf.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[createForeignKey] sql=" + sqlBuf.toString(), MODULE); + } try (Connection connection = getConnection(); Statement stmt = connection.createStatement()) { stmt.executeUpdate(sqlBuf.toString()); } catch (SQLException e) { @@ -2172,7 +2222,9 @@ public class DatabaseUtil { } sqlBuf.append(relConstraintName); - if (Debug.verboseOn()) Debug.logVerbose("[deleteForeignKey] sql=" + sqlBuf.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[deleteForeignKey] sql=" + sqlBuf.toString(), MODULE); + } try (Connection connection = getConnection(); Statement stmt = connection.createStatement()) { stmt.executeUpdate(sqlBuf.toString()); } catch (SQLException e) { @@ -2232,7 +2284,9 @@ public class DatabaseUtil { entity.colNameString(entity.getPkFieldsUnmodifiable(), sqlBuf, ""); sqlBuf.append(")"); - if (Debug.verboseOn()) Debug.logVerbose("[createPrimaryKey] sql=" + sqlBuf.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[createPrimaryKey] sql=" + sqlBuf.toString(), MODULE); + } try (Connection connection = getConnection(); Statement stmt = connection.createStatement()) { stmt.executeUpdate(sqlBuf.toString()); } catch (SQLException e) { @@ -2291,7 +2345,9 @@ public class DatabaseUtil { // DEJ20050502 not sure why this is here, shouldn't be needed and some dbs don't support like this, ie when used with PRIMARY KEY: sqlBuf.append(" CASCADE"); } - if (Debug.verboseOn()) Debug.logVerbose("[deletePrimaryKey] sql=" + sqlBuf.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[deletePrimaryKey] sql=" + sqlBuf.toString(), MODULE); + } try (Connection connection = getConnection(); Statement stmt = connection.createStatement()) { stmt.executeUpdate(sqlBuf.toString()); } catch (SQLException e) { @@ -2354,7 +2410,9 @@ public class DatabaseUtil { public String createDeclaredIndex(ModelEntity entity, ModelIndex modelIndex) { String createIndexSql = makeIndexClause(entity, modelIndex); - if (Debug.verboseOn()) Debug.logVerbose("[createForeignKeyIndex] index sql=" + createIndexSql, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[createForeignKeyIndex] index sql=" + createIndexSql, MODULE); + } try (Connection connection = getConnection(); Statement stmt = connection.createStatement()) { stmt.executeUpdate(createIndexSql); @@ -2432,7 +2490,9 @@ public class DatabaseUtil { retMsgsBuffer.append("\n"); } retMsgsBuffer.append(retMsg); - if (Debug.infoOn()) Debug.logInfo(retMsg, MODULE); + if (Debug.infoOn()) { + Debug.logInfo(retMsg, MODULE); + } } } @@ -2456,7 +2516,9 @@ public class DatabaseUtil { indexSqlBuf.append(modelIndex.getName()); String deleteIndexSql = indexSqlBuf.toString(); - if (Debug.verboseOn()) Debug.logVerbose("[deleteDeclaredIndex] index sql=" + deleteIndexSql, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[deleteDeclaredIndex] index sql=" + deleteIndexSql, MODULE); + } try (Connection connection = getConnection(); Statement stmt = connection.createStatement()) { stmt.executeUpdate(deleteIndexSql); @@ -2524,7 +2586,9 @@ public class DatabaseUtil { return "Error creating foreign key index clause, see log for details"; } - if (Debug.verboseOn()) Debug.logVerbose("[createForeignKeyIndex] index sql=" + createIndexSql, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[createForeignKeyIndex] index sql=" + createIndexSql, MODULE); + } try (Connection connection = getConnection(); Statement stmt = connection.createStatement()) { stmt.executeUpdate(createIndexSql); @@ -2629,7 +2693,9 @@ public class DatabaseUtil { String deleteIndexSql = indexSqlBuf.toString(); - if (Debug.verboseOn()) Debug.logVerbose("[deleteForeignKeyIndex] index sql=" + deleteIndexSql, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[deleteForeignKeyIndex] index sql=" + deleteIndexSql, MODULE); + } try (Connection connection = getConnection(); Statement stmt = connection.createStatement()) { stmt.executeUpdate(deleteIndexSql); @@ -2693,7 +2759,9 @@ public class DatabaseUtil { sqlTableBuf.append(this.datasourceInfo.getCollate()); } - if (Debug.verboseOn()) Debug.logVerbose("[updateCharacterSetAndCollation] character-set and collate sql=" + sqlTableBuf, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[updateCharacterSetAndCollation] character-set and collate sql=" + sqlTableBuf, MODULE); + } try (Statement stmt = connection.createStatement()) { stmt.executeUpdate(sqlTableBuf.toString()); @@ -2741,7 +2809,9 @@ public class DatabaseUtil { } } - if (Debug.verboseOn()) Debug.logVerbose("[updateCharacterSetAndCollation] character-set and collate sql=" + sqlBuf, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[updateCharacterSetAndCollation] character-set and collate sql=" + sqlBuf, MODULE); + } try (Statement stmt = connection.createStatement()) { stmt.executeUpdate(sqlBuf.toString()); } catch (SQLException e) { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java index 6e89626..b3ba25b 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java @@ -148,12 +148,16 @@ public class SQLProcessor implements AutoCloseable { return; } - if (Debug.verboseOn()) Debug.logVerbose("SQLProcessor:commit() _manualTX=" + _manualTX, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("SQLProcessor:commit() _manualTX=" + _manualTX, MODULE); + } if (_manualTX) { try { _connection.commit(); - if (Debug.verboseOn()) Debug.logVerbose("SQLProcessor:commit() : called commit on connection", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("SQLProcessor:commit() : called commit on connection", MODULE); + } } catch (SQLException sqle) { Debug.logError(sqle, "Error committing transaction: " + sqle.toString()); try { @@ -174,16 +178,22 @@ public class SQLProcessor implements AutoCloseable { return; } - if (Debug.verboseOn()) Debug.logVerbose("SQLProcessor:rollback() _manualTX=" + _manualTX, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("SQLProcessor:rollback() _manualTX=" + _manualTX, MODULE); + } try { if (_manualTX) { _connection.rollback(); - if (Debug.verboseOn()) Debug.logVerbose("SQLProcessor:rollback() : _manualTX=" + _manualTX, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("SQLProcessor:rollback() : _manualTX=" + _manualTX, MODULE); + } } else { try { TransactionUtil.setRollbackOnly("rollback called in Entity Engine SQLProcessor", new Exception("Current Location Stack")); - if (Debug.verboseOn()) Debug.logVerbose("SQLProcessor:rollback() : _manualTX=" + _manualTX, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("SQLProcessor:rollback() : _manualTX=" + _manualTX, MODULE); + } } catch (GenericTransactionException e) { Debug.logError(e, "Error setting rollback only", MODULE); throw new GenericDataSourceException("Error setting rollback only", e); @@ -203,7 +213,9 @@ public class SQLProcessor implements AutoCloseable { @Override public void close() throws GenericDataSourceException { if (_manualTX) { - if (Debug.verboseOn()) Debug.logVerbose("SQLProcessor:close() calling commit : _manualTX=" + _manualTX, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("SQLProcessor:close() calling commit : _manualTX=" + _manualTX, MODULE); + } commit(); } @@ -212,7 +224,9 @@ public class SQLProcessor implements AutoCloseable { if (_rs != null) { try { _rs.close(); - if (Debug.verboseOn()) Debug.logVerbose("SQLProcessor:close() result close : _manualTX=" + _manualTX, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("SQLProcessor:close() result close : _manualTX=" + _manualTX, MODULE); + } } catch (SQLException sqle) { Debug.logWarning(sqle.getMessage(), MODULE); } @@ -223,7 +237,9 @@ public class SQLProcessor implements AutoCloseable { if (_ps != null) { try { _ps.close(); - if (Debug.verboseOn()) Debug.logVerbose("SQLProcessor:close() preparedStatement close : _manualTX=" + _manualTX, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("SQLProcessor:close() preparedStatement close : _manualTX=" + _manualTX, MODULE); + } } catch (SQLException sqle) { Debug.logWarning(sqle.getMessage(), MODULE); } @@ -234,7 +250,9 @@ public class SQLProcessor implements AutoCloseable { if ((_connection != null) && _bDeleteConnection) { try { _connection.close(); - if (Debug.verboseOn()) Debug.logVerbose("SQLProcessor:close() connection close : _manualTX=" + _manualTX, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("SQLProcessor:close() connection close : _manualTX=" + _manualTX, MODULE); + } } catch (SQLException sqle) { Debug.logWarning(sqle.getMessage(), MODULE); } @@ -259,7 +277,9 @@ public class SQLProcessor implements AutoCloseable { try { _connection = TransactionFactoryLoader.getInstance().getConnection(helperInfo); - if (Debug.verboseOn()) Debug.logVerbose("SQLProcessor:connection() : manualTx=" + _manualTX, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("SQLProcessor:connection() : manualTx=" + _manualTX, MODULE); + } } catch (SQLException sqle) { throw new GenericDataSourceException("Unable to establish a connection with the database.", sqle); } @@ -299,7 +319,9 @@ public class SQLProcessor implements AutoCloseable { if (_connection.getAutoCommit()) { try { _connection.setAutoCommit(false); - if (Debug.verboseOn()) Debug.logVerbose("SQLProcessor:setAutoCommit(false) : manualTx=" + _manualTX, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("SQLProcessor:setAutoCommit(false) : manualTx=" + _manualTX, MODULE); + } } catch (SQLException sqle) { _manualTX = false; } @@ -310,7 +332,9 @@ public class SQLProcessor implements AutoCloseable { try { if (TransactionUtil.getStatus() == TransactionUtil.STATUS_ACTIVE) { - if (Debug.verboseOn()) Debug.logVerbose("[SQLProcessor.getConnection] : active transaction", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[SQLProcessor.getConnection] : active transaction", MODULE); + } _manualTX = false; } } catch (GenericTransactionException e) { @@ -319,7 +343,9 @@ public class SQLProcessor implements AutoCloseable { "transaction status: " + e.toString(), MODULE); } - if (Debug.verboseOn()) Debug.logVerbose("[SQLProcessor.getConnection] : con=" + _connection, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[SQLProcessor.getConnection] : con=" + _connection, MODULE); + } _bDeleteConnection = true; return _connection; @@ -361,7 +387,9 @@ public class SQLProcessor implements AutoCloseable { * @throws GenericEntityException */ public void prepareStatement(String sql, boolean specifyTypeAndConcur, int resultSetType, int resultSetConcurrency, int fetchSize, int maxRows) throws GenericDataSourceException, GenericEntityException { - if (Debug.verboseOn()) Debug.logVerbose("[SQLProcessor.prepareStatement] sql=" + sql, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[SQLProcessor.prepareStatement] sql=" + sql, MODULE); + } if (_connection == null) { getConnection(); @@ -372,14 +400,20 @@ public class SQLProcessor implements AutoCloseable { _ind = 1; if (specifyTypeAndConcur) { _ps = _connection.prepareStatement(sql, resultSetType, resultSetConcurrency); - if (Debug.verboseOn()) Debug.logVerbose("[SQLProcessor.prepareStatement] _ps=" + _ps, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[SQLProcessor.prepareStatement] _ps=" + _ps, MODULE); + } } else { _ps = _connection.prepareStatement(sql); - if (Debug.verboseOn()) Debug.logVerbose("[SQLProcessor.prepareStatement] (def) _ps=" + _ps, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[SQLProcessor.prepareStatement] (def) _ps=" + _ps, MODULE); + } } if (maxRows > 0) { _ps.setMaxRows(maxRows); - if (Debug.verboseOn()) Debug.logVerbose("[SQLProcessor.prepareStatement] max rows set : " + maxRows, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[SQLProcessor.prepareStatement] max rows set : " + maxRows, MODULE); + } } this.setFetchSize(_ps, fetchSize); } catch (SQLException sqle) { @@ -500,7 +534,9 @@ public class SQLProcessor implements AutoCloseable { } try { - if (Debug.verboseOn()) Debug.logVerbose("[SQLProcessor.execQuery]: " + sql, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[SQLProcessor.execQuery]: " + sql, MODULE); + } executeQuery(sql); // process the results by calling the listener for diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java index 2db3215..261ffe6 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java @@ -434,12 +434,16 @@ public final class SqlJdbcUtil { //String fieldPrefix = includeTablenamePrefix ? (modelEntity.getTableName(datasourceInfo) + ".") : ""; if (UtilValidate.isNotEmpty(orderBy)) { - if (Debug.verboseOn()) Debug.logVerbose("Order by list contains: " + orderBy.size() + " entries.", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Order by list contains: " + orderBy.size() + " entries.", MODULE); + } OrderByList orderByList = new OrderByList(orderBy); orderByList.checkOrderBy(modelEntity); orderByList.makeOrderByString(sql, modelEntity, includeTablenamePrefix, datasourceInfo); } - if (Debug.verboseOn()) Debug.logVerbose("makeOrderByClause: " + sql.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("makeOrderByClause: " + sql.toString(), MODULE); + } return sql.toString(); } @@ -796,10 +800,14 @@ public final class SqlJdbcUtil { in = new ObjectInputStream(binaryInput); return in.readObject(); } catch (IOException ex) { - if (Debug.verboseOn()) Debug.logVerbose("Unable to read BLOB data from input stream while getting value : " + curField.getName() + " [" + curField.getColName() + "] (" + ind + "): " + ex.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Unable to read BLOB data from input stream while getting value : " + curField.getName() + " [" + curField.getColName() + "] (" + ind + "): " + ex.toString(), MODULE); + } return null; } catch (ClassNotFoundException ex) { - if (Debug.verboseOn()) Debug.logVerbose("Class not found: Unable to cast BLOB data to an Java object while getting value: " + curField.getName() + " [" + curField.getColName() + "] (" + ind + "); most likely because it is a straight byte[], so just using the raw bytes" + ex.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Class not found: Unable to cast BLOB data to an Java object while getting value: " + curField.getName() + " [" + curField.getColName() + "] (" + ind + "); most likely because it is a straight byte[], so just using the raw bytes" + ex.toString(), MODULE); + } return null; } finally { if (in != null) { @@ -868,11 +876,13 @@ public final class SqlJdbcUtil { fieldClassName = "byte[]"; } - if (Debug.verboseOn()) Debug.logVerbose("type of field " + entityName + "." + modelField.getName() + - " is " + fieldClassName + ", was expecting " + mft.getJavaType() + "; this may " + - "indicate an error in the configuration or in the class, and may result " + - "in an SQL-Java data conversion error. Will use the real field type: " + - fieldClassName + ", not the definition.", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("type of field " + entityName + "." + modelField.getName() + + " is " + fieldClassName + ", was expecting " + mft.getJavaType() + "; this may " + + "indicate an error in the configuration or in the class, and may result " + + "in an SQL-Java data conversion error. Will use the real field type: " + + fieldClassName + ", not the definition.", MODULE); + } fieldType = fieldClassName; } } diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntityChecker.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntityChecker.java index 56f3679..05f0371 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntityChecker.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntityChecker.java @@ -286,7 +286,7 @@ public class ModelEntityChecker { } } - protected static final String[] rwArray = { "ABORT", "ABS", "ABSOLUTE", + protected static final String[] rwArray = {"ABORT", "ABS", "ABSOLUTE", "ACCEPT", "ACCES", "ACCESS", "ACS", "ACTION", "ACTIVATE", "ADD", "ADDFORM", "ADMIN", "AFTER", "AGGREGATE", "ALIAS", "ALL", "ALLOCATE", "ALTER", "ANALYZE", "AND", "ANDFILENAME", "ANY", "ANYFINISH", "APPEND", 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 e9db70e..7bbe27a 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 @@ -419,7 +419,9 @@ public class ModelReader implements Serializable { String message = "Existing relationship with the same name, but different specs found from what would be auto-created for Entity [" + relatedEnt.getEntityName() + "] and relationship to entity [" + curModelEntity.getEntityName() + "] title [" + title + "]; would auto-create: type [" + newRel.getType() + "] and fields [" + newRel.keyMapString(",", "") + "]"; - if (Debug.verboseOn()) Debug.logVerbose(message, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose(message, MODULE); + } } } } diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java index 1fec495..ef103be 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java @@ -1408,7 +1408,9 @@ public class ModelViewEntity extends ModelEntity { value = this.viewEntityCondition.modelViewEntity.convertFieldValue(lhsField, value, modelFieldTypeReader, new HashMap<>()); } - if (Debug.verboseOn()) Debug.logVerbose("[" + this.viewEntityCondition.modelViewEntity.getEntityName() + "]: Got value for fieldName [" + fieldName + "]: " + value, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[" + this.viewEntityCondition.modelViewEntity.getEntityName() + "]: Got value for fieldName [" + fieldName + "]: " + value, MODULE); + } Object rhs = null; if (value != null) { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java index 86f0af2..ae0bab9 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java @@ -234,7 +234,9 @@ public final class TransactionUtil implements Status { if (ut != null) { try { int status = ut.getStatus(); - if (Debug.verboseOn()) Debug.logVerbose("Current status : " + getTransactionStateString(status), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Current status : " + getTransactionStateString(status), MODULE); + } if (status != STATUS_NO_TRANSACTION && status != STATUS_COMMITTING && status != STATUS_COMMITTED && status != STATUS_ROLLING_BACK && status != STATUS_ROLLEDBACK) { ut.commit(); @@ -245,7 +247,9 @@ public final class TransactionUtil implements Status { clearTransactionBeginStack(); clearSetRollbackOnlyCause(); - if (Debug.verboseOn()) Debug.logVerbose("Transaction committed", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Transaction committed", MODULE); + } } else { Debug.logWarning("Not committing transaction, status is " + getStatusString(), MODULE); } diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java index a558772..dc473fe 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java @@ -49,7 +49,9 @@ public class EntityDataAssert { return 0; } - if (Debug.verboseOn()) Debug.logVerbose("Loading XML Resource: " + dataUrl.toExternalForm(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Loading XML Resource: " + dataUrl.toExternalForm(), MODULE); + } try { for (GenericValue checkValue: delegator.readXmlDocument(dataUrl)) { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java index ec30b24..d5c6a02 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java @@ -247,7 +247,9 @@ public class EntityDataLoader { return 0; } - if (Debug.verboseOn()) Debug.logVerbose("[loadData] Loading XML Resource: \"" + dataUrl.toExternalForm() + "\"", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[loadData] Loading XML Resource: \"" + dataUrl.toExternalForm() + "\"", MODULE); + } try { /* The OLD way 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 ba4929c..b0c3aa7 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 @@ -406,7 +406,7 @@ public class EntityQuery { if (!this.useCache && !this.filterByDate) { efo.setMaxRows(1); } - GenericValue result = EntityUtil.getFirst(query(efo)); + GenericValue result = EntityUtil.getFirst(query(efo)); return result; } @@ -415,7 +415,7 @@ public class EntityQuery { */ public GenericValue queryOne() throws GenericEntityException { this.searchPkOnly = true; - GenericValue result = EntityUtil.getOnly(queryList()); + GenericValue result = EntityUtil.getOnly(queryList()); return result; } diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java index 3b363fe..1436869 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java @@ -297,7 +297,9 @@ public class EntitySaxReader extends DefaultHandler { @Override public void endElement(String namespaceURI, String localName, String fullNameString) throws SAXException { - if (Debug.verboseOn()) Debug.logVerbose("endElement: localName=" + localName + ", fullName=" + fullNameString + ", numberRead=" + numberRead, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("endElement: localName=" + localName + ", fullName=" + fullNameString + ", numberRead=" + numberRead, MODULE); + } if ("entity-engine-xml".equals(fullNameString)) { return; } @@ -331,7 +333,9 @@ public class EntitySaxReader extends DefaultHandler { context.put("doc", nodeModel); template.process(context, outWriter); String s = outWriter.toString(); - if (Debug.verboseOn()) Debug.logVerbose("transformed xml: " + s, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("transformed xml: " + s, MODULE); + } EntitySaxReader reader = new EntitySaxReader(delegator); reader.setUseTryInsertMethod(this.useTryInsertMethod); @@ -453,7 +457,9 @@ public class EntitySaxReader extends DefaultHandler { @Override public void startElement(String namepsaceURI, String localName, String fullNameString, Attributes attributes) throws SAXException { - if (Debug.verboseOn()) Debug.logVerbose("startElement: localName=" + localName + ", fullName=" + fullNameString + ", attributes=" + attributes, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("startElement: localName=" + localName + ", fullName=" + fullNameString + ", attributes=" + attributes, MODULE); + } if ("entity-engine-xml".equals(fullNameString)) { // check the maintain-timestamp flag CharSequence maintainTx = attributes.getValue("maintain-timestamps"); 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 ba9fa85..80ea034 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 @@ -360,7 +360,9 @@ public final class EntityUtil { List<T> result = new ArrayList<>(); result.addAll(values); - if (Debug.verboseOn()) Debug.logVerbose("Sorting " + values.size() + " values, orderBy=" + orderBy.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Sorting " + values.size() + " values, orderBy=" + orderBy.toString(), MODULE); + } result.sort(new OrderByList(orderBy)); return result; } diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/SequenceUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/SequenceUtil.java index 7f69dab..b9c35b6 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/SequenceUtil.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/SequenceUtil.java @@ -289,7 +289,9 @@ public class SequenceUtil { } maxSeqId = curSeqId + bankSize; - if (Debug.infoOn()) Debug.logInfo("Got bank of sequenced IDs for [" + this.seqName + "]; curSeqId=" + curSeqId + ", maxSeqId=" + maxSeqId + ", bankSize=" + bankSize, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Got bank of sequenced IDs for [" + this.seqName + "]; curSeqId=" + curSeqId + ", maxSeqId=" + maxSeqId + ", bankSize=" + bankSize, MODULE); + } } } } diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java index 0fc56c3..bbd9337 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/cache/EntityCacheServices.java @@ -201,24 +201,40 @@ public class EntityCacheServices implements DistributedCacheClear { if (context.containsKey("value")) { GenericValue value = (GenericValue) context.get("value"); - if (Debug.infoOn()) Debug.logInfo("Got a clear cache line by value service call; entityName: " + value.getEntityName(), MODULE); - if (Debug.verboseOn()) Debug.logVerbose("Got a clear cache line by value service call; value: " + value, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Got a clear cache line by value service call; entityName: " + value.getEntityName(), MODULE); + } + if (Debug.verboseOn()) { + Debug.logVerbose("Got a clear cache line by value service call; value: " + value, MODULE); + } delegator.clearCacheLine(value, distribute); } else if (context.containsKey("dummyPK")) { GenericEntity dummyPK = (GenericEntity) context.get("dummyPK"); - if (Debug.infoOn()) Debug.logInfo("Got a clear cache line by dummyPK service call; entityName: " + dummyPK.getEntityName(), MODULE); - if (Debug.verboseOn()) Debug.logVerbose("Got a clear cache line by dummyPK service call; dummyPK: " + dummyPK, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Got a clear cache line by dummyPK service call; entityName: " + dummyPK.getEntityName(), MODULE); + } + if (Debug.verboseOn()) { + Debug.logVerbose("Got a clear cache line by dummyPK service call; dummyPK: " + dummyPK, MODULE); + } delegator.clearCacheLineFlexible(dummyPK, distribute); } else if (context.containsKey("primaryKey")) { GenericPK primaryKey = (GenericPK) context.get("primaryKey"); - if (Debug.infoOn()) Debug.logInfo("Got a clear cache line by primaryKey service call; entityName: " + primaryKey.getEntityName(), MODULE); - if (Debug.verboseOn()) Debug.logVerbose("Got a clear cache line by primaryKey service call; primaryKey: " + primaryKey, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Got a clear cache line by primaryKey service call; entityName: " + primaryKey.getEntityName(), MODULE); + } + if (Debug.verboseOn()) { + Debug.logVerbose("Got a clear cache line by primaryKey service call; primaryKey: " + primaryKey, MODULE); + } delegator.clearCacheLine(primaryKey, distribute); } else if (context.containsKey("condition")) { String entityName = (String) context.get("entityName"); EntityCondition condition = (EntityCondition) context.get("condition"); - if (Debug.infoOn()) Debug.logInfo("Got a clear cache line by condition service call; entityName: " + entityName, MODULE); - if (Debug.verboseOn()) Debug.logVerbose("Got a clear cache line by condition service call; condition: " + condition, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Got a clear cache line by condition service call; entityName: " + entityName, MODULE); + } + if (Debug.verboseOn()) { + Debug.logVerbose("Got a clear cache line by condition service call; condition: " + condition, MODULE); + } delegator.clearCacheLineByCondition(entityName, condition, distribute); } return ServiceUtil.returnSuccess(); 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 af46d88..7f91cc6 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 @@ -76,7 +76,9 @@ public final class EntityEcaCondition implements java.io.Serializable { throw new GenericEntityException("Cannot have null Value or DispatchContext!"); } - if (Debug.verboseOn()) Debug.logVerbose(this.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose(this.toString(), MODULE); + } // condition-service; run the service and return the reply result if (isService) { @@ -107,7 +109,9 @@ public final class EntityEcaCondition implements java.io.Serializable { rhsValue = value.get(rhsValueName); } - if (Debug.verboseOn()) Debug.logVerbose("Comparing : " + lhsValue + " " + operator + " " + rhsValue, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Comparing : " + lhsValue + " " + operator + " " + rhsValue, MODULE); + } // evaluate the condition & invoke the action(s) List<Object> messages = new LinkedList<>(); diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java index 88b1873..531093b 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java @@ -140,7 +140,7 @@ public final class EntityEcaRule implements java.io.Serializable { if (!fieldsToLoad.isEmpty()) { Delegator delegator = dctx.getDelegator(); - GenericValue oldValue = EntityQuery.use(delegator).from(entityName).where(value.getPrimaryKey()).queryOne(); + GenericValue oldValue = EntityQuery.use(delegator).from(entityName).where(value.getPrimaryKey()).queryOne(); if (UtilValidate.isNotEmpty(oldValue)) { for (String fieldName : fieldsToLoad) { value.put(fieldName, oldValue.get(fieldName)); 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 be17799..2451aee 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 @@ -132,7 +132,7 @@ public class EntityPermissionChecker { permissionConditionGetter.init(delegator); passed = checkPermissionMethod(delegator, partyId, entityName, entityIdList, auxiliaryValueGetter, relatedRoleGetter, permissionConditionGetter); if (!passed && displayFailCond) { - String errMsg = "Permission is denied. \nThese are the conditions of which one must be met:\n" + String errMsg = "Permission is denied. \nThese are the conditions of which one must be met:\n" + permissionConditionGetter.dumpAsText(); List<Object> errorMessageList = UtilGenerics.cast(context.get("errorMessageList")); errorMessageList.add(errMsg); @@ -495,11 +495,13 @@ public class EntityPermissionChecker { public static boolean checkPermissionMethod(Delegator delegator, String partyId, String entityName, List<? extends Object> entityIdList, AuxiliaryValueGetter auxiliaryValueGetter, RelatedRoleGetter relatedRoleGetter, PermissionConditionGetter permissionConditionGetter) throws GenericEntityException { permissionConditionGetter.init(delegator); - if (Debug.verboseOn()) Debug.logVerbose(permissionConditionGetter.dumpAsText(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose(permissionConditionGetter.dumpAsText(), MODULE); + } boolean passed = false; boolean checkAncestors = false; - boolean hasRoleOperation = checkHasRoleOperations(partyId, permissionConditionGetter, delegator); + boolean hasRoleOperation = checkHasRoleOperations(partyId, permissionConditionGetter, delegator); if (hasRoleOperation) { return true; } @@ -695,16 +697,22 @@ public class EntityPermissionChecker { Delegator delegator = entity.getDelegator(); String pkFieldName = modelEntity.getFirstPkFieldName(); String entityId = entity.getString(pkFieldName); - if (Debug.verboseOn()) Debug.logVerbose("\n\nIN hasMatch: entityId:" + entityId + " partyId:" + partyId + " checkAncestors:" + checkAncestors, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("\n\nIN hasMatch: entityId:" + entityId + " partyId:" + partyId + " checkAncestors:" + checkAncestors, MODULE); + } boolean isMatch = false; permissionConditionGetter.restart(); List<String> auxiliaryValueList = null; if (auxiliaryValueGetter != null) { auxiliaryValueGetter.init(delegator, entityId); - auxiliaryValueList = auxiliaryValueGetter.getList(); - if (Debug.verboseOn()) Debug.logVerbose(auxiliaryValueGetter.dumpAsText(), MODULE); + auxiliaryValueList = auxiliaryValueGetter.getList(); + if (Debug.verboseOn()) { + Debug.logVerbose(auxiliaryValueGetter.dumpAsText(), MODULE); + } } else { - if (Debug.verboseOn()) Debug.logVerbose("NO AUX GETTER", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("NO AUX GETTER", MODULE); + } } List<String> roleValueList = null; if (relatedRoleGetter != null) { @@ -713,17 +721,23 @@ public class EntityPermissionChecker { } else { relatedRoleGetter.init(delegator, entityId, partyId, entity); } - roleValueList = relatedRoleGetter.getList(); - if (Debug.verboseOn()) Debug.logVerbose(relatedRoleGetter.dumpAsText(), MODULE); + roleValueList = relatedRoleGetter.getList(); + if (Debug.verboseOn()) { + Debug.logVerbose(relatedRoleGetter.dumpAsText(), MODULE); + } } else { - if (Debug.verboseOn()) Debug.logVerbose("NO ROLE GETTER", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("NO ROLE GETTER", MODULE); + } } String targStatusId = null; if (modelEntity.getField("statusId") != null) { targStatusId = entity.getString("statusId"); } - if (Debug.verboseOn()) Debug.logVerbose("STATUS:" + targStatusId, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("STATUS:" + targStatusId, MODULE); + } while (permissionConditionGetter.getNext()) { String roleConditionId = permissionConditionGetter.getRoleValue(); @@ -735,7 +749,9 @@ public class EntityPermissionChecker { boolean roleCond = (roleConditionId == null || roleConditionId.equals("_NA_") || (roleValueList != null && roleValueList.contains(roleConditionId))); if (auxiliaryCond && statusCond && roleCond) { - if (Debug.verboseOn()) Debug.logVerbose("MATCHED: role:" + roleConditionId + " status:" + statusConditionId + " aux:" + auxiliaryConditionId, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("MATCHED: role:" + roleConditionId + " status:" + statusConditionId + " aux:" + auxiliaryConditionId, MODULE); + } isMatch = true; break; } 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 2a72d60..c80d48c 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 @@ -441,7 +441,10 @@ public class EntitySyncContext { } } if (entitiesSkippedForKnownNext > 0) { - if (Debug.infoOn()) Debug.logInfo("In assembleValuesToCreate skipped [" + entitiesSkippedForKnownNext + "/" + entityModelToUseList + "] entities for the time period ending at [" + currentRunEndTime + "] because of next known create times", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("In assembleValuesToCreate skipped [" + entitiesSkippedForKnownNext + "/" + entityModelToUseList + + "] entities for the time period ending at [" + currentRunEndTime + "] because of next known create times", MODULE); + } } // TEST SECTION: leave false for normal use @@ -593,7 +596,10 @@ public class EntitySyncContext { } if (entitiesSkippedForKnownNext > 0) { - if (Debug.infoOn()) Debug.logInfo("In assembleValuesToStore skipped [" + entitiesSkippedForKnownNext + "/" + entityModelToUseList + "] entities for the time period ending at [" + currentRunEndTime + "] because of next known update times", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("In assembleValuesToStore skipped [" + entitiesSkippedForKnownNext + "/" + entityModelToUseList + + "] entities for the time period ending at [" + currentRunEndTime + "] because of next known update times", MODULE); + } } // TEST SECTION: leave false for normal use @@ -862,7 +868,9 @@ public class EntitySyncContext { } } - if (Debug.infoOn()) Debug.logInfo("Finished save Final Sync Results [" + entitySyncId + "]: totalRows=" + totalRows + ", totalRowsToCreate=" + totalRowsToCreate + ", totalRowsToStore=" + totalRowsToStore + ", totalRowsToRemove=" + totalRowsToRemove, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Finished save Final Sync Results [" + entitySyncId + "]: totalRows=" + totalRows + ", totalRowsToCreate=" + totalRowsToCreate + ", totalRowsToStore=" + totalRowsToStore + ", totalRowsToRemove=" + totalRowsToRemove, MODULE); + } } public Set<String> makeEntityNameToUseSet() { @@ -882,7 +890,10 @@ public class EntitySyncContext { List<ModelEntity> entityModelToUseList = EntityGroupUtil.getModelEntitiesFromRecords(entitySyncIncludes, delegator, true); - if (Debug.infoOn()) Debug.logInfo("In makeEntityModelToUseList for EntitySync with ID [" + entitySync.get("entitySyncId") + "] syncing " + entityModelToUseList.size() + " entities", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("In makeEntityModelToUseList for EntitySync with ID [" + entitySync.get("entitySyncId") + "] syncing " + + entityModelToUseList.size() + " entities", MODULE); + } return entityModelToUseList; } @@ -910,7 +921,10 @@ public class EntitySyncContext { } } } - if (Debug.infoOn()) Debug.logInfo("No currentRunStartTime was stored on the EntitySync record, so searched for the earliest value and got: " + currentRunStartTime, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("No currentRunStartTime was stored on the EntitySync record, so searched for the earliest value and got: " + + currentRunStartTime, MODULE); + } return currentRunStartTime; } else { return lastSuccessfulSynchTime; diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java index ba44ecd..c842063 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncServices.java @@ -150,7 +150,9 @@ public class EntitySyncServices { List<GenericValue> valuesToStore = UtilGenerics.cast(context.get("valuesToStore")); List<GenericEntity> keysToRemove = UtilGenerics.cast(context.get("keysToRemove")); - if (Debug.infoOn()) Debug.logInfo("Running storeEntitySyncData (" + entitySyncId + ") - [" + valuesToCreate.size() + "] to create; [" + valuesToStore.size() + "] to store; [" + keysToRemove.size() + "] to remove.", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Running storeEntitySyncData (" + entitySyncId + ") - [" + valuesToCreate.size() + "] to create; [" + valuesToStore.size() + "] to store; [" + keysToRemove.size() + "] to remove.", MODULE); + } try { long toCreateInserted = 0; long toCreateUpdated = 0; @@ -247,7 +249,9 @@ public class EntitySyncServices { result.put("toStoreNotUpdated", toStoreNotUpdated); result.put("toRemoveDeleted", toRemoveDeleted); result.put("toRemoveAlreadyDeleted", toRemoveAlreadyDeleted); - if (Debug.infoOn()) Debug.logInfo("Finisching storeEntitySyncData (" + entitySyncId + ") - [" + keysToRemove.size() + "] to remove. Actually removed: " + toRemoveDeleted + " already removed: " + toRemoveAlreadyDeleted, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Finisching storeEntitySyncData (" + entitySyncId + ") - [" + keysToRemove.size() + "] to remove. Actually removed: " + toRemoveDeleted + " already removed: " + toRemoveAlreadyDeleted, MODULE); + } return result; } catch (GenericEntityException e) { Debug.logError(e, "Exception saving Entity Sync Data for entitySyncId [" + entitySyncId + "]: " + e.toString(), MODULE); @@ -413,7 +417,9 @@ public class EntitySyncServices { esc.setTotalRowCounts(valuesToCreate, valuesToStore, keysToRemove); - if (Debug.infoOn()) Debug.logInfo("Service pullAndReportEntitySyncData returning - [" + valuesToCreate.size() + "] to create; [" + valuesToStore.size() + "] to store; [" + keysToRemove.size() + "] to remove; [" + esc.totalRowsPerSplit + "] total rows per split.", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Service pullAndReportEntitySyncData returning - [" + valuesToCreate.size() + "] to create; [" + valuesToStore.size() + "] to store; [" + keysToRemove.size() + "] to remove; [" + esc.totalRowsPerSplit + "] total rows per split.", MODULE); + } if (esc.totalRowsPerSplit > 0) { // stop if we found some data, otherwise look and try again Map<String, Object> result = ServiceUtil.returnSuccess(); 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 787581c..29d9320 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 @@ -75,7 +75,6 @@ import org.w3c.dom.Element; * (see <a href="http://docs.oracle.com/javase/6/docs/api/java/util/ServiceLoader.html" target="_blank">ServiceLoader</a>) * </li> * </ul> - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class SimpleMethod extends MiniLangElement { @@ -541,10 +540,14 @@ public final class SimpleMethod extends MiniLangElement { if (UtilValidate.isEmpty(response)) { if (forceError) { // override response code, always use error code - if (Debug.verboseOn()) Debug.logVerbose("No response code string found, but error messages found so assuming error; returning code [" + defaultErrorCode + "]", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("No response code string found, but error messages found so assuming error; returning code [" + defaultErrorCode + "]", MODULE); + } response = defaultErrorCode; } else { - if (Debug.verboseOn()) Debug.logVerbose("No response code string or errors found, assuming success; returning code [" + defaultSuccessCode + "]", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("No response code string or errors found, assuming success; returning code [" + defaultSuccessCode + "]", MODULE); + } response = defaultSuccessCode; } } diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java index 3252514..fb0ae50 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/FieldObject.java @@ -26,7 +26,6 @@ import org.w3c.dom.Element; /** * Implements the <field> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class FieldObject<T> extends MethodObject<T> { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java index c76b755..d10d8b6 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java @@ -39,7 +39,6 @@ import org.w3c.dom.Element; /** * Implements the <call-class-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 CallClassMethod extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java index 3d99383..1ff3f8b 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java @@ -38,7 +38,6 @@ import org.w3c.dom.Element; /** * Implements the <call-object-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 CallObjectMethod extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java index 0ca7312..cba6203 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallScript.java @@ -33,7 +33,6 @@ import org.w3c.dom.Element; /** * Implements the <script> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CallScript extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java index ec4d52d..ebadacf 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java @@ -48,7 +48,6 @@ import org.w3c.dom.Element; /** * Implements the <call-service> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CallService extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java index 931a78d..5430a62 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java @@ -37,7 +37,6 @@ import org.w3c.dom.Element; /** * Implements the <call-service-asynch> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CallServiceAsynch extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java index a3fac30..0d166ad 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java @@ -36,7 +36,6 @@ import org.w3c.dom.Element; /** * Implements the <call-map-processor> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CallSimpleMapProcessor extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java index 69d20e9..05bde28 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java @@ -42,7 +42,6 @@ import org.w3c.dom.Element; /** * Implements the <call-simple-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 CallSimpleMethod extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java index 037bcdd..f78296e 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/Return.java @@ -28,7 +28,6 @@ import org.w3c.dom.Element; /** * Implements the <return> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class Return extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java index 77eec76..829ba60 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java @@ -40,7 +40,6 @@ import org.w3c.dom.Element; /** * Implements the <set-service-fields> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class SetServiceFields extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java index e8554dd..bad8783 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java @@ -32,7 +32,6 @@ import org.w3c.dom.Element; /** * Implements the <and>, <or>, <not>, and <xor> elements. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public abstract class CombinedCondition extends MiniLangElement implements Conditional { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java index a00c006..c7b1485 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareCondition.java @@ -39,7 +39,6 @@ import org.w3c.dom.Element; /** * Implements the <if-compare> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CompareCondition extends MethodOperation implements Conditional { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java index 3e53e37..42a5920 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CompareFieldCondition.java @@ -38,7 +38,6 @@ import org.w3c.dom.Element; /** * Implements the <if-compare-field> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CompareFieldCondition extends MethodOperation implements Conditional { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java index 2174030..2f0b736 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ElseIf.java @@ -33,7 +33,6 @@ import org.w3c.dom.Element; /** * Implements the <else-if> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class ElseIf extends MiniLangElement { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java index 290aea8..0542dea 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/EmptyCondition.java @@ -34,7 +34,6 @@ import org.w3c.dom.Element; /** * Implements the <if-empty> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class EmptyCondition extends MethodOperation implements Conditional { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java index 6ff3977..bdaccee 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/HasPermissionCondition.java @@ -36,7 +36,6 @@ import org.w3c.dom.Element; /** * Implements the <if-has-permission> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class HasPermissionCondition extends MethodOperation implements Conditional { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java index 3e898cf..e9c6818 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/ClearCacheLine.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <clear-cache-line> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class ClearCacheLine extends EntityOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java index ca2c7f0..47b3468 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CloneValue.java @@ -29,7 +29,6 @@ import org.w3c.dom.Element; /** * Implements the <clone-value> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CloneValue extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java index 2026d58..7c0c267 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/CreateValue.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <create-value> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class CreateValue extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java index 0185b12..6185fda 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityAnd.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <entity-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 EntityAnd extends EntityOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCondition.java index 4b36eb1..ca39388 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCondition.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCondition.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <entity-condition> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class EntityCondition extends EntityOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java index 461696e..664b19e 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityCount.java @@ -40,7 +40,6 @@ import org.w3c.dom.Element; /** * Implements the <entity-count> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class EntityCount extends EntityOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java index eecede7..58a8b84 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java @@ -38,7 +38,6 @@ import org.w3c.dom.Element; /** * Implements the <entity-data> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class EntityData extends EntityOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByAnd.java index e55a04a..67ce0e1 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByAnd.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByAnd.java @@ -33,7 +33,6 @@ import org.w3c.dom.Element; /** * Implements the <filter-list-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 FilterListByAnd extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java index 7abc387..c2426db 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FilterListByDate.java @@ -34,7 +34,6 @@ import org.w3c.dom.Element; /** * Implements the <filter-list-by-date> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class FilterListByDate extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java index 130c6cd..3d97c79 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByAnd.java @@ -39,7 +39,6 @@ import org.w3c.dom.Element; /** * Implements the <find-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 FindByAnd extends EntityOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java index f4e04d5..e323f79 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/FindByPrimaryKey.java @@ -40,7 +40,6 @@ import org.w3c.dom.Element; /** * Implements the <find-by-primary-key> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class FindByPrimaryKey extends EntityOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeValue.java index 1bc9415..5caee9f 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeValue.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeValue.java @@ -34,7 +34,6 @@ import org.w3c.dom.Element; /** * Implements the <make-value> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class MakeValue extends EntityOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/OrderValueList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/OrderValueList.java index 15a440b..b745d28 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/OrderValueList.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/OrderValueList.java @@ -32,7 +32,6 @@ import org.w3c.dom.Element; /** * Implements the <order-value-list> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class OrderValueList extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RefreshValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RefreshValue.java index 4dd2fdc..08cb3b2 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RefreshValue.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RefreshValue.java @@ -32,7 +32,6 @@ import org.w3c.dom.Element; /** * Implements the <refresh-value> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class RefreshValue extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveList.java index 2693e4c..0a9d31a 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveList.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveList.java @@ -34,7 +34,6 @@ import org.w3c.dom.Element; /** * Implements the <remove-list> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class RemoveList extends EntityOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveRelated.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveRelated.java index 38f5275..fc2f005 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveRelated.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveRelated.java @@ -34,7 +34,6 @@ import org.w3c.dom.Element; /** * Implements the <remove-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 RemoveRelated extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveValue.java index 2cbb22e..0329754 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveValue.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveValue.java @@ -32,7 +32,6 @@ import org.w3c.dom.Element; /** * Implements the <remove-value> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class RemoveValue extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SequencedIdToEnv.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SequencedIdToEnv.java index c2267b3..304ec65 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SequencedIdToEnv.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SequencedIdToEnv.java @@ -29,7 +29,6 @@ import org.w3c.dom.Element; /** * Implements the <sequenced-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 SequencedIdToEnv extends EntityOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java index 19800c5..6d77cb8 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java @@ -30,7 +30,6 @@ import org.w3c.dom.Element; /** * Implements the <set-current-user-login> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class SetCurrentUserLogin extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetNonpkFields.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetNonpkFields.java index 09a3fd0..2e87818 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetNonpkFields.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetNonpkFields.java @@ -33,7 +33,6 @@ import org.w3c.dom.Element; /** * Implements the <set-nonpk-fields> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class SetNonpkFields extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetPkFields.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetPkFields.java index 410247b..2b77116 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetPkFields.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/SetPkFields.java @@ -33,7 +33,6 @@ import org.w3c.dom.Element; /** * Implements the <set-pk-fields> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class SetPkFields extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreList.java index 3d63497..c76f85b 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreList.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreList.java @@ -34,7 +34,6 @@ import org.w3c.dom.Element; /** * Implements the <store-list> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class StoreList extends EntityOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreValue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreValue.java index da67997..15cbc7d 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreValue.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/StoreValue.java @@ -32,7 +32,6 @@ import org.w3c.dom.Element; /** * Implements the <store-value> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class StoreValue extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java index b5dbe38..8e30776 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionBegin.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <transaction-begin> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class TransactionBegin extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java index ee1720d..eebac90 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java @@ -32,7 +32,6 @@ import org.w3c.dom.Element; /** * Implements the <add-error> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class AddError extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java index 6855c40..e5b7a4c 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java @@ -37,7 +37,6 @@ import org.w3c.dom.Element; /** * Implements the <assert> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class Assert extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java index 7262215..2a07d09 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java @@ -26,7 +26,6 @@ import org.w3c.dom.Element; /** * Implements the <break> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public class Break extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java index da49940..7184b05 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckErrors.java @@ -30,7 +30,6 @@ import org.w3c.dom.Element; /** * Implements the <check-errors> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class CheckErrors extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java index fba298e..789feec 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java @@ -35,7 +35,6 @@ import org.w3c.dom.Element; /** * Implements the <check-id> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class CheckId extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ClearField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ClearField.java index 060efb5..0bc3528 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ClearField.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ClearField.java @@ -28,7 +28,6 @@ import org.w3c.dom.Element; /** * Implements the <clear-field> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class ClearField extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java index 32834b0..e0241f2 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java @@ -26,7 +26,6 @@ import org.w3c.dom.Element; /** * Implements the <continue> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public class Continue extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java index 1388dc3..cdeaa56 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java @@ -40,7 +40,6 @@ import org.w3c.dom.Element; /** * Implements the <create-object> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class CreateObject extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java index 716b0c7..82484db 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <field-to-list> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class FieldToList extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FirstFromList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FirstFromList.java index 0603622..23c17bf 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FirstFromList.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FirstFromList.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <first-from-list> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class FirstFromList extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java index 8167e73..2070b60 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java @@ -42,7 +42,6 @@ import org.w3c.dom.Element; /** * Implements the <iterate> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class Iterate extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java index ad73adc..905c5d2 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java @@ -37,7 +37,6 @@ import org.w3c.dom.Element; /** * Implements the <iterate-map> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class IterateMap extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java index 29359ae..d5fdfce 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <list-to-list> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class ListToList extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Loop.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Loop.java index 41b32cd..0316dc1 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Loop.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Loop.java @@ -36,7 +36,6 @@ import org.w3c.dom.Element; /** * Implements the <loop> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class Loop extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java index 57de0c7..e732426 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <map-to-map> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class MapToMap extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Now.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Now.java index 491dc20..c7c2ddd 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Now.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Now.java @@ -36,7 +36,6 @@ import org.w3c.dom.Element; /** * Implements the <now>, <now-date-to-env>, and <now-timestamp> elements. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class Now extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java index be3f760..58449fc 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java @@ -36,7 +36,6 @@ import org.w3c.dom.Element; /** * Implements the <order-map-list> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class OrderMapList extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java index 754cb87..0231d55 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetCalendar.java @@ -42,7 +42,6 @@ import com.ibm.icu.util.Calendar; /** * Implements the <set-calendar> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class SetCalendar extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java index 9c50617..c8a4864 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java @@ -38,7 +38,6 @@ import org.w3c.dom.Element; /** * Implements the <set> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class SetOperation extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringAppend.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringAppend.java index 06cbe0e..d6420f2 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringAppend.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringAppend.java @@ -33,7 +33,6 @@ import org.w3c.dom.Element; /** * Implements the <string-append> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class StringAppend extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java index 56a3dc0..ad3ea6c 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java @@ -36,7 +36,6 @@ import org.w3c.dom.Element; /** * Implements the <string-to-list> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class StringToList extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java index ee52cde..4273d90 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ToString.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <to-string> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class ToString 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 707636a..696ad0a 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 @@ -36,7 +36,6 @@ import org.w3c.dom.Element; /** * Implements the <while> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class While extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToRequest.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToRequest.java index 87a060a..6d46cd0 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToRequest.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToRequest.java @@ -29,7 +29,6 @@ import org.w3c.dom.Element; /** * Implements the <field-to-request> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class FieldToRequest extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToSession.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToSession.java index 596505b..2e8580f 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToSession.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/FieldToSession.java @@ -29,7 +29,6 @@ import org.w3c.dom.Element; /** * Implements the <field-to-session> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class FieldToSession extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java index 561487f..c469752 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java @@ -33,7 +33,6 @@ import org.w3c.dom.Element; /** * Implements the <request-parameters-to-list> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class RequestParametersToList extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestToField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestToField.java index bd830a0..448ae44 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestToField.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestToField.java @@ -29,7 +29,6 @@ import org.w3c.dom.Element; /** * Implements the <request-to-field> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class RequestToField extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/SessionToField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/SessionToField.java index 06ed02d..1696ccf 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/SessionToField.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/SessionToField.java @@ -29,7 +29,6 @@ import org.w3c.dom.Element; /** * Implements the <session-to-field> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public class SessionToField extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java index ddb28ae..8bdf5ef 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java @@ -35,7 +35,6 @@ import org.w3c.dom.Element; /** * Implements the <webapp-property-to-field> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class WebappPropertyToField extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java index 132623b..1486ffa 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java @@ -38,7 +38,6 @@ import org.w3c.dom.Element; /** * Implements the <check-permission> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class CheckPermission extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfInstanceOf.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfInstanceOf.java index be0d027..76b90c9 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfInstanceOf.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfInstanceOf.java @@ -35,7 +35,6 @@ import org.w3c.dom.Element; /** * Implements the <if-instance-of> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class IfInstanceOf extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfNotEmpty.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfNotEmpty.java index cf1c44c..6c13b3d 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfNotEmpty.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/IfNotEmpty.java @@ -33,7 +33,6 @@ import org.w3c.dom.Element; /** * Implements the <if-not-empty> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Referenc</a> */ public final class IfNotEmpty extends MethodOperation { 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 8d788a5..1bd2ce1 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 @@ -39,7 +39,6 @@ import org.w3c.dom.Element; /** * Implements the <calculate> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class Calculate extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java index 9d9f798..530dfe3 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Log.java @@ -30,7 +30,6 @@ import org.w3c.dom.Element; /** * Implements the <log> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class Log extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/PropertyToField.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/PropertyToField.java index d7ae11c..0c34c63 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/PropertyToField.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/PropertyToField.java @@ -35,7 +35,6 @@ import org.w3c.dom.Element; /** * Implements the <property-to-field> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class PropertyToField extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java index 4c31c02..5c85fa1 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/otherops/Trace.java @@ -31,7 +31,6 @@ import org.w3c.dom.Element; /** * Implements the <trace> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class Trace extends MethodOperation { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/serviceops/FieldToResult.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/serviceops/FieldToResult.java index 16edaba..d52afd8 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/serviceops/FieldToResult.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/serviceops/FieldToResult.java @@ -29,7 +29,6 @@ import org.w3c.dom.Element; /** * Implements the <field-to-result> element. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a> */ public final class FieldToResult extends MethodOperation { diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/DispatchContext.java b/framework/service/src/main/java/org/apache/ofbiz/service/DispatchContext.java index d814c44..bac9d92 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/DispatchContext.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/DispatchContext.java @@ -185,14 +185,14 @@ public class DispatchContext implements Serializable { throw new GenericServiceException("Model service is null! Should never happen."); } switch (modeInt) { - case 1: - newContext = model.makeValid(context, ModelService.IN_PARAM, true, null); - break; - case 2: - newContext = model.makeValid(context, ModelService.OUT_PARAM, true, null); - break; - default: - throw new GenericServiceException("Invalid mode, should be either IN or OUT"); + case 1: + newContext = model.makeValid(context, ModelService.IN_PARAM, true, null); + break; + case 2: + newContext = model.makeValid(context, ModelService.OUT_PARAM, true, null); + break; + default: + throw new GenericServiceException("Invalid mode, should be either IN or OUT"); } return newContext; } diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/GenericDispatcherFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/GenericDispatcherFactory.java index 8be783d..6067374 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/GenericDispatcherFactory.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/GenericDispatcherFactory.java @@ -64,7 +64,9 @@ public class GenericDispatcherFactory implements LocalDispatcherFactory { DispatchContext ctx = new DispatchContext(name, loader, this); this.dispatcher.register(ctx); this.ctx = ctx; - if (Debug.verboseOn()) Debug.logVerbose("[GenericDispatcher] : Created Dispatcher for: " + name, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[GenericDispatcher] : Created Dispatcher for: " + name, MODULE); + } } @Override diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java b/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java index 9f921aa..8b61bcb 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java @@ -48,7 +48,9 @@ public class GenericResultWaiter implements GenericRequester { completed = true; status = SERVICE_FINISHED; notify(); - if (Debug.verboseOn()) Debug.logVerbose("Received Result (" + completed + ") -- " + result, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Received Result (" + completed + ") -- " + result, MODULE); + } } @Override @@ -111,11 +113,15 @@ public class GenericResultWaiter implements GenericRequester { * @return Map */ public synchronized Map<String, Object> waitForResult(long milliseconds) { - if (Debug.verboseOn()) Debug.logVerbose("Waiting for results...", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Waiting for results...", MODULE); + } while (!isCompleted()) { try { this.wait(milliseconds); - if (Debug.verboseOn()) Debug.logVerbose("Waiting...", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Waiting...", MODULE); + } } catch (java.lang.InterruptedException e) { Debug.logError(e, MODULE); } diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelParam.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelParam.java index 2b93b0c..87f0910 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelParam.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelParam.java @@ -206,7 +206,9 @@ public class ModelParam implements Serializable { if (this.defaultValue != null) { this.optional = true; } - if (Debug.verboseOn()) Debug.logVerbose("Default value for attribute [" + this.name + "] set to [" + this.defaultValue + "]", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Default value for attribute [" + this.name + "] set to [" + this.defaultValue + "]", MODULE); + } } public void copyDefaultValue(ModelParam param) { this.setDefaultValue(param.defaultValue.getOriginal()); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java index 444774c..3513b4f 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java @@ -548,12 +548,16 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali Map<String, String> requiredInfo = new HashMap<>(); Map<String, String> optionalInfo = new HashMap<>(); - if (Debug.verboseOn()) Debug.logVerbose("[ModelService.validate] : {" + this.name + "} : Validating context - " + context, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[ModelService.validate] : {" + this.name + "} : Validating context - " + context, MODULE); + } // do not validate results with errors if (mode.equals(OUT_PARAM) && context != null && context.containsKey(RESPONSE_MESSAGE)) { if (RESPOND_ERROR.equals(context.get(RESPONSE_MESSAGE)) || RESPOND_FAIL.equals(context.get(RESPONSE_MESSAGE))) { - if (Debug.verboseOn()) Debug.logVerbose("[ModelService.validate] : {" + this.name + "} : response was an error, not validating.", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[ModelService.validate] : {" + this.name + "} : response was an error, not validating.", MODULE); + } return; } } @@ -615,14 +619,18 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali } requiredNames.append(key); } - if (Debug.verboseOn()) Debug.logVerbose("[ModelService.validate] : required fields - " + requiredNames, MODULE); - - if (Debug.verboseOn()) Debug.logVerbose("[ModelService.validate] : {" + name + "} : (" + mode + ") Required - " + - requiredTest.size() + " / " + requiredInfo.size(), MODULE); - if (Debug.verboseOn()) Debug.logVerbose("[ModelService.validate] : {" + name + "} : (" + mode + ") Optional - " + - optionalTest.size() + " / " + optionalInfo.size(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[ModelService.validate] : required fields - " + requiredNames, MODULE); + } + if (Debug.verboseOn()) { + Debug.logVerbose("[ModelService.validate] : {" + name + "} : (" + mode + ") Required - " + + requiredTest.size() + " / " + requiredInfo.size(), MODULE); + } + if (Debug.verboseOn()) { + Debug.logVerbose("[ModelService.validate] : {" + name + "} : (" + mode + ") Optional - " + + optionalTest.size() + " / " + optionalInfo.size(), MODULE); + } } - try { validate(requiredInfo, requiredTest, true, this, mode, locale); validate(optionalInfo, optionalTest, false, this, mode, locale); @@ -1060,7 +1068,9 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali // old permission checking if (this.containsPermissions()) { for (ModelPermGroup group: this.permissionGroups) { - if (Debug.verboseOn()) Debug.logVerbose(" Permission : Analyse " + group.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose(" Permission : Analyse " + group.toString(), MODULE); + } Map<String, Object> permResult = group.evalPermissions(dctx, context); if (!ServiceUtil.isSuccess(permResult)) { ServiceUtil.addErrors(permGroupErrors, null, permResult); @@ -1141,7 +1151,9 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali if (group != null) { for (GroupServiceModel sm: group.getServices()) { implServices.add(new ModelServiceIface(sm.getName(), sm.isOptional())); - if (Debug.verboseOn()) Debug.logVerbose("Adding service [" + sm.getName() + "] as interface of: [" + this.name + "]", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Adding service [" + sm.getName() + "] as interface of: [" + this.name + "]", MODULE); + } } } } diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java index d7e2602..35a63ea 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java @@ -163,7 +163,9 @@ public final class ServiceDispatcher { String dispatcherKey = delegator != null ? delegator.getDelegatorName() : "null"; sd = dispatchers.get(dispatcherKey); if (sd == null) { - if (Debug.verboseOn()) Debug.logVerbose("[ServiceDispatcher.getInstance] : No instance found (" + dispatcherKey + ").", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[ServiceDispatcher.getInstance] : No instance found (" + dispatcherKey + ").", MODULE); + } sd = new ServiceDispatcher(delegator); ServiceDispatcher cachedDispatcher = dispatchers.putIfAbsent(dispatcherKey, sd); if (cachedDispatcher == null) { @@ -285,8 +287,10 @@ public final class ServiceDispatcher { } if (Debug.verboseOn() || modelService.debug) { - if (Debug.verboseOn()) Debug.logVerbose("[ServiceDispatcher.runSync] : invoking service " + modelService.name + " [" + modelService.location + - "/" + modelService.invoke + "] (" + modelService.engineName + ")", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[ServiceDispatcher.runSync] : invoking service " + modelService.name + " [" + modelService.location + + "/" + modelService.invoke + "] (" + modelService.engineName + ")", MODULE); + } } Map<String, Object> context = new HashMap<>(); @@ -629,7 +633,9 @@ public final class ServiceDispatcher { if (resultStr.length() > 10240) { resultStr = resultStr.substring(0, 10226) + "...[truncated]"; } - if (Debug.verboseOn()) Debug.logVerbose("Sync service [" + localName + "/" + modelService.name + "] finished with response [" + resultStr + "]", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Sync service [" + localName + "/" + modelService.name + "] finished with response [" + resultStr + "]", MODULE); + } } if (modelService.metrics != null) { modelService.metrics.recordServiceRate(1, timeToRun); @@ -653,8 +659,10 @@ public final class ServiceDispatcher { UtilTimer.timerLog(localName + " / " + service.name, "ASync service started...", MODULE); } if (Debug.verboseOn() || service.debug) { - if (Debug.verboseOn()) Debug.logVerbose("[ServiceDispatcher.runAsync] : preparing service " + service.name + " [" + service.location + "/" + service.invoke + - "] (" + service.engineName + ")", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[ServiceDispatcher.runAsync] : preparing service " + service.name + " [" + service.location + "/" + service.invoke + + "] (" + service.engineName + ")", MODULE); + } } Map<String, Object> context = new HashMap<>(); @@ -969,7 +977,9 @@ public final class ServiceDispatcher { private GenericValue getLoginObject(String service, String localName, String username, String password, String jwtToken, Locale locale) throws GenericServiceException { Map<String, Object> context = UtilMisc.toMap("login.username", username, "login.password", password, "login.token", jwtToken, "isServiceAuth", true, "locale", locale); - if (Debug.verboseOn()) Debug.logVerbose("[ServiceDispathcer.authenticate] : Invoking UserLogin Service", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[ServiceDispathcer.authenticate] : Invoking UserLogin Service", MODULE); + } // get the dispatch context and service model DispatchContext dctx = getLocalContext(localName); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java index 50ac7e7..69c4514 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java @@ -161,7 +161,9 @@ public class ServiceXaWrapper extends GenericXaResource { @Override public void enlist() throws XAException { super.enlist(); - if (Debug.verboseOn()) Debug.logVerbose("Enlisted in transaction : " + this.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Enlisted in transaction : " + this.toString(), MODULE); + } } // -- XAResource Methods @@ -170,7 +172,9 @@ public class ServiceXaWrapper extends GenericXaResource { */ @Override public void commit(Xid xid, boolean onePhase) throws XAException { - if (Debug.verboseOn()) Debug.logVerbose("ServiceXaWrapper#commit() : " + onePhase + " / " + xid.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("ServiceXaWrapper#commit() : " + onePhase + " / " + xid.toString(), MODULE); + } // the commit listener if (this.active) { Debug.logWarning("commit() called without end()", MODULE); @@ -205,7 +209,9 @@ public class ServiceXaWrapper extends GenericXaResource { */ @Override public void rollback(Xid xid) throws XAException { - if (Debug.verboseOn()) Debug.logVerbose("ServiceXaWrapper#rollback() : " + xid.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("ServiceXaWrapper#rollback() : " + xid.toString(), MODULE); + } // the rollback listener if (this.active) { Debug.logWarning("rollback() called without end()", MODULE); @@ -238,7 +244,9 @@ public class ServiceXaWrapper extends GenericXaResource { @Override public int prepare(Xid xid) throws XAException { // overriding to log two phase commits - if (Debug.verboseOn()) Debug.logVerbose("ServiceXaWrapper#prepare() : " + xid.toString(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("ServiceXaWrapper#prepare() : " + xid.toString(), MODULE); + } int rtn; try { rtn = super.prepare(xid); @@ -246,7 +254,9 @@ public class ServiceXaWrapper extends GenericXaResource { Debug.logError(e, MODULE); throw e; } - if (Debug.verboseOn()) Debug.logVerbose("ServiceXaWrapper#prepare() : " + rtn + " / " + (rtn == XA_OK), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("ServiceXaWrapper#prepare() : " + rtn + " / " + (rtn == XA_OK), MODULE); + } return rtn; } @@ -256,14 +266,14 @@ public class ServiceXaWrapper extends GenericXaResource { // set the logging prefix String msgPrefix = "[XaWrapper] "; switch (type) { - case TYPE_ROLLBACK: - msgPrefix = "[Rollback] "; - break; - case TYPE_COMMIT: - msgPrefix = "[Commit] "; - break; - default: - Debug.logWarning("There was another type instead of [Commit] or [Rollback] in runService: " + type, MODULE); + case TYPE_ROLLBACK: + msgPrefix = "[Rollback] "; + break; + case TYPE_COMMIT: + msgPrefix = "[Commit] "; + break; + default: + Debug.logWarning("There was another type instead of [Commit] or [Rollback] in runService: " + type, MODULE); } // if a service exists; run it @@ -306,15 +316,15 @@ public class ServiceXaWrapper extends GenericXaResource { // invoke based on mode switch (mode) { - case MODE_ASYNC: - Debug.logInfo(msgPrefix + "Invoking [" + service + "] via runAsync", MODULE); - dctx.getDispatcher().runAsync(service, thisContext, persist); - break; - - case MODE_SYNC: - Debug.logInfo(msgPrefix + "Invoking [" + service + "] via runSyncIgnore", MODULE); - dctx.getDispatcher().runSyncIgnore(service, thisContext); - break; + case MODE_ASYNC: + Debug.logInfo(msgPrefix + "Invoking [" + service + "] via runAsync", MODULE); + dctx.getDispatcher().runAsync(service, thisContext, persist); + break; + + case MODE_SYNC: + Debug.logInfo(msgPrefix + "Invoking [" + service + "] via runSyncIgnore", MODULE); + dctx.getDispatcher().runSyncIgnore(service, thisContext); + break; } } catch (Throwable t) { Debug.logError(t, "Problem calling " + msgPrefix + "service : " + service + " / " + context, MODULE); @@ -349,7 +359,9 @@ public class ServiceXaWrapper extends GenericXaResource { } } } else { - if (Debug.verboseOn()) Debug.logVerbose("No " + msgPrefix + "service defined; nothing to do", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("No " + msgPrefix + "service defined; nothing to do", MODULE); + } } this.xid = null; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java index 3bf8a06..8d15c2b 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java @@ -174,21 +174,27 @@ public class RecurrenceRule { */ public long getEndTime() { if (rule == null) { - if (Debug.verboseOn()) Debug.logVerbose("Rule is null.", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Rule is null.", MODULE); + } return -1; } long time = 0; java.sql.Timestamp stamp = null; stamp = rule.getTimestamp("untilDateTime"); - if (Debug.verboseOn()) Debug.logVerbose("Stamp value: " + stamp, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Stamp value: " + stamp, MODULE); + } if (stamp != null) { long nanos = stamp.getNanos(); time = stamp.getTime(); time += (nanos / 1000000); } - if (Debug.verboseOn()) Debug.logVerbose("Returning time: " + time, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Returning time: " + time, MODULE); + } return time; } diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java index 2d5c33b..2d4927e 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java @@ -112,7 +112,9 @@ public class ServiceEcaCondition implements java.io.Serializable { throw new GenericServiceException("Cannot have null Service, Context or DispatchContext!"); } - if (Debug.verboseOn()) Debug.logVerbose(this.toString() + ", In the context: " + context, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose(this.toString() + ", In the context: " + context, MODULE); + } // condition-service; run the service and return the reply result if (isService) { @@ -173,7 +175,9 @@ public class ServiceEcaCondition implements java.io.Serializable { } } - if (Debug.verboseOn()) Debug.logVerbose("Comparing : " + lhsValue + " " + operator + " " + rhsValue, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Comparing : " + lhsValue + " " + operator + " " + rhsValue, MODULE); + } // evaluate the condition & invoke the action(s) List<Object> messages = new LinkedList<>(); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java index c9f5e2e..b5bde68 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java @@ -185,7 +185,9 @@ public final class ServiceEcaUtil { return; } - if (Debug.verboseOn()) Debug.logVerbose("Running ECA (" + event + ").", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Running ECA (" + event + ").", MODULE); + } Set<String> actionsRun = new TreeSet<>(); for (ServiceEcaRule eca: rules) { eca.eval(serviceName, dctx, context, result, isError, isFailure, actionsRun); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java b/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java index 9687cfb..ce7c700 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java @@ -178,7 +178,9 @@ public class GroupModel { result.putAll(thisResult); if (model.resultToContext()) { runContext.putAll(thisResult); - if (Debug.verboseOn()) Debug.logVerbose("Added result(s) to context.", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Added result(s) to context.", MODULE); + } } } return result; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java index 47383fe..9de3353 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java @@ -73,7 +73,9 @@ public abstract class AbstractJmsListener implements GenericMessageListener, Exc Object o = XmlSerializer.deserialize(xmlContext, dispatcher.getDelegator()); - if (Debug.verboseOn()) Debug.logVerbose("De-Serialized Context --> " + o, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("De-Serialized Context --> " + o, MODULE); + } if (ObjectType.instanceOf(o, "java.util.Map")) context = UtilGenerics.cast(o); } catch (JMSException je) { @@ -92,7 +94,9 @@ public abstract class AbstractJmsListener implements GenericMessageListener, Exc Debug.logError(e, "Unable to get ModelService for service : " + serviceName, MODULE); } - if (Debug.verboseOn()) Debug.logVerbose("Running service: " + serviceName, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Running service: " + serviceName, MODULE); + } Map<String, Object> result = null; if (context != null) { @@ -113,7 +117,9 @@ public abstract class AbstractJmsListener implements GenericMessageListener, Exc public void onMessage(Message message) { MapMessage mapMessage = null; - if (Debug.verboseOn()) Debug.logVerbose("JMS Message Received --> " + message, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("JMS Message Received --> " + message, MODULE); + } if (message instanceof MapMessage) { mapMessage = (MapMessage) message; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java index 4bb26e7..7cc9d22 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java @@ -80,7 +80,9 @@ public class JmsListenerFactory implements Runnable { public void run() { Debug.logInfo("Starting JMS Listener Factory Thread", MODULE); while (firstPass || connected < loadable) { - if (Debug.verboseOn()) Debug.logVerbose("First Pass: " + firstPass + " Connected: " + connected + " Available: " + loadable, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("First Pass: " + firstPass + " Connected: " + connected + " Available: " + loadable, MODULE); + } this.loadListeners(); if (loadable == 0) { // if there is nothing to do then we can break without sleeping @@ -102,7 +104,9 @@ public class JmsListenerFactory implements Runnable { try { List<JmsService> jmsServices = ServiceConfigUtil.getServiceEngine().getJmsServices(); - if (Debug.verboseOn()) Debug.logVerbose("Loading JMS Listeners.", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Loading JMS Listeners.", MODULE); + } for (JmsService service: jmsServices) { StringBuilder serverKey = new StringBuilder(); for (Server server: service.getServers()) { diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java index 5657007..8fc3ed8 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java @@ -94,7 +94,9 @@ public class JmsServiceEngine extends AbstractEngine { String xmlContext = null; try { - if (Debug.verboseOn()) Debug.logVerbose("Serializing Context --> " + context, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Serializing Context --> " + context, MODULE); + } xmlContext = JmsSerializer.serialize(context); } catch (SerializeException | IOException e) { throw new GenericServiceException("Cannot serialize context.", e); @@ -163,7 +165,9 @@ public class JmsServiceEngine extends AbstractEngine { Message message = makeMessage(session, modelService, context); publisher.publish(message); - if (Debug.verboseOn()) Debug.logVerbose("Sent JMS Message to " + topicName, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Sent JMS Message to " + topicName, MODULE); + } // close the connections publisher.close(); @@ -222,7 +226,9 @@ public class JmsServiceEngine extends AbstractEngine { Message message = makeMessage(session, modelService, context); sender.send(message); - if (Debug.verboseOn()) Debug.logVerbose("Sent JMS Message to " + queueName, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Sent JMS Message to " + queueName, MODULE); + } // close the connections sender.close(); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java index ae7ceba..4854b19 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java @@ -87,7 +87,9 @@ public class JmsTopicListener extends AbstractJmsListener { subscriber.setMessageListener(this); con.start(); this.setConnected(true); - if (Debug.infoOn()) Debug.logInfo("Listening to topic [" + topicName + "] on [" + jndiServer + "]...", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Listening to topic [" + topicName + "] on [" + jndiServer + "]...", MODULE); + } } else { throw new GenericServiceException("Topic lookup failed."); } diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java index afd4dba..a85b07a 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobManager.java @@ -150,8 +150,7 @@ public final class JobManager { EntityCondition.makeConditionDate("fromDate", "thruDate"), EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("instanceId", instanceId), - EntityCondition.makeCondition("instanceId", "_NA_")), EntityJoinOperator.OR) - ), EntityJoinOperator.AND); + EntityCondition.makeCondition("instanceId", "_NA_")), EntityJoinOperator.OR)), EntityJoinOperator.AND); return delegator.findCountByCondition("JobManagerLock", condition, null, null) == 0; } catch (GenericEntityException e) { Debug.logWarning(e, "Exception thrown while check lock on JobManager : " + instanceId, MODULE); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java index ef2e593..2d1684a 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java @@ -42,7 +42,7 @@ import org.apache.ofbiz.base.util.SSLUtil; @SuppressWarnings("serial") public class SSLServerSocketFactory implements RMIServerSocketFactory, Serializable { - private static final String MODULE = SSLServerSocketFactory.class.getName(); + private static final String MODULE = SSLServerSocketFactory.class.getName(); protected boolean clientAuth = false; protected String keystore = null; protected String ksType = null; diff --git a/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupControlPanel.java b/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupControlPanel.java index aee59fa..281d7cf 100644 --- a/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupControlPanel.java +++ b/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupControlPanel.java @@ -48,7 +48,7 @@ final class StartupControlPanel { Config config = null; try { loadGlobalOfbizSystemProperties("ofbiz.system.props"); - config = new Config(ofbizCommands); + config = new Config(ofbizCommands); } catch (StartupException e) { fullyTerminateSystem(e); } 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 e4be866..5f980d1 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 @@ -194,7 +194,9 @@ public final class WebAppUtil { if (UtilValidate.isEmpty(delegatorName)) { delegatorName = "default"; } - if (Debug.verboseOn()) Debug.logVerbose("Setup Entity Engine Delegator with name " + delegatorName, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Setup Entity Engine Delegator with name " + delegatorName, MODULE); + } delegator = DelegatorFactory.getDelegator(delegatorName); servletContext.setAttribute("delegator", delegator); if (delegator == null) { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java index da1f2f7..4873af7 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java @@ -196,7 +196,9 @@ public class ContextFilter implements Filter { while (initParamEnum.hasMoreElements()) { String initParamName = initParamEnum.nextElement(); String initParamValue = config.getServletContext().getInitParameter(initParamName); - if (Debug.verboseOn()) Debug.logVerbose("Adding web.xml context-param to application attribute with name [" + initParamName + "] and value [" + initParamValue + "]", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Adding web.xml context-param to application attribute with name [" + initParamName + "] and value [" + initParamValue + "]", MODULE); + } config.getServletContext().setAttribute(initParamName, initParamValue); } } 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 b418047..94799e3 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 @@ -362,9 +362,6 @@ public final class LoginWorker { if (UtilValidate.isNotEmpty(formParams)) { session.setAttribute("_PREVIOUS_PARAM_MAP_FORM_", formParams); } - - //if (Debug.infoOn()) Debug.logInfo("checkLogin: PathInfo=" + request.getPathInfo(), MODULE); - return "error"; } } 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 84ec236..13a407d 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 @@ -304,7 +304,9 @@ public class RequestHandler { // not using _POST_CHAIN_VIEW_ because it shouldn't be set unless the event execution is successful request.setAttribute("_CURRENT_CHAIN_VIEW_", overrideViewUri); } - if (Debug.infoOn()) Debug.logInfo("[RequestHandler]: Chain in place: requestUri=" + chainRequestUri + " overrideViewUri=" + overrideViewUri + showSessionId(request), MODULE); + if (Debug.infoOn()) { + Debug.logInfo("[RequestHandler]: Chain in place: requestUri=" + chainRequestUri + " overrideViewUri=" + overrideViewUri + showSessionId(request), MODULE); + } } else { // Check if X509 is required and we are not secure; throw exception if (!request.isSecure() && requestMap.securityCert) { @@ -435,11 +437,15 @@ public class RequestHandler { // Pre-Processor/First-Visit event(s) can interrupt the flow by returning null. // Warning: this could cause problems if more then one event attempts to return a response. if (interruptRequest) { - if (Debug.infoOn()) Debug.logInfo("[Pre-Processor Interrupted Request, not running: [" + requestMap.uri + "]. " + showSessionId(request), MODULE); + if (Debug.infoOn()) { + Debug.logInfo("[Pre-Processor Interrupted Request, not running: [" + requestMap.uri + "]. " + showSessionId(request), MODULE); + } return; } - if (Debug.verboseOn()) Debug.logVerbose("[Processing Request]: " + requestMap.uri + showSessionId(request), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[Processing Request]: " + requestMap.uri + showSessionId(request), MODULE); + } request.setAttribute("thisRequestUri", requestMap.uri); // store the actual request URI // Store current requestMap map to be referred later when generating csrf token @@ -454,7 +460,8 @@ public class RequestHandler { if (requestMap.securityAuth) { // Invoke the security handler // catch exceptions and throw RequestHandlerException if failed. - if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler]: AuthRequired. Running security check. " + showSessionId(request), MODULE); + if (Debug.verboseOn()) + Debug.logVerbose("[RequestHandler]: AuthRequired. Running security check. " + showSessionId(request), MODULE); ConfigXMLReader.Event checkLoginEvent = ccfg.getRequestMapMap().get("checkLogin").event; String checkLoginReturnString = null; @@ -538,7 +545,9 @@ public class RequestHandler { } if (eventReturnBasedRequestResponse != null) { //String eventReturnBasedResponse = requestResponse.value; - if (Debug.verboseOn()) Debug.logVerbose("[Response Qualified]: " + eventReturnBasedRequestResponse.name + ", " + eventReturnBasedRequestResponse.type + ":" + eventReturnBasedRequestResponse.value + showSessionId(request), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[Response Qualified]: " + eventReturnBasedRequestResponse.name + ", " + eventReturnBasedRequestResponse.type + ":" + eventReturnBasedRequestResponse.value + showSessionId(request), MODULE); + } // If error, then display more error messages: if ("error".equals(eventReturnBasedRequestResponse.name)) { @@ -582,7 +591,9 @@ public class RequestHandler { } } - if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler]: previousRequest - " + previousRequest + " (" + loginPass + ")" + showSessionId(request), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[RequestHandler]: previousRequest - " + previousRequest + " (" + loginPass + ")" + showSessionId(request), MODULE); + } // if previous request exists, and a login just succeeded, do that now. if (previousRequest != null && loginPass != null && "TRUE".equalsIgnoreCase(loginPass)) { @@ -591,7 +602,9 @@ public class RequestHandler { if ("logout".equals(previousRequest) || "/logout".equals(previousRequest) || "login".equals(previousRequest) || "/login".equals(previousRequest) || "checkLogin".equals(previousRequest) || "/checkLogin".equals(previousRequest) || "/checkLogin/login".equals(previousRequest)) { Debug.logWarning("Found special _PREVIOUS_REQUEST_ of [" + previousRequest + "], setting to null to avoid problems, not running request again", MODULE); } else { - if (Debug.infoOn()) Debug.logInfo("[Doing Previous Request]: " + previousRequest + showSessionId(request), MODULE); + if (Debug.infoOn()) { + Debug.logInfo("[Doing Previous Request]: " + previousRequest + showSessionId(request), MODULE); + } // note that the previous form parameters are not setup (only the URL ones here), they will be found in the session later and handled when the old request redirect comes back Map<String, Object> previousParamMap = UtilGenerics.checkMap(request.getSession().getAttribute("_PREVIOUS_PARAM_MAP_URL_"), String.class, Object.class); @@ -627,7 +640,9 @@ public class RequestHandler { throw new RequestHandlerException("Illegal response; handler could not process request [" + requestMap.uri + "] and event return [" + eventReturn + "]."); } - if (Debug.verboseOn()) Debug.logVerbose("[Event Response Selected] type=" + nextRequestResponse.type + ", value=" + nextRequestResponse.value + ". " + showSessionId(request), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[Event Response Selected] type=" + nextRequestResponse.type + ", value=" + nextRequestResponse.value + ". " + showSessionId(request), MODULE); + } // ========== Handle the responses - chains/views ========== @@ -670,7 +685,9 @@ public class RequestHandler { : ccfg.getStatusCode(); if ("url".equals(nextRequestResponse.type)) { - if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is a URL redirect." + showSessionId(request), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[RequestHandler.doRequest]: Response is a URL redirect." + showSessionId(request), MODULE); + } callRedirect(nextRequestResponse.value, response, request, redirectSC); } else if ("url-redirect".equals(nextRequestResponse.type)) { // check for a cross-application redirect @@ -681,11 +698,15 @@ public class RequestHandler { request, redirectSC); } else if ("cross-redirect".equals(nextRequestResponse.type)) { // check for a cross-application redirect - if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is a Cross-Application redirect." + showSessionId(request), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[RequestHandler.doRequest]: Response is a Cross-Application redirect." + showSessionId(request), MODULE); + } String url = nextRequestResponse.value.startsWith("/") ? nextRequestResponse.value : "/" + nextRequestResponse.value; callRedirect(url + this.makeQueryString(request, nextRequestResponse), response, request, redirectSC); } else if ("request-redirect".equals(nextRequestResponse.type)) { - if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is a Request redirect." + showSessionId(request), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[RequestHandler.doRequest]: Response is a Request redirect." + showSessionId(request), MODULE); + } String link = makeLinkWithQueryString(request, response, "/" + nextRequestResponse.value, nextRequestResponse); // add / update csrf token to link when required @@ -694,7 +715,9 @@ public class RequestHandler { callRedirect(link, response, request, redirectSC); } else if ("request-redirect-noparam".equals(nextRequestResponse.type)) { - if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is a Request redirect with no parameters." + showSessionId(request), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[RequestHandler.doRequest]: Response is a Request redirect with no parameters." + showSessionId(request), MODULE); + } String link = makeLink(request, response, nextRequestResponse.value); // add token to link when required @@ -703,13 +726,17 @@ public class RequestHandler { callRedirect(link, response, request, redirectSC); } else if ("view".equals(nextRequestResponse.type)) { - if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is a view." + showSessionId(request), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[RequestHandler.doRequest]: Response is a view." + showSessionId(request), MODULE); + } // check for an override view, only used if "success" = eventReturn String viewName = (UtilValidate.isNotEmpty(overrideViewUri) && (eventReturn == null || "success".equals(eventReturn))) ? overrideViewUri : nextRequestResponse.value; renderView(viewName, requestMap.securityExternalView, request, response, saveName); } else if ("view-last".equals(nextRequestResponse.type)) { - if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is a view." + showSessionId(request), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[RequestHandler.doRequest]: Response is a view." + showSessionId(request), MODULE); + } // check for an override view, only used if "success" = eventReturn String viewName = (UtilValidate.isNotEmpty(overrideViewUri) && (eventReturn == null || "success".equals(eventReturn))) ? overrideViewUri : nextRequestResponse.value; @@ -743,7 +770,9 @@ public class RequestHandler { } renderView(viewName, requestMap.securityExternalView, request, response, null); } else if ("view-last-noparam".equals(nextRequestResponse.type)) { - if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is a view." + showSessionId(request), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[RequestHandler.doRequest]: Response is a view." + showSessionId(request), MODULE); + } // check for an override view, only used if "success" = eventReturn String viewName = (UtilValidate.isNotEmpty(overrideViewUri) && (eventReturn == null || "success".equals(eventReturn))) ? overrideViewUri : nextRequestResponse.value; @@ -760,7 +789,9 @@ public class RequestHandler { } renderView(viewName, requestMap.securityExternalView, request, response, null); } else if ("view-home".equals(nextRequestResponse.type)) { - if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is a view." + showSessionId(request), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[RequestHandler.doRequest]: Response is a view." + showSessionId(request), MODULE); + } // check for an override view, only used if "success" = eventReturn String viewName = (UtilValidate.isNotEmpty(overrideViewUri) && (eventReturn == null || "success".equals(eventReturn))) ? overrideViewUri : nextRequestResponse.value; @@ -779,7 +810,9 @@ public class RequestHandler { renderView(viewName, requestMap.securityExternalView, request, response, null); } else if ("none".equals(nextRequestResponse.type)) { // no view to render (meaning the return was processed by the event) - if (Debug.verboseOn()) Debug.logVerbose("[RequestHandler.doRequest]: Response is handled by the event." + showSessionId(request), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[RequestHandler.doRequest]: Response is handled by the event." + showSessionId(request), MODULE); + } } } if (originalRequestMap.metrics != null) { @@ -861,7 +894,9 @@ public class RequestHandler { } private static void callRedirect(String url, HttpServletResponse resp, HttpServletRequest req, String statusCodeString) throws RequestHandlerException { - if (Debug.infoOn()) Debug.logInfo("Sending redirect to: [" + url + "]. " + showSessionId(req), MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Sending redirect to: [" + url + "]. " + showSessionId(req), MODULE); + } // set the attributes in the session so we can access it. Enumeration<String> attributeNameEnum = UtilGenerics.cast(req.getAttributeNames()); Map<String, Object> reqAttrMap = new HashMap<>(); @@ -919,13 +954,19 @@ public class RequestHandler { if (UtilHttp.getVisualTheme(req) == null) { UtilHttp.setVisualTheme(req.getSession(), ThemeFactory.resolveVisualTheme(req)); } - if (Debug.infoOn()) Debug.logInfo("Rendering View [" + view + "]. " + showSessionId(req), MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Rendering View [" + view + "]. " + showSessionId(req), MODULE); + } if (view.startsWith(servletName + "/")) { view = view.substring(servletName.length() + 1); - if (Debug.infoOn()) Debug.logInfo("a manual control servlet request was received, removing control servlet path resulting in: view=" + view, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("a manual control servlet request was received, removing control servlet path resulting in: view=" + view, MODULE); + } } - if (Debug.verboseOn()) Debug.logVerbose("[Getting View Map]: " + view + showSessionId(req), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[Getting View Map]: " + view + showSessionId(req), MODULE); + } // before mapping the view, set a request attribute so we know where we are req.setAttribute("_CURRENT_VIEW_", view); @@ -971,7 +1012,9 @@ public class RequestHandler { nextPage = viewMap.page; } - if (Debug.verboseOn()) Debug.logVerbose("[Mapped To]: " + nextPage + showSessionId(req), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[Mapped To]: " + nextPage + showSessionId(req), MODULE); + } long viewStartTime = System.currentTimeMillis(); @@ -995,13 +1038,17 @@ public class RequestHandler { resp.setContentType(contentType); } - if (Debug.verboseOn()) Debug.logVerbose("The ContentType for the " + view + " view is: " + contentType, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("The ContentType for the " + view + " view is: " + contentType, MODULE); + } //Cache Headers boolean viewNoCache = viewMap.noCache; if (viewNoCache) { UtilHttp.setResponseBrowserProxyNoCache(resp); - if (Debug.verboseOn()) Debug.logVerbose("Sending no-cache headers for view [" + nextPage + "]", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Sending no-cache headers for view [" + nextPage + "]", MODULE); + } } else { resp.setHeader("Cache-Control", "Set-Cookie"); } @@ -1010,7 +1057,9 @@ public class RequestHandler { UtilHttp.setResponseBrowserDefaultSecurityHeaders(resp, viewMap); try { - if (Debug.verboseOn()) Debug.logVerbose("Rendering view [" + nextPage + "] of type [" + viewMap.type + "]", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Rendering view [" + nextPage + "] of type [" + viewMap.type + "]", MODULE); + } ViewHandler vh = viewFactory.getViewHandler(viewMap.type); vh.render(view, nextPage, viewMap.info, contentType, charset, req, resp); } catch (ViewHandlerException e) { @@ -1026,7 +1075,9 @@ public class RequestHandler { or if request is an ajax request and user calls abort() method for on ajax request then its showing broken pipe exception on console, skip throwing of RequestHandlerException. JIRA Ticket - OFBIZ-254 */ - if (Debug.verboseOn()) Debug.logVerbose("Skip Request Handler Exception that is caused due to aborted requests. " + e.getMessage(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Skip Request Handler Exception that is caused due to aborted requests. " + e.getMessage(), MODULE); + } } String vname = (String) req.getAttribute("_CURRENT_VIEW_"); @@ -1124,7 +1175,9 @@ public class RequestHandler { boolean didFullSecure = false; boolean didFullStandard = false; if (requestMap != null && (webSiteProps.getEnableHttps() || fullPath || secure)) { - if (Debug.verboseOn()) Debug.logVerbose("In makeLink requestUri=" + requestUri, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("In makeLink requestUri=" + requestUri, MODULE); + } if (secure || (webSiteProps.getEnableHttps() && requestMap.securityHttps && !request.isSecure())) { didFullSecure = true; } else if (fullPath || (webSiteProps.getEnableHttps() && !requestMap.securityHttps && request.isSecure())) { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/WebAppConfigurationException.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/WebAppConfigurationException.java index 8e81c2d..3f3fd08 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/WebAppConfigurationException.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/WebAppConfigurationException.java @@ -20,7 +20,6 @@ package org.apache.ofbiz.webapp.control; /** * Web application configuration exception. - * * @see <code>site-conf.xsd</code> */ @SuppressWarnings("serial") 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 63914d0..2b286da 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 @@ -404,7 +404,7 @@ public class CoreEvents { } } else if (servicePathObject instanceof Collection<?>) { Collection<?> servicePathColl = UtilGenerics.cast(servicePathObject); - int count=0; + int count = 0; servicePathMap = new HashMap<>(); for (Object value: servicePathColl) { servicePathMap.put("_" + count + "_", value); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java index 75f5f6c..a024743 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java @@ -62,7 +62,9 @@ public class JavaEventHandler implements EventHandler { HttpServletRequest request, HttpServletResponse response) throws EventHandlerException { Class<?> k = classes.computeIfAbsent(event.path, JavaEventHandler::loadClass); - if (Debug.verboseOn()) Debug.logVerbose("*[[Event invocation]]*", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("*[[Event invocation]]*", MODULE); + } if (k == null) { throw new EventHandlerException("Error invoking event, the class " + event.path + " was not found"); @@ -71,7 +73,9 @@ public class JavaEventHandler implements EventHandler { throw new EventHandlerException("Invalid event method or path; call initialize()"); } - if (Debug.verboseOn()) Debug.logVerbose("[Processing]: Java Event", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[Processing]: Java Event", MODULE); + } boolean began = false; try { int timeout = Integer.max(event.transactionTimeout, 0); @@ -79,7 +83,9 @@ public class JavaEventHandler implements EventHandler { Method m = k.getMethod(event.invoke, HttpServletRequest.class, HttpServletResponse.class); String ret = (String) m.invoke(null, request, response); - if (Debug.verboseOn()) Debug.logVerbose("[Event Return]: " + ret, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[Event Return]: " + ret, MODULE); + } return ret; } catch (java.lang.reflect.InvocationTargetException e) { Throwable t = e.getTargetException(); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java index 0ab811a..fc3fd23 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java @@ -159,7 +159,9 @@ public class SOAPEventHandler implements EventHandler { throw new EventHandlerException("Cannot get the envelope", e); } - if (Debug.verboseOn()) Debug.logVerbose("[Processing]: SOAP Event", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[Processing]: SOAP Event", MODULE); + } String serviceName = null; try { @@ -185,7 +187,9 @@ public class SOAPEventHandler implements EventHandler { } Map<String, Object> serviceResults = dispatcher.runSync(serviceName, parameters); - if (Debug.verboseOn()) Debug.logVerbose("[EventHandler] : Service invoked", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[EventHandler] : Service invoked", MODULE); + } createAndSendSOAPResponse(serviceResults, serviceName, response); @@ -228,7 +232,9 @@ public class SOAPEventHandler implements EventHandler { HttpServletResponse response) throws EventHandlerException { try { // setup the response - if (Debug.verboseOn()) Debug.logVerbose("[EventHandler] : Setting up response message", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[EventHandler] : Setting up response message", MODULE); + } String xmlResults = SoapSerializer.serialize(serviceResults); //Debug.logInfo("xmlResults ==================" + xmlResults, MODULE); XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xmlResults)); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java index 5aa880d..ece3cd0 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java @@ -104,7 +104,9 @@ public class ServiceMultiEventHandler implements EventHandler { if (serviceName == null) { throw new EventHandlerException("Service name (eventMethod) cannot be null"); } - if (Debug.verboseOn()) Debug.logVerbose("[Set mode/service]: " + mode + "/" + serviceName, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[Set mode/service]: " + mode + "/" + serviceName, MODULE); + } // some needed info for when running the service Locale locale = UtilHttp.getLocale(request); @@ -125,8 +127,12 @@ public class ServiceMultiEventHandler implements EventHandler { throw new EventHandlerException("Problems getting the service model"); } - if (Debug.verboseOn()) Debug.logVerbose("[Processing]: SERVICE Event", MODULE); - if (Debug.verboseOn()) Debug.logVerbose("[Using delegator]: " + dispatcher.getDelegator().getDelegatorName(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[Processing]: SERVICE Event", MODULE); + } + if (Debug.verboseOn()) { + Debug.logVerbose("[Using delegator]: " + dispatcher.getDelegator().getDelegatorName(), MODULE); + } // check if we are using per row submit boolean useRowSubmit = request.getParameter("_useRowSubmit") == null ? false : diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java index 5e2b772..b927c3e 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java @@ -55,7 +55,9 @@ public class SimpleEventHandler implements EventHandler { String eventName = event.invoke; Locale locale = UtilHttp.getLocale(request); - if (Debug.verboseOn()) Debug.logVerbose("[Set path/method]: " + xmlResource + " / " + eventName, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[Set path/method]: " + xmlResource + " / " + eventName, MODULE); + } if (xmlResource == null) { throw new EventHandlerException("XML Resource (eventPath) cannot be null"); @@ -64,12 +66,16 @@ public class SimpleEventHandler implements EventHandler { throw new EventHandlerException("Event Name (eventMethod) cannot be null"); } - if (Debug.verboseOn()) Debug.logVerbose("[Processing]: SIMPLE Event", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[Processing]: SIMPLE Event", MODULE); + } try { int timeout = Integer.max(event.transactionTimeout, 0); beganTransaction = TransactionUtil.begin(timeout); String eventReturn = SimpleMethod.runSimpleEvent(xmlResource, eventName, request, response); - if (Debug.verboseOn()) Debug.logVerbose("[Event Return]: " + eventReturn, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("[Event Return]: " + eventReturn, MODULE); + } return eventReturn; } catch (MiniLangException e) { Debug.logError(e, MODULE); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizContentTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizContentTransform.java index a0b52cd..1bcd3fc 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizContentTransform.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizContentTransform.java @@ -47,7 +47,9 @@ public class OfbizContentTransform implements TemplateTransformModel { String result = ""; Object obj = args.get(key); if (obj != null) { - if (Debug.verboseOn()) Debug.logVerbose("Arg Object : " + obj.getClass().getName(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Arg Object : " + obj.getClass().getName(), MODULE); + } if (obj instanceof TemplateScalarModel) { TemplateScalarModel s = (TemplateScalarModel) obj; try { 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 09c4bbb..0c2f5a0 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 @@ -51,10 +51,12 @@ public class OfbizCurrencyTransform implements TemplateTransformModel { private static final String MODULE = OfbizCurrencyTransform.class.getName(); private static String getArg(Map<String, Object> args, String key) { - String result = ""; + String result = ""; Object o = args.get(key); if (o != null) { - if (Debug.verboseOn()) Debug.logVerbose("Arg Object : " + o.getClass().getName(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Arg Object : " + o.getClass().getName(), MODULE); + } if (o instanceof TemplateScalarModel) { TemplateScalarModel s = (TemplateScalarModel) o; try { @@ -77,7 +79,9 @@ public class OfbizCurrencyTransform implements TemplateTransformModel { if (o == null) { o = 0.00; } - if (Debug.verboseOn()) Debug.logVerbose("Amount Object : " + o.getClass().getName(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Amount Object : " + o.getClass().getName(), MODULE); + } if (o instanceof SimpleScalar) { SimpleScalar s = (SimpleScalar) o; @@ -91,7 +95,9 @@ public class OfbizCurrencyTransform implements TemplateTransformModel { private static Integer getInteger(Map<String, Object> args, String key) { if (args.containsKey(key)) { Object o = args.get(key); - if (Debug.verboseOn()) Debug.logVerbose("Amount Object : " + o.getClass().getName(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Amount Object : " + o.getClass().getName(), MODULE); + } // handle nulls better if (o == null) { @@ -170,7 +176,9 @@ public class OfbizCurrencyTransform implements TemplateTransformModel { @Override public void close() throws IOException { try { - if (Debug.verboseOn()) Debug.logVerbose("parms: " + amount + " " + isoCode + " " + locale, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("parms: " + amount + " " + isoCode + " " + locale, MODULE); + } if (locale.length() < 1) { // Load the locale from the session Environment env = Environment.getCurrentEnvironment(); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizNumberTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizNumberTransform.java index 0d16e69..be2a26b 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizNumberTransform.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizNumberTransform.java @@ -49,7 +49,9 @@ public class OfbizNumberTransform implements TemplateTransformModel { String result = ""; Object o = args.get(key); if (o != null) { - if (Debug.verboseOn()) Debug.logVerbose("Arg Object : " + o.getClass().getName(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Arg Object : " + o.getClass().getName(), MODULE); + } if (o instanceof TemplateScalarModel) { TemplateScalarModel s = (TemplateScalarModel) o; try { @@ -67,7 +69,9 @@ public class OfbizNumberTransform implements TemplateTransformModel { private static Double getNumber(Map<String, Object> args, String key) { if (args.containsKey(key)) { Object o = args.get(key); - if (Debug.verboseOn()) Debug.logVerbose("Number Object : " + o.getClass().getName(), MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Number Object : " + o.getClass().getName(), MODULE); + } // handle nulls better if (o == null) { @@ -114,7 +118,9 @@ public class OfbizNumberTransform implements TemplateTransformModel { @Override public void close() throws IOException { try { - if (Debug.verboseOn()) Debug.logVerbose("params: " + number + " " + format + " " + locale, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("params: " + number + " " + format + " " + locale, MODULE); + } Locale localeObj = null; Delegator delegator = null; // Load the locale from the session diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java index 874d39a..f94b3cb 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java @@ -55,7 +55,6 @@ import freemarker.template.TemplateTransformModel; * exists, it is prepended to the contents of the transform (the part between * <code><@ofbizUrl></code> and <code></@ofbizUrl></code>), and all transform arguments are * ignored.</p> - * */ public class OfbizUrlTransform implements TemplateTransformModel { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java index 93e9a83..497962c 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/VisitHandler.java @@ -220,7 +220,9 @@ public class VisitHandler { // first try to get the current ID from the visitor cookie String cookieVisitorId = null; Cookie[] cookies = request.getCookies(); - if (Debug.verboseOn()) Debug.logVerbose("Cookies:" + cookies, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Cookies:" + cookies, MODULE); + } if (cookies != null) { for (int i = 0; i < cookies.length; i++) { if (cookies[i].getName().equals(visitorCookieName)) { @@ -230,7 +232,9 @@ public class VisitHandler { } } - if (Debug.infoOn()) Debug.logInfo("Found visitorId [" + cookieVisitorId + "] in cookie", MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Found visitorId [" + cookieVisitorId + "] in cookie", MODULE); + } if (UtilValidate.isEmpty(cookieVisitorId)) { // no visitor cookie? create visitor and send back cookie too diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java index 75ed77c..fde7796 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java @@ -50,7 +50,9 @@ public class HttpViewHandler extends AbstractViewHandler { if (UtilValidate.isEmpty(page)) throw new ViewHandlerException("Null or empty source"); - if (Debug.infoOn()) Debug.logInfo("Retreiving HTTP resource at: " + page, MODULE); + if (Debug.infoOn()) { + Debug.logInfo("Retreiving HTTP resource at: " + page, MODULE); + } try { HttpClient httpClient = new HttpClient(page); String pageText = httpClient.get(); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java index 9069afe..ee90448 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java @@ -81,7 +81,9 @@ public final class WebDavUtil { String credentials = request.getHeader("Authorization"); if (credentials != null && credentials.startsWith("Basic ")) { credentials = Arrays.toString(Base64.getMimeDecoder().decode(credentials.replace("Basic ", "").getBytes(StandardCharsets.UTF_8))); - if (Debug.verboseOn()) Debug.logVerbose("Found HTTP Basic credentials", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Found HTTP Basic credentials", MODULE); + } String[] parts = credentials.split(":"); if (parts.length < 2) { return null; 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 82d6273..505b4c1 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 @@ -245,11 +245,11 @@ public class WebToolsServices { } } - int passes=0; + int passes = 0; int initialListSize = files.size(); int lastUnprocessedFilesCount = 0; List<File> unprocessedFiles = new LinkedList<>(); - while (files.size()>0 && + while (files.size() > 0 && files.size() != lastUnprocessedFilesCount) { lastUnprocessedFilesCount = files.size(); unprocessedFiles = new LinkedList<>(); 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 fea14a5..c11fce1 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 @@ -318,7 +318,9 @@ public abstract class AbstractModelAction implements Serializable, ModelAction { public void runAction(Map<String, Object> context) { Object valueObject = valueNameAcsr.get(context); if (valueObject == null) { - if (Debug.verboseOn()) Debug.logVerbose("Value not found with name: " + valueNameAcsr + ", not getting related...", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Value not found with name: " + valueNameAcsr + ", not getting related...", MODULE); + } return; } if (!(valueObject instanceof GenericValue)) { @@ -399,7 +401,9 @@ public abstract class AbstractModelAction implements Serializable, ModelAction { public void runAction(Map<String, Object> context) { Object valueObject = valueNameAcsr.get(context); if (valueObject == null) { - if (Debug.verboseOn()) Debug.logVerbose("Value not found with name: " + valueNameAcsr + ", not getting related...", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("Value not found with name: " + valueNameAcsr + ", not getting related...", MODULE); + } return; } if (!(valueObject instanceof GenericValue)) { 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 1509140..8ef40e1 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 @@ -3335,7 +3335,9 @@ public class ModelFormField { // Output format might not support menus, so make menu rendering optional. MenuStringRenderer menuStringRenderer = (MenuStringRenderer) context.get("menuStringRenderer"); if (menuStringRenderer == null) { - if (Debug.verboseOn()) Debug.logVerbose("MenuStringRenderer instance not found in rendering context, menu not rendered.", MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("MenuStringRenderer instance not found in rendering context, menu not rendered.", MODULE); + } return; } ModelMenu modelMenu = getModelMenu(context); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/ScreenFopViewHandler.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/ScreenFopViewHandler.java index 8c3639f..64dd709 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/ScreenFopViewHandler.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/ScreenFopViewHandler.java @@ -107,7 +107,9 @@ public class ScreenFopViewHandler extends AbstractViewHandler { if (!screenOutString.startsWith("<?xml")) { screenOutString = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + screenOutString; } - if (Debug.verboseOn()) Debug.logVerbose("XSL:FO Screen Output: " + screenOutString, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("XSL:FO Screen Output: " + screenOutString, MODULE); + } if (UtilValidate.isEmpty(contentType)) { contentType = modelTheme.getContentType(getName()); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |