From 65762b1dcebb53b240f10c0b493e183d954c1287 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 7 Nov 2017 17:26:17 -0500 Subject: [PATCH] Remove deprecated RetryableStatusCodeException. Fixes #2003 (#2427) --- .../support/RetryableStatusCodeException.java | 37 ------------------- .../RetryableStatusCodeExceptionTests.java | 36 ------------------ 2 files changed, 73 deletions(-) delete mode 100644 spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/support/RetryableStatusCodeException.java delete mode 100644 spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/support/RetryableStatusCodeExceptionTests.java diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/support/RetryableStatusCodeException.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/support/RetryableStatusCodeException.java deleted file mode 100644 index afc857b5..00000000 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/support/RetryableStatusCodeException.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * - * * Copyright 2013-2016 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 - * * - * * http://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.cloud.netflix.ribbon.support; - -import java.io.IOException; - -/** - * Exception to be thrown when the status code is deemed to be retryable. - * @author Ryan Baxter - * @deprecated Use {@link org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException} instead - */ -//TODO Remove in Edgeware -@Deprecated -public class RetryableStatusCodeException extends IOException { - - private static final String MESSAGE = "Service %s returned a status code of %d"; - - public RetryableStatusCodeException(String serviceId, int statusCode) { - super(String.format(MESSAGE, serviceId, statusCode)); - } -} diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/support/RetryableStatusCodeExceptionTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/support/RetryableStatusCodeExceptionTests.java deleted file mode 100644 index e151e23c..00000000 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/support/RetryableStatusCodeExceptionTests.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * - * * Copyright 2013-2016 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 - * * - * * http://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.cloud.netflix.ribbon.support; - -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - - -/** - * @author Ryan Baxter - */ -public class RetryableStatusCodeExceptionTests { - - @Test - public void testMessage() { - RetryableStatusCodeException ex = new RetryableStatusCodeException("foo", 404); - assertEquals("Service foo returned a status code of 404", ex.getMessage()); - } -} \ No newline at end of file