[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/reso...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Apr 29 07:12:21 2013
New Revision: 4428

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4428&view=rev
Log:
Coding guidelines - Add missing annotations to the computed and Stored Dataconnectots

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseComputedIDDataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/PersistentIdEntry.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIDDataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIDStore.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseComputedIDDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseComputedIDDataConnector.java?rev=4428&r1=4427&r2=4428&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseComputedIDDataConnector.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/BaseComputedIDDataConnector.java Mon Apr 29 07:12:21 2013
@@ -33,6 +33,7 @@
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.BaseDataConnector;
 import net.shibboleth.idp.attribute.resolver.ResolvedAttributeDefinition;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.codec.Base64Support;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -67,7 +68,7 @@
      * 
      * @return salt used when computing the ID
      */
-    public byte[] getSalt() {
+    @Nullable public byte[] getSalt() {
         return salt;
     }
 
@@ -76,7 +77,7 @@
      * 
      * @param newValue used when computing the ID
      */
-    public void setSalt(byte[] newValue) {
+    public void setSalt(@Nullable byte[] newValue) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         salt = newValue;
     }
@@ -86,7 +87,7 @@
      * 
      * @return ID of the attribute whose first value is used when generating the computed ID
      */
-    public String getSourceAttributeId() {
+    @Nullable @NonnullAfterInit public String getSourceAttributeId() {
         return sourceAttribute;
     }
 
@@ -95,9 +96,9 @@
      * 
      * @param newAttributeId what to set.
      */
-    public void setSourceAttributeId(String newAttributeId) {
+    public void setSourceAttributeId(@Nullable String newAttributeId) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        sourceAttribute = newAttributeId;
+        sourceAttribute = StringSupport.trimOrNull(newAttributeId);
     }
 
     /**
@@ -105,7 +106,7 @@
      * 
      * @return ID of the attribute generated by this connector
      */
-    public String getGeneratedAttributeId() {
+    @Nullable @NonnullAfterInit public String getGeneratedAttributeId() {
         return generatedAttribute;
     }
 
@@ -114,7 +115,7 @@
      * 
      * @param newAttributeId what to set.
      */
-    public void setGeneratedAttributeId(String newAttributeId) {
+    public void setGeneratedAttributeId(@Nullable String newAttributeId) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         generatedAttribute = newAttributeId;
     }

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/PersistentIdEntry.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/PersistentIdEntry.java?rev=4428&r1=4427&r2=4428&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/PersistentIdEntry.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/PersistentIdEntry.java Mon Apr 29 07:12:21 2013
@@ -20,7 +20,9 @@
 import java.io.Serializable;
 import java.sql.Timestamp;
 
-/** Data object representing a persistent identifier entry in the persisten storage. */
+import javax.annotation.Nullable;
+
+/** Data object representing a persistent identifier entry in the persistent storage. */
 public class PersistentIdEntry implements Serializable {
 
     /** Serial version UID . */
@@ -77,7 +79,7 @@
      * 
      * @return ID of the entity to which the identifier was issued
      */

[... 301 lines stripped ...]