diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java index 79b7b40f3..d9c52e3bb 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java @@ -116,7 +116,9 @@ public abstract class AbstractMongoConfiguration { * entities. */ protected String getMappingBasePackage() { - return getClass().getPackage().getName(); + + Package mappingBasePackage = getClass().getPackage(); + return mappingBasePackage == null ? null : mappingBasePackage.getName(); } /** diff --git a/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java b/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java new file mode 100644 index 000000000..4a77bc00e --- /dev/null +++ b/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java @@ -0,0 +1,48 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import org.springframework.context.annotation.Configuration; +import org.springframework.data.mongodb.config.AbstractMongoConfiguration; + +import com.mongodb.Mongo; +import com.mongodb.MongoClient; + +/** + * Sample configuration class in default package. + * + * @see DATAMONGO-877 + * @author Oliver Gierke + */ +@Configuration +public class ConfigClassInDefaultPackage extends AbstractMongoConfiguration { + + /* + * (non-Javadoc) + * @see org.springframework.data.mongodb.config.AbstractMongoConfiguration#getDatabaseName() + */ + @Override + protected String getDatabaseName() { + return "default"; + } + + /* + * (non-Javadoc) + * @see org.springframework.data.mongodb.config.AbstractMongoConfiguration#mongo() + */ + @Override + public Mongo mongo() throws Exception { + return new MongoClient(); + } +} diff --git a/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackageUnitTests.java b/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackageUnitTests.java new file mode 100644 index 000000000..f9b9a78ca --- /dev/null +++ b/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackageUnitTests.java @@ -0,0 +1,34 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import org.junit.Test; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +/** + * Unit test for {@link ConfigClassInDefaultPackage}. + * + * @see DATAMONGO-877 + * @author Oliver Gierke + */ +public class ConfigClassInDefaultPackageUnitTests { + + /** + * @see DATAMONGO-877 + */ + @Test + public void loadsConfigClassFromDefaultPackage() { + new AnnotationConfigApplicationContext(ConfigClassInDefaultPackage.class).close(); + } +}