From 4a12382d2b480dd953a4ca4f84798dfef3b1d1c5 Mon Sep 17 00:00:00 2001 From: Max Batischev Date: Mon, 14 Apr 2025 18:13:09 +0300 Subject: [PATCH] Remove unused classes Remove DeferringObservationAuthorizationManager.java and DeferringObservationReactiveAuthorizationManager.java Signed-off-by: Max Batischev --- ...erringObservationAuthorizationManager.java | 72 ------------------ ...servationReactiveAuthorizationManager.java | 73 ------------------- 2 files changed, 145 deletions(-) delete mode 100644 config/src/main/java/org/springframework/security/config/annotation/method/configuration/DeferringObservationAuthorizationManager.java delete mode 100644 config/src/main/java/org/springframework/security/config/annotation/method/configuration/DeferringObservationReactiveAuthorizationManager.java diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/DeferringObservationAuthorizationManager.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/DeferringObservationAuthorizationManager.java deleted file mode 100644 index 3328531606..0000000000 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/DeferringObservationAuthorizationManager.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2002-2022 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.security.config.annotation.method.configuration; - -import java.util.function.Supplier; - -import io.micrometer.observation.ObservationRegistry; -import org.aopalliance.intercept.MethodInvocation; - -import org.springframework.beans.factory.ObjectProvider; -import org.springframework.security.authorization.AuthorizationDecision; -import org.springframework.security.authorization.AuthorizationManager; -import org.springframework.security.authorization.AuthorizationResult; -import org.springframework.security.authorization.ObservationAuthorizationManager; -import org.springframework.security.authorization.method.MethodAuthorizationDeniedHandler; -import org.springframework.security.authorization.method.MethodInvocationResult; -import org.springframework.security.authorization.method.ThrowingMethodAuthorizationDeniedHandler; -import org.springframework.security.core.Authentication; -import org.springframework.util.function.SingletonSupplier; - -final class DeferringObservationAuthorizationManager - implements AuthorizationManager, MethodAuthorizationDeniedHandler { - - private final Supplier> delegate; - - private MethodAuthorizationDeniedHandler handler = new ThrowingMethodAuthorizationDeniedHandler(); - - DeferringObservationAuthorizationManager(ObjectProvider provider, - AuthorizationManager delegate) { - this.delegate = SingletonSupplier.of(() -> { - ObservationRegistry registry = provider.getIfAvailable(() -> ObservationRegistry.NOOP); - if (registry.isNoop()) { - return delegate; - } - return new ObservationAuthorizationManager<>(registry, delegate); - }); - if (delegate instanceof MethodAuthorizationDeniedHandler h) { - this.handler = h; - } - } - - @Override - public AuthorizationDecision check(Supplier authentication, T object) { - return this.delegate.get().check(authentication, object); - } - - @Override - public Object handleDeniedInvocation(MethodInvocation methodInvocation, AuthorizationResult authorizationResult) { - return this.handler.handleDeniedInvocation(methodInvocation, authorizationResult); - } - - @Override - public Object handleDeniedInvocationResult(MethodInvocationResult methodInvocationResult, - AuthorizationResult authorizationResult) { - return this.handler.handleDeniedInvocationResult(methodInvocationResult, authorizationResult); - } - -} diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/DeferringObservationReactiveAuthorizationManager.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/DeferringObservationReactiveAuthorizationManager.java deleted file mode 100644 index 8b028a7077..0000000000 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/DeferringObservationReactiveAuthorizationManager.java +++ /dev/null @@ -1,73 +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.security.config.annotation.method.configuration; - -import java.util.function.Supplier; - -import io.micrometer.observation.ObservationRegistry; -import org.aopalliance.intercept.MethodInvocation; -import reactor.core.publisher.Mono; - -import org.springframework.beans.factory.ObjectProvider; -import org.springframework.security.authorization.AuthorizationDecision; -import org.springframework.security.authorization.AuthorizationResult; -import org.springframework.security.authorization.ObservationReactiveAuthorizationManager; -import org.springframework.security.authorization.ReactiveAuthorizationManager; -import org.springframework.security.authorization.method.MethodAuthorizationDeniedHandler; -import org.springframework.security.authorization.method.MethodInvocationResult; -import org.springframework.security.authorization.method.ThrowingMethodAuthorizationDeniedHandler; -import org.springframework.security.core.Authentication; -import org.springframework.util.function.SingletonSupplier; - -final class DeferringObservationReactiveAuthorizationManager - implements ReactiveAuthorizationManager, MethodAuthorizationDeniedHandler { - - private final Supplier> delegate; - - private MethodAuthorizationDeniedHandler handler = new ThrowingMethodAuthorizationDeniedHandler(); - - DeferringObservationReactiveAuthorizationManager(ObjectProvider provider, - ReactiveAuthorizationManager delegate) { - this.delegate = SingletonSupplier.of(() -> { - ObservationRegistry registry = provider.getIfAvailable(() -> ObservationRegistry.NOOP); - if (registry.isNoop()) { - return delegate; - } - return new ObservationReactiveAuthorizationManager<>(registry, delegate); - }); - if (delegate instanceof MethodAuthorizationDeniedHandler h) { - this.handler = h; - } - } - - @Override - public Mono check(Mono authentication, T object) { - return this.delegate.get().check(authentication, object); - } - - @Override - public Object handleDeniedInvocation(MethodInvocation methodInvocation, AuthorizationResult authorizationResult) { - return this.handler.handleDeniedInvocation(methodInvocation, authorizationResult); - } - - @Override - public Object handleDeniedInvocationResult(MethodInvocationResult methodInvocationResult, - AuthorizationResult authorizationResult) { - return this.handler.handleDeniedInvocationResult(methodInvocationResult, authorizationResult); - } - -}