From dbdc87bb7658b79d42b81f2afa33f7102463f856 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Tue, 8 Nov 2022 17:07:27 -0500 Subject: [PATCH] Remove deprecated AbstractAutoServiceRegistration constructor --- .../serviceregistry/AbstractAutoServiceRegistration.java | 7 ------- .../AbstractAutoServiceRegistrationMgmtDisabledTests.java | 2 +- ...tAutoServiceRegistrationRegistrationLifecycleTests.java | 2 +- .../AbstractAutoServiceRegistrationTests.java | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java index 99d451bc..893eaf54 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistration.java @@ -71,13 +71,6 @@ public abstract class AbstractAutoServiceRegistration private List> registrationLifecycles = new ArrayList<>(); - /** - * @deprecated This function is deprecated and can be replaced by another constructor - */ - @Deprecated - protected AbstractAutoServiceRegistration(ServiceRegistry serviceRegistry) { - this.serviceRegistry = serviceRegistry; - } protected AbstractAutoServiceRegistration(ServiceRegistry serviceRegistry, AutoServiceRegistrationProperties properties) { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java index 734ac98e..fef017e1 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationMgmtDisabledTests.java @@ -168,7 +168,7 @@ public class AbstractAutoServiceRegistrationMgmtDisabledTests { } protected TestAutoServiceRegistration() { - super(new TestServiceRegistry()); + super(new TestServiceRegistry(), new AutoServiceRegistrationProperties()); } @Override diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationRegistrationLifecycleTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationRegistrationLifecycleTests.java index b0e2c187..aea40fb1 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationRegistrationLifecycleTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationRegistrationLifecycleTests.java @@ -111,7 +111,7 @@ class AbstractAutoServiceRegistrationRegistrationLifecycleTests { TestRegistrationLifecycleRegistration testRegistrationLifecycleRegistration = new TestRegistrationLifecycleRegistration(); protected TestAutoServiceRegistrationLifecycle() { - super(new TestRegistrationLifecycleServiceRegistration()); + super(new TestRegistrationLifecycleServiceRegistration(), new AutoServiceRegistrationProperties()); } TestAutoServiceRegistrationLifecycle(AutoServiceRegistrationProperties properties) { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java index 29b7aa40..3ac6d3e2 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java @@ -240,7 +240,7 @@ public class AbstractAutoServiceRegistrationTests { } protected TestAutoServiceRegistration() { - super(new TestServiceRegistry()); + super(new TestServiceRegistry(), new AutoServiceRegistrationProperties()); } @Override