Skip to content

Commit da23133

Browse files
committed
Yet another round of formatting.
Added Eclipse formatter settings.
1 parent ce5046c commit da23133

File tree

58 files changed

+764
-549
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+764
-549
lines changed

spring-data-mongodb/etc/eclipse-formatter.xml

Lines changed: 291 additions & 0 deletions
Large diffs are not rendered by default.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/InvalidMongoDbApiUsageException.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ public class InvalidMongoDbApiUsageException extends InvalidDataAccessApiUsageEx
2222
private static final long serialVersionUID = 2034770973290508041L;
2323

2424
public InvalidMongoDbApiUsageException(String msg) {
25-
super(msg);
26-
}
25+
super(msg);
26+
}
2727

28-
public InvalidMongoDbApiUsageException(String msg, Throwable cause) {
29-
super(msg, cause);
30-
}
28+
public InvalidMongoDbApiUsageException(String msg, Throwable cause) {
29+
super(msg, cause);
30+
}
3131
}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoCollectionUtils.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@
1818

1919
import org.springframework.util.StringUtils;
2020

21-
22-
2321
/**
2422
* Helper class featuring helper methods for working with MongoDb collections.
2523
* <p/>
2624
* <p/>
2725
* Mainly intended for internal use within the framework.
28-
*
26+
*
2927
* @author Thomas Risberg
3028
* @since 1.0
3129
*/
@@ -40,7 +38,7 @@ private MongoCollectionUtils() {
4038

4139
/**
4240
* Obtains the collection name to use for the provided class
43-
*
41+
*
4442
* @param entityClass The class to determine the preferred collection name for
4543
* @return The preferred collection name
4644
*/

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDbFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/**
88
* Interface for factories creating {@link DB} instances.
9-
*
9+
*
1010
* @author Mark Pollack
1111
*/
1212
public interface MongoDbFactory {
@@ -18,7 +18,7 @@ public interface MongoDbFactory {
1818
* @throws DataAccessException
1919
*/
2020
DB getDb() throws DataAccessException;
21-
21+
2222
/**
2323
* Creates a {@link DB} instance to access the database with the given name.
2424
*

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/UncategorizedMongoDbException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ public class UncategorizedMongoDbException extends UncategorizedDataAccessExcept
2222
private static final long serialVersionUID = -2336595514062364929L;
2323

2424
public UncategorizedMongoDbException(String msg, Throwable cause) {
25-
super(msg, cause);
26-
}
25+
super(msg, cause);
26+
}
2727
}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,38 +46,40 @@ public abstract class AbstractMongoConfiguration {
4646

4747
@Bean
4848
public MongoTemplate mongoTemplate() throws Exception {
49-
return new MongoTemplate(mongoDbFactory(), mappingMongoConverter());
49+
return new MongoTemplate(mongoDbFactory(), mappingMongoConverter());
5050
}
5151

5252
@Bean
53-
public MongoDbFactory mongoDbFactory() throws Exception {
54-
if (getUserCredentials() == null) {
55-
return new SimpleMongoDbFactory(mongo(), getDatabaseName());
56-
} else {
57-
return new SimpleMongoDbFactory(mongo(), getDatabaseName(), getUserCredentials());
58-
}
53+
public MongoDbFactory mongoDbFactory() throws Exception {
54+
if (getUserCredentials() == null) {
55+
return new SimpleMongoDbFactory(mongo(), getDatabaseName());
56+
} else {
57+
return new SimpleMongoDbFactory(mongo(), getDatabaseName(), getUserCredentials());
58+
}
5959
}
6060

6161
public String getMappingBasePackage() {
6262
return "";
6363
}
64-
64+
6565
public UserCredentials getUserCredentials() {
66-
return null;
66+
return null;
6767
}
6868

6969
@Bean
7070
public MongoMappingContext mongoMappingContext() throws ClassNotFoundException, LinkageError {
7171
MongoMappingContext mappingContext = new MongoMappingContext();
7272
String basePackage = getMappingBasePackage();
7373
if (StringUtils.hasText(basePackage)) {
74-
ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(false);
74+
ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
75+
false);
7576
componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
7677
componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));
7778

7879
Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
7980
for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
80-
initialEntitySet.add(ClassUtils.forName(candidate.getBeanClassName(), mappingContext.getClass().getClassLoader()));
81+
initialEntitySet.add(ClassUtils.forName(candidate.getBeanClassName(), mappingContext.getClass()
82+
.getClassLoader()));
8183
}
8284
mappingContext.setInitialEntitySet(initialEntitySet);
8385
}
@@ -93,7 +95,7 @@ public MappingMongoConverter mappingMongoConverter() throws Exception {
9395

9496
/**
9597
* Hook that allows post-processing after the MappingMongoConverter has been successfully created.
96-
*
98+
*
9799
* @param converter
98100
*/
99101
protected void afterMappingMongoConverterCreation(MappingMongoConverter converter) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ protected String resolveId(Element element, AbstractBeanDefinition definition, P
6666
@Override
6767
protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
6868
BeanDefinitionRegistry registry = parserContext.getRegistry();
69-
69+
7070
BeanDefinition conversionsDefinition = getCustomConversions(element, parserContext);
7171
String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition);
7272

@@ -100,17 +100,19 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa
100100
if (!StringUtils.hasText(dbFactoryRef)) {
101101
dbFactoryRef = DB_FACTORY;
102102
}
103-
BeanDefinitionBuilder indexHelperBuilder = BeanDefinitionBuilder.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
103+
BeanDefinitionBuilder indexHelperBuilder = BeanDefinitionBuilder
104+
.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
104105
indexHelperBuilder.addConstructorArgValue(new RuntimeBeanReference(ctxRef));
105106
indexHelperBuilder.addConstructorArgValue(new RuntimeBeanReference(dbFactoryRef));
106107
registry.registerBeanDefinition(INDEX_HELPER, indexHelperBuilder.getBeanDefinition());
107108
}
108109

109110
return converterBuilder.getBeanDefinition();
110111
}
111-
112-
private String potentiallyCreateMappingContext(Element element, ParserContext parserContext, BeanDefinition conversionsDefinition) {
113-
112+
113+
private String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
114+
BeanDefinition conversionsDefinition) {
115+
114116
String ctxRef = element.getAttribute("mapping-context-ref");
115117
if (!StringUtils.hasText(ctxRef)) {
116118
BeanDefinitionBuilder mappingContextBuilder = BeanDefinitionBuilder
@@ -120,26 +122,26 @@ private String potentiallyCreateMappingContext(Element element, ParserContext pa
120122
if (classesToAdd != null) {
121123
mappingContextBuilder.addPropertyValue("initialEntitySet", classesToAdd);
122124
}
123-
125+
124126
if (conversionsDefinition != null) {
125127
AbstractBeanDefinition simpleTypesDefinition = new GenericBeanDefinition();
126128
simpleTypesDefinition.setFactoryBeanName("customConversions");
127129
simpleTypesDefinition.setFactoryMethodName("getSimpleTypeHolder");
128-
130+
129131
mappingContextBuilder.addPropertyValue("simpleTypeHolder", simpleTypesDefinition);
130132
}
131133

132134
parserContext.getRegistry().registerBeanDefinition(MAPPING_CONTEXT, mappingContextBuilder.getBeanDefinition());
133135
ctxRef = MAPPING_CONTEXT;
134136
}
135-
137+
136138
return ctxRef;
137139
}
138-
140+
139141
private BeanDefinition getCustomConversions(Element element, ParserContext parserContext) {
140-
142+
141143
List<Element> customConvertersElements = DomUtils.getChildElementsByTagName(element, "custom-converters");
142-
144+
143145
if (customConvertersElements.size() == 1) {
144146
Element customerConvertersElement = customConvertersElements.get(0);
145147
ManagedList<BeanMetadataElement> converterBeans = new ManagedList<BeanMetadataElement>();
@@ -149,18 +151,18 @@ private BeanDefinition getCustomConversions(Element element, ParserContext parse
149151
converterBeans.add(parseConverter(listenerElement, parserContext));
150152
}
151153
}
152-
154+
153155
BeanDefinitionBuilder conversionsBuilder = BeanDefinitionBuilder.rootBeanDefinition(CustomConversions.class);
154156
conversionsBuilder.addConstructorArgValue(converterBeans);
155-
157+
156158
AbstractBeanDefinition conversionsBean = conversionsBuilder.getBeanDefinition();
157159
conversionsBean.setSource(parserContext.extractSource(element));
158-
160+
159161
parserContext.getRegistry().registerBeanDefinition("customConversions", conversionsBean);
160-
162+
161163
return conversionsBean;
162164
}
163-
165+
164166
return null;
165167
}
166168

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa
7474
if (userCredentials != null) {
7575
dbFactoryBuilder.addConstructorArgValue(userCredentials);
7676
}
77-
77+
7878
ParsingUtils.setPropertyValue(element, dbFactoryBuilder, "write-concern", "writeConcern");
7979

8080
return dbFactoryBuilder.getBeanDefinition();

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
/**
2929
* Parser for &lt;mongo;gt; definitions. If no name
30-
*
30+
*
3131
* @author Mark Pollack
3232
*/
3333
public class MongoParser extends AbstractSingleBeanDefinitionParser {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoRepositoryNamespaceHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
/**
2121
* {@link org.springframework.beans.factory.xml.NamespaceHandler} for Mongo DB based repositories.
22-
*
22+
*
2323
* @author Oliver Gierke
2424
*/
2525
public class MongoRepositoryNamespaceHandler extends NamespaceHandlerSupport {

0 commit comments

Comments
 (0)