Author: mthl
Date: Mon Jun 10 12:27:40 2019
New Revision: 1860937
URL: http://svn.apache.org/viewvc?rev=1860937&view=rev
Log:
Improved: Add missing ‘static’ modifier for private methods
(OFBIZ-11098)
In order to make it clear when a method is not depending on the
internal state of an object, it is a good practice to declare it as
static.
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayRequest.java
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java
ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/test/MiniLangTests.java
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelNotification.java
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java
ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/AdminServer.java
ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Classpath.java
ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java
ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenu.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayRequest.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayRequest.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayRequest.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayRequest.java
Mon Jun 10 12:27:40 2019
@@ -407,7 +407,7 @@ public class GatewayRequest {
* The value of the node being created.
* @return An XML node as a String in <nodName>nodeValue</nodeName> format
*/
- private String createNode(String nodeName, String nodeValue) {
+ private static String createNode(String nodeName, String nodeValue) {
return "<" + nodeName + ">" + nodeValue + "</" + nodeName + ">";
}
}
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java
Mon Jun 10 12:27:40 2019
@@ -207,7 +207,7 @@ public class PcChargeApi {
}
- private boolean checkIn(String name) {
+ private static boolean checkIn(String name) {
for (String element : validOut) {
if (name.equals(element)) {
return false;
@@ -216,7 +216,7 @@ public class PcChargeApi {
return true;
}
- private boolean checkOut(String name) {
+ private static boolean checkOut(String name) {
for (String element : validIn) {
if (name.equals(element)) {
return false;
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java
Mon Jun 10 12:27:40 2019
@@ -204,7 +204,7 @@ public class RitaApi {
throw new IllegalStateException("Cannot send output object");
}
- private boolean checkIn(String name) {
+ private static boolean checkIn(String name) {
for (String element : validOut) {
if (name.equals(element)) {
return false;
@@ -213,7 +213,7 @@ public class RitaApi {
return true;
}
- private boolean checkOut(String name) {
+ private static boolean checkOut(String name) {
for (String element : validIn) {
if (name.equals(element)) {
return false;
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java
Mon Jun 10 12:27:40 2019
@@ -796,7 +796,7 @@ public class CheckOutHelper {
csi.clearAllTaxInfo();
continue;
}
- List<List<? extends Object>> taxReturn =
this.getTaxAdjustments(dispatcher, "calcTax", serviceContext);
+ List<List<? extends Object>> taxReturn =
getTaxAdjustments(dispatcher, "calcTax", serviceContext);
if (Debug.verboseOn()) {
Debug.logVerbose("ReturnList: " + taxReturn, module);
@@ -908,7 +908,8 @@ public class CheckOutHelper {
}
// Calc the tax adjustments.
- private List<List<? extends Object>> getTaxAdjustments(LocalDispatcher
dispatcher, String taxService, Map<String, Object> serviceContext) throws
GeneralException {
+ private static List<List<? extends Object>>
getTaxAdjustments(LocalDispatcher dispatcher, String taxService,
+ Map<String, Object> serviceContext) throws GeneralException {
Map<String, Object> serviceResult = null;
try {
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
Mon Jun 10 12:27:40 2019
@@ -213,7 +213,7 @@ public class PackingSession implements j
this.runEvents(PackingEvent.EVENT_CODE_ADD);
}
- private BigDecimal numAvailableItems(GenericValue res) {
+ private static BigDecimal numAvailableItems(GenericValue res) {
// In simple situations, the reserved quantity will match the quantity
from the order item.
// If there is a back order, quantity from order may exceed quantity
currently reserved and on hand.
// resQty should never exceed the quantity from the order item,
because that quantity was the quantity reserved in the first place.
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java
Mon Jun 10 12:27:40 2019
@@ -91,7 +91,7 @@ public class ComponentContainer implemen
*
* @param componentsClassPath a list of classpaths for all components
*/
- private void loadClassPathForAllComponents(List<Classpath>
componentsClassPath) {
+ private static void loadClassPathForAllComponents(List<Classpath>
componentsClassPath) {
List<URL> allComponentUrls = new ArrayList<>();
for(Classpath classPath : componentsClassPath) {
try {
@@ -256,7 +256,7 @@ public class ComponentContainer implemen
* @param location directory location of the component
* @return The component configuration
*/
- private ComponentConfig retrieveComponentConfig(String name, String
location) {
+ private static ComponentConfig retrieveComponentConfig(String name, String
location) {
ComponentConfig config = null;
try {
config = ComponentConfig.getComponentConfig(name, location);
@@ -331,7 +331,7 @@ public class ComponentContainer implemen
* @return the constructed classpath
* @throws IOException
*/
- private Classpath buildClasspathFromComponentConfig(ComponentConfig
config) throws IOException {
+ private static Classpath buildClasspathFromComponentConfig(ComponentConfig
config) throws IOException {
Classpath classPath = new Classpath();
String configRoot = config.getRootLocation().replace('\\', '/');
configRoot = configRoot.endsWith("/") ? configRoot : configRoot + "/";
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java
Mon Jun 10 12:27:40 2019
@@ -81,7 +81,8 @@ public class ContainerLoader {
startLoadedContainers();
}
- private Collection<ContainerConfig.Configuration>
retrieveOfbizContainers(String configFile) throws StartupException {
+ private static Collection<ContainerConfig.Configuration>
retrieveOfbizContainers(String configFile)
+ throws StartupException {
try {
return ContainerConfig.getConfigurations(configFile);
} catch (ContainerException e) {
@@ -89,7 +90,7 @@ public class ContainerLoader {
}
}
- private List<ContainerConfig.Configuration>
filterContainersHavingMatchingLoaders(List<String> loaders,
+ private static List<ContainerConfig.Configuration>
filterContainersHavingMatchingLoaders(List<String> loaders,
Collection<ContainerConfig.Configuration> containerConfigs) {
return containerConfigs.stream()
.filter(containerCfg ->
@@ -99,7 +100,7 @@ public class ContainerLoader {
.collect(Collectors.toList());
}
- private List<Container>
loadContainersFromConfigurations(List<ContainerConfig.Configuration>
containerConfigs,
+ private static List<Container>
loadContainersFromConfigurations(List<ContainerConfig.Configuration>
containerConfigs,
Config config, List<StartupCommand> ofbizCommands) throws
StartupException {
List<Container> loadContainers = new ArrayList<>();
@@ -112,8 +113,7 @@ public class ContainerLoader {
return loadContainers;
}
- private Container loadContainer(String configFile,
- ContainerConfig.Configuration containerCfg,
+ private static Container loadContainer(String configFile,
ContainerConfig.Configuration containerCfg,
List<StartupCommand> ofbizCommands) throws StartupException {
// load the container class
ClassLoader loader = Thread.currentThread().getContextClassLoader();
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java
Mon Jun 10 12:27:40 2019
@@ -196,7 +196,7 @@ public class UtilCache<K, V> implements
}
}
- private Object fromKey(Object key) {
+ private static Object fromKey(Object key) {
return key == null ? ObjectType.NULL : key;
}
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java
Mon Jun 10 12:27:40 2019
@@ -137,7 +137,7 @@ public class NodeELResolver extends ELRe
}
}
- private final boolean isResolvable(Object base) {
+ private final static boolean isResolvable(Object base) {
return base != null && (base instanceof Node || base instanceof
NodeImpl);
}
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
Mon Jun 10 12:27:40 2019
@@ -267,7 +267,7 @@ public class FlexibleStringExpanderTests
everythingTest();
}
- private void everythingTest() {
+ private static void everythingTest() {
Map<String, Object> testMap = new HashMap<>();
testMap.put("date", new java.util.Date(1234567890));
testMap.put("usd", "USD");
Modified:
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
Mon Jun 10 12:27:40 2019
@@ -164,7 +164,7 @@ public class CatalinaContainer implement
return name;
}
- private Property retrieveTomcatEngineConfig(ContainerConfig.Configuration
cc) throws ContainerException {
+ private static Property
retrieveTomcatEngineConfig(ContainerConfig.Configuration cc) throws
ContainerException {
List<ContainerConfig.Configuration.Property> engineProps =
cc.getPropertiesWithValue("engine");
if (UtilValidate.isEmpty(engineProps)) {
throw new ContainerException("Cannot load CatalinaContainer; no
engines defined.");
@@ -175,7 +175,7 @@ public class CatalinaContainer implement
return engineProps.get(0);
}
- private Tomcat prepareTomcatServer(ContainerConfig.Configuration cc,
+ private static Tomcat prepareTomcatServer(ContainerConfig.Configuration cc,
ContainerConfig.Configuration.Property engineConfig) throws
ContainerException {
System.setProperty(Globals.CATALINA_HOME_PROP,
System.getProperty("ofbiz.home") + "/" +
@@ -205,7 +205,7 @@ public class CatalinaContainer implement
return tomcat;
}
- private Engine prepareTomcatEngine(Tomcat tomcat, Property engineConfig) {
+ private static Engine prepareTomcatEngine(Tomcat tomcat, Property
engineConfig) {
Engine engine = tomcat.getEngine();
engine.setName(engineConfig.name);
@@ -218,7 +218,7 @@ public class CatalinaContainer implement
return engine;
}
- private Host prepareHost(Tomcat tomcat, List<String> virtualHosts) {
+ private static Host prepareHost(Tomcat tomcat, List<String> virtualHosts) {
Host host;
if (UtilValidate.isEmpty(virtualHosts)) {
@@ -240,7 +240,7 @@ public class CatalinaContainer implement
return host;
}
- private Host prepareVirtualHost(Tomcat tomcat, List<String> virtualHosts) {
+ private static Host prepareVirtualHost(Tomcat tomcat, List<String>
virtualHosts) {
// assume that the first virtual-host will be the default; additional
virtual-hosts will be aliases
String hostName = virtualHosts.get(0);
Host host;
@@ -262,7 +262,7 @@ public class CatalinaContainer implement
return host;
}
- private Property prepareTomcatClustering(Host host, Property engineConfig)
throws ContainerException {
+ private static Property prepareTomcatClustering(Host host, Property
engineConfig) throws ContainerException {
Property clusterProp = null;
List<Property> clusterProps =
engineConfig.getPropertiesWithValue("cluster");
@@ -291,7 +291,7 @@ public class CatalinaContainer implement
return clusterProp;
}
- private NioReceiver prepareChannelReceiver(Property clusterProp) throws
ContainerException {
+ private static NioReceiver prepareChannelReceiver(Property clusterProp)
throws ContainerException {
NioReceiver listener = new NioReceiver();
String tla = ContainerConfig.getPropertyValue(clusterProp,
"tcp-listen-host", "auto");
@@ -312,7 +312,7 @@ public class CatalinaContainer implement
return listener;
}
- private ReplicationTransmitter prepareChannelSender(Property clusterProp)
throws ContainerException {
+ private static ReplicationTransmitter prepareChannelSender(Property
clusterProp) throws ContainerException {
ReplicationTransmitter trans = new ReplicationTransmitter();
try {
MultiPointSender mps =
(MultiPointSender)Class.forName(ContainerConfig.getPropertyValue(clusterProp,
@@ -324,7 +324,7 @@ public class CatalinaContainer implement
return trans;
}
- private McastService prepareChannelMcastService(Property clusterProp)
throws ContainerException {
+ private static McastService prepareChannelMcastService(Property
clusterProp) throws ContainerException {
McastService mcast = new McastService();
String mcb = ContainerConfig.getPropertyValue(clusterProp,
"mcast-bind-addr", null);
@@ -349,7 +349,7 @@ public class CatalinaContainer implement
return mcast;
}
- private ClusterManager prepareClusterManager(Property clusterProp) throws
ContainerException {
+ private static ClusterManager prepareClusterManager(Property clusterProp)
throws ContainerException {
String mgrClassName = ContainerConfig.getPropertyValue(clusterProp,
"manager-class", "org.apache.catalina.ha.session.DeltaManager");
try {
return
(ClusterManager)Class.forName(mgrClassName).getDeclaredConstructor().newInstance();
@@ -358,14 +358,14 @@ public class CatalinaContainer implement
}
}
- private ReplicationValve prepareClusterValve(Property clusterProp) {
+ private static ReplicationValve prepareClusterValve(Property clusterProp) {
ReplicationValve clusterValve = new ReplicationValve();
String defaultValveFilter =
".*\\.gif;.*\\.js;.*\\.jpg;.*\\.htm;.*\\.html;.*\\.txt;.*\\.png;.*\\.css;.*\\.ico;.*\\.htc;";
clusterValve.setFilter(ContainerConfig.getPropertyValue(clusterProp,
"rep-valve-filter", defaultValveFilter));
return clusterValve;
}
- private List<Valve> prepareTomcatEngineValves(Property engineConfig)
throws ContainerException {
+ private static List<Valve> prepareTomcatEngineValves(Property
engineConfig) throws ContainerException {
List<Valve> engineValves = new ArrayList<>();
// configure the CrossSubdomainSessionValve
@@ -410,7 +410,7 @@ public class CatalinaContainer implement
return engineValves;
}
- private List<Connector> prepareTomcatConnectors(Configuration
configuration) throws ContainerException {
+ private static List<Connector> prepareTomcatConnectors(Configuration
configuration) throws ContainerException {
List<Property> connectorProps =
configuration.getPropertiesWithValue("connector");
if (UtilValidate.isEmpty(connectorProps)) {
throw new ContainerException("Cannot load CatalinaContainer; no
connectors defined!");
@@ -421,7 +421,7 @@ public class CatalinaContainer implement
.collect(Collectors.toList());
}
- private Connector prepareConnector(Property connectorProp) {
+ private static Connector prepareConnector(Property connectorProp) {
Connector connector = new
Connector(ContainerConfig.getPropertyValue(connectorProp, "protocol",
"HTTP/1.1"));
connector.setPort(ContainerConfig.getPropertyValue(connectorProp,
"port", 0) + Start.getInstance().getConfig().portOffset);
if ("true".equals(ContainerConfig.getPropertyValue(connectorProp,
"upgradeProtocol", "false"))) {
@@ -445,7 +445,7 @@ public class CatalinaContainer implement
return connector;
}
- private void loadWebapps(Tomcat tomcat, ContainerConfig.Configuration
configuration, Property clusterProp) {
+ private static void loadWebapps(Tomcat tomcat,
ContainerConfig.Configuration configuration, Property clusterProp) {
ScheduledExecutorService executor =
ExecutionPool.getScheduledExecutor(new ThreadGroup(module),
"catalina-startup",
Runtime.getRuntime().availableProcessors(), 0, true);
List<Future<Context>> futures = new ArrayList<>();
@@ -473,7 +473,7 @@ public class CatalinaContainer implement
executor.shutdown();
}
- private List<String> getWebappMounts(ComponentConfig.WebappInfo
webappInfo) {
+ private static List<String> getWebappMounts(ComponentConfig.WebappInfo
webappInfo) {
List<String> allAppsMounts = new ArrayList<>();
String engineName = webappInfo.server;
String mount = webappInfo.getContextRoot();
@@ -486,7 +486,7 @@ public class CatalinaContainer implement
return allAppsMounts;
}
- private Callable<Context> createCallableContext(Tomcat tomcat,
ComponentConfig.WebappInfo appInfo,
+ private static Callable<Context> createCallableContext(Tomcat tomcat,
ComponentConfig.WebappInfo appInfo,
Property clusterProp, ContainerConfig.Configuration configuration)
{
Debug.logInfo("Creating context [" + appInfo.name + "]", module);
@@ -500,7 +500,7 @@ public class CatalinaContainer implement
};
}
- private StandardContext prepareContext(Host host,
ContainerConfig.Configuration configuration,
+ private static StandardContext prepareContext(Host host,
ContainerConfig.Configuration configuration,
ComponentConfig.WebappInfo appInfo, Property clusterProp) throws
ContainerException {
StandardContext context = new StandardContext();
@@ -560,7 +560,7 @@ public class CatalinaContainer implement
return context;
}
- private String getWebappRootLocation(ComponentConfig.WebappInfo appInfo) {
+ private static String getWebappRootLocation(ComponentConfig.WebappInfo
appInfo) {
String location = appInfo.componentConfig.getRootLocation() +
appInfo.location;
location = location.replace('\\', '/');
if (location.endsWith("/")) {
@@ -569,7 +569,7 @@ public class CatalinaContainer implement
return location;
}
- private String getWebappMountPoint(ComponentConfig.WebappInfo appInfo) {
+ private static String getWebappMountPoint(ComponentConfig.WebappInfo
appInfo) {
String mount = appInfo.mountPoint;
if (mount.endsWith("/*")) {
mount = mount.substring(0, mount.length() - 2);
@@ -577,7 +577,8 @@ public class CatalinaContainer implement
return mount;
}
- private boolean isContextDistributable(ContainerConfig.Configuration
configuration, String location) throws ContainerException {
+ private static boolean
isContextDistributable(ContainerConfig.Configuration configuration, String
location)
+ throws ContainerException {
String webXmlFilePath = new
StringBuilder().append("file:///").append(location).append("/WEB-INF/web.xml").toString();
boolean appIsDistributable =
ContainerConfig.getPropertyValue(configuration, "apps-distributable", true);
try {
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
Mon Jun 10 12:27:40 2019
@@ -42,7 +42,7 @@ public class PerformFindTests extends OF
super(name);
}
- private List<GenericValue> getCompleteList(Map<String, Object> context) {
+ private static List<GenericValue> getCompleteList(Map<String, Object>
context) {
List<GenericValue> foundElements = new LinkedList<>();
try (EntityListIterator listIt = (EntityListIterator)
context.get("listIt")) {
if (listIt != null) {
Modified:
ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java
Mon Jun 10 12:27:40 2019
@@ -66,7 +66,7 @@ public final class ModelDataFileReader {
this.modelDataFiles =
Collections.unmodifiableMap(createModelDataFiles());
}
- private ModelDataFile createModelDataFile(Element dataFileElement) {
+ private static ModelDataFile createModelDataFile(Element dataFileElement) {
ModelDataFile dataFile = new ModelDataFile();
String tempStr;
@@ -163,7 +163,7 @@ public final class ModelDataFileReader {
return result;
}
- private ModelField createModelField(Element fieldElement) {
+ private static ModelField createModelField(Element fieldElement) {
ModelField field = new ModelField();
String tempStr;
@@ -203,7 +203,7 @@ public final class ModelDataFileReader {
return field;
}
- private ModelRecord createModelRecord(Element recordElement) {
+ private static ModelRecord createModelRecord(Element recordElement) {
ModelRecord record = new ModelRecord();
String tempStr;
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java
Mon Jun 10 12:27:40 2019
@@ -173,7 +173,7 @@ public class EntityFieldValue extends En
}
}
- private String getColName(Map<String, String> tableAliases, ModelEntity
modelEntity, String fieldName,
+ private static String getColName(Map<String, String> tableAliases,
ModelEntity modelEntity, String fieldName,
boolean includeTableNamePrefix, Datasource datasourceInfo) {
if (modelEntity == null) {
return fieldName;
@@ -182,7 +182,7 @@ public class EntityFieldValue extends En
includeTableNamePrefix, datasourceInfo);
}
- private String getColName(Map<String, String> tableAliases, ModelEntity
modelEntity, ModelField modelField,
+ private static String getColName(Map<String, String> tableAliases,
ModelEntity modelEntity, ModelField modelField,
String fieldName, boolean includeTableNamePrefix, Datasource
datasourceInfo) {
if (modelEntity == null || modelField == null) {
return fieldName;
@@ -209,7 +209,7 @@ public class EntityFieldValue extends En
return colName;
}
- private String getColName(ModelField modelField, String fieldName) {
+ private static String getColName(ModelField modelField, String fieldName) {
return (modelField == null) ? fieldName : modelField.getColValue();
}
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java
Mon Jun 10 12:27:40 2019
@@ -92,7 +92,7 @@ public class GenericDAO {
this.datasource =
EntityConfig.getDatasource(helperInfo.getHelperBaseName());
}
- private void addFieldIfMissing(List<ModelField> fieldsToSave, String
fieldName, ModelEntity modelEntity) {
+ private static void addFieldIfMissing(List<ModelField> fieldsToSave,
String fieldName, ModelEntity modelEntity) {
for (ModelField fieldToSave: fieldsToSave) {
if (fieldName.equals(fieldToSave.getName())) {
return;
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
Mon Jun 10 12:27:40 2019
@@ -111,7 +111,8 @@ public class DatabaseUtil {
return connection;
}
- private Connection getConnection(String driverName, String connectionUrl,
Properties props, String userName, String password) throws SQLException {
+ private static Connection getConnection(String driverName, String
connectionUrl, Properties props, String userName,
+ String password) throws SQLException {
// first register the JDBC driver with the DriverManager
if (driverName != null) {
if (DriverManager.getDriver(driverName) == null) {
@@ -1906,7 +1907,7 @@ public class DatabaseUtil {
}
}
- private String makeTempFieldName(ModelField field) {
+ private static String makeTempFieldName(ModelField field) {
String tempName = "tmp_" + field.getName();
if (tempName.length() > 30) {
tempName = tempName.substring(0, 30);
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java
Mon Jun 10 12:27:40 2019
@@ -676,7 +676,7 @@ public class ModelEntity implements Comp
return getFieldNamesFromFieldVector(getNopksCopy());
}
- private List<String> getFieldNamesFromFieldVector(List<ModelField>
modelFields) {
+ private static List<String> getFieldNamesFromFieldVector(List<ModelField>
modelFields) {
List<String> nameList = new ArrayList<>(modelFields.size());
for (ModelField field: modelFields) {
nameList.add(field.getName());
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java
Mon Jun 10 12:27:40 2019
@@ -925,7 +925,7 @@ public class EntityTestSuite extends Ent
/*
* This creates an string id from a number
*/
- private String getTestId(String strTestBase, int iNum) {
+ private static String getTestId(String strTestBase, int iNum) {
StringBuilder strBufTemp = new StringBuilder(strTestBase);
if (iNum < 10000) {
strBufTemp.append("0");
Modified:
ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
Mon Jun 10 12:27:40 2019
@@ -388,7 +388,7 @@ public final class SimpleMethod extends
addMessage(methodContext, messageListName, message);
}
- private void addMessage(MethodContext methodContext, String
messageListName, String message) {
+ private static void addMessage(MethodContext methodContext, String
messageListName, String message) {
List<String> messages = methodContext.getEnv(messageListName);
if (messages == null) {
messages = new LinkedList<>();
Modified:
ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/test/MiniLangTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/test/MiniLangTests.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/test/MiniLangTests.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/test/MiniLangTests.java
Mon Jun 10 12:27:40 2019
@@ -42,7 +42,7 @@ public class MiniLangTests extends OFBiz
traceEnabled =
"true".equals(UtilProperties.getPropertyValue("minilang",
"unit.tests.trace.enabled"));
}
- private Map<String, Object> createContext() {
+ private static Map<String, Object> createContext() {
return UtilMisc.toMap("locale", Locale.US, "timeZone",
TimeZone.getTimeZone("GMT"));
}
@@ -55,7 +55,7 @@ public class MiniLangTests extends OFBiz
return context;
}
- private SimpleMethod createSimpleMethod(String xmlString) throws Exception
{
+ private static SimpleMethod createSimpleMethod(String xmlString) throws
Exception {
return new
SimpleMethod(UtilXml.readXmlDocument(xmlString).getDocumentElement(), module);
}
Modified:
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelNotification.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelNotification.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelNotification.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelNotification.java
Mon Jun 10 12:27:40 2019
@@ -128,7 +128,7 @@ public class ModelNotification {
}
}
- private String getCommaSeparatedAddressList(NotificationGroup
notificationGroup, String notifyType) {
+ private static String getCommaSeparatedAddressList(NotificationGroup
notificationGroup, String notifyType) {
if (notificationGroup != null) {
List<String> addr = getAddressesByType(notificationGroup,
notifyType);
if (UtilValidate.isNotEmpty(addr)) {
@@ -138,7 +138,7 @@ public class ModelNotification {
return null;
}
- private List<String> getAddressesByType(NotificationGroup group, String
type) {
+ private static List<String> getAddressesByType(NotificationGroup group,
String type) {
List<String> l = new ArrayList<>();
for (Notify n : group.getNotifyList()) {
if (n.getType().equals(type)) {
Modified:
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java
Mon Jun 10 12:27:40 2019
@@ -933,13 +933,13 @@ public class ModelService extends Abstra
// internal map of strings
if (UtilValidate.isNotEmpty(param.stringMapPrefix) &&
!source.containsKey(key)) {
- Map<String, Object> paramMap = this.makePrefixMap(source,
param);
+ Map<String, Object> paramMap = makePrefixMap(source,
param);
if (UtilValidate.isNotEmpty(paramMap)) {
target.put(key, paramMap);
}
// internal list of strings
} else if (UtilValidate.isNotEmpty(param.stringListSuffix) &&
!source.containsKey(key)) {
- List<Object> paramList = this.makeSuffixList(source,
param);
+ List<Object> paramList = makeSuffixList(source, param);
if (UtilValidate.isNotEmpty(paramList)) {
target.put(key, paramList);
}
@@ -968,7 +968,7 @@ public class ModelService extends Abstra
return target;
}
- private Map<String, Object> makePrefixMap(Map<String, ? extends Object>
source, ModelParam param) {
+ private static Map<String, Object> makePrefixMap(Map<String, ? extends
Object> source, ModelParam param) {
Map<String, Object> paramMap = new HashMap<>();
for (Map.Entry<String, ? extends Object> entry: source.entrySet()) {
String key = entry.getKey();
@@ -980,7 +980,7 @@ public class ModelService extends Abstra
return paramMap;
}
- private List<Object> makeSuffixList(Map<String, ? extends Object> source,
ModelParam param) {
+ private static List<Object> makeSuffixList(Map<String, ? extends Object>
source, ModelParam param) {
List<Object> paramList = new LinkedList<>();
for (Map.Entry<String, ? extends Object> entry: source.entrySet()) {
String key = entry.getKey();
Modified:
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java
Mon Jun 10 12:27:40 2019
@@ -242,15 +242,15 @@ public class ModelServiceReader implemen
// construct the context
service.contextInfo = new HashMap<>();
- this.createNotification(serviceElement, service);
- this.createPermission(serviceElement, service);
- this.createPermGroups(serviceElement, service);
- this.createGroupDefs(serviceElement, service);
- this.createImplDefs(serviceElement, service);
+ createNotification(serviceElement, service);
+ createPermission(serviceElement, service);
+ createPermGroups(serviceElement, service);
+ createGroupDefs(serviceElement, service);
+ createImplDefs(serviceElement, service);
this.createAutoAttrDefs(serviceElement, service);
- this.createAttrDefs(serviceElement, service);
- this.createOverrideDefs(serviceElement, service);
- this.createDeprecated(serviceElement, service);
+ createAttrDefs(serviceElement, service);
+ createOverrideDefs(serviceElement, service);
+ createDeprecated(serviceElement, service);
// Get metrics.
Element metricsElement = UtilXml.firstChildElement(serviceElement,
"metric");
if (metricsElement != null) {
@@ -259,7 +259,7 @@ public class ModelServiceReader implemen
return service;
}
- private String getCDATADef(Element baseElement, String tagName) {
+ private static String getCDATADef(Element baseElement, String tagName) {
String value = "";
NodeList nl = baseElement.getElementsByTagName(tagName);
@@ -277,7 +277,7 @@ public class ModelServiceReader implemen
return value;
}
- private void createNotification(Element baseElement, ModelService model) {
+ private static void createNotification(Element baseElement, ModelService
model) {
List<? extends Element> n = UtilXml.childElementList(baseElement,
"notification");
// default notification groups
ModelNotification nSuccess = new ModelNotification();
@@ -305,7 +305,7 @@ public class ModelServiceReader implemen
}
}
- private void createPermission(Element baseElement, ModelService model) {
+ private static void createPermission(Element baseElement, ModelService
model) {
Element e = UtilXml.firstChildElement(baseElement,
"permission-service");
if (e != null) {
model.permissionServiceName = e.getAttribute("service-name");
@@ -315,7 +315,7 @@ public class ModelServiceReader implemen
}
}
- private void createPermGroups(Element baseElement, ModelService model) {
+ private static void createPermGroups(Element baseElement, ModelService
model) {
for (Element element: UtilXml.childElementList(baseElement,
"required-permissions")) {
ModelPermGroup group = new ModelPermGroup();
group.joinType = element.getAttribute("join-type");
@@ -324,7 +324,7 @@ public class ModelServiceReader implemen
}
}
- private void createGroupPermissions(Element baseElement, ModelPermGroup
group, ModelService service) {
+ private static void createGroupPermissions(Element baseElement,
ModelPermGroup group, ModelService service) {
// create the simple permissions
for (Element element: UtilXml.childElementList(baseElement,
"check-permission")) {
ModelPermission perm = new ModelPermission();
@@ -354,7 +354,7 @@ public class ModelServiceReader implemen
}
}
- private void createGroupDefs(Element baseElement, ModelService service) {
+ private static void createGroupDefs(Element baseElement, ModelService
service) {
List<? extends Element> group = UtilXml.childElementList(baseElement,
"group");
if (UtilValidate.isNotEmpty(group)) {
Element groupElement = group.get(0);
@@ -367,7 +367,7 @@ public class ModelServiceReader implemen
}
}
- private void createImplDefs(Element baseElement, ModelService service) {
+ private static void createImplDefs(Element baseElement, ModelService
service) {
for (Element implement: UtilXml.childElementList(baseElement,
"implements")) {
String serviceName =
UtilXml.checkEmpty(implement.getAttribute("service")).intern();
boolean optional =
UtilXml.checkBoolean(implement.getAttribute("optional"), false);
@@ -454,7 +454,7 @@ public class ModelServiceReader implemen
}
}
- private void createAttrDefs(Element baseElement, ModelService service) {
+ private static void createAttrDefs(Element baseElement, ModelService
service) {
// Add in the defined attributes (override the above defaults if
specified)
for (Element attribute: UtilXml.childElementList(baseElement,
"attribute")) {
ModelParam param = new ModelParam();
@@ -494,7 +494,7 @@ public class ModelServiceReader implemen
}
// set the validators
- this.addValidators(attribute, param);
+ addValidators(attribute, param);
service.addParam(param);
}
@@ -591,7 +591,7 @@ public class ModelServiceReader implemen
service.addParam(def);
}
- private void createOverrideDefs(Element baseElement, ModelService service)
{
+ private static void createOverrideDefs(Element baseElement, ModelService
service) {
for (Element overrideElement: UtilXml.childElementList(baseElement,
"override")) {
String name =
UtilXml.checkEmpty(overrideElement.getAttribute("name"));
ModelParam param = service.getParam(name);
@@ -645,7 +645,7 @@ public class ModelServiceReader implemen
}
// override validators
- this.addValidators(overrideElement, param);
+ addValidators(overrideElement, param);
if (directToParams) {
service.addParam(param);
@@ -656,7 +656,7 @@ public class ModelServiceReader implemen
}
}
- private void createDeprecated(Element baseElement, ModelService service) {
+ private static void createDeprecated(Element baseElement, ModelService
service) {
Element deprecated = UtilXml.firstChildElement(baseElement,
"deprecated");
if (deprecated != null) {
service.deprecatedUseInstead =
deprecated.getAttribute("use-instead");
@@ -666,7 +666,7 @@ public class ModelServiceReader implemen
}
}
- private void addValidators(Element attribute, ModelParam param) {
+ private static void addValidators(Element attribute, ModelParam param) {
List<? extends Element> validateElements =
UtilXml.childElementList(attribute, "type-validate");
if (UtilValidate.isNotEmpty(validateElements)) {
// always clear out old ones; never append
@@ -691,7 +691,7 @@ public class ModelServiceReader implemen
}
}
- private Document getDocument(URL url) {
+ private static Document getDocument(URL url) {
if (url == null) {
return null;
}
Modified:
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java
Mon Jun 10 12:27:40 2019
@@ -294,7 +294,7 @@ public final class ServiceDispatcher {
context.putAll(params);
}
// check the locale
- Locale locale = this.checkLocale(context);
+ Locale locale = checkLocale(context);
// set up the running service log
rs = this.logService(localName, modelService,
GenericEngine.SYNC_MODE);
@@ -671,7 +671,7 @@ public final class ServiceDispatcher {
this.logService(localName, service, GenericEngine.ASYNC_MODE);
// check the locale
- Locale locale = this.checkLocale(context);
+ Locale locale = checkLocale(context);
// setup the engine and context
DispatchContext ctx = localContext.get(localName);
@@ -995,7 +995,7 @@ public final class ServiceDispatcher {
}
// checks the locale object in the context
- private Locale checkLocale(Map<String, Object> context) {
+ private static Locale checkLocale(Map<String, Object> context) {
Object locale = context.get("locale");
Locale newLocale = null;
Modified:
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java
Mon Jun 10 12:27:40 2019
@@ -270,7 +270,7 @@ public class RecurrenceInfo {
return checkDateList(rDateList, nextTime, fromTime);
}
- private long checkDateList(List<Date> dateList, long time, long fromTime) {
+ private static long checkDateList(List<Date> dateList, long time, long
fromTime) {
long nextTime = time;
if (UtilValidate.isNotEmpty(dateList)) {
Modified:
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java
Mon Jun 10 12:27:40 2019
@@ -140,7 +140,7 @@ public class RecurrenceRule {
}
// Checks for a valid frequency property.
- private boolean checkFreq(String freq) {
+ private static boolean checkFreq(String freq) {
if (freq == null) {
return false;
}
@@ -708,7 +708,7 @@ public class RecurrenceRule {
}
// Tests a string for the contents of a number at the beginning
- private boolean hasNumber(String str) {
+ private static boolean hasNumber(String str) {
String list[] = {"+", "-", "1", "2", "3", "4", "5", "6", "7", "8",
"9", "0"};
List<String> numberList = Arrays.asList(list);
String firstChar = str.substring(0, 1);
@@ -720,7 +720,7 @@ public class RecurrenceRule {
}
// Gets the numeric value of the number at the beginning of the string
- private int getDailyNumber(String str) {
+ private static int getDailyNumber(String str) {
int number = 0;
StringBuilder numberBuf = new StringBuilder();
@@ -745,7 +745,7 @@ public class RecurrenceRule {
}
// Gets the string part of the combined number+string
- private String getDailyString(String str) {
+ private static String getDailyString(String str) {
StringBuilder sBuf = new StringBuilder();
for (int i = 0; i < str.length(); i++) {
@@ -759,7 +759,7 @@ public class RecurrenceRule {
}
// Returns the Calendar day of the rule day string
- private int getCalendarDay(String day) {
+ private static int getCalendarDay(String day) {
if (day != null) {
day = day.trim();
if ("MO".equalsIgnoreCase(day)) {
Modified:
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java
Mon Jun 10 12:27:40 2019
@@ -75,7 +75,8 @@ public class XMLRPCClientEngine extends
/*
* Invoke the remote XMLRPC SERVICE : This engine convert all value in IN
mode to one struct.
*/
- private Map<String, Object> serviceInvoker(ModelService modelService,
Map<String, Object> context) throws GenericServiceException {
+ private static Map<String, Object> serviceInvoker(ModelService
modelService, Map<String, Object> context)
+ throws GenericServiceException {
if (modelService.location == null || modelService.invoke == null) {
throw new GenericServiceException("Cannot locate service to
invoke");
}
Modified:
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java
Mon Jun 10 12:27:40 2019
@@ -195,7 +195,7 @@ public final class JobPoller implements
}
}
- private boolean pollEnabled() {
+ private static boolean pollEnabled() {
try {
return
ServiceConfigUtil.getServiceEngine().getThreadPool().getPollEnabled();
} catch (GenericConfigException e) {
Modified:
ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/AdminServer.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/AdminServer.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/AdminServer.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/AdminServer.java
Mon Jun 10 12:27:40 2019
@@ -122,7 +122,7 @@ final class AdminServer extends Thread {
&& !request.substring(request.indexOf(':') + 1).isEmpty();
}
- private String prepareResponseToClient(OfbizSocketCommand control,
AtomicReference<ServerState> serverState) {
+ private static String prepareResponseToClient(OfbizSocketCommand control,
AtomicReference<ServerState> serverState) {
String response = null;
switch(control) {
case SHUTDOWN:
Modified:
ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Classpath.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Classpath.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Classpath.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Classpath.java
Mon Jun 10 12:27:40 2019
@@ -124,7 +124,7 @@ public final class Classpath {
}
}
- private void appendPath(StringBuilder cp, String path) {
+ private static void appendPath(StringBuilder cp, String path) {
if (path.indexOf(' ') >= 0) {
cp.append('\"');
cp.append(path);
Modified:
ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java
Mon Jun 10 12:27:40 2019
@@ -76,16 +76,16 @@ public final class Config {
TimeZone.setDefault(getDefaultTimeZone(props));
}
- private String getProperty(Properties props, String key, String
defaultValue) {
+ private static String getProperty(Properties props, String key, String
defaultValue) {
return Optional.ofNullable(System.getProperty(key))
.orElse(props.getProperty(key, defaultValue));
}
- private String getOfbizHome(String homeProp) {
+ private static String getOfbizHome(String homeProp) {
return homeProp.equals(".") ?
System.getProperty("user.dir").replace('\\', '/') : homeProp;
}
- private String getAbsolutePath(Properties props, String key, String
defaultValue, String ofbizHome) {
+ private static String getAbsolutePath(Properties props, String key, String
defaultValue, String ofbizHome) {
return getProperty(props, key, ofbizHome + "/" +
props.getProperty(key, defaultValue));
}
@@ -104,7 +104,7 @@ public final class Config {
return props;
}
- private String determineOfbizPropertiesFileName(List<StartupCommand>
ofbizCommands) {
+ private static String
determineOfbizPropertiesFileName(List<StartupCommand> ofbizCommands) {
if(ofbizCommands.stream().anyMatch(
option ->
option.getName().equals(StartupCommandUtil.StartupOption.LOAD_DATA.getName())))
{
return "load-data.properties";
@@ -116,7 +116,7 @@ public final class Config {
}
}
- private int getPortOffsetValue(List<StartupCommand> ofbizCommands, String
defaultOffset) throws StartupException {
+ private static int getPortOffsetValue(List<StartupCommand> ofbizCommands,
String defaultOffset) throws StartupException {
String extractedPortOffset = ofbizCommands.stream()
.filter(command ->
command.getName().equals(StartupCommandUtil.StartupOption.PORTOFFSET.getName()))
.findFirst()
@@ -129,7 +129,7 @@ public final class Config {
}
}
- private int getAdminPort(Properties props, int defaultAdminPort, int
portOffsetValue) {
+ private static int getAdminPort(Properties props, int defaultAdminPort,
int portOffsetValue) {
String adminPortStr = getProperty(props, "ofbiz.admin.port",
String.valueOf(defaultAdminPort));
try {
return Integer.parseInt(adminPortStr) + portOffsetValue;
@@ -139,7 +139,7 @@ public final class Config {
}
}
- private InetAddress getAdminAddress(String serverHost) throws
StartupException {
+ private static InetAddress getAdminAddress(String serverHost) throws
StartupException {
try {
return InetAddress.getByName(serverHost);
} catch (UnknownHostException e) {
@@ -147,7 +147,7 @@ public final class Config {
}
}
- private Locale getDefaultLocale(Properties props, String defaultLocale) {
+ private static Locale getDefaultLocale(Properties props, String
defaultLocale) {
String localeString = getProperty(props, "ofbiz.locale.default",
defaultLocale);
String locales[] = localeString.split("_");
Locale locale = null;
@@ -168,7 +168,7 @@ public final class Config {
return locale;
}
- private TimeZone getDefaultTimeZone(Properties props) {
+ private static TimeZone getDefaultTimeZone(Properties props) {
String defaultTimezone = getProperty(props, "ofbiz.timeZone.default",
TimeZone.getDefault().getID());
return TimeZone.getTimeZone(defaultTimezone);
}
Modified:
ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java
Mon Jun 10 12:27:40 2019
@@ -112,7 +112,7 @@ public class TestRunContainer implements
return name;
}
- private void setLoggerLevel(String logLevel) {
+ private static void setLoggerLevel(String logLevel) {
if (logLevel != null) {
int selectedLogLevel = Debug.getLevelFromString(logLevel);
@@ -123,7 +123,7 @@ public class TestRunContainer implements
}
}
- private JunitSuiteWrapper prepareJunitSuiteWrapper(Map<String,String>
testProps) throws ContainerException {
+ private static JunitSuiteWrapper
prepareJunitSuiteWrapper(Map<String,String> testProps) throws
ContainerException {
String component = testProps.get("component");
String suiteName = testProps.get("suitename");
String testCase = testProps.get("case");
@@ -144,7 +144,7 @@ public class TestRunContainer implements
}
}
- private void logTestSuiteResults(TestSuite suite, TestResult results) {
+ private static void logTestSuiteResults(TestSuite suite, TestResult
results) {
Debug.logInfo("[JUNIT] Results for test suite: " + suite.getName(),
module);
Debug.logInfo("[JUNIT] Pass: " + results.wasSuccessful() + " | #
Tests: " + results.runCount() + " | # Failed: " +
results.failureCount() + " # Errors: " + results.errorCount(),
module);
@@ -159,7 +159,7 @@ public class TestRunContainer implements
}
}
- private void logErrorsOrFailures(Enumeration<TestFailure>
errorsOrFailures) {
+ private static void logErrorsOrFailures(Enumeration<TestFailure>
errorsOrFailures) {
if (!errorsOrFailures.hasMoreElements()) {
Debug.logInfo("None", module);
} else {
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
Mon Jun 10 12:27:40 2019
@@ -202,7 +202,7 @@ public class ControlEventListener implem
totalPassiveSessions--;
}
- private String getUserLoginSession(HttpSession session) {
+ private static String getUserLoginSession(HttpSession session) {
Map<String, ?> userLoginSession =
UtilGenerics.cast(session.getAttribute("userLoginSession"));
String sessionData = null;
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Mon Jun 10 12:27:40 2019
@@ -847,7 +847,7 @@ public class RequestHandler {
return nextPage;
}
- private void callRedirect(String url, HttpServletResponse resp,
HttpServletRequest req, String statusCodeString) throws RequestHandlerException
{
+ 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);
// set the attributes in the session so we can access it.
Enumeration<String> attributeNameEnum =
UtilGenerics.cast(req.getAttributeNames());
@@ -1070,7 +1070,7 @@ public class RequestHandler {
}
}
- private void addNameValuePairToQueryString(StringBuilder queryString,
String name, String value) {
+ private static void addNameValuePairToQueryString(StringBuilder
queryString, String name, String value) {
if (UtilValidate.isNotEmpty(value)) {
if (queryString.length() > 1) {
queryString.append("&");
@@ -1296,7 +1296,7 @@ public class RequestHandler {
}
}
- private String showSessionId(HttpServletRequest request) {
+ private static String showSessionId(HttpServletRequest request) {
Delegator delegator = (Delegator) request.getAttribute("delegator");
boolean showSessionIdInLog =
EntityUtilProperties.propertyValueEqualsIgnoreCase("requestHandler",
"show-sessionId-in-log", "Y", delegator);
if (showSessionIdInLog) {
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java
Mon Jun 10 12:27:40 2019
@@ -84,7 +84,7 @@ public class SOAPEventHandler implements
if (wsdlReq != null) {
String serviceName =
RequestHandler.getOverrideViewUri(request.getPathInfo());
DispatchContext dctx = dispatcher.getDispatchContext();
- String locationUri = this.getLocationURI(request);
+ String locationUri = getLocationURI(request);
if (serviceName != null) {
Document wsdl = null;
@@ -211,7 +211,7 @@ public class SOAPEventHandler implements
return null;
}
- private void validateSOAPBody(SOAPBody reqBody) throws
EventHandlerException {
+ private static void validateSOAPBody(SOAPBody reqBody) throws
EventHandlerException {
// ensure the SOAPBody contains only one service call request
Integer numServiceCallRequests = 0;
Iterator<Object> serviceIter =
UtilGenerics.cast(reqBody.getChildElements());
@@ -224,7 +224,8 @@ public class SOAPEventHandler implements
}
}
- private void createAndSendSOAPResponse(Map<String, Object> serviceResults,
String serviceName, HttpServletResponse response) throws EventHandlerException {
+ private static void createAndSendSOAPResponse(Map<String, Object>
serviceResults, String serviceName,
+ HttpServletResponse response) throws EventHandlerException {
try {
// setup the response
if (Debug.verboseOn()) Debug.logVerbose("[EventHandler] : Setting
up response message", module);
@@ -266,15 +267,18 @@ public class SOAPEventHandler implements
}
}
- private void sendError(HttpServletResponse res, String errorMessage,
String serviceName) throws EventHandlerException {
+ private static void sendError(HttpServletResponse res, String
errorMessage, String serviceName)
+ throws EventHandlerException {
// setup the response
sendError(res, ServiceUtil.returnError(errorMessage), serviceName);
}
- private void sendError(HttpServletResponse res, List<String>
errorMessages, String serviceName) throws EventHandlerException {
+ private static void sendError(HttpServletResponse res, List<String>
errorMessages, String serviceName)
+ throws EventHandlerException {
sendError(res, ServiceUtil.returnError(errorMessages.toString()),
serviceName);
}
- private void sendError(HttpServletResponse res, Object object, String
serviceName) throws EventHandlerException {
+ private static void sendError(HttpServletResponse res, Object object,
String serviceName)
+ throws EventHandlerException {
try {
// setup the response
res.setContentType("text/xml");
@@ -314,7 +318,7 @@ public class SOAPEventHandler implements
}
}
- private String getLocationURI(HttpServletRequest request) {
+ private static String getLocationURI(HttpServletRequest request) {
StringBuilder uri = new StringBuilder();
uri.append(request.getScheme());
uri.append("://");
Modified:
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
Mon Jun 10 12:27:40 2019
@@ -838,7 +838,7 @@ public abstract class ModelForm extends
}
}
- private void addUpdateField(ModelFormFieldBuilder builder, Set<String>
useWhenFields,
+ private static void addUpdateField(ModelFormFieldBuilder builder,
Set<String> useWhenFields,
List<ModelFormFieldBuilder> fieldBuilderList, Map<String,
ModelFormFieldBuilder> fieldBuilderMap) {
if (!builder.getUseWhen().isEmpty() ||
useWhenFields.contains(builder.getName())) {
useWhenFields.add(builder.getName());
Modified:
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenu.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenu.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenu.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenu.java
Mon Jun 10 12:27:40 2019
@@ -327,7 +327,7 @@ public class ModelMenu extends ModelWidg
* add/override modelMenuItem using the menuItemList and menuItemMap
*
*/
- private void addUpdateMenuItem(ModelMenuItem modelMenuItem,
List<ModelMenuItem> menuItemList,
+ private static void addUpdateMenuItem(ModelMenuItem modelMenuItem,
List<ModelMenuItem> menuItemList,
Map<String, ModelMenuItem> menuItemMap) {
ModelMenuItem existingMenuItem =
menuItemMap.get(modelMenuItem.getName());
if (existingMenuItem != null) {
Modified:
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java
Mon Jun 10 12:27:40 2019
@@ -273,7 +273,7 @@ public class ModelMenuItem extends Model
visitor.visit(this);
}
- private void addUpdateMenuItem(ModelMenuItem modelMenuItem,
List<ModelMenuItem> menuItemList,
+ private static void addUpdateMenuItem(ModelMenuItem modelMenuItem,
List<ModelMenuItem> menuItemList,
Map<String, ModelMenuItem> menuItemMap) {
ModelMenuItem existingMenuItem =
menuItemMap.get(modelMenuItem.getName());
if (existingMenuItem != null) {
Modified:
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java
Mon Jun 10 12:27:40 2019
@@ -265,7 +265,7 @@ public class ModelTheme implements Seria
* @param initWidgetPropertiesMap
* @param widgetProperties
*/
- private void addWidgetProperties(Map<String, Object>
initWidgetPropertiesMap, Element widgetProperties) {
+ private static void addWidgetProperties(Map<String, Object>
initWidgetPropertiesMap, Element widgetProperties) {
for (Element childElement :
UtilXml.childElementList(widgetProperties)) {
switch (childElement.getNodeName()) {
case "default-view-size":
Modified:
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java?rev=1860937&r1=1860936&r2=1860937&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
Mon Jun 10 12:27:40 2019
@@ -491,8 +491,8 @@ public class FormRenderer {
return maxNumOfColumns;
}
- private void renderHiddenIgnoredFields(Appendable writer, Map<String,
Object> context, FormStringRenderer formStringRenderer,
- List<ModelFormField> fieldList) throws IOException {
+ private static void renderHiddenIgnoredFields(Appendable writer,
Map<String, Object> context,
+ FormStringRenderer formStringRenderer, List<ModelFormField>
fieldList) throws IOException {
for (ModelFormField modelFormField : fieldList) {
FieldInfo fieldInfo = modelFormField.getFieldInfo();
@@ -591,7 +591,7 @@ public class FormRenderer {
}
// do all of the hidden fields...
- this.renderHiddenIgnoredFields(writer, localContext,
formStringRenderer, hiddenIgnoredFieldList);
+ renderHiddenIgnoredFields(writer, localContext,
formStringRenderer, hiddenIgnoredFieldList);
Iterator<ModelFormField> innerFormFieldIter =
innerFormFields.iterator();
while (innerFormFieldIter.hasNext()) {
@@ -636,7 +636,7 @@ public class FormRenderer {
}
} else {
// do all of the hidden fields...
- this.renderHiddenIgnoredFields(writer, localContext,
formStringRenderer, hiddenIgnoredFieldList);
+ renderHiddenIgnoredFields(writer, localContext,
formStringRenderer, hiddenIgnoredFieldList);
Iterator<ModelFormField> mainFieldIter = mainFieldList.iterator();
while (mainFieldIter.hasNext()) {
@@ -983,7 +983,7 @@ public class FormRenderer {
// render all hidden & ignored fields
List<ModelFormField> hiddenIgnoredFieldList =
getHiddenIgnoredFields(context, alreadyRendered, tempFieldList, -1);
- this.renderHiddenIgnoredFields(writer, context, formStringRenderer,
hiddenIgnoredFieldList);
+ renderHiddenIgnoredFields(writer, context, formStringRenderer,
hiddenIgnoredFieldList);
// render formatting wrapper open
// This should be covered by fieldGroup.renderStartString
