[1/2] syncope git commit: Member -> static method cleanup

2017-09-26 Thread ilgrosso 
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ò 
Authored: Tue Sep 26 12:15:47 2017 +0200
Committer: Francesco Chicchiriccò 
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 {
 private ResourceDataBinder binder;
 
 @Autowired
-private ConnObjectUtils connObjectUtils;
-
-@Autowired
 private MappingManager mappingManager;
 
 @Autowired
@@ -364,7 +361,7 @@ public class ResourceLogic extends 
AbstractTransactionalLogic {
 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 {
 
 @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 tasks, PropagationReporter reporter, 
boolean nullPriorityAsync);
 
 @Override
-public PropagationReporter execute(
-final Collection tasks,
-final boolean nullPriorityAsync) {
-
-PropagationReporter reporter =
-
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
+public PropagationReporter execute(final Collection 
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

[2/2] syncope git commit: Member -> static method cleanup

2017-09-26 Thread ilgrosso 
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ò 
Authored: Tue Sep 26 12:15:47 2017 +0200
Committer: Francesco Chicchiriccò 
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 {
 private ResourceDataBinder binder;
 
 @Autowired
-private ConnObjectUtils connObjectUtils;
-
-@Autowired
 private MappingManager mappingManager;
 
 @Autowired
@@ -351,7 +348,7 @@ public class ResourceLogic extends 
AbstractTransactionalLogic {
 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 {
 
 @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 tasks, PropagationReporter reporter, 
boolean nullPriorityAsync);
 
 @Override
-public PropagationReporter execute(
-final Collection tasks,
-final boolean nullPriorityAsync) {
-
-PropagationReporter reporter =
-
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
+public PropagationReporter execute(final Collection 
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
---