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

Removed unused imports, polished license headers and suppres some compiler warnings.

Browse Source
This commit is contained in:
Oliver Gierke
2011-07-21 09:07:49 +02:00
parent 4324ed8231
commit 992f09d731
20 changed files with 27 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2010 the original author or authors.
* Copyright 2010-2011 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.
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.mongodb;
import org.springframework.dao.InvalidDataAccessApiUsageException;
public class InvalidMongoDbApiUsageException extends InvalidDataAccessApiUsageException {
public InvalidMongoDbApiUsageException(String msg) {
private static final long serialVersionUID = 2034770973290508041L;
public InvalidMongoDbApiUsageException(String msg) {
super(msg);
}
public InvalidMongoDbApiUsageException(String msg, Throwable cause) {
super(msg, cause);
}
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2010 the original author or authors.
* Copyright 2010-2011 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.
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.mongodb;
import org.springframework.dao.UncategorizedDataAccessException;
public class UncategorizedMongoDbException extends UncategorizedDataAccessException {
public UncategorizedMongoDbException(String msg, Throwable cause) {
private static final long serialVersionUID = -2336595514062364929L;
public UncategorizedMongoDbException(String msg, Throwable cause) {
super(msg, cause);
}
}

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

@@ -19,17 +19,12 @@ package org.springframework.data.mongodb.config;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.data.mongodb.core.MongoFactoryBean;
import org.springframework.data.mongodb.core.MongoOptionsFactoryBean;
import org.springframework.util.StringUtils;
import org.springframework.util.xml.DomUtils;
import org.w3c.dom.Element;
import com.mongodb.ServerAddress;
/**
* Parser for <mongo;gt; definitions. If no name
*
@@ -37,6 +32,7 @@ import com.mongodb.ServerAddress;
*/
public class MongoParser extends AbstractSingleBeanDefinitionParser {
@Override
protected Class<?> getBeanClass(Element element) {
return MongoFactoryBean.class;
}
@@ -53,10 +49,6 @@ public class MongoParser extends AbstractSingleBeanDefinitionParser {
}
@Override
protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
throws BeanDefinitionStoreException {
@@ -66,6 +58,4 @@ public class MongoParser extends AbstractSingleBeanDefinitionParser {
}
return name;
}
}

4
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java
View File

@@ -16,23 +16,21 @@
package org.springframework.data.mongodb.core.convert;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.bson.types.ObjectId;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.ConversionServiceFactory;
import org.springframework.core.convert.support.GenericConversionService;
import org.springframework.data.mongodb.core.convert.MongoConverters.BigDecimalToStringConverter;
import org.springframework.data.mongodb.core.convert.MongoConverters.BigIntegerToObjectIdConverter;
import org.springframework.data.mongodb.core.convert.MongoConverters.ObjectIdToBigIntegerConverter;
import org.springframework.data.mongodb.core.convert.MongoConverters.ObjectIdToStringConverter;
import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigDecimalConverter;
import org.springframework.data.mongodb.core.convert.MongoConverters.StringToObjectIdConverter;
import com.mongodb.BasicDBList;

2
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterSaveEvent.java
View File

@@ -18,8 +18,6 @@ package org.springframework.data.mongodb.core.mapping.event;
import com.mongodb.DBObject;
import org.springframework.data.mapping.PersistentEntity;
/**
* @author Jon Brisbin <jbrisbin@vmware.com>
*/

2
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java
View File

@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.mongodb.core.mapping.event;
import com.mongodb.DBObject;
@@ -23,6 +22,7 @@ import org.apache.commons.logging.LogFactory;
/**
* @author Jon Brisbin <jbrisbin@vmware.com>
*/
@SuppressWarnings({ "hiding", "rawtypes" })
public class LoggingEventListener<MongoMappingEvent> extends AbstractMappingEventListener {
private Log log = LogFactory.getLog(getClass());

16
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoNamespaceReplicaSetTests.java
View File

@@ -18,7 +18,6 @@ package org.springframework.data.mongodb.config;
import static org.junit.Assert.*;
import java.lang.reflect.Field;
import java.util.List;
import org.junit.Test;
@@ -29,8 +28,6 @@ import org.springframework.data.mongodb.core.MongoFactoryBean;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import com.mongodb.Mongo;
import com.mongodb.MongoOptions;
import com.mongodb.ServerAddress;
@RunWith(SpringJUnit4ClassRunner.class)
@@ -40,15 +37,13 @@ public class MongoNamespaceReplicaSetTests extends NamespaceTestSupport {
@Autowired
private ApplicationContext ctx;
@Test
public void testMongoWithReplicaSets() throws Exception {
assertTrue(ctx.containsBean("replicaSetMongo"));
MongoFactoryBean mfb = (MongoFactoryBean) ctx.getBean("&replicaSetMongo");
String host = readField("host", mfb);
Integer port = readField("port", mfb);
List<ServerAddress> replicaSetSeeds = readField("replicaSetSeeds", mfb);
assertNotNull(replicaSetSeeds);
assertNotNull(replicaSetSeeds);
assertEquals("127.0.0.1", replicaSetSeeds.get(0).getHost());
assertEquals(27017, replicaSetSeeds.get(0).getPort());
@@ -56,11 +51,6 @@ public class MongoNamespaceReplicaSetTests extends NamespaceTestSupport {
assertEquals("localhost", replicaSetSeeds.get(1).getHost());
assertEquals(27018, replicaSetSeeds.get(1).getPort());
Mongo mongo = mfb.getObject();
//TODO test infrastructure to have replica sets
//assertEquals(2, mongo.getAllAddress().size());
// TODO test infrastructure to have replica sets
}
}

2
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Friend.java
View File

@@ -15,8 +15,6 @@
*/
package org.springframework.data.mongodb.core;
import java.util.ArrayList;
import java.util.List;
public class Friend {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoAdminIntegrationTests.java
View File

@@ -24,7 +24,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoAdminOperations;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -39,8 +38,7 @@ public class MongoAdminIntegrationTests {
private static Log logger = LogFactory.getLog(MongoAdminIntegrationTests.class);
private MongoAdminOperations mongoAdmin;
@SuppressWarnings("unused")
private DB testAdminDb;
@Autowired

1
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
View File

@@ -63,6 +63,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
* @author Oliver Gierke
* @author Thomas Risberg
*/
@SuppressWarnings("deprecation")
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration("classpath:infrastructure.xml")
public class MongoTemplateTests {

2
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatialAppConfig.java
View File

@@ -30,12 +30,14 @@ public class GeoSpatialAppConfig extends AbstractMongoConfiguration {
return "database";
}
@Override
@Bean
public Mongo mongo() throws Exception {
return new Mongo("localhost");
}
@Bean
@SuppressWarnings("rawtypes")
public LoggingEventListener<MongoMappingEvent> mappingEventsListener() {
return new LoggingEventListener<MongoMappingEvent>();
}

1
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Address.java
View File

@@ -21,6 +21,7 @@ package org.springframework.data.mongodb.core.mapping;
*/
public class Address implements Comparable<Address> {
@SuppressWarnings("unused")
private String id;
private String[] lines;
private String city;

1
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/CustomCollectionWithIndex.java
View File

@@ -27,6 +27,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
public class CustomCollectionWithIndex {
@Id
@SuppressWarnings("unused")
private String id;
@Indexed
private String name;

1
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/DetectedCollectionWithIndex.java
View File

@@ -27,6 +27,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
public class DetectedCollectionWithIndex {
@Id
@SuppressWarnings("unused")
private String id;
@Indexed
private String name;

1
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeneratedId.java
View File

@@ -28,6 +28,7 @@ public class GeneratedId {
@Id
private ObjectId id;
@SuppressWarnings("unused")
private String name;
public GeneratedId(String name) {

1
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonCustomCollection1.java
View File

@@ -26,6 +26,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
public class PersonCustomCollection1 extends BasePerson {
@Id
@SuppressWarnings("unused")
private String id;
public PersonCustomCollection1(Integer ssn, String firstName, String lastName) {

1
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonCustomCollection2.java
View File

@@ -26,6 +26,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
public class PersonCustomCollection2 extends BasePerson {
@Id
@SuppressWarnings("unused")
private String id;
public PersonCustomCollection2(Integer ssn, String firstName, String lastName) {

1
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonMultiDimArrays.java
View File

@@ -26,6 +26,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
public class PersonMultiDimArrays extends BasePerson {
@Id
@SuppressWarnings("unused")
private String id;
private String[][] grid;

2
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/monitor/MongoMonitorIntegrationTests.java
View File

@@ -41,7 +41,7 @@ public class MongoMonitorIntegrationTests {
@Test
public void serverInfo() {
ServerInfo serverInfo = new ServerInfo(mongo);
String version = serverInfo.getVersion();
serverInfo.getVersion();
Assert.isTrue(StringUtils.hasText("1."));
}

1
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Person.java
View File

@@ -39,6 +39,7 @@ public class Person extends Contact {
@Indexed(unique = true, dropDups = true)
private String email;
private Integer age;
@SuppressWarnings("unused")
private Sex sex;
@GeoSpatialIndexed