Skip to content

Commit 644c1a2

Browse files
mp911demp911de
committed
DATAMONGO-1587 - Migrate ticket references in test code to Spring Framework style.
1 parent 8df9d30 commit 644c1a2

File tree

170 files changed

+2071
-7474
lines changed

Some content is hidden

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

170 files changed

+2071
-7474
lines changed

‎spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/MongoLog4jAppenderUnitTests.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013 the original author or authors.
2+
* Copyright 2013-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,10 +24,7 @@
2424
*/
2525
public class MongoLog4jAppenderUnitTests {
2626

27-
/**
28-
* @see DATAMONGO-641
29-
*/
30-
@Test
27+
@Test // DATAMONGO-641
3128
public void closesWithoutMongoInstancePresent() {
3229
new MongoLog4jAppender().close();
3330
}

‎spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ public DBRef toDBRef(Object object, MongoPersistentProperty referringProperty) {
339339
Assert.isTrue(annotation != null, "The referenced property has to be mapped with @DBRef!");
340340
}
341341

342-
// @see DATAMONGO-913
342+
// DATAMONGO-913
343343
if (object instanceof LazyLoadingProxy) {
344344
return ((LazyLoadingProxy) object).toDBRef();
345345
}

‎spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014 the original author or authors.
2+
* Copyright 2014-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
2222
/**
2323
* Sample configuration class in default package.
2424
*
25-
* @see DATAMONGO-877
2625
* @author Oliver Gierke
2726
*/
2827
@Configuration

‎spring-data-mongodb/src/test/java/ConfigClassInDefaultPackageUnitTests.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014 the original author or authors.
2+
* Copyright 2014-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,15 +19,11 @@
1919
/**
2020
* Unit test for {@link ConfigClassInDefaultPackage}.
2121
*
22-
* @see DATAMONGO-877
2322
* @author Oliver Gierke
2423
*/
2524
public class ConfigClassInDefaultPackageUnitTests {
2625

27-
/**
28-
* @see DATAMONGO-877
29-
*/
30-
@Test
26+
@Test // DATAMONGO-877
3127
public void loadsConfigClassFromDefaultPackage() {
3228
new AnnotationConfigApplicationContext(ConfigClassInDefaultPackage.class).close();
3329
}

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractMongoConfigurationUnitTests.java

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2016 the original author or authors.
2+
* Copyright 2012-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -57,10 +57,7 @@ public class AbstractMongoConfigurationUnitTests {
5757

5858
@Rule public ExpectedException exception = ExpectedException.none();
5959

60-
/**
61-
* @see DATAMONGO-496
62-
*/
63-
@Test
60+
@Test // DATAMONGO-496
6461
public void usesConfigClassPackageAsBaseMappingPackage() throws ClassNotFoundException {
6562

6663
AbstractMongoConfiguration configuration = new SampleMongoConfiguration();
@@ -69,28 +66,19 @@ public void usesConfigClassPackageAsBaseMappingPackage() throws ClassNotFoundExc
6966
assertThat(configuration.getInitialEntitySet(), hasItem(Entity.class));
7067
}
7168

72-
/**
73-
* @see DATAMONGO-496
74-
*/
75-
@Test
69+
@Test // DATAMONGO-496
7670
public void doesNotScanPackageIfMappingPackageIsNull() throws ClassNotFoundException {
7771
assertScanningDisabled(null);
7872
}
7973

80-
/**
81-
* @see DATAMONGO-496
82-
*/
83-
@Test
74+
@Test // DATAMONGO-496
8475
public void doesNotScanPackageIfMappingPackageIsEmpty() throws ClassNotFoundException {
8576

8677
assertScanningDisabled("");
8778
assertScanningDisabled(" ");
8879
}
8980

90-
/**
91-
* @see DATAMONGO-569
92-
*/
93-
@Test
81+
@Test // DATAMONGO-569
9482
public void containsMongoDbFactoryButNoMongoBean() {
9583

9684
AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
@@ -113,10 +101,7 @@ public void returnsUninitializedMappingContext() throws Exception {
113101
assertThat(context.getPersistentEntities(), is(not(emptyIterable())));
114102
}
115103

116-
/**
117-
* @see DATAMONGO-717
118-
*/
119-
@Test
104+
@Test // DATAMONGO-717
120105
public void lifecycleCallbacksAreInvokedInAppropriateOrder() {
121106

122107
AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
@@ -128,10 +113,7 @@ public void lifecycleCallbacksAreInvokedInAppropriateOrder() {
128113
context.close();
129114
}
130115

131-
/**
132-
* @see DATAMONGO-725
133-
*/
134-
@Test
116+
@Test // DATAMONGO-725
135117
public void shouldBeAbleToConfigureCustomTypeMapperViaJavaConfig() {
136118

137119
AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
@@ -143,18 +125,12 @@ public void shouldBeAbleToConfigureCustomTypeMapperViaJavaConfig() {
143125
context.close();
144126
}
145127

146-
/**
147-
* @see DATAMONGO-789
148-
*/
149-
@Test
128+
@Test // DATAMONGO-789
150129
public void authenticationDatabaseShouldDefaultToNull() {
151130
assertThat(new SampleMongoConfiguration().getAuthenticationDatabaseName(), is(nullValue()));
152131
}
153132

154-
/**
155-
* @see DATAMONGO-1470
156-
*/
157-
@Test
133+
@Test // DATAMONGO-1470
158134
@SuppressWarnings("unchecked")
159135
public void allowsMultipleEntityBasePackages() throws ClassNotFoundException {
160136

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfigurationIntegrationTests.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016 the original author or authors.
2+
* Copyright 2016-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -42,10 +42,7 @@ public class AbstractReactiveMongoConfigurationIntegrationTests {
4242

4343
@Autowired ApplicationContext context;
4444

45-
/**
46-
* @see DATAMONGO-1444
47-
*/
48-
@Test
45+
@Test // DATAMONGO-1444
4946
public void contextShouldContainTemplate() {
5047

5148
assertThat(context.getBean(SimpleReactiveMongoDatabaseFactory.class)).isNotNull();

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfigurationUnitTests.java

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016 the original author or authors.
2+
* Copyright 2016-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -57,10 +57,7 @@ public class AbstractReactiveMongoConfigurationUnitTests {
5757

5858
@Rule public ExpectedException exception = ExpectedException.none();
5959

60-
/**
61-
* @see DATAMONGO-1444
62-
*/
63-
@Test
60+
@Test // DATAMONGO-1444
6461
public void usesConfigClassPackageAsBaseMappingPackage() throws ClassNotFoundException {
6562

6663
AbstractReactiveMongoConfiguration configuration = new SampleMongoConfiguration();
@@ -69,28 +66,19 @@ public void usesConfigClassPackageAsBaseMappingPackage() throws ClassNotFoundExc
6966
assertThat(configuration.getInitialEntitySet(), hasItem(Entity.class));
7067
}
7168

72-
/**
73-
* @see DATAMONGO-1444
74-
*/
75-
@Test
69+
@Test // DATAMONGO-1444
7670
public void doesNotScanPackageIfMappingPackageIsNull() throws ClassNotFoundException {
7771
assertScanningDisabled(null);
7872
}
7973

80-
/**
81-
* @see DATAMONGO-1444
82-
*/
83-
@Test
74+
@Test // DATAMONGO-1444
8475
public void doesNotScanPackageIfMappingPackageIsEmpty() throws ClassNotFoundException {
8576

8677
assertScanningDisabled("");
8778
assertScanningDisabled(" ");
8879
}
8980

90-
/**
91-
* @see DATAMONGO-1444
92-
*/
93-
@Test
81+
@Test // DATAMONGO-1444
9482
public void containsMongoDbFactoryButNoMongoBean() {
9583

9684
AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
@@ -102,10 +90,7 @@ public void containsMongoDbFactoryButNoMongoBean() {
10290
context.close();
10391
}
10492

105-
/**
106-
* @see DATAMONGO-1444
107-
*/
108-
@Test
93+
@Test // DATAMONGO-1444
10994
public void returnsUninitializedMappingContext() throws Exception {
11095

11196
SampleMongoConfiguration configuration = new SampleMongoConfiguration();
@@ -116,10 +101,7 @@ public void returnsUninitializedMappingContext() throws Exception {
116101
assertThat(context.getPersistentEntities(), is(not(emptyIterable())));
117102
}
118103

119-
/**
120-
* @see DATAMONGO-1444
121-
*/
122-
@Test
104+
@Test // DATAMONGO-1444
123105
public void lifecycleCallbacksAreInvokedInAppropriateOrder() {
124106

125107
AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
@@ -131,10 +113,7 @@ public void lifecycleCallbacksAreInvokedInAppropriateOrder() {
131113
context.close();
132114
}
133115

134-
/**
135-
* @see DATAMONGO-1444
136-
*/
137-
@Test
116+
@Test // DATAMONGO-1444
138117
public void shouldBeAbleToConfigureCustomTypeMapperViaJavaConfig() {
139118

140119
AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
@@ -146,10 +125,7 @@ public void shouldBeAbleToConfigureCustomTypeMapperViaJavaConfig() {
146125
context.close();
147126
}
148127

149-
/**
150-
* @see DATAMONGO-1444
151-
*/
152-
@Test
128+
@Test // DATAMONGO-1444
153129
@SuppressWarnings("unchecked")
154130
public void allowsMultipleEntityBasePackages() throws ClassNotFoundException {
155131

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingIntegrationTests.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2015 the original author or authors.
2+
* Copyright 2012-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -35,10 +35,7 @@
3535
*/
3636
public class AuditingIntegrationTests {
3737

38-
/**
39-
* @see DATAMONGO-577, DATAMONGO-800, DATAMONGO-883
40-
*/
41-
@Test
38+
@Test // DATAMONGO-577, DATAMONGO-800, DATAMONGO-883
4239
public void enablesAuditingAndSetsPropertiesAccordingly() throws Exception {
4340

4441
AbstractApplicationContext context = new ClassPathXmlApplicationContext("auditing.xml", getClass());

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingViaJavaConfigRepositoriesTests.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2016 the original author or authors.
2+
* Copyright 2013-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -79,10 +79,7 @@ public void setup() {
7979
this.auditor = auditablePersonRepository.save(new AuditablePerson("auditor"));
8080
}
8181

82-
/**
83-
* @see DATAMONGO-792, DATAMONGO-883
84-
*/
85-
@Test
82+
@Test // DATAMONGO-792, DATAMONGO-883
8683
public void basicAuditing() {
8784

8885
doReturn(this.auditor).when(this.auditorAware).getCurrentAuditor();
@@ -96,19 +93,13 @@ public void basicAuditing() {
9693
assertThat(savedUser.getCreatedAt(), is(notNullValue()));
9794
}
9895

99-
/**
100-
* @see DATAMONGO-843
101-
*/
102-
@Test
96+
@Test // DATAMONGO-843
10397
@SuppressWarnings("resource")
10498
public void auditingUsesFallbackMappingContextIfNoneConfiguredWithRepositories() {
10599
new AnnotationConfigApplicationContext(SimpleConfigWithRepositories.class);
106100
}
107101

108-
/**
109-
* @see DATAMONGO-843
110-
*/
111-
@Test
102+
@Test // DATAMONGO-843
112103
@SuppressWarnings("resource")
113104
public void auditingUsesFallbackMappingContextIfNoneConfigured() {
114105
new AnnotationConfigApplicationContext(SimpleConfig.class);

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/GeoJsonConfigurationIntegrationTests.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015 the original author or authors.
2+
* Copyright 2015-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -43,10 +43,7 @@ static class Config {}
4343

4444
@Autowired GeoJsonModule geoJsonModule;
4545

46-
/**
47-
* @see DATAMONGO-1181
48-
*/
49-
@Test
46+
@Test // DATAMONGO-1181
5047
public void picksUpGeoJsonModuleConfigurationByDefault() {
5148
assertThat(geoJsonModule, is(notNullValue()));
5249
}

0 commit comments

Comments
 (0)