You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by jb...@apache.org on 2013/01/08 13:19:06 UTC
svn commit: r1430250 - in /syncope/trunk:
client/src/main/java/org/apache/syncope/services/proxy/
core/src/test/java/org/apache/syncope/core/rest/
Author: jbernhardt
Date: Tue Jan 8 12:19:05 2013
New Revision: 1430250
URL: http://svn.apache.org/viewvc?rev=1430250&view=rev
Log:
[SYNCOPE-259]
Cleanup. Some small refactorings.
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ConfigurationServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ConnectorServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/EntitlementServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/LoggerServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/NotificationServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/PolicyServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ReportServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ResourceServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/RoleServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/SchemaServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/SpringServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/TaskServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/UserServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/WorkflowServiceProxy.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ConfigurationServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ConfigurationServiceProxy.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ConfigurationServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ConfigurationServiceProxy.java Tue Jan 8 12:19:05 2013
@@ -37,32 +37,32 @@ public class ConfigurationServiceProxy e
@Override
public ConfigurationTO create(ConfigurationTO configurationTO) {
- return restTemplate.postForObject(BASE_URL + "configuration/create",
+ return restTemplate.postForObject(baseUrl + "configuration/create",
configurationTO, ConfigurationTO.class);
}
@Override
public ConfigurationTO delete(String key) {
return restTemplate
- .getForObject(BASE_URL + "configuration/delete/{key}.json",
+ .getForObject(baseUrl + "configuration/delete/{key}.json",
ConfigurationTO.class, key);
}
@Override
public List<ConfigurationTO> list() {
- return Arrays.asList(restTemplate.getForObject(BASE_URL
+ return Arrays.asList(restTemplate.getForObject(baseUrl
+ "configuration/list.json", ConfigurationTO[].class));
}
@Override
public ConfigurationTO read(String key) {
- return restTemplate.getForObject(BASE_URL
+ return restTemplate.getForObject(baseUrl
+ "configuration/read/{key}.json", ConfigurationTO.class, key);
}
@Override
public ConfigurationTO update(String key, ConfigurationTO configurationTO) {
- return restTemplate.postForObject(BASE_URL + "configuration/update",
+ return restTemplate.postForObject(baseUrl + "configuration/update",
configurationTO, ConfigurationTO.class);
}
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ConnectorServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ConnectorServiceProxy.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ConnectorServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ConnectorServiceProxy.java Tue Jan 8 12:19:05 2013
@@ -35,19 +35,19 @@ public class ConnectorServiceProxy exten
@Override
public ConnInstanceTO create(ConnInstanceTO connectorTO) {
- return restTemplate.postForObject(BASE_URL + "connector/create.json", connectorTO,
+ return restTemplate.postForObject(baseUrl + "connector/create.json", connectorTO,
ConnInstanceTO.class);
}
@Override
public ConnInstanceTO update(Long connectorId, ConnInstanceTO connectorTO) {
- return restTemplate.postForObject(BASE_URL + "connector/update.json", connectorTO,
+ return restTemplate.postForObject(baseUrl + "connector/update.json", connectorTO,
ConnInstanceTO.class);
}
@Override
public ConnInstanceTO delete(Long connectorId) {
- return restTemplate.getForObject(BASE_URL + "connector/delete/{connectorId}.json",
+ return restTemplate.getForObject(baseUrl + "connector/delete/{connectorId}.json",
ConnInstanceTO.class, connectorId);
}
@@ -57,13 +57,13 @@ public class ConnectorServiceProxy exten
? "?lang=" + lang
: "";
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "connector/list.json" + param,
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "connector/list.json" + param,
ConnInstanceTO[].class));
}
@Override
public ConnInstanceTO read(Long connectorId) {
- return restTemplate.getForObject(BASE_URL + "connector/read/{connectorId}", ConnInstanceTO.class,
+ return restTemplate.getForObject(baseUrl + "connector/read/{connectorId}", ConnInstanceTO.class,
connectorId);
}
@@ -73,7 +73,7 @@ public class ConnectorServiceProxy exten
? "?lang=" + lang
: "";
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "connector/bundle/list.json" + param,
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "connector/bundle/list.json" + param,
ConnBundleTO[].class));
}
@@ -83,25 +83,25 @@ public class ConnectorServiceProxy exten
? "?showall=true"
: "?showall=false";
- return Arrays.asList(restTemplate.postForObject(BASE_URL + "connector/schema/list" + param, connectorTO,
+ return Arrays.asList(restTemplate.postForObject(baseUrl + "connector/schema/list" + param, connectorTO,
String[].class));
}
@Override
public List<ConnConfProperty> getConfigurationProperties(Long connectorId) {
return Arrays.asList(restTemplate
- .getForObject(BASE_URL + "connector/{connectorId}/configurationProperty/list",
+ .getForObject(baseUrl + "connector/{connectorId}/configurationProperty/list",
ConnConfProperty[].class, connectorId));
}
@Override
public boolean validate(ConnInstanceTO connectorTO) {
- return restTemplate.postForObject(BASE_URL + "connector/check.json", connectorTO, Boolean.class);
+ return restTemplate.postForObject(baseUrl + "connector/check.json", connectorTO, Boolean.class);
}
@Override
public ConnInstanceTO readConnectorBean(String resourceName) {
- return restTemplate.getForObject(BASE_URL + "connector/{resourceName}/connectorBean",
+ return restTemplate.getForObject(baseUrl + "connector/{resourceName}/connectorBean",
ConnInstanceTO.class, resourceName);
}
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/EntitlementServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/EntitlementServiceProxy.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/EntitlementServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/EntitlementServiceProxy.java Tue Jan 8 12:19:05 2013
@@ -34,12 +34,12 @@ public class EntitlementServiceProxy ext
@Override
public Set<String> getAllEntitlements() {
return new HashSet<String>(Arrays.asList(new RestTemplate().getForObject(
- BASE_URL + "auth/allentitlements.json", String[].class)));
+ baseUrl + "auth/allentitlements.json", String[].class)));
}
@Override
public Set<String> getMyEntitlements() {
- return new HashSet<String>(Arrays.asList(restTemplate.getForObject(BASE_URL
+ return new HashSet<String>(Arrays.asList(restTemplate.getForObject(baseUrl
+ "auth/entitlements.json", String[].class)));
}
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/LoggerServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/LoggerServiceProxy.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/LoggerServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/LoggerServiceProxy.java Tue Jan 8 12:19:05 2013
@@ -36,34 +36,34 @@ public class LoggerServiceProxy extends
@Override
public List<LoggerTO> listLogs() {
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "logger/log/list", LoggerTO[].class));
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "logger/log/list", LoggerTO[].class));
}
@Override
public List<AuditLoggerName> listAudits() {
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "logger/audit/list",
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "logger/audit/list",
AuditLoggerName[].class));
}
@Override
public LoggerTO setLogLevel(String name, Level level) {
- return restTemplate.postForObject(BASE_URL + "logger/log/{name}/{level}", null, LoggerTO.class, name,
+ return restTemplate.postForObject(baseUrl + "logger/log/{name}/{level}", null, LoggerTO.class, name,
level);
}
@Override
public LoggerTO deleteLog(String name) {
- return restTemplate.getForObject(BASE_URL + "logger/log/delete/{name}", LoggerTO.class, name);
+ return restTemplate.getForObject(baseUrl + "logger/log/delete/{name}", LoggerTO.class, name);
}
@Override
public void enableAudit(AuditLoggerName auditLoggerName) {
- restTemplate.put(BASE_URL + "logger/audit/enable", auditLoggerName);
+ restTemplate.put(baseUrl + "logger/audit/enable", auditLoggerName);
}
@Override
public void disableAudit(AuditLoggerName auditLoggerName) {
- restTemplate.put(BASE_URL + "logger/audit/disable", auditLoggerName);
+ restTemplate.put(baseUrl + "logger/audit/disable", auditLoggerName);
}
}
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/NotificationServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/NotificationServiceProxy.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/NotificationServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/NotificationServiceProxy.java Tue Jan 8 12:19:05 2013
@@ -33,31 +33,31 @@ public class NotificationServiceProxy ex
@Override
public NotificationTO read(Long notificationId) {
- return restTemplate.getForObject(BASE_URL + "notification/read/{notificationId}.json",
+ return restTemplate.getForObject(baseUrl + "notification/read/{notificationId}.json",
NotificationTO.class, notificationId);
}
@Override
public List<NotificationTO> list() {
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "notification/list.json",
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "notification/list.json",
NotificationTO[].class));
}
@Override
public NotificationTO create(NotificationTO notificationTO) {
- return restTemplate.postForObject(BASE_URL + "notification/create.json", notificationTO,
+ return restTemplate.postForObject(baseUrl + "notification/create.json", notificationTO,
NotificationTO.class);
}
@Override
public NotificationTO update(Long notificationId, NotificationTO notificationTO) {
- return restTemplate.postForObject(BASE_URL + "notification/update.json", notificationTO,
+ return restTemplate.postForObject(baseUrl + "notification/update.json", notificationTO,
NotificationTO.class);
}
@Override
public NotificationTO delete(Long notificationId) {
- return restTemplate.getForObject(BASE_URL + "notification/delete/{notificationId}.json",
+ return restTemplate.getForObject(baseUrl + "notification/delete/{notificationId}.json",
NotificationTO.class, notificationId);
}
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/PolicyServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/PolicyServiceProxy.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/PolicyServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/PolicyServiceProxy.java Tue Jan 8 12:19:05 2013
@@ -34,7 +34,7 @@ public class PolicyServiceProxy extends
@Override
public <T extends PolicyTO> T create(final T policyTO) {
@SuppressWarnings("unchecked")
- T result = (T) restTemplate.postForObject(BASE_URL
+ T result = (T) restTemplate.postForObject(baseUrl
+ "policy/{kind}/create", policyTO, policyTO.getClass(),
typeToUrl(policyTO.getType()));
return result;
@@ -43,7 +43,7 @@ public class PolicyServiceProxy extends
@Override
public <T extends PolicyTO> T update(Long policyId, T policyTO) {
@SuppressWarnings("unchecked")
- T result = (T) restTemplate.postForObject(BASE_URL
+ T result = (T) restTemplate.postForObject(baseUrl
+ "policy/{kind}/update", policyTO, policyTO.getClass(),
typeToUrl(policyTO.getType()));
return result;
@@ -52,27 +52,27 @@ public class PolicyServiceProxy extends
@Override
public <T extends PolicyTO> List<T> listByType(PolicyType type) {
@SuppressWarnings("unchecked")
- List<T> result = restTemplate.getForObject(BASE_URL + "policy/{kind}/list",
+ List<T> result = restTemplate.getForObject(baseUrl + "policy/{kind}/list",
List.class, typeToUrl(type));
return result;
}
@Override
public <T extends PolicyTO> T readGlobal(PolicyType type, Class<T> policyClass) {
- T result = restTemplate.getForObject(BASE_URL + "policy/{kind}/global/read",
+ T result = restTemplate.getForObject(baseUrl + "policy/{kind}/global/read",
policyClass, typeToUrl(type));
return result;
}
@Override
public <T extends PolicyTO> T read(Long policyId, Class<T> policyClass) {
- T result = restTemplate.getForObject(BASE_URL + "policy/read/{id}", policyClass, policyId);
+ T result = restTemplate.getForObject(baseUrl + "policy/read/{id}", policyClass, policyId);
return result;
}
@Override
public <T extends PolicyTO> T delete(Long policyId, Class<T> policyClass) {
- T result = restTemplate.getForObject(BASE_URL + "policy/delete/{id}", policyClass, policyId);
+ T result = restTemplate.getForObject(baseUrl + "policy/delete/{id}", policyClass, policyId);
return result;
}
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ReportServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ReportServiceProxy.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ReportServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ReportServiceProxy.java Tue Jan 8 12:19:05 2013
@@ -35,22 +35,22 @@ public class ReportServiceProxy extends
@Override
public ReportTO create(ReportTO reportTO) {
- return restTemplate.postForObject(BASE_URL + "report/create", reportTO, ReportTO.class);
+ return restTemplate.postForObject(baseUrl + "report/create", reportTO, ReportTO.class);
}
@Override
public ReportTO update(Long reportId, ReportTO reportTO) {
- return restTemplate.postForObject(BASE_URL + "report/update", reportTO, ReportTO.class);
+ return restTemplate.postForObject(baseUrl + "report/update", reportTO, ReportTO.class);
}
@Override
public int count() {
- return restTemplate.getForObject(BASE_URL + "report/count.json", Integer.class);
+ return restTemplate.getForObject(baseUrl + "report/count.json", Integer.class);
}
@Override
public List<ReportTO> list() {
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "report/list", ReportTO[].class));
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "report/list", ReportTO[].class));
}
@Override
@@ -61,24 +61,24 @@ public class ReportServiceProxy extends
@Override
public List<ReportExecTO> listExecutions() {
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "report/execution/list",
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "report/execution/list",
ReportExecTO[].class));
}
@Override
public List<String> getReportletConfClasses() {
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "report/reportletConfClasses.json",
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "report/reportletConfClasses.json",
String[].class));
}
@Override
public ReportTO read(Long reportId) {
- return restTemplate.getForObject(BASE_URL + "report/read/{reportId}", ReportTO.class, reportId);
+ return restTemplate.getForObject(baseUrl + "report/read/{reportId}", ReportTO.class, reportId);
}
@Override
public ReportExecTO readExecution(Long executionId) {
- return restTemplate.getForObject(BASE_URL + "report/execution/read/{reportId}",
+ return restTemplate.getForObject(baseUrl + "report/execution/read/{reportId}",
ReportExecTO.class, executionId);
}
@@ -90,13 +90,13 @@ public class ReportServiceProxy extends
@Override
public ReportExecTO execute(Long reportId) {
- return restTemplate.postForObject(BASE_URL + "report/execute/{reportId}", null,
+ return restTemplate.postForObject(baseUrl + "report/execute/{reportId}", null,
ReportExecTO.class, reportId);
}
@Override
public ReportTO delete(Long reportId) {
- return restTemplate.getForObject(BASE_URL + "report/delete/{reportId}",
+ return restTemplate.getForObject(baseUrl + "report/delete/{reportId}",
ReportTO.class, reportId);
}
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ResourceServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ResourceServiceProxy.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ResourceServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ResourceServiceProxy.java Tue Jan 8 12:19:05 2013
@@ -38,29 +38,29 @@ public class ResourceServiceProxy extend
@Override
public ResourceTO create(ResourceTO resourceTO) {
- return restTemplate.postForObject(BASE_URL + "resource/create.json", resourceTO, ResourceTO.class);
+ return restTemplate.postForObject(baseUrl + "resource/create.json", resourceTO, ResourceTO.class);
}
@Override
public ResourceTO update(String resourceName, ResourceTO resourceTO) {
- return restTemplate.postForObject(BASE_URL + "resource/update.json", resourceTO, ResourceTO.class);
+ return restTemplate.postForObject(baseUrl + "resource/update.json", resourceTO, ResourceTO.class);
}
@Override
public ResourceTO delete(String resourceName) {
- return restTemplate.getForObject(BASE_URL + "resource/delete/{resourceName}.json", ResourceTO.class,
+ return restTemplate.getForObject(baseUrl + "resource/delete/{resourceName}.json", ResourceTO.class,
resourceName);
}
@Override
public ResourceTO read(String resourceName) {
- return restTemplate.getForObject(BASE_URL + "resource/read/{resourceName}.json", ResourceTO.class,
+ return restTemplate.getForObject(baseUrl + "resource/read/{resourceName}.json", ResourceTO.class,
resourceName);
}
@Override
public Set<String> getPropagationActionsClasses() {
- return new HashSet<String>(Arrays.asList(restTemplate.getForObject(BASE_URL
+ return new HashSet<String>(Arrays.asList(restTemplate.getForObject(baseUrl
+ "resource/propagationActionsClasses.json", String[].class)));
}
@@ -70,19 +70,19 @@ public class ResourceServiceProxy extend
? query = "?connInstanceId=" + connInstanceId.toString()
: "";
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "resource/list.json" + query,
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "resource/list.json" + query,
ResourceTO[].class, connInstanceId));
}
@Override
public ConnObjectTO getConnector(String resourceName, AttributableType type, String objectId) {
- return restTemplate.getForObject(BASE_URL + "resource/{resourceName}/read/{type}/{objectId}.json",
+ return restTemplate.getForObject(baseUrl + "resource/{resourceName}/read/{type}/{objectId}.json",
ConnObjectTO.class, resourceName, type, objectId);
}
@Override
public boolean check(ResourceTO resourceTO) {
- return restTemplate.postForObject(BASE_URL + "resource/check.json", resourceTO, Boolean.class)
+ return restTemplate.postForObject(baseUrl + "resource/check.json", resourceTO, Boolean.class)
.booleanValue();
}
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/RoleServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/RoleServiceProxy.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/RoleServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/RoleServiceProxy.java Tue Jan 8 12:19:05 2013
@@ -35,67 +35,67 @@ public class RoleServiceProxy extends Sp
@Override
public List<RoleTO> children(Long roleId) {
- return Arrays.asList(restTemplate.getForObject(BASE_URL
+ return Arrays.asList(restTemplate.getForObject(baseUrl
+ "role/children/{roleId}.json", RoleTO[].class, roleId));
}
@Override
public RoleTO create(RoleTO roleTO) {
- return restTemplate.postForObject(BASE_URL + "role/create", roleTO,
+ return restTemplate.postForObject(baseUrl + "role/create", roleTO,
RoleTO.class);
}
@Override
public RoleTO delete(Long roleId) {
- return restTemplate.getForObject(BASE_URL + "role/delete/{roleId}",
+ return restTemplate.getForObject(baseUrl + "role/delete/{roleId}",
RoleTO.class, roleId);
}
@Override
public List<RoleTO> list() {
- return Arrays.asList(restTemplate.getForObject(BASE_URL
+ return Arrays.asList(restTemplate.getForObject(baseUrl
+ "role/list.json", RoleTO[].class));
}
@Override
public RoleTO parent(Long roleId) {
- return restTemplate.getForObject(BASE_URL + "role/parent/{roleId}.json",
+ return restTemplate.getForObject(baseUrl + "role/parent/{roleId}.json",
RoleTO.class, roleId);
}
@Override
public RoleTO read(Long roleId) {
- return restTemplate.getForObject(BASE_URL + "role/read/{roleId}.json",
+ return restTemplate.getForObject(baseUrl + "role/read/{roleId}.json",
RoleTO.class, roleId);
}
@Override
public List<RoleTO> search(NodeCond searchCondition) {
return Arrays.asList(restTemplate.postForObject(
- BASE_URL + "role/search", searchCondition, RoleTO[].class));
+ baseUrl + "role/search", searchCondition, RoleTO[].class));
}
@Override
public List<RoleTO> search(NodeCond searchCondition, int page, int size) {
return Arrays.asList(restTemplate.postForObject(
- BASE_URL + "role/search/{page}/{size}", searchCondition, RoleTO[].class, page, size));
+ baseUrl + "role/search/{page}/{size}", searchCondition, RoleTO[].class, page, size));
}
@Override
public int searchCount(NodeCond searchCondition) {
- return restTemplate.postForObject(BASE_URL + "role/search/count.json",
+ return restTemplate.postForObject(baseUrl + "role/search/count.json",
searchCondition, Integer.class);
}
@Override
public RoleTO selfRead(Long roleId) {
- return restTemplate.getForObject(BASE_URL + "role/selfRead/{roleId}",
+ return restTemplate.getForObject(baseUrl + "role/selfRead/{roleId}",
RoleTO.class, roleId);
}
@Override
public RoleTO update(Long roleId, RoleMod roleMod) {
- return restTemplate.postForObject(BASE_URL + "role/update", roleMod,
+ return restTemplate.postForObject(baseUrl + "role/update", roleMod,
RoleTO.class);
}
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/SchemaServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/SchemaServiceProxy.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/SchemaServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/SchemaServiceProxy.java Tue Jan 8 12:19:05 2013
@@ -39,28 +39,28 @@ public class SchemaServiceProxy extends
public <T extends AbstractSchemaTO> T create(String kind, T schemaTO) {
String schemaType = getSchemaType(schemaTO.getClass());
- return (T) restTemplate.postForObject(BASE_URL + schemaType + "/{kind}/create", schemaTO,
+ return (T) restTemplate.postForObject(baseUrl + schemaType + "/{kind}/create", schemaTO,
schemaTO.getClass(), kind);
}
@Override
public <T extends AbstractSchemaTO> T delete(String kind, String schemaName, Class<T> type) {
String schemaType = getSchemaType(type);
- return restTemplate.getForObject(BASE_URL + schemaType + "/{kind}/delete/{name}.json", type, kind,
+ return restTemplate.getForObject(baseUrl + schemaType + "/{kind}/delete/{name}.json", type, kind,
schemaName);
}
@Override
public <T extends AbstractSchemaTO> List<T> list(String kind, Class<T[]> type) {
String schemaType = getSchemaTypeArray(type);
- return Arrays.asList(restTemplate.getForObject(BASE_URL + schemaType + "/{kind}/list.json", type,
+ return Arrays.asList(restTemplate.getForObject(baseUrl + schemaType + "/{kind}/list.json", type,
kind));
}
@Override
public <T extends AbstractSchemaTO> T read(String kind, String schemaName, Class<T> type) {
String schemaType = getSchemaType(type);
- return restTemplate.getForObject(BASE_URL + schemaType + "/{kind}/read/{name}.json", type, kind,
+ return restTemplate.getForObject(baseUrl + schemaType + "/{kind}/read/{name}.json", type, kind,
schemaName);
}
@@ -68,7 +68,7 @@ public class SchemaServiceProxy extends
@Override
public <T extends AbstractSchemaTO> T update(String kind, String schemaName, T schemaTO) {
String schemaType = getSchemaType(schemaTO.getClass());
- return (T) restTemplate.postForObject(BASE_URL + schemaType + "/{kind}/update", schemaTO,
+ return (T) restTemplate.postForObject(baseUrl + schemaType + "/{kind}/update", schemaTO,
schemaTO.getClass(), kind);
}
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/SpringServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/SpringServiceProxy.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/SpringServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/SpringServiceProxy.java Tue Jan 8 12:19:05 2013
@@ -24,10 +24,10 @@ public abstract class SpringServiceProxy
protected RestTemplate restTemplate;
- protected String BASE_URL; //TODO rename property to baseUrl to match naming conventions
+ protected String baseUrl;
public SpringServiceProxy(String baseUrl, RestTemplate restTemplate) {
this.restTemplate = restTemplate;
- this.BASE_URL = baseUrl;
+ this.baseUrl = baseUrl;
}
}
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/TaskServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/TaskServiceProxy.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/TaskServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/TaskServiceProxy.java Tue Jan 8 12:19:05 2013
@@ -39,7 +39,7 @@ public class TaskServiceProxy extends Sp
@Override
public int count(String kind) {
- return restTemplate.getForObject(BASE_URL + "task/{kind}/count.json", Integer.class, kind);
+ return restTemplate.getForObject(baseUrl + "task/{kind}/count.json", Integer.class, kind);
}
@SuppressWarnings("unchecked")
@@ -51,13 +51,13 @@ public class TaskServiceProxy extends Sp
? "sched"
: "";
- return (T) restTemplate.postForObject(BASE_URL + "task/create/{type}", taskTO, taskTO.getClass(),
+ return (T) restTemplate.postForObject(baseUrl + "task/create/{type}", taskTO, taskTO.getClass(),
subTypeString);
}
@Override
public <T extends TaskTO> T delete(Long taskId, Class<T> type) {
- return restTemplate.getForObject(BASE_URL + "task/delete/{taskId}", type, taskId);
+ return restTemplate.getForObject(baseUrl + "task/delete/{taskId}", type, taskId);
}
@Override
@@ -71,53 +71,53 @@ public class TaskServiceProxy extends Sp
String param = (dryRun)
? "?dryRun=true"
: "";
- return restTemplate.postForObject(BASE_URL + "task/execute/{taskId}" + param, null, TaskExecTO.class,
+ return restTemplate.postForObject(baseUrl + "task/execute/{taskId}" + param, null, TaskExecTO.class,
taskId);
}
@Override
public Set<String> getJobClasses() {
- return new HashSet<String>(Arrays.asList(restTemplate.getForObject(BASE_URL + "task/jobClasses.json",
+ return new HashSet<String>(Arrays.asList(restTemplate.getForObject(baseUrl + "task/jobClasses.json",
String[].class)));
}
@Override
public Set<String> getSyncActionsClasses() {
- return new HashSet<String>(Arrays.asList(restTemplate.getForObject(BASE_URL
+ return new HashSet<String>(Arrays.asList(restTemplate.getForObject(baseUrl
+ "task/syncActionsClasses.json", String[].class)));
}
@Override
public <T extends TaskTO> List<T> list(String kind, Class<T[]> type) {
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "task/{kind}/list", type, kind));
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "task/{kind}/list", type, kind));
}
@Override
public <T extends TaskTO> List<T> list(String kind, int page, int size, Class<T[]> type) {
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "task/{kind}/list/{page}/{size}.json",
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "task/{kind}/list/{page}/{size}.json",
type, kind, page, size));
}
@Override
public List<TaskExecTO> listExecutions(String kind) {
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "task/{kind}/execution/list",
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "task/{kind}/execution/list",
TaskExecTO[].class, kind));
}
@Override
public <T extends TaskTO> T read(Long taskId, Class<T> type) {
- return restTemplate.getForObject(BASE_URL + "task/read/{taskId}", type, taskId);
+ return restTemplate.getForObject(baseUrl + "task/read/{taskId}", type, taskId);
}
@Override
public TaskExecTO readExecution(Long executionId) {
- return restTemplate.getForObject(BASE_URL + "task/execution/read/{taskId}", TaskExecTO.class,
+ return restTemplate.getForObject(baseUrl + "task/execution/read/{taskId}", TaskExecTO.class,
executionId);
}
@Override
public TaskExecTO report(Long executionId, PropagationTaskExecStatus status, String message) {
- return restTemplate.getForObject(BASE_URL + "task/execution/report/{executionId}"
+ return restTemplate.getForObject(baseUrl + "task/execution/report/{executionId}"
+ "?executionStatus={status}&message={message}", TaskExecTO.class, executionId, status,
message);
}
@@ -133,7 +133,7 @@ public class TaskServiceProxy extends Sp
if (path == null)
throw new IllegalArgumentException("Task can only be instance of SchedTaskTO or SyncTaskTO");
- return (T) restTemplate.postForObject(BASE_URL + "task/update/" + path, taskTO, taskTO.getClass());
+ return (T) restTemplate.postForObject(baseUrl + "task/update/" + path, taskTO, taskTO.getClass());
}
}
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/UserServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/UserServiceProxy.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/UserServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/UserServiceProxy.java Tue Jan 8 12:19:05 2013
@@ -38,50 +38,50 @@ public class UserServiceProxy extends Sp
@Override
public Boolean verifyPassword(String username, String password) {
return restTemplate.getForObject(
- BASE_URL + "user/verifyPassword/{username}.json?password={password}", Boolean.class,
+ baseUrl + "user/verifyPassword/{username}.json?password={password}", Boolean.class,
username, password);
}
@Override
public int count() {
- return restTemplate.getForObject(BASE_URL + "user/count.json", Integer.class);
+ return restTemplate.getForObject(baseUrl + "user/count.json", Integer.class);
}
@Override
public List<UserTO> list() {
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "user/list.json", UserTO[].class));
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "user/list.json", UserTO[].class));
}
@Override
public List<UserTO> list(int page, int size) {
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "user/list/{page}/{size}.json",
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "user/list/{page}/{size}.json",
UserTO[].class, page, size));
}
@Override
public UserTO read(Long userId) {
- return restTemplate.getForObject(BASE_URL + "user/read/{userId}.json", UserTO.class, userId);
+ return restTemplate.getForObject(baseUrl + "user/read/{userId}.json", UserTO.class, userId);
}
@Override
public UserTO read(String username) {
- return restTemplate.getForObject(BASE_URL + "user/readByUsername/{username}.json", UserTO.class,
+ return restTemplate.getForObject(baseUrl + "user/readByUsername/{username}.json", UserTO.class,
username);
}
@Override
public UserTO create(UserTO userTO) {
- return restTemplate.postForObject(BASE_URL + "user/create", userTO, UserTO.class);
+ return restTemplate.postForObject(baseUrl + "user/create", userTO, UserTO.class);
}
@Override
public UserTO update(Long userId, UserMod userMod) {
- return restTemplate.postForObject(BASE_URL + "user/update", userMod, UserTO.class);
+ return restTemplate.postForObject(baseUrl + "user/update", userMod, UserTO.class);
}
@Override
public UserTO delete(Long userId) {
- return restTemplate.getForObject(BASE_URL + "user/delete/{userId}", UserTO.class, userId);
+ return restTemplate.getForObject(baseUrl + "user/delete/{userId}", UserTO.class, userId);
}
@Override
@@ -91,92 +91,92 @@ public class UserServiceProxy extends Sp
@Override
public List<WorkflowFormTO> getForms() {
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "user/workflow/form/list",
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "user/workflow/form/list",
WorkflowFormTO[].class));
}
@Override
public WorkflowFormTO getFormForUser(Long userId) {
- return restTemplate.getForObject(BASE_URL + "user/workflow/form/{userId}", WorkflowFormTO.class,
+ return restTemplate.getForObject(baseUrl + "user/workflow/form/{userId}", WorkflowFormTO.class,
userId);
}
@Override
public WorkflowFormTO claimForm(String taskId) {
- return restTemplate.getForObject(BASE_URL + "user/workflow/form/claim/{taskId}",
+ return restTemplate.getForObject(baseUrl + "user/workflow/form/claim/{taskId}",
WorkflowFormTO.class, taskId);
}
@Override
public UserTO submitForm(WorkflowFormTO form) {
- return restTemplate.postForObject(BASE_URL + "user/workflow/form/submit", form, UserTO.class);
+ return restTemplate.postForObject(baseUrl + "user/workflow/form/submit", form, UserTO.class);
}
@Override
public UserTO activate(long userId, String token) {
- return restTemplate.getForObject(BASE_URL + "user/activate/{userId}?token=" + token, UserTO.class,
+ return restTemplate.getForObject(baseUrl + "user/activate/{userId}?token=" + token, UserTO.class,
userId);
}
@Override
public UserTO activateByUsername(String username, String token) {
- return restTemplate.getForObject(BASE_URL + "user/activateByUsername/{username}.json?token=" + token,
+ return restTemplate.getForObject(baseUrl + "user/activateByUsername/{username}.json?token=" + token,
UserTO.class, username);
}
@Override
public UserTO suspend(long userId) {
- return restTemplate.getForObject(BASE_URL + "user/suspend/{userId}", UserTO.class, userId);
+ return restTemplate.getForObject(baseUrl + "user/suspend/{userId}", UserTO.class, userId);
}
@Override
public UserTO reactivate(long userId) {
- return restTemplate.getForObject(BASE_URL + "user/reactivate/{userId}", UserTO.class, userId);
+ return restTemplate.getForObject(baseUrl + "user/reactivate/{userId}", UserTO.class, userId);
}
@Override
public UserTO reactivate(long userId, String query) {
- return restTemplate.getForObject(BASE_URL + "user/reactivate/" + userId + query, UserTO.class);
+ return restTemplate.getForObject(baseUrl + "user/reactivate/" + userId + query, UserTO.class);
}
@Override
public UserTO suspendByUsername(String username) {
- return restTemplate.getForObject(BASE_URL + "user/suspendByUsername/{username}.json", UserTO.class,
+ return restTemplate.getForObject(baseUrl + "user/suspendByUsername/{username}.json", UserTO.class,
username);
}
@Override
public UserTO reactivateByUsername(String username) {
- return restTemplate.getForObject(BASE_URL + "user/reactivateByUsername/{username}.json",
+ return restTemplate.getForObject(baseUrl + "user/reactivateByUsername/{username}.json",
UserTO.class, username);
}
@Override
public UserTO suspend(long userId, String query) {
- return restTemplate.getForObject(BASE_URL + "user/suspend/" + userId + query, UserTO.class);
+ return restTemplate.getForObject(baseUrl + "user/suspend/" + userId + query, UserTO.class);
}
@Override
public UserTO readSelf() {
- return restTemplate.getForObject(BASE_URL + "user/read/self", UserTO.class);
+ return restTemplate.getForObject(baseUrl + "user/read/self", UserTO.class);
}
@Override
public List<UserTO> search(NodeCond searchCondition) {
- return Arrays.asList(restTemplate.postForObject(BASE_URL + "user/search", searchCondition,
+ return Arrays.asList(restTemplate.postForObject(baseUrl + "user/search", searchCondition,
UserTO[].class));
}
@Override
public List<UserTO> search(NodeCond searchCondition, int page, int size) {
- return Arrays.asList(restTemplate.postForObject(BASE_URL + "user/search/{page}/{size}",
+ return Arrays.asList(restTemplate.postForObject(baseUrl + "user/search/{page}/{size}",
searchCondition, UserTO[].class, page, size));
}
@Override
public int searchCount(NodeCond searchCondition) {
return restTemplate
- .postForObject(BASE_URL + "user/search/count.json", searchCondition, Integer.class);
+ .postForObject(baseUrl + "user/search/count.json", searchCondition, Integer.class);
}
@Override
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/WorkflowServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/WorkflowServiceProxy.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/WorkflowServiceProxy.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/WorkflowServiceProxy.java Tue Jan 8 12:19:05 2013
@@ -34,17 +34,17 @@ public class WorkflowServiceProxy extend
@Override
public WorkflowDefinitionTO getDefinition(String type) {
return restTemplate
- .getForObject(BASE_URL + "workflow/definition/" + type, WorkflowDefinitionTO.class);
+ .getForObject(baseUrl + "workflow/definition/" + type, WorkflowDefinitionTO.class);
}
@Override
public void updateDefinition(String type, WorkflowDefinitionTO definition) {
- restTemplate.put(BASE_URL + "workflow/definition/" + type, definition);
+ restTemplate.put(baseUrl + "workflow/definition/" + type, definition);
}
@Override
public List<String> getDefinedTasks(final String type) {
- return Arrays.asList(restTemplate.getForObject(BASE_URL + "workflow/tasks/" + type, String.class));
+ return Arrays.asList(restTemplate.getForObject(baseUrl + "workflow/tasks/" + type, String.class));
}
}
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java?rev=1430250&r1=1430249&r2=1430250&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java Tue Jan 8 12:19:05 2013
@@ -25,6 +25,18 @@ import org.apache.http.impl.client.Defau
import org.apache.syncope.client.http.PreemptiveAuthHttpRequestFactory;
import org.apache.syncope.client.mod.AttributeMod;
import org.apache.syncope.client.to.AttributeTO;
+import org.apache.syncope.services.ConfigurationService;
+import org.apache.syncope.services.ConnectorService;
+import org.apache.syncope.services.EntitlementService;
+import org.apache.syncope.services.LoggerService;
+import org.apache.syncope.services.NotificationService;
+import org.apache.syncope.services.ReportService;
+import org.apache.syncope.services.ResourceService;
+import org.apache.syncope.services.RoleService;
+import org.apache.syncope.services.SchemaService;
+import org.apache.syncope.services.TaskService;
+import org.apache.syncope.services.UserService;
+import org.apache.syncope.services.WorkflowService;
import org.apache.syncope.services.proxy.ConfigurationServiceProxy;
import org.apache.syncope.services.proxy.ConnectorServiceProxy;
import org.apache.syncope.services.proxy.EntitlementServiceProxy;
@@ -81,29 +93,29 @@ public abstract class AbstractTest {
@Autowired
protected RestTemplate restTemplate;
- protected UserServiceProxy userService;
+ protected UserService userService;
- protected RoleServiceProxy roleService;
+ protected RoleService roleService;
- protected ResourceServiceProxy resourceService;
+ protected ResourceService resourceService;
- protected EntitlementServiceProxy entitlementService;
+ protected EntitlementService entitlementService;
- protected ConfigurationServiceProxy configurationService;
+ protected ConfigurationService configurationService;
- protected ConnectorServiceProxy connectorService;
+ protected ConnectorService connectorService;
- protected LoggerServiceProxy loggerService;
+ protected LoggerService loggerService;
- protected ReportServiceProxy reportService;
+ protected ReportService reportService;
- protected TaskServiceProxy taskService;
+ protected TaskService taskService;
- protected WorkflowServiceProxy workflowService;
+ protected WorkflowService workflowService;
- protected NotificationServiceProxy notificationService;
+ protected NotificationService notificationService;
- protected SchemaServiceProxy schemaService;
+ protected SchemaService schemaService;
@Autowired
protected DataSource testDataSource;