From 00ffa9c0a5149a25e1a19d968d603ca54c1345f4 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 5 Aug 2011 10:13:56 -0400 Subject: [PATCH] renaming MongoMessageStore to MongoDbMessageStore for consistency --- .../{MongoMessageStore.java => MongoDbMessageStore.java} | 7 ++++--- ... => MongoDbMessageStoreClaimCheckIntegrationTests.java} | 6 +++--- ...essageStoreTests.java => MongoDbMessageStoreTests.java} | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) rename spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/{MongoMessageStore.java => MongoDbMessageStore.java} (96%) rename spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/{MongoClaimCheckIntegrationTests.java => MongoDbMessageStoreClaimCheckIntegrationTests.java} (94%) rename spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/{MongoMessageStoreTests.java => MongoDbMessageStoreTests.java} (94%) diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java similarity index 96% rename from spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoMessageStore.java rename to spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java index f159e60bf5..14b8bd7a1a 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoMessageStore.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java @@ -48,8 +48,9 @@ import com.mongodb.DBObject; /** * @author Mark Fisher * @author Oleg Zhurakousky + * @since 2.1 */ -public class MongoMessageStore implements MessageStore, BeanClassLoaderAware { +public class MongoDbMessageStore implements MessageStore, BeanClassLoaderAware { private final static String DEFAULT_COLLECTION_NAME = "messages"; @@ -61,11 +62,11 @@ public class MongoMessageStore implements MessageStore, BeanClassLoaderAware { private volatile ClassLoader classLoader = ClassUtils.getDefaultClassLoader(); - public MongoMessageStore(MongoDbFactory mongoDbFactory) { + public MongoDbMessageStore(MongoDbFactory mongoDbFactory) { this(mongoDbFactory, null); } - public MongoMessageStore(MongoDbFactory mongoDbFactory, String collectionName) { + public MongoDbMessageStore(MongoDbFactory mongoDbFactory, String collectionName) { Assert.notNull(mongoDbFactory, "mongoDbFactory must not be null"); MessageReadingMongoConverter converter = new MessageReadingMongoConverter(mongoDbFactory, new MongoMappingContext()); this.template = new MongoTemplate(mongoDbFactory, converter); diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoClaimCheckIntegrationTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java similarity index 94% rename from spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoClaimCheckIntegrationTests.java rename to spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java index 8c300cf19f..c67d3bb70c 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoClaimCheckIntegrationTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java @@ -33,13 +33,13 @@ import static org.junit.Assert.assertEquals; /** * @author Mark Fisher */ -public class MongoClaimCheckIntegrationTests extends MongoDbAvailableTests{ +public class MongoDbMessageStoreClaimCheckIntegrationTests extends MongoDbAvailableTests{ @Test @MongoDbAvailable public void stringPayload() throws Exception { MongoDbFactory mongoDbFactory = new SimpleMongoDbFactory(new Mongo(), "test"); - MongoMessageStore messageStore = new MongoMessageStore(mongoDbFactory); + MongoDbMessageStore messageStore = new MongoDbMessageStore(mongoDbFactory); ClaimCheckInTransformer checkin = new ClaimCheckInTransformer(messageStore); ClaimCheckOutTransformer checkout = new ClaimCheckOutTransformer(messageStore); Message originalMessage = MessageBuilder.withPayload("test1").build(); @@ -58,7 +58,7 @@ public class MongoClaimCheckIntegrationTests extends MongoDbAvailableTests{ @MongoDbAvailable public void objectPayload() throws Exception { MongoDbFactory mongoDbFactory = new SimpleMongoDbFactory(new Mongo(), "test"); - MongoMessageStore messageStore = new MongoMessageStore(mongoDbFactory); + MongoDbMessageStore messageStore = new MongoDbMessageStore(mongoDbFactory); ClaimCheckInTransformer checkin = new ClaimCheckInTransformer(messageStore); ClaimCheckOutTransformer checkout = new ClaimCheckOutTransformer(messageStore); Beverage payload = new Beverage(); diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoMessageStoreTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreTests.java similarity index 94% rename from spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoMessageStoreTests.java rename to spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreTests.java index 3a219c30bf..e927cf751e 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoMessageStoreTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreTests.java @@ -34,13 +34,13 @@ import com.mongodb.Mongo; * @author Mark Fisher * @author Oleg Zhurakousky */ -public class MongoMessageStoreTests extends MongoDbAvailableTests{ +public class MongoDbMessageStoreTests extends MongoDbAvailableTests{ @Test @MongoDbAvailable public void addGetWithStringPayload() throws Exception { MongoDbFactory mongoDbFactory = new SimpleMongoDbFactory(new Mongo(), "test"); - MongoMessageStore store = new MongoMessageStore(mongoDbFactory); + MongoDbMessageStore store = new MongoDbMessageStore(mongoDbFactory); Message messageToStore = MessageBuilder.withPayload("Hello").build(); store.addMessage(messageToStore); Message retrievedMessage = store.getMessage(messageToStore.getHeaders().getId()); @@ -54,7 +54,7 @@ public class MongoMessageStoreTests extends MongoDbAvailableTests{ @MongoDbAvailable public void addGetWithObjectDefaultConstructorPayload() throws Exception { MongoDbFactory mongoDbFactory = new SimpleMongoDbFactory(new Mongo(), "test"); - MongoMessageStore store = new MongoMessageStore(mongoDbFactory); + MongoDbMessageStore store = new MongoDbMessageStore(mongoDbFactory); Person p = new Person(); p.setFname("John"); p.setLname("Doe");