You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2015/07/10 12:30:35 UTC
svn commit: r1690236 - in /aries/trunk/transaction:
transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/
transaction-blueprint/src/test/java/org/apache/aries/transaction/
transaction-jdbc/src/main/java/org/apache/aries/transaction/...
Author: cschneider
Date: Fri Jul 10 10:30:35 2015
New Revision: 1690236
URL: http://svn.apache.org/r1690236
Log:
Fix warnings
Modified:
aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java
aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/AnnotationParserTest.java
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/AbstractMCFFactory.java
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/Activator.java
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/DataSourceMCFFactory.java
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ManagedDataSourceFactory.java
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingDelegatingManagedConnectionFactory.java
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingGenericConnectionManager.java
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/XADataSourceMCFFactory.java
aries/trunk/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/PooledConnectionFactory.java
aries/trunk/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/RecoverablePooledConnectionFactory.java
Modified: aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java?rev=1690236&r1=1690235&r2=1690236&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java (original)
+++ aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java Fri Jul 10 10:30:35 2015
@@ -198,9 +198,9 @@ public class TxNamespaceHandler implemen
this.interceptor = (Interceptor) container.getComponentInstance(id);
}
+ @SuppressWarnings("rawtypes")
public Set<Class> getManagedClasses()
{
- // TODO Auto-generated method stub
return null;
}
Modified: aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/AnnotationParserTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/AnnotationParserTest.java?rev=1690236&r1=1690235&r2=1690236&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/AnnotationParserTest.java (original)
+++ aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/AnnotationParserTest.java Fri Jul 10 10:30:35 2015
@@ -23,7 +23,6 @@ import static org.apache.aries.transacti
import static org.apache.aries.transaction.annotations.TransactionPropagationType.Supports;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.anyString;
-import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
Modified: aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/AbstractMCFFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/AbstractMCFFactory.java?rev=1690236&r1=1690235&r2=1690236&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/AbstractMCFFactory.java (original)
+++ aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/AbstractMCFFactory.java Fri Jul 10 10:30:35 2015
@@ -23,7 +23,6 @@ import java.util.List;
import javax.resource.spi.ManagedConnectionFactory;
import javax.sql.CommonDataSource;
-import javax.sql.XADataSource;
import org.tranql.connector.AllExceptionsAreFatalSorter;
import org.tranql.connector.ExceptionSorter;
Modified: aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/Activator.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/Activator.java?rev=1690236&r1=1690235&r2=1690236&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/Activator.java (original)
+++ aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/Activator.java Fri Jul 10 10:30:35 2015
@@ -34,9 +34,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.sql.CommonDataSource;
-import java.util.Hashtable;
+import java.util.Hashtable;
+@SuppressWarnings("rawtypes")
public class Activator implements BundleActivator,
ServiceTrackerCustomizer<CommonDataSource, ManagedDataSourceFactory>,
SingleServiceTracker.SingleServiceListener
Modified: aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/DataSourceMCFFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/DataSourceMCFFactory.java?rev=1690236&r1=1690235&r2=1690236&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/DataSourceMCFFactory.java (original)
+++ aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/DataSourceMCFFactory.java Fri Jul 10 10:30:35 2015
@@ -35,6 +35,7 @@ public class DataSourceMCFFactory extend
}
}
+ @SuppressWarnings("serial")
public class DataSourceMCF extends AbstractLocalDataSourceMCF<DataSource> implements TransactionSupport {
public DataSourceMCF() {
super((DataSource) DataSourceMCFFactory.this.getDataSource(), DataSourceMCFFactory.this.getExceptionSorter(), true);
Modified: aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ManagedDataSourceFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ManagedDataSourceFactory.java?rev=1690236&r1=1690235&r2=1690236&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ManagedDataSourceFactory.java (original)
+++ aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ManagedDataSourceFactory.java Fri Jul 10 10:30:35 2015
@@ -27,9 +27,11 @@ import org.osgi.framework.ServiceRegistr
import javax.sql.CommonDataSource;
import javax.sql.DataSource;
import javax.sql.XADataSource;
+
import java.util.Hashtable;
import java.util.Map;
+@SuppressWarnings({"rawtypes", "unchecked"})
public class ManagedDataSourceFactory {
private final ServiceReference reference;
Modified: aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingDelegatingManagedConnectionFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingDelegatingManagedConnectionFactory.java?rev=1690236&r1=1690235&r2=1690236&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingDelegatingManagedConnectionFactory.java (original)
+++ aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingDelegatingManagedConnectionFactory.java Fri Jul 10 10:30:35 2015
@@ -42,6 +42,9 @@ import java.sql.SQLException;
import java.util.HashSet;
import java.util.Set;
+@SuppressWarnings({
+ "rawtypes", "serial", "unchecked"
+})
public final class ValidatingDelegatingManagedConnectionFactory implements UserPasswordManagedConnectionFactory, ValidatingManagedConnectionFactory, TransactionSupport {
private static final Logger LOG = LoggerFactory.getLogger(ValidatingDelegatingManagedConnectionFactory.class);
Modified: aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingGenericConnectionManager.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingGenericConnectionManager.java?rev=1690236&r1=1690235&r2=1690236&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingGenericConnectionManager.java (original)
+++ aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingGenericConnectionManager.java Fri Jul 10 10:30:35 2015
@@ -46,6 +46,9 @@ import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.locks.ReadWriteLock;
+@SuppressWarnings({
+ "unchecked", "serial"
+})
public final class ValidatingGenericConnectionManager extends GenericConnectionManager {
private static final Timer TIMER = new Timer("ValidatingGenericConnectionManagerTimer", true);
Modified: aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/XADataSourceMCFFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/XADataSourceMCFFactory.java?rev=1690236&r1=1690235&r2=1690236&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/XADataSourceMCFFactory.java (original)
+++ aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/XADataSourceMCFFactory.java Fri Jul 10 10:30:35 2015
@@ -18,28 +18,20 @@
*/
package org.apache.aries.transaction.jdbc.internal;
-import org.tranql.connector.AllExceptionsAreFatalSorter;
-import org.tranql.connector.CredentialExtractor;
-import org.tranql.connector.ExceptionSorter;
-import org.tranql.connector.NoExceptionsAreFatalSorter;
-import org.tranql.connector.jdbc.AbstractXADataSourceMCF;
-import org.tranql.connector.jdbc.ConfigurableSQLStateExceptionSorter;
-import org.tranql.connector.jdbc.KnownSQLStateExceptionSorter;
-import org.tranql.connector.jdbc.ManagedXAConnection;
+import java.sql.SQLException;
import javax.resource.ResourceException;
import javax.resource.spi.ConnectionRequestInfo;
import javax.resource.spi.ManagedConnection;
-import javax.resource.spi.ManagedConnectionFactory;
import javax.resource.spi.ResourceAdapterInternalException;
import javax.resource.spi.TransactionSupport;
import javax.security.auth.Subject;
import javax.sql.XAConnection;
import javax.sql.XADataSource;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
+import org.tranql.connector.CredentialExtractor;
+import org.tranql.connector.jdbc.AbstractXADataSourceMCF;
+import org.tranql.connector.jdbc.ManagedXAConnection;
public class XADataSourceMCFFactory extends AbstractMCFFactory {
@@ -52,6 +44,7 @@ public class XADataSourceMCFFactory exte
}
}
+ @SuppressWarnings("serial")
public class XADataSourceMCF extends AbstractXADataSourceMCF<XADataSource> implements TransactionSupport {
public XADataSourceMCF() {
Modified: aries/trunk/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/PooledConnectionFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/PooledConnectionFactory.java?rev=1690236&r1=1690235&r2=1690236&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/PooledConnectionFactory.java (original)
+++ aries/trunk/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/PooledConnectionFactory.java Fri Jul 10 10:30:35 2015
@@ -16,11 +16,8 @@
*/
package org.apache.aries.transaction.jms;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.JMSException;
@@ -34,9 +31,6 @@ import org.apache.commons.pool.KeyedPool
import org.apache.commons.pool.impl.GenericKeyedObjectPool;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.commons.pool.ObjectPoolFactory;
-import org.apache.commons.pool.impl.GenericObjectPool;
-import org.apache.commons.pool.impl.GenericObjectPoolFactory;
/**
* A JMS provider which pools Connection, Session and MessageProducer instances
Modified: aries/trunk/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/RecoverablePooledConnectionFactory.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/RecoverablePooledConnectionFactory.java?rev=1690236&r1=1690235&r2=1690236&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/RecoverablePooledConnectionFactory.java (original)
+++ aries/trunk/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/RecoverablePooledConnectionFactory.java Fri Jul 10 10:30:35 2015
@@ -16,9 +16,7 @@
*/
package org.apache.aries.transaction.jms;
-import javax.jms.JMSException;
import javax.jms.Connection;
-import javax.jms.XAConnection;
import org.apache.aries.transaction.jms.internal.ConnectionPool;
import org.apache.aries.transaction.jms.internal.GenericResourceManager;
@@ -32,6 +30,7 @@ import org.apache.aries.transaction.jms.
*
* @org.apache.xbean.XBean element="xaPooledConnectionFactory"
*/
+@SuppressWarnings("serial")
public class RecoverablePooledConnectionFactory extends XaPooledConnectionFactory {
private String name;