Weld SVN: r6403 - extensions/trunk/src/main/java/org/jboss/weld/extensions/util/properties/query.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-06-03 23:14:47 -0400 (Thu, 03 Jun 2010)
New Revision: 6403
Modified:
extensions/trunk/src/main/java/org/jboss/weld/extensions/util/properties/query/PropertyQueries.java
Log:
minor
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/util/properties/query/PropertyQueries.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/util/properties/query/PropertyQueries.java 2010-06-04 02:13:58 UTC (rev 6402)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/util/properties/query/PropertyQueries.java 2010-06-04 03:14:47 UTC (rev 6403)
@@ -12,7 +12,7 @@
* @param targetClass
* @return
*/
- public static <V> PropertyQuery<V> createPropertyQuery(Class<?> targetClass)
+ public static <V> PropertyQuery<V> createQuery(Class<?> targetClass)
{
return new PropertyQuery<V>(targetClass);
}
13 years, 11 months
Weld SVN: r6402 - extensions/trunk/src/main/java/org/jboss/weld/extensions/util/properties/query.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-06-03 22:13:58 -0400 (Thu, 03 Jun 2010)
New Revision: 6402
Modified:
extensions/trunk/src/main/java/org/jboss/weld/extensions/util/properties/query/NamedPropertyCriteria.java
Log:
support for multiple possible property names
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/util/properties/query/NamedPropertyCriteria.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/util/properties/query/NamedPropertyCriteria.java 2010-06-03 15:56:17 UTC (rev 6401)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/util/properties/query/NamedPropertyCriteria.java 2010-06-04 02:13:58 UTC (rev 6402)
@@ -11,21 +11,30 @@
*/
public class NamedPropertyCriteria implements PropertyCriteria
{
- private final String propertyName;
+ private final String[] propertyNames;
- public NamedPropertyCriteria(String propertyName)
+ public NamedPropertyCriteria(String... propertyNames)
{
- this.propertyName = propertyName;
+ this.propertyNames = propertyNames;
}
public boolean fieldMatches(Field f)
{
- return propertyName.equals(f.getName());
+ for (String propertyName : propertyNames)
+ {
+ if (propertyName.equals(f.getName())) return true;
+ }
+ return false;
}
public boolean methodMatches(Method m)
{
- return m.getName().startsWith("get") &&
- Introspector.decapitalize(m.getName().substring(3)).equals(propertyName);
+ for (String propertyName : propertyNames)
+ {
+ if (m.getName().startsWith("get") &&
+ Introspector.decapitalize(m.getName().substring(3)).equals(propertyName)) return true;
+
+ }
+ return false;
}
}
13 years, 11 months
Weld SVN: r6401 - build/trunk/parent.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-03 11:56:17 -0400 (Thu, 03 Jun 2010)
New Revision: 6401
Modified:
build/trunk/parent/pom.xml
Log:
default findbugs config
Modified: build/trunk/parent/pom.xml
===================================================================
--- build/trunk/parent/pom.xml 2010-06-03 15:26:06 UTC (rev 6400)
+++ build/trunk/parent/pom.xml 2010-06-03 15:56:17 UTC (rev 6401)
@@ -550,10 +550,23 @@
<version>1.3</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ <xmlOutput>true</xmlOutput>
+ <failOnError>false</failOnError>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
13 years, 11 months
Weld SVN: r6400 - core/trunk/impl.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-03 11:26:06 -0400 (Thu, 03 Jun 2010)
New Revision: 6400
Modified:
core/trunk/impl/pom.xml
Log:
don't fail the build
Modified: core/trunk/impl/pom.xml
===================================================================
--- core/trunk/impl/pom.xml 2010-06-03 14:30:31 UTC (rev 6399)
+++ core/trunk/impl/pom.xml 2010-06-03 15:26:06 UTC (rev 6400)
@@ -202,8 +202,9 @@
</dependencies>
<configuration>
<effort>Max</effort>
- <threshold>Default</threshold>
+ <threshold>Low</threshold>
<xmlOutput>true</xmlOutput>
+ <failOnError>false</failOnError>
</configuration>
<executions>
<execution>
13 years, 11 months
Weld SVN: r6399 - core/trunk/impl.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-03 10:30:31 -0400 (Thu, 03 Jun 2010)
New Revision: 6399
Modified:
core/trunk/impl/pom.xml
Log:
move findbugs to a profile
Modified: core/trunk/impl/pom.xml
===================================================================
--- core/trunk/impl/pom.xml 2010-06-03 14:26:51 UTC (rev 6398)
+++ core/trunk/impl/pom.xml 2010-06-03 14:30:31 UTC (rev 6399)
@@ -168,31 +168,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.1</version>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <effort>Max</effort>
- <threshold>Default</threshold>
- <xmlOutput>true</xmlOutput>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -210,6 +185,37 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>findbugs</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <effort>Max</effort>
+ <threshold>Default</threshold>
+ <xmlOutput>true</xmlOutput>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<scm>
13 years, 11 months
Weld SVN: r6398 - in core/trunk/impl/src/main/java/org/jboss/weld: context and 2 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-03 10:26:51 -0400 (Thu, 03 Jun 2010)
New Revision: 6398
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
core/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java
core/trunk/impl/src/main/java/org/jboss/weld/context/SerializableContextualImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/serialization/ContextualStoreImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/util/serviceProvider/DefaultServiceLoader.java
Log:
various fixes
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2010-06-03 14:25:11 UTC (rev 6397)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2010-06-03 14:26:51 UTC (rev 6398)
@@ -335,14 +335,17 @@
public BeanManagerImpl getManager(BeanDeploymentArchive beanDeploymentArchive)
{
- if (beanDeployments.containsKey(beanDeploymentArchive))
+ synchronized (this)
{
- return beanDeployments.get(beanDeploymentArchive).getBeanManager();
+ if (beanDeployments.containsKey(beanDeploymentArchive))
+ {
+ return beanDeployments.get(beanDeploymentArchive).getBeanManager();
+ }
+ else
+ {
+ return null;
+ }
}
- else
- {
- return null;
- }
}
public Bootstrap startInitialization()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java 2010-06-03 14:25:11 UTC (rev 6397)
+++ core/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java 2010-06-03 14:26:51 UTC (rev 6398)
@@ -38,6 +38,8 @@
import org.jboss.weld.serialization.spi.ContextualStore;
import org.slf4j.cal10n.LocLogger;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* Base for the Context implementations. Delegates calls to the abstract
* getBeanStorage and getActive to allow for different implementations (storage
@@ -75,6 +77,7 @@
*
* @see javax.enterprise.context.spi.Context#get(BaseBean, boolean)
*/
+ @SuppressWarnings(value="UL_UNRELEASED_LOCK", justification="False positive from FindBugs")
public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext)
{
if (!isActive())
@@ -102,6 +105,7 @@
{
if (needCreationLock)
{
+
creationLock.lock();
beanInstance = getBeanStore().get(id);
if (beanInstance != null)
Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/SerializableContextualImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/context/SerializableContextualImpl.java 2010-06-03 14:25:11 UTC (rev 6397)
+++ core/trunk/impl/src/main/java/org/jboss/weld/context/SerializableContextualImpl.java 2010-06-03 14:26:51 UTC (rev 6398)
@@ -24,6 +24,8 @@
import org.jboss.weld.serialization.spi.ContextualStore;
import org.jboss.weld.serialization.spi.helpers.SerializableContextual;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* A serializable version of contextual that knows how to restore the
* original bean if necessary
@@ -44,7 +46,7 @@
// A directly serializable contextual
private C serialiazable;
-
+ @SuppressWarnings(value="SE_TRANSIENT_FIELD_NOT_RESTORED", justification="A cache which is lazily loaded")
// A cached, transient version of the contextual
private transient C cached;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/serialization/ContextualStoreImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/serialization/ContextualStoreImpl.java 2010-06-03 14:25:11 UTC (rev 6397)
+++ core/trunk/impl/src/main/java/org/jboss/weld/serialization/ContextualStoreImpl.java 2010-06-03 14:26:51 UTC (rev 6398)
@@ -24,35 +24,35 @@
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.PassivationCapable;
+import org.jboss.weld.context.SerializableContextualImpl;
+import org.jboss.weld.context.SerializableContextualInstanceImpl;
+import org.jboss.weld.serialization.spi.ContextualStore;
+import org.jboss.weld.serialization.spi.helpers.SerializableContextual;
+import org.jboss.weld.serialization.spi.helpers.SerializableContextualInstance;
+
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.Maps;
-import org.jboss.weld.serialization.spi.ContextualStore;
-import org.jboss.weld.serialization.spi.helpers.SerializableContextual;
-import org.jboss.weld.serialization.spi.helpers.SerializableContextualInstance;
-import org.jboss.weld.context.SerializableContextualImpl;
-import org.jboss.weld.context.SerializableContextualInstanceImpl;
-
/**
* Implementation of {@link org.jboss.weld.serialization.spi.ContextualStore}
- *
+ *
* @author Pete Muir
- *
+ *
*/
public class ContextualStoreImpl implements ContextualStore
{
-
+
private static final String GENERATED_ID_PREFIX = ContextualStoreImpl.class.getName();
-
+
// The map containing container-local contextuals
private final BiMap<Contextual<?>, String> contextuals;
-
+
// The map containing passivation capable contextuals
private final ConcurrentMap<String, Contextual<?>> passivationCapableContextuals;
-
+
private final AtomicInteger idGenerator;
-
+
public ContextualStoreImpl()
{
this.idGenerator = new AtomicInteger(0);
@@ -82,15 +82,16 @@
return (C) passivationCapableContextuals.get(id);
}
}
-
+
/**
- * Add a contextual (if not already present) to the store, and return
- * it's id. If the contextual is passivation capable, it's id will
- * be used, otherwise an id will be generated
+ * Add a contextual (if not already present) to the store, and return it's
+ * id. If the contextual is passivation capable, it's id will be used,
+ * otherwise an id will be generated
*
* @param contextual the contexutal to add
* @return the current id for the contextual
*/
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="RV_RETURN_VALUE_OF_PUTIFABSENT_IGNORED", justification="Using non-standard semantics of putIfAbsent")
public String putIfAbsent(Contextual<?> contextual)
{
if (contextual instanceof PassivationCapable)
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/serviceProvider/DefaultServiceLoader.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/serviceProvider/DefaultServiceLoader.java 2010-06-03 14:25:11 UTC (rev 6397)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/serviceProvider/DefaultServiceLoader.java 2010-06-03 14:26:51 UTC (rev 6398)
@@ -26,7 +26,6 @@
import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.Collections;
@@ -190,11 +189,10 @@
private void loadServiceFile(URL serviceFile)
{
- InputStream is = null;
+ BufferedReader reader = null;
try
{
- is = serviceFile.openStream();
- BufferedReader reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+ reader = new BufferedReader(new InputStreamReader(serviceFile.openStream(), "UTF-8"));
String serviceClassName = null;
while ((serviceClassName = reader.readLine()) != null)
{
@@ -212,11 +210,11 @@
}
finally
{
- if (is != null)
+ if (reader != null)
{
try
{
- is.close();
+ reader.close();
}
catch (IOException e)
{
13 years, 11 months
Weld SVN: r6396 - extensions/trunk/src/main/java/org/jboss/weld/extensions/bean.
by weld-commits＠lists.jboss.org
Author: swd847
Date: 2010-06-03 09:54:00 -0400 (Thu, 03 Jun 2010)
New Revision: 6396
Modified:
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/BeanImpl.java
Log:
#WELDX-107
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/BeanImpl.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/BeanImpl.java 2010-06-03 13:44:32 UTC (rev 6395)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/BeanImpl.java 2010-06-03 13:54:00 UTC (rev 6396)
@@ -34,7 +34,7 @@
*
* @param <T>
*/
-class BeanImpl<T> implements Bean<T>
+public class BeanImpl<T> implements Bean<T>
{
private final Class<?> beanClass;
private final InjectionTarget<T> injectionTarget;
13 years, 11 months
Weld SVN: r6395 - in core/trunk/impl: src/main/java/org/jboss/weld/bean/builtin and 8 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-03 09:44:32 -0400 (Thu, 03 Jun 2010)
New Revision: 6395
Modified:
core/trunk/impl/pom.xml
core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/context/BusyConversationException.java
core/trunk/impl/src/main/java/org/jboss/weld/context/ContextNotActiveException.java
core/trunk/impl/src/main/java/org/jboss/weld/context/CreationalContextImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/context/NonexistentConversationException.java
core/trunk/impl/src/main/java/org/jboss/weld/conversation/ServletConversationManager.java
core/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/exceptions/AmbiguousResolutionException.java
core/trunk/impl/src/main/java/org/jboss/weld/exceptions/CreationException.java
core/trunk/impl/src/main/java/org/jboss/weld/exceptions/IllegalArgumentException.java
core/trunk/impl/src/main/java/org/jboss/weld/exceptions/IllegalProductException.java
core/trunk/impl/src/main/java/org/jboss/weld/exceptions/IllegalStateException.java
core/trunk/impl/src/main/java/org/jboss/weld/exceptions/InjectionException.java
core/trunk/impl/src/main/java/org/jboss/weld/exceptions/InvalidObjectException.java
core/trunk/impl/src/main/java/org/jboss/weld/exceptions/UnproxyableResolutionException.java
core/trunk/impl/src/main/java/org/jboss/weld/exceptions/UnsatisfiedResolutionException.java
core/trunk/impl/src/main/java/org/jboss/weld/exceptions/UnsupportedOperationException.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/ProxyClassConstructorInjectionPointWrapper.java
core/trunk/impl/src/main/java/org/jboss/weld/util/AnnotatedTypes.java
core/trunk/impl/src/main/java/org/jboss/weld/util/collections/ImmutableArraySet.java
core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/instantiation/ReflectionFactoryInstantiator.java
core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/instantiation/UnsafeInstantiator.java
Log:
add findbugs plugin, suppress various warnings
Modified: core/trunk/impl/pom.xml
===================================================================
--- core/trunk/impl/pom.xml 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/pom.xml 2010-06-03 13:44:32 UTC (rev 6395)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
@@ -115,12 +116,20 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ <version>1.3.2</version>
+ <optional>true</optional>
+ </dependency>
+
+
</dependencies>
<build>
@@ -128,7 +137,6 @@
<plugin>
<groupId>ch.qos.cal10n.plugins</groupId>
<artifactId>maven-cal10n-plugin</artifactId>
- <version>0.7.2</version>
<executions>
<execution>
<id>verify-messages</id>
@@ -160,6 +168,32 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <effort>Max</effort>
+ <threshold>Default</threshold>
+ <xmlOutput>true</xmlOutput>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
@@ -178,7 +212,7 @@
</profile>
</profiles>
- <scm>
+ <scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/impl</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/impl</developerConnection>
<url>http://fisheye.jboss.org/browse/weld/core/trunk/impl</url>
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -50,6 +50,7 @@
*
* @param <T>
*/
+(a)edu.umd.cs.findbugs.annotations.SuppressWarnings(value="SE_NO_SUITABLE_CONSTRUCTOR", justification="Uses SerializationProxy")
public class InstanceImpl<T> extends AbstractFacade<T, Instance<T>> implements Instance<T>, Serializable
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/BusyConversationException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/context/BusyConversationException.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/context/BusyConversationException.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -20,12 +20,15 @@
import org.jboss.weld.exceptions.WeldExceptionKeyMessage;
import org.jboss.weld.exceptions.WeldExceptionMessage;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* A localized message version of the
* {@link javax.enterprise.context.NonexistentConversationException}.
*
* @author David Allen
*/
+@SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification="Workaround for exception classes poor i8ln support")
public class BusyConversationException extends javax.enterprise.context.BusyConversationException
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/ContextNotActiveException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/context/ContextNotActiveException.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/context/ContextNotActiveException.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -20,12 +20,15 @@
import org.jboss.weld.exceptions.WeldExceptionKeyMessage;
import org.jboss.weld.exceptions.WeldExceptionMessage;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* A localized message version of the
* {@link javax.enterprise.context.ContextNotActiveException}.
*
* @author David Allen
*/
+@SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification="Workaround for exception classes poor i8ln support")
public class ContextNotActiveException extends javax.enterprise.context.ContextNotActiveException
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/CreationalContextImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/context/CreationalContextImpl.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/context/CreationalContextImpl.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -23,13 +23,16 @@
import javax.enterprise.context.spi.Contextual;
import javax.enterprise.context.spi.CreationalContext;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
public class CreationalContextImpl<T> implements CreationalContext<T>, WeldCreationalContext<T>, Serializable
{
private static final long serialVersionUID = 7375854583908262422L;
- // Only needed for creation, by the time it's serialized we don't need it
+ @SuppressWarnings(value="SE_TRANSIENT_FIELD_NOT_RESTORED", justification="Not needed after initial creation")
private final transient Map<Contextual<?>, Object> incompleteInstances;
+ @SuppressWarnings(value="SE_TRANSIENT_FIELD_NOT_RESTORED", justification="Not needed after initial creation")
private final transient Contextual<T> contextual;
private final DependentInstancesStore dependentInstancesStore;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/NonexistentConversationException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/context/NonexistentConversationException.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/context/NonexistentConversationException.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -20,12 +20,15 @@
import org.jboss.weld.exceptions.WeldExceptionKeyMessage;
import org.jboss.weld.exceptions.WeldExceptionMessage;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* A localized message version of the
* {@link javax.enterprise.context.NonexistentConversationException}.
*
* @author David Allen
*/
+@SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification="Workaround for exception classes poor i8ln support")
public class NonexistentConversationException extends javax.enterprise.context.NonexistentConversationException
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/conversation/ServletConversationManager.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/conversation/ServletConversationManager.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/conversation/ServletConversationManager.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -27,6 +27,8 @@
import org.jboss.weld.servlet.ConversationBeanStore;
import org.jboss.weld.servlet.HttpSessionManager;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
@SessionScoped
public class ServletConversationManager extends AbstractConversationManager implements Serializable
{
@@ -39,6 +41,7 @@
private boolean sessionInvalidated;
@Inject
+ @SuppressWarnings(value="SE_BAD_FIELD", justification="Injected field")
private HttpSessionManager httpSessionManager;
@Produces
Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -48,6 +48,7 @@
* @param <T> The type of event being wrapped
* @see javax.enterprise.event.Event
*/
+(a)edu.umd.cs.findbugs.annotations.SuppressWarnings(value="SE_NO_SUITABLE_CONSTRUCTOR", justification="Uses SerializationProxy")
public class EventImpl<T> extends AbstractFacade<T, Event<T>> implements Event<T>, Serializable
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/exceptions/AmbiguousResolutionException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/exceptions/AmbiguousResolutionException.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/exceptions/AmbiguousResolutionException.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -17,12 +17,15 @@
package org.jboss.weld.exceptions;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* Provides message localization service for the
* {@link javax.enterprise.inject.AmbiguousResolutionException}.
*
* @author David Allen
*/
+@SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification="Workaround for exception classes poor i8ln support")
public class AmbiguousResolutionException extends javax.enterprise.inject.AmbiguousResolutionException
{
private static final long serialVersionUID = 2L;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/exceptions/CreationException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/exceptions/CreationException.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/exceptions/CreationException.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -17,12 +17,15 @@
package org.jboss.weld.exceptions;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* A version of {@link javax.enterprise.inject.CreationException} that supports
* message localization.
*
* @author David Allen
*/
+@SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification="Workaround for exception classes poor i8ln support")
public class CreationException extends javax.enterprise.inject.CreationException
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/exceptions/IllegalArgumentException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/exceptions/IllegalArgumentException.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/exceptions/IllegalArgumentException.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -17,12 +17,15 @@
package org.jboss.weld.exceptions;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* An {@link java.lang.IllegalArgumentException} with support for
* localized messages in Weld.
*
* @author David Allen
*/
+@SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification="Workaround for exception classes poor i8ln support")
public class IllegalArgumentException extends java.lang.IllegalArgumentException
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/exceptions/IllegalProductException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/exceptions/IllegalProductException.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/exceptions/IllegalProductException.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -17,12 +17,15 @@
package org.jboss.weld.exceptions;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* An {@link javax.enterprise.inject.IllegalProductException} with support for
* localized messages in Weld.
*
* @author David Allen
*/
+@SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification="Workaround for exception classes poor i8ln support")
public class IllegalProductException extends javax.enterprise.inject.IllegalProductException
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/exceptions/IllegalStateException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/exceptions/IllegalStateException.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/exceptions/IllegalStateException.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -17,12 +17,15 @@
package org.jboss.weld.exceptions;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* An {@link java.lang.IllegalStateException} with support for
* localized messages in Weld.
*
* @author David Allen
*/
+@SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification="Workaround for exception classes poor i8ln support")
public class IllegalStateException extends java.lang.IllegalStateException
{
private static final long serialVersionUID = 2L;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/exceptions/InjectionException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/exceptions/InjectionException.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/exceptions/InjectionException.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -17,12 +17,15 @@
package org.jboss.weld.exceptions;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* Provides message localization service for the
* {@link javax.enterprise.inject.InjectionException}.
*
* @author David Allen
*/
+@SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification="Workaround for exception classes poor i8ln support")
public class InjectionException extends javax.enterprise.inject.InjectionException
{
private static final long serialVersionUID = 2L;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/exceptions/InvalidObjectException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/exceptions/InvalidObjectException.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/exceptions/InvalidObjectException.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -17,12 +17,15 @@
package org.jboss.weld.exceptions;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* An extended version of {@link java.io.InvalidObjectException} that supports
* localization.
*
* @author David Allen
*/
+@SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification="Workaround for exception classes poor i8ln support")
public class InvalidObjectException extends java.io.InvalidObjectException
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/exceptions/UnproxyableResolutionException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/exceptions/UnproxyableResolutionException.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/exceptions/UnproxyableResolutionException.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -17,12 +17,15 @@
package org.jboss.weld.exceptions;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* Provides message localization service for the
* {@link javax.enterprise.inject.UnproxyableResolutionException}.
*
* @author David Allen
*/
+@SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification="Workaround for exception classes poor i8ln support")
public class UnproxyableResolutionException extends javax.enterprise.inject.UnproxyableResolutionException
{
private static final long serialVersionUID = 2L;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/exceptions/UnsatisfiedResolutionException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/exceptions/UnsatisfiedResolutionException.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/exceptions/UnsatisfiedResolutionException.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -17,12 +17,15 @@
package org.jboss.weld.exceptions;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* Provides message localization service for the
* {@link javax.enterprise.inject.UnsatisfiedResolutionException}.
*
* @author David Allen
*/
+@SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification="Workaround for exception classes poor i8ln support")
public class UnsatisfiedResolutionException extends javax.enterprise.inject.UnsatisfiedResolutionException
{
private static final long serialVersionUID = 2L;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/exceptions/UnsupportedOperationException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/exceptions/UnsupportedOperationException.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/exceptions/UnsupportedOperationException.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -17,12 +17,15 @@
package org.jboss.weld.exceptions;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* An {@link java.lang.UnsupportedOperationException} with support for
* localized messages in Weld.
*
* @author David Allen
*/
+@SuppressWarnings(value="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification="Workaround for exception classes poor i8ln support")
public class UnsupportedOperationException extends java.lang.UnsupportedOperationException
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -48,6 +48,8 @@
import org.jboss.weld.manager.BeanManagerImpl;
import org.jboss.weld.util.AnnotatedTypes;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
public class ConstructorInjectionPoint<T> extends ForwardingWeldConstructor<T> implements WeldInjectionPoint<T, Constructor<T>>, Serializable
{
@@ -72,6 +74,7 @@
}
+ @SuppressWarnings(value="SE_BAD_FIELD", justification="If the bean is not serializable, we won't ever try to serialize the injection point")
private final Bean<T> declaringBean;
private final WeldConstructor<T> constructor;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -44,9 +44,12 @@
import org.jboss.weld.manager.BeanManagerImpl;
import org.jboss.weld.util.AnnotatedTypes;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
public class FieldInjectionPoint<T, X> extends ForwardingWeldField<T, X> implements WeldInjectionPoint<T, Field>, Serializable
{
+ @SuppressWarnings(value="SE_BAD_FIELD", justification="If the bean is not serializable, we won't ever try to serialize the injection point")
private final Bean<?> declaringBean;
private final WeldField<T, X> field;
private final boolean delegate;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -47,6 +47,8 @@
import org.jboss.weld.logging.messages.ReflectionMessage;
import org.jboss.weld.manager.BeanManagerImpl;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
public class ParameterInjectionPoint<T, X> extends ForwardingWeldParameter<T, X> implements WeldInjectionPoint<T, Object>, Serializable
{
@@ -55,6 +57,7 @@
return new ParameterInjectionPoint<T, X>(declaringBean, parameter);
}
+ @SuppressWarnings(value="SE_BAD_FIELD", justification="If the bean is not serializable, we won't ever try to serialize the injection point")
private final Bean<?> declaringBean;
private final WeldParameter<T, X> parameter;
private final boolean delegate;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ProxyClassConstructorInjectionPointWrapper.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ProxyClassConstructorInjectionPointWrapper.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ProxyClassConstructorInjectionPointWrapper.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -33,6 +33,8 @@
*
* @author <a href="mailto:mariusb@redhat.com">Marius Bogoevici</a>
*/
+// TODO Needs equals/hashcode
+// TODO Would be clearer to make this either a wrapper or not
public class ProxyClassConstructorInjectionPointWrapper<T> extends ConstructorInjectionPoint<T>
{
private ConstructorInjectionPoint<T> originalConstructorInjectionPoint;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/AnnotatedTypes.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/AnnotatedTypes.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/AnnotatedTypes.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -39,6 +39,8 @@
import javax.enterprise.inject.spi.AnnotatedParameter;
import javax.enterprise.inject.spi.AnnotatedType;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
/**
* Class that can take an AnnotatedType and return a unique string
* representation of that type
@@ -52,6 +54,7 @@
* Does the first stage of comparing AnnoatedCallables, however it cannot
* compare the method parameters
*/
+ @SuppressWarnings("SE_COMPARATOR_SHOULD_BE_SERIALIZABLE")
private static class AnnotatedCallableComparator<T> implements Comparator<AnnotatedCallable<? super T>>
{
@@ -74,6 +77,7 @@
}
+ @SuppressWarnings("SE_COMPARATOR_SHOULD_BE_SERIALIZABLE")
private static class AnnotatedMethodComparator<T> implements Comparator<AnnotatedMethod<? super T>>
{
@@ -106,6 +110,7 @@
}
+ @SuppressWarnings("SE_COMPARATOR_SHOULD_BE_SERIALIZABLE")
private static class AnnotatedConstructorComparator<T> implements Comparator<AnnotatedConstructor<? super T>>
{
@@ -138,6 +143,7 @@
}
+ @SuppressWarnings("SE_COMPARATOR_SHOULD_BE_SERIALIZABLE")
private static class AnnotatedFieldComparator<T> implements Comparator<AnnotatedField<? super T>>
{
@@ -157,6 +163,7 @@
}
+ @SuppressWarnings("SE_COMPARATOR_SHOULD_BE_SERIALIZABLE")
private static class AnnotationComparator implements Comparator<Annotation>
{
@@ -168,6 +175,7 @@
}
}
+ @SuppressWarnings("SE_COMPARATOR_SHOULD_BE_SERIALIZABLE")
private static class MethodComparator implements Comparator<Method>
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/collections/ImmutableArraySet.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/collections/ImmutableArraySet.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/collections/ImmutableArraySet.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -241,7 +241,7 @@
@Override
public int hashCode()
{
- return elements.hashCode();
+ return Arrays.hashCode(elements);
}
@Override
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/instantiation/ReflectionFactoryInstantiator.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/instantiation/ReflectionFactoryInstantiator.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/instantiation/ReflectionFactoryInstantiator.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -16,8 +16,9 @@
*/
package org.jboss.weld.util.reflection.instantiation;
+import static org.jboss.weld.logging.messages.ReflectionMessage.REFLECTIONFACTORY_INSTANTIATION_FAILED;
+
import java.lang.reflect.Constructor;
-import static org.jboss.weld.logging.messages.ReflectionMessage.REFLECTIONFACTORY_INSTANTIATION_FAILED;
import java.lang.reflect.Method;
import org.jboss.weld.exceptions.WeldException;
@@ -46,6 +47,7 @@
}
catch (Exception e)
{
+ // TODO Catch explicit subclasses
// OK to fail
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/instantiation/UnsafeInstantiator.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/instantiation/UnsafeInstantiator.java 2010-06-03 12:29:11 UTC (rev 6394)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/instantiation/UnsafeInstantiator.java 2010-06-03 13:44:32 UTC (rev 6395)
@@ -16,15 +16,15 @@
*/
package org.jboss.weld.util.reflection.instantiation;
+import static org.jboss.weld.logging.messages.ReflectionMessage.UNSAFE_INSTANTIATION_FAILED;
+
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import org.jboss.weld.exceptions.WeldException;
import org.jboss.weld.util.reflection.SecureReflections;
-import static org.jboss.weld.logging.messages.ReflectionMessage.UNSAFE_INSTANTIATION_FAILED;
-
/**
* An instantiator for sun.misc.Unsafe
*
@@ -50,6 +50,7 @@
}
catch (Exception e)
{
+ // TODO Catch explicit subclasses
// OK to fail
}
}
13 years, 11 months
Weld SVN: r6394 - core/trunk/impl/src/main/java/org/jboss/weld/util.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-06-03 08:29:11 -0400 (Thu, 03 Jun 2010)
New Revision: 6394
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/util/Proxies.java
Log:
remove unused code
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Proxies.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Proxies.java 2010-06-03 11:54:29 UTC (rev 6393)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Proxies.java 2010-06-03 12:29:11 UTC (rev 6394)
@@ -17,19 +17,14 @@
package org.jboss.weld.util;
import static org.jboss.weld.logging.messages.UtilMessage.CANNOT_PROXY_NON_CLASS_TYPE;
-import static org.jboss.weld.logging.messages.ReflectionMessage.METHODHANDLER_SET_FAILED;
-import static org.jboss.weld.logging.messages.UtilMessage.INSTANCE_NOT_A_PROXY;
import static org.jboss.weld.logging.messages.ValidatorMessage.NOT_PROXYABLE_ARRAY_TYPE;
import static org.jboss.weld.logging.messages.ValidatorMessage.NOT_PROXYABLE_FINAL_TYPE_OR_METHOD;
import static org.jboss.weld.logging.messages.ValidatorMessage.NOT_PROXYABLE_NO_CONSTRUCTOR;
import static org.jboss.weld.logging.messages.ValidatorMessage.NOT_PROXYABLE_PRIMITIVE;
import static org.jboss.weld.logging.messages.ValidatorMessage.NOT_PROXYABLE_PRIVATE_CONSTRUCTOR;
import static org.jboss.weld.logging.messages.ValidatorMessage.NOT_PROXYABLE_UNKNOWN;
-import static org.jboss.weld.util.reflection.Reflections.EMPTY_CLASSES;
-import java.io.Serializable;
import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
@@ -37,14 +32,8 @@
import java.util.LinkedHashSet;
import java.util.Set;
-import javassist.util.proxy.MethodFilter;
-import javassist.util.proxy.MethodHandler;
-import javassist.util.proxy.ProxyFactory;
-import javassist.util.proxy.ProxyObject;
-
import org.jboss.weld.exceptions.IllegalArgumentException;
import org.jboss.weld.exceptions.UnproxyableResolutionException;
-import org.jboss.weld.exceptions.WeldException;
import org.jboss.weld.util.reflection.Reflections;
import org.jboss.weld.util.reflection.SecureReflections;
import org.jboss.weld.util.reflection.instantiation.InstantiatorFactory;
@@ -59,17 +48,6 @@
public class Proxies
{
- private static class IgnoreFinalizeMethodFilter implements MethodFilter, Serializable
- {
- private static final long serialVersionUID = 1L;
-
- public boolean isHandled(Method m)
- {
- return !m.getName().equals("finalize");
- }
-
- }
-
public static class TypeInfo
{
@@ -121,28 +99,6 @@
return superclass;
}
- private Class<?>[] getInterfaces()
- {
- return interfaces.toArray(EMPTY_CLASSES);
- }
-
- /**
- * @return
- */
- public ProxyFactory createProxyFactory()
- {
- ProxyFactory proxyFactory = new ProxyFactory();
- ProxyFactory.useCache = false;
- proxyFactory.setFilter(new IgnoreFinalizeMethodFilter());
- Class<?> superClass = getSuperClass();
- if (superClass != null && superClass != Object.class)
- {
- proxyFactory.setSuperclass(superClass);
- }
- proxyFactory.setInterfaces(getInterfaces());
- return proxyFactory;
- }
-
public TypeInfo add(Type type)
{
if (type instanceof Class<?>)
13 years, 11 months