From 22068e325abbbb3339b31e15069f957c7e5d2225 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 23 Oct 2009 07:30:25 +0000 Subject: [PATCH] * fixed some Findbugs / Checkstyle issues * introduced helper methods to minimize necessary @@SuppressWarnings("unchecked")@ scope git-svn-id: svn+ssh://svn.synyx.de/var/svn/synyx/opensource/hera/trunk@7555 5a64d73e-33d6-4ccc-9058-23f8668ecac9 --- .../synyx/hera/core/OrderAwarePluginRegistry.java | 5 ++--- .../org/synyx/hera/core/SimplePluginRegistry.java | 12 ++++++------ .../hera/core/config/PluginListDefinitionParser.java | 6 +++--- .../synyx/hera/core/support/BeanListFactoryBean.java | 7 ++++--- .../hera/core/support/PluginRegistryFactoryBean.java | 2 +- .../core/support/BeanListFactoryBeanUnitTest.java | 11 +++++++++-- .../org/synyx/hera/metadata/MetadataProvider.java | 2 +- 7 files changed, 26 insertions(+), 19 deletions(-) diff --git a/core/src/main/java/org/synyx/hera/core/OrderAwarePluginRegistry.java b/core/src/main/java/org/synyx/hera/core/OrderAwarePluginRegistry.java index b8d984e..b6803c0 100644 --- a/core/src/main/java/org/synyx/hera/core/OrderAwarePluginRegistry.java +++ b/core/src/main/java/org/synyx/hera/core/OrderAwarePluginRegistry.java @@ -4,14 +4,13 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.springframework.core.Ordered; import org.springframework.core.annotation.AnnotationAwareOrderComparator; -import org.springframework.core.annotation.Order; /** * {@link PluginRegistry} implementation that can handle {@link Plugin}s using - * the {@link Ordered} interface or {@link Order} annotation. + * the {@link org.springframework.core.Ordered} interface or + * {@link org.springframework.core.annotation.Order} annotation. * * @author Oliver Gierke - gierke@synyx.de */ diff --git a/core/src/main/java/org/synyx/hera/core/SimplePluginRegistry.java b/core/src/main/java/org/synyx/hera/core/SimplePluginRegistry.java index bf9dbe5..052b438 100644 --- a/core/src/main/java/org/synyx/hera/core/SimplePluginRegistry.java +++ b/core/src/main/java/org/synyx/hera/core/SimplePluginRegistry.java @@ -118,10 +118,10 @@ public class SimplePluginRegistry, S> implements */ public T getPluginFor(S delimiter) { - List plugins = getPluginsFor(delimiter); + List result = getPluginsFor(delimiter); - if (0 < plugins.size()) { - return plugins.get(0); + if (0 < result.size()) { + return result.get(0); } return null; @@ -172,13 +172,13 @@ public class SimplePluginRegistry, S> implements public List getPluginsFor(S delimiter, E ex) throws E { - List plugins = getPluginsFor(delimiter); + List result = getPluginsFor(delimiter); - if (0 == plugins.size()) { + if (0 == result.size()) { throw ex; } - return plugins; + return result; } diff --git a/core/src/main/java/org/synyx/hera/core/config/PluginListDefinitionParser.java b/core/src/main/java/org/synyx/hera/core/config/PluginListDefinitionParser.java index ee9b2c3..a98bbc2 100644 --- a/core/src/main/java/org/synyx/hera/core/config/PluginListDefinitionParser.java +++ b/core/src/main/java/org/synyx/hera/core/config/PluginListDefinitionParser.java @@ -15,7 +15,6 @@ */ package org.synyx.hera.core.config; -import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; @@ -35,8 +34,9 @@ public class PluginListDefinitionParser extends AbstractBeanDefinitionParser { /** - * Returns the name of the {@link BeanFactoryPostProcessor} to be - * registered. + * Returns the name of the + * {@link org.springframework.beans.factory.config.BeanFactoryPostProcessor} + * to be registered. * * @return */ diff --git a/core/src/main/java/org/synyx/hera/core/support/BeanListFactoryBean.java b/core/src/main/java/org/synyx/hera/core/support/BeanListFactoryBean.java index 21a468a..2d4d5db 100644 --- a/core/src/main/java/org/synyx/hera/core/support/BeanListFactoryBean.java +++ b/core/src/main/java/org/synyx/hera/core/support/BeanListFactoryBean.java @@ -20,19 +20,20 @@ import java.util.Comparator; import java.util.List; import org.springframework.beans.factory.FactoryBean; -import org.springframework.context.ApplicationContext; import org.springframework.core.annotation.AnnotationAwareOrderComparator; /** * Factory to create bean lists for a given type. Exposes all beans of the - * configured type that can be found in the {@link ApplicationContext}. + * configured type that can be found in the + * {@link org.springframework.context.ApplicationContext}. * * @author Oliver Gierke - gierke@synyx.de */ public class BeanListFactoryBean extends AbstractTypeAwareSupport implements FactoryBean { + @SuppressWarnings("unchecked") private static final Comparator COMPARATOR = new AnnotationAwareOrderComparator(); @@ -42,7 +43,7 @@ public class BeanListFactoryBean extends AbstractTypeAwareSupport * * @see org.springframework.beans.factory.FactoryBean#getObject() */ - public Object getObject() throws Exception { + public Object getObject() { List beans = getBeans(); Collections.sort(beans, COMPARATOR); diff --git a/core/src/main/java/org/synyx/hera/core/support/PluginRegistryFactoryBean.java b/core/src/main/java/org/synyx/hera/core/support/PluginRegistryFactoryBean.java index aced105..5c506ff 100644 --- a/core/src/main/java/org/synyx/hera/core/support/PluginRegistryFactoryBean.java +++ b/core/src/main/java/org/synyx/hera/core/support/PluginRegistryFactoryBean.java @@ -35,7 +35,7 @@ public class PluginRegistryFactoryBean, S> extends * * @see org.springframework.beans.factory.FactoryBean#getObject() */ - public Object getObject() throws Exception { + public Object getObject() { return OrderAwarePluginRegistry.create(getBeans()); } diff --git a/core/src/test/java/org/synyx/hera/core/support/BeanListFactoryBeanUnitTest.java b/core/src/test/java/org/synyx/hera/core/support/BeanListFactoryBeanUnitTest.java index 2018cc3..17ac8f6 100644 --- a/core/src/test/java/org/synyx/hera/core/support/BeanListFactoryBeanUnitTest.java +++ b/core/src/test/java/org/synyx/hera/core/support/BeanListFactoryBeanUnitTest.java @@ -53,7 +53,7 @@ public class BeanListFactoryBeanUnitTest { Object result = factory.getObject(); assertTrue(result instanceof List); - List members = (List) result; + List members = type(result); assertEquals(0, members.indexOf(second)); assertEquals(1, members.indexOf(first)); @@ -70,11 +70,18 @@ public class BeanListFactoryBeanUnitTest { Object result = factory.getObject(); assertTrue(result instanceof List); - List members = (List) result; + List members = type(result); assertTrue(members.isEmpty()); } + @SuppressWarnings("unchecked") + private List type(Object list) { + + return (List) list; + } + + /** * Returns an {@link Ordered} with the given order. * diff --git a/metadata/src/main/java/org/synyx/hera/metadata/MetadataProvider.java b/metadata/src/main/java/org/synyx/hera/metadata/MetadataProvider.java index 636b36f..ea1ae3c 100644 --- a/metadata/src/main/java/org/synyx/hera/metadata/MetadataProvider.java +++ b/metadata/src/main/java/org/synyx/hera/metadata/MetadataProvider.java @@ -28,5 +28,5 @@ public interface MetadataProvider { * * @return the plugins metadata */ - public PluginMetadata getMetadata(); + PluginMetadata getMetadata(); }