Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

checkstyle FinalClassCheck

Browse Source 
fixes

fixModifiers after fixFinal

Revert CachingSessionFactory

Class is spied in tests.

checkstyle - Import Rules

checkstyle InterfaceIsType

checkstyle InnerTypeLast

checkstyle OneStatementPerLine

CovariantEquals
OneTopLevelClass

* Revert `'\n'` -> `System.lineSeparator()` in the Gradle scripts to meet Git `autocrlf = true` on Windows
* Fix timing issue with the `LastModifiedFileListFilterTests`, when the `age = 1` might not be enough for the file object when we have some delay before checking
This commit is contained in:
Gary Russell
2016-04-02 10:52:19 -04:00
committed by Artem Bilan
parent 43af472c3a
commit 4ac3a79df7
105 changed files with 752 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoParserUtils.java
View File

@@ -30,7 +30,7 @@ import org.springframework.util.StringUtils;
* @author Gary Russell
* @since 2.2
*/
class MongoParserUtils {
final class MongoParserUtils {
private MongoParserUtils() {
super();

24
spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java
View File

@@ -454,10 +454,20 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
this.collectionName).get(SEQUENCE);
}
@SuppressWarnings("unchecked")
private static void enhanceHeaders(MessageHeaders messageHeaders, Map<String, Object> headers) {
Map<String, Object> innerMap =
(Map<String, Object>) new DirectFieldAccessor(messageHeaders).getPropertyValue("headers");
// using reflection to set ID and TIMESTAMP since they are immutable through MessageHeaders
innerMap.put(MessageHeaders.ID, headers.get(MessageHeaders.ID));
innerMap.put(MessageHeaders.TIMESTAMP, headers.get(MessageHeaders.TIMESTAMP));
}
/**
* Custom implementation of the {@link MappingMongoConverter} strategy.
*/
private class MessageReadingMongoConverter extends MappingMongoConverter {
private final class MessageReadingMongoConverter extends MappingMongoConverter {
private MessageReadingMongoConverter(MongoDbFactory mongoDbFactory,
MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
@@ -586,16 +596,6 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
}
@SuppressWarnings("unchecked")
private static void enhanceHeaders(MessageHeaders messageHeaders, Map<String, Object> headers) {
Map<String, Object> innerMap =
(Map<String, Object>) new DirectFieldAccessor(messageHeaders).getPropertyValue("headers");
// using reflection to set ID and TIMESTAMP since they are immutable through MessageHeaders
innerMap.put(MessageHeaders.ID, headers.get(MessageHeaders.ID));
innerMap.put(MessageHeaders.TIMESTAMP, headers.get(MessageHeaders.TIMESTAMP));
}
private static class UuidToDBObjectConverter implements Converter<UUID, DBObject> {
@Override
public DBObject convert(UUID source) {
@@ -650,7 +650,7 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
}
private class DBObjectToMutableMessageConverter implements GenericConverter {
private final class DBObjectToMutableMessageConverter implements GenericConverter {
private final Class<?> mutableMessageClass;

2
spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/support/MongoHeaders.java
View File

@@ -23,7 +23,7 @@ package org.springframework.integration.mongodb.support;
* @author Gary Russell
* @since 2.2
*/
public class MongoHeaders {
public final class MongoHeaders {
private MongoHeaders() {
super();