You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/01/16 09:09:52 UTC
svn commit: r1433846 - in /syncope/trunk:
client/src/main/java/org/apache/syncope/services/proxy/
client/src/main/java/org/apache/syncope/types/
console/src/main/java/org/apache/syncope/console/pages/panels/
Author: ilgrosso
Date: Wed Jan 16 08:09:52 2013
New Revision: 1433846
URL: http://svn.apache.org/viewvc?rev=1433846&view=rev
Log:
[SYNCOPE-259] [SYNCOPE-172] Removing confusing toString() from AttributableType breaking ResourceMappingPanel + adding some final keywords to ResourceServiceProxy (this should be taken as standard practcice as other defined PMD / Findbugs / Checkstyle rules)
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/services/proxy/ResourceServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/types/AttributableType.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
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=1433846&r1=1433845&r2=1433846&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 Wed Jan 16 08:09:52 2013
@@ -16,14 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.services.proxy;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import org.apache.syncope.client.to.ConnObjectTO;
import org.apache.syncope.client.to.ResourceTO;
import org.apache.syncope.services.ResourceService;
@@ -32,29 +30,30 @@ import org.springframework.web.client.Re
public class ResourceServiceProxy extends SpringServiceProxy implements ResourceService {
- public ResourceServiceProxy(String baseUrl, RestTemplate restTemplate) {
+ public ResourceServiceProxy(final String baseUrl, final RestTemplate restTemplate) {
super(baseUrl, restTemplate);
}
@Override
- public ResourceTO create(ResourceTO resourceTO) {
+ public ResourceTO create(final ResourceTO resourceTO) {
return getRestTemplate().postForObject(baseUrl + "resource/create.json", resourceTO, ResourceTO.class);
}
@Override
- public ResourceTO update(String resourceName, ResourceTO resourceTO) {
+ public ResourceTO update(final String resourceName, final ResourceTO resourceTO) {
return getRestTemplate().postForObject(baseUrl + "resource/update.json", resourceTO, ResourceTO.class);
}
@Override
- public ResourceTO delete(String resourceName) {
+ public ResourceTO delete(final String resourceName) {
return getRestTemplate().getForObject(baseUrl + "resource/delete/{resourceName}.json", ResourceTO.class,
resourceName);
}
@Override
- public ResourceTO read(String resourceName) {
- return getRestTemplate().getForObject(baseUrl + "resource/read/{resourceName}.json", ResourceTO.class, resourceName);
+ public ResourceTO read(final String resourceName) {
+ return getRestTemplate().getForObject(baseUrl + "resource/read/{resourceName}.json", ResourceTO.class,
+ resourceName);
}
@Override
@@ -69,23 +68,24 @@ public class ResourceServiceProxy extend
}
@Override
- public List<ResourceTO> list(Long connInstanceId) {
- if (connInstanceId == null)
+ public List<ResourceTO> list(final Long connInstanceId) {
+ if (connInstanceId == null) {
return list();
+ }
- return Arrays.asList(getRestTemplate().getForObject(baseUrl + "resource/list.json?connInstanceId={connId}", ResourceTO[].class,
- connInstanceId));
+ return Arrays.asList(getRestTemplate().getForObject(baseUrl + "resource/list.json?connInstanceId={connId}",
+ ResourceTO[].class, connInstanceId));
}
@Override
- public ConnObjectTO getConnector(String resourceName, AttributableType type, String objectId) {
+ public ConnObjectTO getConnector(final String resourceName, final AttributableType type, final String objectId) {
return getRestTemplate().getForObject(baseUrl + "resource/{resourceName}/read/{type}/{objectId}.json",
- ConnObjectTO.class, resourceName, type.toString().toUpperCase(), objectId);
+ ConnObjectTO.class, resourceName, type.name(), objectId);
}
@Override
- public boolean check(ResourceTO resourceTO) {
- return getRestTemplate().postForObject(baseUrl + "resource/check.json", resourceTO, Boolean.class).booleanValue();
+ public boolean check(final ResourceTO resourceTO) {
+ return getRestTemplate().postForObject(baseUrl + "resource/check.json", resourceTO, Boolean.class).
+ booleanValue();
}
-
}
Modified: syncope/trunk/client/src/main/java/org/apache/syncope/types/AttributableType.java
URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/types/AttributableType.java?rev=1433846&r1=1433845&r2=1433846&view=diff
==============================================================================
--- syncope/trunk/client/src/main/java/org/apache/syncope/types/AttributableType.java (original)
+++ syncope/trunk/client/src/main/java/org/apache/syncope/types/AttributableType.java Wed Jan 16 08:09:52 2013
@@ -24,9 +24,4 @@ public enum AttributableType {
ROLE,
MEMBERSHIP;
- @Override
- public String toString() {
- return name().toLowerCase();
- };
-
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java?rev=1433846&r1=1433845&r2=1433846&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java Wed Jan 16 08:09:52 2013
@@ -555,7 +555,7 @@ public class ResourceMappingPanel extend
final List<IntMappingType> res = new ArrayList<IntMappingType>();
if (entity != null) {
- res.addAll(IntMappingType.getAttributeTypes(AttributableType.valueOf(entity.toString())));
+ res.addAll(IntMappingType.getAttributeTypes(AttributableType.valueOf(entity.name())));
}
return res;