[ofbiz-framework] branch trunk updated: Improved: Made MODULE as private data member of class instead of public in all framework components. (OFBIZ-11739) This will reduce checkstlye issues. Thanks Jacques for review.
Locked
 
|
This is an automated email from the ASF dual-hosted git repository.
surajk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new abc7836 Improved: Made MODULE as private data member of class instead of public in all framework components. (OFBIZ-11739) This will reduce checkstlye issues. Thanks Jacques for review. abc7836 is described below commit abc7836ddeb45c54c92b2ec59589f6a79590ebb4 Author: Suraj Khurana <[hidden email]> AuthorDate: Fri May 29 13:20:46 2020 +0530 Improved: Made MODULE as private data member of class instead of public in all framework components. (OFBIZ-11739) This will reduce checkstlye issues. Thanks Jacques for review. --- .../ofbiz/base/component/ComponentConfig.java | 2 +- .../base/component/ComponentLoaderConfig.java | 2 +- .../base/component/ComponentResourceHandler.java | 2 +- .../ofbiz/base/concurrent/ExecutionPool.java | 2 +- .../apache/ofbiz/base/config/JNDIConfigUtil.java | 2 +- .../ofbiz/base/config/MainResourceHandler.java | 2 +- .../apache/ofbiz/base/config/ResourceLoader.java | 2 +- .../ofbiz/base/container/ComponentContainer.java | 2 +- .../ofbiz/base/container/ContainerLoader.java | 2 +- .../base/container/NamingServiceContainer.java | 2 +- .../ofbiz/base/conversion/NetConverters.java | 2 +- .../org/apache/ofbiz/base/crypto/DesCrypt.java | 2 +- .../org/apache/ofbiz/base/crypto/HashCrypt.java | 2 +- .../java/org/apache/ofbiz/base/crypto/Main.java | 2 +- .../base/location/ComponentLocationResolver.java | 2 +- .../ofbiz/base/location/FlexibleLocation.java | 2 +- .../apache/ofbiz/base/util/AliasKeyManager.java | 2 +- .../java/org/apache/ofbiz/base/util/FileUtil.java | 2 +- .../org/apache/ofbiz/base/util/GroovyUtil.java | 2 +- .../org/apache/ofbiz/base/util/HttpClient.java | 2 +- .../apache/ofbiz/base/util/JNDIContextFactory.java | 2 +- .../org/apache/ofbiz/base/util/KeyStoreUtil.java | 2 +- .../org/apache/ofbiz/base/util/MessageString.java | 2 +- .../apache/ofbiz/base/util/MultiTrustManager.java | 2 +- .../org/apache/ofbiz/base/util/ObjectType.java | 2 +- .../org/apache/ofbiz/base/util/PatternFactory.java | 2 +- .../apache/ofbiz/base/util/ReferenceCleaner.java | 2 +- .../java/org/apache/ofbiz/base/util/SSLUtil.java | 2 +- .../org/apache/ofbiz/base/util/ScriptUtil.java | 2 +- .../org/apache/ofbiz/base/util/StringUtil.java | 2 +- .../org/apache/ofbiz/base/util/URLConnector.java | 2 +- .../org/apache/ofbiz/base/util/UtilDateTime.java | 2 +- .../org/apache/ofbiz/base/util/UtilFormatOut.java | 2 +- .../org/apache/ofbiz/base/util/UtilGenerics.java | 2 +- .../java/org/apache/ofbiz/base/util/UtilHttp.java | 2 +- .../java/org/apache/ofbiz/base/util/UtilIO.java | 2 +- .../org/apache/ofbiz/base/util/UtilJavaParse.java | 2 +- .../java/org/apache/ofbiz/base/util/UtilMisc.java | 2 +- .../org/apache/ofbiz/base/util/UtilNumber.java | 2 +- .../org/apache/ofbiz/base/util/UtilObject.java | 2 +- .../java/org/apache/ofbiz/base/util/UtilPlist.java | 2 +- .../org/apache/ofbiz/base/util/UtilProperties.java | 2 +- .../java/org/apache/ofbiz/base/util/UtilTimer.java | 2 +- .../java/org/apache/ofbiz/base/util/UtilURL.java | 2 +- .../org/apache/ofbiz/base/util/UtilValidate.java | 2 +- .../java/org/apache/ofbiz/base/util/UtilXml.java | 2 +- .../ofbiz/base/util/cache/CacheSoftReference.java | 2 +- .../apache/ofbiz/base/util/cache/UtilCache.java | 2 +- .../base/util/collections/FlexibleMapAccessor.java | 2 +- .../ofbiz/base/util/collections/MapComparator.java | 2 +- .../ofbiz/base/util/collections/MapContext.java | 2 +- .../ofbiz/base/util/collections/MapStack.java | 2 +- .../util/collections/MultivaluedMapContext.java | 2 +- .../util/collections/ResourceBundleMapWrapper.java | 2 +- .../base/util/string/FlexibleStringExpander.java | 2 +- .../ofbiz/base/util/template/XslTransform.java | 2 +- .../catalina/container/CatalinaContainer.java | 2 +- .../container/CrossSubdomainSessionValve.java | 2 +- .../ofbiz/catalina/container/OFBizRealm.java | 2 +- .../java/org/apache/ofbiz/common/CommonEvents.java | 2 +- .../java/org/apache/ofbiz/common/FindServices.java | 2 +- .../org/apache/ofbiz/common/KeywordSearchUtil.java | 2 +- .../ofbiz/common/email/NotificationServices.java | 2 +- .../org/apache/ofbiz/common/geo/GeoWorker.java | 2 +- .../apache/ofbiz/common/image/ImageTransform.java | 2 +- .../common/login/LdapAuthenticationServices.java | 2 +- .../apache/ofbiz/common/login/LoginServices.java | 2 +- .../common/preferences/PreferenceServices.java | 2 +- .../ofbiz/common/preferences/PreferenceWorker.java | 2 +- .../apache/ofbiz/common/qrcode/QRCodeEvents.java | 2 +- .../apache/ofbiz/common/qrcode/QRCodeServices.java | 2 +- .../ofbiz/common/scripting/ContextHelper.java | 2 +- .../ofbiz/common/scripting/ScriptHelperImpl.java | 2 +- .../apache/ofbiz/common/status/StatusServices.java | 2 +- .../apache/ofbiz/common/status/StatusWorker.java | 2 +- .../org/apache/ofbiz/common/uom/UomWorker.java | 2 +- .../java/org/apache/ofbiz/datafile/DataFile.java | 2 +- .../apache/ofbiz/datafile/DataFile2EntityXml.java | 2 +- .../apache/ofbiz/datafile/ModelDataFileReader.java | 2 +- .../org/apache/ofbiz/datafile/RecordIterator.java | 2 +- .../org/apache/ofbiz/entity/DelegatorFactory.java | 2 +- .../apache/ofbiz/entity/DelegatorFactoryImpl.java | 2 +- .../org/apache/ofbiz/entity/GenericDelegator.java | 2 +- .../org/apache/ofbiz/entity/GenericEntity.java | 2 +- .../entity/cache/AbstractEntityConditionCache.java | 2 +- .../java/org/apache/ofbiz/entity/cache/Cache.java | 2 +- .../org/apache/ofbiz/entity/cache/EntityCache.java | 2 +- .../apache/ofbiz/entity/cache/EntityListCache.java | 2 +- .../ofbiz/entity/cache/EntityObjectCache.java | 2 +- .../entity/condition/EntityComparisonOperator.java | 2 +- .../entity/condition/EntityConditionBuilder.java | 2 +- .../entity/condition/EntityConditionListBase.java | 2 +- .../entity/condition/EntityConditionSubSelect.java | 2 +- .../apache/ofbiz/entity/condition/EntityExpr.java | 2 +- .../ofbiz/entity/condition/EntityFieldValue.java | 2 +- .../apache/ofbiz/entity/condition/OrderByItem.java | 2 +- .../entity/connection/DBCPConnectionFactory.java | 2 +- .../entity/connection/DebugManagedDataSource.java | 2 +- .../apache/ofbiz/entity/datasource/GenericDAO.java | 2 +- .../ofbiz/entity/datasource/GenericHelperDAO.java | 2 +- .../entity/datasource/GenericHelperFactory.java | 2 +- .../ofbiz/entity/datasource/ReadOnlyHelperDAO.java | 2 +- .../apache/ofbiz/entity/finder/ByAndFinder.java | 2 +- .../ofbiz/entity/finder/ByConditionFinder.java | 2 +- .../ofbiz/entity/finder/EntityFinderUtil.java | 2 +- .../org/apache/ofbiz/entity/finder/ListFinder.java | 2 +- .../ofbiz/entity/finder/PrimaryKeyFinder.java | 2 +- .../ofbiz/entity/jdbc/ConnectionFactoryLoader.java | 2 +- .../apache/ofbiz/entity/jdbc/CursorConnection.java | 2 +- .../apache/ofbiz/entity/jdbc/CursorResultSet.java | 2 +- .../apache/ofbiz/entity/jdbc/CursorStatement.java | 2 +- .../org/apache/ofbiz/entity/jdbc/DatabaseUtil.java | 2 +- .../apache/ofbiz/entity/jdbc/JdbcValueHandler.java | 2 +- .../org/apache/ofbiz/entity/jdbc/SQLProcessor.java | 2 +- .../org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java | 2 +- .../ofbiz/entity/model/DynamicViewEntity.java | 2 +- .../org/apache/ofbiz/entity/model/ModelEntity.java | 2 +- .../ofbiz/entity/model/ModelEntityChecker.java | 2 +- .../org/apache/ofbiz/entity/model/ModelField.java | 2 +- .../apache/ofbiz/entity/model/ModelFieldType.java | 2 +- .../ofbiz/entity/model/ModelFieldTypeReader.java | 2 +- .../ofbiz/entity/model/ModelGroupReader.java | 2 +- .../org/apache/ofbiz/entity/model/ModelReader.java | 2 +- .../org/apache/ofbiz/entity/model/ModelUtil.java | 2 +- .../apache/ofbiz/entity/model/ModelViewEntity.java | 2 +- .../ofbiz/entity/serialize/XmlSerializer.java | 2 +- .../apache/ofbiz/entity/test/EntityTestSuite.java | 2 +- .../ofbiz/entity/test/EntityUtilTestSuite.java | 2 +- .../ofbiz/entity/transaction/DebugXaResource.java | 2 +- .../entity/transaction/DumbTransactionFactory.java | 2 +- .../entity/transaction/GenericXaResource.java | 2 +- .../transaction/GeronimoTransactionFactory.java | 2 +- .../entity/transaction/JNDITransactionFactory.java | 2 +- .../transaction/TransactionFactoryLoader.java | 2 +- .../ofbiz/entity/transaction/TransactionUtil.java | 2 +- .../org/apache/ofbiz/entity/util/EntityCrypto.java | 2 +- .../apache/ofbiz/entity/util/EntityDataAssert.java | 2 +- .../apache/ofbiz/entity/util/EntityDataLoader.java | 2 +- .../ofbiz/entity/util/EntityListIterator.java | 2 +- .../org/apache/ofbiz/entity/util/EntityQuery.java | 2 +- .../apache/ofbiz/entity/util/EntitySaxReader.java | 2 +- .../apache/ofbiz/entity/util/EntityTypeUtil.java | 2 +- .../org/apache/ofbiz/entity/util/EntityUtil.java | 2 +- .../org/apache/ofbiz/entity/util/SequenceUtil.java | 2 +- .../apache/ofbiz/entityext/EntityGroupUtil.java | 2 +- .../ofbiz/entityext/EntityServiceFactory.java | 2 +- .../ofbiz/entityext/EntityWatchServices.java | 2 +- .../ofbiz/entityext/cache/EntityCacheServices.java | 2 +- .../entityext/data/EntityDataLoadContainer.java | 2 +- .../ofbiz/entityext/data/EntityDataServices.java | 2 +- .../ofbiz/entityext/data/UpgradeServices.java | 2 +- .../ofbiz/entityext/eca/DelegatorEcaHandler.java | 2 +- .../ofbiz/entityext/eca/EntityEcaAction.java | 2 +- .../ofbiz/entityext/eca/EntityEcaCondition.java | 2 +- .../apache/ofbiz/entityext/eca/EntityEcaRule.java | 2 +- .../ofbiz/entityext/eca/EntityEcaSetField.java | 2 +- .../apache/ofbiz/entityext/eca/EntityEcaUtil.java | 2 +- .../permission/EntityPermissionChecker.java | 2 +- .../synchronization/EntitySyncContext.java | 2 +- .../synchronization/EntitySyncServices.java | 2 +- .../org/apache/ofbiz/minilang/MiniLangUtil.java | 2 +- .../apache/ofbiz/minilang/MiniLangValidate.java | 2 +- .../org/apache/ofbiz/minilang/SimpleMethod.java | 2 +- .../minilang/method/callops/CallClassMethod.java | 2 +- .../minilang/method/callops/CallObjectMethod.java | 2 +- .../ofbiz/minilang/method/callops/CallScript.java | 2 +- .../ofbiz/minilang/method/callops/CallService.java | 2 +- .../minilang/method/callops/CallServiceAsynch.java | 2 +- .../minilang/method/callops/CallSimpleMethod.java | 2 +- .../minilang/method/callops/SetServiceFields.java | 2 +- .../method/conditional/ConditionalFactory.java | 2 +- .../method/conditional/EmptyCondition.java | 2 +- .../method/conditional/RegexpCondition.java | 2 +- .../conditional/ValidateMethodCondition.java | 2 +- .../minilang/method/entityops/CreateValue.java | 2 +- .../ofbiz/minilang/method/entityops/EntityAnd.java | 2 +- .../minilang/method/entityops/EntityCondition.java | 2 +- .../minilang/method/entityops/EntityData.java | 2 +- .../ofbiz/minilang/method/entityops/EntityOne.java | 2 +- .../ofbiz/minilang/method/entityops/FindByAnd.java | 2 +- .../method/entityops/FindByPrimaryKey.java | 2 +- .../minilang/method/entityops/GetRelated.java | 2 +- .../minilang/method/entityops/GetRelatedOne.java | 2 +- .../minilang/method/entityops/MakeNextSeqId.java | 2 +- .../minilang/method/entityops/RefreshValue.java | 2 +- .../minilang/method/entityops/RemoveByAnd.java | 2 +- .../minilang/method/entityops/RemoveList.java | 2 +- .../minilang/method/entityops/RemoveRelated.java | 2 +- .../minilang/method/entityops/RemoveValue.java | 2 +- .../ofbiz/minilang/method/entityops/StoreList.java | 2 +- .../minilang/method/entityops/StoreValue.java | 2 +- .../method/entityops/TransactionBegin.java | 2 +- .../method/entityops/TransactionCommit.java | 2 +- .../method/entityops/TransactionRollback.java | 2 +- .../ofbiz/minilang/method/envops/Assert.java | 2 +- .../ofbiz/minilang/method/envops/CheckId.java | 2 +- .../ofbiz/minilang/method/envops/CreateObject.java | 2 +- .../ofbiz/minilang/method/envops/Iterate.java | 2 +- .../ofbiz/minilang/method/envops/IterateMap.java | 2 +- .../apache/ofbiz/minilang/method/envops/Loop.java | 2 +- .../ofbiz/minilang/method/envops/SetCalendar.java | 2 +- .../ofbiz/minilang/method/envops/SetOperation.java | 2 +- .../ofbiz/minilang/method/otherops/Calculate.java | 2 +- .../ofbiz/minilang/method/otherops/Trace.java | 2 +- .../minilang/method/serviceops/FieldToResult.java | 2 +- .../apache/ofbiz/minilang/operation/Convert.java | 2 +- .../ofbiz/minilang/operation/InFieldOper.java | 2 +- .../ofbiz/minilang/operation/MakeInString.java | 2 +- .../ofbiz/minilang/operation/PropertyOper.java | 2 +- .../apache/ofbiz/minilang/operation/Regexp.java | 2 +- .../ofbiz/minilang/operation/SimpleMapProcess.java | 2 +- .../ofbiz/minilang/operation/ValidateMethod.java | 2 +- .../apache/ofbiz/security/CsrfDefenseStrategy.java | 2 +- .../java/org/apache/ofbiz/security/CsrfUtil.java | 2 +- .../org/apache/ofbiz/security/SecurityFactory.java | 2 +- .../org/apache/ofbiz/security/SecurityUtil.java | 2 +- .../org/apache/ofbiz/service/DispatchContext.java | 2 +- .../apache/ofbiz/service/GenericResultWaiter.java | 2 +- .../apache/ofbiz/service/ModelNotification.java | 2 +- .../java/org/apache/ofbiz/service/ModelParam.java | 2 +- .../org/apache/ofbiz/service/ModelPermGroup.java | 2 +- .../org/apache/ofbiz/service/ModelPermission.java | 2 +- .../org/apache/ofbiz/service/ModelService.java | 2 +- .../apache/ofbiz/service/ModelServiceReader.java | 2 +- .../apache/ofbiz/service/ServiceDispatcher.java | 2 +- .../ofbiz/service/ServiceSynchronization.java | 2 +- .../java/org/apache/ofbiz/service/ServiceUtil.java | 2 +- .../org/apache/ofbiz/service/ServiceXaWrapper.java | 2 +- .../ofbiz/service/calendar/RecurrenceInfo.java | 2 +- .../ofbiz/service/calendar/RecurrenceRule.java | 2 +- .../service/calendar/TemporalExpressions.java | 24 +++++++++++----------- .../ofbiz/service/config/ServiceConfigUtil.java | 2 +- .../apache/ofbiz/service/eca/ServiceEcaAction.java | 2 +- .../ofbiz/service/eca/ServiceEcaCondition.java | 2 +- .../apache/ofbiz/service/eca/ServiceEcaRule.java | 2 +- .../ofbiz/service/eca/ServiceEcaSetField.java | 2 +- .../apache/ofbiz/service/eca/ServiceEcaUtil.java | 2 +- .../ofbiz/service/engine/AbstractEngine.java | 2 +- .../ofbiz/service/engine/EntityAutoEngine.java | 2 +- .../ofbiz/service/engine/GenericAsyncEngine.java | 2 +- .../apache/ofbiz/service/engine/GroovyEngine.java | 2 +- .../apache/ofbiz/service/engine/HttpEngine.java | 2 +- .../ofbiz/service/engine/SOAPClientEngine.java | 2 +- .../apache/ofbiz/service/engine/ScriptEngine.java | 2 +- .../ofbiz/service/engine/SoapSerializer.java | 2 +- .../ofbiz/service/engine/StandardJavaEngine.java | 2 +- .../ofbiz/service/engine/XMLRPCClientEngine.java | 2 +- .../org/apache/ofbiz/service/group/GroupModel.java | 2 +- .../ofbiz/service/group/GroupServiceModel.java | 2 +- .../ofbiz/service/group/ServiceGroupReader.java | 2 +- .../ofbiz/service/jms/AbstractJmsListener.java | 2 +- .../ofbiz/service/jms/JmsListenerFactory.java | 2 +- .../apache/ofbiz/service/jms/JmsQueueListener.java | 2 +- .../apache/ofbiz/service/jms/JmsSerializer.java | 2 +- .../apache/ofbiz/service/jms/JmsServiceEngine.java | 2 +- .../apache/ofbiz/service/jms/JmsTopicListener.java | 2 +- .../org/apache/ofbiz/service/job/AbstractJob.java | 2 +- .../ofbiz/service/job/GenericServiceJob.java | 2 +- .../org/apache/ofbiz/service/job/JobManager.java | 2 +- .../org/apache/ofbiz/service/job/JobPoller.java | 2 +- .../org/apache/ofbiz/service/job/JobServices.java | 2 +- .../java/org/apache/ofbiz/service/job/JobUtil.java | 2 +- .../ofbiz/service/job/PersistedServiceJob.java | 2 +- .../org/apache/ofbiz/service/job/PurgeJob.java | 2 +- .../ofbiz/service/mail/JavaMailContainer.java | 2 +- .../ofbiz/service/mail/MimeMessageWrapper.java | 2 +- .../ofbiz/service/mail/ServiceMcaAction.java | 2 +- .../ofbiz/service/mail/ServiceMcaCondition.java | 2 +- .../apache/ofbiz/service/mail/ServiceMcaRule.java | 2 +- .../apache/ofbiz/service/mail/ServiceMcaUtil.java | 2 +- .../ofbiz/service/rmi/ExampleRemoteClient.java | 2 +- .../ofbiz/service/rmi/RemoteDispatcherImpl.java | 2 +- .../ofbiz/service/rmi/RmiServiceContainer.java | 2 +- .../rmi/socket/ssl/SSLClientSocketFactory.java | 2 +- .../rmi/socket/ssl/SSLServerSocketFactory.java | 2 +- .../ofbiz/service/test/AbstractXmlRpcTestCase.java | 2 +- .../test/ServiceEngineTestPermissionServices.java | 2 +- .../service/test/ServiceEngineTestServices.java | 2 +- .../org/apache/ofbiz/service/test/XmlRpcTests.java | 2 +- .../apache/ofbiz/service/xmlrpc/XmlRpcClient.java | 2 +- .../ofbiz/base/start/StartupControlPanel.java | 2 +- .../ofbiz/testtools/EntityXmlAssertTest.java | 2 +- .../apache/ofbiz/testtools/JunitSuiteWrapper.java | 2 +- .../org/apache/ofbiz/testtools/ModelTestSuite.java | 2 +- .../org/apache/ofbiz/testtools/ServiceTest.java | 2 +- .../apache/ofbiz/testtools/SimpleMethodTest.java | 2 +- .../apache/ofbiz/testtools/TestRunContainer.java | 2 +- .../org/apache/ofbiz/webapp/OfbizUrlBuilder.java | 2 +- .../java/org/apache/ofbiz/webapp/WebAppUtil.java | 2 +- .../ofbiz/webapp/control/ConfigXMLReader.java | 2 +- .../control/ControlActivationEventListener.java | 2 +- .../ofbiz/webapp/control/ControlEventListener.java | 2 +- .../ofbiz/webapp/control/LoginEventListener.java | 2 +- .../ofbiz/webapp/control/RequestHandler.java | 2 +- .../apache/ofbiz/webapp/control/TokenFilter.java | 2 +- .../org/apache/ofbiz/webapp/event/CoreEvents.java | 2 +- .../apache/ofbiz/webapp/event/EventFactory.java | 2 +- .../webapp/event/FileUploadProgressListener.java | 2 +- .../ofbiz/webapp/event/GroovyEventHandler.java | 2 +- .../ofbiz/webapp/event/JavaEventHandler.java | 2 +- .../ofbiz/webapp/event/RomeEventHandler.java | 2 +- .../ofbiz/webapp/event/SOAPEventHandler.java | 2 +- .../ofbiz/webapp/event/ScriptEventHandler.java | 2 +- .../ofbiz/webapp/event/ServiceEventHandler.java | 2 +- .../webapp/event/ServiceMultiEventHandler.java | 2 +- .../ofbiz/webapp/event/SimpleEventHandler.java | 2 +- .../org/apache/ofbiz/webapp/event/TestEvent.java | 2 +- .../ofbiz/webapp/event/XmlRpcEventHandler.java | 2 +- .../ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java | 2 +- .../webapp/ftl/CsrfTokenPairNonAjaxTransform.java | 2 +- .../ofbiz/webapp/ftl/FreeMarkerViewHandler.java | 2 +- .../ofbiz/webapp/ftl/OfbizAmountTransform.java | 2 +- .../ofbiz/webapp/ftl/OfbizCurrencyTransform.java | 2 +- .../ofbiz/webapp/ftl/OfbizNumberTransform.java | 2 +- .../webapp/ftl/RenderWrappedTextTransform.java | 2 +- .../webapp/ftl/ScriptTemplateListTransform.java | 2 +- .../ofbiz/webapp/ftl/SetContextFieldTransform.java | 2 +- .../webapp/ftl/SetRequestAttributeMethod.java | 2 +- .../apache/ofbiz/webapp/stats/ServerHitBin.java | 2 +- .../apache/ofbiz/webapp/stats/VisitHandler.java | 2 +- .../apache/ofbiz/webapp/taglib/ContentUrlTag.java | 2 +- .../apache/ofbiz/webapp/view/ApacheFopWorker.java | 2 +- .../apache/ofbiz/webapp/view/HttpViewHandler.java | 2 +- .../apache/ofbiz/webapp/view/JspViewHandler.java | 2 +- .../org/apache/ofbiz/webapp/view/ViewFactory.java | 2 +- .../apache/ofbiz/webapp/webdav/ResponseHelper.java | 2 +- .../apache/ofbiz/webapp/webdav/WebDavServlet.java | 2 +- .../org/apache/ofbiz/webapp/webdav/WebDavUtil.java | 2 +- .../apache/ofbiz/webapp/website/WebSiteWorker.java | 2 +- .../org/apache/ofbiz/webtools/GenericWebEvent.java | 2 +- .../apache/ofbiz/webtools/WebToolsServices.java | 2 +- .../webtools/artifactinfo/ArtifactInfoFactory.java | 2 +- .../ControllerRequestArtifactInfo.java | 2 +- .../artifactinfo/ControllerViewArtifactInfo.java | 2 +- .../artifactinfo/FormWidgetArtifactInfo.java | 2 +- .../ofbiz/webtools/artifactinfo/RunTestEvents.java | 2 +- .../artifactinfo/ScreenWidgetArtifactInfo.java | 2 +- .../webtools/artifactinfo/ServiceArtifactInfo.java | 2 +- .../ofbiz/webtools/labelmanager/LabelFile.java | 2 +- .../ofbiz/webtools/labelmanager/LabelInfo.java | 2 +- .../webtools/labelmanager/LabelManagerFactory.java | 2 +- .../webtools/labelmanager/LabelReferences.java | 2 +- .../ofbiz/webtools/labelmanager/LabelValue.java | 2 +- .../ofbiz/webtools/print/FoPrintServerEvents.java | 2 +- .../org/apache/ofbiz/widget/WidgetFactory.java | 2 +- .../java/org/apache/ofbiz/widget/WidgetWorker.java | 2 +- .../ofbiz/widget/cache/GenericWidgetOutput.java | 2 +- .../org/apache/ofbiz/widget/cache/ScreenCache.java | 2 +- .../ofbiz/widget/cache/WidgetContextCacheKey.java | 2 +- .../ofbiz/widget/content/WidgetContentWorker.java | 2 +- .../widget/content/WidgetDataResourceWorker.java | 2 +- .../ofbiz/widget/model/AbstractModelAction.java | 2 +- .../ofbiz/widget/model/AbstractModelCondition.java | 2 +- .../ofbiz/widget/model/CommonWidgetModels.java | 2 +- .../org/apache/ofbiz/widget/model/FieldInfo.java | 2 +- .../org/apache/ofbiz/widget/model/FormFactory.java | 2 +- .../org/apache/ofbiz/widget/model/GridFactory.java | 2 +- .../org/apache/ofbiz/widget/model/HtmlWidget.java | 2 +- .../ofbiz/widget/model/IterateSectionWidget.java | 2 +- .../org/apache/ofbiz/widget/model/MenuFactory.java | 2 +- .../org/apache/ofbiz/widget/model/ModelForm.java | 2 +- .../apache/ofbiz/widget/model/ModelFormAction.java | 2 +- .../apache/ofbiz/widget/model/ModelFormField.java | 2 +- .../ofbiz/widget/model/ModelFormFieldBuilder.java | 2 +- .../org/apache/ofbiz/widget/model/ModelGrid.java | 2 +- .../org/apache/ofbiz/widget/model/ModelMenu.java | 2 +- .../apache/ofbiz/widget/model/ModelMenuAction.java | 2 +- .../ofbiz/widget/model/ModelMenuCondition.java | 2 +- .../apache/ofbiz/widget/model/ModelMenuItem.java | 2 +- .../org/apache/ofbiz/widget/model/ModelScreen.java | 2 +- .../ofbiz/widget/model/ModelScreenCondition.java | 2 +- .../ofbiz/widget/model/ModelScreenWidget.java | 2 +- .../apache/ofbiz/widget/model/ModelSingleForm.java | 2 +- .../org/apache/ofbiz/widget/model/ModelTheme.java | 2 +- .../org/apache/ofbiz/widget/model/ModelTree.java | 2 +- .../apache/ofbiz/widget/model/ModelTreeAction.java | 2 +- .../ofbiz/widget/model/ModelTreeCondition.java | 2 +- .../org/apache/ofbiz/widget/model/ModelWidget.java | 2 +- .../ofbiz/widget/model/ModelWidgetCondition.java | 2 +- .../apache/ofbiz/widget/model/ScreenFactory.java | 2 +- .../apache/ofbiz/widget/model/ThemeFactory.java | 2 +- .../org/apache/ofbiz/widget/model/TreeFactory.java | 2 +- .../ofbiz/widget/model/XmlWidgetActionVisitor.java | 2 +- .../ofbiz/widget/portal/PortalPageWorker.java | 2 +- .../apache/ofbiz/widget/renderer/FormRenderer.java | 2 +- .../ofbiz/widget/renderer/MenuWrapTransform.java | 2 +- .../apache/ofbiz/widget/renderer/Paginator.java | 2 +- .../ofbiz/widget/renderer/ScreenRenderer.java | 2 +- .../apache/ofbiz/widget/renderer/UtilHelpText.java | 2 +- .../apache/ofbiz/widget/renderer/VisualTheme.java | 2 +- .../ofbiz/widget/renderer/fo/FoFormRenderer.java | 2 +- .../widget/renderer/fo/ScreenFopViewHandler.java | 2 +- .../widget/renderer/html/HtmlMenuWrapper.java | 2 +- .../widget/renderer/html/HtmlMenuWrapperImage.java | 2 +- .../widget/renderer/html/HtmlTreeRenderer.java | 2 +- .../widget/renderer/html/HtmlWidgetRenderer.java | 2 +- .../widget/renderer/macro/MacroFormRenderer.java | 2 +- .../widget/renderer/macro/MacroMenuRenderer.java | 2 +- .../widget/renderer/macro/MacroScreenRenderer.java | 2 +- .../renderer/macro/MacroScreenViewHandler.java | 2 +- .../widget/renderer/macro/MacroTreeRenderer.java | 2 +- 401 files changed, 412 insertions(+), 412 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 8572b66..3a8c109 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 @@ -56,7 +56,7 @@ import org.w3c.dom.Element; */ public final class ComponentConfig { - public static final String MODULE = ComponentConfig.class.getName(); + private static final String MODULE = ComponentConfig.class.getName(); public static final String OFBIZ_COMPONENT_XML_FILENAME = "ofbiz-component.xml"; // This map is not a UtilCache instance because there is no strategy or implementation for reloading components. private static final ComponentConfigCache componentConfigCache = new ComponentConfigCache(); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentLoaderConfig.java b/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentLoaderConfig.java index 224f155..ec22ae2 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentLoaderConfig.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentLoaderConfig.java @@ -52,7 +52,7 @@ import org.xml.sax.SAXException; */ public final class ComponentLoaderConfig { - public static final String MODULE = ComponentLoaderConfig.class.getName(); + private static final String MODULE = ComponentLoaderConfig.class.getName(); public static final String COMPONENT_LOAD_XML_FILENAME = "component-load.xml"; public enum ComponentType { SINGLE_COMPONENT, COMPONENT_DIRECTORY } diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java b/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java index 97afeb1..831962d 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java @@ -39,7 +39,7 @@ import org.xml.sax.SAXException; @SuppressWarnings("serial") public class ComponentResourceHandler implements ResourceHandler { - public static final String MODULE = ComponentResourceHandler.class.getName(); + private static final String MODULE = ComponentResourceHandler.class.getName(); protected String componentName; protected String loaderName; protected String location; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ExecutionPool.java b/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ExecutionPool.java index e905208..5559fe3 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ExecutionPool.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/concurrent/ExecutionPool.java @@ -40,7 +40,7 @@ import org.apache.ofbiz.base.util.Debug; @SourceMonitored public final class ExecutionPool { - public static final String MODULE = ExecutionPool.class.getName(); + private static final String MODULE = ExecutionPool.class.getName(); public static final ExecutorService GLOBAL_BATCH = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 5, TimeUnit.SECONDS, new SynchronousQueue<>(), new ExecutionPoolThreadFactory(null, "OFBiz-batch")); public static final ForkJoinPool GLOBAL_FORK_JOIN = new ForkJoinPool(); private static final ExecutorService pulseExecutionPool = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), new ExecutionPoolThreadFactory(null, "OFBiz-ExecutionPoolPulseWorker")); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java index 493cbe7..a8126dc 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/config/JNDIConfigUtil.java @@ -30,7 +30,7 @@ import org.w3c.dom.Element; */ public final class JNDIConfigUtil { - public static final String MODULE = JNDIConfigUtil.class.getName(); + private static final String MODULE = JNDIConfigUtil.class.getName(); private static final String JNDI_CONFIG_XML_FILENAME = "jndiservers.xml"; private static final ConcurrentHashMap<String, JndiServerInfo> jndiServerInfos = new ConcurrentHashMap<>(); private JNDIConfigUtil() {} diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java b/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java index 772efd7..d9c91f7 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java @@ -33,7 +33,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public final class MainResourceHandler implements ResourceHandler { - public static final String MODULE = MainResourceHandler.class.getName(); + private static final String MODULE = MainResourceHandler.class.getName(); private final String xmlFilename; private final String loaderName; private final String location; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/config/ResourceLoader.java b/framework/base/src/main/java/org/apache/ofbiz/base/config/ResourceLoader.java index ffbec60..e66f6d5 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/config/ResourceLoader.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/config/ResourceLoader.java @@ -33,7 +33,7 @@ import org.w3c.dom.Element; */ public abstract class ResourceLoader { - public static final String MODULE = ResourceLoader.class.getName(); + private static final String MODULE = ResourceLoader.class.getName(); private static final UtilCache<String, ResourceLoader> loaderCache = UtilCache.createUtilCache("resource.ResourceLoaders", 0, 0); // This cache is temporary - we will use it until the framework has been refactored to eliminate DOM tree caching, then it can be removed. private static final UtilCache<String, Document> domCache = UtilCache.createUtilCache("resource.DomTrees", 0, 0); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java b/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java index 1a201c9..789eea7 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java @@ -47,7 +47,7 @@ import org.apache.ofbiz.base.util.Debug; */ public class ComponentContainer implements Container { - public static final String MODULE = ComponentContainer.class.getName(); + private static final String MODULE = ComponentContainer.class.getName(); private String name; private final AtomicBoolean loaded = new AtomicBoolean(false); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java b/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java index 1f48399..403fe26 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java @@ -47,7 +47,7 @@ import org.apache.ofbiz.base.util.UtilValidate; */ public class ContainerLoader { - public static final String MODULE = ContainerLoader.class.getName(); + private static final String MODULE = ContainerLoader.class.getName(); private final Deque<Container> loadedContainers = new LinkedList<>(); 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 6910716..af852fb 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 @@ -38,7 +38,7 @@ import org.apache.ofbiz.base.util.RMIExtendedSocketFactory; public class NamingServiceContainer implements Container { - public static final String MODULE = NamingServiceContainer.class.getName(); + private static final String MODULE = NamingServiceContainer.class.getName(); protected String configFileLocation = null; protected boolean isRunning = false; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NetConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NetConverters.java index 3266f5a..5b6fb7c 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NetConverters.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NetConverters.java @@ -27,7 +27,7 @@ import java.net.URL; /** Net Converter classes. */ public class NetConverters implements ConverterLoader { - public static final String MODULE = NetConverters.class.getName(); + private static final String MODULE = NetConverters.class.getName(); public static class StringToInetAddress extends AbstractConverter<String, InetAddress> { public StringToInetAddress() { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/DesCrypt.java b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/DesCrypt.java index acc5c89..a542296 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/DesCrypt.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/DesCrypt.java @@ -41,7 +41,7 @@ import org.apache.ofbiz.base.util.GeneralException; */ public class DesCrypt { - public static final String MODULE = DesCrypt.class.getName(); + private static final String MODULE = DesCrypt.class.getName(); public static Key generateKey() throws NoSuchAlgorithmException { KeyGenerator keyGen = KeyGenerator.getInstance("DESede"); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java index 6f044f9..6cc84ac 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java @@ -44,7 +44,7 @@ import org.apache.ofbiz.base.util.UtilValidate; */ public class HashCrypt { - public static final String MODULE = HashCrypt.class.getName(); + private static final String MODULE = HashCrypt.class.getName(); public static final String CRYPT_CHAR_SET = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./"; private static final String PBKDF2_SHA1 ="PBKDF2-SHA1"; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/Main.java b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/Main.java index 77d99c6..bcacecc 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/crypto/Main.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/crypto/Main.java @@ -24,7 +24,7 @@ import org.apache.shiro.crypto.AesCipherService; public class Main { - public static final String MODULE = Main.class.getName(); + private static final String MODULE = Main.class.getName(); public static void main(String[] args) throws Exception { if ("-crypt".equals(args[0])) { Debug.logInfo(HashCrypt.cryptUTF8(args[1], null, args[2]), MODULE); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java b/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java index 87e41d2..4bf9b74 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java @@ -35,7 +35,7 @@ import org.apache.ofbiz.base.util.Debug; public class ComponentLocationResolver implements LocationResolver { - public static final String MODULE = ComponentLocationResolver.class.getName(); + private static final String MODULE = ComponentLocationResolver.class.getName(); @Override public URL resolveLocation(String location) throws MalformedURLException { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.java b/framework/base/src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.java index 2a182f8..94bc2e5 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.java @@ -36,7 +36,7 @@ import org.apache.ofbiz.base.util.UtilValidate; */ public final class FlexibleLocation { - public static final String MODULE = FlexibleLocation.class.getName(); + private static final String MODULE = FlexibleLocation.class.getName(); private static final Map<String, LocationResolver> locationResolvers; static { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java index e602c53..83a42b8 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java @@ -30,7 +30,7 @@ import javax.net.ssl.X509KeyManager; * */ public class AliasKeyManager implements X509KeyManager { - public static final String MODULE = X509KeyManager.class.getName(); + private static final String MODULE = X509KeyManager.class.getName(); protected X509KeyManager keyManager = null; protected String alias = null; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java index 44ac58a..f407e4f 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java @@ -55,7 +55,7 @@ import org.apache.ofbiz.base.location.ComponentLocationResolver; */ public final class FileUtil { - public static final String MODULE = FileUtil.class.getName(); + private static final String MODULE = FileUtil.class.getName(); private FileUtil () {} diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java index 0b1ee48..5355c68 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java @@ -43,7 +43,7 @@ import groovy.lang.Script; */ public class GroovyUtil { - public static final String MODULE = GroovyUtil.class.getName(); + private static final String MODULE = GroovyUtil.class.getName(); private static final UtilCache<String, Class<?>> parsedScripts = UtilCache.createUtilCache("script.GroovyLocationParsedCache", 0, 0, false); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java index 25ac81b..87cee50 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java @@ -41,7 +41,7 @@ import java.util.Map; */ public class HttpClient { - public static final String MODULE = HttpClient.class.getName(); + private static final String MODULE = HttpClient.class.getName(); private int hostVerification = SSLUtil.getHostCertNormalCheck(); private int timeout = 30000; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/JNDIContextFactory.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/JNDIContextFactory.java index 6ba4baa..a6cdb05 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/JNDIContextFactory.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/JNDIContextFactory.java @@ -33,7 +33,7 @@ import org.apache.ofbiz.base.util.cache.UtilCache; */ public class JNDIContextFactory { - public static final String MODULE = JNDIContextFactory.class.getName(); + private static final String MODULE = JNDIContextFactory.class.getName(); // FIXME: InitialContext instances are not thread-safe! They should not be cached. private static final UtilCache<String, InitialContext> contexts = UtilCache.createUtilCache("entity.JNDIContexts", 0, 0); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java index 1cb4010..de92631 100755 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java @@ -60,7 +60,7 @@ import org.apache.ofbiz.base.config.GenericConfigException; */ public final class KeyStoreUtil { - public static final String MODULE = KeyStoreUtil.class.getName(); + private static final String MODULE = KeyStoreUtil.class.getName(); private KeyStoreUtil () {} diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/MessageString.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/MessageString.java index 494e733..3f247d9 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/MessageString.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/MessageString.java @@ -33,7 +33,7 @@ import java.util.TreeSet; @SuppressWarnings("serial") public class MessageString implements Serializable { - public static final String MODULE = MessageString.class.getName(); + private static final String MODULE = MessageString.class.getName(); protected String message; protected String fieldName; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/MultiTrustManager.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/MultiTrustManager.java index 5ac1001..56370ad 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/MultiTrustManager.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/MultiTrustManager.java @@ -35,7 +35,7 @@ import javax.net.ssl.X509TrustManager; */ public class MultiTrustManager implements X509TrustManager { - public static final String MODULE = MultiTrustManager.class.getName(); + private static final String MODULE = MultiTrustManager.class.getName(); protected List<KeyStore> keystores; 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 a65e423..dce2e3f 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 @@ -41,7 +41,7 @@ import org.w3c.dom.Node; */ public class ObjectType { - public static final String MODULE = ObjectType.class.getName(); + private static final String MODULE = ObjectType.class.getName(); public static final Object NULL = new NullObject(); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java index 5ae244c..e6e8831 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java @@ -29,7 +29,7 @@ import org.apache.oro.text.regex.Perl5Compiler; */ public class PatternFactory { - public static final String MODULE = PatternFactory.class.getName(); + private static final String MODULE = PatternFactory.class.getName(); private static final UtilCache<String, Pattern> compiledPerl5Patterns = UtilCache.createUtilCache("regularExpression.compiledPerl5Patterns", false); /** diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/ReferenceCleaner.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/ReferenceCleaner.java index c0ab284..0aecd03 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/ReferenceCleaner.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/ReferenceCleaner.java @@ -24,7 +24,7 @@ import java.lang.ref.SoftReference; import java.lang.ref.WeakReference; public final class ReferenceCleaner { - public static final String MODULE = ReferenceCleaner.class.getName(); + private static final String MODULE = ReferenceCleaner.class.getName(); private static final class CleanerThread extends Thread { private boolean keepRunning = true; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java index da640a0..bad977e 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java @@ -53,7 +53,7 @@ import org.apache.ofbiz.base.config.GenericConfigException; */ public final class SSLUtil { - public static final String MODULE = SSLUtil.class.getName(); + private static final String MODULE = SSLUtil.class.getName(); private static final int HOSTCERT_NO_CHECK = 0; private static final int HOSTCERT_MIN_CHECK = 1; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java index 0e8989e..e6a79e9 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java @@ -60,7 +60,7 @@ import org.codehaus.groovy.runtime.InvokerHelper; */ public final class ScriptUtil { - public static final String MODULE = ScriptUtil.class.getName(); + private static final String MODULE = ScriptUtil.class.getName(); /** The screen widget context map bindings key. */ public static final String WIDGET_CONTEXT_KEY = "widget"; /** The service/servlet/request parameters map bindings key. */ diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java index 8309f6a..c8ad552 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java @@ -43,7 +43,7 @@ import org.apache.commons.codec.binary.Hex; public class StringUtil { public static final StringUtil INSTANCE = new StringUtil(); - public static final String MODULE = StringUtil.class.getName(); + private static final String MODULE = StringUtil.class.getName(); private static final Map<String, Pattern> substitutionPatternMap = createSubstitutionPatternMap(); private static Map<String, Pattern> createSubstitutionPatternMap() { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java index cfd95c1..38e4b7c 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java @@ -35,7 +35,7 @@ import org.apache.ofbiz.base.config.GenericConfigException; */ public class URLConnector { - public static final String MODULE = URLConnector.class.getName(); + private static final String MODULE = URLConnector.class.getName(); private URLConnection connection = null; private URL url = null; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java index 74c0263..6c33802 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java @@ -39,7 +39,7 @@ import com.ibm.icu.util.Calendar; */ public final class UtilDateTime { - public static final String MODULE = UtilDateTime.class.getName(); + private static final String MODULE = UtilDateTime.class.getName(); private static final String[][] timevals = { {"1000", "millisecond"}, diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java index 7f17e5c..36fb4bf 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java @@ -33,7 +33,7 @@ import org.apache.ofbiz.entity.util.EntityUtilProperties; */ public final class UtilFormatOut { - public static final String MODULE = UtilFormatOut.class.getName(); + private static final String MODULE = UtilFormatOut.class.getName(); public static final String DEFAULT_FORMAT = "default"; public static final String AMOUNT_FORMAT = "amount"; public static final String QUANTITY_FORMAT = "quantity"; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java index 4a1d37e..c4f9b32 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilGenerics.java @@ -23,7 +23,7 @@ import java.util.Map; public final class UtilGenerics { - public static final String MODULE = UtilMisc.class.getName(); + private static final String MODULE = UtilMisc.class.getName(); private UtilGenerics() {} diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java index f08da5e..1365884 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java @@ -85,7 +85,7 @@ import org.apache.ofbiz.widget.renderer.VisualTheme; */ public final class UtilHttp { - public static final String MODULE = UtilHttp.class.getName(); + private static final String MODULE = UtilHttp.class.getName(); private static final String MULTI_ROW_DELIMITER = "_o_"; private static final String ROW_SUBMIT_PREFIX = "_rowSubmit_o_"; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilIO.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilIO.java index a32557a..4a0edb4 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilIO.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilIO.java @@ -34,7 +34,7 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; public final class UtilIO { - public static final String MODULE = UtilIO.class.getName(); + private static final String MODULE = UtilIO.class.getName(); private UtilIO () {} diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilJavaParse.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilJavaParse.java index 9c8f637..0453879 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilJavaParse.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilJavaParse.java @@ -36,7 +36,7 @@ import org.apache.ofbiz.base.component.ComponentConfig; */ public final class UtilJavaParse { - public static final String MODULE = UtilJavaParse.class.getName(); + private static final String MODULE = UtilJavaParse.class.getName(); // FIXME: Not thread safe private static Set<String> serviceMethodNames = new HashSet<>(); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java index ce3091b..3b64e3e 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java @@ -58,7 +58,7 @@ import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; */ public final class UtilMisc { - public static final String MODULE = UtilMisc.class.getName(); + private static final String MODULE = UtilMisc.class.getName(); private static final BigDecimal ZERO_BD = BigDecimal.ZERO; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java index 49f251f..8a0bf96 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilNumber.java @@ -28,7 +28,7 @@ import com.ibm.icu.text.RuleBasedNumberFormat; public final class UtilNumber { - public static final String MODULE = UtilNumber.class.getName(); + private static final String MODULE = UtilNumber.class.getName(); // properties file name for arithmetic configuration private static final String arithmeticPropertiesFile = "arithmetic.properties"; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java index 1950e12..10e36ea 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java @@ -38,7 +38,7 @@ public final class UtilObject { private UtilObject() { } - public static final String MODULE = UtilObject.class.getName(); + private static final String MODULE = UtilObject.class.getName(); /** Serialize an object to a byte array */ public static byte[] getBytes(Object obj) { diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilPlist.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilPlist.java index 0034702..aaeec75 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilPlist.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilPlist.java @@ -35,7 +35,7 @@ import java.util.Map; */ public final class UtilPlist { - public static final String MODULE = UtilPlist.class.getName(); + private static final String MODULE = UtilPlist.class.getName(); private UtilPlist() {} 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 4ff9e0c..1e320e4 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 @@ -63,7 +63,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public final class UtilProperties implements Serializable { - public static final String MODULE = UtilProperties.class.getName(); + private static final String MODULE = UtilProperties.class.getName(); private UtilProperties() {} 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 0851846..3c2f2ab 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 @@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public class UtilTimer { - public static final String MODULE = UtilTimer.class.getName(); + private static final String MODULE = UtilTimer.class.getName(); protected static final ConcurrentHashMap<String, UtilTimer> staticTimers = new ConcurrentHashMap<>(); protected String timerName = null; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilURL.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilURL.java index b677a7c..8486e28 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilURL.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilURL.java @@ -30,7 +30,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public final class UtilURL { - public static final String MODULE = UtilURL.class.getName(); + private static final String MODULE = UtilURL.class.getName(); private static final Map<String, URL> urlMap = new ConcurrentHashMap<>(); private UtilURL() {} diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java index b396c78..1069c4c 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java @@ -70,7 +70,7 @@ import com.ibm.icu.util.Calendar; */ public final class UtilValidate { - public static final String MODULE = UtilValidate.class.getName(); + private static final String MODULE = UtilValidate.class.getName(); private UtilValidate() {} diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java index 92c17b6..f25cd1c 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java @@ -80,7 +80,7 @@ import com.thoughtworks.xstream.XStream; */ public final class UtilXml { - public static final String MODULE = UtilXml.class.getName(); + private static final String MODULE = UtilXml.class.getName(); private static final XStream xstream = createXStream(); private UtilXml () {} diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheSoftReference.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheSoftReference.java index ea3dd21..ac409db 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheSoftReference.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/CacheSoftReference.java @@ -26,7 +26,7 @@ import org.apache.ofbiz.base.util.ReferenceCleaner; @SuppressWarnings("serial") public abstract class CacheSoftReference<V> extends ReferenceCleaner.Soft<V> implements Serializable { - public static final String MODULE = CacheSoftReference.class.getName(); + private static final String MODULE = CacheSoftReference.class.getName(); public CacheSoftReference(V o) { super(o); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java index 5eae992..439b143 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/UtilCache.java @@ -64,7 +64,7 @@ import com.googlecode.concurrentlinkedhashmap.EvictionListener; @SuppressWarnings("serial") public class UtilCache<K, V> implements Serializable, EvictionListener<Object, CacheLine<V>> { - public static final String MODULE = UtilCache.class.getName(); + private static final String MODULE = UtilCache.class.getName(); /** A static Map to keep track of all of the UtilCache instances. */ private static final ConcurrentHashMap<String, UtilCache<?, ?>> utilCacheTable = new ConcurrentHashMap<>(); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java index d743279..bafedbe 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java @@ -42,7 +42,7 @@ import org.apache.ofbiz.base.util.string.UelUtil; @SourceMonitored @SuppressWarnings("serial") public final class FlexibleMapAccessor<T> implements Serializable, IsEmpty { - public static final String MODULE = FlexibleMapAccessor.class.getName(); + private static final String MODULE = FlexibleMapAccessor.class.getName(); private static final UtilCache<String, FlexibleMapAccessor<Object>> fmaCache = UtilCache.createUtilCache("flexibleMapAccessor.ExpressionCache"); private static final FlexibleMapAccessor<?> nullFma = new FlexibleMapAccessor<>(""); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java index fb94ed0..9130407 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java @@ -31,7 +31,7 @@ import org.apache.ofbiz.base.util.UtilGenerics; */ public class MapComparator implements Comparator<Map<Object, Object>> { - public static final String MODULE = MapComparator.class.getName(); + private static final String MODULE = MapComparator.class.getName(); private List<? extends Object> keys; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapContext.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapContext.java index 8e8ebad..ab25f36 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapContext.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapContext.java @@ -47,7 +47,7 @@ import org.apache.ofbiz.base.util.UtilGenerics; */ public class MapContext<K, V> implements Map<K, V>, LocalizedMap<V> { - public static final String MODULE = MapContext.class.getName(); + private static final String MODULE = MapContext.class.getName(); protected Deque<Map<K, V>> contexts = new LinkedList<>(); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapStack.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapStack.java index 1885734..edec9e8 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapStack.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapStack.java @@ -29,7 +29,7 @@ import org.apache.ofbiz.base.util.Debug; */ public class MapStack<K> extends MapContext<K, Object> { - public static final String MODULE = MapStack.class.getName(); + private static final String MODULE = MapStack.class.getName(); public static <K> MapStack<K> create() { MapStack<K> newValue = new MapStack<>(); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContext.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContext.java index 270e880..5ec4448 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContext.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContext.java @@ -28,7 +28,7 @@ import java.util.List; */ public class MultivaluedMapContext<K, V> extends MapContext<K, List<V>> { - public static final String MODULE = MultivaluedMapContext.class.getName(); + private static final String MODULE = MultivaluedMapContext.class.getName(); /** * Create a multi-value map initialized with one context diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ResourceBundleMapWrapper.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ResourceBundleMapWrapper.java index 8aafe5d..df74c0e 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ResourceBundleMapWrapper.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ResourceBundleMapWrapper.java @@ -38,7 +38,7 @@ import org.apache.ofbiz.service.calendar.TemporalExpressions.Frequency; @SuppressWarnings("serial") public class ResourceBundleMapWrapper implements Map<String, Object>, Serializable { - public static final String MODULE = Frequency.class.getName(); + private static final String MODULE = Frequency.class.getName(); protected MapStack<String> rbmwStack; protected ResourceBundle initialResourceBundle; protected Map<String, Object> context; diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java index 5ec91a6..b453074 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java @@ -53,7 +53,7 @@ import org.apache.ofbiz.base.util.cache.UtilCache; @SuppressWarnings("serial") public abstract class FlexibleStringExpander implements Serializable, IsEmpty { - public static final String MODULE = FlexibleStringExpander.class.getName(); + private static final String MODULE = FlexibleStringExpander.class.getName(); public static final String openBracket = "${"; public static final String closeBracket = "}"; protected static final UtilCache<Key, FlexibleStringExpander> exprCache = UtilCache.createUtilCache("flexibleStringExpander.ExpressionCache"); diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java index 363741c..7f4ec58 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java @@ -53,7 +53,7 @@ import org.xml.sax.XMLReader; public final class XslTransform { - public static final String MODULE = XslTransform.class.getName(); + private static final String MODULE = XslTransform.class.getName(); private static final UtilCache<String, Templates> xslTemplatesCache = UtilCache.createUtilCache("XsltTemplates", 0, 0); /** diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java index 8a0efc1..d647af2 100644 --- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java +++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java @@ -88,7 +88,7 @@ import org.xml.sax.SAXException; */ public class CatalinaContainer implements Container { - public static final String MODULE = CatalinaContainer.class.getName(); + private static final String MODULE = CatalinaContainer.class.getName(); private String name; private Tomcat tomcat; diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java index 81d6d60..cc30aac 100644 --- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java +++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java @@ -36,7 +36,7 @@ import org.apache.tomcat.util.http.MimeHeaders; public class CrossSubdomainSessionValve extends ValveBase { - public static final String MODULE = CrossSubdomainSessionValve.class.getName(); + private static final String MODULE = CrossSubdomainSessionValve.class.getName(); public CrossSubdomainSessionValve() { super(); diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java index 843d29f..27f6d70 100644 --- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java +++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java @@ -33,7 +33,7 @@ import org.apache.ofbiz.entity.util.EntityQuery; public class OFBizRealm extends RealmBase { - public static final String MODULE = OFBizRealm.class.getName(); + private static final String MODULE = OFBizRealm.class.getName(); @Override protected String getPassword(String username) { diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java b/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java index c97fa36..aeda1ec 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java @@ -62,7 +62,7 @@ import org.apache.ofbiz.widget.renderer.VisualTheme; */ public class CommonEvents { - public static final String MODULE = CommonEvents.class.getName(); + private static final String MODULE = CommonEvents.class.getName(); // Attributes removed for security reason; _ERROR_MESSAGE_ and _ERROR_MESSAGE_LIST are kept private static final String[] IGNOREATTRS = new String[] { 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 8919865..e4506f9 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 @@ -67,7 +67,7 @@ import org.apache.ofbiz.service.ServiceUtil; */ public class FindServices { - public static final String MODULE = FindServices.class.getName(); + private static final String MODULE = FindServices.class.getName(); public static final String resource = "CommonUiLabels"; public static final Map<String, EntityComparisonOperator<?, ?>> entityOperators; diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java b/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java index e606273..d7c4741 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/KeywordSearchUtil.java @@ -40,7 +40,7 @@ import org.apache.ofbiz.entity.util.EntityQuery; */ public final class KeywordSearchUtil { - public static final String MODULE = KeywordSearchUtil.class.getName(); + private static final String MODULE = KeywordSearchUtil.class.getName(); private static Set<String> thesaurusRelsToInclude = new HashSet<>(); private static Set<String> thesaurusRelsForReplace = new HashSet<>(); 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 6ece910..05e231f 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 @@ -100,7 +100,7 @@ import freemarker.template.TemplateException; */ public class NotificationServices { - public static final String MODULE = NotificationServices.class.getName(); + private static final String MODULE = NotificationServices.class.getName(); public static final String resource = "CommonUiLabels"; /** 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 e9263fd..9331c3c 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 @@ -37,7 +37,7 @@ import org.apache.ofbiz.entity.util.EntityUtil; */ public final class GeoWorker { - public static final String MODULE = GeoWorker.class.getName(); + private static final String MODULE = GeoWorker.class.getName(); private GeoWorker() {} 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 e5f046b..cc2be20 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 @@ -50,7 +50,7 @@ import org.xml.sax.SAXException; */ public class ImageTransform { - public static final String MODULE = ImageTransform.class.getName(); + private static final String MODULE = ImageTransform.class.getName(); public static final String resource = "CommonErrorUiLabels"; public ImageTransform() { 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 429a893..cfc7205 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 @@ -45,7 +45,7 @@ import org.apache.ofbiz.service.DispatchContext; */ public class LdapAuthenticationServices { - public static final String MODULE = LdapAuthenticationServices.class.getName(); + 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); 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 c338117..55dd92c 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 @@ -68,7 +68,7 @@ import org.apache.tomcat.util.res.StringManager; */ public class LoginServices { - public static final String MODULE = LoginServices.class.getName(); + private static final String MODULE = LoginServices.class.getName(); public static final String resource = "SecurityextUiLabels"; /** Login service to authenticate username and password diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java b/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java index 58ba9cf..d34f262 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java @@ -48,7 +48,7 @@ import org.apache.ofbiz.service.ServiceUtil; * This class handles any data conversion needed.</p> */ public class PreferenceServices { - public static final String MODULE = PreferenceServices.class.getName(); + private static final String MODULE = PreferenceServices.class.getName(); public static final String resource = "PrefErrorUiLabels"; 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 6448337..8bf53a6 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 @@ -35,7 +35,7 @@ import org.apache.ofbiz.service.ServiceUtil; * User preference worker methods. */ public final class PreferenceWorker { - public static final String MODULE = PreferenceWorker.class.getName(); + private static final String MODULE = PreferenceWorker.class.getName(); /** * User preference administrator permission. Currently set to "USERPREF_ADMIN". */ diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java b/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java index 475eb4e..67fadb4 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java @@ -44,7 +44,7 @@ import org.apache.ofbiz.service.ServiceUtil; */ public class QRCodeEvents { - public static final String MODULE = QRCodeEvents.class.getName(); + private static final String MODULE = QRCodeEvents.class.getName(); /** Streams QR Code to the output. */ public static String serveQRCodeImage(HttpServletRequest request, HttpServletResponse response) { 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 2273c4e..fd94204 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 @@ -61,7 +61,7 @@ import freemarker.template.utility.StringUtil; */ public class QRCodeServices { - public static final String MODULE = QRCodeServices.class.getName(); + private static final String MODULE = QRCodeServices.class.getName(); public static final int MIN_SIZE = 20; 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 fb7c7ea..8a328b2 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 @@ -48,7 +48,7 @@ import org.apache.ofbiz.widget.renderer.VisualTheme; */ public final class ContextHelper { - public static final String MODULE = ContextHelper.class.getName(); + private static final String MODULE = ContextHelper.class.getName(); private static final int EVENT = 1; private static final int SERVICE = 2; private static final int UNKNOWN = 3; diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java b/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java index 3624b4a..05364e3 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java @@ -48,7 +48,7 @@ import org.apache.ofbiz.service.ServiceUtil; */ public final class ScriptHelperImpl implements ScriptHelper { - public static final String MODULE = ScriptHelperImpl.class.getName(); + private static final String MODULE = ScriptHelperImpl.class.getName(); private static final Map<String, ? extends Object> EMPTY_ARGS = Collections.unmodifiableMap(new HashMap<String, Object>()); private static GenericValue runFindByPrimaryKey(ModelEntity modelEntity, ContextHelper ctxHelper, boolean useCache, boolean autoFieldMap, 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 7ee365c..d261c5f 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 @@ -40,7 +40,7 @@ import org.apache.ofbiz.service.ServiceUtil; */ public class StatusServices { - public static final String MODULE = StatusServices.class.getName(); + private static final String MODULE = StatusServices.class.getName(); public static final String resource = "CommonUiLabels"; public static Map<String, Object> getStatusItems(DispatchContext ctx, Map<String, ?> context) { diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java index 5814862..137b9af 100644 --- a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java +++ b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java @@ -34,7 +34,7 @@ import org.apache.ofbiz.entity.util.EntityQuery; */ public final class StatusWorker { - public static final String MODULE = StatusWorker.class.getName(); + private static final String MODULE = StatusWorker.class.getName(); private StatusWorker() {} 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 ac8fe54..a2a9352 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 @@ -36,7 +36,7 @@ import com.ibm.icu.util.Calendar; */ public class UomWorker { - public static final String MODULE = UomWorker.class.getName(); + private static final String MODULE = UomWorker.class.getName(); private UomWorker () {} diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java index 1052cb3..40a51fa 100644 --- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java +++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java @@ -40,7 +40,7 @@ import org.apache.ofbiz.base.util.UtilValidate; public class DataFile { - public static final String MODULE = DataFile.class.getName(); + private static final String MODULE = DataFile.class.getName(); /** List of record in the file, contains Record objects */ protected List<Record> records = new ArrayList<>(); diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile2EntityXml.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile2EntityXml.java index 0b5f3da..b756282 100644 --- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile2EntityXml.java +++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile2EntityXml.java @@ -34,7 +34,7 @@ import org.apache.ofbiz.base.util.UtilValidate; public class DataFile2EntityXml { - public static final String MODULE = DataFile2EntityXml.class.getName(); + private static final String MODULE = DataFile2EntityXml.class.getName(); /** Creates a new instance of DataFile2EntityXml */ public DataFile2EntityXml() { diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java index 55421b3..745bf84 100644 --- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java +++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java @@ -40,7 +40,7 @@ import org.w3c.dom.NodeList; public final class ModelDataFileReader { - public static final String MODULE = ModelDataFileReader.class.getName(); + private static final String MODULE = ModelDataFileReader.class.getName(); private static final UtilCache<URL, ModelDataFileReader> readers = UtilCache.createUtilCache("ModelDataFile", true); public static ModelDataFileReader getModelDataFileReader(URL readerURL) throws DataFileException { diff --git a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java index a895076..9d88fcf 100644 --- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java +++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java @@ -33,7 +33,7 @@ import java.util.Stack; */ public class RecordIterator { - public static final String MODULE = RecordIterator.class.getName(); + private static final String MODULE = RecordIterator.class.getName(); protected BufferedReader br; protected ModelDataFile modelDataFile; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java index c6a8666..bfc2416 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java @@ -32,7 +32,7 @@ import org.apache.ofbiz.base.util.UtilObject; /** <code>Delegator</code> factory abstract class. */ public abstract class DelegatorFactory implements Factory<Delegator, String> { - public static final String MODULE = DelegatorFactory.class.getName(); + private static final String MODULE = DelegatorFactory.class.getName(); private static final ConcurrentHashMap<String, Future<Delegator>> delegators = new ConcurrentHashMap<>(); private static final ThreadGroup DELEGATOR_THREAD_GROUP = new ThreadGroup("DelegatorFactory"); private static final ScheduledExecutorService executor = ExecutionPool.getScheduledExecutor(DELEGATOR_THREAD_GROUP, "delegator-startup", Runtime.getRuntime().availableProcessors(), 10, true); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactoryImpl.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactoryImpl.java index f0e4cf8..86b0f0c 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactoryImpl.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactoryImpl.java @@ -24,7 +24,7 @@ import org.apache.ofbiz.base.util.Debug; * instance of <code>GenericDelegator</code>. */ public class DelegatorFactoryImpl extends DelegatorFactory { - public static final String MODULE = DelegatorFactoryImpl.class.getName(); + private static final String MODULE = DelegatorFactoryImpl.class.getName(); // TODO: this method should propagate the GenericEntityException @Override 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 e67f98d..f1ceb1a 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 @@ -94,7 +94,7 @@ import org.xml.sax.SAXException; */ public class GenericDelegator implements Delegator { - public static final String MODULE = GenericDelegator.class.getName(); + private static final String MODULE = GenericDelegator.class.getName(); protected ModelReader modelReader = null; protected ModelGroupReader modelGroupReader = null; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java index 98734ae..bd9d07b 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java @@ -77,7 +77,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public class GenericEntity implements Map<String, Object>, LocalizedMap<Object>, Serializable, Comparable<GenericEntity>, Cloneable { - public static final String MODULE = GenericEntity.class.getName(); + private static final String MODULE = GenericEntity.class.getName(); public static final GenericEntity NULL_ENTITY = new NullGenericEntity(); public static final NullField NULL_FIELD = new NullField(); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java index 1a578a0..a3d9f4e 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/AbstractEntityConditionCache.java @@ -35,7 +35,7 @@ import org.apache.ofbiz.entity.model.ModelEntity; public abstract class AbstractEntityConditionCache<K, V> extends AbstractCache<EntityCondition, ConcurrentMap<K, V>> { - public static final String MODULE = AbstractEntityConditionCache.class.getName(); + private static final String MODULE = AbstractEntityConditionCache.class.getName(); protected AbstractEntityConditionCache(String delegatorName, String id) { super(delegatorName, id); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java index 576758c..85dc04c 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java @@ -29,7 +29,7 @@ import org.apache.ofbiz.entity.condition.EntityCondition; public class Cache { - public static final String MODULE = Cache.class.getName(); + private static final String MODULE = Cache.class.getName(); protected EntityCache entityCache; protected EntityListCache entityListCache; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityCache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityCache.java index b02d3b3..a287b6d 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityCache.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityCache.java @@ -28,7 +28,7 @@ import org.apache.ofbiz.entity.condition.EntityCondition; import org.apache.ofbiz.entity.model.ModelEntity; public class EntityCache extends AbstractCache<GenericPK, GenericValue> { - public static final String MODULE = EntityCache.class.getName(); + private static final String MODULE = EntityCache.class.getName(); public EntityCache(String delegatorName) { super(delegatorName, "entity"); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityListCache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityListCache.java index a2f8752..b099f3e 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityListCache.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityListCache.java @@ -32,7 +32,7 @@ import org.apache.ofbiz.entity.util.EntityUtil; public class EntityListCache extends AbstractEntityConditionCache<Object, List<GenericValue>> { - public static final String MODULE = EntityListCache.class.getName(); + private static final String MODULE = EntityListCache.class.getName(); public EntityListCache(String delegatorName) { super(delegatorName, "entity-list"); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityObjectCache.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityObjectCache.java index 21d96e2..3a36d6e 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityObjectCache.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/EntityObjectCache.java @@ -23,7 +23,7 @@ import org.apache.ofbiz.entity.condition.EntityCondition; public class EntityObjectCache extends AbstractEntityConditionCache<String, Object> { - public static final String MODULE = EntityObjectCache.class.getName(); + private static final String MODULE = EntityObjectCache.class.getName(); public EntityObjectCache(String delegatorName) { super(delegatorName, "object-list"); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java index 1cb6970..db90d4d 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java @@ -45,7 +45,7 @@ import org.apache.oro.text.regex.Perl5Matcher; @SuppressWarnings("serial") public abstract class EntityComparisonOperator<L, R> extends EntityOperator<L, R> { - public static final String MODULE = EntityComparisonOperator.class.getName(); + private static final String MODULE = EntityComparisonOperator.class.getName(); public static Pattern makeOroPattern(String sqlLike) { Perl5Util perl5Util = new Perl5Util(); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java index d390c1a..60e65d7 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java @@ -34,7 +34,7 @@ import org.apache.ofbiz.entity.model.ModelEntity; import groovy.util.BuilderSupport; public class EntityConditionBuilder extends BuilderSupport { - public static final String MODULE = EntityConditionBuilder.class.getName(); + private static final String MODULE = EntityConditionBuilder.class.getName(); @SuppressWarnings("serial") private static class ConditionHolder implements EntityCondition { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java index f9ee7c8..6609e0a 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionListBase.java @@ -32,7 +32,7 @@ import org.apache.ofbiz.entity.model.ModelEntity; */ @SuppressWarnings("serial") abstract class EntityConditionListBase<T extends EntityCondition> implements EntityCondition { - public static final String MODULE = EntityConditionListBase.class.getName(); + private static final String MODULE = EntityConditionListBase.class.getName(); /** The list of condition expressions to combine. */ protected final List<? extends T> conditions; /** The infix operator used to combine every elements in the list of conditions. */ diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionSubSelect.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionSubSelect.java index faa70e2..8c357c7 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionSubSelect.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionSubSelect.java @@ -37,7 +37,7 @@ import org.apache.ofbiz.entity.model.ModelViewEntity; */ @SuppressWarnings("serial") public class EntityConditionSubSelect extends EntityConditionValue { - public static final String MODULE = EntityConditionSubSelect.class.getName(); + private static final String MODULE = EntityConditionSubSelect.class.getName(); protected ModelEntity localModelEntity = null; protected String keyFieldName = null; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java index 2c8aa88..4288810 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityExpr.java @@ -41,7 +41,7 @@ import org.apache.ofbiz.entity.model.ModelFieldType; */ @SuppressWarnings("serial") public final class EntityExpr implements EntityCondition { - public static final String MODULE = EntityExpr.class.getName(); + private static final String MODULE = EntityExpr.class.getName(); /** The left hand side of the expression. */ private final Object lhs; /** The operator used to combine the two sides of the expression. */ diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java index 7a918da..50e6813 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFieldValue.java @@ -43,7 +43,7 @@ import org.apache.ofbiz.entity.model.ModelViewEntity.ModelAlias; @SuppressWarnings("serial") public class EntityFieldValue extends EntityConditionValue { - public static final String MODULE = EntityFieldValue.class.getName(); + private static final String MODULE = EntityFieldValue.class.getName(); protected String fieldName = null; protected String entityAlias = null; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByItem.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByItem.java index 28ac824..42f5d8f 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByItem.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByItem.java @@ -35,7 +35,7 @@ public class OrderByItem implements Comparator<GenericEntity> { public static final String NULLS_FIRST = "NULLS FIRST"; public static final String NULLS_LAST = "NULLS LAST"; - public static final String MODULE = OrderByItem.class.getName(); + private static final String MODULE = OrderByItem.class.getName(); protected boolean descending; protected Boolean nullsFirst; 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 c81f6be..856fcdc 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 @@ -53,7 +53,7 @@ import org.apache.ofbiz.entity.transaction.TransactionUtil; */ public class DBCPConnectionFactory implements ConnectionFactory { - public static final String MODULE = DBCPConnectionFactory.class.getName(); + private static final String MODULE = DBCPConnectionFactory.class.getName(); // ManagedDataSource is useful to debug the usage of connections in the pool (must be verbose) // In case you don't want to be disturbed in the log (focusing on something else), it's still easy to comment out the line from DebugManagedDataSource protected static final ConcurrentHashMap<String, DebugManagedDataSource<? extends Connection>> dsCache = 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 c19280b..3cba0f7 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 @@ -32,7 +32,7 @@ import org.apache.ofbiz.base.util.Debug; public class DebugManagedDataSource<C extends Connection> extends ManagedDataSource<C> { - public static final String MODULE = DebugManagedDataSource.class.getName(); + private static final String MODULE = DebugManagedDataSource.class.getName(); public DebugManagedDataSource(ObjectPool<C> pool, TransactionRegistry transactionRegistry) { super(pool, transactionRegistry); 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 7909670..2044e19 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 @@ -69,7 +69,7 @@ import org.apache.ofbiz.entity.util.EntityQuery; */ public class GenericDAO { - public static final String MODULE = GenericDAO.class.getName(); + private static final String MODULE = GenericDAO.class.getName(); private static final ConcurrentHashMap<String, GenericDAO> genericDAOs = new ConcurrentHashMap<>(); private final GenericHelperInfo helperInfo; 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 bc8ec16..ef9c25d 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 @@ -41,7 +41,7 @@ import org.apache.ofbiz.entity.util.EntityListIterator; */ public class GenericHelperDAO implements GenericHelper { - public static final String MODULE = GenericHelperDAO.class.getName(); + private static final String MODULE = GenericHelperDAO.class.getName(); protected GenericDAO genericDAO; protected GenericHelperInfo helperInfo; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java index 9cb1a45..b2afbdd 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java @@ -33,7 +33,7 @@ import org.apache.ofbiz.entity.config.model.EntityConfig; */ public class GenericHelperFactory { - public static final String MODULE = GenericHelperFactory.class.getName(); + private static final String MODULE = GenericHelperFactory.class.getName(); // protected static UtilCache helperCache = new UtilCache("entity.GenericHelpers", 0, 0); protected static final Map<String, GenericHelper> helperCache = new HashMap<>(); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java index 50b7451..ab8941f 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java @@ -40,7 +40,7 @@ import org.apache.ofbiz.entity.util.EntityListIterator; */ public class ReadOnlyHelperDAO implements GenericHelper { - public static final String MODULE = ReadOnlyHelperDAO.class.getName(); + private static final String MODULE = ReadOnlyHelperDAO.class.getName(); protected GenericDAO genericDAO; protected GenericHelperInfo helperInfo; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByAndFinder.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByAndFinder.java index 371dfae..02cbac7 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByAndFinder.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByAndFinder.java @@ -34,7 +34,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public class ByAndFinder extends ListFinder { - public static final String MODULE = ByAndFinder.class.getName(); + private static final String MODULE = ByAndFinder.class.getName(); protected Map<FlexibleMapAccessor<Object>, Object> fieldMap; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByConditionFinder.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByConditionFinder.java index e108f7b..8d4f8e6 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByConditionFinder.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ByConditionFinder.java @@ -36,7 +36,7 @@ import org.w3c.dom.Element; */ @SuppressWarnings("serial") public class ByConditionFinder extends ListFinder { - public static final String MODULE = ByConditionFinder.class.getName(); + private static final String MODULE = ByConditionFinder.class.getName(); protected Condition whereCondition; protected Condition havingCondition; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java index 04b1cbe..1f885ba 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java @@ -57,7 +57,7 @@ import org.w3c.dom.Element; */ public final class EntityFinderUtil { - public static final String MODULE = EntityFinderUtil.class.getName(); + private static final String MODULE = EntityFinderUtil.class.getName(); private EntityFinderUtil () {} diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ListFinder.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ListFinder.java index 26778dc..5ebc710 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ListFinder.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/ListFinder.java @@ -55,7 +55,7 @@ import org.w3c.dom.Element; */ @SuppressWarnings("serial") public abstract class ListFinder extends Finder { - public static final String MODULE = ListFinder.class.getName(); + private static final String MODULE = ListFinder.class.getName(); protected String label; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/PrimaryKeyFinder.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/PrimaryKeyFinder.java index d1d2d53..db15212 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/PrimaryKeyFinder.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/PrimaryKeyFinder.java @@ -44,7 +44,7 @@ import org.w3c.dom.Element; */ @SuppressWarnings("serial") public class PrimaryKeyFinder extends Finder { - public static final String MODULE = PrimaryKeyFinder.class.getName(); + private static final String MODULE = PrimaryKeyFinder.class.getName(); protected FlexibleMapAccessor<Object> valueNameAcsr; protected FlexibleStringExpander autoFieldMapExdr; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/ConnectionFactoryLoader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/ConnectionFactoryLoader.java index 6d23fab..a7d2abe 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/ConnectionFactoryLoader.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/ConnectionFactoryLoader.java @@ -28,7 +28,7 @@ import org.apache.ofbiz.entity.connection.ConnectionFactory; */ public class ConnectionFactoryLoader { // Debug MODULE name - public static final String MODULE = ConnectionFactoryLoader.class.getName(); + private static final String MODULE = ConnectionFactoryLoader.class.getName(); private static final ConnectionFactory connFactory = createConnectionFactory(); private static ConnectionFactory createConnectionFactory() { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorConnection.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorConnection.java index 85c9419..3d710f9 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorConnection.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorConnection.java @@ -28,7 +28,7 @@ import org.apache.ofbiz.base.util.Debug; public class CursorConnection extends AbstractCursorHandler { - public static final String MODULE = CursorConnection.class.getName(); + private static final String MODULE = CursorConnection.class.getName(); public static Connection newCursorConnection(Connection con, String cursorName, int pageSize) throws Exception { return newHandler(new CursorConnection(con, cursorName, pageSize), Connection.class); } diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorResultSet.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorResultSet.java index 27e865e..c9bf72b 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorResultSet.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorResultSet.java @@ -28,7 +28,7 @@ import org.apache.ofbiz.base.util.Debug; public class CursorResultSet extends AbstractCursorHandler { - public static final String MODULE = CursorResultSet.class.getName(); + private static final String MODULE = CursorResultSet.class.getName(); protected ResultSet rs; protected Statement stmt; protected String query; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java index 3259da5..5c19587 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/CursorStatement.java @@ -31,7 +31,7 @@ import org.apache.ofbiz.entity.transaction.TransactionUtil; public class CursorStatement extends AbstractCursorHandler { - public static final String MODULE = CursorStatement.class.getName(); + private static final String MODULE = CursorStatement.class.getName(); protected ResultSet currentResultSet; protected Statement stmt; protected boolean beganTransaction; 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 fe57ba3..ccc9ca9 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 @@ -68,7 +68,7 @@ import org.apache.ofbiz.entity.transaction.TransactionUtil; */ public class DatabaseUtil { - public static final String MODULE = DatabaseUtil.class.getName(); + private static final String MODULE = DatabaseUtil.class.getName(); // OFBiz Connections protected ModelFieldTypeReader modelFieldTypeReader = null; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java index 2b26eec..4816840 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/JdbcValueHandler.java @@ -44,7 +44,7 @@ import org.apache.ofbiz.base.util.Debug; * */ public abstract class JdbcValueHandler<T> { - public static final String MODULE = JdbcValueHandler.class.getName(); + private static final String MODULE = JdbcValueHandler.class.getName(); private static final Map<String, JdbcValueHandler<?>> JdbcValueHandlerMap = createJdbcValueHandlerMap(); private static final Map<String, Integer> SqlTypeMap = createSqlTypeMap(); 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 7e2377f..4047672 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 @@ -53,7 +53,7 @@ import org.apache.ofbiz.entity.transaction.TransactionUtil; public class SQLProcessor implements AutoCloseable { /** Module Name Used for debugging */ - public static final String MODULE = SQLProcessor.class.getName(); + private static final String MODULE = SQLProcessor.class.getName(); /** Used for testing connections when test is enabled */ private static final List<String> CONNECTION_TEST_LIST = new ArrayList<>(); 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 ec8fb7e..bf68eed 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 @@ -69,7 +69,7 @@ import org.apache.ofbiz.entity.model.ModelViewEntity; * */ public final class SqlJdbcUtil { - public static final String MODULE = SqlJdbcUtil.class.getName(); + private static final String MODULE = SqlJdbcUtil.class.getName(); private static final int CHAR_BUFFER_SIZE = 4096; private static Map<String, Integer> fieldTypeMap = new HashMap<>(); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java index 04eefce..21efff4 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java @@ -43,7 +43,7 @@ import org.w3c.dom.Element; * */ public class DynamicViewEntity { - public static final String MODULE = DynamicViewEntity.class.getName(); + private static final String MODULE = DynamicViewEntity.class.getName(); /** The entity-name of the Entity */ protected String entityName = "DynamicViewEntity"; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java index f95d445..e707589 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java @@ -61,7 +61,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public class ModelEntity implements Comparable<ModelEntity>, Serializable { - public static final String MODULE = ModelEntity.class.getName(); + private static final String MODULE = ModelEntity.class.getName(); /** The name of the time stamp field for locking/synchronization */ public static final String STAMP_FIELD = "lastUpdatedStamp"; 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 fbaf38e..55de827 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 @@ -39,7 +39,7 @@ import org.apache.ofbiz.entity.GenericEntityException; */ public class ModelEntityChecker { - public static final String MODULE = ModelEntityChecker.class.getName(); + private static final String MODULE = ModelEntityChecker.class.getName(); public static void checkEntities(Delegator delegator, List<String> warningList) throws GenericEntityException { ModelReader reader = delegator.getModelReader(); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java index bad19a5..b44bec4 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelField.java @@ -37,7 +37,7 @@ import org.w3c.dom.Element; @ThreadSafe @SuppressWarnings("serial") public final class ModelField extends ModelChild { - public static final String MODULE = ModelField.class.getName(); + private static final String MODULE = ModelField.class.getName(); public enum EncryptMethod { FALSE, diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldType.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldType.java index 5756441..edc1bb5 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldType.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldType.java @@ -33,7 +33,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public class ModelFieldType implements Serializable { - public static final String MODULE = ModelFieldType.class.getName(); + private static final String MODULE = ModelFieldType.class.getName(); /** The type of the Field */ private String type; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldTypeReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldTypeReader.java index 77aedd5..f336d7a 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldTypeReader.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelFieldTypeReader.java @@ -45,7 +45,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public class ModelFieldTypeReader implements Serializable { - public static final String MODULE = ModelFieldTypeReader.class.getName(); + private static final String MODULE = ModelFieldTypeReader.class.getName(); protected static final UtilCache<String, ModelFieldTypeReader> readers = UtilCache.createUtilCache("entity.ModelFieldTypeReader", 0, 0); protected static Map<String, ModelFieldType> createFieldTypeCache(Element docElement, String location) { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelGroupReader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelGroupReader.java index 52596be..e2ed0ad 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelGroupReader.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelGroupReader.java @@ -52,7 +52,7 @@ import org.w3c.dom.Node; @SuppressWarnings("serial") public class ModelGroupReader implements Serializable { - public static final String MODULE = ModelGroupReader.class.getName(); + private static final String MODULE = ModelGroupReader.class.getName(); private static final UtilCache<String, ModelGroupReader> readers = UtilCache.createUtilCache("entity.ModelGroupReader", 0, 0); private volatile Map<String, String> groupCache = null; 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 5317895..6ba7325 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 @@ -57,7 +57,7 @@ import org.w3c.dom.Node; @SuppressWarnings("serial") public class ModelReader implements Serializable { - public static final String MODULE = ModelReader.class.getName(); + private static final String MODULE = ModelReader.class.getName(); private static final UtilCache<String, ModelReader> readers = UtilCache.createUtilCache("entity.ModelReader", 0, 0); protected volatile Map<String, ModelEntity> entityCache = null; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java index ab324a4..f90b510 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java @@ -34,7 +34,7 @@ import org.apache.ofbiz.entity.model.ModelViewEntity.ModelAlias; */ public final class ModelUtil { - public static final String MODULE = ModelUtil.class.getName(); + private static final String MODULE = ModelUtil.class.getName(); private static final String vowelBag = "aeiouyAEIOUY"; private ModelUtil () {} 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 3a5fd71..76bb81a 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 @@ -54,7 +54,7 @@ import org.w3c.dom.NodeList; */ @SuppressWarnings("serial") public class ModelViewEntity extends ModelEntity { - public static final String MODULE = ModelViewEntity.class.getName(); + private static final String MODULE = ModelViewEntity.class.getName(); private static final Map<String, String> functionPrefixMap = new HashMap<>(); private static final Set<String> numericFunctionsSet = new HashSet<>(); // names of functions that return a numeric type diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java index 88e7902..8eaf926 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java @@ -67,7 +67,7 @@ import org.xml.sax.SAXException; * */ public class XmlSerializer { - public static final String MODULE = XmlSerializer.class.getName(); + private static final String MODULE = XmlSerializer.class.getName(); private volatile static WeakReference<DateFormat> simpleDateFormatter; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java index ed95d1f..fb710e7 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java @@ -65,7 +65,7 @@ import org.apache.ofbiz.entity.util.SequenceUtil; public class EntityTestSuite extends EntityTestCase { - public static final String MODULE = EntityTestSuite.class.getName(); + private static final String MODULE = EntityTestSuite.class.getName(); /* * This sets how many values to insert when trying to create a large number of values. 10,000 causes HSQL to crash but is ok * with Derby. Going up to 100,000 causes problems all around because Java List seems to be capped at about 65,000 values. diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityUtilTestSuite.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityUtilTestSuite.java index aa57a37..c0bd469 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityUtilTestSuite.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityUtilTestSuite.java @@ -32,7 +32,7 @@ import java.util.List; public class EntityUtilTestSuite extends EntityTestCase { - public static final String MODULE = EntityUtilTestSuite.class.getName(); + private static final String MODULE = EntityUtilTestSuite.class.getName(); public static final long TEST_COUNT = 1000; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java index 22667ce..5b76f51 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DebugXaResource.java @@ -25,7 +25,7 @@ import org.apache.ofbiz.base.util.Debug; public class DebugXaResource extends GenericXaResource { - public static final String MODULE = DebugXaResource.class.getName(); + private static final String MODULE = DebugXaResource.class.getName(); public Exception ex = null; public DebugXaResource(String info) { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DumbTransactionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DumbTransactionFactory.java index 85d988f..12843fb 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DumbTransactionFactory.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/DumbTransactionFactory.java @@ -44,7 +44,7 @@ import org.apache.ofbiz.entity.jdbc.ConnectionFactoryLoader; */ public class DumbTransactionFactory implements TransactionFactory { - public static final String MODULE = DumbTransactionFactory.class.getName(); + private static final String MODULE = DumbTransactionFactory.class.getName(); @Override public TransactionManager getTransactionManager() { diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java index 93dbe77..3730512 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GenericXaResource.java @@ -34,7 +34,7 @@ import org.apache.ofbiz.base.util.Debug; */ public abstract class GenericXaResource extends Thread implements XAResource { - public static final String MODULE = GenericXaResource.class.getName(); + private static final String MODULE = GenericXaResource.class.getName(); protected Transaction trans = null; protected boolean active = false; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java index 2ef75b0..dcf51a0 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/GeronimoTransactionFactory.java @@ -38,7 +38,7 @@ import org.apache.ofbiz.entity.jdbc.ConnectionFactoryLoader; public class GeronimoTransactionFactory implements TransactionFactory { - public static final String MODULE = GeronimoTransactionFactory.class.getName(); + private static final String MODULE = GeronimoTransactionFactory.class.getName(); private static int defaultTransactionTimeoutSeconds = 60; private static TransactionLog transactionLog; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java index 05c9b9c..2c4cc27 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java @@ -49,7 +49,7 @@ import org.apache.ofbiz.entity.jdbc.ConnectionFactoryLoader; public class JNDITransactionFactory implements TransactionFactory { // Debug MODULE name - public static final String MODULE = JNDITransactionFactory.class.getName(); + private static final String MODULE = JNDITransactionFactory.class.getName(); volatile TransactionManager transactionManager = null; volatile UserTransaction userTransaction = null; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactoryLoader.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactoryLoader.java index 52f5b57..91afb75 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactoryLoader.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionFactoryLoader.java @@ -27,7 +27,7 @@ import org.apache.ofbiz.entity.config.model.EntityConfig; */ public class TransactionFactoryLoader { - public static final String MODULE = TransactionFactoryLoader.class.getName(); + private static final String MODULE = TransactionFactoryLoader.class.getName(); private static final TransactionFactory txFactory = createTransactionFactory(); private static TransactionFactory createTransactionFactory() { 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 80ce417..44949ed 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 @@ -61,7 +61,7 @@ import org.apache.ofbiz.entity.jdbc.CursorConnection; */ public final class TransactionUtil implements Status { // Debug MODULE name - public static final String MODULE = TransactionUtil.class.getName(); + private static final String MODULE = TransactionUtil.class.getName(); private static ThreadLocal<List<Transaction>> suspendedTxStack = new ThreadLocal<>(); private static ThreadLocal<List<Exception>> suspendedTxLocationStack = new ThreadLocal<>(); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java index 13bba79..9bbfa76 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java @@ -49,7 +49,7 @@ import org.apache.shiro.crypto.hash.HashService; public final class EntityCrypto { - public static final String MODULE = EntityCrypto.class.getName(); + private static final String MODULE = EntityCrypto.class.getName(); private final Delegator delegator; private final ConcurrentMap<String, byte[]> keyMap = new ConcurrentHashMap<>(); 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 4d8d7d3..06f8b0e 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 @@ -37,7 +37,7 @@ import org.xml.sax.SAXException; */ public class EntityDataAssert { - public static final String MODULE = EntityDataAssert.class.getName(); + private static final String MODULE = EntityDataAssert.class.getName(); public static int assertData(URL dataUrl, Delegator delegator, List<Object> errorMessages) throws GenericEntityException, SAXException, ParserConfigurationException, IOException { int rowsChecked = 0; 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 b942ad3..30efe74 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 @@ -57,7 +57,7 @@ import org.xml.sax.SAXException; */ public class EntityDataLoader { - public static final String MODULE = EntityDataLoader.class.getName(); + private static final String MODULE = EntityDataLoader.class.getName(); public static String getPathsString(String helperName) { StringBuilder pathBuffer = new StringBuilder(); diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java index b525fb5..4fc0dd8 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java @@ -45,7 +45,7 @@ import org.apache.ofbiz.entity.model.ModelFieldTypeReader; public class EntityListIterator implements AutoCloseable, ListIterator<GenericValue> { /** Module Name Used for debugging */ - public static final String MODULE = EntityListIterator.class.getName(); + private static final String MODULE = EntityListIterator.class.getName(); protected SQLProcessor sqlp; protected ResultSet resultSet; 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 26f351d..fa1943c 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 @@ -51,7 +51,7 @@ import org.apache.ofbiz.entity.model.DynamicViewEntity; */ public class EntityQuery { - public static final String MODULE = EntityQuery.class.getName(); + private static final String MODULE = EntityQuery.class.getName(); private Delegator delegator; private String entityName = null; 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 8384a3f..57eab05 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 @@ -73,7 +73,7 @@ import freemarker.template.TemplateHashModel; * SAX XML Parser Content Handler for Entity Engine XML files */ public class EntitySaxReader extends DefaultHandler { - public static final String MODULE = EntitySaxReader.class.getName(); + private static final String MODULE = EntitySaxReader.class.getName(); public static final int DEFAULT_TX_TIMEOUT = 7200; protected org.xml.sax.Locator locator; diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityTypeUtil.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityTypeUtil.java index 9325961..bfa5818 100644 --- a/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityTypeUtil.java +++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityTypeUtil.java @@ -33,7 +33,7 @@ import org.apache.ofbiz.entity.GenericValue; */ public final class EntityTypeUtil { - public static final String MODULE = EntityTypeUtil.class.getName(); + private static final String MODULE = EntityTypeUtil.class.getName(); private EntityTypeUtil() {} 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 42b4270..3dfab82 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 @@ -59,7 +59,7 @@ import org.apache.ofbiz.entity.model.ModelField; */ public final class EntityUtil { - public static final String MODULE = EntityUtil.class.getName(); + private static final String MODULE = EntityUtil.class.getName(); private EntityUtil() {} 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 4e49615..9c5b0af 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 @@ -41,7 +41,7 @@ import org.apache.ofbiz.entity.transaction.TransactionUtil; */ public class SequenceUtil { - public static final String MODULE = SequenceUtil.class.getName(); + private static final String MODULE = SequenceUtil.class.getName(); private final ConcurrentMap<String, SequenceBank> sequences = new ConcurrentHashMap<>(); private final GenericHelperInfo helperInfo; diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java index b251d55..0600949 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityGroupUtil.java @@ -36,7 +36,7 @@ import org.apache.ofbiz.entity.util.EntityQuery; */ public final class EntityGroupUtil { - public static final String MODULE = EntityGroupUtil.class.getName(); + private static final String MODULE = EntityGroupUtil.class.getName(); private EntityGroupUtil () {} diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityServiceFactory.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityServiceFactory.java index ae1d87e..0fe2435 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityServiceFactory.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityServiceFactory.java @@ -28,7 +28,7 @@ import org.apache.ofbiz.service.ServiceContainer; */ public class EntityServiceFactory { - public static final String MODULE = EntityServiceFactory.class.getName(); + private static final String MODULE = EntityServiceFactory.class.getName(); public static LocalDispatcher getLocalDispatcher(Delegator delegator) { LocalDispatcher dispatcher = ServiceContainer.getLocalDispatcher("entity-" + delegator.getDelegatorName(), delegator); diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityWatchServices.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityWatchServices.java index c9f82d0..2023a14 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityWatchServices.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/EntityWatchServices.java @@ -29,7 +29,7 @@ import org.apache.ofbiz.service.ServiceUtil; public class EntityWatchServices { - public static final String MODULE = EntityWatchServices.class.getName(); + private static final String MODULE = EntityWatchServices.class.getName(); /** * This service is meant to be called through an Entity ECA (EECA) to watch an entity 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 3ab6f6e..988417d 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 @@ -41,7 +41,7 @@ import org.apache.ofbiz.service.ServiceUtil; */ public class EntityCacheServices implements DistributedCacheClear { - public static final String MODULE = EntityCacheServices.class.getName(); + private static final String MODULE = EntityCacheServices.class.getName(); protected Delegator delegator = null; protected LocalDispatcher dispatcher = null; diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataLoadContainer.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataLoadContainer.java index 37dbf1f..4d166ba 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataLoadContainer.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataLoadContainer.java @@ -63,7 +63,7 @@ import org.apache.ofbiz.service.ServiceDispatcher; */ public class EntityDataLoadContainer implements Container { - public static final String MODULE = EntityDataLoadContainer.class.getName(); + private static final String MODULE = EntityDataLoadContainer.class.getName(); private String name; // possible command line properties passed by user diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java index 2a0a0cf..87f0549 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataServices.java @@ -64,7 +64,7 @@ import org.apache.shiro.crypto.AesCipherService; */ public class EntityDataServices { - public static final String MODULE = EntityDataServices.class.getName(); + private static final String MODULE = EntityDataServices.class.getName(); public static final String resource = "EntityExtUiLabels"; public static Map<String, Object> exportDelimitedToDirectory(DispatchContext dctx, Map<String, Object> context) { diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/UpgradeServices.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/UpgradeServices.java index 626c1ec..a887b69 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/UpgradeServices.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/UpgradeServices.java @@ -47,7 +47,7 @@ import org.apache.ofbiz.service.ServiceUtil; */ public class UpgradeServices { - public static final String MODULE = UpgradeServices.class.getName(); + private static final String MODULE = UpgradeServices.class.getName(); public static final String resource = "EntityExtUiLabels"; diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java index 87735f9..ea4a7c9 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/DelegatorEcaHandler.java @@ -43,7 +43,7 @@ import org.apache.ofbiz.service.DispatchContext; */ public class DelegatorEcaHandler implements EntityEcaHandler<EntityEcaRule> { - public static final String MODULE = DelegatorEcaHandler.class.getName(); + private static final String MODULE = DelegatorEcaHandler.class.getName(); protected Delegator delegator = null; protected String delegatorName = null; diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java index 8cf553e..94ed1a7 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java @@ -40,7 +40,7 @@ import org.w3c.dom.Element; */ @SuppressWarnings("serial") public final class EntityEcaAction implements java.io.Serializable { - public static final String MODULE = EntityEcaAction.class.getName(); + private static final String MODULE = EntityEcaAction.class.getName(); private final String serviceName; private final String serviceMode; 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 0945b55..10cddec 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 @@ -42,7 +42,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public final class EntityEcaCondition implements java.io.Serializable { - public static final String MODULE = EntityEcaCondition.class.getName(); + private static final String MODULE = EntityEcaCondition.class.getName(); protected String lhsValueName = null; protected String rhsValueName = null; 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 eab8373..16a185b 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 @@ -43,7 +43,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public final class EntityEcaRule implements java.io.Serializable { - public static final String MODULE = EntityEcaRule.class.getName(); + private static final String MODULE = EntityEcaRule.class.getName(); private final String entityName; private final String operationName; diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java index e6e040f..ed4105d 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaSetField.java @@ -32,7 +32,7 @@ import org.w3c.dom.Element; */ public final class EntityEcaSetField { - public static final String MODULE = EntityEcaSetField.class.getName(); + private static final String MODULE = EntityEcaSetField.class.getName(); private final String fieldName; private final String envName; diff --git a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaUtil.java b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaUtil.java index 5cc09f7..911b955 100644 --- a/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaUtil.java +++ b/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaUtil.java @@ -47,7 +47,7 @@ import org.w3c.dom.Element; */ public final class EntityEcaUtil { - public static final String MODULE = EntityEcaUtil.class.getName(); + private static final String MODULE = EntityEcaUtil.class.getName(); private static final UtilCache<String, Map<String, Map<String, List<EntityEcaRule>>>> entityEcaReaders = UtilCache.createUtilCache("entity.EcaReaders", 0, 0, false); 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 d0eb939..f64a822 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 @@ -58,7 +58,7 @@ import org.w3c.dom.Element; */ public class EntityPermissionChecker { - public static final String MODULE = EntityPermissionChecker.class.getName(); + private static final String MODULE = EntityPermissionChecker.class.getName(); protected FlexibleStringExpander entityIdExdr; protected FlexibleStringExpander entityNameExdr; 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 7d73806..4539807 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 @@ -63,7 +63,7 @@ import org.xml.sax.SAXException; */ public class EntitySyncContext { - public static final String MODULE = EntitySyncContext.class.getName(); + private static final String MODULE = EntitySyncContext.class.getName(); // set default split to 10 seconds, ie try not to get too much data moving over at once public static final long defaultSyncSplitMillis = 10000; 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 fccd5ac..e047168 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 @@ -68,7 +68,7 @@ import com.ibm.icu.util.Calendar; */ public class EntitySyncServices { - public static final String MODULE = EntitySyncServices.class.getName(); + private static final String MODULE = EntitySyncServices.class.getName(); public static final String resource = "EntityExtUiLabels"; /** diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java index fb81fba..f345fdc 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangUtil.java @@ -56,7 +56,7 @@ import org.w3c.dom.Node; */ public final class MiniLangUtil { - public static final String MODULE = MiniLangUtil.class.getName(); + private static final String MODULE = MiniLangUtil.class.getName(); private static final Set<String> SCRIPT_PREFIXES; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java index 79082a2..4baa13e 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangValidate.java @@ -33,7 +33,7 @@ import org.w3c.dom.Node; */ public final class MiniLangValidate { - public static final String MODULE = MiniLangValidate.class.getName(); + private static final String MODULE = MiniLangValidate.class.getName(); /** * Tests <code>element</code> for invalid attribute names. 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 34f7533..bcf35a9 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 @@ -80,7 +80,7 @@ import org.w3c.dom.Element; */ public final class SimpleMethod extends MiniLangElement { - public static final String MODULE = SimpleMethod.class.getName(); + private static final String MODULE = SimpleMethod.class.getName(); private static final String err_resource = "MiniLangErrorUiLabels"; private static final String[] DEPRECATED_ATTRIBUTES = {"parameter-map-name", "locale-name", "delegator-name", "security-name", "dispatcher-name", "user-login-name"}; private static final Map<String, MethodOperation.Factory<MethodOperation>> methodOperationFactories; 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 03739e8..c76b755 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 @@ -44,7 +44,7 @@ import org.w3c.dom.Element; */ public final class CallClassMethod extends MethodOperation { - public static final String MODULE = CallClassMethod.class.getName(); + private static final String MODULE = CallClassMethod.class.getName(); private final String className; private final Class<?> methodClass; 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 5b6da8a..3d99383 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 @@ -43,7 +43,7 @@ import org.w3c.dom.Element; */ public final class CallObjectMethod extends MethodOperation { - public static final String MODULE = CallClassMethod.class.getName(); + private static final String MODULE = CallClassMethod.class.getName(); private final String methodName; private final FlexibleMapAccessor<Object> objFieldFma; 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 8fc7f8c..ae38ffc 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 @@ -38,7 +38,7 @@ import org.w3c.dom.Element; */ public final class CallScript extends MethodOperation { - public static final String MODULE = CallScript.class.getName(); + private static final String MODULE = CallScript.class.getName(); // This method is needed only during the v1 to v2 transition private static boolean autoCorrect(Element element) { 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 b600daa..ec4d52d 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 @@ -54,7 +54,7 @@ import org.w3c.dom.Element; public final class CallService extends MethodOperation { private static final String MODULE = CallService.class.getName(); - public static final String RESOURCE = "MiniLangErrorUiLabels"; + private static final String RESOURCE = "MiniLangErrorUiLabels"; private final boolean breakOnError; private final FlexibleMessage defaultMessage; 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 6f7d37b..931a78d 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 @@ -42,7 +42,7 @@ import org.w3c.dom.Element; */ public final class CallServiceAsynch extends MethodOperation { - public static final String MODULE = CallServiceAsynch.class.getName(); + private static final String MODULE = CallServiceAsynch.class.getName(); private final boolean includeUserLogin; private final FlexibleMapAccessor<Map<String, Object>> inMapFma; 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 26aef15..69d20e9 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 @@ -47,7 +47,7 @@ import org.w3c.dom.Element; */ public final class CallSimpleMethod extends MethodOperation { - public static final String MODULE = CallSimpleMethod.class.getName(); + private static final String MODULE = CallSimpleMethod.class.getName(); private final String methodName; private final String xmlResource; 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 7a0bc53..77eec76 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 @@ -45,7 +45,7 @@ import org.w3c.dom.Element; */ public final class SetServiceFields extends MethodOperation { - public static final String MODULE = SetServiceFields.class.getName(); + private static final String MODULE = SetServiceFields.class.getName(); // This method is needed only during the v1 to v2 transition private static boolean autoCorrect(Element element) { diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java index 72aa2eb..b0890c9 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java @@ -38,7 +38,7 @@ import org.w3c.dom.Element; */ public abstract class ConditionalFactory<C extends Conditional> { - public static final String MODULE = ConditionalFactory.class.getName(); + private static final String MODULE = ConditionalFactory.class.getName(); private static final Map<String, ConditionalFactory<?>> conditionalFactories; static { 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 e631b51..290aea8 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 @@ -39,7 +39,7 @@ import org.w3c.dom.Element; */ public final class EmptyCondition extends MethodOperation implements Conditional { - public static final String MODULE = EmptyCondition.class.getName(); + private static final String MODULE = EmptyCondition.class.getName(); private final FlexibleMapAccessor<Object> fieldFma; // Sub-operations are used only when this is a method operation. diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java index a5e62d4..8e80dad 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/RegexpCondition.java @@ -47,7 +47,7 @@ import org.w3c.dom.Element; */ public class RegexpCondition extends MethodOperation implements Conditional { - public static final String MODULE = RegexpCondition.class.getName(); + private static final String MODULE = RegexpCondition.class.getName(); private final FlexibleMapAccessor<Object> fieldFma; private final FlexibleStringExpander exprFse; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java index 8d509e5..e6386b7 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ValidateMethodCondition.java @@ -41,7 +41,7 @@ import org.w3c.dom.Element; */ public final class ValidateMethodCondition extends MethodOperation implements Conditional { - public static final String MODULE = ValidateMethodCondition.class.getName(); + private static final String MODULE = ValidateMethodCondition.class.getName(); private static final Class<?>[] paramTypes = new Class<?>[] { String.class }; private final String className; 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 2da85dd..2026d58 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 @@ -36,7 +36,7 @@ import org.w3c.dom.Element; */ public final class CreateValue extends MethodOperation { - public static final String MODULE = CreateValue.class.getName(); + private static final String MODULE = CreateValue.class.getName(); private final boolean createOrStore; @Deprecated 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 fbae004..0185b12 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 @@ -36,7 +36,7 @@ import org.w3c.dom.Element; */ public final class EntityAnd extends EntityOperation { - public static final String MODULE = EntityAnd.class.getName(); + private static final String MODULE = EntityAnd.class.getName(); private final ByAndFinder finder; 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 b360b06..4b36eb1 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 @@ -36,7 +36,7 @@ import org.w3c.dom.Element; */ public final class EntityCondition extends EntityOperation { - public static final String MODULE = EntityCondition.class.getName(); + private static final String MODULE = EntityCondition.class.getName(); private final ByConditionFinder finder; 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 7bf36a9..eecede7 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 @@ -43,7 +43,7 @@ import org.w3c.dom.Element; */ public final class EntityData extends EntityOperation { - public static final String MODULE = EntityData.class.getName(); + private static final String MODULE = EntityData.class.getName(); private final FlexibleMapAccessor<List<Object>> errorListFma; private final FlexibleStringExpander locationFse; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java index 2c12946..be9c03e 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java @@ -36,7 +36,7 @@ import org.w3c.dom.Element; */ public final class EntityOne extends EntityOperation { - public static final String MODULE = EntityOne.class.getName(); + private static final String MODULE = EntityOne.class.getName(); private final PrimaryKeyFinder finder; 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 7079e68..130c6cd 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 @@ -44,7 +44,7 @@ import org.w3c.dom.Element; */ public final class FindByAnd extends EntityOperation { - public static final String MODULE = FindByAnd.class.getName(); + private static final String MODULE = FindByAnd.class.getName(); private final FlexibleStringExpander entityNameFse; private final FlexibleMapAccessor<Collection<String>> fieldsToSelectListFma; 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 38a20db..f4e04d5 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 @@ -45,7 +45,7 @@ import org.w3c.dom.Element; */ public final class FindByPrimaryKey extends EntityOperation { - public static final String MODULE = FindByPrimaryKey.class.getName(); + private static final String MODULE = FindByPrimaryKey.class.getName(); private final FlexibleStringExpander entityNameFse; private final FlexibleMapAccessor<Collection<String>> fieldsToSelectListFma; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java index 65aca3b..e8322c2 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelated.java @@ -42,7 +42,7 @@ import org.w3c.dom.Element; */ public final class GetRelated extends MethodOperation { - public static final String MODULE = GetRelated.class.getName(); + private static final String MODULE = GetRelated.class.getName(); private final FlexibleMapAccessor<Object> listFma; private final FlexibleMapAccessor<Map<String, ? extends Object>> mapFma; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java index 5abafa9..da7b144 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/GetRelatedOne.java @@ -39,7 +39,7 @@ import org.w3c.dom.Element; */ public final class GetRelatedOne extends MethodOperation { - public static final String MODULE = GetRelatedOne.class.getName(); + private static final String MODULE = GetRelatedOne.class.getName(); private final FlexibleStringExpander relationNameFse; private final FlexibleMapAccessor<GenericValue> toValueFma; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java index 7d92033..da3b95f 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/MakeNextSeqId.java @@ -36,7 +36,7 @@ import org.w3c.dom.Element; */ public final class MakeNextSeqId extends MethodOperation { - public static final String MODULE = MakeNextSeqId.class.getName(); + private static final String MODULE = MakeNextSeqId.class.getName(); private final FlexibleStringExpander incrementByFse; private final FlexibleStringExpander numericPaddingFse; 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 2219234..4dd2fdc 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 @@ -37,7 +37,7 @@ import org.w3c.dom.Element; */ public final class RefreshValue extends MethodOperation { - public static final String MODULE = RemoveValue.class.getName(); + private static final String MODULE = RemoveValue.class.getName(); private final FlexibleMapAccessor<GenericValue> valueFma; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java index 104e6ae..e228edd 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/RemoveByAnd.java @@ -40,7 +40,7 @@ import org.w3c.dom.Element; */ public final class RemoveByAnd extends EntityOperation { - public static final String MODULE = RemoveByAnd.class.getName(); + private static final String MODULE = RemoveByAnd.class.getName(); private final FlexibleStringExpander entityNameFse; private final FlexibleMapAccessor<Map<String, ? extends Object>> mapFma; 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 9966f68..2693e4c 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 @@ -39,7 +39,7 @@ import org.w3c.dom.Element; */ public final class RemoveList extends EntityOperation { - public static final String MODULE = RemoveList.class.getName(); + private static final String MODULE = RemoveList.class.getName(); private final FlexibleMapAccessor<List<GenericValue>> listFma; public RemoveList(Element element, SimpleMethod simpleMethod) throws MiniLangException { 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 96f49a0..38f5275 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 @@ -39,7 +39,7 @@ import org.w3c.dom.Element; */ public final class RemoveRelated extends MethodOperation { - public static final String MODULE = RemoveRelated.class.getName(); + private static final String MODULE = RemoveRelated.class.getName(); private final FlexibleStringExpander relationNameFse; private final FlexibleMapAccessor<GenericValue> valueFma; 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 8d374c0..2cbb22e 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 @@ -37,7 +37,7 @@ import org.w3c.dom.Element; */ public final class RemoveValue extends MethodOperation { - public static final String MODULE = RemoveValue.class.getName(); + private static final String MODULE = RemoveValue.class.getName(); private final FlexibleMapAccessor<GenericValue> valueFma; public RemoveValue(Element element, SimpleMethod simpleMethod) throws MiniLangException { 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 1c94d8b..3d63497 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 @@ -39,7 +39,7 @@ import org.w3c.dom.Element; */ public final class StoreList extends EntityOperation { - public static final String MODULE = StoreList.class.getName(); + private static final String MODULE = StoreList.class.getName(); private final FlexibleMapAccessor<List<GenericValue>> listFma; public StoreList(Element element, SimpleMethod simpleMethod) throws MiniLangException { 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 4357a76..da67997 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 @@ -37,7 +37,7 @@ import org.w3c.dom.Element; */ public final class StoreValue extends MethodOperation { - public static final String MODULE = StoreValue.class.getName(); + private static final String MODULE = StoreValue.class.getName(); private final FlexibleMapAccessor<GenericValue> valueFma; public StoreValue(Element element, SimpleMethod simpleMethod) throws MiniLangException { 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 42c1a0a..b5dbe38 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 @@ -36,7 +36,7 @@ import org.w3c.dom.Element; */ public final class TransactionBegin extends MethodOperation { - public static final String MODULE = TransactionBegin.class.getName(); + private static final String MODULE = TransactionBegin.class.getName(); private final FlexibleMapAccessor<Boolean> beganTransactionFma; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java index 7ac48d9..b5448d8 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionCommit.java @@ -36,7 +36,7 @@ import org.w3c.dom.Element; */ public final class TransactionCommit extends MethodOperation { - public static final String MODULE = TransactionCommit.class.getName(); + private static final String MODULE = TransactionCommit.class.getName(); private final FlexibleMapAccessor<Boolean> beganTransactionFma; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java index 424b4ee..7a63aa1 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/TransactionRollback.java @@ -36,7 +36,7 @@ import org.w3c.dom.Element; */ public final class TransactionRollback extends MethodOperation { - public static final String MODULE = TransactionRollback.class.getName(); + private static final String MODULE = TransactionRollback.class.getName(); private final FlexibleMapAccessor<Boolean> beganTransactionFma; 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 f786737..6855c40 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 @@ -42,7 +42,7 @@ import org.w3c.dom.Element; */ public final class Assert extends MethodOperation { - public static final String MODULE = Assert.class.getName(); + private static final String MODULE = Assert.class.getName(); private final List<Conditional> conditionalList; private final FlexibleMapAccessor<List<Object>> errorListFma; 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 24933f0..fba298e 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 @@ -40,7 +40,7 @@ import org.w3c.dom.Element; */ public final class CheckId extends MethodOperation { - public static final String MODULE = CheckId.class.getName(); + private static final String MODULE = CheckId.class.getName(); private final FlexibleMapAccessor<List<String>> errorListFma; private final FlexibleMapAccessor<Object> fieldFma; 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 974d48c..532795c 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 @@ -45,7 +45,7 @@ import org.w3c.dom.Element; */ public final class CreateObject extends MethodOperation { - public static final String MODULE = CreateObject.class.getName(); + private static final String MODULE = CreateObject.class.getName(); private final String className; private final Class<?> targetClass; 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 5f3cadf..8167e73 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 @@ -47,7 +47,7 @@ import org.w3c.dom.Element; */ public final class Iterate extends MethodOperation { - public static final String MODULE = Iterate.class.getName(); + private static final String MODULE = Iterate.class.getName(); private final FlexibleMapAccessor<Object> entryFma; private final FlexibleMapAccessor<Object> listFma; 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 fdcc8fc..ad73adc 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 @@ -42,7 +42,7 @@ import org.w3c.dom.Element; */ public final class IterateMap extends MethodOperation { - public static final String MODULE = IterateMap.class.getName(); + private static final String MODULE = IterateMap.class.getName(); private final FlexibleMapAccessor<Object> keyFma; private final FlexibleMapAccessor<Map<? extends Object, ? extends Object>> mapFma; 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 e6f62e7..41b32cd 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 @@ -41,7 +41,7 @@ import org.w3c.dom.Element; */ public final class Loop extends MethodOperation { - public static final String MODULE = Loop.class.getName(); + private static final String MODULE = Loop.class.getName(); private final FlexibleStringExpander countFse; private final FlexibleMapAccessor<Integer> fieldFma; 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 c336884..754cb87 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 @@ -47,7 +47,7 @@ import com.ibm.icu.util.Calendar; */ public final class SetCalendar extends MethodOperation { - public static final String MODULE = SetCalendar.class.getName(); + private static final String MODULE = SetCalendar.class.getName(); // This method is needed only during the v1 to v2 transition private static boolean autoCorrect(Element element) { 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 493e1c2..9c50617 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 @@ -43,7 +43,7 @@ import org.w3c.dom.Element; */ public final class SetOperation extends MethodOperation { - public static final String MODULE = SetOperation.class.getName(); + private static final String MODULE = SetOperation.class.getName(); // This method is needed only during the v1 to v2 transition private static boolean autoCorrect(Element element) { 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 e20b3af..9271074 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 @@ -44,7 +44,7 @@ import org.w3c.dom.Element; */ public final class Calculate extends MethodOperation { - public static final String MODULE = Calculate.class.getName(); + private static final String MODULE = Calculate.class.getName(); public static final int TYPE_DOUBLE = 1; public static final int TYPE_FLOAT = 2; 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 8753d67..4c31c02 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 @@ -36,7 +36,7 @@ import org.w3c.dom.Element; */ public final class Trace extends MethodOperation { - public static final String MODULE = Trace.class.getName(); + private static final String MODULE = Trace.class.getName(); private final int level; private final List<MethodOperation> methodOperations; 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 cf00a3d..16edaba 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 @@ -34,7 +34,7 @@ import org.w3c.dom.Element; */ public final class FieldToResult extends MethodOperation { - public static final String MODULE = FieldToResult.class.getName(); + private static final String MODULE = FieldToResult.class.getName(); private final FlexibleMapAccessor<Object> fieldFma; private final FlexibleMapAccessor<Object> resultFma; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Convert.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Convert.java index 9a0c095..dbdf986 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Convert.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Convert.java @@ -33,7 +33,7 @@ import org.w3c.dom.Element; */ public class Convert extends SimpleMapOperation { - public static final String MODULE = Convert.class.getName(); + private static final String MODULE = Convert.class.getName(); String format; boolean replace = true; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/InFieldOper.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/InFieldOper.java index 7f7a186..615af5b 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/InFieldOper.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/InFieldOper.java @@ -32,7 +32,7 @@ import org.w3c.dom.Element; */ public class InFieldOper extends MakeInStringOperation { - public static final String MODULE = InFieldOper.class.getName(); + private static final String MODULE = InFieldOper.class.getName(); String fieldName; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java index e914551..f99535e 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java @@ -33,7 +33,7 @@ import org.w3c.dom.Element; */ public class MakeInString { - public static final String MODULE = MakeInString.class.getName(); + private static final String MODULE = MakeInString.class.getName(); String fieldName; List<MakeInStringOperation> operations = new ArrayList<>(); diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/PropertyOper.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/PropertyOper.java index 1bbef0b..b92ae18 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/PropertyOper.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/PropertyOper.java @@ -33,7 +33,7 @@ import org.w3c.dom.Element; */ public class PropertyOper extends MakeInStringOperation { - public static final String MODULE = PropertyOper.class.getName(); + private static final String MODULE = PropertyOper.class.getName(); String property; String resource; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java index a3ef4e5..f87dad5 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Regexp.java @@ -37,7 +37,7 @@ import org.w3c.dom.Element; */ public class Regexp extends SimpleMapOperation { - public static final String MODULE = Regexp.class.getName(); + private static final String MODULE = Regexp.class.getName(); private Pattern pattern = null; String expr; diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java index deb1924..1c90843 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java @@ -33,7 +33,7 @@ import org.w3c.dom.Element; */ public class SimpleMapProcess { - public static final String MODULE = SimpleMapProcess.class.getName(); + private static final String MODULE = SimpleMapProcess.class.getName(); String field = ""; List<SimpleMapOperation> simpleMapOperations = new ArrayList<>(); diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ValidateMethod.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ValidateMethod.java index 7c355c6..d16a769 100644 --- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ValidateMethod.java +++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/ValidateMethod.java @@ -34,7 +34,7 @@ import org.w3c.dom.Element; */ public class ValidateMethod extends SimpleMapOperation { - public static final String MODULE = ValidateMethod.class.getName(); + private static final String MODULE = ValidateMethod.class.getName(); String className; String methodName; diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/CsrfDefenseStrategy.java b/framework/security/src/main/java/org/apache/ofbiz/security/CsrfDefenseStrategy.java index 3262ac6..177d908 100644 --- a/framework/security/src/main/java/org/apache/ofbiz/security/CsrfDefenseStrategy.java +++ b/framework/security/src/main/java/org/apache/ofbiz/security/CsrfDefenseStrategy.java @@ -29,7 +29,7 @@ import org.apache.ofbiz.webapp.control.RequestHandlerExceptionAllowExternalReque public class CsrfDefenseStrategy implements ICsrfDefenseStrategy { - public static final String MODULE = CsrfDefenseStrategy.class.getName(); + private static final String MODULE = CsrfDefenseStrategy.class.getName(); private static SecureRandom secureRandom = null; private static final String PRNG = "SHA1PRNG"; private static final String CHARSET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java b/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java index a682b8c..846013b 100644 --- a/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java +++ b/framework/security/src/main/java/org/apache/ofbiz/security/CsrfUtil.java @@ -45,7 +45,7 @@ import org.apache.ofbiz.webapp.control.WebAppConfigurationException; public final class CsrfUtil { - public static final String MODULE = CsrfUtil.class.getName(); + private static final String MODULE = CsrfUtil.class.getName(); private static String tokenNameNonAjax = UtilProperties.getPropertyValue("security", "csrf.tokenName.nonAjax", "csrf"); private static ICsrfDefenseStrategy strategy; diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java b/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java index 9a33ed9..00b8f29 100644 --- a/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java +++ b/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java @@ -46,7 +46,7 @@ import org.apache.ofbiz.entity.util.EntityUtil; */ public final class SecurityFactory { - public static final String MODULE = SecurityFactory.class.getName(); + private static final String MODULE = SecurityFactory.class.getName(); // The default implementation stores a Delegator reference, so we will cache by delegator name. // The goal is to remove Delegator references in the Security interface, then we can use a singleton // and eliminate the cache. diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/SecurityUtil.java b/framework/security/src/main/java/org/apache/ofbiz/security/SecurityUtil.java index 2e365b9..165347f 100644 --- a/framework/security/src/main/java/org/apache/ofbiz/security/SecurityUtil.java +++ b/framework/security/src/main/java/org/apache/ofbiz/security/SecurityUtil.java @@ -42,7 +42,7 @@ import org.apache.ofbiz.webapp.control.JWTManager; */ public final class SecurityUtil { - public static final String MODULE = SecurityUtil.class.getName(); + private static final String MODULE = SecurityUtil.class.getName(); private static final List<String> adminPermissions = UtilMisc.toList( "IMPERSONATE_ADMIN", "ARTIFACT_INFO_VIEW", 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 f659b16..d814c44 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 @@ -53,7 +53,7 @@ import org.w3c.dom.Document; @SuppressWarnings("serial") public class DispatchContext implements Serializable { - public static final String MODULE = DispatchContext.class.getName(); + private static final String MODULE = DispatchContext.class.getName(); private static final UtilCache<String, Map<String, ModelService>> modelServiceMapByModel = UtilCache.createUtilCache("service.ModelServiceMapByModel", 0, 0, false); 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 fbd8079..9f921aa 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 @@ -28,7 +28,7 @@ import org.apache.ofbiz.base.util.Debug; @SuppressWarnings("serial") public class GenericResultWaiter implements GenericRequester { - public static final String MODULE = GenericResultWaiter.class.getName(); + private static final String MODULE = GenericResultWaiter.class.getName(); /** Status code for a running service */ public static final int SERVICE_RUNNING = -1; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelNotification.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelNotification.java index 6a7e03a..0fc163d 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelNotification.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelNotification.java @@ -38,7 +38,7 @@ import org.apache.ofbiz.service.config.model.Notify; */ public class ModelNotification { - public static final String MODULE = ModelNotification.class.getName(); + private static final String MODULE = ModelNotification.class.getName(); public String notificationGroupName; public String notificationEvent; 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 ba39f88..8736de2 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 @@ -40,7 +40,7 @@ import org.apache.ofbiz.base.util.string.FlexibleStringExpander; @SuppressWarnings("serial") public class ModelParam implements Serializable { - public static final String MODULE = ModelParam.class.getName(); + private static final String MODULE = ModelParam.class.getName(); /** Parameter name */ public String name; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermGroup.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermGroup.java index 0f0db03..1937ac2 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermGroup.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermGroup.java @@ -32,7 +32,7 @@ import org.apache.ofbiz.base.util.UtilValidate; @SuppressWarnings("serial") public class ModelPermGroup implements Serializable { - public static final String MODULE = ModelPermGroup.class.getName(); + private static final String MODULE = ModelPermGroup.class.getName(); public static final String PERM_JOIN_AND = "AND"; public static final String PERM_JOIN_OR = "OR"; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermission.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermission.java index 167b6e4..f948fc1 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermission.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelPermission.java @@ -34,7 +34,7 @@ import org.apache.ofbiz.security.Security; @SuppressWarnings("serial") public class ModelPermission implements Serializable { - public static final String MODULE = ModelPermission.class.getName(); + private static final String MODULE = ModelPermission.class.getName(); public static final int PERMISSION = 1; public static final int ENTITY_PERMISSION = 2; 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 3094614..a00874c 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 @@ -94,7 +94,7 @@ public class ModelService extends AbstractMap<String, Object> implements Seriali MODEL_SERVICE_FIELD_MAP.put(field.getName(), field); } } - public static final String MODULE = ModelService.class.getName(); + private static final String MODULE = ModelService.class.getName(); public static final String XSD = "http://www.w3.org/2001/XMLSchema"; public static final String TNS = "http://ofbiz.apache.org/service/"; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java b/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java index f340228..b6cbf46 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java @@ -56,7 +56,7 @@ import org.xml.sax.SAXException; @SuppressWarnings("serial") public class ModelServiceReader implements Serializable { - public static final String MODULE = ModelServiceReader.class.getName(); + private static final String MODULE = ModelServiceReader.class.getName(); /** is either from a URL or from a ResourceLoader (through the ResourceHandler) */ protected boolean isFromURL; 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 200147a..c1c7196 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 @@ -66,7 +66,7 @@ import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; */ public final class ServiceDispatcher { - public static final String MODULE = ServiceDispatcher.class.getName(); + private static final String MODULE = ServiceDispatcher.class.getName(); public static final int lruLogSize = 200; public static final int LOCK_RETRIES = 3; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceSynchronization.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceSynchronization.java index 47f6c6b..9194c4c 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceSynchronization.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceSynchronization.java @@ -45,7 +45,7 @@ import org.apache.ofbiz.entity.transaction.TransactionUtil; */ public class ServiceSynchronization implements Synchronization { - public static final String MODULE = ServiceSynchronization.class.getName(); + private static final String MODULE = ServiceSynchronization.class.getName(); private static Map<Transaction, ServiceSynchronization> syncingleton = new WeakHashMap<>(); private List<ServiceExecution> services = new ArrayList<>(); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java index 96e0f0a..ed67e53 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java @@ -50,7 +50,7 @@ import org.apache.ofbiz.service.job.JobUtil; */ public final class ServiceUtil { - public static final String MODULE = ServiceUtil.class.getName(); + private static final String MODULE = ServiceUtil.class.getName(); private static final String resource = "ServiceErrorUiLabels"; private ServiceUtil () {} 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 37f2821..2f927db 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 @@ -39,7 +39,7 @@ import org.apache.ofbiz.entity.transaction.TransactionUtil; @Deprecated public class ServiceXaWrapper extends GenericXaResource { - public static final String MODULE = ServiceXaWrapper.class.getName(); + private static final String MODULE = ServiceXaWrapper.class.getName(); public static final int TYPE_ROLLBACK = 600; public static final int TYPE_COMMIT = 500; public static final int MODE_ASYNC = 100; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java index 0933cd0..74d3c47 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java @@ -38,7 +38,7 @@ import com.ibm.icu.util.Calendar; */ public class RecurrenceInfo { - public static final String MODULE = RecurrenceInfo.class.getName(); + private static final String MODULE = RecurrenceInfo.class.getName(); protected GenericValue info; protected Date startDate; 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 3116b05..76dc24d 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 @@ -38,7 +38,7 @@ import com.ibm.icu.util.Calendar; */ public class RecurrenceRule { - public static final String MODULE = RecurrenceRule.class.getName(); + private static final String MODULE = RecurrenceRule.class.getName(); // ********************** // * byXXX constants diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java index 43e0ac1..1094783 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java @@ -57,7 +57,7 @@ public class TemporalExpressions implements Serializable { /** A temporal expression that represents a range of dates. */ public static class DateRange extends TemporalExpression { - public static final String MODULE = DateRange.class.getName(); + private static final String MODULE = DateRange.class.getName(); protected final org.apache.ofbiz.base.util.DateRange range; public DateRange(Date date) { @@ -136,7 +136,7 @@ public class TemporalExpressions implements Serializable { /** A temporal expression that represents a day in the month. */ public static class DayInMonth extends TemporalExpression { - public static final String MODULE = DayInMonth.class.getName(); + private static final String MODULE = DayInMonth.class.getName(); protected final int dayOfWeek; protected final int occurrence; @@ -290,7 +290,7 @@ public class TemporalExpressions implements Serializable { /** A temporal expression that represents a day of month range. */ public static class DayOfMonthRange extends TemporalExpression { - public static final String MODULE = DayOfMonthRange.class.getName(); + private static final String MODULE = DayOfMonthRange.class.getName(); protected final int end; protected final int start; @@ -408,7 +408,7 @@ public class TemporalExpressions implements Serializable { /** A temporal expression that represents a day of week range. */ public static class DayOfWeekRange extends TemporalExpression { - public static final String MODULE = DayOfWeekRange.class.getName(); + private static final String MODULE = DayOfWeekRange.class.getName(); protected final int end; protected final int start; @@ -550,7 +550,7 @@ public class TemporalExpressions implements Serializable { /** A temporal expression that represents a difference of two temporal expressions. */ public static class Difference extends TemporalExpression { - public static final String MODULE = Difference.class.getName(); + private static final String MODULE = Difference.class.getName(); protected final TemporalExpression excluded; protected final TemporalExpression included; @@ -655,7 +655,7 @@ public class TemporalExpressions implements Serializable { /* A temporal expression that represents a frequency. */ public static class Frequency extends TemporalExpression { - public static final String MODULE = Frequency.class.getName(); + private static final String MODULE = Frequency.class.getName(); protected final int freqCount; protected final int freqType; protected final Date start; @@ -818,7 +818,7 @@ public class TemporalExpressions implements Serializable { /** A temporal expression that represents an hour range. */ public static class HourRange extends TemporalExpression { - public static final String MODULE = HourRange.class.getName(); + private static final String MODULE = HourRange.class.getName(); protected final int end; protected final int start; @@ -977,7 +977,7 @@ public class TemporalExpressions implements Serializable { /** A temporal expression that represents a mathematical intersection of all of its * member expressions. */ public static class Intersection extends TemporalExpression { - public static final String MODULE = Intersection.class.getName(); + private static final String MODULE = Intersection.class.getName(); protected final Set<TemporalExpression> expressionSet; public Intersection(Set<TemporalExpression> expressionSet) { @@ -1106,7 +1106,7 @@ public class TemporalExpressions implements Serializable { /** A temporal expression that represents a minute range. */ public static class MinuteRange extends TemporalExpression { - public static final String MODULE = MinuteRange.class.getName(); + private static final String MODULE = MinuteRange.class.getName(); protected final int end; protected final int start; @@ -1264,7 +1264,7 @@ public class TemporalExpressions implements Serializable { /** A temporal expression that represents a month range. */ public static class MonthRange extends TemporalExpression { - public static final String MODULE = MonthRange.class.getName(); + private static final String MODULE = MonthRange.class.getName(); protected final int end; protected final int start; @@ -1423,7 +1423,7 @@ public class TemporalExpressions implements Serializable { /** A temporal expression that provides a substitution for an excluded temporal expression. */ public static class Substitution extends TemporalExpression { - public static final String MODULE = Substitution.class.getName(); + private static final String MODULE = Substitution.class.getName(); protected final TemporalExpression excluded; protected final TemporalExpression included; protected final TemporalExpression substitute; @@ -1545,7 +1545,7 @@ public class TemporalExpressions implements Serializable { /** A temporal expression that represents a mathematical union of all of its * member expressions. */ public static class Union extends TemporalExpression { - public static final String MODULE = Union.class.getName(); + private static final String MODULE = Union.class.getName(); protected final Set<TemporalExpression> expressionSet; public Union(Set<TemporalExpression> expressionSet) { diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java index 4fa3fa4..96663c5 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java @@ -45,7 +45,7 @@ import org.w3c.dom.Element; */ public final class ServiceConfigUtil { - public static final String MODULE = ServiceConfigUtil.class.getName(); + private static final String MODULE = ServiceConfigUtil.class.getName(); private static final String engine = "default"; private static final String SERVICE_ENGINE_XML_FILENAME = "serviceengine.xml"; // Keep the ServiceConfig instance in a cache - so the configuration can be reloaded at run-time. There will be only one ServiceConfig instance in the cache. diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java index a91080b..6d0837c 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java @@ -41,7 +41,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public class ServiceEcaAction implements java.io.Serializable { - public static final String MODULE = ServiceEcaAction.class.getName(); + private static final String MODULE = ServiceEcaAction.class.getName(); protected String eventName = null; protected String serviceName = null; 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 2e17f21..6ae4440 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 @@ -40,7 +40,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public class ServiceEcaCondition implements java.io.Serializable { - public static final String MODULE = ServiceEcaCondition.class.getName(); + private static final String MODULE = ServiceEcaCondition.class.getName(); protected String conditionService = null; protected String lhsValueName = null; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java index 1fcb019..c017304 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java @@ -38,7 +38,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public final class ServiceEcaRule implements java.io.Serializable { - public static final String MODULE = ServiceEcaRule.class.getName(); + private static final String MODULE = ServiceEcaRule.class.getName(); public final String serviceName; public final String eventName; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java index 0ec5cbd..21bbeea 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java @@ -36,7 +36,7 @@ import org.w3c.dom.Element; */ public class ServiceEcaSetField { - public static final String MODULE = ServiceEcaSetField.class.getName(); + private static final String MODULE = ServiceEcaSetField.class.getName(); protected String fieldName = null; protected String mapName = null; 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 73b7d4b..33676bb 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 @@ -48,7 +48,7 @@ import org.w3c.dom.Element; */ public final class ServiceEcaUtil { - public static final String MODULE = ServiceEcaUtil.class.getName(); + private static final String MODULE = ServiceEcaUtil.class.getName(); // using a cache is dangerous here because if someone clears it the ECAs won't run: public static UtilCache ecaCache = new UtilCache("service.ServiceECAs", 0, 0, false); private static Map<String, Map<String, List<ServiceEcaRule>>> ecaCache = new ConcurrentHashMap<>(); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/AbstractEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/AbstractEngine.java index ebab5bc..4666a69 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/AbstractEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/AbstractEngine.java @@ -36,7 +36,7 @@ import org.apache.ofbiz.service.config.model.ServiceLocation; */ public abstract class AbstractEngine implements GenericEngine { - public static final String MODULE = AbstractEngine.class.getName(); + private static final String MODULE = AbstractEngine.class.getName(); /** Map containing aliases for service implementation locations. */ protected static final Map<String, String> locationMap = createLocationMap(); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java index a415d67..20d73f2 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java @@ -49,7 +49,7 @@ import org.apache.ofbiz.service.ServiceUtil; */ public final class EntityAutoEngine extends GenericAsyncEngine { - public static final String MODULE = EntityAutoEngine.class.getName(); + private static final String MODULE = EntityAutoEngine.class.getName(); public static final String resource = "ServiceErrorUiLabels"; private static final List<String> availableInvokeActionNames = UtilMisc.toList("create", "update", "delete", "expire"); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java index f8ea4c2..21d9913 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java @@ -48,7 +48,7 @@ import org.apache.ofbiz.service.job.JobPriority; */ public abstract class GenericAsyncEngine extends AbstractEngine { - public static final String MODULE = GenericAsyncEngine.class.getName(); + private static final String MODULE = GenericAsyncEngine.class.getName(); protected GenericAsyncEngine(ServiceDispatcher dispatcher) { super(dispatcher); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java index c511e85..628b535 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyEngine.java @@ -47,7 +47,7 @@ import groovy.lang.Script; */ public final class GroovyEngine extends GenericAsyncEngine { - public static final String MODULE = GroovyEngine.class.getName(); + private static final String MODULE = GroovyEngine.class.getName(); private static final Object[] EMPTY_ARGS = {}; private static final Set<String> protectedKeys = createProtectedKeys(); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/HttpEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/HttpEngine.java index 706f20b..ce7a5ea 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/HttpEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/HttpEngine.java @@ -43,7 +43,7 @@ import org.apache.ofbiz.service.ServiceDispatcher; */ public class HttpEngine extends GenericAsyncEngine { - public static final String MODULE = HttpEngine.class.getName(); + private static final String MODULE = HttpEngine.class.getName(); private static final boolean exportAll = false; public HttpEngine(ServiceDispatcher dispatcher) { diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/SOAPClientEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/SOAPClientEngine.java index 5343a3f..8747f1f 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/SOAPClientEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/SOAPClientEngine.java @@ -52,7 +52,7 @@ import org.apache.ofbiz.service.ServiceDispatcher; */ public final class SOAPClientEngine extends GenericAsyncEngine { - public static final String MODULE = SOAPClientEngine.class.getName(); + private static final String MODULE = SOAPClientEngine.class.getName(); public SOAPClientEngine(ServiceDispatcher dispatcher) { super(dispatcher); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/ScriptEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/ScriptEngine.java index 0f21b98..1f7dd3d 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/ScriptEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/ScriptEngine.java @@ -52,7 +52,7 @@ import org.apache.ofbiz.service.ServiceUtil; */ public final class ScriptEngine extends GenericAsyncEngine { - public static final String MODULE = ScriptEngine.class.getName(); + private static final String MODULE = ScriptEngine.class.getName(); private static final Set<String> protectedKeys = createProtectedKeys(); private static Set<String> createProtectedKeys() { diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/SoapSerializer.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/SoapSerializer.java index 651be37..6e04bdb 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/SoapSerializer.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/SoapSerializer.java @@ -37,7 +37,7 @@ import org.xml.sax.SAXException; * */ public class SoapSerializer { - public static final String MODULE = SoapSerializer.class.getName(); + private static final String MODULE = SoapSerializer.class.getName(); public static Object deserialize(String content, Delegator delegator) throws SerializeException, SAXException, ParserConfigurationException, IOException { Document document = UtilXml.readXmlDocument(content, false); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardJavaEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardJavaEngine.java index 57330d2..f10abac 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardJavaEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/StandardJavaEngine.java @@ -35,7 +35,7 @@ import org.apache.ofbiz.service.ServiceDispatcher; */ public final class StandardJavaEngine extends GenericAsyncEngine { - public static final String MODULE = StandardJavaEngine.class.getName(); + private static final String MODULE = StandardJavaEngine.class.getName(); public StandardJavaEngine(ServiceDispatcher dispatcher) { super(dispatcher); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java b/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java index 913dc08..f2b6deb 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java @@ -45,7 +45,7 @@ import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; */ public class XMLRPCClientEngine extends GenericAsyncEngine { - public static final String MODULE = XMLRPCClientEngine.class.getName(); + private static final String MODULE = XMLRPCClientEngine.class.getName(); public XMLRPCClientEngine(ServiceDispatcher dispatcher) { super(dispatcher); 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 8cf0ea9..9687cfb 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 @@ -36,7 +36,7 @@ import org.w3c.dom.Element; */ public class GroupModel { - public static final String MODULE = GroupModel.class.getName(); + private static final String MODULE = GroupModel.class.getName(); private String groupName, sendMode; private List<GroupServiceModel> services; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupServiceModel.java b/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupServiceModel.java index 33fdded..c786282 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupServiceModel.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupServiceModel.java @@ -34,7 +34,7 @@ import org.w3c.dom.Element; */ public class GroupServiceModel { - public static final String MODULE = GroupServiceModel.class.getName(); + private static final String MODULE = GroupServiceModel.class.getName(); private String serviceName, serviceMode; private boolean resultToContext = false; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupReader.java b/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupReader.java index 0b155b8..4315970 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupReader.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/group/ServiceGroupReader.java @@ -37,7 +37,7 @@ import org.w3c.dom.Element; */ public class ServiceGroupReader { - public static final String MODULE = ServiceGroupReader.class.getName(); + private static final String MODULE = ServiceGroupReader.class.getName(); // using a cache is dangerous here because if someone clears it the groups won't work at all: public static UtilCache groupsCache = new UtilCache("service.ServiceGroups", 0, 0, false); private static final Map<String, GroupModel> groupsCache = new ConcurrentHashMap<>(); 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 e303b6c..47383fe 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 @@ -40,7 +40,7 @@ import org.apache.ofbiz.service.ServiceContainer; */ public abstract class AbstractJmsListener implements GenericMessageListener, ExceptionListener { - public static final String MODULE = AbstractJmsListener.class.getName(); + private static final String MODULE = AbstractJmsListener.class.getName(); protected LocalDispatcher dispatcher; protected boolean isConnected = false; 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 e3af136..0f7ffac 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 @@ -41,7 +41,7 @@ import org.apache.ofbiz.service.config.model.Server; */ public class JmsListenerFactory implements Runnable { - public static final String MODULE = JmsListenerFactory.class.getName(); + private static final String MODULE = JmsListenerFactory.class.getName(); public static final String TOPIC_LISTENER_CLASS = "org.apache.ofbiz.service.jms.JmsTopicListener"; public static final String QUEUE_LISTENER_CLASS = "org.apache.ofbiz.service.jms.JmsQueueListener"; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java index 250072a..3084160 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java @@ -39,7 +39,7 @@ import org.apache.ofbiz.service.GenericServiceException; */ public class JmsQueueListener extends AbstractJmsListener { - public static final String MODULE = JmsQueueListener.class.getName(); + private static final String MODULE = JmsQueueListener.class.getName(); private QueueConnection con = null; private QueueSession session = null; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsSerializer.java b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsSerializer.java index 705de85..eccafeb 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsSerializer.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsSerializer.java @@ -37,7 +37,7 @@ import org.xml.sax.SAXException; * */ public class JmsSerializer { - public static final String MODULE = JmsSerializer.class.getName(); + private static final String MODULE = JmsSerializer.class.getName(); public static Object deserialize(String content, Delegator delegator) throws SerializeException, SAXException, ParserConfigurationException, IOException { Document document = UtilXml.readXmlDocument(content, false); 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 9734a39..5657007 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 @@ -70,7 +70,7 @@ import org.w3c.dom.Element; */ public class JmsServiceEngine extends AbstractEngine { - public static final String MODULE = JmsServiceEngine.class.getName(); + private static final String MODULE = JmsServiceEngine.class.getName(); public JmsServiceEngine(ServiceDispatcher dispatcher) { super(dispatcher); 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 5878748..ae7ceba 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 @@ -39,7 +39,7 @@ import org.apache.ofbiz.service.GenericServiceException; */ public class JmsTopicListener extends AbstractJmsListener { - public static final String MODULE = JmsTopicListener.class.getName(); + private static final String MODULE = JmsTopicListener.class.getName(); private TopicConnection con = null; private TopicSession session = null; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/AbstractJob.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/AbstractJob.java index f88c985..e97d411 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/job/AbstractJob.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/AbstractJob.java @@ -30,7 +30,7 @@ import org.apache.ofbiz.entity.transaction.TransactionUtil; */ public abstract class AbstractJob implements Job { - public static final String MODULE = AbstractJob.class.getName(); + private static final String MODULE = AbstractJob.class.getName(); private final String jobId; private final String jobName; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/GenericServiceJob.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/GenericServiceJob.java index 53a98a8..99aa9fd 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/job/GenericServiceJob.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/GenericServiceJob.java @@ -35,7 +35,7 @@ import org.apache.ofbiz.service.semaphore.SemaphoreWaitException; @SuppressWarnings("serial") public class GenericServiceJob extends AbstractJob implements Serializable { - public static final String MODULE = GenericServiceJob.class.getName(); + private static final String MODULE = GenericServiceJob.class.getName(); protected final transient GenericRequester requester; protected final transient DispatchContext dctx; 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 12dcdd3..d563c97 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 @@ -71,7 +71,7 @@ import com.ibm.icu.util.Calendar; */ public final class JobManager { - public static final String MODULE = JobManager.class.getName(); + private static final String MODULE = JobManager.class.getName(); public static final String instanceId = UtilProperties.getPropertyValue("general", "unique.instanceId", "ofbiz0"); private static final ConcurrentHashMap<String, JobManager> registeredManagers = new ConcurrentHashMap<>(); private static boolean isShutDown = false; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java index 929979c..aaf7dae 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java @@ -48,7 +48,7 @@ import org.apache.ofbiz.service.config.model.ThreadPool; */ public final class JobPoller implements ServiceConfigListener { - public static final String MODULE = JobPoller.class.getName(); + private static final String MODULE = JobPoller.class.getName(); private static final AtomicInteger created = new AtomicInteger(); private static final ConcurrentHashMap<String, JobManager> jobManagers = new ConcurrentHashMap<>(); private static final ThreadPoolExecutor executor = createThreadPoolExecutor(); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java index b76e4fc..fcfd7eb 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobServices.java @@ -42,7 +42,7 @@ import org.apache.ofbiz.service.config.ServiceConfigUtil; public class JobServices { - public static final String MODULE = JobServices.class.getName(); + private static final String MODULE = JobServices.class.getName(); private static final String resource = "ServiceErrorUiLabels"; public static Map<String, Object> cancelJob(DispatchContext dctx, Map<String, ? extends Object> context) { diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobUtil.java index 4ab7d98..4d5c5a5 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/job/JobUtil.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/JobUtil.java @@ -28,7 +28,7 @@ import org.apache.ofbiz.entity.transaction.TransactionUtil; public class JobUtil { - public static final String MODULE = JobUtil.class.getName(); + private static final String MODULE = JobUtil.class.getName(); public static void removeJob(GenericValue jobValue) { // always suspend the current transaction; use the one internally diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java index 02a9d09..0def753 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java @@ -60,7 +60,7 @@ import com.ibm.icu.util.TimeZone; @SuppressWarnings("serial") public class PersistedServiceJob extends GenericServiceJob { - public static final String MODULE = PersistedServiceJob.class.getName(); + private static final String MODULE = PersistedServiceJob.class.getName(); private final transient Delegator delegator; private long nextRecurrence = -1; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/job/PurgeJob.java b/framework/service/src/main/java/org/apache/ofbiz/service/job/PurgeJob.java index 15fd3d2..dc30d59 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/job/PurgeJob.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/job/PurgeJob.java @@ -28,7 +28,7 @@ import org.apache.ofbiz.entity.GenericValue; @SuppressWarnings("serial") public class PurgeJob extends AbstractJob implements Serializable { - public static final String MODULE = PurgeJob.class.getName(); + private static final String MODULE = PurgeJob.class.getName(); private final GenericValue jobValue; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java index 3b49e23..b803fb2 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java @@ -60,7 +60,7 @@ import org.apache.ofbiz.service.ServiceContainer; public class JavaMailContainer implements Container { - public static final String MODULE = JavaMailContainer.class.getName(); + private static final String MODULE = JavaMailContainer.class.getName(); public static final String INBOX = "INBOX"; protected Delegator delegator = null; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java index d2a9eae..23dfc2e 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java @@ -48,7 +48,7 @@ import org.apache.ofbiz.base.util.UtilDateTime; @SuppressWarnings("serial") public class MimeMessageWrapper implements java.io.Serializable { - public static final String MODULE = MimeMessageWrapper.class.getName(); + private static final String MODULE = MimeMessageWrapper.class.getName(); protected transient MimeMessage message = null; protected transient Session session = null; protected Properties mailProperties = null; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaAction.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaAction.java index aa0d2c9..0923eca 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaAction.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaAction.java @@ -33,7 +33,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public class ServiceMcaAction implements java.io.Serializable { - public static final String MODULE = ServiceMcaAction.class.getName(); + private static final String MODULE = ServiceMcaAction.class.getName(); protected String serviceName = null; protected String serviceMode = null; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java index 281b026..7964112 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java @@ -41,7 +41,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public class ServiceMcaCondition implements java.io.Serializable { - public static final String MODULE = ServiceMcaCondition.class.getName(); + private static final String MODULE = ServiceMcaCondition.class.getName(); public static final int CONDITION_FIELD = 1; public static final int CONDITION_HEADER = 2; public static final int CONDITION_SERVICE = 3; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaRule.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaRule.java index 97c8ca1..51dc155 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaRule.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaRule.java @@ -32,7 +32,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public class ServiceMcaRule implements java.io.Serializable { - public static final String MODULE = ServiceMcaRule.class.getName(); + private static final String MODULE = ServiceMcaRule.class.getName(); protected String ruleName = null; protected List<ServiceMcaCondition> conditions = new LinkedList<>(); diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaUtil.java b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaUtil.java index 5024cb8..d438bb7 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaUtil.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaUtil.java @@ -35,7 +35,7 @@ import org.w3c.dom.Element; public final class ServiceMcaUtil { - public static final String MODULE = ServiceMcaUtil.class.getName(); + private static final String MODULE = ServiceMcaUtil.class.getName(); private static final UtilCache<String, ServiceMcaRule> mcaCache = UtilCache.createUtilCache("service.ServiceMCAs", 0, 0, false); private ServiceMcaUtil() {} diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java index 1750a75..168c856 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java @@ -48,7 +48,7 @@ import org.apache.ofbiz.service.GenericServiceException; */ public class ExampleRemoteClient { - public static final String MODULE = ExampleRemoteClient.class.getName(); + private static final String MODULE = ExampleRemoteClient.class.getName(); protected final static String RMI_URL = "rmi://localhost:1099/RMIDispatcher"; // change to match the remote server protected RemoteDispatcher rd = null; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcherImpl.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcherImpl.java index a6a2dcd..9814825 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcherImpl.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcherImpl.java @@ -38,7 +38,7 @@ import org.apache.ofbiz.service.ModelService; @SuppressWarnings("serial") public class RemoteDispatcherImpl extends UnicastRemoteObject implements RemoteDispatcher { - public static final String MODULE = RemoteDispatcherImpl.class.getName(); + private static final String MODULE = RemoteDispatcherImpl.class.getName(); private static boolean exportAll = false; protected LocalDispatcher dispatcher = null; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java index 362e25e..956d5b3 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java @@ -44,7 +44,7 @@ import org.apache.ofbiz.service.ServiceContainer; */ public class RmiServiceContainer implements Container { - public static final String MODULE = RmiServiceContainer.class.getName(); + private static final String MODULE = RmiServiceContainer.class.getName(); protected RemoteDispatcherImpl remote = null; protected String configFile = null; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java index ecac32d..c2e1885 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java @@ -37,7 +37,7 @@ import org.apache.ofbiz.base.util.SSLUtil; @SuppressWarnings("serial") public class SSLClientSocketFactory implements RMIClientSocketFactory, Serializable { - public static final String MODULE = SSLClientSocketFactory.class.getName(); + private static final String MODULE = SSLClientSocketFactory.class.getName(); @Override public Socket createSocket(String host, int port) throws IOException { 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 9e41e62..ef2e593 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 { - public 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/service/src/main/java/org/apache/ofbiz/service/test/AbstractXmlRpcTestCase.java b/framework/service/src/main/java/org/apache/ofbiz/service/test/AbstractXmlRpcTestCase.java index c8575f8..4079d58 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/test/AbstractXmlRpcTestCase.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/test/AbstractXmlRpcTestCase.java @@ -32,7 +32,7 @@ import junit.framework.TestCase; */ public class AbstractXmlRpcTestCase extends TestCase { - public static final String MODULE = AbstractXmlRpcTestCase.class.getName(); + private static final String MODULE = AbstractXmlRpcTestCase.class.getName(); protected String keyStoreComponent; protected String keyStoreName; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEngineTestPermissionServices.java b/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEngineTestPermissionServices.java index 910b7e9..aa33c6e 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEngineTestPermissionServices.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEngineTestPermissionServices.java @@ -24,7 +24,7 @@ import org.apache.ofbiz.service.ServiceUtil; public class ServiceEngineTestPermissionServices { - public static final String MODULE = ServiceEngineTestPermissionServices.class.getName(); + private static final String MODULE = ServiceEngineTestPermissionServices.class.getName(); public static final String resource = "ServiceErrorUiLabels"; public static Map<String, Object> genericTestService(DispatchContext dctx, Map<String, ? extends Object> context) { diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEngineTestServices.java b/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEngineTestServices.java index 1f05457..fd146da 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEngineTestServices.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEngineTestServices.java @@ -39,7 +39,7 @@ import org.apache.ofbiz.service.ServiceUtil; public class ServiceEngineTestServices { - public static final String MODULE = ServiceEngineTestServices.class.getName(); + private static final String MODULE = ServiceEngineTestServices.class.getName(); public static final String resource = "ServiceErrorUiLabels"; public static Map<String, Object> testServiceDeadLockRetry(DispatchContext dctx, Map<String, ? extends Object> context) { diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java b/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java index 2e46f5c..072f32a 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/test/XmlRpcTests.java @@ -36,7 +36,7 @@ import org.apache.xmlrpc.client.XmlRpcClient; */ public class XmlRpcTests extends AbstractXmlRpcTestCase { - public static final String MODULE = XmlRpcTests.class.getName(); + private static final String MODULE = XmlRpcTests.class.getName(); public static final String resource = "ServiceErrorUiLabels"; private static String url = "http://localhost:8080/webtools/control/xmlrpc?USERNAME=admin&PASSWORD=ofbiz"; diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/XmlRpcClient.java b/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/XmlRpcClient.java index 2b5142e..17f6c6d 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/XmlRpcClient.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/XmlRpcClient.java @@ -32,7 +32,7 @@ import org.apache.xmlrpc.client.XmlRpcTransportFactory; */ public class XmlRpcClient extends org.apache.xmlrpc.client.XmlRpcClient { - public static final String MODULE = XmlRpcClient.class.getName(); + private static final String MODULE = XmlRpcClient.class.getName(); protected String keyStoreComponent; protected String keyStoreName; 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 9a77902..59c6c3f 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 @@ -34,7 +34,7 @@ import org.apache.ofbiz.base.start.Start.ServerState; */ final class StartupControlPanel { - public static final String MODULE = StartupControlPanel.class.getName(); + private static final String MODULE = StartupControlPanel.class.getName(); /** * Initialize OFBiz by: diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java index 62cc6d2..16e5874 100644 --- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java +++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java @@ -35,7 +35,7 @@ import junit.framework.TestResult; public class EntityXmlAssertTest extends OFBizTestCase { - public static final String MODULE = ServiceTest.class.getName(); + private static final String MODULE = ServiceTest.class.getName(); protected String entityXmlUrlString; protected String action; diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java index 1e3d297..e0bdac4 100644 --- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java +++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java @@ -36,7 +36,7 @@ import junit.framework.TestSuite; */ public class JunitSuiteWrapper { - public static final String MODULE = JunitSuiteWrapper.class.getName(); + private static final String MODULE = JunitSuiteWrapper.class.getName(); protected List<ModelTestSuite> modelTestSuiteList = new LinkedList<>(); diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java index 5043081..568049b 100644 --- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java +++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java @@ -48,7 +48,7 @@ import junit.framework.TestSuite; * Use this class in a JUnit test runner to bootstrap the Test Suite runner. */ public class ModelTestSuite { - public static final String MODULE = ModelTestSuite.class.getName(); + private static final String MODULE = ModelTestSuite.class.getName(); public static final String DELEGATOR_NAME = "test"; public static final String DISPATCHER_NAME = "test-dispatcher"; diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java index a50a30e..76cce24 100644 --- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java +++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ServiceTest.java @@ -34,7 +34,7 @@ import junit.framework.TestResult; public class ServiceTest extends OFBizTestCase { - public static final String MODULE = ServiceTest.class.getName(); + private static final String MODULE = ServiceTest.class.getName(); protected String serviceName; diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/SimpleMethodTest.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/SimpleMethodTest.java index 90e4a83e..7c3f455 100644 --- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/SimpleMethodTest.java +++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/SimpleMethodTest.java @@ -42,7 +42,7 @@ import junit.framework.TestResult; public class SimpleMethodTest extends OFBizTestCase { - public static final String MODULE = ServiceTest.class.getName(); + private static final String MODULE = ServiceTest.class.getName(); protected String methodLocation; protected String methodName; diff --git a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java index 524c17c..9d7465f 100644 --- a/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java +++ b/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java @@ -49,7 +49,7 @@ import junit.framework.TestSuite; */ public class TestRunContainer implements Container { - public static final String MODULE = TestRunContainer.class.getName(); + private static final String MODULE = TestRunContainer.class.getName(); public static final String logDir = "runtime/logs/test-results/"; private String name; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java index d5683c4..0c21587 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java @@ -41,7 +41,7 @@ import org.xml.sax.SAXException; */ public final class OfbizUrlBuilder { - public static final String MODULE = OfbizUrlBuilder.class.getName(); + private static final String MODULE = OfbizUrlBuilder.class.getName(); /** * Returns an <code>OfbizUrlBuilder</code> instance. 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 cbc5d0f..2ee9ccc 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 @@ -64,7 +64,7 @@ import org.xml.sax.helpers.DefaultHandler; */ public final class WebAppUtil { - public static final String MODULE = WebAppUtil.class.getName(); + private static final String MODULE = WebAppUtil.class.getName(); public static final String CONTROL_MOUNT_POINT = "control"; private static final Path webAppFileName = Paths.get("WEB-INF", "web.xml"); private static final UtilCache<Path, WebXml> webXmlCache = UtilCache.createUtilCache("webapp.WebXml"); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java index 6f53726..38260f3 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java @@ -63,7 +63,7 @@ import org.w3c.dom.Element; */ public class ConfigXMLReader { - public static final String MODULE = ConfigXMLReader.class.getName(); + private static final String MODULE = ConfigXMLReader.class.getName(); public static final Path CONTROLLERXMLFILENAME = Paths.get("WEB-INF", "controller.xml"); private static final UtilCache<URL, ControllerConfig> CONTROLLERCACHE = UtilCache .createUtilCache("webapp.ControllerConfig"); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlActivationEventListener.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlActivationEventListener.java index 7401617..b07357e 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlActivationEventListener.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlActivationEventListener.java @@ -30,7 +30,7 @@ import org.apache.ofbiz.base.util.UtilProperties; */ public class ControlActivationEventListener implements HttpSessionActivationListener { // Debug MODULE name - public static final String MODULE = ControlActivationEventListener.class.getName(); + private static final String MODULE = ControlActivationEventListener.class.getName(); public ControlActivationEventListener() {} diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java index 30e7b26..49f4f92 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java @@ -44,7 +44,7 @@ import org.apache.ofbiz.entity.util.EntityQuery; */ public class ControlEventListener implements HttpSessionListener { // Debug MODULE name - public static final String MODULE = ControlEventListener.class.getName(); + private static final String MODULE = ControlEventListener.class.getName(); protected static long totalActiveSessions = 0; protected static long totalPassiveSessions = 0; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginEventListener.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginEventListener.java index 105e8e0..b17b004 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginEventListener.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginEventListener.java @@ -28,7 +28,7 @@ import javax.servlet.http.HttpSessionListener; */ public class LoginEventListener implements HttpSessionListener { // Debug MODULE name - public static final String MODULE = LoginEventListener.class.getName(); + private static final String MODULE = LoginEventListener.class.getName(); public LoginEventListener() {} 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 d9a5251..e84ed38 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 @@ -80,7 +80,7 @@ import org.apache.ofbiz.widget.model.ThemeFactory; */ public class RequestHandler { - public static final String MODULE = RequestHandler.class.getName(); + private static final String MODULE = RequestHandler.class.getName(); private final ViewFactory viewFactory; private final EventFactory eventFactory; private final URL controllerConfigURL; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java index 3aaca85..f2f9e7d 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/TokenFilter.java @@ -39,7 +39,7 @@ import java.util.Locale; import java.util.Map; public class TokenFilter implements Filter { - public static final String MODULE = TokenFilter.class.getName(); + private static final String MODULE = TokenFilter.class.getName(); protected FilterConfig config = null; 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 9611630..678f224 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 @@ -60,7 +60,7 @@ import org.apache.ofbiz.webapp.control.RequestHandler; */ public class CoreEvents { - public static final String MODULE = CoreEvents.class.getName(); + private static final String MODULE = CoreEvents.class.getName(); public static final String err_resource = "WebappUiLabels"; /** diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java index d8ab108..4510e9e 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java @@ -34,7 +34,7 @@ import org.apache.ofbiz.webapp.control.ConfigXMLReader; */ public class EventFactory { - public static final String MODULE = EventFactory.class.getName(); + private static final String MODULE = EventFactory.class.getName(); private final Map<String, EventHandler> handlers = new HashMap<>(); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java index 4084688..c699f90 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java @@ -28,7 +28,7 @@ import org.apache.commons.fileupload.ProgressListener; @SuppressWarnings("serial") public class FileUploadProgressListener implements ProgressListener, Serializable { - public static final String MODULE = FileUploadProgressListener.class.getName(); + private static final String MODULE = FileUploadProgressListener.class.getName(); protected long contentLength = -1; protected long bytesRead = -1; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java index addf4ab..dffc38b 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java @@ -48,7 +48,7 @@ import groovy.lang.Script; public class GroovyEventHandler implements EventHandler { - public static final String MODULE = GroovyEventHandler.class.getName(); + private static final String MODULE = GroovyEventHandler.class.getName(); protected static final Object[] EMPTY_ARGS = {}; private static final Set<String> protectedKeys = createProtectedKeys(); 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 61a7736..75f5f6c 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 @@ -36,7 +36,7 @@ import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; */ public class JavaEventHandler implements EventHandler { - public static final String MODULE = JavaEventHandler.class.getName(); + private static final String MODULE = JavaEventHandler.class.getName(); /* Cache for event handler classes. */ private ConcurrentHashMap<String, Class<?>> classes = new ConcurrentHashMap<>(); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java index ad197ae..9f00bf0 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java @@ -38,7 +38,7 @@ import com.sun.syndication.io.WireFeedOutput; */ public class RomeEventHandler implements EventHandler { - public static final String MODULE = RomeEventHandler.class.getName(); + private static final String MODULE = RomeEventHandler.class.getName(); public static final String mime = "application/xml; charset=UTF-8"; public static final String defaultFeedType = "rss_2.0"; 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 5e407e9..30d68d8 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 @@ -65,7 +65,7 @@ import org.w3c.dom.Document; */ public class SOAPEventHandler implements EventHandler { - public static final String MODULE = SOAPEventHandler.class.getName(); + private static final String MODULE = SOAPEventHandler.class.getName(); @Override public void init(ServletContext context) throws EventHandlerException { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ScriptEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ScriptEventHandler.java index 4e52d0b..14f6197 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ScriptEventHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ScriptEventHandler.java @@ -58,7 +58,7 @@ import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; */ public final class ScriptEventHandler implements EventHandler { - public static final String MODULE = ScriptEventHandler.class.getName(); + private static final String MODULE = ScriptEventHandler.class.getName(); private static final Set<String> protectedKeys = createProtectedKeys(); private static Set<String> createProtectedKeys() { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java index d258e6d..1e0d264 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java @@ -51,7 +51,7 @@ import org.apache.ofbiz.widget.renderer.VisualTheme; */ public class ServiceEventHandler implements EventHandler { - public static final String MODULE = ServiceEventHandler.class.getName(); + private static final String MODULE = ServiceEventHandler.class.getName(); public static final String SYNC = "sync"; public static final String ASYNC = "async"; 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 7ab5f8b..2072061 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 @@ -58,7 +58,7 @@ import org.apache.ofbiz.webapp.control.WebAppConfigurationException; */ public class ServiceMultiEventHandler implements EventHandler { - public static final String MODULE = ServiceMultiEventHandler.class.getName(); + private static final String MODULE = ServiceMultiEventHandler.class.getName(); public static final String SYNC = "sync"; public static final String ASYNC = "async"; 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 3175b1e..5e2b772 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 @@ -39,7 +39,7 @@ import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; */ public class SimpleEventHandler implements EventHandler { - public static final String MODULE = SimpleEventHandler.class.getName(); + private static final String MODULE = SimpleEventHandler.class.getName(); /** Contains the property file name for translation of error messages. */ public static final String err_resource = "WebappUiLabels"; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/TestEvent.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/TestEvent.java index 8f3e878..5d7cbd0 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/TestEvent.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/TestEvent.java @@ -29,7 +29,7 @@ import org.apache.ofbiz.base.util.HttpClient; */ public class TestEvent { - public static final String MODULE = TestEvent.class.getName(); + private static final String MODULE = TestEvent.class.getName(); public static String test(HttpServletRequest request, HttpServletResponse response) { request.setAttribute("MESSAGE", "Test Event Ran Fine."); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java index 6bc7806..4799c2e 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java @@ -72,7 +72,7 @@ import org.xml.sax.XMLReader; */ public final class XmlRpcEventHandler extends XmlRpcHttpServer implements EventHandler { - public static final String MODULE = XmlRpcEventHandler.class.getName(); + private static final String MODULE = XmlRpcEventHandler.class.getName(); private LocalDispatcher dispatcher; private Boolean enabledForExtensions = null; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java index 3b92e92..fa25a67 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java @@ -36,7 +36,7 @@ import freemarker.template.TemplateTransformModel; */ public class CsrfTokenAjaxTransform implements TemplateTransformModel { - public static final String MODULE = CsrfTokenAjaxTransform.class.getName(); + private static final String MODULE = CsrfTokenAjaxTransform.class.getName(); @Override public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenPairNonAjaxTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenPairNonAjaxTransform.java index 12fc1a6..47f3de1 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenPairNonAjaxTransform.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/CsrfTokenPairNonAjaxTransform.java @@ -36,7 +36,7 @@ import freemarker.template.TemplateTransformModel; */ public class CsrfTokenPairNonAjaxTransform implements TemplateTransformModel { - public static final String MODULE = CsrfTokenPairNonAjaxTransform.class.getName(); + private static final String MODULE = CsrfTokenPairNonAjaxTransform.class.getName(); @Override public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java index a5e2d39..ed99e9e 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java @@ -44,7 +44,7 @@ import freemarker.template.TemplateException; */ public class FreeMarkerViewHandler extends AbstractViewHandler { - public static final String MODULE = FreeMarkerViewHandler.class.getName(); + private static final String MODULE = FreeMarkerViewHandler.class.getName(); protected Configuration config = (Configuration) FreeMarkerWorker.getDefaultOfbizConfig().clone(); @Override diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java index aa289d4..3ea78d0 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizAmountTransform.java @@ -32,7 +32,7 @@ import org.apache.ofbiz.base.util.UtilGenerics; */ public class OfbizAmountTransform extends OfbizNumberTransform { - public static final String MODULE = OfbizAmountTransform.class.getName(); + private static final String MODULE = OfbizAmountTransform.class.getName(); @Override public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) { 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 8ec1ad2..c88cb79 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 @@ -48,7 +48,7 @@ import freemarker.template.TemplateTransformModel; */ public class OfbizCurrencyTransform implements TemplateTransformModel { - public static final String MODULE = OfbizCurrencyTransform.class.getName(); + private static final String MODULE = OfbizCurrencyTransform.class.getName(); private static String getArg(Map<String, Object> args, String key) { String result = ""; 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 7e61d23..9fc9605 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 @@ -42,7 +42,7 @@ import org.apache.ofbiz.entity.Delegator; */ public class OfbizNumberTransform implements TemplateTransformModel { - public static final String MODULE = OfbizNumberTransform.class.getName(); + private static final String MODULE = OfbizNumberTransform.class.getName(); String format = null; private static String getArg(Map<String, Object> args, String key) { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java index 00cd06d..29b4907 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java @@ -36,7 +36,7 @@ import freemarker.template.TemplateTransformModel; */ public class RenderWrappedTextTransform implements TemplateTransformModel { - public static final String MODULE = RenderWrappedTextTransform.class.getName(); + private static final String MODULE = RenderWrappedTextTransform.class.getName(); @Override public Writer getWriter(final Writer out, @SuppressWarnings("rawtypes") Map args) { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTemplateListTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTemplateListTransform.java index 7c9bf4d..f8c67fa 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTemplateListTransform.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTemplateListTransform.java @@ -36,7 +36,7 @@ import freemarker.template.TemplateTransformModel; */ public class ScriptTemplateListTransform implements TemplateTransformModel { - public static final String MODULE = CsrfTokenAjaxTransform.class.getName(); + private static final String MODULE = CsrfTokenAjaxTransform.class.getName(); @Override public Writer getWriter(Writer out, @SuppressWarnings("rawtypes") Map args) diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetContextFieldTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetContextFieldTransform.java index 68b450e..57fc2d5 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetContextFieldTransform.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetContextFieldTransform.java @@ -36,7 +36,7 @@ import freemarker.template.TemplateScalarModel; */ public class SetContextFieldTransform implements TemplateMethodModelEx { - public static final String MODULE = SetContextFieldTransform.class.getName(); + private static final String MODULE = SetContextFieldTransform.class.getName(); @Override public Object exec(@SuppressWarnings("rawtypes") List args) throws TemplateModelException { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java index a769bc9..60d923e 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/SetRequestAttributeMethod.java @@ -35,7 +35,7 @@ import freemarker.template.TemplateScalarModel; */ public class SetRequestAttributeMethod implements TemplateMethodModelEx { - public static final String MODULE = SetRequestAttributeMethod.class.getName(); + private static final String MODULE = SetRequestAttributeMethod.class.getName(); @Override public Object exec(@SuppressWarnings("rawtypes") List args) throws TemplateModelException { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java index 2c35721..5da1588 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java @@ -47,7 +47,7 @@ import com.ibm.icu.util.Calendar; */ public class ServerHitBin { // Debug MODULE name - public static final String MODULE = ServerHitBin.class.getName(); + private static final String MODULE = ServerHitBin.class.getName(); public static final int REQUEST = 1; public static final int EVENT = 2; 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 324d531..769a71d 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 @@ -43,7 +43,7 @@ import org.apache.ofbiz.entity.util.EntityUtilProperties; */ public class VisitHandler { // Debug MODULE name - public static final String MODULE = VisitHandler.class.getName(); + private static final String MODULE = VisitHandler.class.getName(); public static final String visitorCookieName = "OFBiz.Visitor"; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java index 9f2c3e0..9fc80c9 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/taglib/ContentUrlTag.java @@ -34,7 +34,7 @@ import org.apache.ofbiz.webapp.website.WebSiteWorker; */ public class ContentUrlTag { - public static final String MODULE = ContentUrlTag.class.getName(); + private static final String MODULE = ContentUrlTag.class.getName(); public static void appendContentPrefix(HttpServletRequest request, StringBuilder urlBuffer) { try { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java index 0a1cdf5..669ff79 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java @@ -53,7 +53,7 @@ import org.apache.ofbiz.base.util.UtilValidate; public final class ApacheFopWorker { - public static final String MODULE = ApacheFopWorker.class.getName(); + private static final String MODULE = ApacheFopWorker.class.getName(); /** File name prefix used for temporary files. Currently set to * <code>org.apache.ofbiz.webapp.view.ApacheFopWorker-</code>. */ 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 4e33676..75ed77c 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 @@ -34,7 +34,7 @@ import org.apache.ofbiz.base.util.UtilValidate; */ public class HttpViewHandler extends AbstractViewHandler { - public static final String MODULE = HttpViewHandler.class.getName(); + private static final String MODULE = HttpViewHandler.class.getName(); @Override public void init(ServletContext context) throws ViewHandlerException { diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java index 67ff931..e6cef63 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java @@ -36,7 +36,7 @@ import org.apache.ofbiz.webapp.control.ControlFilter; */ public class JspViewHandler extends AbstractViewHandler { - public static final String MODULE = JspViewHandler.class.getName(); + private static final String MODULE = JspViewHandler.class.getName(); protected ServletContext context; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java index b45d8e7..3617ee4 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java @@ -36,7 +36,7 @@ import org.apache.ofbiz.webapp.control.ConfigXMLReader; */ public class ViewFactory { - public static final String MODULE = ViewFactory.class.getName(); + private static final String MODULE = ViewFactory.class.getName(); private final Map<String, ViewHandler> handlers = new HashMap<>(); diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java index 9e960b5..947bfba 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/ResponseHelper.java @@ -33,7 +33,7 @@ import org.w3c.dom.Element; * working with WebDAV requests and responses.*/ public class ResponseHelper { - public static final String MODULE = ResponseHelper.class.getName(); + private static final String MODULE = ResponseHelper.class.getName(); public static final String DAV_NAMESPACE_URI = "DAV:"; public static final String STATUS_200 = "HTTP/1.1 200 OK"; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavServlet.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavServlet.java index 0781def..31a3e52 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavServlet.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavServlet.java @@ -49,7 +49,7 @@ import org.apache.ofbiz.service.ServiceContainer; @SuppressWarnings("serial") public class WebDavServlet extends GenericServlet { - public static final String MODULE = WebDavServlet.class.getName(); + private static final String MODULE = WebDavServlet.class.getName(); protected Delegator delegator = null; protected LocalDispatcher dispatcher = null; 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 e9abd06..26a8b39 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 @@ -43,7 +43,7 @@ import org.xml.sax.SAXException; /** Utility methods needed to implement a WebDAV servlet. */ public final class WebDavUtil { - public static final String MODULE = WebDavUtil.class.getName(); + private static final String MODULE = WebDavUtil.class.getName(); private static final TimeZone GMT_TIMEZONE = TimeZone.getTimeZone("GMT"); private static final String RFC1123_DATE_FORMAT = "EEE, dd MMM yyyy HH:mm:ss zzz"; diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteWorker.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteWorker.java index 4d7a695..9118ea2 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteWorker.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteWorker.java @@ -32,7 +32,7 @@ import org.apache.ofbiz.entity.util.EntityQuery; */ public final class WebSiteWorker { - public static final String MODULE = WebSiteWorker.class.getName(); + private static final String MODULE = WebSiteWorker.class.getName(); private WebSiteWorker() {} diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java index 7354889..fb9c1d8 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/GenericWebEvent.java @@ -48,7 +48,7 @@ import org.apache.ofbiz.security.Security; */ public class GenericWebEvent { - public static final String MODULE = GenericWebEvent.class.getName(); + private static final String MODULE = GenericWebEvent.class.getName(); public static final String err_resource = "WebtoolsErrorUiLabels"; /** An HTTP WebEvent handler that updates a Generic entity 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 d479911..f80b07c 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 @@ -102,7 +102,7 @@ import org.xml.sax.SAXException; public class WebToolsServices { - public static final String MODULE = WebToolsServices.class.getName(); + private static final String MODULE = WebToolsServices.class.getName(); public static final String resource = "WebtoolsUiLabels"; public static Map<String, Object> entityImport(DispatchContext dctx, Map<String, ? extends Object> context) { diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java index c19ed5b..1f4a6ce 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java @@ -62,7 +62,7 @@ import org.xml.sax.SAXException; public class ArtifactInfoFactory { - public static final String MODULE = ArtifactInfoFactory.class.getName(); + private static final String MODULE = ArtifactInfoFactory.class.getName(); private static final UtilCache<String, ArtifactInfoFactory> artifactInfoFactoryCache = UtilCache.createUtilCache("ArtifactInfoFactory"); diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java index 337a75d..a919573 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java @@ -36,7 +36,7 @@ import org.apache.ofbiz.webapp.control.ConfigXMLReader; * */ public class ControllerRequestArtifactInfo extends ArtifactInfoBase { - public static final String MODULE = ControllerRequestArtifactInfo.class.getName(); + private static final String MODULE = ControllerRequestArtifactInfo.class.getName(); protected URL controllerXmlUrl; protected String requestUri; diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java index a1075da..bd2bb22 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java @@ -33,7 +33,7 @@ import org.apache.ofbiz.webapp.control.ConfigXMLReader; * */ public class ControllerViewArtifactInfo extends ArtifactInfoBase { - public static final String MODULE = ControllerViewArtifactInfo.class.getName(); + private static final String MODULE = ControllerViewArtifactInfo.class.getName(); protected URL controllerXmlUrl; protected String viewUri; diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java index c86721f..49e52e0 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java @@ -42,7 +42,7 @@ import org.xml.sax.SAXException; * */ public class FormWidgetArtifactInfo extends ArtifactInfoBase { - public static final String MODULE = FormWidgetArtifactInfo.class.getName(); + private static final String MODULE = FormWidgetArtifactInfo.class.getName(); protected ModelForm modelForm; diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java index 957c500..07cf33b 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java @@ -34,7 +34,7 @@ import org.apache.ofbiz.testtools.TestRunContainer; */ public class RunTestEvents { - public static final String MODULE = RunTestEvents.class.getName(); + private static final String MODULE = RunTestEvents.class.getName(); public static String runTest(HttpServletRequest request, HttpServletResponse response) throws ContainerException { diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java index f795eff..e60dc43 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java @@ -41,7 +41,7 @@ import org.xml.sax.SAXException; * */ public class ScreenWidgetArtifactInfo extends ArtifactInfoBase { - public static final String MODULE = ScreenWidgetArtifactInfo.class.getName(); + private static final String MODULE = ScreenWidgetArtifactInfo.class.getName(); protected ModelScreen modelScreen; diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java index ddc2e2e..4b44550 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java @@ -54,7 +54,7 @@ import org.apache.ofbiz.service.group.ServiceGroupReader; * */ public class ServiceArtifactInfo extends ArtifactInfoBase { - public static final String MODULE = ServiceArtifactInfo.class.getName(); + private static final String MODULE = ServiceArtifactInfo.class.getName(); protected ModelService modelService; protected String displayPrefix = null; diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelFile.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelFile.java index 6001113..15857e2 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelFile.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelFile.java @@ -21,7 +21,7 @@ package org.apache.ofbiz.webtools.labelmanager; import java.io.File; public class LabelFile { - public static final String MODULE = LabelFile.class.getName(); + private static final String MODULE = LabelFile.class.getName(); protected final boolean fileLoaded = false; protected final File file; diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelInfo.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelInfo.java index 478009b..83bc7e8 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelInfo.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelInfo.java @@ -26,7 +26,7 @@ import org.apache.ofbiz.base.util.UtilValidate; public class LabelInfo { - public static final String MODULE = LabelInfo.class.getName(); + private static final String MODULE = LabelInfo.class.getName(); protected String labelKey = ""; protected String labelKeyComment = ""; diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java index 48209a8..604d855 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java @@ -47,7 +47,7 @@ import org.xml.sax.SAXException; public class LabelManagerFactory { - public static final String MODULE = LabelManagerFactory.class.getName(); + private static final String MODULE = LabelManagerFactory.class.getName(); public static final String resource = "WebtoolsUiLabels"; public static final String keySeparator = "#"; diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java index 51e03a8..b50e34c 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java @@ -55,7 +55,7 @@ import org.xml.sax.SAXException; public class LabelReferences { - public static final String MODULE = LabelReferences.class.getName(); + private static final String MODULE = LabelReferences.class.getName(); private static final String bracketedUiLabelMap = "${uiLabelMap."; private static final String uiLabelMap = "uiLabelMap."; private static final String formFieldTitle = "FormFieldTitle_"; diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelValue.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelValue.java index 0df1a3d..aa64e28 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelValue.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelValue.java @@ -20,7 +20,7 @@ package org.apache.ofbiz.webtools.labelmanager; public class LabelValue { - public static final String MODULE = LabelValue.class.getName(); + private static final String MODULE = LabelValue.class.getName(); protected String labelValue = ""; protected String labelComment = ""; diff --git a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java index 5a6a55f..d8a4c9d 100644 --- a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java +++ b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/print/FoPrintServerEvents.java @@ -48,7 +48,7 @@ import org.apache.ofbiz.widget.renderer.macro.MacroScreenRenderer; public class FoPrintServerEvents { - public static final String MODULE = FoPrintServerEvents.class.getName(); + private static final String MODULE = FoPrintServerEvents.class.getName(); public static String getXslFo(HttpServletRequest req, HttpServletResponse resp) { LocalDispatcher dispatcher = (LocalDispatcher) req.getAttribute("dispatcher"); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java index 930c6b1..1de1d1b 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java @@ -41,7 +41,7 @@ import org.w3c.dom.Element; */ public class WidgetFactory { - public static final String MODULE = WidgetFactory.class.getName(); + private static final String MODULE = WidgetFactory.class.getName(); protected static final Map<String, Constructor<? extends ModelScreenWidget>> screenWidgets = new ConcurrentHashMap<>(); static { diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java index 1bd7088..13ae707 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetWorker.java @@ -43,7 +43,7 @@ import org.jsoup.parser.Parser; public final class WidgetWorker { - public static final String MODULE = WidgetWorker.class.getName(); + private static final String MODULE = WidgetWorker.class.getName(); private WidgetWorker () {} diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/GenericWidgetOutput.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/GenericWidgetOutput.java index aa8f079..5818b9e 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/GenericWidgetOutput.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/GenericWidgetOutput.java @@ -20,7 +20,7 @@ package org.apache.ofbiz.widget.cache; public class GenericWidgetOutput { - public static final String MODULE = GenericWidgetOutput.class.getName(); + private static final String MODULE = GenericWidgetOutput.class.getName(); protected String output; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/ScreenCache.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/ScreenCache.java index 7d29b04..d4f6e5c 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/ScreenCache.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/ScreenCache.java @@ -22,7 +22,7 @@ import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.cache.UtilCache; public class ScreenCache extends AbstractCache { - public static final String MODULE = ScreenCache.class.getName(); + private static final String MODULE = ScreenCache.class.getName(); public ScreenCache() { super("screen"); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/WidgetContextCacheKey.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/WidgetContextCacheKey.java index 5749a2e..050a67f 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/WidgetContextCacheKey.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/cache/WidgetContextCacheKey.java @@ -31,7 +31,7 @@ import org.apache.ofbiz.base.util.UtilMisc; public final class WidgetContextCacheKey { - public static final String MODULE = WidgetContextCacheKey.class.getName(); + private static final String MODULE = WidgetContextCacheKey.class.getName(); private static Set<String> fieldNamesToSkip = createFieldNamesToSkip(); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/content/WidgetContentWorker.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/content/WidgetContentWorker.java index d3e3520..d37ab78 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/content/WidgetContentWorker.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/content/WidgetContentWorker.java @@ -24,7 +24,7 @@ import org.apache.ofbiz.base.util.Debug; * WidgetContentWorker Class */ public final class WidgetContentWorker { - public static final String MODULE = WidgetContentWorker.class.getName(); + private static final String MODULE = WidgetContentWorker.class.getName(); private static ContentWorkerInterface contentWorker = null; private WidgetContentWorker () {} diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/content/WidgetDataResourceWorker.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/content/WidgetDataResourceWorker.java index 9c1c037..4a8980a 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/content/WidgetDataResourceWorker.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/content/WidgetDataResourceWorker.java @@ -24,7 +24,7 @@ import org.apache.ofbiz.base.util.Debug; * WidgetContentWorker Class */ public final class WidgetDataResourceWorker { - public static final String MODULE = WidgetDataResourceWorker.class.getName(); + private static final String MODULE = WidgetDataResourceWorker.class.getName(); private WidgetDataResourceWorker() {} private static DataResourceWorkerInterface dataresourceWorker = null; static { 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 e217935..c8dc285 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 @@ -80,7 +80,7 @@ public abstract class AbstractModelAction implements Serializable, ModelAction { * */ - public static final String MODULE = AbstractModelAction.class.getName(); + private static final String MODULE = AbstractModelAction.class.getName(); /** * Returns a new <code>ModelAction</code> instance, built from <code>actionElement</code>. diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java index 24357d4..d3f31d3 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java @@ -72,7 +72,7 @@ public abstract class AbstractModelCondition implements Serializable, ModelCondi * */ - public static final String MODULE = AbstractModelCondition.class.getName(); + private static final String MODULE = AbstractModelCondition.class.getName(); public static final ModelConditionFactory DEFAULT_CONDITION_FACTORY = new DefaultConditionFactory(); public static List<ModelCondition> readSubConditions(ModelConditionFactory factory, ModelWidget modelWidget, diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java index e339858..573290c 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java @@ -52,7 +52,7 @@ import org.w3c.dom.Element; */ public final class CommonWidgetModels { - public static final String MODULE = CommonWidgetModels.class.getName(); + private static final String MODULE = CommonWidgetModels.class.getName(); private CommonWidgetModels() { } diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FieldInfo.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FieldInfo.java index 099a9d7..0284688 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FieldInfo.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FieldInfo.java @@ -35,7 +35,7 @@ import org.w3c.dom.Element; */ public abstract class FieldInfo { - public static final String MODULE = FieldInfo.class.getName(); + private static final String MODULE = FieldInfo.class.getName(); public static final int DISPLAY = 1; public static final int HYPERLINK = 2; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java index e957587..2902573 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java @@ -45,7 +45,7 @@ import org.xml.sax.SAXException; */ public class FormFactory { - public static final String MODULE = FormFactory.class.getName(); + private static final String MODULE = FormFactory.class.getName(); private static final UtilCache<String, ModelForm> formLocationCache = UtilCache.createUtilCache("widget.form.locationResource", 0, 0, false); private static final UtilCache<String, ModelForm> formWebappCache = UtilCache.createUtilCache("widget.form.webappResource", 0, 0, false); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/GridFactory.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/GridFactory.java index a7e7653..a4a92e3 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/GridFactory.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/GridFactory.java @@ -47,7 +47,7 @@ import org.xml.sax.SAXException; */ public class GridFactory { - public static final String MODULE = GridFactory.class.getName(); + private static final String MODULE = GridFactory.class.getName(); private static final UtilCache<String, ModelGrid> gridLocationCache = UtilCache.createUtilCache("widget.grid.locationResource", 0, 0, false); private static final UtilCache<String, ModelGrid> gridWebappCache = UtilCache.createUtilCache("widget.grid.webappResource", 0, 0, false); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java index 36d4742..13449db 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java @@ -60,7 +60,7 @@ import freemarker.template.Version; */ @SuppressWarnings("serial") public class HtmlWidget extends ModelScreenWidget { - public static final String MODULE = HtmlWidget.class.getName(); + private static final String MODULE = HtmlWidget.class.getName(); private static final UtilCache<String, Template> specialTemplateCache = UtilCache.createUtilCache("widget.screen.template.ftl.general", 0, 0, false); protected static final Configuration specialConfig = FreeMarkerWorker.makeConfiguration(new ExtendedWrapper(FreeMarkerWorker.VERSION)); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java index 6131cd1..e00d236 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java @@ -54,7 +54,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public class IterateSectionWidget extends ModelScreenWidget { - public static final String MODULE = IterateSectionWidget.class.getName(); + private static final String MODULE = IterateSectionWidget.class.getName(); public static final int DEFAULT_PAGE_SIZE = 5; public static final int MAX_PAGE_SIZE = 10000; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MenuFactory.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MenuFactory.java index f360b4f..7281181 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MenuFactory.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MenuFactory.java @@ -43,7 +43,7 @@ import org.xml.sax.SAXException; */ public class MenuFactory { - public static final String MODULE = MenuFactory.class.getName(); + private static final String MODULE = MenuFactory.class.getName(); public static final UtilCache<String, Map<String, ModelMenu>> menuWebappCache = UtilCache.createUtilCache("widget.menu.webappResource", 0, 0, false); public static final UtilCache<String, Map<String, ModelMenu>> menuLocationCache = UtilCache.createUtilCache("widget.menu.locationResource", 0, 0, false); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java index 35fe98f..dcff3eb 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java @@ -81,7 +81,7 @@ public abstract class ModelForm extends ModelWidget { * */ - public static final String MODULE = ModelForm.class.getName(); + private static final String MODULE = ModelForm.class.getName(); public static final String DEFAULT_FORM_RESULT_LIST_NAME = "defaultFormResultList"; /** Pagination settings and defaults. */ public static final int DEFAULT_PAGE_SIZE = 10; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormAction.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormAction.java index 450de22..efb3caa 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormAction.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormAction.java @@ -42,7 +42,7 @@ import org.w3c.dom.Element; */ public abstract class ModelFormAction { - public static final String MODULE = ModelFormAction.class.getName(); + private static final String MODULE = ModelFormAction.class.getName(); public static List<ModelAction> readSubActions(ModelForm modelForm, Element parentElement) { List<? extends Element> actionElementList = UtilXml.childElementList(parentElement); 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 10e5383..53c8783 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 @@ -105,7 +105,7 @@ public class ModelFormField { * */ - public static final String MODULE = ModelFormField.class.getName(); + private static final String MODULE = ModelFormField.class.getName(); /** * Constructs a form field model from a builder specification. diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java index 6e27a47..dfde8c2 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java @@ -71,7 +71,7 @@ import org.w3c.dom.Element; */ public class ModelFormFieldBuilder { - public static final String MODULE = ModelFormFieldBuilder.class.getName(); + private static final String MODULE = ModelFormFieldBuilder.class.getName(); private FlexibleStringExpander action = FlexibleStringExpander.getInstance(""); private String attributeName = ""; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelGrid.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelGrid.java index e8fca12..147d51d0 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelGrid.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelGrid.java @@ -52,7 +52,7 @@ public class ModelGrid extends ModelForm { * */ - public static final String MODULE = ModelGrid.class.getName(); + private static final String MODULE = ModelGrid.class.getName(); /** XML Constructor */ public ModelGrid(Element formElement, String formLocation, ModelReader entityModelReader, diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenu.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenu.java index 42382fc..1c76c3c 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenu.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenu.java @@ -56,7 +56,7 @@ public class ModelMenu extends ModelWidget { * */ - public static final String MODULE = ModelMenu.class.getName(); + private static final String MODULE = ModelMenu.class.getName(); private final List<ModelAction> actions; private final String defaultAlign; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java index 1a7a266..4bc95d1 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuAction.java @@ -45,7 +45,7 @@ import org.w3c.dom.Element; */ public abstract class ModelMenuAction { - public static final String MODULE = ModelMenuAction.class.getName(); + private static final String MODULE = ModelMenuAction.class.getName(); public static List<ModelAction> readSubActions(ModelMenu modelMenu, Element parentElement) { List<? extends Element> actionElementList = UtilXml.childElementList(parentElement); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuCondition.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuCondition.java index c56008b..96a2095 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuCondition.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuCondition.java @@ -42,7 +42,7 @@ public final class ModelMenuCondition { * */ - public static final String MODULE = ModelMenuCondition.class.getName(); + private static final String MODULE = ModelMenuCondition.class.getName(); private final FlexibleStringExpander passStyleExdr; private final FlexibleStringExpander failStyleExdr; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java index 1d8b2d1..0e2aa29 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java @@ -62,7 +62,7 @@ public class ModelMenuItem extends ModelWidget { * */ - public static final String MODULE = ModelMenuItem.class.getName(); + private static final String MODULE = ModelMenuItem.class.getName(); private final List<ModelAction> actions; private final String align; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreen.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreen.java index 7a46e78..4ac12d1 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreen.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreen.java @@ -41,7 +41,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public class ModelScreen extends ModelWidget { - public static final String MODULE = ModelScreen.class.getName(); + private static final String MODULE = ModelScreen.class.getName(); private final String sourceLocation; private final FlexibleStringExpander transactionTimeoutExdr; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenCondition.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenCondition.java index 5f6cca6..44a6f36 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenCondition.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenCondition.java @@ -47,7 +47,7 @@ public final class ModelScreenCondition { * */ - public static final String MODULE = ModelScreenCondition.class.getName(); + private static final String MODULE = ModelScreenCondition.class.getName(); public static final ModelConditionFactory SCREEN_CONDITION_FACTORY = new ScreenConditionFactory(); public static class IfEmptySection extends AbstractModelCondition { diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java index d0af494..75d84cc 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java @@ -65,7 +65,7 @@ import org.xml.sax.SAXException; */ @SuppressWarnings("serial") public abstract class ModelScreenWidget extends ModelWidget { - public static final String MODULE = ModelScreenWidget.class.getName(); + private static final String MODULE = ModelScreenWidget.class.getName(); private final ModelScreen modelScreen; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelSingleForm.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelSingleForm.java index 4e3ca1f..1e98d5e 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelSingleForm.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelSingleForm.java @@ -52,7 +52,7 @@ public class ModelSingleForm extends ModelForm { * */ - public static final String MODULE = ModelSingleForm.class.getName(); + private static final String MODULE = ModelSingleForm.class.getName(); /** XML Constructor */ public ModelSingleForm(Element formElement, String formLocation, ModelReader entityModelReader, diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java index 708f818..429e5aa 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java @@ -42,7 +42,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public class ModelTheme implements Serializable { - public static final String MODULE = ModelTheme.class.getName(); + private static final String MODULE = ModelTheme.class.getName(); //generic properties private final String name; private final Map<String, VisualTheme> visualThemes; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java index dac9964..46f38ae 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTree.java @@ -78,7 +78,7 @@ public class ModelTree extends ModelWidget { * */ - public static final String MODULE = ModelTree.class.getName(); + private static final String MODULE = ModelTree.class.getName(); private final String defaultEntityName; private final String defaultRenderStyle; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTreeAction.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTreeAction.java index 5f7d57a..e07a59c 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTreeAction.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTreeAction.java @@ -68,7 +68,7 @@ public abstract class ModelTreeAction extends AbstractModelAction { * */ - public static final String MODULE = ModelTreeAction.class.getName(); + private static final String MODULE = ModelTreeAction.class.getName(); public static List<ModelAction> readNodeActions(ModelNode modelNode, Element actionsElement) { List<? extends Element> actionElementList = UtilXml.childElementList(actionsElement); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTreeCondition.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTreeCondition.java index 02e0ce2..2b450d7 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTreeCondition.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTreeCondition.java @@ -26,7 +26,7 @@ import org.w3c.dom.Element; * @see <code>widget-tree.xsd</code> */ public class ModelTreeCondition { - public static final String MODULE = ModelTreeCondition.class.getName(); + private static final String MODULE = ModelTreeCondition.class.getName(); private final ModelCondition condition; public ModelTreeCondition(ModelTree modelTree, Element conditionElement) { diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidget.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidget.java index f4e6202..b9e1291 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidget.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidget.java @@ -33,7 +33,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public abstract class ModelWidget implements Serializable { - public static final String MODULE = ModelWidget.class.getName(); + private static final String MODULE = ModelWidget.class.getName(); /** * The parameter name used to control widget boundary comments. Currently * set to "widgetVerbose". diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java index 7c028b6..a70e5c7 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java @@ -72,7 +72,7 @@ public abstract class ModelWidgetCondition implements Serializable { * */ - public static final String MODULE = ModelWidgetCondition.class.getName(); + private static final String MODULE = ModelWidgetCondition.class.getName(); public static final ConditionFactory DEFAULT_CONDITION_FACTORY = new DefaultConditionFactory(); private final ModelWidget modelWidget; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScreenFactory.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScreenFactory.java index f772fa3..ef83286 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScreenFactory.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScreenFactory.java @@ -46,7 +46,7 @@ import org.xml.sax.SAXException; */ public class ScreenFactory { - public static final String MODULE = ScreenFactory.class.getName(); + private static final String MODULE = ScreenFactory.class.getName(); public static final UtilCache<String, Map<String, ModelScreen>> screenLocationCache = UtilCache.createUtilCache("widget.screen.locationResource", 0, 0, false); public static final UtilCache<String, Map<String, ModelScreen>> screenWebappCache = UtilCache.createUtilCache("widget.screen.webappResource", 0, 0, false); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java index b7c190e..f1a854d 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ThemeFactory.java @@ -54,7 +54,7 @@ import org.xml.sax.SAXException; */ public class ThemeFactory { - public static final String MODULE = ThemeFactory.class.getName(); + private static final String MODULE = ThemeFactory.class.getName(); private static final UtilCache<String, ModelTheme> themeLocationCache = UtilCache.createUtilCache("widget.theme.locationResource", 0, 0, false); private static final UtilCache<String, VisualTheme> themeVisualThemeIdCache = UtilCache.createUtilCache("widget.theme.idAndVisualTheme", 0, 0, false); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/TreeFactory.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/TreeFactory.java index dd22aa8..5bc5e0e 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/TreeFactory.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/TreeFactory.java @@ -40,7 +40,7 @@ import org.xml.sax.SAXException; */ public class TreeFactory { - public static final String MODULE = TreeFactory.class.getName(); + private static final String MODULE = TreeFactory.class.getName(); public static final UtilCache<String, Map<String, ModelTree>> treeLocationCache = UtilCache.createUtilCache("widget.tree.locationResource", 0, 0, false); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/XmlWidgetActionVisitor.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/XmlWidgetActionVisitor.java index b098bf3..1c0e050 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/XmlWidgetActionVisitor.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/XmlWidgetActionVisitor.java @@ -38,7 +38,7 @@ import org.apache.ofbiz.widget.model.ModelFormAction.CallParentActions; */ public class XmlWidgetActionVisitor extends XmlAbstractWidgetVisitor implements ModelActionVisitor { - public static final String MODULE = XmlWidgetActionVisitor.class.getName(); + private static final String MODULE = XmlWidgetActionVisitor.class.getName(); public XmlWidgetActionVisitor(Appendable writer) { super(writer); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java index 3e9ea6e..971bb8f 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java @@ -42,7 +42,7 @@ import org.apache.ofbiz.widget.WidgetWorker; */ public class PortalPageWorker { - public static final String MODULE = PortalPageWorker.class.getName(); + private static final String MODULE = PortalPageWorker.class.getName(); public PortalPageWorker() { } diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java index 75ea28d..49889aa 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java @@ -74,7 +74,7 @@ public class FormRenderer { * */ - public static final String MODULE = FormRenderer.class.getName(); + private static final String MODULE = FormRenderer.class.getName(); public static String getCurrentContainerId(ModelForm modelForm, Map<String, Object> context) { Locale locale = UtilMisc.ensureLocale(context.get("locale")); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java index 7a4c9b5..3308b19 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java @@ -68,7 +68,7 @@ import freemarker.template.TransformControl; */ public class MenuWrapTransform implements TemplateTransformModel { - public static final String MODULE = MenuWrapTransform.class.getName(); + private static final String MODULE = MenuWrapTransform.class.getName(); public static final String [] upSaveKeyNames = {"globalNodeTrail"}; public static final String [] saveKeyNames = {"contentId", "subContentId", "subDataResourceTypeId", "mimeTypeId", "whenMap", "locale", "wrapTemplateId", "encloseWrapText", "nullThruDatesOnly", "renderOnStart", "renderOnClose", "menuDefFile", "menuName", "associatedContentId", "wrapperClassName"}; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java index 66f6862..920d6df 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java @@ -40,7 +40,7 @@ import org.apache.ofbiz.widget.model.ModelForm; */ public final class Paginator { - public static final String MODULE = Paginator.class.getName(); + private static final String MODULE = Paginator.class.getName(); public static int getActualPageSize(Map<String, Object> context) { Integer value = (Integer) context.get("actualPageSize"); diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java index 6aefc47..9f4bd7e 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java @@ -72,7 +72,7 @@ import freemarker.ext.servlet.ServletContextHashModel; */ public class ScreenRenderer { - public static final String MODULE = ScreenRenderer.class.getName(); + private static final String MODULE = ScreenRenderer.class.getName(); protected Appendable writer; protected MapStack<String> context; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java index b89e3e3..0ed4f70 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java @@ -33,7 +33,7 @@ import org.apache.ofbiz.entity.model.ModelReader; */ public final class UtilHelpText { - public static final String MODULE = UtilHelpText.class.getName(); + private static final String MODULE = UtilHelpText.class.getName(); private UtilHelpText () {} diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/VisualTheme.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/VisualTheme.java index b4791a9..9d37d50 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/VisualTheme.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/VisualTheme.java @@ -35,7 +35,7 @@ import org.w3c.dom.Element; @SuppressWarnings("serial") public final class VisualTheme implements Serializable { - public static final String MODULE = VisualTheme.class.getName(); + private static final String MODULE = VisualTheme.class.getName(); private ModelTheme modelTheme; private final String visualThemeId; private final List<String> screenshots; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java index 6357ec3..e6235e3 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/fo/FoFormRenderer.java @@ -65,7 +65,7 @@ import org.apache.ofbiz.widget.renderer.macro.MacroScreenRenderer; */ public class FoFormRenderer extends HtmlWidgetRenderer implements FormStringRenderer { - public static final String MODULE = FoFormRenderer.class.getName(); + private static final String MODULE = FoFormRenderer.class.getName(); HttpServletRequest request; HttpServletResponse response; 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 9091992..d1036a8 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 @@ -60,7 +60,7 @@ import freemarker.template.TemplateException; * This handler will use JPublish to generate the XSL-FO */ public class ScreenFopViewHandler extends AbstractViewHandler { - public static final String MODULE = ScreenFopViewHandler.class.getName(); + private static final String MODULE = ScreenFopViewHandler.class.getName(); protected static final String DEFAULT_ERROR_TEMPLATE = "component://common/widget/CommonScreens.xml#FoError"; protected ServletContext servletContext = null; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java index d83d62c..3230e06 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java @@ -45,7 +45,7 @@ import org.xml.sax.SAXException; */ public class HtmlMenuWrapper { - public static final String MODULE = HtmlMenuWrapper.class.getName(); + private static final String MODULE = HtmlMenuWrapper.class.getName(); protected String resourceName; protected String menuName; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapperImage.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapperImage.java index ef6c647..31dd6bb 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapperImage.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapperImage.java @@ -39,7 +39,7 @@ import org.xml.sax.SAXException; */ public class HtmlMenuWrapperImage extends HtmlMenuWrapper { - public static final String MODULE = HtmlMenuWrapperImage.class.getName(); + private static final String MODULE = HtmlMenuWrapperImage.class.getName(); protected HtmlMenuWrapperImage() {} diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java index d0512c8..45976c7 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java @@ -50,7 +50,7 @@ import freemarker.template.TemplateException; public class HtmlTreeRenderer extends HtmlWidgetRenderer implements TreeStringRenderer { ScreenStringRenderer screenStringRenderer = null; - public static final String MODULE = HtmlTreeRenderer.class.getName(); + private static final String MODULE = HtmlTreeRenderer.class.getName(); public HtmlTreeRenderer() {} diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlWidgetRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlWidgetRenderer.java index 047037e..7a63054 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlWidgetRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlWidgetRenderer.java @@ -28,7 +28,7 @@ import org.apache.ofbiz.widget.model.ModelWidget; * is a base class that is extended by other widget HTML rendering classes. */ public class HtmlWidgetRenderer { - public static final String MODULE = HtmlWidgetRenderer.class.getName(); + private static final String MODULE = HtmlWidgetRenderer.class.getName(); /** * Characters that are appended to the end of each rendered element. Currently set to diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java index cfa6152..a87a573 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java @@ -107,7 +107,7 @@ import freemarker.template.TemplateException; */ public final class MacroFormRenderer implements FormStringRenderer { - public static final String MODULE = MacroFormRenderer.class.getName(); + private static final String MODULE = MacroFormRenderer.class.getName(); private final Template macroLibrary; private final WeakHashMap<Appendable, Environment> environments = new WeakHashMap<>(); private final UtilCodec.SimpleEncoder internalEncoder; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java index 67e1fcd..afee332 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java @@ -54,7 +54,7 @@ import freemarker.template.TemplateException; public class MacroMenuRenderer implements MenuStringRenderer { - public static final String MODULE = MacroMenuRenderer.class.getName(); + private static final String MODULE = MacroMenuRenderer.class.getName(); private int macroCount = 999; private final Map<Appendable, Environment> environments = new HashMap<>(); private final Template macroLibrary; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java index 7cd5040..a8cf74e 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java @@ -71,7 +71,7 @@ import freemarker.template.TemplateException; public class MacroScreenRenderer implements ScreenStringRenderer { - public static final String MODULE = MacroScreenRenderer.class.getName(); + private static final String MODULE = MacroScreenRenderer.class.getName(); private Template macroLibrary; private WeakHashMap<Appendable, Environment> environments = new WeakHashMap<>(); private String rendererName; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java index 89a820d..1a1b41e 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenViewHandler.java @@ -49,7 +49,7 @@ import freemarker.template.utility.StandardCompress; public class MacroScreenViewHandler extends AbstractViewHandler { - public static final String MODULE = MacroScreenViewHandler.class.getName(); + private static final String MODULE = MacroScreenViewHandler.class.getName(); protected ServletContext servletContext = null; diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java index d4e60ee..9e8148b 100644 --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java @@ -53,7 +53,7 @@ import freemarker.template.TemplateException; */ public class MacroTreeRenderer implements TreeStringRenderer { - public static final String MODULE = MacroTreeRenderer.class.getName(); + private static final String MODULE = MacroTreeRenderer.class.getName(); private Template macroLibrary; private Environment environment; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |