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 2015/01/05 14:34:23 UTC
[18/53] [abbrv] syncope git commit: Code formatting with netbeans
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java
index 92b3cfb..d30c624 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java
@@ -55,7 +55,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-
public class CamelUserProvisioningManager implements UserProvisioningManager {
private static final Logger LOG = LoggerFactory.getLogger(CamelUserProvisioningManager.class);
@@ -70,7 +69,7 @@ public class CamelUserProvisioningManager implements UserProvisioningManager {
@Autowired
protected RouteDAO routeDAO;
-
+
@Autowired
protected SyncopeCamelContext contextFactory;
@@ -90,7 +89,7 @@ public class CamelUserProvisioningManager implements UserProvisioningManager {
return content.toString();
}
-
+
public void startContext() throws Exception {
getContext().start();
}
@@ -170,15 +169,15 @@ public class CamelUserProvisioningManager implements UserProvisioningManager {
return create(userTO, true, false, null, Collections.<String>emptySet());
}
-
-
+
public Map.Entry<Long, List<PropagationStatus>> create(final UserTO userTO, boolean storePassword) {
return create(userTO, storePassword, false, null, Collections.<String>emptySet());
}
@Override
- public Map.Entry<Long, List<PropagationStatus>> create(final UserTO userTO, final boolean storePassword, boolean disablePwdPolicyCheck, Boolean enabled, Set<String> excludedResources) {
+ public Map.Entry<Long, List<PropagationStatus>> create(final UserTO userTO, final boolean storePassword,
+ boolean disablePwdPolicyCheck, Boolean enabled, Set<String> excludedResources) {
String uri = "direct:createPort";
PollingConsumer pollingConsumer = getConsumer(uri);
@@ -209,13 +208,12 @@ public class CamelUserProvisioningManager implements UserProvisioningManager {
public Map.Entry<Long, List<PropagationStatus>> update(final UserMod userMod) {
return update(userMod, false);
}
-
-
+
@Override
public Map.Entry<Long, List<PropagationStatus>> update(UserMod userMod, boolean removeMemberships) {
String uri = "direct:updatePort";
PollingConsumer pollingConsumer = getConsumer(uri);
-
+
Map<String, Object> props = new HashMap<String, Object>();
props.put("removeMemberships", removeMemberships);
@@ -227,10 +225,9 @@ public class CamelUserProvisioningManager implements UserProvisioningManager {
throw (RuntimeException) o.getProperty(Exchange.EXCEPTION_CAUGHT);
}
- return o.getIn().getBody(Map.Entry.class);
+ return o.getIn().getBody(Map.Entry.class);
}
-
@Override
public List<PropagationStatus> delete(final Long userId) {
@@ -286,7 +283,8 @@ public class CamelUserProvisioningManager implements UserProvisioningManager {
if (statusMod.isOnSyncope()) {
sendMessage("direct:activateUser", user.getId(), props);
} else {
- WorkflowResult<Long> updated = new WorkflowResult<Long>(user.getId(), null, statusMod.getType().name().toLowerCase());
+ WorkflowResult<Long> updated = new WorkflowResult<Long>(user.getId(), null, statusMod.getType().name().
+ toLowerCase());
sendMessage("direct:statusUser", updated, props);
}
@@ -311,7 +309,8 @@ public class CamelUserProvisioningManager implements UserProvisioningManager {
if (statusMod.isOnSyncope()) {
sendMessage("direct:reactivateUser", user.getId(), props);
} else {
- WorkflowResult<Long> updated = new WorkflowResult<Long>(user.getId(), null, statusMod.getType().name().toLowerCase());
+ WorkflowResult<Long> updated = new WorkflowResult<Long>(user.getId(), null, statusMod.getType().name().
+ toLowerCase());
sendMessage("direct:statusUser", updated, props);
}
@@ -337,7 +336,8 @@ public class CamelUserProvisioningManager implements UserProvisioningManager {
if (statusMod.isOnSyncope()) {
sendMessage("direct:suspendUser", user.getId(), props);
} else {
- WorkflowResult<Long> updated = new WorkflowResult<Long>(user.getId(), null, statusMod.getType().name().toLowerCase());
+ WorkflowResult<Long> updated = new WorkflowResult<Long>(user.getId(), null, statusMod.getType().name().
+ toLowerCase());
sendMessage("direct:statusUser", updated, props);
}
@@ -389,7 +389,8 @@ public class CamelUserProvisioningManager implements UserProvisioningManager {
}
@Override
- public Map.Entry<Long, List<PropagationStatus>> updateInSync(UserMod userMod, Long id, SyncResult result, Boolean enabled, Set<String> excludedResources) {
+ public Map.Entry<Long, List<PropagationStatus>> updateInSync(UserMod userMod, Long id, SyncResult result,
+ Boolean enabled, Set<String> excludedResources) {
String uri = "direct:updateSyncPort";
PollingConsumer pollingConsumer = getConsumer(uri);
@@ -456,7 +457,7 @@ public class CamelUserProvisioningManager implements UserProvisioningManager {
public void confirmPasswordReset(SyncopeUser user, final String token, final String password) {
String uri = "direct:confirmPwdResetPort";
PollingConsumer pollingConsumer = getConsumer(uri);
-
+
Map<String, Object> props = new HashMap<String, Object>();
props.put("user", user);
props.put("userId", user.getId());
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
index 6381649..c529dcf 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.provisioning.camel;
import java.io.ByteArrayInputStream;
@@ -44,38 +43,39 @@ import org.springframework.stereotype.Component;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-
@Component
-public class SyncopeCamelContext{
+public class SyncopeCamelContext {
private static final Logger LOG = LoggerFactory.getLogger(SyncopeCamelContext.class);
- private CamelContext camelContext = null;
-
- public SyncopeCamelContext() {
+ private CamelContext camelContext = null;
+
+ public SyncopeCamelContext() {
}
-
- public CamelContext getContext(RouteDAO routeDAO){
- if(camelContext == null) camelContext = new SpringCamelContext(ApplicationContextProvider.getApplicationContext());
- if(camelContext.getRouteDefinitions().isEmpty()){
-
+ public CamelContext getContext(RouteDAO routeDAO) {
+
+ if (camelContext == null) {
+ camelContext = new SpringCamelContext(ApplicationContextProvider.getApplicationContext());
+ }
+ if (camelContext.getRouteDefinitions().isEmpty()) {
+
List<CamelRoute> crl = routeDAO.findAll();
- LOG.info("{} route(s) are going to be loaded ", crl.size());
+ LOG.info("{} route(s) are going to be loaded ", crl.size());
loadContext(routeDAO, crl);
-
+
try {
camelContext.start();
} catch (Exception ex) {
LOG.error("Error during staring camel context {}", ex);
}
}
-
+
return camelContext;
}
-
- public void loadContext(RouteDAO routeDAO, List<CamelRoute> crl){
-
+
+ public void loadContext(RouteDAO routeDAO, List<CamelRoute> crl) {
+
try {
DocumentBuilder dBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
JAXBContext jaxbContext = JAXBContext.newInstance(Constants.JAXB_CONTEXT_PACKAGES);
@@ -84,7 +84,8 @@ public class SyncopeCamelContext{
for (int s = 0; s < crl.size(); s++) {
- InputStream is = new ByteArrayInputStream( URLDecoder.decode(crl.get(s).getRouteContent(), "UTF-8").getBytes());
+ InputStream is = new ByteArrayInputStream(URLDecoder.decode(crl.get(s).getRouteContent(), "UTF-8").
+ getBytes());
Document doc = dBuilder.parse(is);
doc.getDocumentElement().normalize();
Node routeEl = doc.getElementsByTagName("route").item(0);
@@ -96,42 +97,44 @@ public class SyncopeCamelContext{
} catch (Exception ex) {
LOG.error("Error during loading camel context {}", ex);
}
-
+
}
-
- public void reloadContext(RouteDAO routeDAO){
-
+
+ public void reloadContext(RouteDAO routeDAO) {
+
List<CamelRoute> crl = routeDAO.findAll();
- if(camelContext == null) getContext(routeDAO);
- else {
- if( ! camelContext.getRouteDefinitions().isEmpty()){
- for (Iterator<RouteDefinition> it = camelContext.getRouteDefinitions().iterator(); it.hasNext(); ) {
+ if (camelContext == null) {
+ getContext(routeDAO);
+ } else {
+ if (!camelContext.getRouteDefinitions().isEmpty()) {
+ for (Iterator<RouteDefinition> it = camelContext.getRouteDefinitions().iterator(); it.hasNext();) {
RouteDefinition ard = it.next();
- it.remove();
- }
+ it.remove();
+ }
}
loadContext(routeDAO, crl);
}
}
-
- public void reloadContext(RouteDAO routeDAO, Long routeId){
-
- if(camelContext == null) getContext(routeDAO);
- else {
- if( ! camelContext.getRouteDefinitions().isEmpty()){
-
+
+ public void reloadContext(RouteDAO routeDAO, Long routeId) {
+
+ if (camelContext == null) {
+ getContext(routeDAO);
+ } else {
+ if (!camelContext.getRouteDefinitions().isEmpty()) {
+
camelContext.getRouteDefinitions().remove(routeId.intValue());
List<CamelRoute> crl = new ArrayList<CamelRoute>();
crl.add(routeDAO.find(routeId));
loadContext(routeDAO, crl);
}
-
+
}
-
+
}
-
- public List<RouteDefinition> getDefinitions(){
+
+ public List<RouteDefinition> getDefinitions() {
return camelContext.getRouteDefinitions();
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreatePropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreatePropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreatePropagation.java
index 2c34090..2af3d37 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreatePropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreatePropagation.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.provisioning.camel.processors;
import java.util.AbstractMap;
@@ -41,22 +40,23 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class DefaultRoleCreatePropagation implements Processor{
+public class DefaultRoleCreatePropagation implements Processor {
private static final Logger LOG = LoggerFactory.getLogger(DefaultRoleCreatePropagation.class);
-
+
@Autowired
protected PropagationManager propagationManager;
+
@Autowired
protected PropagationTaskExecutor taskExecutor;
-
+
@Override
- public void process(Exchange exchange){
-
+ public void process(Exchange exchange) {
+
WorkflowResult<Long> created = (WorkflowResult) exchange.getIn().getBody();
RoleTO subject = exchange.getProperty("subject", RoleTO.class);
- Set<String> excludedResource = exchange.getProperty("excludedResources", Set.class);
-
+ Set<String> excludedResource = exchange.getProperty("excludedResources", Set.class);
+
EntitlementUtil.extendAuthContext(created.getResult());
List<PropagationTask> tasks = propagationManager.getRoleCreateTaskIds(created, subject.getVirAttrs());
@@ -68,11 +68,11 @@ public class DefaultRoleCreatePropagation implements Processor{
LOG.error("Error propagation primary resource", e);
propagationReporter.onPrimaryResourceFailure(tasks);
}
-
+
Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(
created.getResult(), propagationReporter.getStatuses());
-
+
exchange.getOut().setBody(result);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreateSyncPropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreateSyncPropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreateSyncPropagation.java
index c216c41..d796d6d 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreateSyncPropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreateSyncPropagation.java
@@ -2,23 +2,22 @@ package org.apache.syncope.core.provisioning.camel.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
-
import java.util.AbstractMap;
import java.util.Collections;
import java.util.List;
@@ -41,25 +40,25 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@Component
-public class DefaultRoleCreateSyncPropagation implements Processor{
+public class DefaultRoleCreateSyncPropagation implements Processor {
-
@Autowired
protected PropagationManager propagationManager;
+
@Autowired
protected PropagationTaskExecutor taskExecutor;
-
+
private static final Logger LOG = LoggerFactory.getLogger(DefaultRoleCreateSyncPropagation.class);
-
+
@Override
- public void process(Exchange exchange){
-
+ public void process(Exchange exchange) {
+
WorkflowResult<Long> created = (WorkflowResult) exchange.getIn().getBody();
-
+
RoleTO actual = exchange.getProperty("subject", RoleTO.class);
Map<Long, String> roleOwnerMap = exchange.getProperty("roleOwnerMap", Map.class);
Set<String> excludedResource = exchange.getProperty("excludedResources", Set.class);
-
+
AttributeTO roleOwner = actual.getAttrMap().get(StringUtils.EMPTY);
if (roleOwner != null) {
@@ -72,10 +71,10 @@ public class DefaultRoleCreateSyncPropagation implements Processor{
actual.getVirAttrs(), excludedResource);
taskExecutor.execute(tasks);
-
+
Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(
created.getResult(), Collections.<PropagationStatus>emptyList());
-
+
exchange.getOut().setBody(result);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeletePropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeletePropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeletePropagation.java
index 6523b76..1c00131 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeletePropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeletePropagation.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.provisioning.camel.processors;
import java.util.ArrayList;
@@ -40,25 +39,30 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class DefaultRoleDeletePropagation implements Processor{
+public class DefaultRoleDeletePropagation implements Processor {
private static final Logger LOG = LoggerFactory.getLogger(DefaultRoleDeletePropagation.class);
+
@Autowired
protected RoleWorkflowAdapter rwfAdapter;
+
@Autowired
protected PropagationManager propagationManager;
+
@Autowired
- protected PropagationTaskExecutor taskExecutor;
+ protected PropagationTaskExecutor taskExecutor;
+
@Autowired
protected RoleDAO roleDAO;
+
@Autowired
protected RoleDataBinder binder;
-
+
@Override
public void process(Exchange exchange) throws Exception {
-
+
Long subjectId = exchange.getIn().getBody(Long.class);
-
+
final List<SyncopeRole> toBeDeprovisioned = new ArrayList<SyncopeRole>();
final SyncopeRole syncopeRole = roleDAO.find(subjectId);
@@ -92,11 +96,9 @@ public class DefaultRoleDeletePropagation implements Processor{
} catch (PropagationException e) {
LOG.error("Error propagation primary resource", e);
propagationReporter.onPrimaryResourceFailure(tasks);
- }
-
+ }
+
exchange.setProperty("statuses", propagationReporter.getStatuses());
}
-
-
-
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeprovisionPropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeprovisionPropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeprovisionPropagation.java
index 77e9e73..a7c35fb 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeprovisionPropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeprovisionPropagation.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.provisioning.camel.processors;
import java.util.HashSet;
@@ -38,29 +37,32 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class DefaultRoleDeprovisionPropagation implements Processor{
+public class DefaultRoleDeprovisionPropagation implements Processor {
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserDeprovisionPropagation.class);
-
+
@Autowired
protected PropagationManager propagationManager;
+
@Autowired
protected PropagationTaskExecutor taskExecutor;
+
@Autowired
protected RoleDataBinder binder;
-
+
@Override
- public void process(Exchange exchange){
-
+ public void process(Exchange exchange) {
+
Long roleId = exchange.getIn().getBody(Long.class);
List<String> resources = exchange.getProperty("resources", List.class);
-
+
final SyncopeRole role = binder.getRoleFromId(roleId);
-
+
final Set<String> noPropResourceName = role.getResourceNames();
noPropResourceName.removeAll(resources);
-
- final List<PropagationTask> tasks = propagationManager.getRoleDeleteTaskIds(roleId, new HashSet<String>(resources), noPropResourceName);
+
+ final List<PropagationTask> tasks = propagationManager.getRoleDeleteTaskIds(roleId, new HashSet<String>(
+ resources), noPropResourceName);
PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().getBean(
PropagationReporter.class);
try {
@@ -69,8 +71,8 @@ public class DefaultRoleDeprovisionPropagation implements Processor{
LOG.error("Error propagation primary resource", e);
propagationReporter.onPrimaryResourceFailure(tasks);
}
-
+
exchange.getOut().setBody(propagationReporter.getStatuses());
- }
-
+ }
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleUpdatePropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleUpdatePropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleUpdatePropagation.java
index 30fe08d..90d37dd 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleUpdatePropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleUpdatePropagation.java
@@ -40,25 +40,27 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class DefaultRoleUpdatePropagation implements Processor{
+public class DefaultRoleUpdatePropagation implements Processor {
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserUpdatePropagation.class);
-
+
@Autowired
protected PropagationManager propagationManager;
+
@Autowired
protected PropagationTaskExecutor taskExecutor;
+
@Autowired
protected UserDataBinder binder;
-
+
@Override
- public void process(Exchange exchange){
- WorkflowResult<Long> updated = (WorkflowResult) exchange.getIn().getBody();
- RoleMod subjectMod = exchange.getProperty("subjectMod", RoleMod.class);
+ public void process(Exchange exchange) {
+ WorkflowResult<Long> updated = (WorkflowResult) exchange.getIn().getBody();
+ RoleMod subjectMod = exchange.getProperty("subjectMod", RoleMod.class);
Set<String> excludedResource = exchange.getProperty("excludedResources", Set.class);
-
+
List<PropagationTask> tasks = propagationManager.getRoleUpdateTaskIds(updated,
- subjectMod.getVirAttrsToRemove(), subjectMod.getVirAttrsToUpdate(),excludedResource);
+ subjectMod.getVirAttrsToRemove(), subjectMod.getVirAttrsToUpdate(), excludedResource);
PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().getBean(
PropagationReporter.class);
try {
@@ -67,11 +69,11 @@ public class DefaultRoleUpdatePropagation implements Processor{
LOG.error("Error propagation primary resource", e);
propagationReporter.onPrimaryResourceFailure(tasks);
}
-
+
Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(
updated.getResult(), propagationReporter.getStatuses());
-
+
exchange.getOut().setBody(result);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserConfirmPwdResetPropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserConfirmPwdResetPropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserConfirmPwdResetPropagation.java
index 3ffa5b6..f3d9d74 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserConfirmPwdResetPropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserConfirmPwdResetPropagation.java
@@ -35,17 +35,18 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class DefaultUserConfirmPwdResetPropagation implements Processor{
+public class DefaultUserConfirmPwdResetPropagation implements Processor {
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserConfirmPwdResetPropagation.class);
-
+
@Autowired
protected PropagationManager propagationManager;
+
@Autowired
protected PropagationTaskExecutor taskExecutor;
-
+
@Override
- public void process(Exchange exchange){
+ public void process(Exchange exchange) {
SyncopeUser user = exchange.getProperty("user", SyncopeUser.class);
List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(user, null, null);
@@ -56,6 +57,6 @@ public class DefaultUserConfirmPwdResetPropagation implements Processor{
} catch (PropagationException e) {
LOG.error("Error propagation primary resource", e);
propReporter.onPrimaryResourceFailure(tasks);
- }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserCreatePropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserCreatePropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserCreatePropagation.java
index 3d2b18d..82ba0ab 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserCreatePropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserCreatePropagation.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.provisioning.camel.processors;
import java.util.AbstractMap;
@@ -40,24 +39,25 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class DefaultUserCreatePropagation implements Processor{
+public class DefaultUserCreatePropagation implements Processor {
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserCreatePropagation.class);
-
+
@Autowired
protected PropagationManager propagationManager;
+
@Autowired
protected PropagationTaskExecutor taskExecutor;
-
+
@Override
- public void process(Exchange exchange){
-
- if((exchange.getIn().getBody() instanceof WorkflowResult)){
-
- WorkflowResult<Map.Entry<Long, Boolean>> created = (WorkflowResult) exchange.getIn().getBody();
+ public void process(Exchange exchange) {
+
+ if ((exchange.getIn().getBody() instanceof WorkflowResult)) {
+
+ WorkflowResult<Map.Entry<Long, Boolean>> created = (WorkflowResult) exchange.getIn().getBody();
UserTO actual = exchange.getProperty("actual", UserTO.class);
Set<String> excludedResource = exchange.getProperty("excludedResources", Set.class);
-
+
List<PropagationTask> tasks = propagationManager.getUserCreateTaskIds(
created, actual.getPassword(), actual.getVirAttrs(), excludedResource, actual.getMemberships());
PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().
@@ -68,11 +68,12 @@ public class DefaultUserCreatePropagation implements Processor{
LOG.error("Error propagation primary resource {}", e);
propagationReporter.onPrimaryResourceFailure(tasks);
}
-
- Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(created.getResult().getKey(), propagationReporter.getStatuses());
+
+ Map.Entry<Long, List<PropagationStatus>> result =
+ new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(created.getResult().getKey(),
+ propagationReporter.getStatuses());
exchange.getOut().setBody(result);
- }
+ }
}
-
-
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeletePropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeletePropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeletePropagation.java
index b8fa699..3f80459 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeletePropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeletePropagation.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.provisioning.camel.processors;
import java.util.List;
@@ -35,28 +34,30 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class DefaultUserDeletePropagation implements Processor{
-
+public class DefaultUserDeletePropagation implements Processor {
+
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserDeletePropagation.class);
+
@Autowired
protected PropagationManager propagationManager;
+
@Autowired
protected PropagationTaskExecutor taskExecutor;
-
+
@Override
public void process(Exchange exchange) throws Exception {
-
- Long userId = (Long) exchange.getIn().getBody();
+
+ Long userId = (Long) exchange.getIn().getBody();
LOG.info("UserId {} ", userId);
-
- Set<String> excludedResource = exchange.getProperty("excludedResources", Set.class);
-
+
+ Set<String> excludedResource = exchange.getProperty("excludedResources", Set.class);
+
// Note here that we can only notify about "delete", not any other
// task defined in workflow process definition: this because this
// information could only be available after uwfAdapter.delete(), which
// will also effectively remove user from db, thus making virtually
// impossible by NotificationManager to fetch required user information
- List<PropagationTask> tasks = propagationManager.getUserDeleteTaskIds(userId,excludedResource);
+ List<PropagationTask> tasks = propagationManager.getUserDeleteTaskIds(userId, excludedResource);
PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().
getBean(PropagationReporter.class);
@@ -66,8 +67,8 @@ public class DefaultUserDeletePropagation implements Processor{
LOG.error("Error propagation primary resource", e);
propagationReporter.onPrimaryResourceFailure(tasks);
}
-
+
exchange.setProperty("statuses", propagationReporter.getStatuses());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeprovisionPropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeprovisionPropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeprovisionPropagation.java
index 2d2eba9..a529dea 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeprovisionPropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeprovisionPropagation.java
@@ -37,28 +37,30 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class DefaultUserDeprovisionPropagation implements Processor{
+public class DefaultUserDeprovisionPropagation implements Processor {
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserDeprovisionPropagation.class);
-
+
@Autowired
protected PropagationManager propagationManager;
+
@Autowired
protected PropagationTaskExecutor taskExecutor;
+
@Autowired
protected UserDataBinder binder;
-
+
@Override
- public void process(Exchange exchange){
-
+ public void process(Exchange exchange) {
+
Long userId = exchange.getIn().getBody(Long.class);
List<String> resources = exchange.getProperty("resources", List.class);
-
- final SyncopeUser user = binder.getUserFromId(userId);
-
+
+ final SyncopeUser user = binder.getUserFromId(userId);
+
final Set<String> noPropResourceName = user.getResourceNames();
noPropResourceName.removeAll(resources);
-
+
final List<PropagationTask> tasks =
propagationManager.getUserDeleteTaskIds(userId, new HashSet<String>(resources), noPropResourceName);
final PropagationReporter propagationReporter =
@@ -69,8 +71,8 @@ public class DefaultUserDeprovisionPropagation implements Processor{
LOG.error("Error propagation primary resource", e);
propagationReporter.onPrimaryResourceFailure(tasks);
}
-
+
exchange.getOut().setBody(propagationReporter.getStatuses());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserStatusPropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserStatusPropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserStatusPropagation.java
index 8bbc246..cc167d7 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserStatusPropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserStatusPropagation.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.provisioning.camel.processors;
import java.util.AbstractMap;
@@ -42,22 +41,24 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class DefaultUserStatusPropagation implements Processor{
-
+public class DefaultUserStatusPropagation implements Processor {
+
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserStatusPropagation.class);
+
@Autowired
protected PropagationManager propagationManager;
+
@Autowired
protected PropagationTaskExecutor taskExecutor;
-
+
@Override
- public void process(Exchange exchange){
-
+ public void process(Exchange exchange) {
+
WorkflowResult<Long> updated = (WorkflowResult) exchange.getIn().getBody();
-
+
SyncopeUser user = exchange.getProperty("user", SyncopeUser.class);
StatusMod statusMod = exchange.getProperty("statusMod", StatusMod.class);
-
+
Set<String> resourcesToBeExcluded = new HashSet<String>(user.getResourceNames());
resourcesToBeExcluded.removeAll(statusMod.getResourceNames());
@@ -71,8 +72,9 @@ public class DefaultUserStatusPropagation implements Processor{
LOG.error("Error propagation primary resource", e);
propReporter.onPrimaryResourceFailure(tasks);
}
-
- Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(updated.getResult(), propReporter.getStatuses());
- exchange.getOut().setBody(result);
- }
+
+ Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(
+ updated.getResult(), propReporter.getStatuses());
+ exchange.getOut().setBody(result);
+ }
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdateInSyncPropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdateInSyncPropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdateInSyncPropagation.java
index 48eb3d9..a931a5b 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdateInSyncPropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdateInSyncPropagation.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.provisioning.camel.processors;
import java.util.AbstractMap;
@@ -42,39 +41,44 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class DefaultUserUpdateInSyncPropagation implements Processor{
+public class DefaultUserUpdateInSyncPropagation implements Processor {
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserUpdateInSyncPropagation.class);
-
+
@Autowired
protected PropagationManager propagationManager;
+
@Autowired
protected PropagationTaskExecutor taskExecutor;
+
@Autowired
protected UserDataBinder binder;
+
@Autowired
protected UserDAO userDAO;
-
+
@Override
- public void process(Exchange exchange){
-
- WorkflowResult<Map.Entry<UserMod, Boolean>> updated = (WorkflowResult) exchange.getIn().getBody();
+ public void process(Exchange exchange) {
+
+ WorkflowResult<Map.Entry<UserMod, Boolean>> updated = (WorkflowResult) exchange.getIn().getBody();
+
+ Set<String> excludedResource = exchange.getProperty("excludedResources", Set.class);
+
+ PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().
+ getBean(PropagationReporter.class);
+
+ List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(updated, updated.getResult().getKey().
+ getPassword() != null, excludedResource);
- Set<String> excludedResource = exchange.getProperty("excludedResources", Set.class);
-
- PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().
- getBean(PropagationReporter.class);
+ try {
+ taskExecutor.execute(tasks, propagationReporter);
+ } catch (PropagationException e) {
+ LOG.error("Error propagation primary resource", e);
+ propagationReporter.onPrimaryResourceFailure(tasks);
+ }
- List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(updated,updated.getResult().getKey().getPassword() != null,excludedResource);
-
- try {
- taskExecutor.execute(tasks, propagationReporter);
- } catch (PropagationException e) {
- LOG.error("Error propagation primary resource", e);
- propagationReporter.onPrimaryResourceFailure(tasks);
- }
-
- Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(updated.getResult().getKey().getId(), propagationReporter.getStatuses());
- exchange.getOut().setBody(result);
+ Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(
+ updated.getResult().getKey().getId(), propagationReporter.getStatuses());
+ exchange.getOut().setBody(result);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java
index c8ffe34..a94bea5 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.provisioning.camel.processors;
import java.util.AbstractMap;
@@ -45,78 +44,81 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class DefaultUserUpdatePropagation implements Processor{
+public class DefaultUserUpdatePropagation implements Processor {
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserUpdatePropagation.class);
-
+
@Autowired
protected PropagationManager propagationManager;
+
@Autowired
protected PropagationTaskExecutor taskExecutor;
+
@Autowired
protected UserDataBinder binder;
-
+
@Override
- public void process(Exchange exchange){
-
- WorkflowResult<Map.Entry<UserMod, Boolean>> updated = (WorkflowResult) exchange.getIn().getBody();
- UserMod actual = exchange.getProperty("actual", UserMod.class);
- boolean removeMemberships = exchange.getProperty("removeMemberships", boolean.class);
-
- // SYNCOPE-501: check if there are memberships to be removed with virtual attributes assigned
- /*for (Long membershipId : actual.getMembershipsToRemove()) {
- if (!binder.fillMembershipVirtual(
- null,
- null,
- membershipId,
- Collections.<String>emptySet(),
- Collections.<AttributeMod>emptySet(),
- true).isEmpty()) {
+ public void process(Exchange exchange) {
- removeMemberships = true;
- }
- }*/
-
- List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(updated);
- if (tasks.isEmpty()) {
- // SYNCOPE-459: take care of user virtual attributes ...
- final PropagationByResource propByResVirAttr = binder.fillVirtual(
+ WorkflowResult<Map.Entry<UserMod, Boolean>> updated = (WorkflowResult) exchange.getIn().getBody();
+ UserMod actual = exchange.getProperty("actual", UserMod.class);
+ boolean removeMemberships = exchange.getProperty("removeMemberships", boolean.class);
+
+ // SYNCOPE-501: check if there are memberships to be removed with virtual attributes assigned
+ /* for (Long membershipId :
+ * actual.getMembershipsToRemove()) {
+ * if (!binder.fillMembershipVirtual(
+ * null,
+ * null,
+ * membershipId,
+ * Collections.<String>emptySet(),
+ * Collections.<AttributeMod>emptySet(),
+ * true).isEmpty()) {
+ *
+ * removeMemberships = true;
+ * }
+ * } */
+ List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(updated);
+ if (tasks.isEmpty()) {
+ // SYNCOPE-459: take care of user virtual attributes ...
+ final PropagationByResource propByResVirAttr = binder.fillVirtual(
+ updated.getResult().getKey().getId(),
+ actual.getVirAttrsToRemove(),
+ actual.getVirAttrsToUpdate());
+ // SYNCOPE-501: update only virtual attributes (if any of them changed), password propagation is
+ // not required, take care also of membership virtual attributes
+ boolean addOrUpdateMemberships = false;
+ for (MembershipMod membershipMod : actual.getMembershipsToAdd()) {
+ if (!binder.fillMembershipVirtual(
updated.getResult().getKey().getId(),
- actual.getVirAttrsToRemove(),
- actual.getVirAttrsToUpdate());
- // SYNCOPE-501: update only virtual attributes (if any of them changed), password propagation is
- // not required, take care also of membership virtual attributes
- boolean addOrUpdateMemberships = false;
- for (MembershipMod membershipMod : actual.getMembershipsToAdd()) {
- if (!binder.fillMembershipVirtual(
- updated.getResult().getKey().getId(),
- membershipMod.getRole(),
- null,
- membershipMod.getVirAttrsToRemove(),
- membershipMod.getVirAttrsToUpdate(),
- false).isEmpty()) {
+ membershipMod.getRole(),
+ null,
+ membershipMod.getVirAttrsToRemove(),
+ membershipMod.getVirAttrsToUpdate(),
+ false).isEmpty()) {
- addOrUpdateMemberships = true;
- }
+ addOrUpdateMemberships = true;
}
- tasks.addAll(!propByResVirAttr.isEmpty() || addOrUpdateMemberships || removeMemberships
- ? propagationManager.getUserUpdateTaskIds(updated, false, null)
- : Collections.<PropagationTask>emptyList());
}
+ tasks.addAll(!propByResVirAttr.isEmpty() || addOrUpdateMemberships || removeMemberships
+ ? propagationManager.getUserUpdateTaskIds(updated, false, null)
+ : Collections.<PropagationTask>emptyList());
+ }
- PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().
- getBean(PropagationReporter.class);
+ PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().
+ getBean(PropagationReporter.class);
- if (!tasks.isEmpty()) {
- try {
- taskExecutor.execute(tasks, propagationReporter);
- } catch (PropagationException e) {
- LOG.error("Error propagation primary resource", e);
- propagationReporter.onPrimaryResourceFailure(tasks);
- }
+ if (!tasks.isEmpty()) {
+ try {
+ taskExecutor.execute(tasks, propagationReporter);
+ } catch (PropagationException e) {
+ LOG.error("Error propagation primary resource", e);
+ propagationReporter.onPrimaryResourceFailure(tasks);
}
-
- Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(updated.getResult().getKey().getId(), propagationReporter.getStatuses());
- exchange.getOut().setBody(result);
+ }
+
+ Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(
+ updated.getResult().getKey().getId(), propagationReporter.getStatuses());
+ exchange.getOut().setBody(result);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserWFSuspendPropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserWFSuspendPropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserWFSuspendPropagation.java
index e20c84e..88cd160 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserWFSuspendPropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserWFSuspendPropagation.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.provisioning.camel.processors;
import java.util.AbstractMap.SimpleEntry;
@@ -35,19 +34,20 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class DefaultUserWFSuspendPropagation implements Processor{
+public class DefaultUserWFSuspendPropagation implements Processor {
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserWFSuspendPropagation.class);
-
+
@Autowired
protected PropagationManager propagationManager;
+
@Autowired
protected PropagationTaskExecutor taskExecutor;
-
+
@Override
- public void process(Exchange exchange){
-
- WorkflowResult<Long> updated = (WorkflowResult) exchange.getIn().getBody();
+ public void process(Exchange exchange) {
+
+ WorkflowResult<Long> updated = (WorkflowResult) exchange.getIn().getBody();
Boolean suspend = exchange.getProperty("suspend", Boolean.class);
if (suspend) {
@@ -62,5 +62,5 @@ public class DefaultUserWFSuspendPropagation implements Processor{
taskExecutor.execute(tasks);
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/UserStatusOnSync.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/UserStatusOnSync.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/UserStatusOnSync.java
index b2acdfb..7cb7dfa 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/UserStatusOnSync.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/UserStatusOnSync.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.provisioning.camel.processors;
import java.util.Map;
@@ -33,42 +32,43 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
-public class UserStatusOnSync implements Processor{
-
+public class UserStatusOnSync implements Processor {
+
private static final Logger LOG = LoggerFactory.getLogger(UserStatusOnSync.class);
-
+
@Autowired
protected UserDAO userDAO;
+
@Autowired
protected UserWorkflowAdapter uwfAdapter;
-
+
@Override
- public void process(Exchange exchange){
-
- WorkflowResult<Map.Entry<UserMod, Boolean>> updated = (WorkflowResult) exchange.getIn().getBody();
-
+ public void process(Exchange exchange) {
+
+ WorkflowResult<Map.Entry<UserMod, Boolean>> updated = (WorkflowResult) exchange.getIn().getBody();
+
Boolean enabled = exchange.getProperty("enabled", Boolean.class);
Long id = exchange.getProperty("id", Long.class);
-
+
if (enabled != null) {
- SyncopeUser user = userDAO.find(id);
+ SyncopeUser user = userDAO.find(id);
- WorkflowResult<Long> enableUpdate = null;
- if (user.isSuspended() == null) {
- enableUpdate = uwfAdapter.activate(id, null);
- } else if (enabled && user.isSuspended()) {
- enableUpdate = uwfAdapter.reactivate(id);
- } else if (!enabled && !user.isSuspended()) {
- enableUpdate = uwfAdapter.suspend(id);
- }
+ WorkflowResult<Long> enableUpdate = null;
+ if (user.isSuspended() == null) {
+ enableUpdate = uwfAdapter.activate(id, null);
+ } else if (enabled && user.isSuspended()) {
+ enableUpdate = uwfAdapter.reactivate(id);
+ } else if (!enabled && !user.isSuspended()) {
+ enableUpdate = uwfAdapter.suspend(id);
+ }
- if (enableUpdate != null) {
- if (enableUpdate.getPropByRes() != null) {
- updated.getPropByRes().merge(enableUpdate.getPropByRes());
- updated.getPropByRes().purge();
- }
- updated.getPerformedTasks().addAll(enableUpdate.getPerformedTasks());
- }
- }
+ if (enableUpdate != null) {
+ if (enableUpdate.getPropByRes() != null) {
+ updated.getPropByRes().merge(enableUpdate.getPropByRes());
+ updated.getPropByRes().purge();
+ }
+ updated.getPerformedTasks().addAll(enableUpdate.getPerformedTasks());
+ }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/quartz/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/quartz/package-info.java b/core/src/main/java/org/apache/syncope/core/quartz/package-info.java
index 9447e7d..e2121f2 100644
--- a/core/src/main/java/org/apache/syncope/core/quartz/package-info.java
+++ b/core/src/main/java/org/apache/syncope/core/quartz/package-info.java
@@ -17,4 +17,3 @@
* under the License.
*/
package org.apache.syncope.core.quartz;
-
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/report/ReportletConfClass.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/report/ReportletConfClass.java b/core/src/main/java/org/apache/syncope/core/report/ReportletConfClass.java
index 146b23d..e22fa92 100644
--- a/core/src/main/java/org/apache/syncope/core/report/ReportletConfClass.java
+++ b/core/src/main/java/org/apache/syncope/core/report/ReportletConfClass.java
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
import org.apache.syncope.common.report.ReportletConf;
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
public @interface ReportletConfClass {
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/report/cocoon/TextSerializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/report/cocoon/TextSerializer.java b/core/src/main/java/org/apache/syncope/core/report/cocoon/TextSerializer.java
index 992df5f..d6e5e4c 100644
--- a/core/src/main/java/org/apache/syncope/core/report/cocoon/TextSerializer.java
+++ b/core/src/main/java/org/apache/syncope/core/report/cocoon/TextSerializer.java
@@ -98,4 +98,4 @@ public class TextSerializer extends XMLSerializer {
serializer.setMethod(TXT);
return serializer;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java b/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java
index a4e53b8..b02bef8 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java
@@ -217,7 +217,7 @@ public class LoggerController extends AbstractTransactionalController<LoggerTO>
final String packageSearchPath =
ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
+ ClassUtils.convertClassNameToResourcePath(
- SystemPropertyUtils.resolvePlaceholders(this.getClass().getPackage().getName()))
+ SystemPropertyUtils.resolvePlaceholders(this.getClass().getPackage().getName()))
+ "/" + "**/*.class";
final Resource[] resources = resourcePatternResolver.getResources(packageSearchPath);
@@ -239,7 +239,7 @@ public class LoggerController extends AbstractTransactionalController<LoggerTO>
}
}
}
-
+
//SYNCOPE-608
final EventCategoryTO authenticationControllerEvents = new EventCategoryTO();
authenticationControllerEvents.setCategory("AuthenticationController");
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java b/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
index 701dc5b..3a0f9d6 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
@@ -95,7 +95,7 @@ public class RoleController extends AbstractSubjectController<RoleTO, RoleMod> {
@Resource(name = "anonymousUser")
private String anonymousUser;
-
+
@Resource(name = "roleProvisioningManager")
protected RoleProvisioningManager provisioningManager;
@@ -259,7 +259,7 @@ public class RoleController extends AbstractSubjectController<RoleTO, RoleMod> {
LOG.debug("Transformed: {}", actual);
Map.Entry<Long, List<PropagationStatus>> updated = provisioningManager.update(roleMod);
-
+
final RoleTO updatedTO = binder.getRoleTO(updated.getKey());
updatedTO.getPropagationStatusTOs().addAll(updated.getValue());
return updatedTO;
@@ -281,7 +281,7 @@ public class RoleController extends AbstractSubjectController<RoleTO, RoleMod> {
}
List<PropagationStatus> statuses = provisioningManager.delete(roleId);
-
+
RoleTO roleTO = new RoleTO();
roleTO.setId(roleId);
@@ -318,7 +318,7 @@ public class RoleController extends AbstractSubjectController<RoleTO, RoleMod> {
roleMod.setId(roleId);
roleMod.getResourcesToRemove().addAll(resources);
final Long updatedResult = provisioningManager.unlink(roleMod);
-
+
return binder.getRoleTO(updatedResult);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/rest/controller/RouteController.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/controller/RouteController.java b/core/src/main/java/org/apache/syncope/core/rest/controller/RouteController.java
index 117d10f..f905f2c 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/controller/RouteController.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/controller/RouteController.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.rest.controller;
import java.lang.reflect.Method;
@@ -36,57 +35,58 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@Component
-public class RouteController extends AbstractTransactionalController<RouteTO>{
-
+public class RouteController extends AbstractTransactionalController<RouteTO> {
+
private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(RouteDataBinder.class);
-
+
@Autowired
private RouteDAO routeDao;
-
+
@Autowired
private RouteDataBinder binder;
-
+
@Autowired
private SyncopeCamelContext context;
-
-
+
@PreAuthorize("hasRole('ROUTE_LIST')")
@Transactional(readOnly = true)
- public List<RouteTO> listRoutes(){
+ public List<RouteTO> listRoutes() {
List<RouteTO> routes = new ArrayList<RouteTO>();
Iterator it = routeDao.findAll().iterator();
- while(it.hasNext()){
+ while (it.hasNext()) {
routes.add(binder.getRouteTO((CamelRoute) it.next()));
}
return routes;
}
-
+
@PreAuthorize("hasRole('ROUTE_READ')")
@Transactional(readOnly = true)
- public RouteTO readRoute(Long id){
+ public RouteTO readRoute(Long id) {
CamelRoute route = routeDao.find(id);
- if (route==null)
- throw new NotFoundException("Route with id="+id);
-
+ if (route == null) {
+ throw new NotFoundException("Route with id=" + id);
+ }
+
return binder.getRouteTO(route);
}
-
+
@PreAuthorize("hasRole('ROUTE_UPDATE')")
- public void updateRoute(RouteTO routeTO){
+ public void updateRoute(RouteTO routeTO) {
CamelRoute route = routeDao.find(routeTO.getId());
- if (route==null)
- throw new NotFoundException("Route with id="+route.getId());
+ if (route == null) {
+ throw new NotFoundException("Route with id=" + route.getId());
+ }
route.setRouteContent(routeTO.getRouteContent());
- routeDao.save(route);
+ routeDao.save(route);
LOG.info("UPDATING ROUTE WITH ID {} ", routeTO.getId());
LOG.info("NEW ROUTE CONTENT {} ", routeTO.getRouteContent());
context.reloadContext(routeDao, routeTO.getId());
- }
-
+ }
+
@Override
protected RouteTO resolveReference(Method method, Object... args) throws UnresolvedReferenceException {
throw new UnresolvedReferenceException();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java b/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
index 0a30a86..0607a5f 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
@@ -96,7 +96,7 @@ public class UserController extends AbstractSubjectController<UserTO, UserMod> {
@Autowired
protected AttributableTransformer attrTransformer;
-
+
@Resource(name = "userProvisioningManager")
protected UserProvisioningManager provisioningManager;
@@ -212,8 +212,7 @@ public class UserController extends AbstractSubjectController<UserTO, UserMod> {
UserTO actual = attrTransformer.transform(userTO);
LOG.debug("Transformed: {}", actual);
- Map.Entry<Long, List<PropagationStatus>>
- created = provisioningManager.create(actual,storePassword);
+ Map.Entry<Long, List<PropagationStatus>> created = provisioningManager.create(actual, storePassword);
final UserTO savedTO = binder.getUserTO(created.getKey());
savedTO.getPropagationStatusTOs().addAll(created.getValue());
@@ -238,7 +237,7 @@ public class UserController extends AbstractSubjectController<UserTO, UserMod> {
// AttributableMod transformation (if configured)
UserMod actual = attrTransformer.transform(userMod);
LOG.debug("Transformed: {}", actual);
-
+
//CAMEL
// SYNCOPE-501: check if there are memberships to be removed with virtual attributes assigned
boolean removeMemberships = false;
@@ -254,15 +253,16 @@ public class UserController extends AbstractSubjectController<UserTO, UserMod> {
removeMemberships = true;
}
}
-
- Map.Entry<Long, List<PropagationStatus>> updated = provisioningManager.update(actual,removeMemberships);
+
+ Map.Entry<Long, List<PropagationStatus>> updated = provisioningManager.update(actual, removeMemberships);
final UserTO updatedTO = binder.getUserTO(updated.getKey());
updatedTO.getPropagationStatusTOs().addAll(updated.getValue());
return updatedTO;
}
- protected Map.Entry<Long, List<PropagationStatus>> setStatusOnWfAdapter(final SyncopeUser user, final StatusMod statusMod) {
+ protected Map.Entry<Long, List<PropagationStatus>> setStatusOnWfAdapter(final SyncopeUser user,
+ final StatusMod statusMod) {
Map.Entry<Long, List<PropagationStatus>> updated;
switch (statusMod.getType()) {
@@ -289,8 +289,7 @@ public class UserController extends AbstractSubjectController<UserTO, UserMod> {
public UserTO status(final StatusMod statusMod) {
SyncopeUser user = binder.getUserFromId(statusMod.getId());
- Map.Entry<Long, List<PropagationStatus>>
- updated = setStatusOnWfAdapter(user, statusMod);
+ Map.Entry<Long, List<PropagationStatus>> updated = setStatusOnWfAdapter(user, statusMod);
final UserTO savedTO = binder.getUserTO(updated.getKey());
savedTO.getPropagationStatusTOs().addAll(updated.getValue());
return savedTO;
@@ -477,8 +476,8 @@ public class UserController extends AbstractSubjectController<UserTO, UserMod> {
@Transactional(rollbackFor = { Throwable.class })
@Override
public UserTO deprovision(final Long userId, final Collection<String> resources) {
- final SyncopeUser user = binder.getUserFromId(userId);
-
+ final SyncopeUser user = binder.getUserFromId(userId);
+
List<PropagationStatus> statuses = provisioningManager.deprovision(userId, resources);
final UserTO updatedUserTO = binder.getUserTO(user);
@@ -535,18 +534,18 @@ public class UserController extends AbstractSubjectController<UserTO, UserMod> {
throw new UnresolvedReferenceException();
}
-
- public PrintStream getDefinition() throws FileNotFoundException{
- /*String result = "";
- if(provisioningManager instanceof CamelUserProvisioningManager){
- List l = ((CamelUserProvisioningManager)provisioningManager).getRoutes();
- Iterator<CamelRoute> it = l.iterator();
-
- while(it.hasNext()){
- result += it.next().getRouteContent();
- }
- }
- return new PrintStream(result);*/
+
+ public PrintStream getDefinition() throws FileNotFoundException {
+ /* String result = "";
+ * if(provisioningManager instanceof CamelUserProvisioningManager){
+ * List l = ((CamelUserProvisioningManager)provisioningManager).getRoutes();
+ * Iterator<CamelRoute> it = l.iterator();
+ *
+ * while(it.hasNext()){
+ * result += it.next().getRouteContent();
+ * }
+ * }
+ * return new PrintStream(result); */
return null;
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/rest/data/ReportDataBinder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/data/ReportDataBinder.java b/core/src/main/java/org/apache/syncope/core/rest/data/ReportDataBinder.java
index cfcaee4..2d5a433 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/data/ReportDataBinder.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/data/ReportDataBinder.java
@@ -52,9 +52,9 @@ public class ReportDataBinder {
*/
private static final Logger LOG = LoggerFactory.getLogger(ReportDataBinder.class);
- private static final String[] IGNORE_REPORT_PROPERTIES = {"id", "reportlets", "executions"};
+ private static final String[] IGNORE_REPORT_PROPERTIES = { "id", "reportlets", "executions" };
- private static final String[] IGNORE_REPORT_EXECUTION_PROPERTIES = {"id", "report", "execResult"};
+ private static final String[] IGNORE_REPORT_EXECUTION_PROPERTIES = { "id", "report", "execResult" };
@Autowired
private ReportExecDAO reportExecDAO;
@@ -65,7 +65,7 @@ public class ReportDataBinder {
@Autowired
private ImplementationClassNamesLoader classNamesLoader;
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public Set<Class<Reportlet>> getAllReportletClasses() {
Set<Class<Reportlet>> reportletClasses = new HashSet<Class<Reportlet>>();
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/rest/data/RouteDataBinder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/data/RouteDataBinder.java b/core/src/main/java/org/apache/syncope/core/rest/data/RouteDataBinder.java
index c1016e6..824bd52 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/data/RouteDataBinder.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/data/RouteDataBinder.java
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.rest.data;
-
import org.apache.syncope.common.to.RouteTO;
import org.apache.syncope.common.util.BeanUtils;
import org.apache.syncope.core.persistence.beans.CamelRoute;
@@ -28,11 +26,11 @@ import org.springframework.stereotype.Component;
@Component
public class RouteDataBinder {
-
+
private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(RouteDataBinder.class);
-
- public RouteTO getRouteTO(CamelRoute route){
-
+
+ public RouteTO getRouteTO(CamelRoute route) {
+
RouteTO routeTO = new RouteTO();
BeanUtils.copyProperties(route, routeTO);
return routeTO;
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java b/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java
index bcc015d..e625533 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/utils/QueryResourceInfoComparator.java
@@ -55,8 +55,8 @@ public class QueryResourceInfoComparator extends OperationResourceInfoComparator
return op1Counter == op2Counter
? 0
: op1Counter < op2Counter
- ? 1
- : -1;
+ ? 1
+ : -1;
}
/**
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java b/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java
index e8f0e67..f3a9edf 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java
@@ -202,8 +202,8 @@ public class RestServiceExceptionMapper implements ExceptionMapper<Exception>, R
if (iee != null) {
ClientExceptionType exType =
iee.getEntityClassSimpleName().endsWith("Policy")
- ? ClientExceptionType.InvalidPolicy
- : ClientExceptionType.valueOf("Invalid" + iee.getEntityClassSimpleName());
+ ? ClientExceptionType.InvalidPolicy
+ : ClientExceptionType.valueOf("Invalid" + iee.getEntityClassSimpleName());
ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST);
builder.header(RESTHeaders.ERROR_CODE, exType.getHeaderValue());
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/security/AsymmetricCipher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/security/AsymmetricCipher.java b/core/src/main/java/org/apache/syncope/core/security/AsymmetricCipher.java
index 5c95114..b0a6c8e 100644
--- a/core/src/main/java/org/apache/syncope/core/security/AsymmetricCipher.java
+++ b/core/src/main/java/org/apache/syncope/core/security/AsymmetricCipher.java
@@ -35,6 +35,7 @@ import javax.crypto.Cipher;
public class AsymmetricCipher {
final private static String xform = "RSA/NONE/PKCS1Padding";
+
final private static String algorithm = "RSA";
public static byte[] encrypt(byte[] inpBytes, PublicKey key) throws Exception {
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/services/ConnectorServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/services/ConnectorServiceImpl.java b/core/src/main/java/org/apache/syncope/core/services/ConnectorServiceImpl.java
index 4d5c09f..3c1b6fa 100644
--- a/core/src/main/java/org/apache/syncope/core/services/ConnectorServiceImpl.java
+++ b/core/src/main/java/org/apache/syncope/core/services/ConnectorServiceImpl.java
@@ -70,7 +70,7 @@ public class ConnectorServiceImpl extends AbstractServiceImpl implements Connect
final boolean includeSpecial) {
connInstanceTO.setId(connInstanceId);
-
+
List<String> schemaNames = controller.getSchemaNames(connInstanceTO, includeSpecial);
List<SchemaTO> result = new ArrayList<SchemaTO>(schemaNames.size());
for (String name : schemaNames) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java b/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java
index 2fc947c..020414d 100644
--- a/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java
+++ b/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java
@@ -96,7 +96,7 @@ public class PolicyServiceImpl extends AbstractServiceImpl implements PolicyServ
@Override
public <T extends AbstractPolicyTO> void update(final Long policyId, final T policyTO) {
policyTO.setId(policyId);
-
+
switch (policyTO.getType()) {
case ACCOUNT:
case GLOBAL_ACCOUNT:
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/services/RouteServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/services/RouteServiceImpl.java b/core/src/main/java/org/apache/syncope/core/services/RouteServiceImpl.java
index 1c44765..ecc323e 100644
--- a/core/src/main/java/org/apache/syncope/core/services/RouteServiceImpl.java
+++ b/core/src/main/java/org/apache/syncope/core/services/RouteServiceImpl.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.services;
import java.util.List;
@@ -27,20 +26,20 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
-public class RouteServiceImpl extends AbstractServiceImpl implements RouteService{
+public class RouteServiceImpl extends AbstractServiceImpl implements RouteService {
@Autowired
private RouteController controller;
-
+
@Override
public List<RouteTO> getRoutes() {
-
- return controller.listRoutes();
+
+ return controller.listRoutes();
}
-
+
@Override
- public RouteTO getRoute(Long id){
-
+ public RouteTO getRoute(Long id) {
+
return controller.readRoute(id);
}
@@ -48,5 +47,5 @@ public class RouteServiceImpl extends AbstractServiceImpl implements RouteServic
public void importRoute(Long id, RouteTO route) {
controller.updateRoute(route);
}
-
-}
\ No newline at end of file
+
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java b/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java
index fa88e7c..7ab3691 100644
--- a/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java
+++ b/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java
@@ -61,8 +61,8 @@ public class WorkflowServiceImpl extends AbstractServiceImpl implements Workflow
public Response exportDefinition(final SubjectType kind) {
final MediaType accept =
messageContext.getHttpHeaders().getAcceptableMediaTypes().contains(MediaType.APPLICATION_JSON_TYPE)
- ? MediaType.APPLICATION_JSON_TYPE
- : MediaType.APPLICATION_XML_TYPE;
+ ? MediaType.APPLICATION_JSON_TYPE
+ : MediaType.APPLICATION_XML_TYPE;
StreamingOutput sout = new StreamingOutput() {
@@ -104,8 +104,8 @@ public class WorkflowServiceImpl extends AbstractServiceImpl implements Workflow
public void importDefinition(final SubjectType kind, final String definition) {
final MediaType contentType =
messageContext.getHttpHeaders().getMediaType().equals(MediaType.APPLICATION_JSON_TYPE)
- ? MediaType.APPLICATION_JSON_TYPE
- : MediaType.APPLICATION_XML_TYPE;
+ ? MediaType.APPLICATION_JSON_TYPE
+ : MediaType.APPLICATION_XML_TYPE;
if (kind == SubjectType.USER) {
controller.importUserDefinition(contentType, definition);
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java b/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java
index 42548d1..0a809be 100644
--- a/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java
+++ b/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java
@@ -162,7 +162,8 @@ public interface SyncActions extends AbstractSyncActions<AbstractSyncopeResultHa
* Action to be executed after each local user / role synchronization.
*
* @param profile profile of the synchronization being executed.
- * @param delta retrieved synchronization information (may be modified by 'beforeProvision/beforeUpdate/beforeDelete')
+ * @param delta retrieved synchronization information (may be modified by
+ * 'beforeProvision/beforeUpdate/beforeDelete')
* @param subject synchronized local user / role
* @param result global synchronization results at the current synchronization step
* @throws JobExecutionException in case of generic failure
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/sync/SyncResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/sync/SyncResult.java b/core/src/main/java/org/apache/syncope/core/sync/SyncResult.java
index 5ebca8a..7f1986a 100644
--- a/core/src/main/java/org/apache/syncope/core/sync/SyncResult.java
+++ b/core/src/main/java/org/apache/syncope/core/sync/SyncResult.java
@@ -28,9 +28,12 @@ import org.apache.syncope.common.types.ResourceOperation;
import org.apache.syncope.common.types.TraceLevel;
public class SyncResult {
+
public enum Status {
+
SUCCESS,
FAILURE
+
}
private String message;
@@ -115,8 +118,8 @@ public class SyncResult {
// All
return String.format("%s %s (id/name): %d/%s %s", operation, status, id, name,
StringUtils.isBlank(message)
- ? ""
- : "with message: " + message);
+ ? ""
+ : "with message: " + message);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectPushResultHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectPushResultHandler.java b/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectPushResultHandler.java
index f8cb658..7036ab7 100644
--- a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectPushResultHandler.java
+++ b/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectPushResultHandler.java
@@ -114,7 +114,6 @@ public abstract class AbstractSubjectPushResultHandler extends AbstractSyncopeRe
String operation = null;
// Try to read remote object (user / group) BEFORE any actual operation
-
final String accountId = MappingUtil.getAccountIdValue(
subject, profile.getSyncTask().getResource(), getMapping().getAccountIdItem());
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncJob.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncJob.java b/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncJob.java
index cabeb4f..26ff30b 100644
--- a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncJob.java
+++ b/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncJob.java
@@ -316,7 +316,7 @@ public abstract class AbstractSyncJob<T extends AbstractSyncTask, A extends Abst
} catch (Exception e) {
final String msg = String.
format("Connector instance bean for resource %s and connInstance %s not found",
- syncTask.getResource(), syncTask.getResource().getConnector());
+ syncTask.getResource(), syncTask.getResource().getConnector());
throw new JobExecutionException(msg, e);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncopeResultHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncopeResultHandler.java b/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncopeResultHandler.java
index 78ada92..0c27004 100644
--- a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncopeResultHandler.java
+++ b/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncopeResultHandler.java
@@ -43,7 +43,7 @@ public abstract class AbstractSyncopeResultHandler<T extends AbstractSyncTask, A
* Logger.
*/
protected static final Logger LOG = LoggerFactory.getLogger(AbstractSyncopeResultHandler.class);
-
+
/**
* User data binder.
*/
@@ -102,10 +102,10 @@ public abstract class AbstractSyncopeResultHandler<T extends AbstractSyncTask, A
* Sync profile.
*/
protected SyncProfile<T, A> profile;
-
+
@Resource(name = "userProvisioningManager")
protected UserProvisioningManager userProvisioningManager;
-
+
@Resource(name = "roleProvisioningManager")
protected RoleProvisioningManager roleProvisioningManager;