svn commit: r1814327 - in /ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity: Delegator.java GenericDelegator.java

[mbrohl]

Author: mbrohl
Date: Sat Nov  4 22:23:20 2017
New Revision: 1814327

URL: http://svn.apache.org/viewvc?rev=1814327&view=rev
Log:
Improved: Remove deprecated method
GenericDelegator.decryptFieldValue(String, String).
(OFBIZ-9916)

Modified:
    ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/Delegator.java
    ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java

Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/Delegator.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/Delegator.java?rev=1814327&r1=1814326&r2=1814327&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/Delegator.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/Delegator.java Sat Nov  4 22:23:20 2017
@@ -210,9 +210,6 @@ public interface Delegator {
      */
     GenericValue createSingle(String entityName, Object singlePkValue) throws GenericEntityException;
 
-    @Deprecated
-    Object decryptFieldValue(String entityName, String encValue) throws EntityCryptoException;
-
     Object decryptFieldValue(String entityName, ModelField.EncryptMethod encryptMethod, String encValue) throws EntityCryptoException;
 
     Object encryptFieldValue(String entityName, ModelField.EncryptMethod encryptMethod, Object fieldValue) throws EntityCryptoException;

Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java?rev=1814327&r1=1814326&r2=1814327&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java Sat Nov  4 22:23:20 2017
@@ -2384,15 +2384,6 @@ public class GenericDelegator implements
         return fieldValue;
     }
 
-    @Override
-    @Deprecated
-    public Object decryptFieldValue(String entityName, String encValue) throws EntityCryptoException {
-        if (UtilValidate.isNotEmpty(encValue)) {
-            return this.crypto.decrypt(entityName, ModelField.EncryptMethod.TRUE, encValue);
-        }
-        return null;
-    }
-
     /* (non-Javadoc)
      * @see org.apache.ofbiz.entity.Delegator#encryptFieldValue(java.lang.String, java.lang.Object)
      */