Fix config bean dependencies. (#1588)

Closes #1557.

Author: mikereiche

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

@@ -39,7 +39,6 @@
 import org.springframework.data.couchbase.core.ReactiveCouchbaseTemplate;
 import org.springframework.data.couchbase.core.convert.CouchbaseCustomConversions;
 import org.springframework.data.couchbase.core.convert.CouchbasePropertyValueConverterFactory;
-import org.springframework.data.couchbase.core.convert.CryptoConverter;
 import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter;
 import org.springframework.data.couchbase.core.convert.translation.JacksonTranslationService;
 import org.springframework.data.couchbase.core.convert.translation.TranslationService;
@@ -88,6 +87,9 @@
 @Configuration
 public abstract class AbstractCouchbaseConfiguration {
 
+	ObjectMapper mapper;
+	CryptoManager cryptoManager = null;
+
 	/**
 	 * The connection string which allows the SDK to connect to the cluster.
 	 * <p>
@@ -155,9 +157,8 @@ public ClusterEnvironment couchbaseClusterEnvironment() {
 		if (!nonShadowedJacksonPresent()) {
 			throw new CouchbaseException("non-shadowed Jackson not present");
 		}
-		CryptoManager cryptoManager = cryptoManager();
-		builder.jsonSerializer(JacksonJsonSerializer.create(couchbaseObjectMapper(cryptoManager)));
-		builder.cryptoManager(cryptoManager);
+		builder.jsonSerializer(JacksonJsonSerializer.create(getCouchbaseObjectMapper()));
+		builder.cryptoManager(getCryptoManager());
 		configureEnvironment(builder);
 		return builder.build();
 	}
@@ -167,8 +168,7 @@ public ClusterEnvironment couchbaseClusterEnvironment() {
 	 *
 	 * @param builder the builder that can be customized.
 	 */
-	protected void configureEnvironment(final ClusterEnvironment.Builder builder) {
-	}
+	protected void configureEnvironment(final ClusterEnvironment.Builder builder) {}
 
 	@Bean(name = BeanNames.COUCHBASE_TEMPLATE)
 	public CouchbaseTemplate couchbaseTemplate(CouchbaseClientFactory couchbaseClientFactory,
@@ -177,6 +177,7 @@ public CouchbaseTemplate couchbaseTemplate(CouchbaseClientFactory couchbaseClien
 				getDefaultConsistency());
 	}
 
+	@Deprecated
 	public CouchbaseTemplate couchbaseTemplate(CouchbaseClientFactory couchbaseClientFactory,
 			MappingCouchbaseConverter mappingCouchbaseConverter) {
 		return couchbaseTemplate(couchbaseClientFactory, mappingCouchbaseConverter, new JacksonTranslationService());
@@ -189,6 +190,7 @@ public ReactiveCouchbaseTemplate reactiveCouchbaseTemplate(CouchbaseClientFactor
 				getDefaultConsistency());
 	}
 
+	@Deprecated
 	public ReactiveCouchbaseTemplate reactiveCouchbaseTemplate(CouchbaseClientFactory couchbaseClientFactory,
 			MappingCouchbaseConverter mappingCouchbaseConverter) {
 		return reactiveCouchbaseTemplate(couchbaseClientFactory, mappingCouchbaseConverter,
@@ -288,7 +290,7 @@ public MappingCouchbaseConverter mappingCouchbaseConverter(CouchbaseMappingConte
 	@Bean
 	public TranslationService couchbaseTranslationService() {
 		final JacksonTranslationService jacksonTranslationService = new JacksonTranslationService();
-		jacksonTranslationService.setObjectMapper(couchbaseObjectMapper(cryptoManager()));
+		jacksonTranslationService.setObjectMapper(getCouchbaseObjectMapper());
 		jacksonTranslationService.afterPropertiesSet();
 		// for sdk3, we need to ask the mapper _it_ uses to ignore extra fields...
 		JacksonTransformers.MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -309,35 +311,26 @@ public CouchbaseMappingContext couchbaseMappingContext(CustomConversions customC
 		return mappingContext;
 	}
 
-	/**
-	 * Creates a {@link ObjectMapper} for the jsonSerializer of the ClusterEnvironment
-	 *
-	 * @return ObjectMapper
-	 */
-	private ObjectMapper couchbaseObjectMapper() {
-		return couchbaseObjectMapper(cryptoManager());
+	private ObjectMapper getCouchbaseObjectMapper() {
+		if (mapper != null) {
+			return mapper;
+		}
+		return mapper = couchbaseObjectMapper();
 	}
 
 	/**
 	 * Creates a {@link ObjectMapper} for the jsonSerializer of the ClusterEnvironment
 	 *
-	 * @param cryptoManager
 	 * @return ObjectMapper
 	 */
-
-	ObjectMapper mapper;
-
-	public ObjectMapper couchbaseObjectMapper(CryptoManager cryptoManager) {
-		if (mapper != null) {
-			return mapper;
-		}
-		mapper = new ObjectMapper(); // or use the one from the Java SDK (?) JacksonTransformers.MAPPER
-		mapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-		mapper.registerModule(new JsonValueModule());
-		if (cryptoManager != null) {
-			mapper.registerModule(new EncryptionModule(cryptoManager));
+	public ObjectMapper couchbaseObjectMapper() {
+		ObjectMapper om = new ObjectMapper(); // or use the one from the Java SDK (?) JacksonTransformers.MAPPER
+		om.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		om.registerModule(new JsonValueModule());
+		if (getCryptoManager() != null) {
+			om.registerModule(new EncryptionModule(getCryptoManager()));
 		}
-		return mapper;
+		return om;
 	}
 
 	/**
@@ -405,7 +398,7 @@ protected boolean autoIndexCreation() {
 	 */
 	@Bean(name = BeanNames.COUCHBASE_CUSTOM_CONVERSIONS)
 	public CustomConversions customConversions() {
-		return customConversions(cryptoManager());
+		return customConversions(getCryptoManager());
 	}
 
 	/**
@@ -428,14 +421,18 @@ public CustomConversions customConversions(CryptoManager cryptoManager) {
 		return customConversions;
 	}
 
-	@Bean
-	protected CryptoManager cryptoManager() {
-		return null;
+	/**
+	 * cryptoManager can be null, so it cannot be a bean and then used as an arg for bean methods
+	 */
+	private CryptoManager getCryptoManager() {
+		if (cryptoManager == null) {
+			cryptoManager = cryptoManager();
+		}
+		return cryptoManager;
 	}
 
-	@Bean
-	protected CryptoConverter cryptoConverter(CryptoManager cryptoManager) {
-		return cryptoManager == null ? null : new CryptoConverter(cryptoManager);
+	protected CryptoManager cryptoManager() {
+		return null;
 	}
 
 	/**

src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryFieldLevelEncryptionIntegrationTests.java

@@ -344,9 +344,9 @@ public String getBucketName() {
 		}
 
 		@Override
-		public ObjectMapper couchbaseObjectMapper(CryptoManager cryptoManager) {
-			ObjectMapper om = super.couchbaseObjectMapper(cryptoManager);
-			om.registerModule(new JodaModule());
+		public ObjectMapper couchbaseObjectMapper() {
+			ObjectMapper om = super.couchbaseObjectMapper();
+			om.registerModule(new JodaModule()); // to test joda mapping
 			return om;
 		}
 
@@ -356,8 +356,6 @@ protected void configureEnvironment(ClusterEnvironment.Builder builder) {
 				builder.securityConfig(
 						SecurityConfig.builder().trustManagerFactory(InsecureTrustManagerFactory.INSTANCE).enableTls(true));
 			}
-			CryptoManager cryptoManager = cryptoManager();
-			builder.cryptoManager(cryptoManager).build();
 		}
 
 		@Override
@@ -390,27 +388,6 @@ public byte[] decrypt(Map<String, Object> encryptedNode) {
 				return result;
 			}
 
-			private String toBytes(byte[] plaintext) {
-				StringBuffer sb = new StringBuffer();
-				for (byte b : plaintext) {
-					sb.append(b);
-					sb.append(" ");
-				}
-				return sb.toString();
-			}
-
-			private boolean cmp(byte[] a, byte[] b) {
-				if (a.length != b.length)
-					return false;
-				for (int i = 0; i < a.length; i++) {
-					if (a[i] != b[i])
-						return false;
-				}
-				return true;
-			}
-
-			byte[] canned_sdk_encbytes = { 34, 65, 81, 73, 68, 66, 65, 61, 61, 34 };
-			byte[] canned_spring_encbytes = { 91, 49, 44, 50, 44, 51, 44, 52, 93 };
 		}
 
 	}