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/11/22 14:41:02 UTC
svn commit: r1544534 - in
/syncope/trunk/common/src/main/java/org/apache/syncope/common:
mod/StatusMod.java to/AbstractAttributableTO.java to/AttributeTO.java
to/ConnObjectTO.java
Author: ilgrosso
Date: Fri Nov 22 13:41:01 2013
New Revision: 1544534
URL: http://svn.apache.org/r1544534
Log:
Checking core full working also via application/xml
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/StatusMod.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AttributeTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/StatusMod.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/StatusMod.java?rev=1544534&r1=1544533&r2=1544534&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/StatusMod.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/mod/StatusMod.java Fri Nov 22 13:41:01 2013
@@ -18,8 +18,11 @@
*/
package org.apache.syncope.common.mod;
+import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.ArrayList;
import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
@@ -95,6 +98,9 @@ public class StatusMod extends AbstractB
this.onSyncope = onSyncope;
}
+ @XmlElementWrapper(name = "resources")
+ @XmlElement(name = "resource")
+ @JsonProperty("resources")
public List<String> getResourceNames() {
return resourceNames;
}
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java?rev=1544534&r1=1544533&r2=1544534&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AbstractAttributableTO.java Fri Nov 22 13:41:01 2013
@@ -65,34 +65,22 @@ public abstract class AbstractAttributab
@JsonIgnore
public Map<String, AttributeTO> getDerAttrMap() {
- Map<String, AttributeTO> result;
-
- if (derAttrs == null) {
- result = Collections.emptyMap();
- } else {
- result = new HashMap<String, AttributeTO>(derAttrs.size());
- for (AttributeTO attributeTO : derAttrs) {
- result.put(attributeTO.getSchema(), attributeTO);
- }
- result = Collections.unmodifiableMap(result);
+ Map<String, AttributeTO> result = new HashMap<String, AttributeTO>(derAttrs.size());
+ for (AttributeTO attributeTO : derAttrs) {
+ result.put(attributeTO.getSchema(), attributeTO);
}
+ result = Collections.unmodifiableMap(result);
return result;
}
@JsonIgnore
public Map<String, AttributeTO> getVirAttrMap() {
- Map<String, AttributeTO> result;
-
- if (derAttrs == null) {
- result = Collections.emptyMap();
- } else {
- result = new HashMap<String, AttributeTO>(virAttrs.size());
- for (AttributeTO attributeTO : virAttrs) {
- result.put(attributeTO.getSchema(), attributeTO);
- }
- result = Collections.unmodifiableMap(result);
+ Map<String, AttributeTO> result = new HashMap<String, AttributeTO>(virAttrs.size());
+ for (AttributeTO attributeTO : virAttrs) {
+ result.put(attributeTO.getSchema(), attributeTO);
}
+ result = Collections.unmodifiableMap(result);
return result;
}
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AttributeTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AttributeTO.java?rev=1544534&r1=1544533&r2=1544534&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AttributeTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AttributeTO.java Fri Nov 22 13:41:01 2013
@@ -43,7 +43,7 @@ public class AttributeTO extends Abstrac
/**
* Set of (string) values of this attribute.
*/
- private List<String> values;
+ private final List<String> values;
/**
* Whether this attribute is read-only or not.
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java?rev=1544534&r1=1544533&r2=1544534&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java Fri Nov 22 13:41:01 2013
@@ -47,17 +47,11 @@ public class ConnObjectTO extends Abstra
@JsonIgnore
public Map<String, AttributeTO> getAttrMap() {
- Map<String, AttributeTO> result;
-
- if (attrs == null) {
- result = Collections.<String, AttributeTO>emptyMap();
- } else {
- result = new HashMap<String, AttributeTO>(attrs.size());
- for (AttributeTO attributeTO : attrs) {
- result.put(attributeTO.getSchema(), attributeTO);
- }
- result = Collections.<String, AttributeTO>unmodifiableMap(result);
+ Map<String, AttributeTO> result = new HashMap<String, AttributeTO>(attrs.size());
+ for (AttributeTO attributeTO : attrs) {
+ result.put(attributeTO.getSchema(), attributeTO);
}
+ result = Collections.<String, AttributeTO>unmodifiableMap(result);
return result;
}