Browse Source
This commit removes the following obsolete and deprecated APIs. - org.springframework.util.Base64Utils - org.springframework.cache.jcache.interceptor.JCacheOperationSourcePointcut - org.springframework.http.client.AbstractClientHttpResponse - org.springframework.http.client.ClientHttpResponse.getRawStatusCode() - org.springframework.http.client.observation.ClientHttpObservationDocumentation.HighCardinalityKeyNames.CLIENT_NAME - org.springframework.web.reactive.function.client.ClientHttpObservationDocumentation.HighCardinalityKeyNames.CLIENT_NAME - org.springframework.web.filter.reactive.ServerWebExchangeContextFilter.get(Context) - org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler.handleBindException(...) - org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver.handleBindException(...) Closes gh-30608pull/32294/head
Sam Brannen
2 years ago
12 changed files with 4 additions and 371 deletions
@ -1,68 +0,0 @@
@@ -1,68 +0,0 @@
|
||||
/* |
||||
* Copyright 2002-2023 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.cache.jcache.interceptor; |
||||
|
||||
import java.io.Serializable; |
||||
import java.lang.reflect.Method; |
||||
|
||||
import org.springframework.aop.support.StaticMethodMatcherPointcut; |
||||
import org.springframework.lang.Nullable; |
||||
import org.springframework.util.ObjectUtils; |
||||
|
||||
/** |
||||
* A Pointcut that matches if the underlying {@link JCacheOperationSource} |
||||
* has an operation for a given method. |
||||
* |
||||
* @author Stephane Nicoll |
||||
* @since 4.1 |
||||
* @deprecated since 6.0.10, as it is not used by the framework anymore |
||||
*/ |
||||
@Deprecated(since = "6.0.10", forRemoval = true) |
||||
@SuppressWarnings("serial") |
||||
public abstract class JCacheOperationSourcePointcut extends StaticMethodMatcherPointcut implements Serializable { |
||||
|
||||
@Override |
||||
public boolean matches(Method method, Class<?> targetClass) { |
||||
JCacheOperationSource cas = getCacheOperationSource(); |
||||
return (cas != null && cas.getCacheOperation(method, targetClass) != null); |
||||
} |
||||
|
||||
/** |
||||
* Obtain the underlying {@link JCacheOperationSource} (may be {@code null}). |
||||
* To be implemented by subclasses. |
||||
*/ |
||||
@Nullable |
||||
protected abstract JCacheOperationSource getCacheOperationSource(); |
||||
|
||||
|
||||
@Override |
||||
public boolean equals(@Nullable Object other) { |
||||
return (this == other || (other instanceof JCacheOperationSourcePointcut that && |
||||
ObjectUtils.nullSafeEquals(getCacheOperationSource(), that.getCacheOperationSource()))); |
||||
} |
||||
|
||||
@Override |
||||
public int hashCode() { |
||||
return JCacheOperationSourcePointcut.class.hashCode(); |
||||
} |
||||
|
||||
@Override |
||||
public String toString() { |
||||
return getClass().getName() + ": " + getCacheOperationSource(); |
||||
} |
||||
|
||||
} |
||||
@ -1,132 +0,0 @@
@@ -1,132 +0,0 @@
|
||||
/* |
||||
* Copyright 2002-2023 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.util; |
||||
|
||||
import java.util.Base64; |
||||
|
||||
/** |
||||
* A simple utility class for Base64 encoding and decoding. |
||||
* |
||||
* <p>Adapts to Java 8's {@link java.util.Base64} in a convenience fashion. |
||||
* |
||||
* @author Juergen Hoeller |
||||
* @author Gary Russell |
||||
* @since 4.1 |
||||
* @see java.util.Base64 |
||||
* @deprecated as of Spring Framework 6.0.5 in favor of {@link Base64}; scheduled |
||||
* for removal in 6.2 |
||||
*/ |
||||
@Deprecated(since = "6.0.5", forRemoval = true) |
||||
public abstract class Base64Utils { |
||||
|
||||
/** |
||||
* Base64-encode the given byte array. |
||||
* @param src the original byte array |
||||
* @return the encoded byte array |
||||
*/ |
||||
public static byte[] encode(byte[] src) { |
||||
if (src.length == 0) { |
||||
return src; |
||||
} |
||||
return Base64.getEncoder().encode(src); |
||||
} |
||||
|
||||
/** |
||||
* Base64-decode the given byte array. |
||||
* @param src the encoded byte array |
||||
* @return the original byte array |
||||
*/ |
||||
public static byte[] decode(byte[] src) { |
||||
if (src.length == 0) { |
||||
return src; |
||||
} |
||||
return Base64.getDecoder().decode(src); |
||||
} |
||||
|
||||
/** |
||||
* Base64-encode the given byte array using the RFC 4648 |
||||
* "URL and Filename Safe Alphabet". |
||||
* @param src the original byte array |
||||
* @return the encoded byte array |
||||
* @since 4.2.4 |
||||
*/ |
||||
public static byte[] encodeUrlSafe(byte[] src) { |
||||
if (src.length == 0) { |
||||
return src; |
||||
} |
||||
return Base64.getUrlEncoder().encode(src); |
||||
} |
||||
|
||||
/** |
||||
* Base64-decode the given byte array using the RFC 4648 |
||||
* "URL and Filename Safe Alphabet". |
||||
* @param src the encoded byte array |
||||
* @return the original byte array |
||||
* @since 4.2.4 |
||||
*/ |
||||
public static byte[] decodeUrlSafe(byte[] src) { |
||||
if (src.length == 0) { |
||||
return src; |
||||
} |
||||
return Base64.getUrlDecoder().decode(src); |
||||
} |
||||
|
||||
/** |
||||
* Base64-encode the given byte array to a String. |
||||
* @param src the original byte array |
||||
* @return the encoded byte array as a UTF-8 String |
||||
*/ |
||||
public static String encodeToString(byte[] src) { |
||||
if (src.length == 0) { |
||||
return ""; |
||||
} |
||||
return Base64.getEncoder().encodeToString(src); |
||||
} |
||||
|
||||
/** |
||||
* Base64-decode the given byte array from a UTF-8 String. |
||||
* @param src the encoded UTF-8 String |
||||
* @return the original byte array |
||||
*/ |
||||
public static byte[] decodeFromString(String src) { |
||||
if (src.isEmpty()) { |
||||
return new byte[0]; |
||||
} |
||||
return Base64.getDecoder().decode(src); |
||||
} |
||||
|
||||
/** |
||||
* Base64-encode the given byte array to a String using the RFC 4648 |
||||
* "URL and Filename Safe Alphabet". |
||||
* @param src the original byte array |
||||
* @return the encoded byte array as a UTF-8 String |
||||
*/ |
||||
public static String encodeToUrlSafeString(byte[] src) { |
||||
return Base64.getUrlEncoder().encodeToString(src); |
||||
} |
||||
|
||||
/** |
||||
* Base64-decode the given byte array from a UTF-8 String using the RFC 4648 |
||||
* "URL and Filename Safe Alphabet". |
||||
* @param src the encoded UTF-8 String |
||||
* @return the original byte array |
||||
*/ |
||||
public static byte[] decodeFromUrlSafeString(String src) { |
||||
return Base64.getUrlDecoder().decode(src); |
||||
} |
||||
|
||||
} |
||||
@ -1,39 +0,0 @@
@@ -1,39 +0,0 @@
|
||||
/* |
||||
* Copyright 2002-2023 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.http.client; |
||||
|
||||
import java.io.IOException; |
||||
|
||||
import org.springframework.http.HttpStatusCode; |
||||
|
||||
/** |
||||
* Abstract base for {@link ClientHttpResponse}. |
||||
* |
||||
* @author Arjen Poutsma |
||||
* @since 3.1.1 |
||||
* @deprecated as of 6.0, with no direct replacement; scheduled for removal in 6.2 |
||||
*/ |
||||
@Deprecated(since = "6.0", forRemoval = true) |
||||
public abstract class AbstractClientHttpResponse implements ClientHttpResponse { |
||||
|
||||
@Override |
||||
@SuppressWarnings("removal") |
||||
public HttpStatusCode getStatusCode() throws IOException { |
||||
return HttpStatusCode.valueOf(getRawStatusCode()); |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue