You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ar...@apache.org on 2016/07/01 15:53:19 UTC
svn commit: r1750969 -
/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java
Author: arunpatidar
Date: Fri Jul 1 15:53:19 2016
New Revision: 1750969
URL: http://svn.apache.org/viewvc?rev=1750969&view=rev
Log:
Applied patch from jira issue - OFBIZ-7591 - Enforce noninstantiability to UtilJavaParse class. Thanks Rishi Solanki and Rohit Koushal for your contribution.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java?rev=1750969&r1=1750968&r2=1750969&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilJavaParse.java Fri Jul 1 15:53:19 2016
@@ -32,10 +32,66 @@ import org.ofbiz.base.component.Componen
* NOTE: the approach here is not the best and it may be better to use a parser, line one based on antlr, or using a Java Bytecode parser to look at .class files.
*
*/
-public class UtilJavaParse {
+public final class UtilJavaParse {
public static final String module = UtilJavaParse.class.getName();
+ // FIXME: Not thread safe
+ private static Set<String> serviceMethodNames = new HashSet<String>();
+ private static Set<String> entityMethodNames = new HashSet<String>();
+ static {
+ serviceMethodNames.add("runSync");
+ serviceMethodNames.add("runSyncIgnore");
+ serviceMethodNames.add("runAsync");
+ serviceMethodNames.add("runAsyncWait");
+ serviceMethodNames.add("registerCallback");
+ serviceMethodNames.add("schedule"); // NOTE: the service name may be the 1st, 2nd or 3rd param for variations on this
+ serviceMethodNames.add("addRollbackService");
+ serviceMethodNames.add("addCommitService");
+
+ entityMethodNames.add("getModelEntity");
+ entityMethodNames.add("getEntityGroupName");
+ entityMethodNames.add("getModelEntityMapByGroup");
+ entityMethodNames.add("getGroupHelperName");
+ entityMethodNames.add("getEntityHelperName");
+ entityMethodNames.add("getEntityHelper");
+
+ entityMethodNames.add("makeValue");
+ entityMethodNames.add("makeValueSingle");
+ entityMethodNames.add("makeValidValue");
+ entityMethodNames.add("makePK");
+ entityMethodNames.add("makePKSingle");
+
+ entityMethodNames.add("create");
+ entityMethodNames.add("createSingle");
+ entityMethodNames.add("removeByAnd");
+ entityMethodNames.add("removeByCondition");
+
+ entityMethodNames.add("create");
+ entityMethodNames.add("createSingle");
+ entityMethodNames.add("removeByAnd");
+ entityMethodNames.add("removeByCondition");
+ entityMethodNames.add("storeByCondition");
+ entityMethodNames.add("removeAll");
+ entityMethodNames.add("findOne");
+ entityMethodNames.add("findByPrimaryKey");
+ entityMethodNames.add("findByPrimaryKeyCache");
+ entityMethodNames.add("findAllCache");
+ entityMethodNames.add("findByAnd");
+ entityMethodNames.add("findByOr");
+ entityMethodNames.add("findByAndCache");
+ entityMethodNames.add("findByLike");
+ entityMethodNames.add("findByCondition");
+ entityMethodNames.add("findByConditionCache");
+ entityMethodNames.add("findListIteratorByCondition");
+ entityMethodNames.add("find");
+ entityMethodNames.add("findList");
+ entityMethodNames.add("findCountByAnd");
+ entityMethodNames.add("findCountByCondition");
+ }
+
+ private UtilJavaParse () {}
+
public static String findRealPathAndFileForClass(String fullyQualifiedClassName) {
// search through the component directories, in the src directory for each, using the class path as the path within it
@@ -116,18 +172,6 @@ public class UtilJavaParse {
return nextClose;
}
- // FIXME: Not thread safe
- public static Set<String> serviceMethodNames = new HashSet<String>();
- static {
- serviceMethodNames.add("runSync");
- serviceMethodNames.add("runSyncIgnore");
- serviceMethodNames.add("runAsync");
- serviceMethodNames.add("runAsyncWait");
- serviceMethodNames.add("registerCallback");
- serviceMethodNames.add("schedule"); // NOTE: the service name may be the 1st, 2nd or 3rd param for variations on this
- serviceMethodNames.add("addRollbackService");
- serviceMethodNames.add("addCommitService");
- }
public static Set<String> findServiceCallsInBlock(int blockStart, int blockEnd, String javaFile) {
Set<String> serviceNameSet = new HashSet<String>();
@@ -154,49 +198,6 @@ public class UtilJavaParse {
return serviceNameSet;
}
- // FIXME: Not thread safe
- public static Set<String> entityMethodNames = new HashSet<String>();
- static {
- entityMethodNames.add("getModelEntity");
- entityMethodNames.add("getEntityGroupName");
- entityMethodNames.add("getModelEntityMapByGroup");
- entityMethodNames.add("getGroupHelperName");
- entityMethodNames.add("getEntityHelperName");
- entityMethodNames.add("getEntityHelper");
-
- entityMethodNames.add("makeValue");
- entityMethodNames.add("makeValueSingle");
- entityMethodNames.add("makeValidValue");
- entityMethodNames.add("makePK");
- entityMethodNames.add("makePKSingle");
-
- entityMethodNames.add("create");
- entityMethodNames.add("createSingle");
- entityMethodNames.add("removeByAnd");
- entityMethodNames.add("removeByCondition");
-
- entityMethodNames.add("create");
- entityMethodNames.add("createSingle");
- entityMethodNames.add("removeByAnd");
- entityMethodNames.add("removeByCondition");
- entityMethodNames.add("storeByCondition");
- entityMethodNames.add("removeAll");
- entityMethodNames.add("findOne");
- entityMethodNames.add("findByPrimaryKey");
- entityMethodNames.add("findByPrimaryKeyCache");
- entityMethodNames.add("findAllCache");
- entityMethodNames.add("findByAnd");
- entityMethodNames.add("findByOr");
- entityMethodNames.add("findByAndCache");
- entityMethodNames.add("findByLike");
- entityMethodNames.add("findByCondition");
- entityMethodNames.add("findByConditionCache");
- entityMethodNames.add("findListIteratorByCondition");
- entityMethodNames.add("find");
- entityMethodNames.add("findList");
- entityMethodNames.add("findCountByAnd");
- entityMethodNames.add("findCountByCondition");
- }
public static Set<String> findEntityUseInBlock(int blockStart, int blockEnd, String javaFile) {
Set<String> entityNameSet = new HashSet<String>();