syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject syncope git commit: [SYNCOPE-742] Downgrade to CXF 3.1.4
Date Tue, 22 Dec 2015 11:50:47 GMT
Repository: syncope
Updated Branches:
  refs/heads/master a9c262454 -> 72e3836cf


[SYNCOPE-742] Downgrade to CXF 3.1.4


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/72e3836c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/72e3836c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/72e3836c

Branch: refs/heads/master
Commit: 72e3836cf29e1edeb2c619c2d06ce64252e31f34
Parents: a9c2624
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Tue Dec 22 12:50:40 2015 +0100
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Tue Dec 22 12:50:40 2015 +0100

----------------------------------------------------------------------
 .../schema/SchemaSyncopeOperations.java         | 16 ++++++--
 .../commands/task/TaskSyncopeOperations.java    |  8 +++-
 .../client/console/rest/SchemaRestClient.java   |  4 +-
 .../client/console/rest/TaskRestClient.java     |  6 ++-
 .../enduser/resources/SchemaResource.java       |  6 +--
 .../common/rest/api/service/SchemaService.java  |  5 ++-
 .../common/rest/api/service/TaskService.java    |  6 ++-
 .../syncope/core/rest/cxf/Swagger2Feature.java  | 40 +++++++++++++++++---
 .../syncope/core/rest/cxf/WadlGenerator.java    | 10 ++++-
 .../rest/cxf/service/SchemaServiceImpl.java     |  3 +-
 .../core/rest/cxf/service/TaskServiceImpl.java  |  4 +-
 .../fit/core/reference/AbstractTaskITCase.java  |  2 +-
 .../fit/core/reference/DerSchemaITCase.java     |  3 +-
 .../fit/core/reference/MultitenancyITCase.java  |  2 +-
 .../fit/core/reference/PlainSchemaITCase.java   |  5 ++-
 .../core/reference/PropagationTaskITCase.java   | 16 +++++---
 .../fit/core/reference/PushTaskITCase.java      |  3 +-
 .../fit/core/reference/SchedTaskITCase.java     |  2 +-
 .../fit/core/reference/SyncTaskITCase.java      |  2 +-
 .../syncope/fit/core/reference/UserITCase.java  | 25 ++++++++----
 .../fit/core/reference/VirSchemaITCase.java     |  8 ++--
 pom.xml                                         |  2 +-
 22 files changed, 128 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaSyncopeOperations.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaSyncopeOperations.java
b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaSyncopeOperations.java
index 92f9bf3..0201be0 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaSyncopeOperations.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaSyncopeOperations.java
@@ -34,19 +34,27 @@ public class SchemaSyncopeOperations {
     }
 
     public <T extends AbstractSchemaTO> List<T> list(final String schemaTypeString)
{
-        return schemaService.list(new SchemaQuery.Builder().type(SchemaType.valueOf(schemaTypeString)).build());
+        return schemaService.list(
+                SchemaType.valueOf(schemaTypeString),
+                new SchemaQuery.Builder().type(SchemaType.valueOf(schemaTypeString)).build());
     }
 
     public <T extends AbstractSchemaTO> List<T> listPlain() {
-        return schemaService.list(new SchemaQuery.Builder().type(SchemaType.PLAIN).build());
+        return schemaService.list(
+                SchemaType.PLAIN,
+                new SchemaQuery.Builder().type(SchemaType.PLAIN).build());
     }
 
     public <T extends AbstractSchemaTO> List<T> listDerived() {
-        return schemaService.list(new SchemaQuery.Builder().type(SchemaType.DERIVED).build());
+        return schemaService.list(
+                SchemaType.DERIVED,
+                new SchemaQuery.Builder().type(SchemaType.DERIVED).build());
     }
 
     public <T extends AbstractSchemaTO> List<T> listVirtual() {
-        return schemaService.list(new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build());
+        return schemaService.list(
+                SchemaType.VIRTUAL,
+                new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build());
     }
 
     public void delete(final String schemaTypeString, final String schemaName) {

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java
b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java
index 61ba771..65761d3 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java
@@ -49,11 +49,15 @@ public class TaskSyncopeOperations {
     }
 
     public List<AbstractTaskTO> list(final String type) {
-        return taskService.list(new TaskQuery.Builder().type(TaskType.valueOf(type)).build()).getResult();
+        return taskService.list(
+                TaskType.valueOf(type),
+                new TaskQuery.Builder().type(TaskType.valueOf(type)).build()).getResult();
     }
 
     public List<AbstractTaskTO> listPropagationTask() {
-        return taskService.list(new TaskQuery.Builder().type(TaskType.PROPAGATION).build()).getResult();
+        return taskService.list(
+                TaskType.PROPAGATION,
+                new TaskQuery.Builder().type(TaskType.PROPAGATION).build()).getResult();
     }
 
     public void deleteExecution(final String executionKey) {

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java
b/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java
index 10c2fa2..38b1992 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/SchemaRestClient.java
@@ -64,10 +64,10 @@ public class SchemaRestClient extends BaseRestClient {
         try {
             if (kind == null || kind.length == 0) {
                 schemas.addAll(getService(SchemaService.class).
-                        <T>list(new SchemaQuery.Builder().type(schemaType).build()));
+                        <T>list(schemaType, new SchemaQuery.Builder().type(schemaType).build()));
             } else {
                 schemas.addAll(getService(SchemaService.class).
-                        <T>list(new SchemaQuery.Builder().type(schemaType).anyTypeClasses(kind).build()));
+                        <T>list(schemaType, new SchemaQuery.Builder().type(schemaType).anyTypeClasses(kind).build()));
             }
         } catch (SyncopeClientException e) {
             LOG.error("While getting all {} schemas for {}", schemaType, kind, e);

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
b/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
index 7de2253..7b75073 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
@@ -65,7 +65,8 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien
      */
     public int count(final String kind) {
         return getService(TaskService.class).
-                list(new TaskQuery.Builder().type(TaskType.valueOf(kind)).page(1).size(1).build()).
+                list(TaskType.valueOf(kind),
+                        new TaskQuery.Builder().type(TaskType.valueOf(kind)).page(1).size(1).build()).
                 getTotalCount();
     }
 
@@ -74,7 +75,8 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien
             final Class<T> reference, final int page, final int size, final SortParam<String>
sort) {
 
         return (List<T>) getService(TaskService.class).
-                list(new TaskQuery.Builder().type(getTaskType(reference)).page(page).size(size).
+                list(getTaskType(reference),
+                        new TaskQuery.Builder().type(getTaskType(reference)).page(page).size(size).
                         orderBy(toOrderBy(sort)).build()).
                 getResult();
     }

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java
index db6a7e4..77fce95 100644
--- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java
+++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java
@@ -67,13 +67,13 @@ public class SchemaResource extends AbstractBaseResource {
             final AnyTypeTO anyTypeUserTO = anyTypeService.read(AnyTypeKind.USER.name());
 
             final List<PlainSchemaTO> plainSchemas = schemaService.list(
-                    new SchemaQuery.Builder().type(SchemaType.PLAIN).
+                    SchemaType.PLAIN, new SchemaQuery.Builder().type(SchemaType.PLAIN).
                     anyTypeClasses(anyTypeUserTO.getClasses()).build());
             final List<DerSchemaTO> derSchemas = schemaService.list(
-                    new SchemaQuery.Builder().type(SchemaType.DERIVED).
+                    SchemaType.DERIVED, new SchemaQuery.Builder().type(SchemaType.DERIVED).
                     anyTypeClasses(anyTypeUserTO.getClasses()).build());
             final List<VirSchemaTO> virSchemas = schemaService.list(
-                    new SchemaQuery.Builder().type(SchemaType.VIRTUAL).
+                    SchemaType.VIRTUAL, new SchemaQuery.Builder().type(SchemaType.VIRTUAL).
                     anyTypeClasses(anyTypeUserTO.getClasses()).build());
 
             response.setWriteCallback(new AbstractResource.WriteCallback() {

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java
b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java
index 48f9b40..d0f6bd5 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java
@@ -59,12 +59,15 @@ public interface SchemaService extends JAXRSService {
      * Returns a list of schemas matching the given query.
      *
      * @param <T> actual SchemaTO
+     * @param type type for schemas to be listed
      * @param query query conditions
      * @return list of schemas with matching type, for the given anyTypeClass if provided
      */
     @GET
     @Produces({ JAXRSService.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    <T extends AbstractSchemaTO> List<T> list(@BeanParam SchemaQuery query);
+    <T extends AbstractSchemaTO> List<T> list(
+            @NotNull @PathParam("type") SchemaType type,
+            @BeanParam SchemaQuery query);
 
     /**
      * Creates a new schema.

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
index eda7c4b..ebd379c 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
@@ -42,6 +42,7 @@ import org.apache.syncope.common.lib.to.SchedTaskTO;
 import org.apache.syncope.common.lib.to.TaskExecTO;
 import org.apache.syncope.common.lib.types.JobAction;
 import org.apache.syncope.common.lib.types.JobStatusType;
+import org.apache.syncope.common.lib.types.TaskType;
 import org.apache.syncope.common.rest.api.beans.BulkExecDeleteQuery;
 import org.apache.syncope.common.rest.api.beans.ExecuteQuery;
 import org.apache.syncope.common.rest.api.beans.TaskExecQuery;
@@ -71,13 +72,16 @@ public interface TaskService extends JAXRSService {
     /**
      * Returns a paged list of existing tasks matching the given query.
      *
+     * @param type type of tasks to be listed
      * @param query query conditions
      * @param <T> type of taskTO
      * @return paged list of existing tasks matching the given query
      */
     @GET
     @Produces({ JAXRSService.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    <T extends AbstractTaskTO> PagedResult<T> list(@BeanParam TaskQuery query);
+    <T extends AbstractTaskTO> PagedResult<T> list(
+            @NotNull @MatrixParam("type") TaskType type,
+            @BeanParam TaskQuery query);
 
     /**
      * Creates a new task.

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java
index fa7ce9a..350bd61 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java
@@ -21,20 +21,48 @@ package org.apache.syncope.core.rest.cxf;
 import java.net.URL;
 import org.apache.cxf.Bus;
 import org.apache.cxf.endpoint.Server;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Automatically loads available javadocs from class loader (when {@link java.net.URLClassLoader}).
  */
 public class Swagger2Feature extends org.apache.cxf.jaxrs.swagger.Swagger2Feature {
 
-    @Override
-    public void initialize(final Server server, final Bus bus) {
-        URL[] javaDocURLs = JavaDocUtils.getJavaDocURLs();
-        if (javaDocURLs != null) {
-            super.setJavaDocURLs(javaDocURLs);
+    private static final Logger LOG = LoggerFactory.getLogger(Swagger2Feature.class);
+
+    private static final boolean SWAGGER_JAXRS_AVAILABLE;
+
+    static {
+        SWAGGER_JAXRS_AVAILABLE = isSwaggerJaxRsAvailable();
+    }
+
+    private static boolean isSwaggerJaxRsAvailable() {
+        try {
+            Class.forName("io.swagger.jaxrs.DefaultParameterExtension");
+            return true;
+        } catch (Throwable ex) {
+            return false;
         }
+    }
 
-        super.initialize(server, bus);
+    public void setActivateOnlyIfJaxrsSupported(final boolean activateOnlyIfJaxrsSupported)
{
+        // do nothing
     }
 
+    @Override
+    public void initialize(final Server server, final Bus bus) {
+        if (SWAGGER_JAXRS_AVAILABLE) {
+            URL[] javaDocURLs = JavaDocUtils.getJavaDocURLs();
+            if (javaDocURLs != null && javaDocURLs.length >= 0) {
+                try {
+                    super.setJavaDocPath(javaDocURLs[0].toExternalForm());
+                } catch (Exception e) {
+                    LOG.error("Could not load Javadocs from {}", javaDocURLs[0], e);
+                }
+            }
+
+            super.initialize(server, bus);
+        }
+    }
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/WadlGenerator.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/WadlGenerator.java
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/WadlGenerator.java
index 444e58e..664b439 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/WadlGenerator.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/WadlGenerator.java
@@ -20,12 +20,16 @@ package org.apache.syncope.core.rest.cxf;
 
 import java.net.URL;
 import javax.ws.rs.container.ContainerRequestContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Automatically loads available javadocs from class loader (when {@link java.net.URLClassLoader}).
  */
 public class WadlGenerator extends org.apache.cxf.jaxrs.model.wadl.WadlGenerator {
 
+    private static final Logger LOG = LoggerFactory.getLogger(WadlGenerator.class);
+
     private boolean inited = false;
 
     @Override
@@ -33,8 +37,10 @@ public class WadlGenerator extends org.apache.cxf.jaxrs.model.wadl.WadlGenerator
         synchronized (this) {
             if (!inited) {
                 URL[] javaDocURLs = JavaDocUtils.getJavaDocURLs();
-                if (javaDocURLs != null) {
-                    super.setJavaDocURLs(javaDocURLs);
+                try {
+                    super.setJavaDocPath(javaDocURLs[0].toExternalForm());
+                } catch (Exception e) {
+                    LOG.error("Could not load Javadocs from {}", javaDocURLs[0], e);
                 }
 
                 inited = true;

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java
index 810c520..0dd0482 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java
@@ -52,7 +52,8 @@ public class SchemaServiceImpl extends AbstractServiceImpl implements SchemaServ
     }
 
     @Override
-    public <T extends AbstractSchemaTO> List<T> list(final SchemaQuery query)
{
+    public <T extends AbstractSchemaTO> List<T> list(final SchemaType type, final
SchemaQuery query) {
+        query.setType(type);
         return logic.list(query.getType(), query.getAnyTypeClasses());
     }
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
index 5b33103..44e5cf7 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
@@ -32,6 +32,7 @@ import org.apache.syncope.common.lib.to.SyncTaskTO;
 import org.apache.syncope.common.lib.to.TaskExecTO;
 import org.apache.syncope.common.lib.types.JobAction;
 import org.apache.syncope.common.lib.types.JobStatusType;
+import org.apache.syncope.common.lib.types.TaskType;
 import org.apache.syncope.common.rest.api.RESTHeaders;
 import org.apache.syncope.common.rest.api.beans.BulkExecDeleteQuery;
 import org.apache.syncope.common.rest.api.beans.ExecuteQuery;
@@ -75,7 +76,8 @@ public class TaskServiceImpl extends AbstractServiceImpl implements TaskService
 
     @SuppressWarnings("unchecked")
     @Override
-    public <T extends AbstractTaskTO> PagedResult<T> list(final TaskQuery query)
{
+    public <T extends AbstractTaskTO> PagedResult<T> list(final TaskType type,
final TaskQuery query) {
+        query.setType(type);
         return (PagedResult<T>) buildPagedResult(
                 logic.list(
                         query.getType(),

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AbstractTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AbstractTaskITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AbstractTaskITCase.java
index 8a20ea9..2e815a5 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AbstractTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/AbstractTaskITCase.java
@@ -168,7 +168,7 @@ public abstract class AbstractTaskITCase extends AbstractITCase {
 
     protected NotificationTaskTO findNotificationTaskBySender(final String sender) {
         PagedResult<NotificationTaskTO> tasks =
-                taskService.list(new TaskQuery.Builder().type(TaskType.NOTIFICATION).build());
+                taskService.list(TaskType.NOTIFICATION, new TaskQuery.Builder().type(TaskType.NOTIFICATION).build());
         assertNotNull(tasks);
         assertFalse(tasks.getResult().isEmpty());
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java
index 6221f45..15f8384 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DerSchemaITCase.java
@@ -41,7 +41,8 @@ public class DerSchemaITCase extends AbstractITCase {
 
     @Test
     public void list() {
-        List<DerSchemaTO> derSchemas = schemaService.list(new SchemaQuery.Builder().type(SchemaType.DERIVED).build());
+        List<DerSchemaTO> derSchemas = schemaService.list(
+                SchemaType.DERIVED, new SchemaQuery.Builder().type(SchemaType.DERIVED).build());
         assertFalse(derSchemas.isEmpty());
         for (DerSchemaTO derivedSchemaTO : derSchemas) {
             assertNotNull(derivedSchemaTO);

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java
index 8458181..0cbf571 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java
@@ -104,7 +104,7 @@ public class MultitenancyITCase extends AbstractITCase {
     @Test
     public void readPlainSchemas() {
         assertEquals(17, adminClient.getService(SchemaService.class).
-                list(new SchemaQuery.Builder().type(SchemaType.PLAIN).build()).size());
+                list(SchemaType.PLAIN, new SchemaQuery.Builder().type(SchemaType.PLAIN).build()).size());
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java
index edd32ec..f20bb48 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PlainSchemaITCase.java
@@ -158,7 +158,8 @@ public class PlainSchemaITCase extends AbstractITCase {
 
     @Test
     public void list() {
-        List<PlainSchemaTO> schemas = schemaService.list(new SchemaQuery.Builder().type(SchemaType.PLAIN).build());
+        List<PlainSchemaTO> schemas = schemaService.list(
+                SchemaType.PLAIN, new SchemaQuery.Builder().type(SchemaType.PLAIN).build());
         assertFalse(schemas.isEmpty());
         for (PlainSchemaTO schemaTO : schemas) {
             assertNotNull(schemaTO);
@@ -170,7 +171,7 @@ public class PlainSchemaITCase extends AbstractITCase {
         final String clazz = anyTypeService.read(AnyTypeKind.USER.name()).getClasses().get(0);
 
         List<PlainSchemaTO> userSchemas = schemaService.list(
-                new SchemaQuery.Builder().type(SchemaType.PLAIN).anyTypeClass(clazz).build());
+                SchemaType.PLAIN, new SchemaQuery.Builder().type(SchemaType.PLAIN).anyTypeClass(clazz).build());
 
         assertTrue(IterableUtils.matchesAny(userSchemas, new Predicate<PlainSchemaTO>()
{
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java
index d5c77e7..0bf11d8 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java
@@ -45,7 +45,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
     @Test
     public void paginatedList() {
         PagedResult<PropagationTaskTO> tasks = taskService.list(
-                new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(2).build());
+                TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(2).build());
         assertNotNull(tasks);
         assertEquals(2, tasks.getResult().size());
 
@@ -54,7 +54,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
         }
 
         tasks = taskService.list(
-                new TaskQuery.Builder().type(TaskType.PROPAGATION).page(2).size(2).build());
+                TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).page(2).size(2).build());
         assertNotNull(tasks);
         assertEquals(2, tasks.getPage());
         assertEquals(2, tasks.getResult().size());
@@ -64,7 +64,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
         }
 
         tasks = taskService.list(
-                new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1000).size(2).build());
+                TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1000).size(2).build());
         assertNotNull(tasks);
         assertTrue(tasks.getResult().isEmpty());
     }
@@ -80,7 +80,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
     @Test
     public void bulkAction() {
         PagedResult<PropagationTaskTO> before = taskService.list(
-                new TaskQuery.Builder().type(TaskType.PROPAGATION).build());
+                TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).build());
 
         // create user with testdb resource
         UserTO userTO = UserITCase.getUniqueSampleTO("taskBulk@apache.org");
@@ -88,7 +88,8 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
         createUser(userTO);
 
         List<PropagationTaskTO> after = new ArrayList<>(
-                taskService.<PropagationTaskTO>list(new TaskQuery.Builder().type(TaskType.PROPAGATION).build()).
+                taskService.<PropagationTaskTO>list(
+                        TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).build()).
                 getResult());
         after.removeAll(before.getResult());
         assertFalse(after.isEmpty());
@@ -102,7 +103,8 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
 
         taskService.bulk(bulkAction);
 
-        assertFalse(taskService.list(new TaskQuery.Builder().type(TaskType.PROPAGATION).build()).getResult().
+        assertFalse(taskService.list(
+                TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).build()).getResult().
                 containsAll(after));
     }
 
@@ -120,12 +122,14 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
 
         // check list
         PagedResult<AbstractTaskTO> tasks = taskService.list(
+                TaskType.PROPAGATION,
                 new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(2).details(false).build());
         for (AbstractTaskTO item : tasks.getResult()) {
             assertTrue(item.getExecutions().isEmpty());
         }
 
         tasks = taskService.list(
+                TaskType.PROPAGATION,
                 new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(2).details(true).build());
         for (AbstractTaskTO item : tasks.getResult()) {
             assertFalse(item.getExecutions().isEmpty());

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java
index 93f0139..14cd318 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java
@@ -80,7 +80,8 @@ public class PushTaskITCase extends AbstractTaskITCase {
 
     @Test
     public void list() {
-        PagedResult<PushTaskTO> tasks = taskService.list(new TaskQuery.Builder().type(TaskType.PUSH).build());
+        PagedResult<PushTaskTO> tasks = taskService.list(
+                TaskType.PUSH, new TaskQuery.Builder().type(TaskType.PUSH).build());
         assertFalse(tasks.getResult().isEmpty());
         for (AbstractTaskTO task : tasks.getResult()) {
             if (!(task instanceof PushTaskTO)) {

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SchedTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SchedTaskITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SchedTaskITCase.java
index 327abe8..09d1e5c 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SchedTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SchedTaskITCase.java
@@ -60,7 +60,7 @@ public class SchedTaskITCase extends AbstractTaskITCase {
     @Test
     public void list() {
         PagedResult<SchedTaskTO> tasks =
-                taskService.list(new TaskQuery.Builder().type(TaskType.SCHEDULED).build());
+                taskService.list(TaskType.SCHEDULED, new TaskQuery.Builder().type(TaskType.SCHEDULED).build());
         assertFalse(tasks.getResult().isEmpty());
         for (AbstractTaskTO task : tasks.getResult()) {
             if (!(task instanceof SchedTaskTO) || task instanceof SyncTaskTO || task instanceof
PushTaskTO) {

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java
index 2385ebe..2070589 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java
@@ -98,7 +98,7 @@ public class SyncTaskITCase extends AbstractTaskITCase {
     @Test
     public void list() {
         PagedResult<SyncTaskTO> tasks = taskService.list(
-                new TaskQuery.Builder().type(TaskType.SYNCHRONIZATION).build());
+                TaskType.SYNCHRONIZATION, new TaskQuery.Builder().type(TaskType.SYNCHRONIZATION).build());
         assertFalse(tasks.getResult().isEmpty());
         for (AbstractTaskTO task : tasks.getResult()) {
             if (!(task instanceof SyncTaskTO)) {

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java
index 199fe0b..eb394f4 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java
@@ -144,7 +144,7 @@ public class UserITCase extends AbstractITCase {
     public void createUserWithNoPropagation() {
         // get task list
         PagedResult<PropagationTaskTO> tasks = taskService.list(
-                new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
+                TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
         assertNotNull(tasks);
         assertFalse(tasks.getResult().isEmpty());
 
@@ -159,7 +159,7 @@ public class UserITCase extends AbstractITCase {
 
         // get the new task list
         tasks = taskService.list(
-                new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
+                TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
         assertNotNull(tasks);
         assertFalse(tasks.getResult().isEmpty());
 
@@ -348,7 +348,7 @@ public class UserITCase extends AbstractITCase {
     public void create() {
         // get task list
         PagedResult<PropagationTaskTO> tasks = taskService.list(
-                new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
+                TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
         assertNotNull(tasks);
         assertFalse(tasks.getResult().isEmpty());
 
@@ -388,7 +388,9 @@ public class UserITCase extends AbstractITCase {
         assertNotNull(newUserTO.getCreationDate());
 
         // get the new task list
-        tasks = taskService.list(new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
+        tasks = taskService.list(
+                TaskType.PROPAGATION,
+                new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
         assertNotNull(tasks);
         assertFalse(tasks.getResult().isEmpty());
 
@@ -683,6 +685,7 @@ public class UserITCase extends AbstractITCase {
     @Test
     public void updatePasswordOnly() {
         int beforeTasks = taskService.list(
+                TaskType.PROPAGATION,
                 new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build()).getTotalCount();
         assertFalse(beforeTasks <= 0);
 
@@ -701,6 +704,7 @@ public class UserITCase extends AbstractITCase {
         assertNotNull(userTO.getChangePwdDate());
 
         int afterTasks = taskService.list(
+                TaskType.PROPAGATION,
                 new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build()).getTotalCount();
         assertFalse(beforeTasks <= 0);
 
@@ -712,6 +716,7 @@ public class UserITCase extends AbstractITCase {
     public void verifyTaskRegistration() {
         // get task list
         PagedResult<PropagationTaskTO> tasks = taskService.list(
+                TaskType.PROPAGATION,
                 new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
         assertNotNull(tasks);
         assertFalse(tasks.getResult().isEmpty());
@@ -731,7 +736,9 @@ public class UserITCase extends AbstractITCase {
         assertNotNull(userTO);
 
         // get the new task list
-        tasks = taskService.list(new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
+        tasks = taskService.list(
+                TaskType.PROPAGATION,
+                new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
         assertNotNull(tasks);
         assertFalse(tasks.getResult().isEmpty());
 
@@ -755,7 +762,9 @@ public class UserITCase extends AbstractITCase {
         assertNotNull(userTO);
 
         // get the new task list
-        tasks = taskService.list(new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
+        tasks = taskService.list(
+                TaskType.PROPAGATION,
+                new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
 
         maxKey = newMaxKey;
         newMaxKey = tasks.getResult().iterator().next().getKey();
@@ -775,7 +784,9 @@ public class UserITCase extends AbstractITCase {
         userService.delete(userTO.getKey());
 
         // get the new task list
-        tasks = taskService.list(new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
+        tasks = taskService.list(
+                TaskType.PROPAGATION,
+                new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
 
         maxKey = newMaxKey;
         newMaxKey = tasks.getResult().iterator().next().getKey();

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java
index 56d8186..6cc5060 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirSchemaITCase.java
@@ -44,7 +44,8 @@ public class VirSchemaITCase extends AbstractITCase {
 
     @Test
     public void list() {
-        List<VirSchemaTO> vSchemas = schemaService.list(new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build());
+        List<VirSchemaTO> vSchemas = schemaService.list(
+                SchemaType.VIRTUAL, new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build());
         assertFalse(vSchemas.isEmpty());
         for (VirSchemaTO vSchemaTO : vSchemas) {
             assertNotNull(vSchemaTO);
@@ -94,14 +95,15 @@ public class VirSchemaITCase extends AbstractITCase {
     public void anonymous() {
         SchemaService unauthenticated = clientFactory.create().getService(SchemaService.class);
         try {
-            unauthenticated.list(new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build());
+            unauthenticated.list(SchemaType.VIRTUAL, new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build());
             fail();
         } catch (AccessControlException e) {
             assertNotNull(e);
         }
 
         SchemaService anonymous = clientFactory.create(ANONYMOUS_UNAME, ANONYMOUS_KEY).getService(SchemaService.class);
-        assertFalse(anonymous.list(new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build()).isEmpty());
+        assertFalse(anonymous.list(
+                SchemaType.VIRTUAL, new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build()).isEmpty());
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/syncope/blob/72e3836c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6c83f61..bc9df36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -326,7 +326,7 @@ under the License.
     <connid.ldap.version>1.5.0</connid.ldap.version>
     <connid.ad.version>1.3.0</connid.ad.version>
 
-    <cxf.version>3.1.5-SNAPSHOT</cxf.version>
+    <cxf.version>3.1.4</cxf.version>
 
     <camel.version>2.16.1</camel.version>	
 


Mime
View raw message