DATACOUCH-23 - Make tests clean buckets, Import cleanup.

Author: daschl

src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java

@@ -17,7 +17,6 @@
 package org.springframework.data.couchbase.cache;
 
 import com.couchbase.client.CouchbaseClient;
-import net.spy.memcached.internal.OperationFuture;
 import org.springframework.cache.Cache;
 import org.springframework.cache.support.SimpleValueWrapper;
 

src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java

@@ -17,12 +17,13 @@
 package org.springframework.data.couchbase.cache;
 
 import com.couchbase.client.CouchbaseClient;
+import org.springframework.cache.Cache;
+import org.springframework.cache.support.AbstractCacheManager;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
-import org.springframework.cache.Cache;
-import org.springframework.cache.support.AbstractCacheManager;
 
 /**
  * The {@link CouchbaseCacheManager} orchestrates {@link CouchbaseCache} instances.

src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java

@@ -17,21 +17,22 @@
 package org.springframework.data.couchbase.config;
 
 import com.couchbase.client.CouchbaseClient;
-import java.util.HashSet;
-import java.util.Set;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
-import org.springframework.data.couchbase.core.mapping.CouchbaseMappingContext;
 import org.springframework.data.couchbase.core.CouchbaseTemplate;
 import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter;
+import org.springframework.data.couchbase.core.mapping.CouchbaseMappingContext;
 import org.springframework.data.couchbase.core.mapping.Document;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Base class for Spring Data Couchbase configuration using JavaConfig.
  *

src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java

@@ -16,19 +16,17 @@
 
 package org.springframework.data.couchbase.core;
 
+import com.couchbase.client.ObservedException;
+import com.couchbase.client.ObservedModifiedException;
+import com.couchbase.client.ObservedTimeoutException;
 import com.couchbase.client.protocol.views.InvalidViewException;
-import com.couchbase.client.protocol.views.ViewException;
+import com.couchbase.client.vbucket.ConnectionException;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 
-import com.couchbase.client.ObservedException;
-import com.couchbase.client.ObservedModifiedException;
-import com.couchbase.client.ObservedTimeoutException;
-import com.couchbase.client.vbucket.ConnectionException;
-
 import java.util.concurrent.CancellationException;
 
 

src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java

@@ -17,13 +17,13 @@
 package org.springframework.data.couchbase.core;
 
 
-import java.util.Collection;
-import java.util.List;
-
 import com.couchbase.client.protocol.views.Query;
 import com.couchbase.client.protocol.views.ViewResponse;
 import org.springframework.data.couchbase.core.convert.CouchbaseConverter;
 
+import java.util.Collection;
+import java.util.List;
+
 /**
  * Defines common operations on the Couchbase data source, most commonly implemented by {@link CouchbaseTemplate}.
  *

src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java

@@ -16,16 +16,12 @@
 
 package org.springframework.data.couchbase.core;
 
-import java.util.*;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
-
+import com.couchbase.client.CouchbaseClient;
 import com.couchbase.client.protocol.views.Query;
 import com.couchbase.client.protocol.views.View;
 import com.couchbase.client.protocol.views.ViewResponse;
 import com.couchbase.client.protocol.views.ViewRow;
 import net.spy.memcached.internal.OperationFuture;
-
 import org.springframework.dao.QueryTimeoutException;
 import org.springframework.data.couchbase.core.convert.CouchbaseConverter;
 import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter;
@@ -34,7 +30,9 @@
 import org.springframework.data.couchbase.core.mapping.*;
 import org.springframework.data.mapping.context.MappingContext;
 
-import com.couchbase.client.CouchbaseClient;
+import java.util.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 
 /**
  * @author Michael Nitschinger

src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java

@@ -20,9 +20,7 @@
 import org.springframework.util.Assert;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Value object to capture custom conversion.

src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java

@@ -16,27 +16,30 @@
 
 package org.springframework.data.couchbase.core.convert;
 
-import java.util.*;
-
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.CollectionFactory;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.ConversionServiceFactory;
 import org.springframework.data.convert.EntityInstantiator;
-import org.springframework.data.couchbase.core.mapping.*;
+import org.springframework.data.couchbase.core.mapping.CouchbaseDocument;
+import org.springframework.data.couchbase.core.mapping.CouchbaseList;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentEntity;
+import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.AssociationHandler;
 import org.springframework.data.mapping.PreferredConstructor.Parameter;
+import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.*;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
+import java.util.*;
+
 /**
  * The Couchbase special {@link MappingCouchbaseConverter}.
  *

src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java

@@ -16,13 +16,14 @@
 
 package org.springframework.data.couchbase.core.mapping;
 
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Field;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.util.StringUtils;
 
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+
 /**
  * Implements annotated property representations of a given Field instance.
  *

src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java

@@ -18,7 +18,10 @@
 
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * A {@link CouchbaseList} is an abstract list that represents an array stored in a (most of the times JSON) document.

src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseMappingContext.java

@@ -16,15 +16,16 @@
 
 package org.springframework.data.couchbase.core.mapping;
 
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Field;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.data.mapping.context.AbstractMappingContext;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.util.TypeInformation;
 
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+
 /**
  * Default implementation of a {@link org.springframework.data.mapping.context.MappingContext} for Couchbase using
  * {@link BasicCouchbasePersistentEntity} and {@link BasicCouchbasePersistentProperty} as primary abstractions.

src/main/java/org/springframework/data/couchbase/core/mapping/Document.java

@@ -16,13 +16,10 @@
 
 package org.springframework.data.couchbase.core.mapping;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import org.springframework.data.annotation.Persistent;
 
+import java.lang.annotation.*;
+
 /**
  * Identifies a domain object to be persisted to Couchbase.
  *

src/main/java/org/springframework/data/couchbase/monitor/ClusterInfo.java

@@ -17,14 +17,10 @@
 package org.springframework.data.couchbase.monitor;
 
 import com.couchbase.client.CouchbaseClient;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
 import org.springframework.jmx.export.annotation.ManagedAttribute;
 import org.springframework.jmx.export.annotation.ManagedMetric;
 import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.web.client.RestTemplate;
 
-import java.util.Arrays;
 import java.util.HashMap;
 
 /**

src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java

@@ -16,16 +16,11 @@
 
 package org.springframework.data.couchbase.repository.config;
 
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ComponentScan.Filter;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.couchbase.repository.support.CouchbaseRepositoryFactoryBean;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * Annotation to activate Couchbase repositories. If no base package is configured through either {@link #value()},

src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java

@@ -23,9 +23,6 @@
 import org.springframework.data.couchbase.core.CouchbaseOperations;
 import org.springframework.data.couchbase.repository.CouchbaseRepository;
 import org.springframework.data.couchbase.repository.query.CouchbaseEntityInformation;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
 import org.springframework.util.Assert;
 
 import java.io.Serializable;

src/test/java/org/springframework/data/couchbase/TestApplicationConfig.java

@@ -16,34 +16,61 @@
 
 package org.springframework.data.couchbase;
 
-import com.couchbase.client.CouchbaseClient;
-import java.io.IOException;
-import java.net.URI;
-import java.util.Arrays;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
-import org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration;
+import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter;
+import org.springframework.data.couchbase.core.mapping.CouchbaseMappingContext;
+import org.springframework.data.couchbase.util.BucketManager;
 
 /**
  * @author Michael Nitschinger
  */
 @Configuration
-public class TestApplicationConfig extends AbstractCouchbaseConfiguration {
+public class TestApplicationConfig  {
 
   @Autowired
   private Environment env;
 
   @Bean
-  @Override
-  public CouchbaseClient couchbaseClient() throws IOException {
-    String defaultHost = "http://127.0.0.1:8091/pools";
-    String host = env.getProperty("couchbase.host", defaultHost);
+  public String couchbaseHost() {
+    return env.getProperty("couchbase.host", "http://127.0.0.1:8091/pools");
+  }
+
+  @Bean
+  public String couchbaseBucket() {
+    return env.getProperty("couchbase.bucket", "default");
+  }
+
+  @Bean
+  public String couchbasePassword() {
+    return env.getProperty("couchbase.password", "");
+  }
+
+  @Bean
+  public String couchbaseAdmin() {
+    return env.getProperty("couchbase.admin", "Administrator");
+  }
 
-    String bucket = env.getProperty("couchbase.bucket", "default");
-    String pass = env.getProperty("couchbase.password", "");
-    return new CouchbaseClient(Arrays.asList(URI.create(host)), bucket, pass);
+  @Bean
+  public String couchbaseAdminPassword() {
+    return env.getProperty("couchbase.adminPassword", "password");
+  }
+
+  @Bean
+  public BucketManager bucketManager() {
+    return new BucketManager(couchbaseHost(), couchbaseAdmin(), couchbaseAdminPassword());
+  }
+
+  @Bean
+  public MappingCouchbaseConverter mappingCouchbaseConverter() throws Exception {
+    return new MappingCouchbaseConverter(couchbaseMappingContext());
+  }
+
+  @Bean
+  public CouchbaseMappingContext couchbaseMappingContext() throws Exception {
+    return new CouchbaseMappingContext();
   }
 
 }