You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/08/23 09:01:08 UTC

syncope git commit: [SYNCOPE-938] Skip some String constructor invocations

Repository: syncope
Updated Branches:
  refs/heads/master 8776551b7 -> 4759ad8ea


[SYNCOPE-938] Skip some String constructor invocations


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4759ad8e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4759ad8e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4759ad8e

Branch: refs/heads/master
Commit: 4759ad8ea33a44885645ecc9ddb7834eea9aaba4
Parents: 8776551
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Aug 23 11:00:57 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Aug 23 11:00:57 2017 +0200

----------------------------------------------------------------------
 .../core/persistence/jpa/entity/AbstractPlainAttrValue.java     | 2 +-
 .../syncope/core/persistence/jpa/inner/PlainAttrTest.java       | 3 +--
 .../java/propagation/LDAPPasswordPropagationActions.java        | 5 ++---
 3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/4759ad8e/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java
index 9e32d02..ae81e6e 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttrValue.java
@@ -261,7 +261,7 @@ public abstract class AbstractPlainAttrValue extends AbstractGeneratedKeyEntity
                 break;
 
             case Binary:
-                result = new String(Base64.getMimeEncoder().encode(getBinaryValue()));
+                result = Base64.getMimeEncoder().encodeToString(getBinaryValue());
                 break;
 
             case String:

http://git-wip-us.apache.org/repos/asf/syncope/blob/4759ad8e/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/PlainAttrTest.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/PlainAttrTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/PlainAttrTest.java
index 9b79f44..f4a6ebd 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/PlainAttrTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/PlainAttrTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.Random;
@@ -207,7 +206,7 @@ public class PlainAttrTest extends AbstractTest {
 
         byte[] bytes = new byte[20];
         new Random().nextBytes(bytes);
-        String photoB64Value = new String(Base64.getMimeEncoder().encode(bytes), StandardCharsets.UTF_8);
+        String photoB64Value = Base64.getMimeEncoder().encodeToString(bytes);
 
         UPlainAttr attr = entityFactory.newEntity(UPlainAttr.class);
         attr.setOwner(user);

http://git-wip-us.apache.org/repos/asf/syncope/blob/4759ad8e/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPPasswordPropagationActions.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPPasswordPropagationActions.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPPasswordPropagationActions.java
index 275b84d..0828bb6 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPPasswordPropagationActions.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPPasswordPropagationActions.java
@@ -72,10 +72,9 @@ public class LDAPPasswordPropagationActions implements PropagationActions {
 
                     String password = user.getPassword().toLowerCase();
                     byte[] decodedPassword = DatatypeConverter.parseHexBinary(password);
-                    byte[] base64EncodedPassword = Base64.getMimeEncoder().encode(decodedPassword);
+                    String base64EncodedPassword = Base64.getMimeEncoder().encodeToString(decodedPassword);
 
-                    String cipherPlusPassword =
-                            ("{" + cipherAlgorithm.toLowerCase() + "}" + new String(base64EncodedPassword));
+                    String cipherPlusPassword = ("{" + cipherAlgorithm.toLowerCase() + "}" + base64EncodedPassword);
 
                     Attribute passwordAttribute = AttributeBuilder.buildPassword(
                             new GuardedString(cipherPlusPassword.toCharArray()));