[java-identity-provider COMMIT] in /trunk/idp-core/src/test: java/net/shibboleth/idp/spring/naturestudy/NamespaceHand...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Mar  3 06:57:34 2014
New Revision: 5510

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5510&view=rev
Log:
IDP-227 more nature study, revolving around our desire to keep the MetadatProviderService separate from the RelyingPartyService, but not making the latter pay the significant cost of initializing and summoning up the metadata.

Added:
    trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/TheInterface.java   (with props)
    trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/TheSecondBean.java   (with props)
    trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/TheSecondBeanParser.java   (with props)
    trunk/idp-core/src/test/resources/net/shibboleth/idp/spring/naturestudy/MultipleBeans.xml   (with props)
Modified:
    trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/NamespaceHandler.java
    trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/TheBeanParser.java
    trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/TheBeanTest.java
    trunk/idp-core/src/test/resources/schema/nature-study.xsd

Modified: trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/NamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/NamespaceHandler.java?rev=5510&r1=5509&r2=5510&view=diff
==============================================================================
--- trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/NamespaceHandler.java (original)
+++ trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/NamespaceHandler.java Mon Mar  3 06:57:34 2014
@@ -28,13 +28,14 @@
     public static final String NAMESPACE = "urn:mace:shibboleth:2.0:naturestudy";
 
     /** {@inheritDoc} */
+    @Override
     public void init() {
         registerBeanDefinitionParser(TheBeanParser.SCHEMA_TYPE,
                 new TheBeanParser());
         registerBeanDefinitionParser(TheBeanParser2.SCHEMA_TYPE,
                 new TheBeanParser2());
-
-
+        registerBeanDefinitionParser(TheSecondBeanParser.SCHEMA_TYPE,
+                new TheSecondBeanParser());
     }
 
 }

Modified: trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/TheBeanParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/TheBeanParser.java?rev=5510&r1=5509&r2=5510&view=diff
==============================================================================
--- trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/TheBeanParser.java (original)
+++ trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/TheBeanParser.java Mon Mar  3 06:57:34 2014
@@ -31,26 +31,24 @@
 /**
  *
  */
-public class TheBeanParser extends AbstractSingleBeanDefinitionParser  {
+public class TheBeanParser extends AbstractSingleBeanDefinitionParser {
 
     public static final QName SCHEMA_TYPE = new QName(NamespaceHandler.NAMESPACE, "NatureStudy");
 
     /** {@inheritDoc} */
-    protected Class<TheBeanFactoryBean> getBeanClass(@Nullable Element element) {
+    @Override protected Class<TheBeanFactoryBean> getBeanClass(@Nullable Element element) {
         return TheBeanFactoryBean.class;
     }
 
     /** {@inheritDoc} */
-    protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
+    @Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
             @Nonnull final BeanDefinitionBuilder builder) {
         final String message = StringSupport.trimOrNull(config.getAttributeNS(null, "theMessage"));
         builder.addPropertyValue("message", message);
     }
 
     /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
+    @Override protected boolean shouldGenerateId() {
         return true;
     }
-
-
 }

Modified: trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/TheBeanTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/TheBeanTest.java?rev=5510&r1=5509&r2=5510&view=diff
==============================================================================
--- trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/TheBeanTest.java (original)
+++ trunk/idp-core/src/test/java/net/shibboleth/idp/spring/naturestudy/TheBeanTest.java Mon Mar  3 06:57:34 2014
@@ -28,10 +28,10 @@
 import org.testng.annotations.Test;
 
 /**
- *  How many ways can we do substitution?
+ * How many ways can we do substitution?
  */
 public class TheBeanTest {
-    
+
     private TheBean getBeanNative(String fileName) {
         final GenericApplicationContext context = new GenericApplicationContext();
         SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
@@ -40,81 +40,149 @@
         beanDefinitionReader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);

[... 189 lines stripped ...]