You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/12/24 16:33:45 UTC
syncope git commit: [SYNCOPE-742] Reversing
72e3836cf29e1edeb2c619c2d06ce64252e31f34 - back to CXF 3.1.5-SNAPSHOT
Repository: syncope
Updated Branches:
refs/heads/master 045975e08 -> f65636e05
[SYNCOPE-742] Reversing 72e3836cf29e1edeb2c619c2d06ce64252e31f34 - back to CXF 3.1.5-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f65636e0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f65636e0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f65636e0
Branch: refs/heads/master
Commit: f65636e059f509a56ff4d04d789295d35cf39478
Parents: 045975e
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Dec 24 16:33:34 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Dec 24 16:33:34 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, 50 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f65636e0/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 0201be0..92f9bf3 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,27 +34,19 @@ public class SchemaSyncopeOperations {
}
public <T extends AbstractSchemaTO> List<T> list(final String schemaTypeString) {
- return schemaService.list(
- SchemaType.valueOf(schemaTypeString),
- new SchemaQuery.Builder().type(SchemaType.valueOf(schemaTypeString)).build());
+ return schemaService.list(new SchemaQuery.Builder().type(SchemaType.valueOf(schemaTypeString)).build());
}
public <T extends AbstractSchemaTO> List<T> listPlain() {
- return schemaService.list(
- SchemaType.PLAIN,
- new SchemaQuery.Builder().type(SchemaType.PLAIN).build());
+ return schemaService.list(new SchemaQuery.Builder().type(SchemaType.PLAIN).build());
}
public <T extends AbstractSchemaTO> List<T> listDerived() {
- return schemaService.list(
- SchemaType.DERIVED,
- new SchemaQuery.Builder().type(SchemaType.DERIVED).build());
+ return schemaService.list(new SchemaQuery.Builder().type(SchemaType.DERIVED).build());
}
public <T extends AbstractSchemaTO> List<T> listVirtual() {
- return schemaService.list(
- SchemaType.VIRTUAL,
- new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build());
+ return schemaService.list(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/f65636e0/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 65761d3..61ba771 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,15 +49,11 @@ public class TaskSyncopeOperations {
}
public List<AbstractTaskTO> list(final String type) {
- return taskService.list(
- TaskType.valueOf(type),
- new TaskQuery.Builder().type(TaskType.valueOf(type)).build()).getResult();
+ return taskService.list(new TaskQuery.Builder().type(TaskType.valueOf(type)).build()).getResult();
}
public List<AbstractTaskTO> listPropagationTask() {
- return taskService.list(
- TaskType.PROPAGATION,
- new TaskQuery.Builder().type(TaskType.PROPAGATION).build()).getResult();
+ return taskService.list(new TaskQuery.Builder().type(TaskType.PROPAGATION).build()).getResult();
}
public void deleteExecution(final String executionKey) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/f65636e0/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 38b1992..10c2fa2 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(schemaType, new SchemaQuery.Builder().type(schemaType).build()));
+ <T>list(new SchemaQuery.Builder().type(schemaType).build()));
} else {
schemas.addAll(getService(SchemaService.class).
- <T>list(schemaType, new SchemaQuery.Builder().type(schemaType).anyTypeClasses(kind).build()));
+ <T>list(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/f65636e0/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 7b75073..7de2253 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,8 +65,7 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien
*/
public int count(final String kind) {
return getService(TaskService.class).
- list(TaskType.valueOf(kind),
- new TaskQuery.Builder().type(TaskType.valueOf(kind)).page(1).size(1).build()).
+ list(new TaskQuery.Builder().type(TaskType.valueOf(kind)).page(1).size(1).build()).
getTotalCount();
}
@@ -75,8 +74,7 @@ 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(getTaskType(reference),
- new TaskQuery.Builder().type(getTaskType(reference)).page(page).size(size).
+ list(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/f65636e0/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 77fce95..db6a7e4 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(
- SchemaType.PLAIN, new SchemaQuery.Builder().type(SchemaType.PLAIN).
+ new SchemaQuery.Builder().type(SchemaType.PLAIN).
anyTypeClasses(anyTypeUserTO.getClasses()).build());
final List<DerSchemaTO> derSchemas = schemaService.list(
- SchemaType.DERIVED, new SchemaQuery.Builder().type(SchemaType.DERIVED).
+ new SchemaQuery.Builder().type(SchemaType.DERIVED).
anyTypeClasses(anyTypeUserTO.getClasses()).build());
final List<VirSchemaTO> virSchemas = schemaService.list(
- SchemaType.VIRTUAL, new SchemaQuery.Builder().type(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/f65636e0/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 d0f6bd5..48f9b40 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,15 +59,12 @@ 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(
- @NotNull @PathParam("type") SchemaType type,
- @BeanParam SchemaQuery query);
+ <T extends AbstractSchemaTO> List<T> list(@BeanParam SchemaQuery query);
/**
* Creates a new schema.
http://git-wip-us.apache.org/repos/asf/syncope/blob/f65636e0/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 ebd379c..eda7c4b 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,7 +42,6 @@ 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;
@@ -72,16 +71,13 @@ 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(
- @NotNull @MatrixParam("type") TaskType type,
- @BeanParam TaskQuery query);
+ <T extends AbstractTaskTO> PagedResult<T> list(@BeanParam TaskQuery query);
/**
* Creates a new task.
http://git-wip-us.apache.org/repos/asf/syncope/blob/f65636e0/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 350bd61..fa7ce9a 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,48 +21,20 @@ 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 {
- 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;
- }
- }
-
- 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);
+ URL[] javaDocURLs = JavaDocUtils.getJavaDocURLs();
+ if (javaDocURLs != null) {
+ super.setJavaDocURLs(javaDocURLs);
}
+
+ super.initialize(server, bus);
}
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f65636e0/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 664b439..444e58e 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,16 +20,12 @@ 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
@@ -37,10 +33,8 @@ public class WadlGenerator extends org.apache.cxf.jaxrs.model.wadl.WadlGenerator
synchronized (this) {
if (!inited) {
URL[] javaDocURLs = JavaDocUtils.getJavaDocURLs();
- try {
- super.setJavaDocPath(javaDocURLs[0].toExternalForm());
- } catch (Exception e) {
- LOG.error("Could not load Javadocs from {}", javaDocURLs[0], e);
+ if (javaDocURLs != null) {
+ super.setJavaDocURLs(javaDocURLs);
}
inited = true;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f65636e0/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 0dd0482..810c520 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,8 +52,7 @@ public class SchemaServiceImpl extends AbstractServiceImpl implements SchemaServ
}
@Override
- public <T extends AbstractSchemaTO> List<T> list(final SchemaType type, final SchemaQuery query) {
- query.setType(type);
+ public <T extends AbstractSchemaTO> List<T> list(final SchemaQuery query) {
return logic.list(query.getType(), query.getAnyTypeClasses());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f65636e0/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 44e5cf7..5b33103 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,7 +32,6 @@ 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;
@@ -76,8 +75,7 @@ public class TaskServiceImpl extends AbstractServiceImpl implements TaskService
@SuppressWarnings("unchecked")
@Override
- public <T extends AbstractTaskTO> PagedResult<T> list(final TaskType type, final TaskQuery query) {
- query.setType(type);
+ public <T extends AbstractTaskTO> PagedResult<T> list(final TaskQuery query) {
return (PagedResult<T>) buildPagedResult(
logic.list(
query.getType(),
http://git-wip-us.apache.org/repos/asf/syncope/blob/f65636e0/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 2e815a5..8a20ea9 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(TaskType.NOTIFICATION, new TaskQuery.Builder().type(TaskType.NOTIFICATION).build());
+ taskService.list(new TaskQuery.Builder().type(TaskType.NOTIFICATION).build());
assertNotNull(tasks);
assertFalse(tasks.getResult().isEmpty());
http://git-wip-us.apache.org/repos/asf/syncope/blob/f65636e0/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 15f8384..6221f45 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,8 +41,7 @@ public class DerSchemaITCase extends AbstractITCase {
@Test
public void list() {
- List<DerSchemaTO> derSchemas = schemaService.list(
- SchemaType.DERIVED, new SchemaQuery.Builder().type(SchemaType.DERIVED).build());
+ List<DerSchemaTO> derSchemas = schemaService.list(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/f65636e0/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 0cbf571..8458181 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(SchemaType.PLAIN, new SchemaQuery.Builder().type(SchemaType.PLAIN).build()).size());
+ list(new SchemaQuery.Builder().type(SchemaType.PLAIN).build()).size());
}
@Test
http://git-wip-us.apache.org/repos/asf/syncope/blob/f65636e0/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 f20bb48..edd32ec 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,8 +158,7 @@ public class PlainSchemaITCase extends AbstractITCase {
@Test
public void list() {
- List<PlainSchemaTO> schemas = schemaService.list(
- SchemaType.PLAIN, new SchemaQuery.Builder().type(SchemaType.PLAIN).build());
+ List<PlainSchemaTO> schemas = schemaService.list(new SchemaQuery.Builder().type(SchemaType.PLAIN).build());
assertFalse(schemas.isEmpty());
for (PlainSchemaTO schemaTO : schemas) {
assertNotNull(schemaTO);
@@ -171,7 +170,7 @@ public class PlainSchemaITCase extends AbstractITCase {
final String clazz = anyTypeService.read(AnyTypeKind.USER.name()).getClasses().get(0);
List<PlainSchemaTO> userSchemas = schemaService.list(
- SchemaType.PLAIN, new SchemaQuery.Builder().type(SchemaType.PLAIN).anyTypeClass(clazz).build());
+ 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/f65636e0/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 0bf11d8..d5c77e7 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(
- TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(2).build());
+ 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(
- TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).page(2).size(2).build());
+ 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(
- TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1000).size(2).build());
+ 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(
- TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).build());
+ new TaskQuery.Builder().type(TaskType.PROPAGATION).build());
// create user with testdb resource
UserTO userTO = UserITCase.getUniqueSampleTO("taskBulk@apache.org");
@@ -88,8 +88,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
createUser(userTO);
List<PropagationTaskTO> after = new ArrayList<>(
- taskService.<PropagationTaskTO>list(
- TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).build()).
+ taskService.<PropagationTaskTO>list(new TaskQuery.Builder().type(TaskType.PROPAGATION).build()).
getResult());
after.removeAll(before.getResult());
assertFalse(after.isEmpty());
@@ -103,8 +102,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
taskService.bulk(bulkAction);
- assertFalse(taskService.list(
- TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).build()).getResult().
+ assertFalse(taskService.list(new TaskQuery.Builder().type(TaskType.PROPAGATION).build()).getResult().
containsAll(after));
}
@@ -122,14 +120,12 @@ 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/f65636e0/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 14cd318..93f0139 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,8 +80,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
@Test
public void list() {
- PagedResult<PushTaskTO> tasks = taskService.list(
- TaskType.PUSH, new TaskQuery.Builder().type(TaskType.PUSH).build());
+ PagedResult<PushTaskTO> tasks = taskService.list(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/f65636e0/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 09d1e5c..327abe8 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(TaskType.SCHEDULED, new TaskQuery.Builder().type(TaskType.SCHEDULED).build());
+ taskService.list(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/f65636e0/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 2070589..2385ebe 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(
- TaskType.SYNCHRONIZATION, new TaskQuery.Builder().type(TaskType.SYNCHRONIZATION).build());
+ 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/f65636e0/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 eb394f4..199fe0b 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(
- TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
+ 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(
- TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
+ 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(
- TaskType.PROPAGATION, new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
+ new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
assertNotNull(tasks);
assertFalse(tasks.getResult().isEmpty());
@@ -388,9 +388,7 @@ public class UserITCase extends AbstractITCase {
assertNotNull(newUserTO.getCreationDate());
// get the new task list
- tasks = taskService.list(
- TaskType.PROPAGATION,
- new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
+ tasks = taskService.list(new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
assertNotNull(tasks);
assertFalse(tasks.getResult().isEmpty());
@@ -685,7 +683,6 @@ 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);
@@ -704,7 +701,6 @@ 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);
@@ -716,7 +712,6 @@ 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());
@@ -736,9 +731,7 @@ public class UserITCase extends AbstractITCase {
assertNotNull(userTO);
// get the new task list
- tasks = taskService.list(
- TaskType.PROPAGATION,
- new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
+ tasks = taskService.list(new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
assertNotNull(tasks);
assertFalse(tasks.getResult().isEmpty());
@@ -762,9 +755,7 @@ public class UserITCase extends AbstractITCase {
assertNotNull(userTO);
// get the new task list
- tasks = taskService.list(
- TaskType.PROPAGATION,
- new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
+ tasks = taskService.list(new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
maxKey = newMaxKey;
newMaxKey = tasks.getResult().iterator().next().getKey();
@@ -784,9 +775,7 @@ public class UserITCase extends AbstractITCase {
userService.delete(userTO.getKey());
// get the new task list
- tasks = taskService.list(
- TaskType.PROPAGATION,
- new TaskQuery.Builder().type(TaskType.PROPAGATION).page(1).size(1).build());
+ tasks = taskService.list(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/f65636e0/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 6cc5060..56d8186 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,8 +44,7 @@ public class VirSchemaITCase extends AbstractITCase {
@Test
public void list() {
- List<VirSchemaTO> vSchemas = schemaService.list(
- SchemaType.VIRTUAL, new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build());
+ List<VirSchemaTO> vSchemas = schemaService.list(new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build());
assertFalse(vSchemas.isEmpty());
for (VirSchemaTO vSchemaTO : vSchemas) {
assertNotNull(vSchemaTO);
@@ -95,15 +94,14 @@ public class VirSchemaITCase extends AbstractITCase {
public void anonymous() {
SchemaService unauthenticated = clientFactory.create().getService(SchemaService.class);
try {
- unauthenticated.list(SchemaType.VIRTUAL, new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build());
+ unauthenticated.list(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(
- SchemaType.VIRTUAL, new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build()).isEmpty());
+ assertFalse(anonymous.list(new SchemaQuery.Builder().type(SchemaType.VIRTUAL).build()).isEmpty());
}
@Test
http://git-wip-us.apache.org/repos/asf/syncope/blob/f65636e0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8da26fb..41f2ba5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,7 +327,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.4</cxf.version>
+ <cxf.version>3.1.5-SNAPSHOT</cxf.version>
<camel.version>2.16.1</camel.version>