From 1c8e297470af44adc3a08f17d7d7c20d5569dd84 Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <oliver.drotbohm@broadcom.com>
Date: Fri, 14 Feb 2025 17:32:37 +0100
Subject: [PATCH] GH-2303 - Upgrade to Spring Plugin 4.0 snapshots.

---
 pom.xml                                                    | 2 +-
 .../hateoas/config/EntityLinksConfiguration.java           | 7 +++----
 .../hateoas/config/HateoasConfiguration.java               | 7 ++++---
 .../hateoas/server/core/DelegatingEntityLinksUnitTest.java | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index be58c82a..27cc0b44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
 		<reactor-bom.version>2024.0.5</reactor-bom.version>
 		<slf4j.version>2.0.17</slf4j.version>
 		<spring.version>7.0.0-M2</spring.version>
-		<spring-plugin.version>3.0.0</spring-plugin.version>
+		<spring-plugin.version>4.0.0-SNAPSHOT</spring-plugin.version>
 		<kotlin.version>2.1.0</kotlin.version>
 		<kotlinx-coroutines.version>1.10.1</kotlinx-coroutines.version>
 		<mockk.version>1.14.0</mockk.version>
diff --git a/src/main/java/org/springframework/hateoas/config/EntityLinksConfiguration.java b/src/main/java/org/springframework/hateoas/config/EntityLinksConfiguration.java
index 4ea74a32..55a7fc88 100644
--- a/src/main/java/org/springframework/hateoas/config/EntityLinksConfiguration.java
+++ b/src/main/java/org/springframework/hateoas/config/EntityLinksConfiguration.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.hateoas.config;
 
-import org.springframework.context.ApplicationContext;
+import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -35,13 +35,12 @@ import org.springframework.plugin.core.support.PluginRegistryFactoryBean;
 class EntityLinksConfiguration {
 
 	@Bean
-	OrderAwarePluginRegistry<EntityLinks, Class<?>> entityLinksPluginRegistry(ApplicationContext context) {
+	OrderAwarePluginRegistry<EntityLinks, Class<?>> entityLinksPluginRegistry(ListableBeanFactory beanFactory) {
 
 		PluginRegistryFactoryBean<EntityLinks, Class<?>> registry = new PluginRegistryFactoryBean<>();
-		registry.setApplicationContext(context);
+		registry.setBeanFactory(beanFactory);
 		registry.setType(EntityLinks.class);
 		registry.setExclusions(new Class[] { DelegatingEntityLinks.class });
-		registry.afterPropertiesSet();
 
 		return registry.getObject();
 	}
diff --git a/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java b/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java
index e42c9334..ff80f0ac 100644
--- a/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java
+++ b/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java
@@ -24,6 +24,7 @@ import java.util.Optional;
 import java.util.Properties;
 import java.util.stream.Collectors;
 
+import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.PropertiesFactoryBean;
@@ -107,13 +108,13 @@ public class HateoasConfiguration {
 	}
 
 	@Bean
-	OrderAwarePluginRegistry<LinkRelationProvider, LookupContext> relProviderPluginRegistry(ApplicationContext context) {
+	OrderAwarePluginRegistry<LinkRelationProvider, LookupContext> relProviderPluginRegistry(
+			ListableBeanFactory beanFactory) {
 
 		PluginRegistryFactoryBean<LinkRelationProvider, LookupContext> factory = new PluginRegistryFactoryBean<>();
-		factory.setApplicationContext(context);
+		factory.setBeanFactory(beanFactory);
 		factory.setType(LinkRelationProvider.class);
 		factory.setExclusions(new Class[] { DelegatingLinkRelationProvider.class });
-		factory.afterPropertiesSet();
 
 		return factory.getObject();
 	}
diff --git a/src/test/java/org/springframework/hateoas/server/core/DelegatingEntityLinksUnitTest.java b/src/test/java/org/springframework/hateoas/server/core/DelegatingEntityLinksUnitTest.java
index 1935ccba..e43dc437 100755
--- a/src/test/java/org/springframework/hateoas/server/core/DelegatingEntityLinksUnitTest.java
+++ b/src/test/java/org/springframework/hateoas/server/core/DelegatingEntityLinksUnitTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.hateoas.TestUtils;
 import org.springframework.hateoas.server.EntityLinks;
 import org.springframework.hateoas.server.ExposesResourceFor;
-import org.springframework.plugin.core.SimplePluginRegistry;
+import org.springframework.plugin.core.OrderAwarePluginRegistry;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
@@ -43,7 +43,7 @@ class DelegatingEntityLinksUnitTest extends TestUtils {
 	@Test
 	void throwsExceptionForUnsupportedClass() {
 
-		EntityLinks links = new DelegatingEntityLinks(SimplePluginRegistry.empty());
+		EntityLinks links = new DelegatingEntityLinks(OrderAwarePluginRegistry.empty());
 
 		assertThatExceptionOfType(IllegalArgumentException.class) //
 				.isThrownBy(() -> links.linkFor(String.class)) //
@@ -84,7 +84,7 @@ class DelegatingEntityLinksUnitTest extends TestUtils {
 	}
 
 	private EntityLinks createDelegatingEntityLinks(EntityLinks target) {
-		return new DelegatingEntityLinks(SimplePluginRegistry.of(target));
+		return new DelegatingEntityLinks(OrderAwarePluginRegistry.of(target));
 	}
 
 	@ExposesResourceFor(String.class)