Author: davsclaus Date: Tue Feb 28 10:31:27 2012 New Revision: 1294555 URL: http://svn.apache.org/viewvc?rev=1294555&view=rev Log: CAMEL-4923: Applied the code cleanup patch from Bilgin.
Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConstants.java camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DescribeTableCommand.java camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConstants.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConstants.java?rev=1294555&r1=1294554&r2=1294555&view=diff ============================================================================== --- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConstants.java (original) +++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConstants.java Tue Feb 28 10:31:27 2012 @@ -20,49 +20,40 @@ package org.apache.camel.component.aws.d * Constants used in Camel AWS DynamoDB component */ public interface DdbConstants { - - String ATTRIBUTES = "CamelAwsSdbAttributes"; + String ATTRIBUTES = "CamelAwsDdbAttributes"; + String ATTRIBUTE_NAMES = "CamelAwsDdbAttributeNames"; String BATCH_ITEMS = "CamelAwsDdbBatchItems"; String BATCH_RESPONSE = "CamelAwsDdbBatchResponse"; - String KEY = "CamelAwsDdbKey"; - String RETURN_VALUES = "CamelAwsDdbReturnValues"; - String TABLE_NAME = "CamelAwsDdbTableName"; - String UPDATE_CONDITION = "CamelAwsDdbUpdateCondition"; - String UNPROCESSED_KEYS = "CamelAwsDdbUnprocessedKeys"; - - - - - - String ATTRIBUTE_NAMES = "CamelAwsSdbAttributeNames"; - String PROVISIONED_THROUGHPUT = "CamelAwsDdbProvisionedThroughput"; + String CONSISTENT_READ = "CamelAwsDdbConsistentRead"; + String CONSUMED_CAPACITY = "CamelAwsDdbConsumedCapacity"; + String COUNT = "CamelAwsDdbCount"; String CREATION_DATE = "CamelAwsDdbCreationDate"; - - - String CONSISTENT_READ = "CamelAwsSdbConsistentRead"; - String ITEMS = "CamelAwsSdbItems"; - String ITEM_NAME = "CamelAwsSdbItemName"; - String MESSAGE_ID = "CamelAwsSdbMessageId"; - String NEXT_TOKEN = "CamelAwsSdbNextToken"; - String OPERATION = "CamelAwsDdbOperation"; - String READ_CAPACITY = "CamelAwsDdbReadCapacity"; - String WRITE_CAPACITY = "CamelAwsDdbWriteCapacity"; - String TABLE_STATUS = "CamelAwsDdbTableStatus"; - String TABLE_CREATION_DATE = "CamelAwsDdbTableCreationDate"; + String EXACT_COUNT = "CamelAwsDdbExactCount"; + String HASH_KEY_VALUE = "CamelAwsDdbHashKeyValue"; + String ITEM = "CamelAwsDdbItem"; + String ITEMS = "CamelAwsDdbItems"; String ITEM_COUNT = "CamelAwsDdbTableItemCount"; + String ITEM_NAME = "CamelAwsDdbItemName"; + String MESSAGE_ID = "CamelAwsDdbMessageId"; + String NEXT_TOKEN = "CamelAwsDdbNextToken"; + String KEY = "CamelAwsDdbKey"; String KEY_SCHEMA = "CamelAwsDdbKeySchema"; - String TABLE_SIZE = "CamelAwsDdbTableSize"; - String ITEM = "CamelAwsDdbItem"; - String UPDATE_VALUES = "CamelAwsDdbUpdateValues"; - String SCAN_FILTER = "CamelAwsDdbScanFilter"; String LAST_EVALUATED_KEY = "CamelAwsDdbLastEvaluatedKey"; - String CONSUMED_CAPACITY = "CamelAwsDdbConsumedCapacity"; - String COUNT = "CamelAwsDdbCount"; + String LIMIT = "CamelAwsDdbLimit"; + String OPERATION = "CamelAwsDdbOperation"; + String PROVISIONED_THROUGHPUT = "CamelAwsDdbProvisionedThroughput"; + String READ_CAPACITY = "CamelAwsDdbReadCapacity"; + String RETURN_VALUES = "CamelAwsDdbReturnValues"; String SCANNED_COUNT = "CamelAwsDdbScannedCount"; String SCAN_INDEX_FORWARD = "CamelAwsDdbScanIndexForward"; String SCAN_RANGE_KEY_CONDITION = "CamelAwsDdbScanRangeKeyCondition"; - String LIMIT = "CamelAwsDdbLimit"; - String HASH_KEY_VALUE = "CamelAwsDdbHashKeyValue"; - String EXACT_COUNT = "CamelAwsDdbExactCount"; + String SCAN_FILTER = "CamelAwsDdbScanFilter"; String START_KEY = "CamelAwsDdbStartKey"; + String TABLE_NAME = "CamelAwsDdbTableName"; + String TABLE_SIZE = "CamelAwsDdbTableSize"; + String TABLE_STATUS = "CamelAwsDdbTableStatus"; + String UPDATE_CONDITION = "CamelAwsDdbUpdateCondition"; + String UPDATE_VALUES = "CamelAwsDdbUpdateValues"; + String UNPROCESSED_KEYS = "CamelAwsDdbUnprocessedKeys"; + String WRITE_CAPACITY = "CamelAwsDdbWriteCapacity"; } Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DescribeTableCommand.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DescribeTableCommand.java?rev=1294555&r1=1294554&r2=1294555&view=diff ============================================================================== --- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DescribeTableCommand.java (original) +++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DescribeTableCommand.java Tue Feb 28 10:31:27 2012 @@ -37,7 +37,7 @@ public class DescribeTableCommand extend Message msg = getMessageForResponse(exchange); msg.setHeader(DdbConstants.TABLE_NAME, result.getTable().getTableName()); msg.setHeader(DdbConstants.TABLE_STATUS, result.getTable().getTableStatus()); - msg.setHeader(DdbConstants.TABLE_CREATION_DATE, result.getTable().getCreationDateTime()); + msg.setHeader(DdbConstants.CREATION_DATE, result.getTable().getCreationDateTime()); msg.setHeader(DdbConstants.ITEM_COUNT, result.getTable().getItemCount()); msg.setHeader(DdbConstants.KEY_SCHEMA, result.getTable().getKeySchema()); msg.setHeader(DdbConstants.READ_CAPACITY, Modified: camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java?rev=1294555&r1=1294554&r2=1294555&view=diff ============================================================================== --- camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java (original) +++ camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java Tue Feb 28 10:31:27 2012 @@ -51,7 +51,7 @@ public class DescribeTableCommandTest { assertEquals("FULL_DESCRIBE_TABLE", ddbClient.describeTableRequest.getTableName()); assertEquals("FULL_DESCRIBE_TABLE", exchange.getIn().getHeader(DdbConstants.TABLE_NAME)); assertEquals("ACTIVE", exchange.getIn().getHeader(DdbConstants.TABLE_STATUS)); - assertEquals(new Date(AmazonDDBClientMock.NOW), exchange.getIn().getHeader(DdbConstants.TABLE_CREATION_DATE)); + assertEquals(new Date(AmazonDDBClientMock.NOW), exchange.getIn().getHeader(DdbConstants.CREATION_DATE)); assertEquals(100L, exchange.getIn().getHeader(DdbConstants.ITEM_COUNT)); assertEquals(new KeySchema(new KeySchemaElement().withAttributeName("name")), exchange.getIn().getHeader(DdbConstants.KEY_SCHEMA));