Skip to content

Commit 1bb65ee

Browse files
committed
Improved: Make private methods static when possible
(OFBIZ-10966) git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1862248 13f79535-47bb-0310-9956-ffa450edef68
1 parent 8c3c6cd commit 1bb65ee

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityJsonReader.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ private long convertJsonAndWriteValues(String jsonString) throws IOException {
197197
return this.numberRead;
198198
}
199199

200-
private List<Map<String, Object>> iterateJsonEntityData(Object jsonData) {
200+
private static List<Map<String, Object>> iterateJsonEntityData(Object jsonData) {
201201
List<Map<String, Object>> genericMapList = new LinkedList<Map<String, Object>>();
202202
if (jsonData instanceof JSONArray) {
203203
JSONArray jsonArray = (JSONArray) jsonData;
@@ -219,7 +219,7 @@ private List<Map<String, Object>> iterateJsonEntityData(Object jsonData) {
219219
return genericMapList;
220220
}
221221

222-
private Map<String, Object> iterateJSONObject(JSONObject jsonObj) {
222+
private static Map<String, Object> iterateJSONObject(JSONObject jsonObj) {
223223
Map<String, Object> mapObj = new HashMap<String, Object>();
224224
Iterator iterator = jsonObj.keySet().iterator();
225225
while (iterator.hasNext()) {
@@ -241,7 +241,7 @@ private long create(JSONObject jsonObject) throws IOException {
241241
String key = iterator.next().toString();
242242
Object value = jsonObject.get(key);
243243
if (UtilValidate.isNotEmpty(value)) {
244-
List<Map<String, Object>> genericMapList = this.iterateJsonEntityData(value);
244+
List<Map<String, Object>> genericMapList = iterateJsonEntityData(value);
245245
for (Map<String, Object> keyValPair : genericMapList) {
246246
try {
247247
ModelEntity modelEntity = this.delegator.getModelEntity(key);
@@ -287,7 +287,7 @@ private long createUpdate(JSONObject jsonObject) throws IOException {
287287
String key = iterator.next().toString();
288288
Object value = jsonObject.get(key);
289289
if (UtilValidate.isNotEmpty(value)) {
290-
List<Map<String, Object>> genericMapList = this.iterateJsonEntityData(value);
290+
List<Map<String, Object>> genericMapList = iterateJsonEntityData(value);
291291
for (Map<String, Object> keyValPair : genericMapList) {
292292
try {
293293
GenericValue currentValue = delegator.makeValue(key);
@@ -372,7 +372,7 @@ private long createReplace(JSONObject jsonObject) throws IOException {
372372
String key = iterator.next().toString();
373373
Object value = jsonObject.get(key);
374374
if (UtilValidate.isNotEmpty(value)) {
375-
List<Map<String, Object>> genericMapList = this.iterateJsonEntityData(value);
375+
List<Map<String, Object>> genericMapList = iterateJsonEntityData(value);
376376
for (Map<String, Object> keyValPair : genericMapList) {
377377
try {
378378
GenericValue currentValue = this.delegator.makeValue(key);
@@ -478,7 +478,7 @@ private long delete(JSONObject jsonObject) throws IOException {
478478
String key = iterator.next().toString();
479479
Object value = jsonObject.get(key);
480480
if (UtilValidate.isNotEmpty(value)) {
481-
List<Map<String, Object>> genericMapList = this.iterateJsonEntityData(value);
481+
List<Map<String, Object>> genericMapList = iterateJsonEntityData(value);
482482
for (Map<String, Object> keyValPair : genericMapList) {
483483
try {
484484
ModelEntity modelEntity = this.delegator.getModelEntity(key);

0 commit comments

Comments
 (0)