svn commit: r833715 - in /ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext: permission/EntityPermissionChecker.java synchronization/EntitySyncServices.java

Author: jleroux
Date: Sat Nov  7 17:10:43 2009
New Revision: 833715

URL: http://svn.apache.org/viewvc?rev=833715&view=rev
Log:
A (slightly modified) patch from Bob Morley "Resolve java warnings exposed in Eclipse : framework - entityext" (https://issues.apache.org/jira/browse/OFBIZ-3108) - OFBIZ-3108
I replaced 3 while loops by for loops

Modified:
    ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
    ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java

Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java?rev=833715&r1=833714&r2=833715&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java Sat Nov  7 17:10:43 2009
@@ -319,7 +319,7 @@
         // check permission for each id in passed list until success.
         // Note that "quickCheck" id come first in the list
         // Check with no roles or purposes on the chance that the permission fields contain _NA_ s.
-        List alreadyCheckedIds = FastList.newInstance();
+        List<String> alreadyCheckedIds = FastList.newInstance();
         Map<String, List<String>> purposes = FastMap.newInstance();
         Map<String, List<String>> roles = FastMap.newInstance();
         //List purposeList = null;
@@ -532,7 +532,7 @@
             //if (Debug.infoOn()) Debug.logInfo(entityIdString, module);
         }
 
-        List alreadyCheckedIds = FastList.newInstance();
+        List<String> alreadyCheckedIds = FastList.newInstance();
         Map<String, GenericValue> entities = FastMap.newInstance();
         //List purposeList = null;
         //List roleList = null;
@@ -1330,7 +1330,7 @@
 
         EntityExpr expr = EntityCondition.makeCondition(entityIdFieldName, EntityOperator.IN, idList);
         EntityExpr expr2 = EntityCondition.makeCondition(partyIdFieldName, partyId);
-        EntityConditionList condList = EntityCondition.makeCondition(UtilMisc.toList(expr, expr2));
+        EntityConditionList<EntityExpr> condList = EntityCondition.makeCondition(UtilMisc.toList(expr, expr2));
         List<GenericValue> roleList = delegator.findList(entityName, condList, null, null, null, true);
         List<GenericValue> roleListFiltered = EntityUtil.filterByDate(roleList);
         Set<String> distinctSet = FastSet.newInstance();

Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java?rev=833715&r1=833714&r2=833715&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncServices.java Sat Nov  7 17:10:43 2009
@@ -18,51 +18,52 @@
  *******************************************************************************/
 package org.ofbiz.entityext.synchronization;
 
+import static org.ofbiz.base.util.UtilGenerics.checkList;
+
+import java.io.IOException;
+import java.net.URL;
 import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import com.ibm.icu.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.io.IOException;
-import java.net.URL;
 
 import javax.xml.parsers.ParserConfigurationException;
 
 import javolution.util.FastMap;
 
 import org.ofbiz.base.util.Debug;
-import static org.ofbiz.base.util.UtilGenerics.checkList;
+import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilURL;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
-import org.ofbiz.base.util.UtilURL;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.DelegatorFactory;
 import org.ofbiz.entity.GenericEntity;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
-import org.ofbiz.entity.serialize.XmlSerializer;
-import org.ofbiz.entity.serialize.SerializeException;
 import org.ofbiz.entity.condition.EntityCondition;
-import org.ofbiz.entity.condition.EntityExpr;
 import org.ofbiz.entity.condition.EntityOperator;
 import org.ofbiz.entity.model.ModelEntity;
+import org.ofbiz.entity.serialize.SerializeException;
+import org.ofbiz.entity.serialize.XmlSerializer;
 import org.ofbiz.entityext.synchronization.EntitySyncContext.SyncAbortException;
 import org.ofbiz.entityext.synchronization.EntitySyncContext.SyncErrorException;
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.service.GenericServiceException;
 import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.service.ServiceUtil;
-
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
+import com.ibm.icu.util.Calendar;
+
 /**
  * Entity Engine Sync Services
  */
@@ -130,7 +131,7 @@
      *@param context Map containing the input parameters
      *@return Map with the result of the service, the output parameters
      */
-    public static Map storeEntitySyncData(DispatchContext dctx, Map context) {
+    public static Map<String, Object> storeEntitySyncData(DispatchContext dctx, Map<String, Object> context) {
         Delegator delegator = dctx.getDelegator();
         String overrideDelegatorName = (String) context.get("delegatorName");
         if (UtilValidate.isNotEmpty(overrideDelegatorName)) {
@@ -143,9 +144,9 @@
 
         String entitySyncId = (String) context.get("entitySyncId");
         // incoming lists will already be sorted by lastUpdatedStamp (or lastCreatedStamp)
-        List valuesToCreate = (List) context.get("valuesToCreate");
-        List valuesToStore = (List) context.get("valuesToStore");
-        List keysToRemove = (List) context.get("keysToRemove");
+        List<GenericValue> valuesToCreate = UtilGenerics.cast(context.get("valuesToCreate"));
+        List<GenericValue> valuesToStore = UtilGenerics.cast(context.get("valuesToStore"));
+        List<GenericEntity> keysToRemove = UtilGenerics.cast(context.get("keysToRemove"));
 
         if (Debug.infoOn()) Debug.logInfo("Running storeEntitySyncData (" + entitySyncId + ") - [" + valuesToCreate.size() + "] to create; [" + valuesToStore.size() + "] to store; [" + keysToRemove.size() + "] to remove.", module);
         try {
@@ -159,9 +160,7 @@
             long toRemoveAlreadyDeleted = 0;
 
             // create all values in the valuesToCreate List; if the value already exists update it, or if exists and was updated more recently than this one dont update it
-            Iterator valueToCreateIter = valuesToCreate.iterator();
-            while (valueToCreateIter.hasNext()) {
-                GenericValue valueToCreate = (GenericValue) valueToCreateIter.next();
+            for (GenericValue valueToCreate : valuesToCreate) {
                 // to Create check if exists (find by pk), if not insert; if exists check lastUpdatedStamp: if null or before the candidate value insert, otherwise don't insert
                 // NOTE: use the delegator from this DispatchContext rather than the one named in the GenericValue
 
@@ -187,9 +186,7 @@
             }
 
             // iterate through to store list and store each
-            Iterator valueToStoreIter = valuesToStore.iterator();
-            while (valueToStoreIter.hasNext()) {
-                GenericValue valueToStore = (GenericValue) valueToStoreIter.next();
+            for (GenericValue valueToStore  : valuesToStore) {
                 // to store check if exists (find by pk), if not insert; if exists check lastUpdatedStamp: if null or before the candidate value insert, otherwise don't insert
 
                 // maintain the original timestamps when doing storage of synced data, by default with will update the timestamps to now
@@ -214,10 +211,7 @@
             }
 
             // iterate through to remove list and remove each
-            Iterator keyToRemoveIter = keysToRemove.iterator();
-            while (keyToRemoveIter.hasNext()) {
-                GenericEntity pkToRemove = (GenericEntity) keyToRemoveIter.next();
-
+            for (GenericEntity pkToRemove : keysToRemove) {
                 // check to see if it exists, if so remove and count, if not just count already removed
                 // always do a removeByAnd, if it was a removeByAnd great, if it was a removeByPrimaryKey, this will also work and save us a query
                 pkToRemove.setIsFromEntitySync(true);
@@ -264,7 +258,7 @@
      *@param context Map containing the input parameters
      *@return Map with the result of the service, the output parameters
      */
-    public static Map runPullEntitySync(DispatchContext dctx, Map context) {
+    public static Map<String, Object> runPullEntitySync(DispatchContext dctx, Map<String, Object> context) {
         LocalDispatcher dispatcher = dctx.getDispatcher();
 
         String entitySyncId = (String) context.get("entitySyncId");
@@ -317,9 +311,9 @@
                     // store data returned, get results (just call storeEntitySyncData locally, get the numbers back and boom shakalaka)
 
                     // anything to store locally?
-                    if (startDate != null && (!UtilValidate.isEmpty((Collection) result.get("valuesToCreate")) ||
-                            !UtilValidate.isEmpty((Collection) result.get("valuesToStore")) ||
-                            !UtilValidate.isEmpty((Collection) result.get("keysToRemove")))) {
+                    if (startDate != null && (!UtilValidate.isEmpty((Collection<?>) result.get("valuesToCreate")) ||
+                            !UtilValidate.isEmpty((Collection<?>) result.get("valuesToStore")) ||
+                            !UtilValidate.isEmpty((Collection<?>) result.get("keysToRemove")))) {
 
                         // yep, we got more data
                         gotMoreData = true;
@@ -587,7 +581,7 @@
         return ServiceUtil.returnSuccess();
     }
 
-    public static Map updateOfflineEntitySync(DispatchContext dctx, Map context) {
+    public static Map<String, Object> updateOfflineEntitySync(DispatchContext dctx, Map<String, Object> context) {
         return ServiceUtil.returnError("Service not yet implemented.");
     }