Commit 6f1232c

committed

Address Checkstyle

Issue gh-17447 Signed-off-by: Josh Cummings <3627351+jzheaux@users.noreply.github.com>

1 parent 93cb016 commit 6f1232cCopy full SHA for 6f1232c

File tree

+25

-8

lines changed

+25

-8

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,8 @@`
`59`	`59`	`* {@code @HasRole} annotation found on a given {@link AnnotatedElement}.`
`60`	`60`	`*`
`61`	`61`	`* <p>`
`62`		`- * Meta-annotations that use enum values can use {@link ExpressionTemplateValueProvider} to`
`63`		`- * provide custom placeholder values.`
	`62`	`+ * Meta-annotations that use enum values can use {@link ExpressionTemplateValueProvider}`
	`63`	`+ * to provide custom placeholder values.`
`64`	`64`	`*`
`65`	`65`	`* <p>`
`66`	`66`	`* Since the process of synthesis is expensive, it is recommended to cache the synthesized`
`@@ -176,8 +176,8 @@ public Set<ConvertiblePair> getConvertibleTypes() {`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`@Override`
`179`		`- public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {`
`180`		`- return (source != null) ? ((ExpressionTemplateValueProvider)source).getExpressionTemplateValue() : null;`
	`179`	`+ public @NullableObject convert(@NullableObject source, TypeDescriptor sourceType, TypeDescriptor targetType) {`
	`180`	`+ return (source != null) ? ((ExpressionTemplateValueProvider)source).getExpressionTemplateValue() : null;`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`}`

Lines changed: 17 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,19 @@`
	`1`	`+/*`
	`2`	`+ * Copyright 2004-present the original author or authors.`
	`3`	`+ *`
	`4`	`+ * Licensed under the Apache License, Version 2.0 (the "License");`
	`5`	`+ * you may not use this file except in compliance with the License.`
	`6`	`+ * You may obtain a copy of the License at`
	`7`	`+ *`
	`8`	`+ * https://www.apache.org/licenses/LICENSE-2.0`
	`9`	`+ *`
	`10`	`+ * Unless required by applicable law or agreed to in writing, software`
	`11`	`+ * distributed under the License is distributed on an "AS IS" BASIS,`
	`12`	`+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.`
	`13`	`+ * See the License for the specific language governing permissions and`
	`14`	`+ * limitations under the License.`
	`15`	`+ */`
	`16`	`+`
`1`	`17`	`package org.springframework.security.core.annotation;`
`2`	`18`
`3`	`19`	`/**`
`@@ -20,14 +36,13 @@`
`20`	`36`	`* }`
`21`	`37`	`* </pre>`
`22`	`38`	`*`
`23`		`- * @since 6.5`
`24`	`39`	`* @author Mike Heath`
	`40`	`+ * @since 7.0`
`25`	`41`	`*/`
`26`	`42`	`public interface ExpressionTemplateValueProvider {`
`27`	`43`
`28`	`44`	`/**`
`29`	`45`	`* Returns the value to be used in an expression template.`
`30`		`- *`
`31`	`46`	`* @return the value to be used in an expression template`
`32`	`47`	`*/`
`33`	`48`	`String getExpressionTemplateValue();`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ void parseMetaSourceAnnotationWithEnumImplementingExpressionTemplateValueProvide`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`enum Permission implements ExpressionTemplateValueProvider {`
`65`		`-READ,`
`66`		`- WRITE;`
	`65`	`+`
	`66`	`+ READ, WRITE;`
`67`	`67`
`68`	`68`	`@Override`
`69`	`69`	`public String getExpressionTemplateValue() {`
`@@ -72,6 +72,7 @@ public String getExpressionTemplateValue() {`
`72`	`72`	`case WRITE -> "'user.WRITE'";`
`73`	`73`	`};`
`74`	`74`	`}`
	`75`	`+`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`@Documented`
`@@ -89,6 +90,7 @@ public String getExpressionTemplateValue() {`
`89`	`90`	`@Target({ ElementType.TYPE, ElementType.METHOD })`
`90`	`91`	`@HasAnyCustomPermissions(permissions = { Permission.READ, Permission.WRITE })`
`91`	`92`	`@interface HasAllCustomPermissions {`
	`93`	`+`
`92`	`94`	`}`
`93`	`95`
`94`	`96`	`@Documented`

Comments

(0)