From efccf6d48038cd8622d77ddfb55a4ab018d5c49d Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <odrotbohm@pivotal.io>
Date: Tue, 15 Oct 2019 10:33:30 +0200
Subject: [PATCH] DATACMNS-1591 - @Primary is now considered on repository
 interfaces.

We now elevate the primary annotation from the scanned repository bean definition to the one created for the repository factory. This previously got lost as the former is hidden behind the RepositoryConfiguration interface that previously didn't expose the primary nature of the underlying bean definition.

Original pull request: #410.
---
 .../DefaultRepositoryConfiguration.java       |  9 +++
 .../config/RepositoryConfiguration.java       |  7 +++
 .../RepositoryConfigurationDelegate.java      |  2 +
 .../PrimaryRepositoryIntegrationTests.java    | 55 +++++++++++++++++++
 4 files changed, 73 insertions(+)
 create mode 100644 src/test/java/org/springframework/data/repository/config/PrimaryRepositoryIntegrationTests.java

diff --git a/src/main/java/org/springframework/data/repository/config/DefaultRepositoryConfiguration.java b/src/main/java/org/springframework/data/repository/config/DefaultRepositoryConfiguration.java
index 3129d8448..4edc5f3c7 100644
--- a/src/main/java/org/springframework/data/repository/config/DefaultRepositoryConfiguration.java
+++ b/src/main/java/org/springframework/data/repository/config/DefaultRepositoryConfiguration.java
@@ -205,4 +205,13 @@ public class DefaultRepositoryConfiguration<T extends RepositoryConfigurationSou
 
 		return toImplementationDetectionConfiguration(factory).forRepositoryConfiguration(this);
 	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.config.RepositoryConfiguration#isPrimary()
+	 */
+	@Override
+	public boolean isPrimary() {
+		return definition.isPrimary();
+	}
 }
diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryConfiguration.java b/src/main/java/org/springframework/data/repository/config/RepositoryConfiguration.java
index 698839539..8b728fefc 100644
--- a/src/main/java/org/springframework/data/repository/config/RepositoryConfiguration.java
+++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfiguration.java
@@ -130,4 +130,11 @@ public interface RepositoryConfiguration<T extends RepositoryConfigurationSource
 	 * @since 2.1
 	 */
 	ImplementationLookupConfiguration toLookupConfiguration(MetadataReaderFactory factory);
+
+	/**
+	 * Returns whether the repository is the primary one for its type.
+	 *
+	 * @return
+	 */
+	boolean isPrimary();
 }
diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java
index 4eddb1a9d..d2eda7bfc 100644
--- a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java
+++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java
@@ -161,6 +161,8 @@ public class RepositoryConfigurationDelegate {
 			}
 
 			AbstractBeanDefinition beanDefinition = definitionBuilder.getBeanDefinition();
+			beanDefinition.setPrimary(configuration.isPrimary());
+
 			String beanName = configurationSource.generateBeanName(beanDefinition);
 
 			if (LOG.isTraceEnabled()) {
diff --git a/src/test/java/org/springframework/data/repository/config/PrimaryRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/repository/config/PrimaryRepositoryIntegrationTests.java
new file mode 100644
index 000000000..2121038c6
--- /dev/null
+++ b/src/test/java/org/springframework/data/repository/config/PrimaryRepositoryIntegrationTests.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2019 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
+ *
+ *      https://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.
+ */
+package org.springframework.data.repository.config;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.junit.Test;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.ComponentScan.Filter;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.repository.CrudRepository;
+
+/**
+ * Integration tests for DATACMNS-1591.
+ *
+ * @author Oliver Drotbohm
+ */
+public class PrimaryRepositoryIntegrationTests {
+
+	@Test // DATACMNS-1591
+	public void returnsPrimaryInstance() {
+
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
+
+		// Two beans available but FirstRepository is the primary one
+		assertThatCode(() -> context.getBean(FirstRepository.class)).doesNotThrowAnyException();
+	}
+
+	@Configuration
+	@EnableRepositories(considerNestedRepositories = true, //
+			includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = Marker.class))
+	static class Config {}
+
+	interface Marker {}
+
+	@Primary
+	interface FirstRepository<T> extends CrudRepository<T, Long>, Marker {}
+
+	interface SecondRepository extends FirstRepository<Object>, Marker {}
+}