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 2016/01/18 16:32:39 UTC
syncope git commit: [SYNCOPE-156] Clean up clean up
Repository: syncope
Updated Branches:
refs/heads/master a1c3ed3ac -> 6649c5941
[SYNCOPE-156] Clean up clean up
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6649c594
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6649c594
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6649c594
Branch: refs/heads/master
Commit: 6649c5941aa33641c60abd3d56aff7ee1f0a7f20
Parents: a1c3ed3
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jan 15 17:05:47 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jan 15 17:05:47 2016 +0100
----------------------------------------------------------------------
.../syncope/client/console/panels/Realm.java | 11 ++--
.../console/rest/AnyObjectRestClient.java | 18 ++++---
.../console/rest/AnyTypeClassRestClient.java | 54 +++++++++++++++++++
.../client/console/rest/AnyTypeRestClient.java | 57 ++------------------
.../console/rest/ConfigurationRestClient.java | 2 -
.../console/rest/ConnectorRestClient.java | 2 -
.../client/console/rest/GroupRestClient.java | 2 -
.../client/console/rest/LoggerRestClient.java | 2 -
.../console/rest/NotificationRestClient.java | 2 -
.../client/console/rest/PolicyRestClient.java | 2 -
.../client/console/rest/RealmRestClient.java | 2 -
.../client/console/rest/ReportRestClient.java | 2 -
.../client/console/rest/ResourceRestClient.java | 2 -
.../client/console/rest/RoleRestClient.java | 2 -
.../client/console/rest/SchemaRestClient.java | 2 -
.../rest/SecurityQuestionRestClient.java | 2 -
.../client/console/rest/TaskRestClient.java | 2 -
.../client/console/rest/UserRestClient.java | 2 -
.../client/console/rest/UserSelfRestClient.java | 2 -
.../console/rest/UserWorkflowRestClient.java | 2 -
.../client/console/rest/WorkflowRestClient.java | 2 -
.../console/wizards/any/AbstractAttrs.java | 4 +-
.../wizards/any/AnyObjectWizardBuilder.java | 4 +-
.../console/wizards/any/AnyWizardBuilder.java | 7 +--
.../client/console/wizards/any/AuxClasses.java | 12 ++---
.../client/console/wizards/any/DerAttrs.java | 14 ++---
.../console/wizards/any/DynamicMemberships.java | 2 +-
.../client/console/wizards/any/Ownership.java | 9 ++--
.../client/console/wizards/any/PlainAttrs.java | 6 +--
.../console/wizards/any/Relationships.java | 13 ++---
.../client/console/wizards/any/VirAttrs.java | 10 ++--
.../provision/ProvisionWizardBuilder.java | 2 +-
32 files changed, 118 insertions(+), 139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
index c07789c..9534d6b 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.rest.AnyObjectRestClient;
+import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
import org.apache.syncope.client.console.rest.AnyTypeRestClient;
import org.apache.syncope.client.console.rest.GroupRestClient;
import org.apache.syncope.client.console.rest.UserRestClient;
@@ -63,6 +64,8 @@ public abstract class Realm extends Panel {
private final AnyTypeRestClient anyTypeRestClient = new AnyTypeRestClient();
+ private final AnyTypeClassRestClient anyTypeClassRestClient = new AnyTypeClassRestClient();
+
private final UserRestClient userRestClient = new UserRestClient();
private final GroupRestClient groupRestClient = new GroupRestClient();
@@ -75,7 +78,7 @@ public abstract class Realm extends Panel {
public Realm(final String id, final RealmTO realmTO, final PageReference pageRef) {
super(id);
this.realmTO = realmTO;
- this.anyTypeTOs = anyTypeRestClient.getAll();
+ this.anyTypeTOs = anyTypeRestClient.list();
this.pageRef = pageRef;
add(new AjaxBootstrapTabbedPanel<>("tabbedPanel", buildTabList(pageRef)));
@@ -155,7 +158,7 @@ public abstract class Realm extends Panel {
final UserTO userTO = new UserTO();
userTO.setRealm(realmTO.getFullPath());
panel = new UserSearchResultPanel.Builder(
- anyTypeRestClient.getAnyTypeClass(anyTypeTO.getClasses().toArray(new String[] {})),
+ anyTypeClassRestClient.list(anyTypeTO.getClasses()),
userRestClient,
anyTypeTO.getKey(),
pageReference).setRealm(realmTO.getFullPath()).
@@ -169,7 +172,7 @@ public abstract class Realm extends Panel {
final GroupTO groupTO = new GroupTO();
groupTO.setRealm(realmTO.getFullPath());
panel = new GroupSearchResultPanel.Builder(
- anyTypeRestClient.getAnyTypeClass(anyTypeTO.getClasses().toArray(new String[] {})),
+ anyTypeClassRestClient.list(anyTypeTO.getClasses()),
groupRestClient,
anyTypeTO.getKey(),
pageReference).setRealm(realmTO.getFullPath()).
@@ -184,7 +187,7 @@ public abstract class Realm extends Panel {
anyObjectTO.setRealm(realmTO.getFullPath());
anyObjectTO.setType(anyTypeTO.getKey());
panel = new AnyObjectSearchResultPanel.Builder(
- anyTypeRestClient.getAnyTypeClass(anyTypeTO.getClasses().toArray(new String[] {})),
+ anyTypeClassRestClient.list(anyTypeTO.getClasses()),
anyObjectRestClient,
anyTypeTO.getKey(),
pageReference).setRealm(realmTO.getFullPath()).
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
index b23d9fe..53201ba 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
@@ -19,8 +19,10 @@
package org.apache.syncope.client.console.rest;
import java.util.List;
+import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
import org.apache.syncope.common.lib.SyncopeClientException;
+import org.apache.syncope.common.lib.patch.AnyObjectPatch;
import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.common.lib.to.BulkAction;
@@ -33,12 +35,10 @@ import org.apache.syncope.common.rest.api.beans.AnySearchQuery;
import org.apache.syncope.common.rest.api.service.AnyObjectService;
import org.apache.syncope.common.rest.api.service.AnyService;
import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
-import org.springframework.stereotype.Component;
/**
* Console client for invoking Rest any type class services.
*/
-@Component
public class AnyObjectRestClient extends AbstractAnyRestClient<AnyObjectTO> {
private static final long serialVersionUID = -8874495991295283249L;
@@ -99,16 +99,18 @@ public class AnyObjectRestClient extends AbstractAnyRestClient<AnyObjectTO> {
return anyObjectTO;
}
- public AnyObjectTO create(final AnyObjectTO anyObjectTO) {
- final Response response = getService(AnyObjectService.class).create(anyObjectTO);
- return response.readEntity(AnyObjectTO.class);
+ public ProvisioningResult<AnyObjectTO> create(final AnyObjectTO anyObjectTO) {
+ Response response = getService(AnyObjectService.class).create(anyObjectTO);
+ return response.readEntity(new GenericType<ProvisioningResult<AnyObjectTO>>() {
+ });
}
- public AnyObjectTO update(final String etag, final AnyObjectTO anyObjectTO) {
- AnyObjectTO result;
+ public ProvisioningResult<AnyObjectTO> update(final String etag, final AnyObjectPatch anyObjectPatch) {
+ ProvisioningResult<AnyObjectTO> result;
synchronized (this) {
AnyObjectService service = getService(etag, AnyObjectService.class);
- result = service.update(anyObjectTO).readEntity(AnyObjectTO.class);
+ result = service.update(anyObjectPatch).readEntity(new GenericType<ProvisioningResult<AnyObjectTO>>() {
+ });
resetClient(AnyObjectService.class);
}
return result;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyTypeClassRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyTypeClassRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyTypeClassRestClient.java
new file mode 100644
index 0000000..10375ca
--- /dev/null
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyTypeClassRestClient.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.rest;
+
+import static org.apache.syncope.client.console.rest.BaseRestClient.getService;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.apache.syncope.common.lib.SyncopeClientException;
+import org.apache.syncope.common.lib.to.AnyTypeClassTO;
+import org.apache.syncope.common.rest.api.service.AnyTypeClassService;
+
+public class AnyTypeClassRestClient extends BaseRestClient {
+
+ private static final long serialVersionUID = -2211371717449597247L;
+
+ public List<AnyTypeClassTO> list() {
+ List<AnyTypeClassTO> types = Collections.emptyList();
+
+ try {
+ types = getService(AnyTypeClassService.class).list();
+ } catch (SyncopeClientException e) {
+ LOG.error("While reading all any type classes", e);
+ }
+
+ return types;
+ }
+
+ public List<AnyTypeClassTO> list(final Collection<String> anyTypeClassNames) {
+ List<AnyTypeClassTO> anyTypeClassTOs = new ArrayList<>();
+ for (String anyTypeClass : anyTypeClassNames) {
+ anyTypeClassTOs.add(getService(AnyTypeClassService.class).read(anyTypeClass));
+ }
+ return anyTypeClassTOs;
+ }
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyTypeRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyTypeRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyTypeRestClient.java
index bf5ebfa..33b9552 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyTypeRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyTypeRestClient.java
@@ -18,28 +18,15 @@
*/
package org.apache.syncope.client.console.rest;
-import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.patch.AnyObjectPatch;
-import org.apache.syncope.common.lib.to.AnyObjectTO;
-import org.apache.syncope.common.lib.to.AnyTypeClassTO;
import org.apache.syncope.common.lib.to.AnyTypeTO;
-import org.apache.syncope.common.lib.to.ProvisioningResult;
-import org.apache.syncope.common.rest.api.service.AnyObjectService;
-import org.apache.syncope.common.rest.api.service.AnyTypeClassService;
import org.apache.syncope.common.rest.api.service.AnyTypeService;
-import org.springframework.stereotype.Component;
-/**
- * Console client for invoking Rest AnyType services.
- */
-@Component
public class AnyTypeRestClient extends BaseRestClient {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -2211371717449597247L;
public AnyTypeTO get(final String kind) {
AnyTypeTO type = null;
@@ -53,8 +40,8 @@ public class AnyTypeRestClient extends BaseRestClient {
return type;
}
- public List<AnyTypeTO> getAll() {
- List<AnyTypeTO> types = null;
+ public List<AnyTypeTO> list() {
+ List<AnyTypeTO> types = Collections.emptyList();
try {
types = getService(AnyTypeService.class).list();
@@ -65,40 +52,4 @@ public class AnyTypeRestClient extends BaseRestClient {
return types;
}
- public List<AnyTypeClassTO> getAllAnyTypeClass() {
- List<AnyTypeClassTO> types = null;
-
- try {
- types = getService(AnyTypeClassService.class).list();
- } catch (SyncopeClientException e) {
- LOG.error("While reading all any types", e);
- }
-
- return types;
- }
-
- public List<AnyTypeClassTO> getAnyTypeClass(final String... anyTypeClassNames) {
- List<AnyTypeClassTO> anyTypeClassTOs = new ArrayList<>();
- for (String anyTypeClass : anyTypeClassNames) {
- anyTypeClassTOs.add(getService(AnyTypeClassService.class).read(anyTypeClass));
- }
- return anyTypeClassTOs;
- }
-
- public ProvisioningResult<AnyObjectTO> create(final AnyObjectTO anyObjectTO) {
- Response response = getService(AnyObjectService.class).create(anyObjectTO);
- return response.readEntity(new GenericType<ProvisioningResult<AnyObjectTO>>() {
- });
- }
-
- public ProvisioningResult<AnyObjectTO> update(final String etag, final AnyObjectPatch anyObjectPatch) {
- ProvisioningResult<AnyObjectTO> result;
- synchronized (this) {
- AnyObjectService service = getService(etag, AnyObjectService.class);
- result = service.update(anyObjectPatch).readEntity(new GenericType<ProvisioningResult<AnyObjectTO>>() {
- });
- resetClient(AnyObjectService.class);
- }
- return result;
- }
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/ConfigurationRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/ConfigurationRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/ConfigurationRestClient.java
index 622a4ca..e28a914 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/ConfigurationRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/ConfigurationRestClient.java
@@ -26,9 +26,7 @@ import org.apache.syncope.client.console.commons.AttrLayoutType;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.rest.api.service.ConfigurationService;
-import org.springframework.stereotype.Component;
-@Component
public class ConfigurationRestClient extends BaseRestClient {
private static final long serialVersionUID = 7692363064029538722L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java
index 208afa4..8dbc8f6 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java
@@ -36,12 +36,10 @@ import org.apache.syncope.common.lib.types.ConnConfProperty;
import org.apache.syncope.common.rest.api.service.ConnectorService;
import org.apache.syncope.common.rest.api.service.ResourceService;
import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Component;
/**
* Console client for invoking Rest Connectors services.
*/
-@Component
public class ConnectorRestClient extends BaseRestClient {
private static final long serialVersionUID = -6870366819966266617L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
index 72f80f5..63f8b93 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
@@ -35,12 +35,10 @@ import org.apache.syncope.common.rest.api.service.AnyService;
import org.apache.syncope.common.rest.api.service.ResourceService;
import org.apache.syncope.common.rest.api.service.GroupService;
import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
-import org.springframework.stereotype.Component;
/**
* Console client for invoking Rest Group's services.
*/
-@Component
public class GroupRestClient extends AbstractAnyRestClient<GroupTO> {
private static final long serialVersionUID = -8549081557283519638L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/LoggerRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/LoggerRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/LoggerRestClient.java
index 56283ab..985d54c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/LoggerRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/LoggerRestClient.java
@@ -31,9 +31,7 @@ import org.apache.syncope.common.lib.types.LoggerLevel;
import org.apache.syncope.common.lib.types.LoggerType;
import org.apache.syncope.common.rest.api.LoggerWrapper;
import org.apache.syncope.common.rest.api.service.LoggerService;
-import org.springframework.stereotype.Component;
-@Component
public class LoggerRestClient extends BaseRestClient {
private static final long serialVersionUID = 4579786978763032240L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java
index ac2eb03..053768a 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java
@@ -21,9 +21,7 @@ package org.apache.syncope.client.console.rest;
import java.util.List;
import org.apache.syncope.common.lib.to.NotificationTO;
import org.apache.syncope.common.rest.api.service.NotificationService;
-import org.springframework.stereotype.Component;
-@Component
public class NotificationRestClient extends BaseRestClient {
private static final long serialVersionUID = 6328933265096511690L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java
index a3f44a1..6abe254 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java
@@ -25,12 +25,10 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.common.lib.policy.AbstractPolicyTO;
import org.apache.syncope.common.lib.types.PolicyType;
import org.apache.syncope.common.rest.api.service.PolicyService;
-import org.springframework.stereotype.Component;
/**
* Console client for invoking Rest Policy services.
*/
-@Component
public class PolicyRestClient extends BaseRestClient {
private static final long serialVersionUID = -1392090291817187902L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/RealmRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/RealmRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/RealmRestClient.java
index 2d99ee7..cd22cfc 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/RealmRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/RealmRestClient.java
@@ -21,12 +21,10 @@ package org.apache.syncope.client.console.rest;
import java.util.List;
import org.apache.syncope.common.lib.to.RealmTO;
import org.apache.syncope.common.rest.api.service.RealmService;
-import org.springframework.stereotype.Component;
/**
* Console client for invoking REST Realm's services.
*/
-@Component
public class RealmRestClient extends BaseRestClient {
private static final long serialVersionUID = -8549081557283519638L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/ReportRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/ReportRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/ReportRestClient.java
index f10e5b8..73e5303 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/ReportRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/ReportRestClient.java
@@ -25,9 +25,7 @@ import org.apache.syncope.common.lib.to.ReportTO;
import org.apache.syncope.common.lib.types.ReportExecExportFormat;
import org.apache.syncope.common.rest.api.beans.ExecuteQuery;
import org.apache.syncope.common.rest.api.service.ReportService;
-import org.springframework.stereotype.Component;
-@Component
public class ReportRestClient extends BaseRestClient implements ExecutionRestClient {
private static final long serialVersionUID = 1644689667998953604L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
index e3bc2be..9809562 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java
@@ -29,12 +29,10 @@ import org.apache.syncope.common.lib.to.BulkActionResult;
import org.apache.syncope.common.lib.to.ResourceTO;
import org.apache.syncope.common.lib.types.ResourceDeassociationAction;
import org.apache.syncope.common.rest.api.service.ResourceService;
-import org.springframework.stereotype.Component;
/**
* Console client for invoking Rest Resources services.
*/
-@Component
public class ResourceRestClient extends BaseRestClient {
private static final long serialVersionUID = -6898907679835668987L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java
index 1da57a7..2441892 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java
@@ -22,12 +22,10 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.common.lib.to.RoleTO;
import org.apache.syncope.common.rest.api.service.RoleService;
-import org.springframework.stereotype.Component;
/**
* Console client for invoking Rest Group's services.
*/
-@Component
public class RoleRestClient extends BaseRestClient {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/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..f9765c2 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
@@ -33,12 +33,10 @@ import org.apache.syncope.common.lib.to.VirSchemaTO;
import org.apache.syncope.common.lib.types.SchemaType;
import org.apache.syncope.common.rest.api.beans.SchemaQuery;
import org.apache.syncope.common.rest.api.service.SchemaService;
-import org.springframework.stereotype.Component;
/**
* Console client for invoking rest schema services.
*/
-@Component
public class SchemaRestClient extends BaseRestClient {
private static final long serialVersionUID = -2479730152700312373L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/SecurityQuestionRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/SecurityQuestionRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/SecurityQuestionRestClient.java
index 2fd07e0..2ed516c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/SecurityQuestionRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/SecurityQuestionRestClient.java
@@ -21,9 +21,7 @@ package org.apache.syncope.client.console.rest;
import java.util.List;
import org.apache.syncope.common.lib.to.SecurityQuestionTO;
import org.apache.syncope.common.rest.api.service.SecurityQuestionService;
-import org.springframework.stereotype.Component;
-@Component
public class SecurityQuestionRestClient extends BaseRestClient {
private static final long serialVersionUID = -3167730221361895176L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/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..a97c066 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
@@ -35,12 +35,10 @@ import org.apache.syncope.common.rest.api.beans.ExecuteQuery;
import org.apache.syncope.common.rest.api.beans.TaskQuery;
import org.apache.syncope.common.rest.api.service.TaskService;
import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
-import org.springframework.stereotype.Component;
/**
* Console client for invoking Rest Tasks services.
*/
-@Component
public class TaskRestClient extends BaseRestClient implements ExecutionRestClient {
private static final long serialVersionUID = 6284485820911028843L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
index 9b8f697..b4b879b 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
@@ -39,12 +39,10 @@ import org.apache.syncope.common.rest.api.service.AnyService;
import org.apache.syncope.common.rest.api.service.ResourceService;
import org.apache.syncope.common.rest.api.service.UserService;
import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
-import org.springframework.stereotype.Component;
/**
* Console client for invoking rest users services.
*/
-@Component
public class UserRestClient extends AbstractAnyRestClient<UserTO> {
private static final long serialVersionUID = -1575748964398293968L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/UserSelfRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/UserSelfRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/UserSelfRestClient.java
index 6a09b7c..d4bc603 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/UserSelfRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/UserSelfRestClient.java
@@ -23,9 +23,7 @@ import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.patch.UserPatch;
import org.apache.syncope.common.lib.to.UserTO;
import org.apache.syncope.common.rest.api.service.UserSelfService;
-import org.springframework.stereotype.Component;
-@Component
public class UserSelfRestClient extends BaseRestClient {
private static final long serialVersionUID = 2994691796924731295L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/UserWorkflowRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/UserWorkflowRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/UserWorkflowRestClient.java
index bb99755..c9d6436 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/UserWorkflowRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/UserWorkflowRestClient.java
@@ -21,9 +21,7 @@ package org.apache.syncope.client.console.rest;
import java.util.List;
import org.apache.syncope.common.lib.to.WorkflowFormTO;
import org.apache.syncope.common.rest.api.service.UserWorkflowService;
-import org.springframework.stereotype.Component;
-@Component
public class UserWorkflowRestClient extends BaseRestClient {
private static final long serialVersionUID = -4785231164900813921L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/rest/WorkflowRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/WorkflowRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/WorkflowRestClient.java
index 2a078a0..b21ba41 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/WorkflowRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/WorkflowRestClient.java
@@ -27,9 +27,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.rest.api.RESTHeaders;
import org.apache.syncope.common.rest.api.service.WorkflowService;
-import org.springframework.stereotype.Component;
-@Component
public class WorkflowRestClient extends BaseRestClient {
private static final long serialVersionUID = 5049285686167071017L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
index 401f5a2..14fc6c7 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Set;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.Transformer;
-import org.apache.syncope.client.console.rest.AnyTypeRestClient;
+import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
import org.apache.syncope.client.console.rest.GroupRestClient;
import org.apache.syncope.client.console.rest.SchemaRestClient;
import org.apache.syncope.common.lib.to.AnyObjectTO;
@@ -41,7 +41,7 @@ public abstract class AbstractAttrs extends WizardStep {
protected final SchemaRestClient schemaRestClient = new SchemaRestClient();
- protected final AnyTypeRestClient anyTypeRestClient = new AnyTypeRestClient();
+ protected final AnyTypeClassRestClient anyTypeClassRestClient = new AnyTypeClassRestClient();
private final GroupRestClient groupRestClient = new GroupRestClient();
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectWizardBuilder.java
index c017399..9ccbd2e 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectWizardBuilder.java
@@ -52,13 +52,13 @@ public class AnyObjectWizardBuilder extends AnyWizardBuilder<AnyObjectTO> implem
final ProvisioningResult<AnyObjectTO> actual;
if (inner.getKey() == 0) {
- actual = anyTypeRestClient.create(AnyObjectTO.class.cast(inner));
+ actual = anyObjectRestClient.create(AnyObjectTO.class.cast(inner));
} else {
final AnyObjectPatch patch = AnyOperations.diff(inner, getOriginalItem().getInnerObject(), false);
// update user just if it is changed
if (!patch.isEmpty()) {
- actual = anyTypeRestClient.update(getOriginalItem().getInnerObject().getETagValue(), patch);
+ actual = anyObjectRestClient.update(getOriginalItem().getInnerObject().getETagValue(), patch);
} else {
actual = new ProvisioningResult<>();
actual.setAny(inner);
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
index 676c6b9..92f4116 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.syncope.client.console.commons.Mode;
import org.apache.syncope.client.console.commons.status.StatusBean;
-import org.apache.syncope.client.console.rest.AnyTypeRestClient;
+import org.apache.syncope.client.console.rest.AnyObjectRestClient;
import org.apache.syncope.client.console.wizards.AjaxWizardBuilder;
import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.common.lib.to.GroupTO;
@@ -36,7 +36,7 @@ public abstract class AnyWizardBuilder<T extends AnyTO> extends AjaxWizardBuilde
private static final long serialVersionUID = -2480279868319546243L;
- protected final AnyTypeRestClient anyTypeRestClient = new AnyTypeRestClient();
+ protected final AnyObjectRestClient anyObjectRestClient = new AnyObjectRestClient();
protected final List<String> anyTypeClasses;
@@ -50,7 +50,8 @@ public abstract class AnyWizardBuilder<T extends AnyTO> extends AjaxWizardBuilde
*/
public AnyWizardBuilder(
final String id, final T anyTO, final List<String> anyTypeClasses, final PageReference pageRef) {
- super(id, new AnyHandler<T>(anyTO), pageRef);
+
+ super(id, new AnyHandler<>(anyTO), pageRef);
this.anyTypeClasses = anyTypeClasses;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AuxClasses.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AuxClasses.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AuxClasses.java
index 1cfbc36..3b8b1f6 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AuxClasses.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AuxClasses.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.Transformer;
-import org.apache.syncope.client.console.rest.AnyTypeRestClient;
+import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
import org.apache.syncope.client.console.rest.GroupRestClient;
import org.apache.syncope.client.console.wicket.markup.html.form.AjaxPalettePanel;
import org.apache.syncope.client.lib.SyncopeClient;
@@ -71,8 +71,8 @@ public class AuxClasses extends WizardStep {
dyngroups = Collections.<Long>emptyList();
}
- final AjaxPalettePanel.Builder<MembershipTO> builder
- = new AjaxPalettePanel.Builder<MembershipTO>().setRenderer(new IChoiceRenderer<MembershipTO>() {
+ final AjaxPalettePanel.Builder<MembershipTO> builder =
+ new AjaxPalettePanel.Builder<MembershipTO>().setRenderer(new IChoiceRenderer<MembershipTO>() {
private static final long serialVersionUID = 1L;
@@ -99,7 +99,7 @@ public class AuxClasses extends WizardStep {
});
fragment.add(builder.setAllowOrder(true).withFilter().build(
- "groups", new ListModel<MembershipTO>(memberships),
+ "groups", new ListModel<>(memberships),
new AjaxPalettePanel.Builder.Query<MembershipTO>() {
private static final long serialVersionUID = 1L;
@@ -142,7 +142,7 @@ public class AuxClasses extends WizardStep {
fragment.add(new AjaxPalettePanel.Builder<String>().setAllowOrder(true).build(
"dyngroups",
- new ListModel<String>(dynamics),
+ new ListModel<>(dynamics),
new ListModel<>(dynamics)).setEnabled(false).setOutputMarkupId(true));
}
add(fragment);
@@ -150,7 +150,7 @@ public class AuxClasses extends WizardStep {
final List<String> current = Arrays.asList(anyTypeClass);
final List<String> choices = new ArrayList<>();
- for (AnyTypeClassTO aux : new AnyTypeRestClient().getAllAnyTypeClass()) {
+ for (AnyTypeClassTO aux : new AnyTypeClassRestClient().list()) {
if (!current.contains(aux.getKey())) {
choices.add(aux.getKey());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DerAttrs.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DerAttrs.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DerAttrs.java
index 6629082..3ad0232 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DerAttrs.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DerAttrs.java
@@ -53,29 +53,29 @@ public class DerAttrs extends AbstractAttrs {
final LoadableDetachableModel<List<AttrTO>> derAttrTOs = new LoadableDetachableModel<List<AttrTO>>() {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 5275935387613157437L;
@Override
protected List<AttrTO> load() {
final List<String> classes = CollectionUtils.collect(
- anyTypeRestClient.getAnyTypeClass(getAllAuxClasses().toArray(new String[] {})),
+ anyTypeClassRestClient.list(getAllAuxClasses()),
new Transformer<AnyTypeClassTO, String>() {
@Override
public String transform(final AnyTypeClassTO input) {
return input.getKey();
}
- }, new ArrayList<String>(Arrays.asList(anyTypeClass)));
+ }, new ArrayList<>(Arrays.asList(anyTypeClass)));
- final List<DerSchemaTO> derSchemas
- = schemaRestClient.getSchemas(SchemaType.DERIVED, classes.toArray(new String[] {}));
+ final List<DerSchemaTO> derSchemas =
+ schemaRestClient.getSchemas(SchemaType.DERIVED, classes.toArray(new String[] {}));
final Map<String, AttrTO> currents = entityTO.getDerAttrMap();
entityTO.getDerAttrs().clear();
// This conversion from set to lis is required by the ListView.
- // Didn't performed by using collect parameter because entityTO change is required.
- return new ArrayList<AttrTO>(
+ // Not performed by using collect parameter because entityTO change is required.
+ return new ArrayList<>(
CollectionUtils.collect(derSchemas, new Transformer<DerSchemaTO, AttrTO>() {
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java
index 8df2cdd..7cd23ea 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java
@@ -59,7 +59,7 @@ public class DynamicMemberships extends WizardStep {
@Override
protected List<AnyTypeTO> load() {
- return CollectionUtils.select(anyTypeRestClient.getAll(), new Predicate<AnyTypeTO>() {
+ return CollectionUtils.select(anyTypeRestClient.list(), new Predicate<AnyTypeTO>() {
@Override
public boolean evaluate(final AnyTypeTO t) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Ownership.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Ownership.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Ownership.java
index 8dbc85b..dc712c0 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Ownership.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Ownership.java
@@ -33,6 +33,7 @@ import org.apache.syncope.client.console.panels.search.SearchClausePanel;
import org.apache.syncope.client.console.panels.search.SearchUtils;
import org.apache.syncope.client.console.panels.search.UserSearchPanel;
import org.apache.syncope.client.console.panels.search.UserSelectionSearchResultPanel;
+import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
import org.apache.syncope.client.console.rest.AnyTypeRestClient;
import org.apache.syncope.client.console.rest.GroupRestClient;
import org.apache.syncope.client.console.rest.UserRestClient;
@@ -69,6 +70,7 @@ public class Ownership extends WizardStep {
private final WebMarkupContainer ownerContainer;
private final AnyTypeRestClient anyTypeRestClient = new AnyTypeRestClient();
+ private final AnyTypeClassRestClient anyTypeClassRestClient = new AnyTypeClassRestClient();
private final GroupSearchPanel groupSearchPanel;
@@ -159,7 +161,7 @@ public class Ownership extends WizardStep {
AnyTypeTO anyTypeTO = anyTypeRestClient.get(AnyTypeKind.GROUP.name());
groupSearchResultPanel = GroupSelectionSearchResultPanel.class.cast(new GroupSelectionSearchResultPanel.Builder(
- anyTypeRestClient.getAnyTypeClass(anyTypeTO.getClasses().toArray(new String[] {})),
+ anyTypeClassRestClient.list(anyTypeTO.getClasses()),
groupRestClient,
anyTypeTO.getKey(),
pageRef).build("searchResult"));
@@ -174,7 +176,7 @@ public class Ownership extends WizardStep {
anyTypeTO = anyTypeRestClient.get(AnyTypeKind.USER.name());
userSearchResultPanel = UserSelectionSearchResultPanel.class.cast(new UserSelectionSearchResultPanel.Builder(
- anyTypeRestClient.getAnyTypeClass(anyTypeTO.getClasses().toArray(new String[] {})),
+ anyTypeClassRestClient.list(anyTypeTO.getClasses()),
userRestClient,
anyTypeTO.getKey(),
pageRef).build("searchResult"));
@@ -236,8 +238,7 @@ public class Ownership extends WizardStep {
};
userSearchFragment.add(userOwnerReset);
- final AjaxTextFieldPanel groupOwner
- = new AjaxTextFieldPanel("groupOwner", "groupOwner",
+ final AjaxTextFieldPanel groupOwner = new AjaxTextFieldPanel("groupOwner", "groupOwner",
new PropertyModel<String>(groupHandler.getInnerObject(), "groupOwner") {
private static final long serialVersionUID = -3743432456095828573L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
index aef1962..cf16792 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
@@ -80,14 +80,14 @@ public class PlainAttrs extends AbstractAttrs {
@Override
protected List<AttrTO> load() {
setSchemas(CollectionUtils.collect(
- anyTypeRestClient.getAnyTypeClass(getAllAuxClasses().toArray(new String[] {})),
+ anyTypeClassRestClient.list(getAllAuxClasses()),
new Transformer<AnyTypeClassTO, String>() {
@Override
public String transform(final AnyTypeClassTO input) {
return input.getKey();
}
- }, new ArrayList<String>(Arrays.asList(anyTypeClass))));
+ }, new ArrayList<>(Arrays.asList(anyTypeClass))));
setAttrs();
return new ArrayList<>(entityTO.getPlainAttrs());
}
@@ -118,7 +118,7 @@ public class PlainAttrs extends AbstractAttrs {
item.add(panel);
panel.setNewModel(attributeTO.getValues());
} else {
- item.add(new MultiFieldPanel.Builder<String>(
+ item.add(new MultiFieldPanel.Builder<>(
new PropertyModel<List<String>>(attributeTO, "values")).build(
"panel",
attributeTO.getSchema(),
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Relationships.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Relationships.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Relationships.java
index f0fdc0a..2411c16 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Relationships.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Relationships.java
@@ -41,6 +41,7 @@ import org.apache.syncope.client.console.panels.search.SearchClause;
import org.apache.syncope.client.console.panels.search.SearchClausePanel;
import org.apache.syncope.client.console.panels.search.SearchUtils;
import org.apache.syncope.client.console.rest.AnyObjectRestClient;
+import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
import org.apache.syncope.client.console.rest.AnyTypeRestClient;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLinksPanel;
@@ -82,6 +83,7 @@ public class Relationships extends WizardStep {
private final PageReference pageRef;
private final AnyTypeRestClient anyTypeRestClient = new AnyTypeRestClient();
+ private final AnyTypeClassRestClient anyTypeClassRestClient = new AnyTypeClassRestClient();
private final AnyTO anyTO;
@@ -234,13 +236,13 @@ public class Relationships extends WizardStep {
}
}, new ArrayList<String>());
- final AjaxDropDownChoicePanel<String> type = new AjaxDropDownChoicePanel<String>(
+ final AjaxDropDownChoicePanel<String> type = new AjaxDropDownChoicePanel<>(
"type", "type", new PropertyModel<String>(rel, "type"));
type.setChoices(availableRels);
add(type.setRenderBodyOnly(true));
- final List<AnyTypeTO> availableTypes
- = ListUtils.select(anyTypeRestClient.getAll(), new Predicate<AnyTypeTO>() {
+ final List<AnyTypeTO> availableTypes =
+ ListUtils.select(anyTypeRestClient.list(), new Predicate<AnyTypeTO>() {
@Override
public boolean evaluate(final AnyTypeTO object) {
@@ -248,7 +250,7 @@ public class Relationships extends WizardStep {
}
});
- final AjaxDropDownChoicePanel<AnyTypeTO> rightType = new AjaxDropDownChoicePanel<AnyTypeTO>(
+ final AjaxDropDownChoicePanel<AnyTypeTO> rightType = new AjaxDropDownChoicePanel<>(
"rightType", "rightType", new PropertyModel<AnyTypeTO>(rel, "rightType") {
private static final long serialVersionUID = -5861057041758169508L;
@@ -339,7 +341,7 @@ public class Relationships extends WizardStep {
fragment.add(anyObjectSearchPanel.setRenderBodyOnly(true));
anyObjectSearchResultPanel = new AnyObjectSelectionSearchResultPanel.Builder(
- anyTypeRestClient.getAnyTypeClass(anyType.getClasses().toArray(new String[] {})),
+ anyTypeClassRestClient.list(anyType.getClasses()),
new AnyObjectRestClient(),
anyType.getKey(),
pageRef).setFiltered(true).
@@ -375,7 +377,6 @@ public class Relationships extends WizardStep {
} else {
super.onEvent(event);
}
-
}
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java
index 2f69864..e818960 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java
@@ -56,17 +56,17 @@ public class VirAttrs extends AbstractAttrs {
@Override
protected List<AttrTO> load() {
final List<String> classes = CollectionUtils.collect(
- anyTypeRestClient.getAnyTypeClass(getAllAuxClasses().toArray(new String[] {})),
+ anyTypeClassRestClient.list(getAllAuxClasses()),
new Transformer<AnyTypeClassTO, String>() {
@Override
public String transform(final AnyTypeClassTO input) {
return input.getKey();
}
- }, new ArrayList<String>(Arrays.asList(anyTypeClass)));
+ }, new ArrayList<>(Arrays.asList(anyTypeClass)));
- final List<VirSchemaTO> virSchemas
- = schemaRestClient.getSchemas(SchemaType.VIRTUAL, classes.toArray(new String[] {}));
+ final List<VirSchemaTO> virSchemas =
+ schemaRestClient.getSchemas(SchemaType.VIRTUAL, classes.toArray(new String[] {}));
final Map<String, AttrTO> currents = entityTO.getVirAttrMap();
entityTO.getVirAttrs().clear();
@@ -120,7 +120,7 @@ public class VirAttrs extends AbstractAttrs {
final AjaxTextFieldPanel panel = new AjaxTextFieldPanel(
"panel", attrTO.getSchema(), new Model<String>(), false);
- item.add(new MultiFieldPanel.Builder<String>(
+ item.add(new MultiFieldPanel.Builder<>(
new PropertyModel<List<String>>(attrTO, "values")).build(
"panel",
attrTO.getSchema(),
http://git-wip-us.apache.org/repos/asf/syncope/blob/6649c594/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java
index b74b86c..06b14cf 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java
@@ -73,7 +73,7 @@ public class ProvisionWizardBuilder extends AjaxWizardBuilder<ProvisionTO> imple
final List<String> res = new ArrayList<>();
CollectionUtils.filter(
- CollectionUtils.collect(new AnyTypeRestClient().getAll(), new Transformer<AnyTypeTO, String>() {
+ CollectionUtils.collect(new AnyTypeRestClient().list(), new Transformer<AnyTypeTO, String>() {
@Override
public String transform(final AnyTypeTO anyTypeTO) {