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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Apr 15 06:45:03 2015
New Revision: 7483

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7483&view=rev
Log:
Stop using deprecated APIs

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/AbstractPersistentIdDataConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML2NameIDAttributeDefinition.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/IdPInitiatedSSORequestMessageDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/KeyAuthorityImpl.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/AbstractPersistentIdDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/AbstractPersistentIdDataConnector.java?rev=7483&r1=7482&r2=7483&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/AbstractPersistentIdDataConnector.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/AbstractPersistentIdDataConnector.java Wed Apr 15 06:45:03 2015
@@ -1,182 +1,182 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.attribute.resolver.impl;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.idp.attribute.StringAttributeValue;
-import net.shibboleth.idp.attribute.resolver.AbstractDataConnector;
-import net.shibboleth.idp.attribute.resolver.PluginDependencySupport;
-import net.shibboleth.idp.attribute.resolver.ResolverPluginDependency;
-import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The basis of a {@link net.shibboleth.idp.attribute.resolver.DataConnector} that handles persistent IDs that depend on
- * a source {@link IdPAttribute}.
- */
-public abstract class AbstractPersistentIdDataConnector extends AbstractDataConnector {
-
-    /** Class logger. */
-    @Nonnull private final Logger log = LoggerFactory.getLogger(AbstractPersistentIdDataConnector.class);
-
-    /** ID of the attribute generated by this data connector. */
-    @NonnullAfterInit private String generatedAttribute;
-
-    /** ID of the attribute whose first value is used when generating the computed ID. */
-    @NonnullAfterInit private String sourceAttribute;
-
-    /**
-     * Get the ID of the attribute whose first value is used when generating the computed ID.
-     * 
-     * @return ID of the attribute whose first value is used when generating the computed ID
-     */
-    @NonnullAfterInit public String getSourceAttributeId() {
-        return sourceAttribute;
-    }
-
-    /**
-     * Set the ID of the attribute whose first value is used when generating the computed ID.
-     * 
-     * @param newAttributeId what to set.
-     */
-    public void setSourceAttributeId(@Nullable String newAttributeId) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        sourceAttribute = StringSupport.trimOrNull(newAttributeId);
-    }
-
-    /**
-     * Get the ID of the attribute generated by this connector.
-     * 
-     * @return ID of the attribute generated by this connector
-     */
-    @NonnullAfterInit public String getGeneratedAttributeId() {
-        return generatedAttribute;
-    }
-
-    /**

[... 1794 lines stripped ...]