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:24 UTC
[19/53] [abbrv] syncope git commit: Code formatting with netbeans
Code formatting with netbeans
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7aa0db37
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7aa0db37
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7aa0db37
Branch: refs/heads/2_0_X
Commit: 7aa0db378d8ab7931c78d570c6f5968e2967bc7b
Parents: b7d6578
Author: giacomolm <gi...@hotmail.it>
Authored: Mon Dec 22 17:48:14 2014 +0100
Committer: giacomolm <gi...@hotmail.it>
Committed: Mon Dec 22 17:48:14 2014 +0100
----------------------------------------------------------------------
core/pom.xml | 14 +-
.../syncope/core/init/CamelRouteLoader.java | 74 ++--
.../init/ImplementationClassNamesLoader.java | 1 -
.../core/init/SpringContextInitializer.java | 4 +-
.../core/persistence/SQLSchemaGenerator.java | 25 +-
.../persistence/beans/AbstractAttrValue.java | 33 +-
.../persistence/beans/AbstractBaseBean.java | 2 +-
.../core/persistence/beans/CamelRoute.java | 4 +-
.../persistence/beans/ExternalResource.java | 2 +-
.../core/persistence/beans/Notification.java | 5 +-
.../core/persistence/beans/package-info.java | 1 -
.../core/persistence/dao/ConnectorRegistry.java | 2 +-
.../core/persistence/dao/impl/RouteDAOImpl.java | 3 +-
.../entity/AbstractSyncTaskCheck.java | 2 +-
.../entity/AbstractSyncTaskValidator.java | 4 +-
.../validation/entity/AttrCheck.java | 2 +-
.../validation/entity/AttrValueCheck.java | 2 +-
.../validation/entity/ConnInstanceCheck.java | 2 +-
.../entity/ExternalResourceCheck.java | 2 +-
.../validation/entity/NotificationCheck.java | 4 +-
.../validation/entity/PolicyCheck.java | 2 +-
.../validation/entity/PropagationTaskCheck.java | 2 +-
.../validation/entity/ReportCheck.java | 2 +-
.../validation/entity/SchedTaskCheck.java | 2 +-
.../validation/entity/SchemaCheck.java | 2 +-
.../validation/entity/SchemaNameCheck.java | 2 +-
.../validation/entity/SyncopeRoleCheck.java | 2 +-
.../validation/entity/SyncopeUserCheck.java | 3 +-
.../syncope/core/policy/PolicyEvaluator.java | 5 +-
.../syncope/core/policy/PolicyPattern.java | 1 +
.../core/propagation/PropagationReporter.java | 2 +-
.../impl/DBPasswordPropagationActions.java | 16 +-
.../impl/PriorityPropagationTaskExecutor.java | 8 +-
.../propagation/impl/PropagationManager.java | 8 +-
.../syncope/core/propagation/package-info.java | 1 -
.../DefaultRoleProvisioningManager.java | 56 +--
.../DefaultUserProvisioningManager.java | 159 +++----
.../core/provisioning/ProvisioningManager.java | 2 +-
.../provisioning/RoleProvisioningManager.java | 14 +-
.../provisioning/UserProvisioningManager.java | 31 +-
.../camel/CamelRoleProvisioningManager.java | 68 +--
.../camel/CamelUserProvisioningManager.java | 33 +-
.../provisioning/camel/SyncopeCamelContext.java | 81 ++--
.../DefaultRoleCreatePropagation.java | 22 +-
.../DefaultRoleCreateSyncPropagation.java | 31 +-
.../DefaultRoleDeletePropagation.java | 24 +-
.../DefaultRoleDeprovisionPropagation.java | 28 +-
.../DefaultRoleUpdatePropagation.java | 24 +-
.../DefaultUserConfirmPwdResetPropagation.java | 11 +-
.../DefaultUserCreatePropagation.java | 31 +-
.../DefaultUserDeletePropagation.java | 25 +-
.../DefaultUserDeprovisionPropagation.java | 24 +-
.../DefaultUserStatusPropagation.java | 26 +-
.../DefaultUserUpdateInSyncPropagation.java | 48 +-
.../DefaultUserUpdatePropagation.java | 116 ++---
.../DefaultUserWFSuspendPropagation.java | 16 +-
.../camel/processors/UserStatusOnSync.java | 54 +--
.../syncope/core/quartz/package-info.java | 1 -
.../syncope/core/report/ReportletConfClass.java | 2 +-
.../core/report/cocoon/TextSerializer.java | 2 +-
.../core/rest/controller/LoggerController.java | 4 +-
.../core/rest/controller/RoleController.java | 8 +-
.../core/rest/controller/RouteController.java | 46 +-
.../core/rest/controller/UserController.java | 45 +-
.../core/rest/data/ReportDataBinder.java | 6 +-
.../syncope/core/rest/data/RouteDataBinder.java | 10 +-
.../rest/utils/QueryResourceInfoComparator.java | 4 +-
.../rest/utils/RestServiceExceptionMapper.java | 4 +-
.../syncope/core/security/AsymmetricCipher.java | 1 +
.../core/services/ConnectorServiceImpl.java | 2 +-
.../core/services/PolicyServiceImpl.java | 2 +-
.../syncope/core/services/RouteServiceImpl.java | 19 +-
.../core/services/WorkflowServiceImpl.java | 8 +-
.../apache/syncope/core/sync/SyncActions.java | 3 +-
.../apache/syncope/core/sync/SyncResult.java | 7 +-
.../impl/AbstractSubjectPushResultHandler.java | 1 -
.../syncope/core/sync/impl/AbstractSyncJob.java | 2 +-
.../sync/impl/AbstractSyncopeResultHandler.java | 6 +-
.../core/sync/impl/LDAPPasswordSyncActions.java | 10 +-
.../core/sync/impl/RoleSyncResultHandler.java | 10 +-
.../core/sync/impl/UserSyncResultHandler.java | 94 ++--
.../core/util/AttributeDeserializer.java | 4 +-
.../syncope/core/util/ContentLoaderHandler.java | 20 +-
.../apache/syncope/core/util/RouteManager.java | 19 +-
.../syncope/core/util/SecureRandomUtil.java | 8 +-
.../core/util/SyncTokenDeserializer.java | 22 +-
.../apache/syncope/core/util/jexl/JexlUtil.java | 4 +-
.../syncope/core/workflow/package-info.java | 1 -
.../role/AbstractRoleWorkflowAdapter.java | 2 +-
.../user/AbstractUserWorkflowAdapter.java | 2 +-
.../workflow/user/NoOpUserWorkflowAdapter.java | 3 +-
.../core/workflow/user/UserWorkflowAdapter.java | 2 +-
.../activiti/ActivitiUserWorkflowAdapter.java | 3 +-
.../user/activiti/SyncopeGroupManager.java | 2 +-
.../user/activiti/SyncopeUserManager.java | 2 +-
.../resources/persistenceContextEMFactory.xml | 4 +-
.../resources/report/staticReportlet2fo.xsl | 98 ++---
.../resources/report/staticReportlet2html.xsl | 84 ++--
.../resources/report/userReportlet2html.xsl | 6 +-
core/src/main/resources/roleRoute.xml | 272 ++++++------
core/src/main/resources/userRoute.xml | 434 +++++++++----------
core/src/main/resources/wadl2html/index.xsl | 80 ++--
.../core/persistence/dao/DerSchemaTest.java | 1 -
.../persistence/dao/SecurityQuestionTest.java | 2 +-
.../core/persistence/dao/VirSchemaTest.java | 1 -
.../syncope/core/rest/ConnectorTestITCase.java | 6 +-
.../core/rest/NotificationTestITCase.java | 2 +-
.../syncope/core/rest/PolicyTestITCase.java | 4 +-
.../syncope/core/rest/ResourceTestITCase.java | 2 +-
109 files changed, 1291 insertions(+), 1266 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 66b5a22..1628184 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -118,7 +118,7 @@ under the License.
<artifactId>cxf-rt-rs-client</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
@@ -127,14 +127,14 @@ under the License.
<artifactId>camel-spring</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.7</version>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2.7</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.7</version>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.2.7</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/init/CamelRouteLoader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/init/CamelRouteLoader.java b/core/src/main/java/org/apache/syncope/core/init/CamelRouteLoader.java
index aa6da28..5f63e0d 100644
--- a/core/src/main/java/org/apache/syncope/core/init/CamelRouteLoader.java
+++ b/core/src/main/java/org/apache/syncope/core/init/CamelRouteLoader.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.init;
import java.io.File;
@@ -47,60 +46,61 @@ import org.w3c.dom.NodeList;
@Component
public class CamelRouteLoader {
-
+
private static final Logger LOG = LoggerFactory.getLogger(CamelRouteLoader.class);
-
+
@Autowired
private RouteDAO routeDAO;
-
+
@Autowired
private DataSource dataSource;
-
+
@Transactional
- public void load(){
-
+ public void load() {
+
//if(routeDAO.findAll().isEmpty()){
- URL url = getClass().getResource("/camelRoute.xml");
+ URL url = getClass().getResource("/camelRoute.xml");
+
+ File file = new File(url.getPath());
+ String query = "INSERT INTO CamelRoute(ID, NAME, ROUTECONTENT) VALUES (?, ?, ?)";
+ try {
+
+ DocumentBuilder dBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ Document doc = dBuilder.parse(file);
+ doc.getDocumentElement().normalize();
- File file = new File(url.getPath());
- String query= "INSERT INTO CamelRoute(ID, NAME, ROUTECONTENT) VALUES (?, ?, ?)";
- try{
-
- DocumentBuilder dBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = dBuilder.parse(file);
- doc.getDocumentElement().normalize();
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
- JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+ NodeList listOfRoutes = doc.getElementsByTagName("route");
+ for (int s = 0; s < listOfRoutes.getLength(); s++) {
+ //getting the route node element
+ Node routeEl = listOfRoutes.item(s);
+ //crate an instance of CamelRoute Entity
+ CamelRoute route = new CamelRoute();
+ route.setName(((Element) routeEl).getAttribute("id"));
+ route.setRouteContent(nodeToString(listOfRoutes.item(s)));
- NodeList listOfRoutes = doc.getElementsByTagName("route");
- for(int s=0; s<listOfRoutes.getLength(); s++){
- //getting the route node element
- Node routeEl = listOfRoutes.item(s);
- //crate an instance of CamelRoute Entity
- CamelRoute route = new CamelRoute();
- route.setName(((Element)routeEl).getAttribute("id"));
- route.setRouteContent(nodeToString(listOfRoutes.item(s)));
-
- jdbcTemplate.update(query, new Object[]{s+1,((Element)routeEl).getAttribute("id"), nodeToString(listOfRoutes.item(s))});
- LOG.info("Route Registration Successed");
- }
- } catch (DataAccessException e) {
- LOG.error("While trying to perform {}", query, e);
- } catch (Exception e) {
- LOG.error("Route Registration failed {}",e.getMessage());
+ jdbcTemplate.update(query, new Object[] { s + 1, ((Element) routeEl).getAttribute("id"), nodeToString(
+ listOfRoutes.item(s)) });
+ LOG.info("Route Registration Successed");
}
+ } catch (DataAccessException e) {
+ LOG.error("While trying to perform {}", query, e);
+ } catch (Exception e) {
+ LOG.error("Route Registration failed {}", e.getMessage());
+ }
//}
}
-
- private String nodeToString(Node node) {
+
+ private String nodeToString(Node node) {
StringWriter sw = new StringWriter();
- try{
+ try {
Transformer t = TransformerFactory.newInstance().newTransformer();
t.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
t.transform(new DOMSource(node), new StreamResult(sw));
- }catch (TransformerException te) {
+ } catch (TransformerException te) {
System.out.println("nodeToString Transformer Exception");
}
return sw.toString();
}
-}
\ 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/init/ImplementationClassNamesLoader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java b/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java
index b7659b8..30c568e 100644
--- a/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java
+++ b/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java
@@ -114,7 +114,6 @@ public class ImplementationClassNamesLoader {
}
// TODO: add push correlation rules management
-
if (interfaces.contains(PropagationActions.class) && !metadata.isAbstract()) {
classNames.get(Type.PROPAGATION_ACTIONS).add(metadata.getClassName());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java b/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java
index 115587d..dc99e34 100644
--- a/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java
+++ b/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java
@@ -49,7 +49,7 @@ public class SpringContextInitializer implements InitializingBean {
@Autowired
private WorkflowAdapterLoader workflowAdapterLoader;
-
+
@Autowired
private CamelRouteLoader routeLoader;
@@ -63,7 +63,7 @@ public class SpringContextInitializer implements InitializingBean {
classNamesLoader.load();
routeLoader.load();
-
+
workflowAdapterLoader.init();
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/SQLSchemaGenerator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/SQLSchemaGenerator.java b/core/src/main/java/org/apache/syncope/core/persistence/SQLSchemaGenerator.java
index 342e347..8942cda 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/SQLSchemaGenerator.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/SQLSchemaGenerator.java
@@ -60,7 +60,7 @@ public final class SQLSchemaGenerator {
}
@SuppressWarnings("unchecked")
- Iterator<File> itor = FileUtils.iterateFiles(baseDir, new String[] {"class"}, true);
+ Iterator<File> itor = FileUtils.iterateFiles(baseDir, new String[] { "class" }, true);
List<File> entityClasses = new ArrayList<File>();
while (itor.hasNext()) {
entityClasses.add(itor.next());
@@ -127,7 +127,7 @@ public final class SQLSchemaGenerator {
for (int i = 0; i < files.size(); i++) {
File file = files.get(i);
- args[ i] = file.getAbsolutePath();
+ args[i] = file.getAbsolutePath();
}
return args;
}
@@ -140,7 +140,6 @@ public final class SQLSchemaGenerator {
final String connectionProperties) {
//extendRealmClasspath();
-
Options opts = new Options();
opts.put(OPTION_PROPERTIES_FILE, persistenceXmlFile);
opts.put(OPTION_CONNECTION_DRIVER_NAME, connectionDriverName);
@@ -156,16 +155,16 @@ public final class SQLSchemaGenerator {
boolean ok = Configurations.runAgainstAllAnchors(opts,
new Configurations.Runnable() {
- @Override
- public boolean run(final Options opts) throws IOException, SQLException {
- JDBCConfiguration conf = new JDBCConfigurationImpl();
- try {
- return MappingTool.run(conf, args, opts);
- } finally {
- conf.close();
- }
- }
- });
+ @Override
+ public boolean run(final Options opts) throws IOException, SQLException {
+ JDBCConfiguration conf = new JDBCConfigurationImpl();
+ try {
+ return MappingTool.run(conf, args, opts);
+ } finally {
+ conf.close();
+ }
+ }
+ });
if (!ok) {
throw new IllegalStateException("The OpenJPA MappingTool detected an error!");
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractAttrValue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractAttrValue.java b/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractAttrValue.java
index 6ee527e..e3e71a1 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractAttrValue.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractAttrValue.java
@@ -195,21 +195,21 @@ public abstract class AbstractAttrValue extends AbstractBaseBean {
return (T) (booleanValue != null
? getBooleanValue()
: dateValue != null
- ? getDateValue()
- : doubleValue != null
- ? getDoubleValue()
- : longValue != null
- ? getLongValue()
- : binaryValue != null
- ? getBinaryValue()
- : stringValue);
+ ? getDateValue()
+ : doubleValue != null
+ ? getDoubleValue()
+ : longValue != null
+ ? getLongValue()
+ : binaryValue != null
+ ? getBinaryValue()
+ : stringValue);
}
public String getValueAsString() {
final AttributeSchemaType type = getAttribute() == null || getAttribute().getSchema() == null
|| getAttribute().getSchema().getType() == null
- ? AttributeSchemaType.String
- : getAttribute().getSchema().getType();
+ ? AttributeSchemaType.String
+ : getAttribute().getSchema().getType();
return getValueAsString(type);
}
@@ -228,22 +228,23 @@ public abstract class AbstractAttrValue extends AbstractBaseBean {
case Long:
result = getAttribute() == null || getAttribute().getSchema() == null
|| getAttribute().getSchema().getConversionPattern() == null
- ? getLongValue().toString()
- : DataFormat.format(getLongValue(), getAttribute().getSchema().getConversionPattern());
+ ? getLongValue().toString()
+ : DataFormat.format(getLongValue(), getAttribute().getSchema().getConversionPattern());
break;
case Double:
result = getAttribute() == null || getAttribute().getSchema() == null
|| getAttribute().getSchema().getConversionPattern() == null
- ? getDoubleValue().toString()
- : DataFormat.format(getDoubleValue(), getAttribute().getSchema().getConversionPattern());
+ ? getDoubleValue().toString()
+ : DataFormat.format(getDoubleValue(), getAttribute().getSchema().getConversionPattern());
break;
case Date:
result = getAttribute() == null || getAttribute().getSchema() == null
|| getAttribute().getSchema().getConversionPattern() == null
- ? DataFormat.format(getDateValue())
- : DataFormat.format(getDateValue(), false, getAttribute().getSchema().getConversionPattern());
+ ? DataFormat.format(getDateValue())
+ : DataFormat.format(getDateValue(), false, getAttribute().getSchema().
+ getConversionPattern());
break;
case Binary:
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java b/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
index b8350b0..af2727a 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
@@ -73,7 +73,7 @@ public abstract class AbstractBaseBean implements Serializable {
}
}
- return excludeFields.toArray(new String[]{});
+ return excludeFields.toArray(new String[] {});
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/beans/CamelRoute.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/beans/CamelRoute.java b/core/src/main/java/org/apache/syncope/core/persistence/beans/CamelRoute.java
index ad05f27..33fff55 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/beans/CamelRoute.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/beans/CamelRoute.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.persistence.beans;
import javax.persistence.Entity;
@@ -26,13 +25,12 @@ import javax.persistence.Lob;
import javax.persistence.GenerationType;
import javax.persistence.Column;
-
@Entity
public class CamelRoute {
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private Long id;
private String name;
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/beans/ExternalResource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/beans/ExternalResource.java b/core/src/main/java/org/apache/syncope/core/persistence/beans/ExternalResource.java
index 438f972..e35eefe 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/beans/ExternalResource.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/beans/ExternalResource.java
@@ -323,7 +323,7 @@ public class ExternalResource extends AbstractSysInfo {
return StringUtils.isBlank(jsonConf)
? Collections.<ConnConfProperty>emptySet()
: new HashSet<ConnConfProperty>(
- Arrays.asList(POJOHelper.deserialize(jsonConf, ConnConfProperty[].class)));
+ Arrays.asList(POJOHelper.deserialize(jsonConf, ConnConfProperty[].class)));
}
public void setConnInstanceConfiguration(final Set<ConnConfProperty> properties) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java b/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java
index 6c1c466..f548b00 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java
@@ -85,7 +85,7 @@ public class Notification extends AbstractBaseBean {
@NotNull
@Enumerated(EnumType.STRING)
private TraceLevel traceLevel;
-
+
@Column(nullable = false)
@Basic
@Min(0)
@@ -168,7 +168,8 @@ public class Notification extends AbstractBaseBean {
}
public boolean addStaticRecipient(String staticRecipient) {
- return staticRecipient != null && !staticRecipients.contains(staticRecipient) && staticRecipients.add(staticRecipient);
+ return staticRecipient != null && !staticRecipients.contains(staticRecipient) && staticRecipients.add(
+ staticRecipient);
}
public boolean removeStaticRecipient(String staticRecipient) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/beans/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/beans/package-info.java b/core/src/main/java/org/apache/syncope/core/persistence/beans/package-info.java
index 3a78e58..eff4862 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/beans/package-info.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/beans/package-info.java
@@ -17,4 +17,3 @@
* under the License.
*/
package org.apache.syncope.core.persistence.beans;
-
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/dao/ConnectorRegistry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/dao/ConnectorRegistry.java b/core/src/main/java/org/apache/syncope/core/persistence/dao/ConnectorRegistry.java
index d9c6845..3a783b9 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/dao/ConnectorRegistry.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/dao/ConnectorRegistry.java
@@ -40,4 +40,4 @@ public interface ConnectorRegistry {
* @param id Spring bean id
*/
void unregisterConnector(String id);
-}
\ 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/persistence/dao/impl/RouteDAOImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RouteDAOImpl.java b/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RouteDAOImpl.java
index aaa0026..7d30a01 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RouteDAOImpl.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RouteDAOImpl.java
@@ -37,7 +37,8 @@ public class RouteDAOImpl extends AbstractDAOImpl implements RouteDAO {
@Transactional(readOnly = true)
@Override
public List<CamelRoute> findAll() {
- TypedQuery<CamelRoute> query = entityManager.createQuery("SELECT e FROM " + CamelRoute.class.getSimpleName() + " e", CamelRoute.class);
+ TypedQuery<CamelRoute> query = entityManager.createQuery("SELECT e FROM " + CamelRoute.class.getSimpleName()
+ + " e", CamelRoute.class);
return query.getResultList();
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractSyncTaskCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractSyncTaskCheck.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractSyncTaskCheck.java
index ac3821d..d7e172b 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractSyncTaskCheck.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractSyncTaskCheck.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = AbstractSyncTaskValidator.class)
@Documented
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractSyncTaskValidator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractSyncTaskValidator.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractSyncTaskValidator.java
index a53d815..9088a44 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractSyncTaskValidator.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractSyncTaskValidator.java
@@ -60,8 +60,8 @@ public class AbstractSyncTaskValidator extends AbstractValidator<AbstractSyncTas
isAssignable = object instanceof SyncTask
? SyncActions.class.isAssignableFrom(actionsClass)
: object instanceof PushTask
- ? PushActions.class.isAssignableFrom(actionsClass)
- : false;
+ ? PushActions.class.isAssignableFrom(actionsClass)
+ : false;
} catch (Exception e) {
LOG.error("Invalid SyncActions specified", e);
isValid = false;
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AttrCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AttrCheck.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AttrCheck.java
index b569545..f0131dd 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AttrCheck.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AttrCheck.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = AttrValidator.class)
@Documented
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AttrValueCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AttrValueCheck.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AttrValueCheck.java
index a2e9740..b5efbca 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AttrValueCheck.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AttrValueCheck.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = AttrValueValidator.class)
@Documented
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ConnInstanceCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ConnInstanceCheck.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ConnInstanceCheck.java
index 6f3af39..172d44e 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ConnInstanceCheck.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ConnInstanceCheck.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target({ElementType.TYPE})
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = ConnInstanceValidator.class)
@Documented
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceCheck.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceCheck.java
index 74c6984..59be7fb 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceCheck.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceCheck.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = ExternalResourceValidator.class)
@Documented
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/NotificationCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/NotificationCheck.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/NotificationCheck.java
index 844be3b..8c10eb8 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/NotificationCheck.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/NotificationCheck.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = NotificationValidator.class)
@Documented
@@ -38,4 +38,4 @@ public @interface NotificationCheck {
Class<?>[] groups() default {};
Class<? extends Payload>[] payload() default {};
-}
\ 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/persistence/validation/entity/PolicyCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/PolicyCheck.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/PolicyCheck.java
index 7d722b8..ef55fb1 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/PolicyCheck.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/PolicyCheck.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = PolicyValidator.class)
@Documented
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/PropagationTaskCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/PropagationTaskCheck.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/PropagationTaskCheck.java
index 8896bc8..ac0a0de 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/PropagationTaskCheck.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/PropagationTaskCheck.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = PropagationTaskValidator.class)
@Documented
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ReportCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ReportCheck.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ReportCheck.java
index 1e32c14..9f00b67 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ReportCheck.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ReportCheck.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = ReportValidator.class)
@Documented
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchedTaskCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchedTaskCheck.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchedTaskCheck.java
index bcade2f..76f012a 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchedTaskCheck.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchedTaskCheck.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = SchedTaskValidator.class)
@Documented
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchemaCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchemaCheck.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchemaCheck.java
index e6e1be5..e092ec9 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchemaCheck.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchemaCheck.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = SchemaValidator.class)
@Documented
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchemaNameCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchemaNameCheck.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchemaNameCheck.java
index 5ae70e1..65def91 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchemaNameCheck.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchemaNameCheck.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = SchemaNameValidator.class)
@Documented
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncopeRoleCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncopeRoleCheck.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncopeRoleCheck.java
index 5586238..ae7e282 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncopeRoleCheck.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncopeRoleCheck.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target({ElementType.TYPE})
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = SyncopeRoleValidator.class)
@Documented
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncopeUserCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncopeUserCheck.java b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncopeUserCheck.java
index 028ae4d..5a709b7 100644
--- a/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncopeUserCheck.java
+++ b/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncopeUserCheck.java
@@ -27,8 +27,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-
-@Target( { ElementType.TYPE })
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = SyncopeUserValidator.class)
@Documented
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/policy/PolicyEvaluator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/policy/PolicyEvaluator.java b/core/src/main/java/org/apache/syncope/core/policy/PolicyEvaluator.java
index e378794..abf7b1d 100644
--- a/core/src/main/java/org/apache/syncope/core/policy/PolicyEvaluator.java
+++ b/core/src/main/java/org/apache/syncope/core/policy/PolicyEvaluator.java
@@ -52,7 +52,7 @@ public class PolicyEvaluator {
final PasswordPolicySpec ppSpec = policy.getSpecification(PasswordPolicySpec.class);
final PasswordPolicySpec evaluatedPPSpec = new PasswordPolicySpec();
- BeanUtils.copyProperties(ppSpec, evaluatedPPSpec, new String[]{"schemasNotPermitted"});
+ BeanUtils.copyProperties(ppSpec, evaluatedPPSpec, new String[] { "schemasNotPermitted" });
for (String schema : ppSpec.getSchemasNotPermitted()) {
AbstractAttr attribute = attributable.getAttr(schema);
@@ -65,7 +65,6 @@ public class PolicyEvaluator {
}
// Password history verification and update
-
if (!(attributable instanceof SyncopeUser)) {
LOG.error("Cannot check previous passwords. attributable is not a user object: {}",
attributable.getClass().getName());
@@ -83,7 +82,7 @@ public class PolicyEvaluator {
final AccountPolicySpec spec = policy.getSpecification(AccountPolicySpec.class);
final AccountPolicySpec accountPolicy = new AccountPolicySpec();
- BeanUtils.copyProperties(spec, accountPolicy, new String[]{"schemasNotPermitted"});
+ BeanUtils.copyProperties(spec, accountPolicy, new String[] { "schemasNotPermitted" });
for (String schema : spec.getSchemasNotPermitted()) {
AbstractAttr attribute = attributable.getAttr(schema);
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/policy/PolicyPattern.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/policy/PolicyPattern.java b/core/src/main/java/org/apache/syncope/core/policy/PolicyPattern.java
index 30065c4..e1e0890 100644
--- a/core/src/main/java/org/apache/syncope/core/policy/PolicyPattern.java
+++ b/core/src/main/java/org/apache/syncope/core/policy/PolicyPattern.java
@@ -43,4 +43,5 @@ public class PolicyPattern {
public static final Pattern FIRST_NON_ALPHANUMERIC = Pattern.compile("\\W.*");
public static final Pattern LAST_NON_ALPHANUMERIC = Pattern.compile(".*\\W");
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/propagation/PropagationReporter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/propagation/PropagationReporter.java b/core/src/main/java/org/apache/syncope/core/propagation/PropagationReporter.java
index 0ff432d..e8c985d 100644
--- a/core/src/main/java/org/apache/syncope/core/propagation/PropagationReporter.java
+++ b/core/src/main/java/org/apache/syncope/core/propagation/PropagationReporter.java
@@ -44,7 +44,7 @@ public interface PropagationReporter {
/**
* Report propagation status after executions in case blocking failure (e.g. on primary resources).
- *
+ *
* @param tasks propagation tasks performed before failure
*/
void onPrimaryResourceFailure(List<PropagationTask> tasks);
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/propagation/impl/DBPasswordPropagationActions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/propagation/impl/DBPasswordPropagationActions.java b/core/src/main/java/org/apache/syncope/core/propagation/impl/DBPasswordPropagationActions.java
index 7157907..9ccb146 100644
--- a/core/src/main/java/org/apache/syncope/core/propagation/impl/DBPasswordPropagationActions.java
+++ b/core/src/main/java/org/apache/syncope/core/propagation/impl/DBPasswordPropagationActions.java
@@ -46,7 +46,7 @@ import org.springframework.transaction.annotation.Transactional;
* cipher algorithm property of the DB Connector.
*/
public class DBPasswordPropagationActions extends DefaultPropagationActions {
-
+
private static final String CLEARTEXT = "CLEARTEXT";
@Autowired
@@ -59,12 +59,12 @@ public class DBPasswordPropagationActions extends DefaultPropagationActions {
if (AttributableType.USER == task.getSubjectType()) {
SyncopeUser user = userDAO.find(task.getSubjectId());
-
+
if (user != null && user.getPassword() != null) {
Attribute missing = AttributeUtil.find(
PropagationTaskExecutor.MANDATORY_MISSING_ATTR_NAME,
task.getAttributes());
-
+
ConnInstance connInstance = task.getResource().getConnector();
if (missing != null && missing.getValue() != null && missing.getValue().size() == 1
&& missing.getValue().get(0).equals(OperationalAttributes.PASSWORD_NAME)
@@ -86,7 +86,7 @@ public class DBPasswordPropagationActions extends DefaultPropagationActions {
}
}
}
-
+
private String getCipherAlgorithm(ConnInstance connInstance) {
String cipherAlgorithm = CLEARTEXT;
for (Iterator<ConnConfProperty> propertyIterator = connInstance.getConfiguration().iterator();
@@ -101,21 +101,21 @@ public class DBPasswordPropagationActions extends DefaultPropagationActions {
}
return cipherAlgorithm;
}
-
+
private boolean cipherAlgorithmMatches(String connectorAlgorithm, CipherAlgorithm userAlgorithm) {
if (userAlgorithm == null) {
return false;
}
-
+
if (connectorAlgorithm.equals(userAlgorithm.name())) {
return true;
}
-
+
// Special check for "SHA" (user sync'd from LDAP)
if ("SHA1".equals(connectorAlgorithm) && "SHA".equals(userAlgorithm.name())) {
return true;
}
-
+
return false;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/propagation/impl/PriorityPropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/propagation/impl/PriorityPropagationTaskExecutor.java b/core/src/main/java/org/apache/syncope/core/propagation/impl/PriorityPropagationTaskExecutor.java
index b6734f7..8fd4f18 100644
--- a/core/src/main/java/org/apache/syncope/core/propagation/impl/PriorityPropagationTaskExecutor.java
+++ b/core/src/main/java/org/apache/syncope/core/propagation/impl/PriorityPropagationTaskExecutor.java
@@ -75,7 +75,7 @@ public class PriorityPropagationTaskExecutor extends AbstractPropagationTaskExec
null,
result,
reporter instanceof DefaultPropagationReporter
- ? ((DefaultPropagationReporter) reporter).getStatuses() : null,
+ ? ((DefaultPropagationReporter) reporter).getStatuses() : null,
tasks);
auditManager.audit(
@@ -85,7 +85,7 @@ public class PriorityPropagationTaskExecutor extends AbstractPropagationTaskExec
null,
result,
reporter instanceof DefaultPropagationReporter
- ? ((DefaultPropagationReporter) reporter).getStatuses() : null,
+ ? ((DefaultPropagationReporter) reporter).getStatuses() : null,
tasks);
}
}
@@ -112,8 +112,8 @@ public class PriorityPropagationTaskExecutor extends AbstractPropagationTaskExec
return prop1 > prop2
? 1
: prop1 == prop2
- ? 0
- : -1;
+ ? 0
+ : -1;
}
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java b/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java
index fcd7110..169c4e8 100644
--- a/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java
+++ b/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java
@@ -388,8 +388,8 @@ public class PropagationManager {
PropagationByResource localPropByRes = binder.fillVirtual(subject, vAttrsToBeRemoved == null
? Collections.<String>emptySet()
: vAttrsToBeRemoved, vAttrsToBeUpdated == null
- ? Collections.<AttributeMod>emptySet()
- : vAttrsToBeUpdated, AttributableUtil.getInstance(subject));
+ ? Collections.<AttributeMod>emptySet()
+ : vAttrsToBeUpdated, AttributableUtil.getInstance(subject));
// SYNCOPE-458 fill membership virtual attributes
if (subject instanceof SyncopeUser) {
@@ -402,8 +402,8 @@ public class PropagationManager {
? Collections.<String>emptySet()
: membershipMod.getVirAttrsToRemove(),
membershipMod.getVirAttrsToUpdate() == null ? Collections.<AttributeMod>emptySet()
- : membershipMod.getVirAttrsToUpdate(), AttributableUtil.getInstance(
- AttributableType.MEMBERSHIP));
+ : membershipMod.getVirAttrsToUpdate(), AttributableUtil.getInstance(
+ AttributableType.MEMBERSHIP));
}
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/propagation/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/propagation/package-info.java b/core/src/main/java/org/apache/syncope/core/propagation/package-info.java
index 7331a06..92d1db5 100644
--- a/core/src/main/java/org/apache/syncope/core/propagation/package-info.java
+++ b/core/src/main/java/org/apache/syncope/core/propagation/package-info.java
@@ -17,4 +17,3 @@
* under the License.
*/
package org.apache.syncope.core.propagation;
-
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/DefaultRoleProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/DefaultRoleProvisioningManager.java b/core/src/main/java/org/apache/syncope/core/provisioning/DefaultRoleProvisioningManager.java
index f376641..5986b8e 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/DefaultRoleProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/DefaultRoleProvisioningManager.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.core.provisioning;
import java.util.AbstractMap;
@@ -48,20 +47,25 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.apache.commons.lang3.StringUtils;
-public class DefaultRoleProvisioningManager implements RoleProvisioningManager{
+public class DefaultRoleProvisioningManager implements RoleProvisioningManager {
private static final Logger LOG = LoggerFactory.getLogger(DefaultRoleProvisioningManager.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 Map.Entry<Long, List<PropagationStatus>> create(RoleTO subject) {
return create(subject, Collections.<String>emptySet());
@@ -69,7 +73,7 @@ public class DefaultRoleProvisioningManager implements RoleProvisioningManager{
@Override
public Map.Entry<Long, List<PropagationStatus>> create(RoleTO subject, Set<String> excludedResources) {
-
+
WorkflowResult<Long> created = rwfAdapter.create(subject);
EntitlementUtil.extendAuthContext(created.getResult());
@@ -86,15 +90,16 @@ public class DefaultRoleProvisioningManager implements RoleProvisioningManager{
final RoleTO savedTO = binder.getRoleTO(created.getResult());
savedTO.getPropagationStatusTOs().addAll(propagationReporter.getStatuses());
-
+
Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(
created.getResult(), propagationReporter.getStatuses());
return result;
}
-
+
@Override
- public Map.Entry<Long, List<PropagationStatus>> createInSync(RoleTO roleTO, Map<Long, String> roleOwnerMap,Set<String> excludedResources) throws PropagationException{
-
+ public Map.Entry<Long, List<PropagationStatus>> createInSync(RoleTO roleTO, Map<Long, String> roleOwnerMap,
+ Set<String> excludedResources) throws PropagationException {
+
WorkflowResult<Long> created = rwfAdapter.create((RoleTO) roleTO);
AttributeTO roleOwner = roleTO.getAttrMap().get(StringUtils.EMPTY);
if (roleOwner != null) {
@@ -107,21 +112,21 @@ public class DefaultRoleProvisioningManager implements RoleProvisioningManager{
roleTO.getVirAttrs(), excludedResources);
taskExecutor.execute(tasks);
-
+
Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(
created.getResult(), null);
return result;
}
-
+
@Override
public Map.Entry<Long, List<PropagationStatus>> update(RoleMod subjectMod) {
-
+
return update(subjectMod, Collections.<String>emptySet());
}
-
+
@Override
public Map.Entry<Long, List<PropagationStatus>> update(RoleMod subjectMod, Set<String> excludedResources) {
-
+
WorkflowResult<Long> updated = rwfAdapter.update(subjectMod);
List<PropagationTask> tasks = propagationManager.getRoleUpdateTaskIds(updated,
@@ -135,7 +140,6 @@ public class DefaultRoleProvisioningManager implements RoleProvisioningManager{
propagationReporter.onPrimaryResourceFailure(tasks);
}
-
Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(
updated.getResult(), propagationReporter.getStatuses());
return result;
@@ -179,13 +183,12 @@ public class DefaultRoleProvisioningManager implements RoleProvisioningManager{
propagationReporter.onPrimaryResourceFailure(tasks);
}
- try{
+ try {
rwfAdapter.delete(subjectId);
+ } catch (RuntimeException e) {
+ throw e;
}
- catch(RuntimeException e){
- throw e;
- }
-
+
return propagationReporter.getStatuses();
}
@@ -194,15 +197,16 @@ public class DefaultRoleProvisioningManager implements RoleProvisioningManager{
WorkflowResult<Long> updated = rwfAdapter.update(subjectMod);
return updated.getResult();
}
-
+
@Override
- public List<PropagationStatus> deprovision(final Long roleId, final Collection<String> resources){
+ public List<PropagationStatus> deprovision(final Long roleId, final Collection<String> resources) {
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 {
@@ -218,5 +222,5 @@ public class DefaultRoleProvisioningManager implements RoleProvisioningManager{
public Long link(RoleMod subjectMod) {
return rwfAdapter.update(subjectMod).getResult();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/DefaultUserProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/DefaultUserProvisioningManager.java b/core/src/main/java/org/apache/syncope/core/provisioning/DefaultUserProvisioningManager.java
index 070c6aa..ff0544f 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/DefaultUserProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/DefaultUserProvisioningManager.java
@@ -47,7 +47,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-public class DefaultUserProvisioningManager implements UserProvisioningManager{
+public class DefaultUserProvisioningManager implements UserProvisioningManager {
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserProvisioningManager.class);
@@ -59,47 +59,48 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager{
@Autowired
protected PropagationTaskExecutor taskExecutor;
-
+
@Autowired
- protected UserDataBinder binder;
+ protected UserDataBinder binder;
@Autowired
- protected UserDAO userDAO;
+ protected UserDAO userDAO;
@Override
- public Map.Entry<Long, List<PropagationStatus>> create(final UserTO userTO){
+ public Map.Entry<Long, List<PropagationStatus>> create(final UserTO userTO) {
return create(userTO, true, false, null, Collections.<String>emptySet());
}
-
- public Map.Entry<Long, List<PropagationStatus>> create(final UserTO userTO, boolean storePassword) {
- /*WorkflowResult<Map.Entry<Long, Boolean>> created;
- try {
- created = uwfAdapter.create(userTO,storePassword);
- } catch (RuntimeException e) {
- throw e;
- }
-
- List<PropagationTask> tasks = propagationManager.getUserCreateTaskIds(
- created, userTO.getPassword(), userTO.getVirAttrs(), userTO.getMemberships());
- 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);
- }
-
- Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(
- created.getResult().getKey(), propagationReporter.getStatuses());
- return result;*/
+ public Map.Entry<Long, List<PropagationStatus>> create(final UserTO userTO, boolean storePassword) {
+ /* WorkflowResult<Map.Entry<Long, Boolean>> created;
+ * try {
+ * created = uwfAdapter.create(userTO,storePassword);
+ * } catch (RuntimeException e) {
+ * throw e;
+ * }
+ *
+ * List<PropagationTask> tasks = propagationManager.getUserCreateTaskIds(
+ * created, userTO.getPassword(), userTO.getVirAttrs(), userTO.getMemberships());
+ *
+ * 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);
+ * }
+ *
+ * Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(
+ * created.getResult().getKey(), propagationReporter.getStatuses());
+ * return result; */
return create(userTO, storePassword, false, null, Collections.<String>emptySet());
}
-
+
@Override
- public Map.Entry<Long, List<PropagationStatus>> create(UserTO userTO, boolean storePassword, boolean disablePwdPolicyCheck, Boolean enabled, Set<String> excludedResources) {
- WorkflowResult<Map.Entry<Long, Boolean>> created;
+ public Map.Entry<Long, List<PropagationStatus>> create(UserTO userTO, boolean storePassword,
+ boolean disablePwdPolicyCheck, Boolean enabled, Set<String> excludedResources) {
+ WorkflowResult<Map.Entry<Long, Boolean>> created;
try {
created = uwfAdapter.create(userTO, disablePwdPolicyCheck, enabled, storePassword);
} catch (RuntimeException e) {
@@ -126,7 +127,7 @@ public class DefaultUserProvisioningManager 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) {
WorkflowResult<Map.Entry<UserMod, Boolean>> updated;
@@ -174,9 +175,9 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager{
Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(
updated.getResult().getKey().getId(), propagationReporter.getStatuses());
- return result;
+ return result;
}
-
+
@Override
public List<PropagationStatus> delete(final Long userId) {
@@ -185,7 +186,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager{
@Override
public List<PropagationStatus> delete(Long subjectId, Set<String> excludedResources) {
- List<PropagationTask> tasks = propagationManager.getUserDeleteTaskIds(subjectId,excludedResources);
+ List<PropagationTask> tasks = propagationManager.getUserDeleteTaskIds(subjectId, excludedResources);
PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().
getBean(PropagationReporter.class);
@@ -205,7 +206,6 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager{
return propagationReporter.getStatuses();
}
-
@Override
public Long unlink(UserMod userMod) {
WorkflowResult<Map.Entry<UserMod, Boolean>> updated = uwfAdapter.update(userMod);
@@ -216,7 +216,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager{
public Long link(UserMod subjectMod) {
return uwfAdapter.update(subjectMod).getResult().getKey().getId();
}
-
+
@Override
public Map.Entry<Long, List<PropagationStatus>> activate(SyncopeUser user, StatusMod statusMod) {
WorkflowResult<Long> updated;
@@ -225,7 +225,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager{
} else {
updated = new WorkflowResult<Long>(user.getId(), null, statusMod.getType().name().toLowerCase());
}
-
+
List<PropagationStatus> statuses = propagateStatus(user, statusMod);
return new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(updated.getResult(), statuses);
}
@@ -238,7 +238,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager{
} else {
updated = new WorkflowResult<Long>(user.getId(), null, statusMod.getType().name().toLowerCase());
}
-
+
List<PropagationStatus> statuses = propagateStatus(user, statusMod);
return new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(updated.getResult(), statuses);
}
@@ -251,13 +251,13 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager{
} else {
updated = new WorkflowResult<Long>(user.getId(), null, statusMod.getType().name().toLowerCase());
}
-
+
List<PropagationStatus> statuses = propagateStatus(user, statusMod);
return new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(updated.getResult(), statuses);
}
-
- public List<PropagationStatus> propagateStatus(SyncopeUser user, StatusMod statusMod){
-
+
+ public List<PropagationStatus> propagateStatus(SyncopeUser user, StatusMod statusMod) {
+
Set<String> resourcesToBeExcluded = new HashSet<String>(user.getResourceNames());
resourcesToBeExcluded.removeAll(statusMod.getResourceNames());
@@ -271,19 +271,19 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager{
LOG.error("Error propagation primary resource", e);
propReporter.onPrimaryResourceFailure(tasks);
}
-
+
return propReporter.getStatuses();
-
+
}
@Override
public List<PropagationStatus> deprovision(Long userId, Collection<String> resources) {
-
- 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 =
@@ -294,14 +294,14 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager{
LOG.error("Error propagation primary resource", e);
propagationReporter.onPrimaryResourceFailure(tasks);
}
-
+
return propagationReporter.getStatuses();
}
@Override
- public Map.Entry<Long, List<PropagationStatus>> updateInSync(final UserMod userMod,final Long id,
- final SyncResult result, Boolean enabled, Set<String> excludedResources){
-
+ public Map.Entry<Long, List<PropagationStatus>> updateInSync(final UserMod userMod, final Long id,
+ final SyncResult result, Boolean enabled, Set<String> excludedResources) {
+
WorkflowResult<Map.Entry<UserMod, Boolean>> updated;
try {
updated = uwfAdapter.update(userMod);
@@ -337,40 +337,41 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager{
}
}
- PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().
- getBean(PropagationReporter.class);
+ PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().
+ getBean(PropagationReporter.class);
- List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(updated,updated.getResult().getKey().getPassword() != null,excludedResources);
-
- 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, excludedResources);
-
- return new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(updated.getResult().getKey().getId(), propagationReporter.getStatuses());
+ try {
+ taskExecutor.execute(tasks, propagationReporter);
+ } catch (PropagationException e) {
+ LOG.error("Error propagation primary resource", e);
+ propagationReporter.onPrimaryResourceFailure(tasks);
+ }
+
+ return new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(updated.getResult().getKey().getId(),
+ propagationReporter.getStatuses());
}
@Override
public void innerSuspend(SyncopeUser user, boolean suspend) {
-
- final WorkflowResult<Long> updated = uwfAdapter.suspend(user);
- // propagate suspension if and only if it is required by policy
- if (suspend) {
- UserMod userMod = new UserMod();
- userMod.setId(updated.getResult());
+ final WorkflowResult<Long> updated = uwfAdapter.suspend(user);
+
+ // propagate suspension if and only if it is required by policy
+ if (suspend) {
+ UserMod userMod = new UserMod();
+ userMod.setId(updated.getResult());
- final List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(
- new WorkflowResult<Map.Entry<UserMod, Boolean>>(
- new AbstractMap.SimpleEntry<UserMod, Boolean>(userMod, Boolean.FALSE),
- updated.getPropByRes(), updated.getPerformedTasks()));
+ final List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(
+ new WorkflowResult<Map.Entry<UserMod, Boolean>>(
+ new AbstractMap.SimpleEntry<UserMod, Boolean>(userMod, Boolean.FALSE),
+ updated.getPropByRes(), updated.getPerformedTasks()));
- taskExecutor.execute(tasks);
- }
+ taskExecutor.execute(tasks);
+ }
}
@Override
@@ -380,7 +381,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager{
@Override
public void confirmPasswordReset(SyncopeUser user, String token, String password) {
-
+
uwfAdapter.confirmPasswordReset(user.getId(), token, password);
List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(user, null, null);
@@ -391,6 +392,6 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager{
} 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/ProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/ProvisioningManager.java b/core/src/main/java/org/apache/syncope/core/provisioning/ProvisioningManager.java
index adc1cb0..65f7f7d 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/ProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/ProvisioningManager.java
@@ -25,7 +25,7 @@ import org.apache.syncope.common.mod.AbstractAttributableMod;
import org.apache.syncope.common.to.AbstractAttributableTO;
import org.apache.syncope.common.to.PropagationStatus;
-public interface ProvisioningManager<T extends AbstractAttributableTO, M extends AbstractAttributableMod>{
+public interface ProvisioningManager<T extends AbstractAttributableTO, M extends AbstractAttributableMod> {
public Map.Entry<Long, List<PropagationStatus>> create(T subject);
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/RoleProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/RoleProvisioningManager.java b/core/src/main/java/org/apache/syncope/core/provisioning/RoleProvisioningManager.java
index 594bf5e..53029ac 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/RoleProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/RoleProvisioningManager.java
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.syncope.core.provisioning;
import java.util.List;
@@ -24,12 +23,13 @@ import org.apache.syncope.common.mod.RoleMod;
import org.apache.syncope.common.to.PropagationStatus;
import org.apache.syncope.core.propagation.PropagationException;
-public interface RoleProvisioningManager extends ProvisioningManager<RoleTO, RoleMod>{
-
+public interface RoleProvisioningManager extends ProvisioningManager<RoleTO, RoleMod> {
+
public Map.Entry<Long, List<PropagationStatus>> create(final RoleTO roleTO, Set<String> excludedResources);
-
- public Map.Entry<Long, List<PropagationStatus>> createInSync(final RoleTO roleTO, Map<Long, String> roleOwnerMap,Set<String> excludedResources) throws PropagationException;
-
+
+ public Map.Entry<Long, List<PropagationStatus>> createInSync(final RoleTO roleTO, Map<Long, String> roleOwnerMap,
+ Set<String> excludedResources) throws PropagationException;
+
public Map.Entry<Long, List<PropagationStatus>> update(RoleMod subjectMod, Set<String> excludedResources);
-
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/UserProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/UserProvisioningManager.java b/core/src/main/java/org/apache/syncope/core/provisioning/UserProvisioningManager.java
index 32a4d18..c5b70a8 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/UserProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/UserProvisioningManager.java
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.syncope.core.provisioning;
import java.util.List;
@@ -27,28 +26,30 @@ import org.apache.syncope.common.to.PropagationStatus;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.sync.SyncResult;
-public interface UserProvisioningManager extends ProvisioningManager<UserTO, UserMod>{
-
+public interface UserProvisioningManager extends ProvisioningManager<UserTO, UserMod> {
+
public Map.Entry<Long, List<PropagationStatus>> activate(SyncopeUser user, StatusMod statusMod);
public Map.Entry<Long, List<PropagationStatus>> reactivate(SyncopeUser user, StatusMod statusMod);
public Map.Entry<Long, List<PropagationStatus>> suspend(SyncopeUser user, StatusMod statusMod);
-
+
public Map.Entry<Long, List<PropagationStatus>> create(final UserTO userTO, final boolean storePassword);
-
- 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);
+
public Map.Entry<Long, List<PropagationStatus>> update(final UserMod userMod, final boolean removeMemberships);
-
- public Map.Entry<Long, List<PropagationStatus>> updateInSync(final UserMod userMod,final Long id, final SyncResult result, Boolean enabled, Set<String> excludedResources);
- public List<PropagationStatus> delete(Long subjectId, Set<String> excludedResources);
-
+ public Map.Entry<Long, List<PropagationStatus>> updateInSync(final UserMod userMod, final Long id,
+ final SyncResult result, Boolean enabled, Set<String> excludedResources);
+
+ public List<PropagationStatus> delete(Long subjectId, Set<String> excludedResources);
+
public void innerSuspend(SyncopeUser user, boolean suspend);
-
+
public void requestPasswordReset(final Long id);
-
- public void confirmPasswordReset(SyncopeUser user,final String token,final String password);
-
+
+ public void confirmPasswordReset(SyncopeUser user, final String token, final String password);
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7aa0db37/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.java
index 4857d2f..33856a9 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.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;
@@ -65,7 +64,7 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-public class CamelRoleProvisioningManager implements RoleProvisioningManager{
+public class CamelRoleProvisioningManager implements RoleProvisioningManager {
private static final Logger LOG = LoggerFactory.getLogger(CamelRoleProvisioningManager.class);
@@ -76,7 +75,7 @@ public class CamelRoleProvisioningManager implements RoleProvisioningManager{
protected Map<String, PollingConsumer> consumerMap;
protected List<String> knownUri;
-
+
@Autowired
protected RouteDAO routeDAO;
@@ -99,7 +98,7 @@ public class CamelRoleProvisioningManager implements RoleProvisioningManager{
public CamelContext getContext() {
//ApplicationContext context = ApplicationContextProvider.getApplicationContext();
//return context.getBean("camel-context", DefaultCamelContext.class);
- return contextFactory.getContext(routeDAO);
+ return contextFactory.getContext(routeDAO);
}
public void changeRoute(String routePath) {
@@ -125,12 +124,12 @@ public class CamelRoleProvisioningManager implements RoleProvisioningManager{
protected void sendMessage(String uri, Object obj, Map<String, Object> properties) {
Exchange exc = new DefaultExchange(getContext());
-
+
Iterator<Map.Entry<String, Object>> it = properties.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<String, Object> property = it.next();
exc.setProperty(property.getKey(), property.getValue());
- LOG.info("Added property {}", property.getKey());
+ LOG.info("Added property {}", property.getKey());
}
DefaultMessage m = new DefaultMessage();
@@ -158,22 +157,22 @@ public class CamelRoleProvisioningManager implements RoleProvisioningManager{
return consumerMap.get(uri);
}
}
-
+
@Override
public Map.Entry<Long, List<PropagationStatus>> create(RoleTO subject) {
-
- return create(subject, Collections.<String>emptySet());
+
+ return create(subject, Collections.<String>emptySet());
}
-
+
@Override
public Map.Entry<Long, List<PropagationStatus>> create(RoleTO roleTO, Set<String> excludedResources) {
-
+
String uri = "direct:createRolePort";
PollingConsumer pollingConsumer = getConsumer(uri);
Map<String, Object> props = new HashMap<String, Object>();
props.put("excludedResources", excludedResources);
-
+
sendMessage("direct:createRole", roleTO, props);
Exchange o = pollingConsumer.receive();
@@ -184,44 +183,45 @@ public class CamelRoleProvisioningManager implements RoleProvisioningManager{
return o.getIn().getBody(Map.Entry.class);
}
-
+
@Override
- public Map.Entry<Long, List<PropagationStatus>> createInSync(RoleTO roleTO, Map<Long, String> roleOwnerMap, Set<String> excludedResources) throws PropagationException {
-
+ public Map.Entry<Long, List<PropagationStatus>> createInSync(RoleTO roleTO, Map<Long, String> roleOwnerMap,
+ Set<String> excludedResources) throws PropagationException {
+
String uri = "direct:createRoleSyncPort";
PollingConsumer pollingConsumer = getConsumer(uri);
- Map<String, Object> props = new HashMap<String, Object>();
+ Map<String, Object> props = new HashMap<String, Object>();
props.put("roleOwnerMap", roleOwnerMap);
props.put("excludedResources", excludedResources);
-
+
sendMessage("direct:createRoleSync", roleTO, props);
Exchange o = pollingConsumer.receive();
- if (o.getProperty(Exchange.EXCEPTION_CAUGHT) != null) {
+ if (o.getProperty(Exchange.EXCEPTION_CAUGHT) != null) {
throw (RuntimeException) o.getProperty(Exchange.EXCEPTION_CAUGHT);
}
-
+
return o.getIn().getBody(Map.Entry.class);
}
@Override
public Map.Entry<Long, List<PropagationStatus>> update(RoleMod subjectMod) {
-
+
return update(subjectMod, Collections.<String>emptySet());
}
-
+
@Override
public Map.Entry<Long, List<PropagationStatus>> update(RoleMod subjectMod, Set<String> excludedResources) {
String uri = "direct:updateRolePort";
PollingConsumer pollingConsumer = getConsumer(uri);
-
+
Map<String, Object> props = new HashMap<String, Object>();
props.put("excludedResources", excludedResources);
- sendMessage("direct:updateRole",subjectMod, props);
+ sendMessage("direct:updateRole", subjectMod, props);
Exchange o = pollingConsumer.receive();
@@ -229,12 +229,12 @@ public class CamelRoleProvisioningManager implements RoleProvisioningManager{
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(Long subjectId) {
-
+
String uri = "direct:deleteRolePort";
PollingConsumer pollingConsumer = getConsumer(uri);
@@ -267,9 +267,9 @@ public class CamelRoleProvisioningManager implements RoleProvisioningManager{
@Override
public Long link(RoleMod subjectMod) {
-
+
String uri = "direct:linkRolePort";
-
+
PollingConsumer pollingConsumer = getConsumer(uri);
sendMessage("direct:linkRole", subjectMod);
@@ -280,28 +280,28 @@ public class CamelRoleProvisioningManager implements RoleProvisioningManager{
throw (RuntimeException) o.getProperty(Exchange.EXCEPTION_CAUGHT);
}
- return o.getIn().getBody(Long.class);
+ return o.getIn().getBody(Long.class);
}
@Override
public List<PropagationStatus> deprovision(final Long roleId, Collection<String> resources) {
-
+
String uri = "direct:deprovisionRolePort";
-
+
PollingConsumer pollingConsumer = getConsumer(uri);
-
+
Map props = new HashMap<String, Object>();
props.put("resources", resources);
sendMessage("direct:deprovisionRole", roleId, props);
-
+
Exchange o = pollingConsumer.receive();
if (o.getProperty(Exchange.EXCEPTION_CAUGHT) != null) {
throw (RuntimeException) o.getProperty(Exchange.EXCEPTION_CAUGHT);
}
-
+
return o.getIn().getBody(List.class);
}
-
+
}