From 05ef215b88e3ea3742f5f80e7c92eb5ee6648f06 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Wed, 10 May 2023 18:09:54 -0600 Subject: [PATCH] Align Formatting Issue gh-13132 --- .../method/AuthorizationAnnotationUtils.java | 2 +- .../AuthorizationAnnotationUtilsTests.java | 29 +++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/springframework/security/authorization/method/AuthorizationAnnotationUtils.java b/core/src/main/java/org/springframework/security/authorization/method/AuthorizationAnnotationUtils.java index 70eabb2efc..87d425f2f4 100644 --- a/core/src/main/java/org/springframework/security/authorization/method/AuthorizationAnnotationUtils.java +++ b/core/src/main/java/org/springframework/security/authorization/method/AuthorizationAnnotationUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * 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. diff --git a/core/src/test/java/org/springframework/security/authorization/method/AuthorizationAnnotationUtilsTests.java b/core/src/test/java/org/springframework/security/authorization/method/AuthorizationAnnotationUtilsTests.java index 480c2860ec..d37423ca23 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/AuthorizationAnnotationUtilsTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/AuthorizationAnnotationUtilsTests.java @@ -1,3 +1,19 @@ +/* + * 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.authorization.method; import java.lang.reflect.Method; @@ -5,6 +21,7 @@ import java.lang.reflect.Proxy; import java.util.List; import org.junit.jupiter.api.Test; + import org.springframework.security.access.prepost.PreAuthorize; import static org.assertj.core.api.Assertions.assertThatNoException; @@ -15,11 +32,10 @@ import static org.assertj.core.api.Assertions.assertThatNoException; class AuthorizationAnnotationUtilsTests { @Test // gh-13132 - public void annotationsOnSyntheticMethodsShouldNotTriggerAnnotationConfigurationException() - throws NoSuchMethodException { - StringRepository proxy = - (StringRepository) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), - new Class[] {StringRepository.class}, (p, m, args) -> null); + void annotationsOnSyntheticMethodsShouldNotTriggerAnnotationConfigurationException() throws NoSuchMethodException { + StringRepository proxy = (StringRepository) Proxy.newProxyInstance( + Thread.currentThread().getContextClassLoader(), new Class[] { StringRepository.class }, + (p, m, args) -> null); Method method = proxy.getClass().getDeclaredMethod("findAll"); assertThatNoException() .isThrownBy(() -> AuthorizationAnnotationUtils.findUniqueAnnotation(method, PreAuthorize.class)); @@ -28,6 +44,7 @@ class AuthorizationAnnotationUtilsTests { private interface BaseRepository { Iterable findAll(); + } private interface StringRepository extends BaseRepository { @@ -35,5 +52,7 @@ class AuthorizationAnnotationUtilsTests { @Override @PreAuthorize("hasRole('someRole')") List findAll(); + } + }