Skip to content

Commit 07406d3

Browse files
mthlmthl
committed
Improved: Add static modifiers in ‘EntityDataLoadContainer’
(OFBIZ-11070) When no reference to ‘this’ is made, it is better to declare methods as static. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1860064 13f79535-47bb-0310-9956-ffa450edef68
1 parent 655f19c commit 07406d3

File tree

1 file changed

+28
-27
lines changed

1 file changed

+28
-27
lines changed

Diff for: ‎framework/entityext/src/main/java/org/apache/ofbiz/entityext/data/EntityDataLoadContainer.java

+28-27
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public String getName() {
131131
return name;
132132
}
133133

134-
private List<GenericValue> getTenantList(Property delegatorNameProp) throws ContainerException {
134+
private static List<GenericValue> getTenantList(Property delegatorNameProp) throws ContainerException {
135135
if (!EntityUtil.isMultiTenantEnabled()) {
136136
throw new ContainerException("Multitenant is disabled, must be enabled in general.properties -> multitenant=Y");
137137
}
@@ -148,7 +148,7 @@ private List<GenericValue> getTenantList(Property delegatorNameProp) throws Cont
148148
}
149149
}
150150

151-
private void loadDataForDelegator(Map<String, String> loadDataProps, Configuration configuration,
151+
private static void loadDataForDelegator(Map<String, String> loadDataProps, Configuration configuration,
152152
Property delegatorNameProp, String overrideDelegator) throws ContainerException{
153153

154154
// prepare command line properties passed by user
@@ -207,7 +207,8 @@ private static boolean isPropertySet(Map<String, String> props, String key) {
207207
* Gets the default entity-group-name defined in the container definition
208208
* unless overridden by the user
209209
*/
210-
private String getEntityGroupNameFromConfig(Configuration cfg, String overrideGroup) throws ContainerException {
210+
private static String getEntityGroupNameFromConfig(Configuration cfg, String overrideGroup)
211+
throws ContainerException {
211212
if (overrideGroup != null) {
212213
return overrideGroup;
213214
} else {
@@ -225,15 +226,16 @@ private String getEntityGroupNameFromConfig(Configuration cfg, String overrideGr
225226
* overridden by the user. This method will create all the tables, keys and
226227
* indices if missing and hence might take a long time.
227228
*/
228-
private Delegator getDelegator(Property delegatorNameProp, String overrideDelegator) throws ContainerException {
229+
private static Delegator getDelegator(Property delegatorNameProp, String overrideDelegator)
230+
throws ContainerException {
229231
if (overrideDelegator != null) {
230232
return DelegatorFactory.getDelegator(overrideDelegator);
231233
} else {
232234
return getDelegatorFromProp(delegatorNameProp);
233235
}
234236
}
235237

236-
private Delegator getDelegatorFromProp(Property delegatorNameProp) throws ContainerException {
238+
private static Delegator getDelegatorFromProp(Property delegatorNameProp) throws ContainerException {
237239
if (delegatorNameProp != null && UtilValidate.isNotEmpty(delegatorNameProp.value)) {
238240
Delegator delegator = DelegatorFactory.getDelegator(delegatorNameProp.value);
239241
if (delegator != null) {
@@ -246,32 +248,32 @@ private Delegator getDelegatorFromProp(Property delegatorNameProp) throws Contai
246248
}
247249
}
248250

249-
private Delegator getBaseDelegator(Delegator delegator) {
251+
private static Delegator getBaseDelegator(Delegator delegator) {
250252
if (delegator.getDelegatorTenantId() != null) {
251253
return DelegatorFactory.getDelegator(delegator.getDelegatorBaseName());
252254
} else {
253255
return delegator;
254256
}
255257
}
256258

257-
private GenericHelperInfo getHelperInfo(Delegator delegator, String entityGroup) throws ContainerException {
259+
private static GenericHelperInfo getHelperInfo(Delegator delegator, String entityGroup) throws ContainerException {
258260
GenericHelperInfo helperInfo = delegator.getGroupHelperInfo(entityGroup);
259261
if (helperInfo == null) {
260262
throw new ContainerException("Unable to locate the datasource helper for the group: " + entityGroup);
261263
}
262264
return helperInfo;
263265
}
264266

265-
private Map<String, ModelEntity> getModelEntities(Delegator delegator,
266-
String entityGroup) throws ContainerException {
267+
private static Map<String, ModelEntity> getModelEntities(Delegator delegator, String entityGroup)
268+
throws ContainerException {
267269
try {
268270
return delegator.getModelEntityMapByGroup(entityGroup);
269271
} catch (GenericEntityException e) {
270272
throw new ContainerException(e);
271273
}
272274
}
273275

274-
private void createOrUpdateComponentEntities(Delegator baseDelegator,
276+
private static void createOrUpdateComponentEntities(Delegator baseDelegator,
275277
Collection<ComponentConfig> allComponents) {
276278

277279
for (ComponentConfig config : allComponents) {
@@ -294,7 +296,7 @@ private void createOrUpdateComponentEntities(Delegator baseDelegator,
294296
}
295297
}
296298

297-
private void dropDbConstraints(DatabaseUtil dbUtil, Map<String, ModelEntity> modelEntities,
299+
private static void dropDbConstraints(DatabaseUtil dbUtil, Map<String, ModelEntity> modelEntities,
298300
TreeSet<String> modelEntityNames) {
299301

300302
List<String> messages = new ArrayList<>();
@@ -326,7 +328,7 @@ private void dropDbConstraints(DatabaseUtil dbUtil, Map<String, ModelEntity> mod
326328
logMessageList(messages);
327329
}
328330

329-
private void createDbConstraints(DatabaseUtil dbUtil, Map<String, ModelEntity> modelEntities,
331+
private static void createDbConstraints(DatabaseUtil dbUtil, Map<String, ModelEntity> modelEntities,
330332
TreeSet<String> modelEntityNames) {
331333

332334
List<String> messages = new ArrayList<>();
@@ -358,7 +360,7 @@ private void createDbConstraints(DatabaseUtil dbUtil, Map<String, ModelEntity> m
358360
logMessageList(messages);
359361
}
360362

361-
private void dropPrimaryKeys(DatabaseUtil dbUtil, Map<String, ModelEntity> modelEntities,
363+
private static void dropPrimaryKeys(DatabaseUtil dbUtil, Map<String, ModelEntity> modelEntities,
362364
TreeSet<String> modelEntityNames) {
363365

364366
List<String> messages = new ArrayList<>();
@@ -374,7 +376,7 @@ private void dropPrimaryKeys(DatabaseUtil dbUtil, Map<String, ModelEntity> model
374376
logMessageList(messages);
375377
}
376378

377-
private void createPrimaryKeys(DatabaseUtil dbUtil, Map<String, ModelEntity> modelEntities,
379+
private static void createPrimaryKeys(DatabaseUtil dbUtil, Map<String, ModelEntity> modelEntities,
378380
TreeSet<String> modelEntityNames) {
379381

380382
List<String> messages = new ArrayList<>();
@@ -390,7 +392,7 @@ private void createPrimaryKeys(DatabaseUtil dbUtil, Map<String, ModelEntity> mod
390392
logMessageList(messages);
391393
}
392394

393-
private void repairDbColumns(DatabaseUtil dbUtil, Map<String, ModelEntity> modelEntities) {
395+
private static void repairDbColumns(DatabaseUtil dbUtil, Map<String, ModelEntity> modelEntities) {
394396
List<String> fieldsToRepair = new ArrayList<>();
395397
List<String> messages = new ArrayList<>();
396398
dbUtil.checkDb(modelEntities, fieldsToRepair, messages, false, false, false, false);
@@ -401,15 +403,14 @@ private void repairDbColumns(DatabaseUtil dbUtil, Map<String, ModelEntity> model
401403
logMessageList(messages);
402404
}
403405

404-
private void logMessageList(List<String> messages) {
406+
private static void logMessageList(List<String> messages) {
405407
if (Debug.infoOn()) {
406408
messages.forEach(message -> Debug.logInfo(message, module));
407409
}
408410
}
409411

410-
private void loadData(Delegator delegator, Delegator baseDelegator,
411-
Collection<ComponentConfig> allComponents,
412-
GenericHelperInfo helperInfo,
412+
private static void loadData(Delegator delegator, Delegator baseDelegator,
413+
Collection<ComponentConfig> allComponents, GenericHelperInfo helperInfo,
413414
Map<String, String> loadDataProps) throws ContainerException {
414415

415416
// prepare command line properties passed by user
@@ -444,15 +445,15 @@ private void loadData(Delegator delegator, Delegator baseDelegator,
444445
logDataLoadingResults(infoMessages, errorMessages, totalRowsChanged);
445446
}
446447

447-
private int getTransactionTimeout(String timeout) {
448+
private static int getTransactionTimeout(String timeout) {
448449
try {
449450
return Integer.parseInt(timeout);
450451
} catch (Exception e) {
451452
return -1;
452453
}
453454
}
454455

455-
private List<URL> prepareDataUrls(Delegator delegator, Delegator baseDelegator,
456+
private static List<URL> prepareDataUrls(Delegator delegator, Delegator baseDelegator,
456457
Collection<ComponentConfig> allComponents, GenericHelperInfo helperInfo,
457458
Map<String, String> loadDataProps) throws ContainerException {
458459

@@ -499,7 +500,7 @@ private static boolean isDataReadersEnabled(List<String> files, String directory
499500
return readers != null || (files.isEmpty() && directory == null);
500501
}
501502

502-
private List<String> prepareTenantLoadComponents(Delegator delegator, Delegator baseDelegator,
503+
private static List<String> prepareTenantLoadComponents(Delegator delegator, Delegator baseDelegator,
503504
Collection<ComponentConfig> allComponents, String component) {
504505

505506
List<String> loadComponents = new ArrayList<>();
@@ -529,7 +530,7 @@ private List<String> prepareTenantLoadComponents(Delegator delegator, Delegator
529530
return loadComponents;
530531
}
531532

532-
private List<URL> retireveDataUrlsFromFileList(List<String> files) throws ContainerException {
533+
private static List<URL> retireveDataUrlsFromFileList(List<String> files) throws ContainerException {
533534
List<URL> fileUrls = new ArrayList<>();
534535
for(String file: files) {
535536
URL url = UtilURL.fromResource(file);
@@ -542,7 +543,7 @@ private List<URL> retireveDataUrlsFromFileList(List<String> files) throws Contai
542543
return fileUrls;
543544
}
544545

545-
private List<URL> retrieveDataUrlsFromDirectory(String directory) {
546+
private static List<URL> retrieveDataUrlsFromDirectory(String directory) {
546547
return Optional.ofNullable(directory)
547548
.map(dir -> Arrays.asList(new File(dir).listFiles()).stream()
548549
.filter(file -> file.getName().toLowerCase(Locale.getDefault()).endsWith(".xml"))
@@ -551,7 +552,7 @@ private List<URL> retrieveDataUrlsFromDirectory(String directory) {
551552
.orElse(new ArrayList<URL>());
552553
}
553554

554-
private void logDataLoadingPlan(List<URL> urlList, String delegatorName) {
555+
private static void logDataLoadingPlan(List<URL> urlList, String delegatorName) {
555556
if (UtilValidate.isNotEmpty(urlList)) {
556557
Debug.logImportant("=-=-=-=-=-=-= Doing a data load using delegator '"
557558
+ delegatorName + "' with the following files:", module);
@@ -562,7 +563,7 @@ private void logDataLoadingPlan(List<URL> urlList, String delegatorName) {
562563
}
563564
}
564565

565-
private String createDataLoadMessage(URL dataUrl, int rowsChanged, int totalRowsChanged) {
566+
private static String createDataLoadMessage(URL dataUrl, int rowsChanged, int totalRowsChanged) {
566567
NumberFormat formatter = NumberFormat.getIntegerInstance();
567568
formatter.setMinimumIntegerDigits(5);
568569
formatter.setGroupingUsed(false);
@@ -571,7 +572,7 @@ private String createDataLoadMessage(URL dataUrl, int rowsChanged, int totalRows
571572
+ " from " + dataUrl.toExternalForm();
572573
}
573574

574-
private void logDataLoadingResults(List<String> infoMessages,
575+
private static void logDataLoadingResults(List<String> infoMessages,
575576
List<Object> errorMessages, int totalRowsChanged) {
576577

577578
if (UtilValidate.isNotEmpty(infoMessages)) {

0 commit comments

Comments
 (0)