directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-core git commit: FC-193 - remove @XmlElement(nillable = true) from all entities
Date Mon, 10 Oct 2016 16:31:50 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 0e38f216b -> a6a56e290


FC-193 - remove @XmlElement(nillable = true) from all entities


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/a6a56e29
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/a6a56e29
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/a6a56e29

Branch: refs/heads/master
Commit: a6a56e290d4355789fb7fb3998a5947cb022c100
Parents: 0e38f21
Author: Shawn McKinney <smckinney@apache.org>
Authored: Mon Oct 10 11:10:25 2016 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Mon Oct 10 11:10:25 2016 -0500

----------------------------------------------------------------------
 .../directory/fortress/core/model/Address.java  |  2 +-
 .../fortress/core/model/FortRequest.java        |  5 -----
 .../fortress/core/model/FortResponse.java       |  6 ------
 .../directory/fortress/core/model/Mod.java      |  2 --
 .../directory/fortress/core/model/OrgUnit.java  |  4 +---
 .../directory/fortress/core/model/PermObj.java  |  3 ---
 .../core/model/PermissionAttribute.java         |  2 --
 .../core/model/PermissionAttributeSet.java      |  2 --
 .../directory/fortress/core/model/PwPolicy.java | 16 --------------
 .../directory/fortress/core/model/SDSet.java    |  2 --
 .../directory/fortress/core/model/Session.java  |  4 ----
 .../directory/fortress/core/model/User.java     | 10 ---------
 .../fortress/core/model/UserAdminRole.java      | 16 --------------
 .../fortress/core/model/UserAudit.java          |  3 ---
 .../directory/fortress/core/model/UserRole.java | 22 +++++++++++++++-----
 15 files changed, 19 insertions(+), 80 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/Address.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Address.java b/src/main/java/org/apache/directory/fortress/core/model/Address.java
index 959061b..8d43257 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/Address.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Address.java
@@ -66,7 +66,7 @@ public class Address implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
-    @XmlElement(nillable = true)
+    //@XmlElement(nillable = true)
     private List<String> addresses;
     private String city;
     private String state;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/FortRequest.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/FortRequest.java b/src/main/java/org/apache/directory/fortress/core/model/FortRequest.java
index 3d8cd0b..ee7c3ac 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/FortRequest.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/FortRequest.java
@@ -42,17 +42,12 @@ import javax.xml.bind.annotation.*;
 })
 public class FortRequest
 {
-    @XmlElement(nillable = true)
     private FortEntity entity;
-    @XmlElement(nillable = true)
     private FortEntity entity2;
-    @XmlElement(nillable = true)
     private Session session;
     private String value;
-    @XmlElement(nillable = true)
     private Integer limit;
     private String contextId;
-    @XmlElement(nillable = true)
     private Boolean isReplace;
 
     public FortEntity getEntity()

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/FortResponse.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/FortResponse.java b/src/main/java/org/apache/directory/fortress/core/model/FortResponse.java
index e6769e2..bea185c 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/FortResponse.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/FortResponse.java
@@ -46,18 +46,12 @@ import java.util.Set;
 public class FortResponse
 {
     private int errorCode;
-    @XmlElement(nillable = true)
     private Boolean isAuthorized;
     private String errorMessage;
-    @XmlElement(nillable = true)
     private FortEntity entity;
-    @XmlElement(nillable = true)
     private List<FortEntity> entities;
-    @XmlElement(nillable = true)
     private List<String> values;
-    @XmlElement(nillable = true)
     private Set<String> valueSet;
-    @XmlElement(nillable = true)
     private Session session;
 
     public FortEntity getEntity()

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/Mod.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Mod.java b/src/main/java/org/apache/directory/fortress/core/model/Mod.java
index 558835c..e7ef9e7 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Mod.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Mod.java
@@ -22,7 +22,6 @@ package org.apache.directory.fortress.core.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import java.io.Serializable;
@@ -84,7 +83,6 @@ public class Mod extends FortEntity implements Serializable
     private String reqStart;
     private String reqEnd;
     private String reqType;
-    @XmlElement(nillable = true)
     private List<String> reqMod;
     private long sequenceId;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/OrgUnit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/OrgUnit.java b/src/main/java/org/apache/directory/fortress/core/model/OrgUnit.java
index 1d81a86..e76e68a 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/OrgUnit.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/OrgUnit.java
@@ -27,7 +27,6 @@ import java.util.UUID;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -182,11 +181,10 @@ public class OrgUnit extends FortEntity implements Graphable, Serializable
     private String description;
 
     /** The names of orgUnits that are parents (direct ascendants) of this orgUnit */
-    @XmlElement(nillable = true)
+    //@XmlElement(nillable = true)
     private Set<String> parents;
 
     /** The set of child orgUnit names (direct descendants) of this orgUnit */
-    @XmlElement(nillable = true)
     private Set<String> children;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/PermObj.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PermObj.java b/src/main/java/org/apache/directory/fortress/core/model/PermObj.java
index 27752bc..96178f0 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/PermObj.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PermObj.java
@@ -28,7 +28,6 @@ import java.util.UUID;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
@@ -145,9 +144,7 @@ public class PermObj extends FortEntity implements Serializable
     private String internalId;
     private String objName;
     private String description;
-    @XmlElement(nillable = true)
     private Props props = new Props();
-    //private Properties props;
     private String ou;
     private String type;
     @XmlTransient

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
index e791895..cba69c5 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
@@ -26,7 +26,6 @@ import java.util.UUID;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
@@ -109,7 +108,6 @@ public class PermissionAttribute extends FortEntity implements Serializable
     private String dataType;
     private String defaultValue;
     private String defaultStrategy;
-    @XmlElement( nillable = true )
     private List<String> validValues;
     @XmlTransient
     private String dn;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/PermissionAttributeSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PermissionAttributeSet.java
b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttributeSet.java
index 9d4835f..5fdd6b5 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/PermissionAttributeSet.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttributeSet.java
@@ -26,7 +26,6 @@ import java.util.UUID;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
@@ -109,7 +108,6 @@ public class PermissionAttributeSet extends FortEntity implements Serializable
     private static final long serialVersionUID = 1L;
 
     private String name;
-    @XmlElement( nillable = true )
     private Set<PermissionAttribute> attributes;
     private String internalId;
     private String description;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/PwPolicy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PwPolicy.java b/src/main/java/org/apache/directory/fortress/core/model/PwPolicy.java
index cd88887..a064bb3 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/PwPolicy.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PwPolicy.java
@@ -24,7 +24,6 @@ import java.io.Serializable;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -158,9 +157,7 @@ public class PwPolicy extends FortEntity implements Serializable
      * modifications to the password.  If this attribute is not present, 0
      * seconds is assumed.
      */
-    @XmlElement(nillable = true)
     private Integer minAge;
-    //private String minAge;
 
     /**
      * 5.2.3  pwdMaxAge
@@ -172,7 +169,6 @@ public class PwPolicy extends FortEntity implements Serializable
      * does not expire.  If not 0, the value must be greater than or equal
      * to the value of the pwdMinAge.
      */
-    @XmlElement(nillable = true)
     private Long maxAge;
 
     /**
@@ -185,7 +181,6 @@ public class PwPolicy extends FortEntity implements Serializable
      * passwords are not stored in the pwdHistory attribute and thus may be
      * reused.
      */
-    @XmlElement(nillable = true)
     private Short inHistory;
 
     /**
@@ -200,7 +195,6 @@ public class PwPolicy extends FortEntity implements Serializable
      * server will check the quality, and if the server is unable to verify
      * it, it will return an error refusing the password.
      */
-    @XmlElement(nillable = true)
     private Short checkQuality;
 
     /**
@@ -214,7 +208,6 @@ public class PwPolicy extends FortEntity implements Serializable
      * value of the pwdCheckQuality attribute, either accept the password
      * without checking it ('0' or '1') or refuse it ('2').
      */
-    @XmlElement(nillable = true)
     private Short minLength;
 
     /**
@@ -228,7 +221,6 @@ public class PwPolicy extends FortEntity implements Serializable
      * will be returned.  If not 0, the value must be smaller than the value
      * of the pwdMaxAge attribute.
      */
-    @XmlElement(nillable = true)
     private Long expireWarning;
 
     /**
@@ -238,7 +230,6 @@ public class PwPolicy extends FortEntity implements Serializable
      * be used to authenticate.  If this attribute is not present or if the
      * value is 0, authentication will fail.
      */
-    @XmlElement(nillable = true)
     private Short graceLoginLimit;
 
     /**
@@ -253,7 +244,6 @@ public class PwPolicy extends FortEntity implements Serializable
      * password may be used to authenticate when the number of failed bind
      * attempts has been reached.
      */
-    @XmlElement(nillable = true)
     private Boolean lockout;
 
     /**
@@ -265,7 +255,6 @@ public class PwPolicy extends FortEntity implements Serializable
      * cannot be used to authenticate until reset by a password
      * administrator.
      */
-    @XmlElement(nillable = true)
     private Integer lockoutDuration;
 
     /**
@@ -276,7 +265,6 @@ public class PwPolicy extends FortEntity implements Serializable
      * If this attribute is not present, or if the value is 0, this policy
      * is not checked, and the value of pwdLockout will be ignored.
      */
-    @XmlElement(nillable = true)
     private Short maxFailure;
 
     /**
@@ -289,7 +277,6 @@ public class PwPolicy extends FortEntity implements Serializable
      * If this attribute is not present, or if its value is 0, the failure
      * counter is only reset by a successful authentication.
      */
-    @XmlElement(nillable = true)
     private Short failureCountInterval;
 
     /**
@@ -304,7 +291,6 @@ public class PwPolicy extends FortEntity implements Serializable
      * due to any actions specified by this document, it is typically set by
      * a password administrator after resetting a user's password.
      */
-    @XmlElement(nillable = true)
     private Boolean mustChange;
 
     /**
@@ -316,7 +302,6 @@ public class PwPolicy extends FortEntity implements Serializable
      * assumed.  This attribute is intended to be used in the absence of an
      * access control mechanism.
      */
-    @XmlElement(nillable = true)
     private Boolean allowUserChange;
 
     /**
@@ -326,7 +311,6 @@ public class PwPolicy extends FortEntity implements Serializable
      * sent along with the new password when being changed.  If this
      * attribute is not present, a "FALSE" value is assumed.
      */
-    @XmlElement(nillable = true)
     private Boolean safeModify;
 
     /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/SDSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/SDSet.java b/src/main/java/org/apache/directory/fortress/core/model/SDSet.java
index 87dd7e5..b92e6dd 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/SDSet.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/SDSet.java
@@ -22,7 +22,6 @@ package org.apache.directory.fortress.core.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -145,7 +144,6 @@ public class SDSet extends FortEntity implements Serializable, Comparable<SDSet>
     private String name;
     private String description;
     private Integer cardinality;
-    @XmlElement(nillable = true)
     private Set<String> members;
     private SDType type;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/Session.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Session.java b/src/main/java/org/apache/directory/fortress/core/model/Session.java
index 8c69ca2..9fd1e57 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Session.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Session.java
@@ -21,7 +21,6 @@ package org.apache.directory.fortress.core.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -174,7 +173,6 @@ import java.util.UUID;
     "graceLogins",
     "message",
     "warnings"
-/*    "warningId"*/
 })
 public class Session  extends FortEntity implements PwMessage, Serializable
 {
@@ -184,14 +182,12 @@ public class Session  extends FortEntity implements PwMessage, Serializable
     private String sessionId;
     private long lastAccess;
     private int timeout;
-/*    private int warningId;*/
     private int errorId;
     private int graceLogins;
     private int expirationSeconds;
     private boolean isAuthenticated;
     private boolean isGroupSession;
     private String message;
-    @XmlElement(nillable = true)
     private List<Warning> warnings;
 
     /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/User.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/User.java b/src/main/java/org/apache/directory/fortress/core/model/User.java
index a2458b0..9aee894 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/User.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/User.java
@@ -29,7 +29,6 @@ import java.util.UUID;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
@@ -273,14 +272,10 @@ public class User extends FortEntity implements Constraint, Serializable
     private static final long serialVersionUID = 1L;
 
     private String userId;
-    @XmlElement(nillable = true)
     private char[] password;
-    @XmlElement(nillable = true)
     private char[] newPassword;
     private String internalId;
-    @XmlElement(nillable = true)
     private List<UserRole> roles;
-    @XmlElement(nillable = true)
     private List<UserAdminRole> adminRoles;
     private String pwPolicy;
     private String cn;
@@ -303,15 +298,10 @@ public class User extends FortEntity implements Constraint, Serializable
     private boolean reset;
     private boolean locked;
     private Boolean system;
-    @XmlElement(nillable = true)
     private Props props = new Props();
-    @XmlElement(nillable = true)
     private Address address;
-    @XmlElement(nillable = true)
     private List<String> phones;
-    @XmlElement(nillable = true)
     private List<String> mobiles;
-    @XmlElement(nillable = true)
     private List<String> emails;
     @XmlTransient
     private byte[] jpegPhoto;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
index 84e7d8d..e4c3201 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
@@ -25,7 +25,6 @@ import java.util.TreeSet;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -67,18 +66,6 @@ import org.apache.directory.fortress.core.util.Config;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-/*
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "userAdminRole", propOrder = {
-    "beginInclusive",
-    "beginRange",
-    "endInclusive",
-    "endRange",
-    "osP",
-    "osU",
-    "roleRangeRaw"
-})
-*/
 @XmlRootElement(name = "fortUserAdminRole")
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "userAdminRole", propOrder =
@@ -95,15 +82,12 @@ public class UserAdminRole extends UserRole implements Administrator
 {
     /** Default serialVersionUID */
     private static final long serialVersionUID = 1L;
-    @XmlElement(nillable = true)
     private Set<String> osPs;
-    @XmlElement(nillable = true)
     private Set<String> osUs;
     private String beginRange;
     private String endRange;
     private boolean beginInclusive;
     private boolean endInclusive;
-    @XmlElement(nillable = true)
     private Set<String> parents;
 
     // Used for formatting raw data:

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/UserAudit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserAudit.java b/src/main/java/org/apache/directory/fortress/core/model/UserAudit.java
index 2e067b4..69ae661 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserAudit.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserAudit.java
@@ -22,7 +22,6 @@ package org.apache.directory.fortress.core.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -74,9 +73,7 @@ public class UserAudit extends FortEntity implements java.io.Serializable
     private String opName;
     private String userId;
     private String internalUserId;
-    @XmlElement(nillable = true)
     private Date beginDate;
-    @XmlElement(nillable = true)
     private Date endDate;
     private String dn;
     private boolean admin = false;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a6a56e29/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
index 9dedd8f..486f00b 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
@@ -27,7 +27,6 @@ import java.util.Set;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
@@ -74,8 +73,23 @@ import org.apache.directory.fortress.core.util.Config;
  */
 @XmlRootElement( name = "fortUserRole" )
 @XmlAccessorType( XmlAccessType.FIELD )
-@XmlType( name = "userRole", propOrder = {"name", "userId", "isGroupRole", "parents", "beginDate",
"beginLockDate",
-        "beginTime", "dayMask", "endDate", "endLockDate", "endTime", "timeout", "roleConstraints"}
)
+@XmlType(
+    name = "userRole",
+    propOrder = {
+        "name",
+        "userId",
+        "isGroupRole",
+        "parents",
+        "beginDate",
+        "beginLockDate",
+        "beginTime",
+        "dayMask",
+        "endDate",
+        "endLockDate",
+        "endTime",
+        "timeout",
+        "roleConstraints"}
+)
 @XmlSeeAlso( {UserAdminRole.class} )
 public class UserRole extends FortEntity implements Serializable, Constraint
 {
@@ -92,9 +106,7 @@ public class UserRole extends FortEntity implements Serializable, Constraint
     private String beginLockDate;
     private String endLockDate;
     private String dayMask;
-    @XmlElement( nillable = true )
     private Set<String> parents;
-    @XmlElement( nillable = true )
     private List<RoleConstraint> roleConstraints;
 
     /**


Mime
View raw message