Merge branch 'main' of github.com:spring-projects/spring-data-couchbase into datacouch_1057_illegal_reflective_access

Author: mikereiche

pom.xml

@@ -273,13 +273,6 @@
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>16</source>
-                    <target>16</target>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>

src/main/java/module-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors
+ * Copyright 2012-2021 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.
@@ -34,6 +34,10 @@
 import com.couchbase.client.core.error.IndexExistsException;
 import com.couchbase.client.java.Cluster;
 
+/**
+ * @author Michael Nitschinger
+ * @author Michael Reiche
+ */
 public class CouchbasePersistentEntityIndexCreator implements ApplicationListener<MappingContextEvent<?, ?>> {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(CouchbasePersistentEntityIndexCreator.class);
@@ -95,7 +99,8 @@ private void checkForAndCreateIndexes(final CouchbasePersistentEntity<?> entity)
 	private void createIndex(final IndexDefinitionHolder indexToCreate) {
 		Cluster cluster = couchbaseOperations.getCouchbaseClientFactory().getCluster();
 
-		StringBuilder statement = new StringBuilder("CREATE INDEX ").append(indexToCreate.getIndexName()).append(" ON `")
+		StringBuilder statement = new StringBuilder("CREATE INDEX `")
+				.append(indexToCreate.getIndexName()).append("` ON `")
 				.append(couchbaseOperations.getBucketName()).append("` (")
 				.append(String.join(",", indexToCreate.getIndexFields())).append(")");
 

src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors
+ * Copyright 2012-2021 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.
@@ -32,6 +32,10 @@
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
+/**
+ * @author Michael Nitschinger
+ * @author Michael Reiche
+ */
 public class CouchbasePersistentEntityIndexResolver implements QueryIndexResolver {
 
 	private final MappingContext<? extends CouchbasePersistentEntity<?>, CouchbasePersistentProperty> mappingContext;
@@ -103,7 +107,8 @@ protected IndexDefinitionHolder createFieldQueryIndexDefinition(final CouchbaseP
 		String fieldName = index.name().isEmpty() ? property.getFieldName() : index.name();
 		fields.add(fieldName + (index.direction() == QueryIndexDirection.DESCENDING ? " DESC" : ""));
 
-		String indexName = "idx_" + StringUtils.uncapitalize(entity.getType().getSimpleName()) + "_" + fieldName;
+		String indexName = "idx_" + StringUtils.uncapitalize(entity.getType().getSimpleName()) + "_"
+				+ fieldName.replace(".", "_");
 
 		return new IndexDefinitionHolder(fields, indexName, getPredicate(entityInfo));
 	}
@@ -126,8 +131,8 @@ protected List<IndexDefinitionHolder> createCompositeQueryIndexDefinitions(final
 
 		return indexAnnotations.stream().map(ann -> {
 			List<String> fields = Arrays.asList(ann.fields());
-			String fieldsIndexName = String.join("_", fields).toLowerCase().replace(" ", "").replace("asc", "")
-					.replace("desc", "");
+			String fieldsIndexName = String.join("_", fields).toLowerCase().replace(".", "_").replace(" ", "")
+					.replace("asc", "").replace("desc", "");
 
 			String indexName = "idx_" + StringUtils.uncapitalize(entity.getType().getSimpleName()) + "_" + fieldsIndexName;
 			return new IndexDefinitionHolder(fields, indexName, predicate);

src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexResolver.java

@@ -16,7 +16,6 @@
 
 package org.springframework.data.couchbase.core.mapping;
 
-import java.lang.reflect.InaccessibleObjectException;
 import java.util.Optional;
 
 import org.springframework.beans.BeansException;
@@ -141,8 +140,12 @@ protected Optional<BasicCouchbasePersistentEntity<?>> addPersistentEntity(TypeIn
 		Optional<BasicCouchbasePersistentEntity<?>> entity = null;
 		try {
 			entity = super.addPersistentEntity(typeInformation);
-		} catch (InaccessibleObjectException ioe) {
-			throw new MappingException("due to InaccessibleObjectException", ioe);
+		} catch (Exception ioe) {
+			if(ioe.getClass().getName().equals("java.lang.reflect.InaccessibleObjectException")){
+				throw new MappingException("due to InaccessibleObjectException", ioe);
+			} else {
+				throw ioe;
+			}
 		}
 
 		if (this.eventPublisher != null && entity.isPresent()) {

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

@@ -145,7 +145,6 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 			currentInvocation.set(invocation);
 
 			try {
-
 				CrudMethodMetadata metadata = (CrudMethodMetadata) TransactionSynchronizationManager.getResource(method);
 
 				if (metadata != null) {
@@ -156,7 +155,7 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 
 				if (methodMetadata == null) {
 
-					methodMetadata = new DefaultCrudMethodMetadata(method, repositoryInformation);
+					methodMetadata = new DefaultCrudMethodMetadata(method);
 					CrudMethodMetadata tmp = metadataCache.putIfAbsent(method, methodMetadata);
 
 					if (tmp != null) {
@@ -187,7 +186,6 @@ private static class DefaultCrudMethodMetadata implements CrudMethodMetadata {
 
 		private final Method method;
 		private final ScanConsistency scanConsistency;
-		private final RepositoryInformation repositoryInformation;
 		private final String scope;
 		private final String collection;
 
@@ -198,10 +196,9 @@ private static class DefaultCrudMethodMetadata implements CrudMethodMetadata {
 		 * 
 		 * @param method must not be {@literal null}.
 		 */
-		DefaultCrudMethodMetadata(Method method, RepositoryInformation repositoryInformation) {
+		DefaultCrudMethodMetadata(Method method) {
 			Assert.notNull(method, "Method must not be null!");
 			this.method = method;
-			this.repositoryInformation = repositoryInformation;
 			String n = method.getName();
 			// internal methods
 			if (n.equals("getEntityInformation") || n.equals("getOperations") || n.equals("withOptions")
@@ -212,8 +209,7 @@ private static class DefaultCrudMethodMetadata implements CrudMethodMetadata {
 				return;
 			}
 
-			AnnotatedElement[] annotated = new AnnotatedElement[] { method, method.getDeclaringClass(),
-					repositoryInformation.getRepositoryInterface(), repositoryInformation.getDomainType() };
+			AnnotatedElement[] annotated = new AnnotatedElement[] { method, method.getDeclaringClass()};
 			this.scanConsistency = OptionsBuilder.annotation(ScanConsistency.class, "query", QueryScanConsistency.NOT_BOUNDED,
 					annotated);
 			this.scope = OptionsBuilder.annotationString(Scope.class, CollectionIdentifier.DEFAULT_SCOPE, annotated);

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

@@ -1,4 +1,4 @@
-Spring Data Couchbase 4.3 M1 (2021.1.0)
+Spring Data Couchbase 4.3 M2 (2021.1.0)
 Copyright (c) [2013-2019] Couchbase / Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -27,4 +27,5 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
 
 
 
+
 

src/main/resources/notice.txt

@@ -23,6 +23,7 @@
 
 @Document
 @CompositeQueryIndex(fields = { "id", "name desc" })
+@CompositeQueryIndex(fields = { "id.something", "name desc" })
 public class Airline extends ComparableEntity {
 	@Id String id;
 

src/test/java/org/springframework/data/couchbase/domain/Airline.java

@@ -24,6 +24,7 @@
 import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.Transient;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.couchbase.core.mapping.Document;
 
@@ -41,6 +42,8 @@ public class User extends ComparableEntity {
 	@Id private String id;
 	private String firstname;
 	private String lastname;
+	@Transient
+	private String transientInfo;
 	@CreatedBy private String createdBy;
 	@CreatedDate private long createdDate;
 	@LastModifiedBy private String lastModifiedBy;
@@ -94,4 +97,10 @@ public int hashCode() {
 		return Objects.hash(id, firstname, lastname);
 	}
 
+	public String getTransientInfo(){
+		return transientInfo;
+	}
+	public void setTransientInfo(String something) {
+		transientInfo = something;
+	}
 }

src/test/java/org/springframework/data/couchbase/domain/User.java

@@ -38,7 +38,9 @@
 @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
 public interface UserColRepository extends CouchbaseRepository<UserCol, String>, DynamicProxyable<UserColRepository> {
 
-	<S extends UserCol> S save(S var1);
+	// CouchbaseRepositoryQueryCollectionIntegrationTests.testScopeCollectionAnnotationSwap() relies on this
+	// being commented out.
+	//<S extends UserCol> S save(S var1);
 
 	List<UserCol> findByFirstname(String firstname);
 

src/test/java/org/springframework/data/couchbase/domain/UserColRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors
+ * Copyright 2012-2021 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.
@@ -17,15 +17,16 @@
 package org.springframework.data.couchbase.domain;
 
 import java.util.List;
+import java.util.stream.Stream;
 
+import com.couchbase.client.java.query.QueryScanConsistency;
 import org.springframework.data.couchbase.repository.CouchbaseRepository;
 import org.springframework.data.couchbase.repository.Query;
 import org.springframework.data.couchbase.repository.ScanConsistency;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import com.couchbase.client.java.json.JsonArray;
-import com.couchbase.client.java.query.QueryScanConsistency;
 
 /**
  * User Repository for tests
@@ -34,11 +35,13 @@
  * @author Michael Reiche
  */
 @Repository
-@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+@ScanConsistency(query=QueryScanConsistency.REQUEST_PLUS)
 public interface UserRepository extends CouchbaseRepository<User, String> {
 
 	List<User> findByFirstname(String firstname);
 
+	Stream<User> findByLastname(String lastname);
+
 	List<User> findByFirstnameIn(String... firstnames);
 
 	List<User> findByFirstnameIn(JsonArray firstnames);
@@ -54,5 +57,4 @@ public interface UserRepository extends CouchbaseRepository<User, String> {
 	List<User> findByIdIsNotNullAndFirstnameEquals(String firstname);
 
 	List<User> findByVersionEqualsAndFirstnameEquals(Long version, String firstname);
-
 }

src/test/java/org/springframework/data/couchbase/domain/UserRepository.java

@@ -62,6 +62,14 @@ void createsCompositeIndex() {
 		assertTrue(foundIndex.get().condition().get().contains("_class"));
 	}
 
+	@Test
+	void createsCompositeIndexWithPath() {
+		Optional<QueryIndex> foundIndex = cluster.queryIndexes().getAllIndexes(bucketName()).stream()
+				.filter(i -> i.name().equals("idx_airline_id_something_name")).findFirst();
+
+		assertTrue(foundIndex.isPresent());
+		assertTrue(foundIndex.get().condition().get().contains("_class"));
+	}
 	@Configuration
 	@EnableCouchbaseRepositories("org.springframework.data.couchbase")
 	static class Config extends AbstractCouchbaseConfiguration {

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

@@ -35,6 +35,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -354,18 +355,42 @@ public void saveNotBounded() {
 		assertNull(airport2, "airport2 should have likely been null at least once");
 	}
 
+	@Test
+	public void testTransient() {
+		User user = new User("1", "Dave", "Wilson");
+		user.setTransientInfo("something");
+		userRepository.save(user);
+		Optional<User> foundUser = userRepository.findById(user.getId());
+		assertEquals(null, foundUser.get().getTransientInfo());
+		userRepository.delete(user);
+	}
+
 	@Test
 	public void testCas() {
 		User user = new User("1", "Dave", "Wilson");
 		userRepository.save(user);
-		userRepository.findByFirstname("Dave");
 		user.setVersion(user.getVersion() - 1);
 		assertThrows(DataIntegrityViolationException.class, () -> userRepository.save(user));
 		user.setVersion(0);
 		userRepository.save(user);
 		userRepository.delete(user);
 	}
 
+	@Test
+	public void testStreamQuery() {
+		User user1 = new User("1", "Dave", "Wilson");
+		User user2 = new User("2", "Brian", "Wilson");
+
+		userRepository.save(user1);
+		userRepository.save(user2);
+		List<User> users = userRepository.findByLastname("Wilson").collect(Collectors.toList());
+		assertEquals(2,users.size());
+		assertTrue(users.contains(user1));
+		assertTrue(users.contains(user2));
+		userRepository.delete(user1);
+		userRepository.delete(user2);
+	}
+
 	@Test
 	public void testExpiryAnnotation() {
 		UserAnnotated user = new UserAnnotated("1", "Dave", "Wilson");