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 2013/07/18 16:03:10 UTC
svn commit: r1504477 [2/2] - in /syncope/trunk: ./ client/
client/src/main/java/org/apache/syncope/client/services/proxy/
client/src/test/java/org/ common/
common/src/main/java/org/apache/syncope/common/
common/src/main/java/org/apache/syncope/common/m...
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java Thu Jul 18 14:03:08 2013
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Set;
import javax.persistence.EntityExistsException;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.to.BulkAction;
import org.apache.syncope.common.to.BulkActionRes;
import org.apache.syncope.common.to.ConnObjectTO;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/SchemaController.java Thu Jul 18 14:03:08 2013
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.EntityExistsException;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.to.SchemaTO;
import org.apache.syncope.common.types.AuditElements.Category;
import org.apache.syncope.common.types.AuditElements.Result;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/VirtualSchemaController.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/VirtualSchemaController.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/VirtualSchemaController.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/VirtualSchemaController.java Thu Jul 18 14:03:08 2013
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.EntityExistsException;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.to.VirtualSchemaTO;
import org.apache.syncope.common.types.AuditElements.Category;
import org.apache.syncope.common.types.AuditElements.Result;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java Thu Jul 18 14:03:08 2013
@@ -28,7 +28,7 @@ import java.util.Set;
import javax.validation.ValidationException;
import org.apache.commons.jexl2.JexlContext;
import org.apache.commons.jexl2.MapContext;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.mod.AbstractAttributableMod;
import org.apache.syncope.common.mod.AttributeMod;
import org.apache.syncope.common.to.AbstractAttributableTO;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java Thu Jul 18 14:03:08 2013
@@ -25,7 +25,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
import org.apache.syncope.common.to.MappingItemTO;
import org.apache.syncope.common.to.MappingTO;
import org.apache.syncope.common.to.ResourceTO;
@@ -330,7 +330,7 @@ public class ResourceDataBinder {
resourceTO.setSyncPolicy(resource.getSyncPolicy() == null
? null : resource.getSyncPolicy().getId());
- resourceTO.setConnectorConfigurationProperties(resource.getConnInstanceConfiguration());
+ resourceTO.setConnConfProperties(resource.getConnInstanceConfiguration());
resourceTO.setUsyncToken(resource.getUserializedSyncToken());
resourceTO.setRsyncToken(resource.getRserializedSyncToken());
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java Thu Jul 18 14:03:08 2013
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.core.rest.data;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.to.AbstractAttributableTO;
import org.apache.syncope.common.to.AttributeTO;
import org.apache.syncope.common.to.MembershipTO;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/UnwrappedObjectMapper.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/UnwrappedObjectMapper.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/UnwrappedObjectMapper.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/UnwrappedObjectMapper.java Thu Jul 18 14:03:08 2013
@@ -18,24 +18,25 @@
*/
package org.apache.syncope.core.rest.data;
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
import java.util.Map;
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-
/**
* Jackson ObjectMapper that unwraps singleton map values and enable default
* typing for handling abstract types serialization.
*/
public class UnwrappedObjectMapper extends ObjectMapper {
+ private static final long serialVersionUID = -317191546835195103L;
+
/**
* Unwraps the given value if it implements the Map interface and contains
* only a single entry. Otherwise the value is returned unmodified.
@@ -62,13 +63,6 @@ public class UnwrappedObjectMapper exten
}
@Override
- public void writeValue(final JsonGenerator jgen, final Object value, final SerializationConfig config)
- throws IOException, JsonGenerationException, JsonMappingException {
-
- super.writeValue(jgen, unwrapMap(value), config);
- }
-
- @Override
public void writeValue(final File resultFile, final Object value)
throws IOException, JsonGenerationException, JsonMappingException {
@@ -90,16 +84,12 @@ public class UnwrappedObjectMapper exten
}
@Override
- public byte[] writeValueAsBytes(final Object value)
- throws IOException, JsonGenerationException, JsonMappingException {
-
+ public byte[] writeValueAsBytes(final Object value) throws JsonProcessingException {
return super.writeValueAsBytes(unwrapMap(value));
}
@Override
- public String writeValueAsString(final Object value)
- throws IOException, JsonGenerationException, JsonMappingException {
-
+ public String writeValueAsString(final Object value) throws JsonProcessingException {
return super.writeValueAsString(unwrapMap(value));
}
}
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java Thu Jul 18 14:03:08 2013
@@ -22,7 +22,7 @@ import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import javax.annotation.Resource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.mod.MembershipMod;
import org.apache.syncope.common.mod.UserMod;
import org.apache.syncope.common.to.MembershipTO;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/services/SchemaServiceImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/services/SchemaServiceImpl.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/services/SchemaServiceImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/services/SchemaServiceImpl.java Thu Jul 18 14:03:08 2013
@@ -102,17 +102,18 @@ public class SchemaServiceImpl implement
}
}
+ @SuppressWarnings("unchecked")
@Override
- public List<? extends AbstractSchemaTO> list(final AttributableType kind, final SchemaType type) {
+ public <T extends AbstractSchemaTO> List<T> list(final AttributableType kind, final SchemaType type) {
switch (type) {
case NORMAL:
- return normalSchemaController.list(kind.toString());
+ return (List<T>) normalSchemaController.list(kind.toString());
case DERIVED:
- return derivedSchemaController.list(kind.toString());
+ return (List<T>) derivedSchemaController.list(kind.toString());
case VIRTUAL:
- return virtualSchemaController.list(kind.toString());
+ return (List<T>) virtualSchemaController.list(kind.toString());
default:
throw new BadRequestException();
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/services/TaskServiceImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/services/TaskServiceImpl.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/services/TaskServiceImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/services/TaskServiceImpl.java Thu Jul 18 14:03:08 2013
@@ -115,13 +115,13 @@ public class TaskServiceImpl implements
}
@Override
- public List<? extends TaskTO> list(final TaskType taskType) {
- return taskController.list(taskType.toString());
+ public <T extends TaskTO> List<T> list(final TaskType taskType) {
+ return (List<T>) taskController.list(taskType.toString());
}
@Override
- public List<? extends TaskTO> list(final TaskType taskType, final int page, final int size) {
- return taskController.list(taskType.toString(), page, size);
+ public <T extends TaskTO> List<T> list(final TaskType taskType, final int page, final int size) {
+ return (List<T>) taskController.list(taskType.toString(), page, size);
}
@SuppressWarnings("unchecked")
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserRequestServiceImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserRequestServiceImpl.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserRequestServiceImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserRequestServiceImpl.java Thu Jul 18 14:03:08 2013
@@ -86,5 +86,4 @@ public class UserRequestServiceImpl impl
public void setUriInfo(final UriInfo uriInfo) {
this.uriInfo = uriInfo;
}
-
}
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java Thu Jul 18 14:03:08 2013
@@ -18,12 +18,11 @@
*/
package org.apache.syncope.core.services;
-import java.util.List;
-
import javax.ws.rs.BadRequestException;
import javax.ws.rs.core.UriInfo;
import org.apache.syncope.common.services.WorkflowService;
+import org.apache.syncope.common.services.WorkflowTasks;
import org.apache.syncope.common.to.WorkflowDefinitionTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.util.CollectionWrapper;
@@ -33,7 +32,7 @@ import org.springframework.stereotype.Se
@Service
public class WorkflowServiceImpl implements WorkflowService, ContextAware {
-
+
@Autowired
private WorkflowController workflowController;
@@ -49,7 +48,6 @@ public class WorkflowServiceImpl impleme
}
}
-
@Override
public void updateDefinition(final AttributableType kind, final WorkflowDefinitionTO definition) {
switch (kind) {
@@ -64,14 +62,13 @@ public class WorkflowServiceImpl impleme
}
}
-
@Override
- public List<String> getDefinedTasks(final AttributableType kind) {
+ public WorkflowTasks getDefinedTasks(final AttributableType kind) {
switch (kind) {
case USER:
- return CollectionWrapper.wrapStrings(workflowController.getDefinedUserTasks());
+ return new WorkflowTasks(CollectionWrapper.wrapStrings(workflowController.getDefinedUserTasks()));
case ROLE:
- return CollectionWrapper.wrapStrings(workflowController.getDefinedUserTasks());
+ return new WorkflowTasks(CollectionWrapper.wrapStrings(workflowController.getDefinedUserTasks()));
default:
throw new BadRequestException();
}
@@ -80,5 +77,4 @@ public class WorkflowServiceImpl impleme
@Override
public void setUriInfo(final UriInfo ui) {
}
-
}
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncResult.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncResult.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncResult.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncResult.java Thu Jul 18 14:03:08 2013
@@ -20,9 +20,9 @@ package org.apache.syncope.core.sync;
import java.util.Collection;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.ResourceOperation;
import org.apache.syncope.common.types.TraceLevel;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java Thu Jul 18 14:03:08 2013
@@ -21,7 +21,7 @@ package org.apache.syncope.core.sync.imp
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.mod.ReferenceMod;
import org.apache.syncope.common.mod.RoleMod;
import org.apache.syncope.common.types.ConflictResolutionAction;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java Thu Jul 18 14:03:08 2013
@@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.mod.AttributeMod;
import org.apache.syncope.common.mod.RoleMod;
import org.apache.syncope.common.mod.UserMod;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ConnIdBundleManager.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ConnIdBundleManager.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ConnIdBundleManager.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ConnIdBundleManager.java Thu Jul 18 14:03:08 2013
@@ -35,7 +35,7 @@ import java.util.Properties;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.core.persistence.dao.NotFoundException;
import org.identityconnectors.common.IOUtil;
import org.identityconnectors.common.security.GuardedString;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ContentExporter.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ContentExporter.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ContentExporter.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ContentExporter.java Thu Jul 18 14:03:08 2013
@@ -47,7 +47,7 @@ import javax.xml.transform.sax.SAXTransf
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.SyncopeConstants;
import org.apache.syncope.core.persistence.dao.impl.AbstractContentDealer;
import org.apache.syncope.core.util.multiparent.MultiParentNode;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/DataFormat.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/DataFormat.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/DataFormat.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/DataFormat.java Thu Jul 18 14:03:08 2013
@@ -22,7 +22,7 @@ import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.apache.syncope.common.SyncopeConstants;
/**
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/JexlUtil.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/JexlUtil.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/JexlUtil.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/JexlUtil.java Thu Jul 18 14:03:08 2013
@@ -28,8 +28,8 @@ import org.apache.commons.jexl2.JexlCont
import org.apache.commons.jexl2.JexlEngine;
import org.apache.commons.jexl2.JexlException;
import org.apache.commons.jexl2.MapContext;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.to.AbstractAttributableTO;
import org.apache.syncope.common.to.AttributeTO;
import org.apache.syncope.core.persistence.beans.AbstractAttr;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java Thu Jul 18 14:03:08 2013
@@ -28,7 +28,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.jexl2.JexlContext;
import org.apache.commons.jexl2.MapContext;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.mod.AttributeMod;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.IntMappingType;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/PasswordEncoder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/PasswordEncoder.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/PasswordEncoder.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/PasswordEncoder.java Thu Jul 18 14:03:08 2013
@@ -29,7 +29,7 @@ import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.SecretKeySpec;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.syncope.common.types.CipherAlgorithm;
import org.jasypt.commons.CommonUtils;
import org.jasypt.digest.StandardStringDigester;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/VirAttrCacheKey.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/VirAttrCacheKey.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/VirAttrCacheKey.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/VirAttrCacheKey.java Thu Jul 18 14:03:08 2013
@@ -18,10 +18,10 @@
*/
package org.apache.syncope.core.util;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.syncope.common.types.AttributableType;
/**
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/multiparent/MultiParentNode.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/multiparent/MultiParentNode.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/multiparent/MultiParentNode.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/multiparent/MultiParentNode.java Thu Jul 18 14:03:08 2013
@@ -20,8 +20,8 @@ package org.apache.syncope.core.util.mul
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
public class MultiParentNode<T> {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/WorkflowResult.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/WorkflowResult.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/WorkflowResult.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/WorkflowResult.java Thu Jul 18 14:03:08 2013
@@ -20,10 +20,10 @@ package org.apache.syncope.core.workflow
import java.util.Collections;
import java.util.Set;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.syncope.core.propagation.PropagationByResource;
public class WorkflowResult<T> {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java Thu Jul 18 14:03:08 2013
@@ -54,7 +54,7 @@ import org.activiti.engine.repository.Pr
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.mod.UserMod;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.to.WorkflowDefinitionTO;
Modified: syncope/trunk/core/src/main/resources/restContext.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/restContext.xml?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/restContext.xml (original)
+++ syncope/trunk/core/src/main/resources/restContext.xml Thu Jul 18 14:03:08 2013
@@ -55,14 +55,16 @@ under the License.
<property name="collectionWrapperMap">
<map>
<entry>
- <key><value>org.apache.syncope.common.to.PolicyTO</value></key>
+ <key>
+ <value>org.apache.syncope.common.to.PolicyTO</value>
+ </key>
<value>policies</value>
</entry>
</map>
</property>
</bean>
- <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider">
+ <bean id="jsonProvider" class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider">
<property name="mapper" ref="jacksonObjectMapper"/>
</bean>
@@ -103,7 +105,8 @@ under the License.
<!-- JSON (via Jackson) -->
<bean id="jacksonObjectMapper" class="org.apache.syncope.core.rest.data.UnwrappedObjectMapper"/>
- <bean id="mappingJacksonHttpMessageConverter" class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
+ <bean id="mappingJacksonHttpMessageConverter"
+ class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
<property name="objectMapper" ref="jacksonObjectMapper"/>
</bean>
@@ -111,7 +114,8 @@ under the License.
<bean id="xStreamXmlMarshaller" class="org.springframework.oxm.xstream.XStreamMarshaller">
<property name="autodetectAnnotations" value="true"/>
</bean>
- <bean id="mappingXstreamHttpMessageConverter" class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter">
+ <bean id="mappingXstreamHttpMessageConverter"
+ class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter">
<constructor-arg ref="xStreamXmlMarshaller"/>
</bean>
@@ -143,7 +147,7 @@ under the License.
</property>
<property name="defaultViews">
<list>
- <bean class="org.springframework.web.servlet.view.json.MappingJacksonJsonView">
+ <bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
<property name="objectMapper" ref="jacksonObjectMapper"/>
</bean>
<bean class="org.springframework.web.servlet.view.xml.MarshallingView">
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java Thu Jul 18 14:03:08 2013
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.core.rest;
-import static org.apache.syncope.common.types.PolicyType.GLOBAL_SYNC;
-import static org.apache.syncope.common.types.PolicyType.SYNC;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
@@ -73,13 +71,10 @@ import org.apache.syncope.common.service
import org.apache.syncope.common.services.UserWorkflowService;
import org.apache.syncope.common.services.WorkflowService;
import org.apache.syncope.common.to.AbstractSchemaTO;
-import org.apache.syncope.common.to.AccountPolicyTO;
import org.apache.syncope.common.to.AttributeTO;
-import org.apache.syncope.common.to.PasswordPolicyTO;
import org.apache.syncope.common.to.PolicyTO;
import org.apache.syncope.common.to.ResourceTO;
import org.apache.syncope.common.to.RoleTO;
-import org.apache.syncope.common.to.SyncPolicyTO;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.PolicyType;
@@ -91,7 +86,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.client.RestTemplate;
@@ -111,11 +106,8 @@ public abstract class AbstractTest {
protected static final String ADMIN_PWD = "password";
- public static final String CONTENT_TYPE_JSON = "application/json";
-
- public static final String CONTENT_TYPE_XML = "application/xml";
-
- public static final String DEFAULT_CONTENT_TYPE = CONTENT_TYPE_JSON;
+ // JSON is not working completely, so let's stay with XML as default for the moment
+ private static final String DEFAULT_CONTENT_TYPE = MediaType.APPLICATION_XML;
private static final String ENV_KEY_CONTENT_TYPE = "jaxrsContentType";
@@ -123,7 +115,7 @@ public abstract class AbstractTest {
private RestTemplate restTemplate;
@Autowired
- private MappingJacksonHttpMessageConverter mappingJacksonHttpMessageConverter;
+ private MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter;
@Autowired
private PreemptiveAuthHttpRequestFactory httpClientFactory;
@@ -254,20 +246,13 @@ public abstract class AbstractTest {
return serviceProxy;
}
- protected WebClient createWebClient(final String path) {
- WebClient wc = restClientFactory.createWebClient().to(BASE_URL, false);
- wc.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE);
- wc.path(path);
- return wc;
- }
-
protected void setupContentType(final Client restClient) {
if (contentType == null) {
String envContentType = System.getProperty(ENV_KEY_CONTENT_TYPE);
- if ((envContentType != null) && (!envContentType.isEmpty())) {
- contentType = envContentType;
- } else {
+ if (envContentType == null || envContentType.isEmpty()) {
contentType = DEFAULT_CONTENT_TYPE;
+ } else {
+ contentType = envContentType;
}
}
restClient.type(contentType).accept(contentType);
@@ -313,10 +298,6 @@ public abstract class AbstractTest {
this.enabledCXF = enabledCXF;
}
- protected void setContentType(final String contentType) {
- this.contentType = contentType;
- }
-
private static <T> T getObjectCXF(final Response response, final Class<T> type, final Object serviceProxy) {
String location = response.getLocation().toString();
WebClient webClient = WebClient.fromClient(WebClient.client(serviceProxy));
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java Thu Jul 18 14:03:08 2013
@@ -512,17 +512,13 @@ public class ConnInstanceTestITCase exte
// set connector configuration
connectorTO.setConfiguration(conf);
- Boolean verify = connectorService.check(connectorTO);
-
- assertTrue(verify);
+ assertTrue(connectorService.check(connectorTO));
conf.remove(password);
password.setValues(Collections.singletonList("password"));
conf.add(password);
- verify = connectorService.check(connectorTO);
-
- assertFalse(verify);
+ assertFalse(connectorService.check(connectorTO));
}
@Test
@@ -627,7 +623,7 @@ public class ConnInstanceTestITCase exte
throw (RuntimeException) clientExceptionMapper.fromResponse(response);
}
- connectorTO = getObject(response, ConnInstanceTO.class, configurationService);
+ connectorTO = getObject(response, ConnInstanceTO.class, connectorService);
assertNotNull(connectorTO);
// ----------------------------------------
@@ -644,7 +640,7 @@ public class ConnInstanceTestITCase exte
endpoint.setValues(Collections.singletonList("http://localhost:9080/wssample/services/provisioning"));
conf.add(endpoint);
- resourceTO.setConnectorConfigurationProperties(conf);
+ resourceTO.setConnConfProperties(conf);
MappingTO mapping = new MappingTO();
resourceTO.setUmapping(mapping);
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java Thu Jul 18 14:03:08 2013
@@ -41,9 +41,7 @@ public class DerivedSchemaTestITCase ext
@Test
public void list() {
- @SuppressWarnings("unchecked")
- List<DerivedSchemaTO> derivedSchemas = (List<DerivedSchemaTO>) schemaService.list(AttributableType.USER,
- SchemaType.DERIVED);
+ List<DerivedSchemaTO> derivedSchemas = schemaService.list(AttributableType.USER, SchemaType.DERIVED);
assertFalse(derivedSchemas.isEmpty());
for (DerivedSchemaTO derivedSchemaTO : derivedSchemas) {
assertNotNull(derivedSchemaTO);
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java Thu Jul 18 14:03:08 2013
@@ -120,7 +120,7 @@ public class ResourceTestITCase extends
p.setValues(Collections.singletonList("http://invalidurl/"));
Set<ConnConfProperty> connectorConfigurationProperties = new HashSet<ConnConfProperty>(Arrays.asList(p));
- resourceTO.setConnectorConfigurationProperties(connectorConfigurationProperties);
+ resourceTO.setConnConfProperties(connectorConfigurationProperties);
Response response = resourceService.create(resourceTO);
ResourceTO actual = getObject(response, ResourceTO.class, resourceService);
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java Thu Jul 18 14:03:08 2013
@@ -132,23 +132,21 @@ public class SchemaTestITCase extends Ab
assertNull(firstname);
}
- @SuppressWarnings("unchecked")
@Test
public void list() {
- List<SchemaTO> userSchemas = (List<SchemaTO>) schemaService.list(AttributableType.USER, SchemaType.NORMAL);
+ List<SchemaTO> userSchemas = schemaService.list(AttributableType.USER, SchemaType.NORMAL);
assertFalse(userSchemas.isEmpty());
for (SchemaTO schemaTO : userSchemas) {
assertNotNull(schemaTO);
}
- List<SchemaTO> roleSchemas = (List<SchemaTO>) schemaService.list(AttributableType.ROLE, SchemaType.NORMAL);
+ List<SchemaTO> roleSchemas = schemaService.list(AttributableType.ROLE, SchemaType.NORMAL);
assertFalse(roleSchemas.isEmpty());
for (SchemaTO schemaTO : roleSchemas) {
assertNotNull(schemaTO);
}
- List<SchemaTO> membershipSchemas = (List<SchemaTO>) schemaService.list(AttributableType.MEMBERSHIP,
- SchemaType.NORMAL);
+ List<SchemaTO> membershipSchemas = schemaService.list(AttributableType.MEMBERSHIP, SchemaType.NORMAL);
assertFalse(membershipSchemas.isEmpty());
for (SchemaTO schemaTO : membershipSchemas) {
assertNotNull(schemaTO);
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java Thu Jul 18 14:03:08 2013
@@ -144,8 +144,7 @@ public class TaskTestITCase extends Abst
@Test
public void list() {
- @SuppressWarnings("unchecked")
- List<PropagationTaskTO> tasks = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION);
+ List<PropagationTaskTO> tasks = taskService.list(TaskType.PROPAGATION);
assertNotNull(tasks);
assertFalse(tasks.isEmpty());
@@ -155,9 +154,8 @@ public class TaskTestITCase extends Abst
}
@Test
- @SuppressWarnings("unchecked")
public void paginatedList() {
- List<PropagationTaskTO> tasks = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION, 1, 2);
+ List<PropagationTaskTO> tasks = taskService.list(TaskType.PROPAGATION, 1, 2);
assertNotNull(tasks);
assertFalse(tasks.isEmpty());
@@ -167,7 +165,7 @@ public class TaskTestITCase extends Abst
assertNotNull(task);
}
- tasks = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION, 2, 2);
+ tasks = taskService.list(TaskType.PROPAGATION, 2, 2);
assertNotNull(tasks);
assertFalse(tasks.isEmpty());
@@ -176,7 +174,7 @@ public class TaskTestITCase extends Abst
assertNotNull(task);
}
- tasks = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION, 1000, 2);
+ tasks = taskService.list(TaskType.PROPAGATION, 1000, 2);
assertNotNull(tasks);
assertTrue(tasks.isEmpty());
@@ -512,8 +510,7 @@ public class TaskTestITCase extends Abst
}
private NotificationTaskTO findNotificationTaskBySender(final String sender) {
- @SuppressWarnings("unchecked")
- List<NotificationTaskTO> tasks = (List<NotificationTaskTO>) taskService.list(TaskType.NOTIFICATION);
+ List<NotificationTaskTO> tasks = taskService.list(TaskType.NOTIFICATION);
assertNotNull(tasks);
assertFalse(tasks.isEmpty());
@@ -887,17 +884,15 @@ public class TaskTestITCase extends Abst
@Test
public void bulkAction() {
- @SuppressWarnings("unchecked")
- final List<PropagationTaskTO> before = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION);
+ final List<PropagationTaskTO> before = taskService.list(TaskType.PROPAGATION);
// create user with testdb resource
final UserTO userTO = UserTestITCase.getUniqueSampleTO("taskBulk@apache.org");
userTO.addResource("resource-testdb");
createUser(userTO);
- @SuppressWarnings("unchecked")
- final List<PropagationTaskTO> after =
- new ArrayList<PropagationTaskTO>((List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION));
+ final List<PropagationTaskTO> after = new ArrayList<PropagationTaskTO>(
+ taskService.<PropagationTaskTO>list(TaskType.PROPAGATION));
after.removeAll(before);
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java Thu Jul 18 14:03:08 2013
@@ -148,7 +148,7 @@ public class UserTestITCase extends Abst
@SuppressWarnings("unchecked")
public void createUserWithNoPropagation() {
// get task list
- List<PropagationTaskTO> tasks = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION);
+ List<PropagationTaskTO> tasks = taskService.list(TaskType.PROPAGATION);
assertNotNull(tasks);
assertFalse(tasks.isEmpty());
@@ -164,7 +164,7 @@ public class UserTestITCase extends Abst
createUser(userTO);
// get the new task list
- tasks = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION);
+ tasks = taskService.list(TaskType.PROPAGATION);
assertNotNull(tasks);
assertFalse(tasks.isEmpty());
@@ -386,7 +386,7 @@ public class UserTestITCase extends Abst
@SuppressWarnings("unchecked")
public void create() {
// get task list
- List<PropagationTaskTO> tasks = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION);
+ List<PropagationTaskTO> tasks = taskService.list(TaskType.PROPAGATION);
assertNotNull(tasks);
assertFalse(tasks.isEmpty());
@@ -433,7 +433,7 @@ public class UserTestITCase extends Abst
assertEquals("virtualvalue", newUserTO.getVirtualAttributeMap().get("virtualdata").getValues().get(0));
// get the new task list
- tasks = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION);
+ tasks = taskService.list(TaskType.PROPAGATION);
assertNotNull(tasks);
assertFalse(tasks.isEmpty());
@@ -901,7 +901,7 @@ public class UserTestITCase extends Abst
@Test
@SuppressWarnings("unchecked")
public void updatePasswordOnly() {
- List<PropagationTaskTO> beforeTasks = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION);
+ List<PropagationTaskTO> beforeTasks = taskService.list(TaskType.PROPAGATION);
assertNotNull(beforeTasks);
assertFalse(beforeTasks.isEmpty());
@@ -926,7 +926,7 @@ public class UserTestITCase extends Abst
passwordTestUser.setPassword("newPassword123", CipherAlgorithm.SHA1, 0);
assertEquals(passwordTestUser.getPassword(), userTO.getPassword());
- List<PropagationTaskTO> afterTasks = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION);
+ List<PropagationTaskTO> afterTasks = taskService.list(TaskType.PROPAGATION);
assertNotNull(afterTasks);
assertFalse(afterTasks.isEmpty());
@@ -937,7 +937,7 @@ public class UserTestITCase extends Abst
@Test
public void verifyTaskRegistration() {
// get task list
- List<PropagationTaskTO> tasks = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION);
+ List<PropagationTaskTO> tasks = taskService.list(TaskType.PROPAGATION);
assertNotNull(tasks);
assertFalse(tasks.isEmpty());
@@ -960,7 +960,7 @@ public class UserTestITCase extends Abst
assertNotNull(userTO);
// get the new task list
- tasks = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION);
+ tasks = taskService.list(TaskType.PROPAGATION);
assertNotNull(tasks);
assertFalse(tasks.isEmpty());
@@ -985,7 +985,7 @@ public class UserTestITCase extends Abst
assertNotNull(userTO);
// get the new task list
- tasks = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION);
+ tasks = taskService.list(TaskType.PROPAGATION);
maxId = newMaxId;
newMaxId = getMaxTaskId(tasks);
@@ -1005,7 +1005,7 @@ public class UserTestITCase extends Abst
userService.delete(userTO.getId());
// get the new task list
- tasks = (List<PropagationTaskTO>) taskService.list(TaskType.PROPAGATION);
+ tasks = taskService.list(TaskType.PROPAGATION);
maxId = newMaxId;
newMaxId = getMaxTaskId(tasks);
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java Thu Jul 18 14:03:08 2013
@@ -41,9 +41,7 @@ public class VirtualSchemaTestITCase ext
@Test
public void list() {
- @SuppressWarnings("unchecked")
- List<VirtualSchemaTO> vSchemas = (List<VirtualSchemaTO>) schemaService.list(AttributableType.USER,
- SchemaType.VIRTUAL);
+ List<VirtualSchemaTO> vSchemas = schemaService.list(AttributableType.USER, SchemaType.VIRTUAL);
assertFalse(vSchemas.isEmpty());
for (VirtualSchemaTO vSchemaTO : vSchemas) {
assertNotNull(vSchemaTO);
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java Thu Jul 18 14:03:08 2013
@@ -21,7 +21,7 @@ package org.apache.syncope.core.rest;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
-import java.util.List;
+import org.apache.syncope.common.services.WorkflowTasks;
import org.apache.syncope.common.to.WorkflowDefinitionTO;
import org.apache.syncope.common.types.AttributableType;
@@ -69,15 +69,15 @@ public class WorkflowTestITCase extends
@Test
public void testGetUserTasks() {
- List<String> tasks = workflowService.getDefinedTasks(AttributableType.USER);
- assertNotNull(tasks);
- assertFalse(tasks.isEmpty());
+ WorkflowTasks tasks = workflowService.getDefinedTasks(AttributableType.USER);
+ assertNotNull(tasks.getTasks());
+ assertFalse(tasks.getTasks().isEmpty());
}
@Test
public void testGetRoleTasks() {
- List<String> tasks = workflowService.getDefinedTasks(AttributableType.ROLE);
- assertNotNull(tasks);
- assertFalse(tasks.isEmpty());
+ WorkflowTasks tasks = workflowService.getDefinedTasks(AttributableType.ROLE);
+ assertNotNull(tasks.getTasks());
+ assertFalse(tasks.getTasks().isEmpty());
}
}
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/data/ResourceDataTest.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/data/ResourceDataTest.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/data/ResourceDataTest.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/data/ResourceDataTest.java Thu Jul 18 14:03:08 2013
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Arrays;
@@ -40,7 +41,6 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.beans.user.USchema;
import org.apache.syncope.core.persistence.dao.ResourceDAO;
import org.apache.syncope.core.persistence.dao.SchemaDAO;
-import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ConfigurationTestITCaseJAXRS.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ConfigurationTestITCaseJAXRS.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ConfigurationTestITCaseJAXRS.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ConfigurationTestITCaseJAXRS.java Thu Jul 18 14:03:08 2013
@@ -27,7 +27,6 @@ public class ConfigurationTestITCaseJAXR
public ConfigurationTestITCaseJAXRS() {
super();
- setContentType(CONTENT_TYPE_XML);
setEnabledCXF(true);
}
}
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/DerivedSchemaTestITCaseJAXRS.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/DerivedSchemaTestITCaseJAXRS.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/DerivedSchemaTestITCaseJAXRS.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/DerivedSchemaTestITCaseJAXRS.java Thu Jul 18 14:03:08 2013
@@ -28,7 +28,5 @@ public class DerivedSchemaTestITCaseJAXR
public DerivedSchemaTestITCaseJAXRS() {
super();
setEnabledCXF(true);
- // JSON is currently not working (fix after CXF migration is complete)
- setContentType(CONTENT_TYPE_XML);
}
}
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/EntitlementTestITCaseJAXRS.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/EntitlementTestITCaseJAXRS.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/EntitlementTestITCaseJAXRS.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/EntitlementTestITCaseJAXRS.java Thu Jul 18 14:03:08 2013
@@ -28,7 +28,5 @@ public class EntitlementTestITCaseJAXRS
public EntitlementTestITCaseJAXRS() {
super();
setEnabledCXF(true);
- // JSON is currently not working (fix after CXF migration is complete)
- setContentType(CONTENT_TYPE_XML);
}
}
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/PolicyTestITCaseJAXRS.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/PolicyTestITCaseJAXRS.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/PolicyTestITCaseJAXRS.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/PolicyTestITCaseJAXRS.java Thu Jul 18 14:03:08 2013
@@ -28,7 +28,5 @@ public class PolicyTestITCaseJAXRS exten
public PolicyTestITCaseJAXRS() {
super();
setEnabledCXF(true);
- // JSON is currently not working (fix after CXF migration is complete)
- setContentType(CONTENT_TYPE_XML);
}
}
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ReportTestITCaseJAXRS.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ReportTestITCaseJAXRS.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ReportTestITCaseJAXRS.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ReportTestITCaseJAXRS.java Thu Jul 18 14:03:08 2013
@@ -28,7 +28,5 @@ public class ReportTestITCaseJAXRS exten
public ReportTestITCaseJAXRS() {
super();
setEnabledCXF(true);
- // JSON is currently not working (fix after CXF migration is complete)
- setContentType(CONTENT_TYPE_XML);
}
}
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/SchemaTestITCaseJAXRS.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/SchemaTestITCaseJAXRS.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/SchemaTestITCaseJAXRS.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/SchemaTestITCaseJAXRS.java Thu Jul 18 14:03:08 2013
@@ -28,7 +28,5 @@ public class SchemaTestITCaseJAXRS exten
public SchemaTestITCaseJAXRS() {
super();
setEnabledCXF(true);
- // JSON is currently not working (fix after CXF migration is complete)
- setContentType(CONTENT_TYPE_XML);
}
}
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/TaskTestITCaseJAXRS.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/TaskTestITCaseJAXRS.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/TaskTestITCaseJAXRS.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/TaskTestITCaseJAXRS.java Thu Jul 18 14:03:08 2013
@@ -28,7 +28,5 @@ public class TaskTestITCaseJAXRS extends
public TaskTestITCaseJAXRS() {
super();
setEnabledCXF(true);
- // JSON is currently not working (fix after CXF migration is complete)
- setContentType(CONTENT_TYPE_XML);
}
}
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/UserTestITCaseJAXRS.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/UserTestITCaseJAXRS.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/UserTestITCaseJAXRS.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/UserTestITCaseJAXRS.java Thu Jul 18 14:03:08 2013
@@ -28,6 +28,5 @@ public class UserTestITCaseJAXRS extends
public UserTestITCaseJAXRS() {
super();
setEnabledCXF(true);
- setContentType(CONTENT_TYPE_XML);
}
}
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/VirtualSchemaTestITCaseJAXRS.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/VirtualSchemaTestITCaseJAXRS.java?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/VirtualSchemaTestITCaseJAXRS.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/VirtualSchemaTestITCaseJAXRS.java Thu Jul 18 14:03:08 2013
@@ -28,6 +28,5 @@ public class VirtualSchemaTestITCaseJAXR
public VirtualSchemaTestITCaseJAXRS() {
super();
setEnabledCXF(true);
- setContentType(CONTENT_TYPE_XML);
}
}
Modified: syncope/trunk/core/src/test/resources/restClientContext.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/restClientContext.xml?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/restClientContext.xml (original)
+++ syncope/trunk/core/src/test/resources/restClientContext.xml Thu Jul 18 14:03:08 2013
@@ -74,8 +74,8 @@ under the License.
<!-- JSON (via Jackson) -->
<bean id="jacksonObjectMapper" class="org.apache.syncope.core.rest.data.UnwrappedObjectMapper"/>
- <bean id="mappingJacksonHttpMessageConverter"
- class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
+ <bean id="mappingJacksonHttpMessageConverter"
+ class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
<property name="objectMapper" ref="jacksonObjectMapper"/>
</bean>
@@ -104,7 +104,7 @@ under the License.
</property>
</bean>
- <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider">
+ <bean id="jsonProvider" class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider">
<property name="mapper" ref="jacksonObjectMapper"/>
</bean>
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1504477&r1=1504476&r2=1504477&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Thu Jul 18 14:03:08 2013
@@ -292,17 +292,17 @@ under the License.
<connid.ad.version>1.1.1</connid.ad.version>
<commons-jexl.version>2.1.1</commons-jexl.version>
- <commons-lang.version>2.6</commons-lang.version>
+ <commons-lang.version>3.1</commons-lang.version>
<hc.client.version>4.2.5</hc.client.version>
<activiti.version>5.13</activiti.version>
- <cxf.version>2.7.5</cxf.version>
+ <cxf.version>2.7.6-SNAPSHOT</cxf.version>
<spring.version>3.2.3.RELEASE</spring.version>
<spring-security.version>3.1.4.RELEASE</spring-security.version>
<aspectj.version>1.7.3</aspectj.version>
- <jackson.version>1.9.12</jackson.version>
+ <jackson.version>2.2.2</jackson.version>
<xstream.version>1.4.4</xstream.version>
<velocity.version>1.7</velocity.version>
<quartz.version>2.1.7</quartz.version>
@@ -400,8 +400,8 @@ under the License.
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
<version>${commons-lang.version}</version>
</dependency>
@@ -627,18 +627,18 @@ under the License.
<!-- /CXF -->
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
</dependency>