[ofbiz-framework] branch trunk updated: Improved: Fix some bugs Spotbugs reports (OFBIZ-12386)

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux 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 ca03e21  Improved:  Fix some bugs Spotbugs reports (OFBIZ-12386)
ca03e21 is described below

commit ca03e21ae8e61e2408eb4e1497e99336d7741163
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Mon Dec 6 09:42:47 2021 +0100

    Improved:  Fix some bugs Spotbugs reports (OFBIZ-12386)
    
    Rearranges order of modifiers after transient insertion, in classes
    ProductConfigWrapper, ModelEntity, ModelViewEntity and ModelService
---
 .../java/org/apache/ofbiz/product/config/ProductConfigWrapper.java  | 4 ++--
 .../src/main/java/org/apache/ofbiz/entity/model/ModelEntity.java    | 2 +-
 .../main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java    | 2 +-
 .../src/main/java/org/apache/ofbiz/service/ModelService.java        | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
 
b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
index 5ad71eb..1832a2c 100644
--- 
a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
+++ 
b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java
@@ -501,9 +501,9 @@ public class ProductConfigWrapper implements Serializable {
     }
 
     public class ConfigItem implements java.io.Serializable {
-        transient private GenericValue configItem = null;
+        private transient GenericValue configItem = null;
         private GenericValue configItemAssoc = null;
-        transient private ProductConfigItemContentWrapper content = null;
+        private transient ProductConfigItemContentWrapper content = null;
         private List<ConfigOption> options = null;
         private boolean first = true;
 
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 b8d9195..fa9a406 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
@@ -68,7 +68,7 @@ public class ModelEntity implements Comparable<ModelEntity>, 
Serializable {
     public static final String CREATE_STAMP_FIELD = "createdStamp";
     public static final String CREATE_STAMP_TX_FIELD = "createdTxStamp";
 
-    transient private ModelInfo modelInfo;
+    private transient ModelInfo modelInfo;
 
     /** The ModelReader that created this Entity */
     private final ModelReader modelReader;
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 840c769..e35a547 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
@@ -1247,7 +1247,7 @@ public class ModelViewEntity extends ModelEntity {
         private final String relEntityAlias;
         private final boolean relOptional;
         private final List<ModelKeyMap> keyMaps = new LinkedList<>();
-        transient private final ViewEntityCondition viewEntityCondition;
+        private final transient ViewEntityCondition viewEntityCondition;
 
         public ModelViewLink(ModelViewEntity modelViewEntity, Element 
viewLinkElement) {
             this.entityAlias = 
UtilXml.checkEmpty(viewLinkElement.getAttribute("entity-alias")).intern();
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 1c5a5fb..037632a 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
@@ -185,7 +185,7 @@ public class ModelService extends AbstractMap<String, 
Object> implements Seriali
     private boolean hideResultInLog;
 
     /** Set of services this service implements */
-    transient private Set<ModelServiceIface> implServices = new 
LinkedHashSet<>();
+    private transient Set<ModelServiceIface> implServices = new 
LinkedHashSet<>();
 
     /** Set of override parameters */
     private Set<ModelParam> overrideParameters = new LinkedHashSet<>();
@@ -194,10 +194,10 @@ public class ModelService extends AbstractMap<String, 
Object> implements Seriali
     private List<ModelPermGroup> permissionGroups = new LinkedList<>();
 
     /** List of email-notifications for this service */
-    transient private List<ModelNotification> notifications = new 
LinkedList<>();
+    private transient List<ModelNotification> notifications = new 
LinkedList<>();
 
     /** Internal Service Group */
-    transient private GroupModel internalGroup = null;
+    private transient GroupModel internalGroup = null;
 
     /**Deprecated information*/
     private String deprecatedUseInstead = null;