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/678bff96 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/678bff96 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/678bff96 Branch: refs/heads/master Commit: 678bff96de895026a31640c5ae0557cd281504fa Parents: 3765af7 Author: Francesco Chicchiriccò <[email protected]> Authored: Tue Sep 26 12:15:47 2017 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Tue Sep 26 12:21:47 2017 +0200 ---------------------------------------------------------------------- .../syncope/core/logic/ResourceLogic.java | 7 +- .../AbstractPropagationTaskExecutor.java | 8 +- .../propagation/DefaultPropagationReporter.java | 8 +- .../java/utils/ConnObjectUtils.java | 78 +++++++++++--------- .../src/main/resources/provisioningContext.xml | 1 - 5 files changed, 51 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/678bff96/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 87a0c43..36b646e 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 @@ -108,9 +108,6 @@ public class ResourceLogic extends AbstractTransactionalLogic<ResourceTO> { private ResourceDataBinder binder; @Autowired - private ConnObjectUtils connObjectUtils; - - @Autowired private MappingManager mappingManager; @Autowired @@ -351,7 +348,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 + "')") @@ -398,7 +395,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/678bff96/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 2e06e8b..80512f6 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 @@ -513,12 +513,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/678bff96/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 6e58281..c07431c 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 @@ -31,15 +31,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) { @@ -62,11 +58,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/678bff96/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 9f0bbd5..c49c84a 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; @@ -49,6 +50,7 @@ import org.identityconnectors.common.Base64; import org.identityconnectors.common.security.GuardedByteArray; import org.identityconnectors.common.security.GuardedString; import org.identityconnectors.common.security.SecurityUtil; +import org.identityconnectors.framework.common.objects.Attribute; import org.identityconnectors.framework.common.objects.ConnectorObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -104,6 +106,49 @@ 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) { + attrs.stream().map(attr -> { + AttrTO attrTO = new AttrTO(); + attrTO.setSchema(attr.getName()); + if (attr.getValue() != null) { + attr.getValue().stream().filter(value -> value != null).forEachOrdered(value -> { + 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()); + } + }); + } + return attrTO; + }).forEach(attrTO -> { + connObjectTO.getAttrs().add(attrTO); + }); + } + + return connObjectTO; + } + + /** * Build a UserTO / GroupTO / AnyObjectTO out of connector object attributes and schema mapping. * * @param obj connector object @@ -272,37 +317,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) { - connObject.getAttributes().stream().map(attr -> { - AttrTO attrTO = new AttrTO(); - attrTO.setSchema(attr.getName()); - if (attr.getValue() != null) { - attr.getValue().stream().filter(value -> value != null).forEachOrdered(value -> { - 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()); - } - }); - } - return attrTO; - }).forEachOrdered((attrTO) -> { - connObjectTO.getAttrs().add(attrTO); - }); - } - - return connObjectTO; - } } http://git-wip-us.apache.org/repos/asf/syncope/blob/678bff96/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"/>
