[jboss-cvs] JBossAS SVN: r86207 - in projects/microcontainer/trunk: aop-mc-int/src/test/java/org/jboss/test/aop/junit and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2009-03-23 10:18:48 -0400 (Mon, 23 Mar 2009)
New Revision: 86207

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java
   projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/aop/junit/SchemaPrinter.java
   projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/aop/junit/TestSchemaResolver.java
   projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyTest.java
   projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/ParentLastURLClassLoader.java
   projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/NullifyTestBean1.java
Log:
Source code tidyup

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java	2009-03-23 14:11:25 UTC (rev 86206)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java	2009-03-23 14:18:48 UTC (rev 86207)
@@ -25,12 +25,8 @@
 import org.jboss.aop.InstanceAdvisor;
 import org.jboss.aop.advice.GenericAspectFactory;
 import org.jboss.aop.joinpoint.Joinpoint;
-import org.jboss.beans.metadata.plugins.AbstractClassLoaderMetaData;
-import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
 import org.jboss.beans.metadata.plugins.factory.GenericBeanFactory;
-import org.jboss.beans.metadata.spi.ValueMetaData;
 import org.jboss.beans.metadata.spi.factory.BeanFactory;
-import org.jboss.kernel.plugins.config.Configurator;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
 import org.jboss.logging.Logger;

Modified: projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/aop/junit/SchemaPrinter.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/aop/junit/SchemaPrinter.java	2009-03-23 14:11:25 UTC (rev 86206)
+++ projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/aop/junit/SchemaPrinter.java	2009-03-23 14:18:48 UTC (rev 86207)
@@ -51,7 +51,7 @@
    @SuppressWarnings("unchecked")
    public static String printSchema(SchemaBinding schemaBinding)
    {
-      String nsURI = (String) schemaBinding.getNamespaces().iterator().next();
+      String nsURI = schemaBinding.getNamespaces().iterator().next();
       StringBuilder builder = new StringBuilder();
       builder.append("<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n");
       if (XMLConstants.NULL_NS_URI.equals(nsURI) == false)

Modified: projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/aop/junit/TestSchemaResolver.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/aop/junit/TestSchemaResolver.java	2009-03-23 14:11:25 UTC (rev 86206)
+++ projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/aop/junit/TestSchemaResolver.java	2009-03-23 14:18:48 UTC (rev 86207)
@@ -49,7 +49,7 @@
    public void addSchemaBinding(SchemaBinding schemaBinding)
    {
       schemaBinding.setSchemaResolver(this);
-      String nsURI = (String) schemaBinding.getNamespaces().iterator().next();
+      String nsURI = schemaBinding.getNamespaces().iterator().next();
       bindings.put(nsURI, schemaBinding);
       if (log.isTraceEnabled())
       {

Modified: projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyTest.java	2009-03-23 14:11:25 UTC (rev 86206)
+++ projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyTest.java	2009-03-23 14:18:48 UTC (rev 86207)
@@ -51,7 +51,6 @@
          {
             deploy(getFile1());
             
-            POJO dependency = (POJO)getBean("Dependency");
             DependencyFactoryAspect.invoked = null;
             POJO pojo = (POJO)getBean("Bean");
             int ret = pojo.method(2);
@@ -76,7 +75,7 @@
    {
       try
       {
-         Object o = getBean(name);
+         getBean(name);
          fail("Should not have found '" + name + "'");
       }
       catch (Exception expected)

Modified: projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/ParentLastURLClassLoader.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/ParentLastURLClassLoader.java	2009-03-23 14:11:25 UTC (rev 86206)
+++ projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/ParentLastURLClassLoader.java	2009-03-23 14:18:48 UTC (rev 86207)
@@ -26,7 +26,6 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.net.URLConnection;
 
 /**
  * 
@@ -77,7 +76,7 @@
       }
       String resourceName = name.replace('.', '/') + ".class";
       URL mine = delegate.findResource(resourceName);
-      URL parents = parent.getResource(resourceName);
+      parent.getResource(resourceName);
       if (mine == null || mine.equals(parent))
       {
          return delegate.loadClass(name);
@@ -92,7 +91,6 @@
    private byte[] loadBytes(String name, String resourceName)
    {
       InputStream in = delegate.getResourceAsStream(resourceName);
-      byte[] bytes = null;
       try
       {
          ByteArrayOutputStream baos = new ByteArrayOutputStream();

Modified: projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/NullifyTestBean1.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/NullifyTestBean1.java	2009-03-23 14:11:25 UTC (rev 86206)
+++ projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/NullifyTestBean1.java	2009-03-23 14:18:48 UTC (rev 86207)
@@ -27,6 +27,7 @@
 /**
  * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
  */
+ at SuppressWarnings("unchecked")
 public class NullifyTestBean1
 {
    public void setSomething(Set set)