From 1dfe235a87dc769314195ab0d9f5c8f13990d9ed Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 22 Oct 2013 14:00:15 +0200 Subject: [PATCH] DATACMNS-90 - Polishing. Added missing author tags where needed. Removed the template method to pick up the configuration from the RepositoryConfigurationSource interface as it's not needed from the outside. Original pull request: #50. --- .../AnnotationRepositoryConfigurationSource.java | 8 +++++--- .../config/RepositoryConfigurationSource.java | 5 ----- .../RepositoryConfigurationSourceSupport.java | 13 +++++++++---- .../config/XmlRepositoryConfigurationSource.java | 5 +++-- ...ationRepositoryConfigurationSourceUnitTests.java | 10 +++++----- ...pulatorBeanDefinitionParserIntegrationTests.java | 5 +++-- 6 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java b/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java index dee86ba63..04c34da14 100644 --- a/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java +++ b/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java @@ -39,6 +39,7 @@ import org.springframework.util.StringUtils; * Annotation based {@link RepositoryConfigurationSource}. * * @author Oliver Gierke + * @author Thomas Darimont */ public class AnnotationRepositoryConfigurationSource extends RepositoryConfigurationSourceSupport { @@ -224,11 +225,12 @@ public class AnnotationRepositoryConfigurationSource extends RepositoryConfigura return typeFilters; } - /* (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationSourceSupport#isConsideringNestedRepositoriesEnabled() + /* + * (non-Javadoc) + * @see org.springframework.data.repository.config.RepositoryConfigurationSourceSupport#shouldConsiderNestedRepositories() */ @Override - public boolean isConsideringNestedRepositoriesEnabled() { + public boolean shouldConsiderNestedRepositories() { return attributes.getBoolean(CONSIDER_NESTED_REPOSITORIES); } } diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSource.java b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSource.java index 67fad5450..2e0bbfc49 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSource.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSource.java @@ -77,9 +77,4 @@ public interface RepositoryConfigurationSource { * @return */ Collection getCandidates(ResourceLoader loader); - - /** - * @return true if the container should look for nested repository interface definitions. - */ - boolean isConsideringNestedRepositoriesEnabled(); } diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSourceSupport.java b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSourceSupport.java index d0768aa7f..b398763e7 100644 --- a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSourceSupport.java +++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSourceSupport.java @@ -30,6 +30,7 @@ import org.springframework.core.type.filter.TypeFilter; * Base class to implement {@link RepositoryConfigurationSource}s. * * @author Oliver Gierke + * @author Thomas Darimont */ public abstract class RepositoryConfigurationSourceSupport implements RepositoryConfigurationSource { @@ -54,7 +55,7 @@ public abstract class RepositoryConfigurationSourceSupport implements Repository public Collection getCandidates(ResourceLoader loader) { RepositoryComponentProvider scanner = new RepositoryComponentProvider(getIncludeFilters()); - scanner.setConsiderNestedRepositoryInterfaces(isConsideringNestedRepositoriesEnabled()); + scanner.setConsiderNestedRepositoryInterfaces(shouldConsiderNestedRepositories()); scanner.setResourceLoader(loader); scanner.setEnvironment(environment); @@ -95,8 +96,12 @@ public abstract class RepositoryConfigurationSourceSupport implements Repository } /** - * Controls whether nested repository-interfaces (e.g. defined as inner classes) should be considered by the - * repository infrastructure. + * Returns whether we should consider nested repositories, i.e. repository interface definitions nested in other + * classes. + * + * @return {@literal true} if the container should look for nested repository interface definitions. */ - public abstract boolean isConsideringNestedRepositoriesEnabled(); + public boolean shouldConsiderNestedRepositories() { + return false; + } } diff --git a/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java b/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java index 7c9bc9224..5240dfe01 100644 --- a/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java +++ b/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java @@ -151,11 +151,12 @@ public class XmlRepositoryConfigurationSource extends RepositoryConfigurationSou return StringUtils.hasText(attribute) ? attribute : null; } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see org.springframework.data.repository.config.RepositoryConfigurationSourceSupport#isConsideringNestedRepositoriesEnabled() */ @Override - public boolean isConsideringNestedRepositoriesEnabled() { + public boolean shouldConsiderNestedRepositories() { String attribute = getNullDefaultedAttribute(element, CONSIDER_NESTED_REPOSITORIES); return attribute != null && Boolean.parseBoolean(attribute); diff --git a/src/test/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSourceUnitTests.java b/src/test/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSourceUnitTests.java index 5e6681b4e..6bae75367 100644 --- a/src/test/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSourceUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSourceUnitTests.java @@ -66,19 +66,19 @@ public class AnnotationRepositoryConfigurationSourceUnitTests { public void defaultsToPackageOfAnnotatedClass() { AnnotationMetadata metadata = new StandardAnnotationMetadata(DefaultConfiguration.class); - RepositoryConfigurationSource source = new AnnotationRepositoryConfigurationSource(metadata, + AnnotationRepositoryConfigurationSource source = new AnnotationRepositoryConfigurationSource(metadata, EnableRepositories.class, environment); Iterable packages = source.getBasePackages(); assertThat(packages, hasItem(DefaultConfiguration.class.getPackage().getName())); - assertThat(source.isConsideringNestedRepositoriesEnabled(), is(false)); + assertThat(source.shouldConsiderNestedRepositories(), is(false)); } @Test public void returnsConfiguredBasePackage() { AnnotationMetadata metadata = new StandardAnnotationMetadata(DefaultConfigurationWithBasePackage.class); - RepositoryConfigurationSource source = new AnnotationRepositoryConfigurationSource(metadata, + AnnotationRepositoryConfigurationSource source = new AnnotationRepositoryConfigurationSource(metadata, EnableRepositories.class, environment); Iterable packages = source.getBasePackages(); @@ -92,10 +92,10 @@ public class AnnotationRepositoryConfigurationSourceUnitTests { public void returnsConsiderNestedRepositories() { AnnotationMetadata metadata = new StandardAnnotationMetadata(DefaultConfigurationWithNestedRepositories.class); - RepositoryConfigurationSource source = new AnnotationRepositoryConfigurationSource(metadata, + AnnotationRepositoryConfigurationSource source = new AnnotationRepositoryConfigurationSource(metadata, EnableRepositories.class, environment); - assertThat(source.isConsideringNestedRepositoriesEnabled(), is(true)); + assertThat(source.shouldConsiderNestedRepositories(), is(true)); } public static class Person {} diff --git a/src/test/java/org/springframework/data/repository/config/ResourceReaderRepositoryPopulatorBeanDefinitionParserIntegrationTests.java b/src/test/java/org/springframework/data/repository/config/ResourceReaderRepositoryPopulatorBeanDefinitionParserIntegrationTests.java index 40c459a1b..c49481bb5 100644 --- a/src/test/java/org/springframework/data/repository/config/ResourceReaderRepositoryPopulatorBeanDefinitionParserIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/config/ResourceReaderRepositoryPopulatorBeanDefinitionParserIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 the original author or authors. + * Copyright 2012-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,9 +33,10 @@ import org.springframework.oxm.jaxb.Jaxb2Marshaller; import org.springframework.test.util.ReflectionTestUtils; /** - * Integration tests for the initializer name-space elements. + * Integration tests for the initializer namespace elements. * * @author Oliver Gierke + * @author Thomas Darimont */ public class ResourceReaderRepositoryPopulatorBeanDefinitionParserIntegrationTests {