Author: bvahdat Date: Mon Jun 4 19:27:41 2012 New Revision: 1346099 URL: http://svn.apache.org/viewvc?rev=1346099&view=rev Log: Cleaned up all the JDK compiler warnings by camel-hbase.
Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/converter/HBaseModelConverter.java camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/BodyMappingStrategy.java camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategyFactory.java camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseCell.java camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseRow.java camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepository.java camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java?rev=1346099&r1=1346098&r2=1346099&view=diff ============================================================================== --- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java (original) +++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java Mon Jun 4 19:27:41 2012 @@ -27,16 +27,12 @@ import org.apache.hadoop.conf.Configurat import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTablePool; import org.apache.hadoop.hbase.filter.Filter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Represents an HBase endpoint. */ public class HBaseEndpoint extends DefaultEndpoint { - private static final Logger LOG = LoggerFactory.getLogger(HBaseEndpoint.class); - private Configuration configuration; private String tableName; private HBaseAdmin admin; @@ -66,10 +62,6 @@ public class HBaseEndpoint extends Defau this.tablePool = tablePool; } - public HBaseEndpoint(String endpointUri) { - super(endpointUri); - } - public Producer createProducer() throws Exception { return new HBaseProducer(this, tablePool, tableName); } Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java?rev=1346099&r1=1346098&r2=1346099&view=diff ============================================================================== --- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java (original) +++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java Mon Jun 4 19:27:41 2012 @@ -40,14 +40,11 @@ import org.apache.hadoop.hbase.client.Re import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.FilterList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * The HBase producer. */ public class HBaseProducer extends DefaultProducer implements ServicePoolAware { - private static final transient Logger LOG = LoggerFactory.getLogger(HBaseProducer.class); private HBaseEndpoint endpoint; private String tableName; private final HTablePool tablePool; Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/converter/HBaseModelConverter.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/converter/HBaseModelConverter.java?rev=1346099&r1=1346098&r2=1346099&view=diff ============================================================================== --- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/converter/HBaseModelConverter.java (original) +++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/converter/HBaseModelConverter.java Mon Jun 4 19:27:41 2012 @@ -16,19 +16,8 @@ */ package org.apache.camel.component.hbase.converter; -import java.math.BigInteger; import org.apache.camel.Converter; -import org.apache.camel.Exchange; -import org.apache.camel.FallbackConverter; -import org.apache.camel.TypeConverter; -import org.apache.camel.component.hbase.HBaseHelper; -import org.apache.camel.component.hbase.model.HBaseRow; -import org.apache.camel.spi.TypeConverterRegistry; import org.apache.hadoop.hbase.util.Bytes; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @Converter public final class HBaseModelConverter { Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/BodyMappingStrategy.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/BodyMappingStrategy.java?rev=1346099&r1=1346098&r2=1346099&view=diff ============================================================================== --- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/BodyMappingStrategy.java (original) +++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/BodyMappingStrategy.java Mon Jun 4 19:27:41 2012 @@ -19,9 +19,6 @@ package org.apache.camel.component.hbase import org.apache.camel.Message; import org.apache.camel.component.hbase.model.HBaseData; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * A {@link org.apache.camel.component.hbase.mapping.CellMappingStrategy} implementation. @@ -32,9 +29,7 @@ import org.slf4j.LoggerFactory; * <p>Suffixes start from number 2</p>. * <p>Suffixes need to be sequential</p>. */ -public class BodyMappingStrategy<R, V> implements CellMappingStrategy { - - private static final Logger LOG = LoggerFactory.getLogger(BodyMappingStrategy.class); +public class BodyMappingStrategy implements CellMappingStrategy { /** * Resolves the cells that the {@link org.apache.camel.Exchange} refers to. Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategyFactory.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategyFactory.java?rev=1346099&r1=1346098&r2=1346099&view=diff ============================================================================== --- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategyFactory.java (original) +++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/CellMappingStrategyFactory.java Mon Jun 4 19:27:41 2012 @@ -60,17 +60,15 @@ public class CellMappingStrategyFactory private CellMappingStrategy loadStrategyfromClassName(String strategyClassName) { - CellMappingStrategy strategy = null; - Class<? extends CellMappingStrategy> clazz = null; ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); if (classLoader != null) { try { - clazz = (Class<? extends CellMappingStrategy>) classLoader.loadClass(strategyClassName); - strategy = clazz.newInstance(); + Class<?> clazz = classLoader.loadClass(strategyClassName); + return (CellMappingStrategy) clazz.newInstance(); } catch (Throwable e) { LOG.warn("Failed to load HBase cell mapping strategy from class {}.", strategyClassName); } } - return strategy; + return null; } } Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java?rev=1346099&r1=1346098&r2=1346099&view=diff ============================================================================== --- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java (original) +++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java Mon Jun 4 19:27:41 2012 @@ -26,8 +26,6 @@ import org.apache.camel.component.hbase. import org.apache.camel.component.hbase.model.HBaseCell; import org.apache.camel.component.hbase.model.HBaseData; import org.apache.camel.component.hbase.model.HBaseRow; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** @@ -41,8 +39,6 @@ import org.slf4j.LoggerFactory; */ public class HeaderMappingStrategy implements CellMappingStrategy { - private static final Logger LOG = LoggerFactory.getLogger(HeaderMappingStrategy.class); - /** * Resolves the cell that the {@link Exchange} refers to. * @@ -57,13 +53,13 @@ public class HeaderMappingStrategy imple if (message != null) { Object id = message.getHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(index)); String rowClassName = message.getHeader(HbaseAttribute.HBASE_ROW_TYPE.asHeader(index), String.class); - Class rowClass = rowClassName == null || rowClassName.isEmpty() ? String.class : message.getExchange().getContext().getClassResolver().resolveClass(rowClassName); + Class<?> rowClass = rowClassName == null || rowClassName.isEmpty() ? String.class : message.getExchange().getContext().getClassResolver().resolveClass(rowClassName); String columnFamily = (String) message.getHeader(HbaseAttribute.HBASE_FAMILY.asHeader(index)); String columnName = (String) message.getHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(index)); Object value = message.getHeader(HbaseAttribute.HBASE_VALUE.asHeader(index)); String valueClassName = message.getHeader(HbaseAttribute.HBASE_VALUE_TYPE.asHeader(index), String.class); - Class valueClass = valueClassName == null || valueClassName.isEmpty() ? String.class : message.getExchange().getContext().getClassResolver().resolveClass(valueClassName); + Class<?> valueClass = valueClassName == null || valueClassName.isEmpty() ? String.class : message.getExchange().getContext().getClassResolver().resolveClass(valueClassName); //Id can be accepted as null when using get, scan etc. if (id == null && columnFamily == null && columnName == null) { Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseCell.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseCell.java?rev=1346099&r1=1346098&r2=1346099&view=diff ============================================================================== --- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseCell.java (original) +++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseCell.java Mon Jun 4 19:27:41 2012 @@ -30,7 +30,7 @@ public class HBaseCell { private String qualifier; private Object value; //The value type can be optionally specified for Gets and Scan, to specify how the byte[] read will be converted. - private Class valueType = String.class; + private Class<?> valueType = String.class; @XmlAttribute(name = "family") public String getFamily() { @@ -60,11 +60,11 @@ public class HBaseCell { } @XmlAttribute(name = "type") - public Class getValueType() { + public Class<?> getValueType() { return valueType; } - public void setValueType(Class valueType) { + public void setValueType(Class<?> valueType) { this.valueType = valueType; } Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseRow.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseRow.java?rev=1346099&r1=1346098&r2=1346099&view=diff ============================================================================== --- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseRow.java (original) +++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/model/HBaseRow.java Mon Jun 4 19:27:41 2012 @@ -26,7 +26,7 @@ public class HBaseRow implements Cloneab private Object id; //The row type can be optionally specified for Gets and Scan, to specify how the byte[] read will be converted. - private Class rowType = String.class; + private Class<?> rowType = String.class; private Set<HBaseCell> cells; /** @@ -54,11 +54,11 @@ public class HBaseRow implements Cloneab } @XmlAttribute(name = "type") - public Class getRowType() { + public Class<?> getRowType() { return rowType; } - public void setRowType(Class rowType) { + public void setRowType(Class<?> rowType) { this.rowType = rowType; } Modified: camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepository.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepository.java?rev=1346099&r1=1346098&r2=1346099&view=diff ============================================================================== --- camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepository.java (original) +++ camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepository.java Mon Jun 4 19:27:41 2012 @@ -32,23 +32,15 @@ import org.apache.hadoop.hbase.util.Byte import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class HBaseIdempotentRepository extends ServiceSupport implements IdempotentRepository { +public class HBaseIdempotentRepository extends ServiceSupport implements IdempotentRepository<Object> { private static final Logger LOG = LoggerFactory.getLogger(HBaseIdempotentRepository.class); - private final Configuration configuration; private final String tableName; private final String family; private final String qualifer; private final HTable table; - /** - * Constructor - * - * @param configuration - * @param tableName - */ public HBaseIdempotentRepository(Configuration configuration, String tableName, String family, String qualifier) throws IOException { - this.configuration = configuration; this.tableName = tableName; this.family = family; this.qualifer = qualifier; Modified: camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java?rev=1346099&r1=1346098&r2=1346099&view=diff ============================================================================== --- camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java (original) +++ camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java Mon Jun 4 19:27:41 2012 @@ -26,7 +26,6 @@ import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.hbase.mapping.CellMappingStrategyFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.TableExistsException; import org.apache.hadoop.hbase.client.Get; @@ -287,7 +286,7 @@ public class HBaseProducerTest extends C Object result2 = resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(2)); Object result3 = resp.getOut().getHeader(HbaseAttribute.HBASE_VALUE.asHeader(3)); - List bodies = Arrays.asList(body); + List<?> bodies = Arrays.asList(body); assertTrue(bodies.contains(result1) && bodies.contains(result2) && bodies.contains(result3)); } Modified: camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java?rev=1346099&r1=1346098&r2=1346099&view=diff ============================================================================== --- camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java (original) +++ camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java Mon Jun 4 19:27:41 2012 @@ -32,7 +32,7 @@ import org.junit.Test; public class HBaseIdempotentRepositoryTest extends CamelHBaseTestSupport { - IdempotentRepository repository; + IdempotentRepository<Object> repository; HTable table; private String key01 = "123";