Repository: syncope
Updated Branches:
  refs/heads/2_0_X 4231e0aba -> 59aa00ff0
  refs/heads/master 3765af711 -> 678bff96d


Member -> static method cleanup


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

Branch: refs/heads/2_0_X
Commit: 59aa00ff010a8dd61876c25e290e72b7eb32ab36
Parents: 4231e0a
Author: Francesco Chicchiriccò <ilgro...@apache.org>
Authored: Tue Sep 26 12:15:47 2017 +0200
Committer: Francesco Chicchiriccò <ilgro...@apache.org>
Committed: Tue Sep 26 12:15:47 2017 +0200

----------------------------------------------------------------------
 .../syncope/core/logic/ResourceLogic.java       |  7 +-
 .../AbstractPropagationTaskExecutor.java        |  8 +-
 .../propagation/DefaultPropagationReporter.java |  8 +-
 .../java/utils/ConnObjectUtils.java             | 81 +++++++++++---------
 .../src/main/resources/provisioningContext.xml  |  1 -
 5 files changed, 52 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/59aa00ff/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
----------------------------------------------------------------------
diff --git 
a/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java 
b/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
index e3777cb..98af4c7 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
@@ -111,9 +111,6 @@ public class ResourceLogic extends 
AbstractTransactionalLogic<ResourceTO> {
     private ResourceDataBinder binder;
 
     @Autowired
-    private ConnObjectUtils connObjectUtils;
-
-    @Autowired
     private MappingManager mappingManager;
 
     @Autowired
@@ -364,7 +361,7 @@ public class ResourceLogic extends 
AbstractTransactionalLogic<ResourceTO> {
             attributes.add(connectorObject.getName());
         }
 
-        return connObjectUtils.getConnObjectTO(connectorObject);
+        return ConnObjectUtils.getConnObjectTO(connectorObject);
     }
 
     @PreAuthorize("hasRole('" + StandardEntitlement.RESOURCE_LIST_CONNOBJECT + 
"')")
@@ -411,7 +408,7 @@ public class ResourceLogic extends 
AbstractTransactionalLogic<ResourceTO> {
 
             @Override
             public boolean handle(final ConnectorObject connectorObject) {
-                
connObjects.add(connObjectUtils.getConnObjectTO(connectorObject));
+                
connObjects.add(ConnObjectUtils.getConnObjectTO(connectorObject));
                 // safety protection against uncontrolled result size
                 count++;
                 return count < size;

http://git-wip-us.apache.org/repos/asf/syncope/blob/59aa00ff/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
index 3e97682..0f5a7b5 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
@@ -537,12 +537,8 @@ public abstract class AbstractPropagationTaskExecutor 
implements PropagationTask
             Collection<PropagationTask> tasks, PropagationReporter reporter, 
boolean nullPriorityAsync);
 
     @Override
-    public PropagationReporter execute(
-            final Collection<PropagationTask> tasks,
-            final boolean nullPriorityAsync) {
-
-        PropagationReporter reporter =
-                
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
+    public PropagationReporter execute(final Collection<PropagationTask> 
tasks, final boolean nullPriorityAsync) {
+        PropagationReporter reporter = new DefaultPropagationReporter();
         try {
             doExecute(tasks, reporter, nullPriorityAsync);
         } catch (PropagationException e) {

http://git-wip-us.apache.org/repos/asf/syncope/blob/59aa00ff/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/DefaultPropagationReporter.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/DefaultPropagationReporter.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/DefaultPropagationReporter.java
index 635c015..9114aad 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/DefaultPropagationReporter.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/DefaultPropagationReporter.java
@@ -32,15 +32,11 @@ import 
org.apache.syncope.core.provisioning.java.utils.ConnObjectUtils;
 import org.identityconnectors.framework.common.objects.ConnectorObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 
 public class DefaultPropagationReporter implements PropagationReporter {
 
     protected static final Logger LOG = 
LoggerFactory.getLogger(DefaultPropagationReporter.class);
 
-    @Autowired
-    protected ConnObjectUtils connObjectUtils;
-
     protected final List<PropagationStatus> statuses = new ArrayList<>();
 
     protected boolean add(final PropagationStatus status) {
@@ -69,11 +65,11 @@ public class DefaultPropagationReporter implements 
PropagationReporter {
         status.setFailureReason(failureReason);
 
         if (beforeObj != null) {
-            status.setBeforeObj(connObjectUtils.getConnObjectTO(beforeObj));
+            status.setBeforeObj(ConnObjectUtils.getConnObjectTO(beforeObj));
         }
 
         if (afterObj != null) {
-            status.setAfterObj(connObjectUtils.getConnObjectTO(afterObj));
+            status.setAfterObj(ConnObjectUtils.getConnObjectTO(afterObj));
         }
 
         add(status);

http://git-wip-us.apache.org/repos/asf/syncope/blob/59aa00ff/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
index c6db575..e85cb30 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
@@ -20,6 +20,7 @@ package org.apache.syncope.core.provisioning.java.utils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.common.lib.AnyOperations;
 import org.apache.syncope.common.lib.patch.AnyPatch;
@@ -107,6 +108,51 @@ public class ConnObjectUtils {
     }
 
     /**
+     * Builds {@link ConnObjectTO} out of {@link ConnectorObject}.
+     *
+     * @param connObject connector object.
+     * @return transfer object
+     */
+    public static ConnObjectTO getConnObjectTO(final ConnectorObject 
connObject) {
+        return connObject == null ? new ConnObjectTO() : 
getConnObjectTO(connObject.getAttributes());
+    }
+
+    /**
+     * Builds {@link ConnObjectTO} out of a collection of {@link Attribute} 
instances.
+     *
+     * @param attrs attributes
+     * @return transfer object
+     */
+    public static ConnObjectTO getConnObjectTO(final Set<Attribute> attrs) {
+        final ConnObjectTO connObjectTO = new ConnObjectTO();
+
+        if (attrs != null) {
+            for (Attribute attr : attrs) {
+                AttrTO attrTO = new AttrTO();
+                attrTO.setSchema(attr.getName());
+
+                if (attr.getValue() != null) {
+                    for (Object value : attr.getValue()) {
+                        if (value != null) {
+                            if (value instanceof GuardedString || value 
instanceof GuardedByteArray) {
+                                attrTO.getValues().add(getPassword(value));
+                            } else if (value instanceof byte[]) {
+                                attrTO.getValues().add(Base64.encode((byte[]) 
value));
+                            } else {
+                                attrTO.getValues().add(value.toString());
+                            }
+                        }
+                    }
+                }
+
+                connObjectTO.getAttrs().add(attrTO);
+            }
+        }
+
+        return connObjectTO;
+    }
+
+    /**
      * Build a UserTO / GroupTO / AnyObjectTO out of connector object 
attributes and schema mapping.
      *
      * @param obj connector object
@@ -276,39 +322,4 @@ public class ConnObjectUtils {
 
         return anyTO;
     }
-
-    /**
-     * Get connector object TO from a connector object.
-     *
-     * @param connObject connector object.
-     * @return connector object TO.
-     */
-    public ConnObjectTO getConnObjectTO(final ConnectorObject connObject) {
-        final ConnObjectTO connObjectTO = new ConnObjectTO();
-
-        if (connObject != null) {
-            for (Attribute attr : connObject.getAttributes()) {
-                AttrTO attrTO = new AttrTO();
-                attrTO.setSchema(attr.getName());
-
-                if (attr.getValue() != null) {
-                    for (Object value : attr.getValue()) {
-                        if (value != null) {
-                            if (value instanceof GuardedString || value 
instanceof GuardedByteArray) {
-                                attrTO.getValues().add(getPassword(value));
-                            } else if (value instanceof byte[]) {
-                                attrTO.getValues().add(Base64.encode((byte[]) 
value));
-                            } else {
-                                attrTO.getValues().add(value.toString());
-                            }
-                        }
-                    }
-                }
-
-                connObjectTO.getAttrs().add(attrTO);
-            }
-        }
-
-        return connObjectTO;
-    }
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/59aa00ff/core/provisioning-java/src/main/resources/provisioningContext.xml
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/resources/provisioningContext.xml 
b/core/provisioning-java/src/main/resources/provisioningContext.xml
index 023d234..5b7871a 100644
--- a/core/provisioning-java/src/main/resources/provisioningContext.xml
+++ b/core/provisioning-java/src/main/resources/provisioningContext.xml
@@ -107,7 +107,6 @@ under the License.
   </bean>
 
   <bean 
class="org.apache.syncope.core.provisioning.java.propagation.PropagationManagerImpl"/>
-  <bean 
class="org.apache.syncope.core.provisioning.java.propagation.DefaultPropagationReporter"
 scope="prototype"/>
 
   <bean id="virAttrCache" class="${virAttrCache}" scope="singleton">
     <constructor-arg value="60"/>

Reply via email to