Commit c839ebb

committed

Merge branch '2.6.x' into 2.7.x

2 parents 3e6c8bc + 8e583f6 commit c839ebbCopy full SHA for c839ebb

File tree

+21

-7

lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src
- main/java/org/springframework/boot/actuate/autoconfigure/health
  - IncludeExcludeGroupMemberPredicate.java
- test/java/org/springframework/boot/actuate/autoconfigure/health
  - IncludeExcludeGroupMemberPredicateTests.java

+21

-7

lines changed

Lines changed: 14 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2021 the original author or authors.`
	`2`	`+ * Copyright 2012-2022 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -41,10 +41,7 @@ class IncludeExcludeGroupMemberPredicate implements Predicate<String> {`
`41`	`41`
`42`	`42`	`@Override`
`43`	`43`	`public boolean test(String name) {`
`44`		`- return testCleanName(clean(name));`
`45`		`- }`
`46`		`-`
`47`		`- private boolean testCleanName(String name) {`
	`44`	`+ name = clean(name);`
`48`	`45`	`return isIncluded(name) && !isExcluded(name);`
`49`	`46`	`}`
`50`	`47`
`@@ -64,7 +61,18 @@ private boolean isIncludedName(String name) {`
`64`	`61`	`}`
`65`	`62`
`66`	`63`	`private boolean isExcluded(String name) {`
`67`		`- return this.exclude.contains("*") \|\| this.exclude.contains(name);`
	`64`	`+ return this.exclude.contains("*") \|\| isExcludedName(name);`
	`65`	`+ }`
	`66`	`+`
	`67`	`+ private boolean isExcludedName(String name) {`
	`68`	`+ if (this.exclude.contains(name)) {`
	`69`	`+ return true;`
	`70`	`+ }`
	`71`	`+ if (name.contains("/")) {`
	`72`	`+ String parent = name.substring(0, name.lastIndexOf("/"));`
	`73`	`+ return isExcludedName(parent);`
	`74`	`+ }`
	`75`	`+ return false;`
`68`	`76`	`}`
`69`	`77`
`70`	`78`	`private Set<String> clean(Set<String> names) {`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2021 the original author or authors.`
	`2`	`+ * Copyright 2012-2022 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -112,6 +112,12 @@ void specifiedIncludeShouldNotIncludeExcludedNested() {`
`112`	`112`	`assertThat(predicate).accepts("test/a").rejects("test/b").rejects("foo");`
`113`	`113`	`}`
`114`	`114`
	`115`	`+ @Test // gh-29251`
	`116`	`+ void specifiedExcludeShouldExcludeNestedChildren() {`
	`117`	`+ Predicate<String> predicate = include("*").exclude("test");`
	`118`	`+ assertThat(predicate).rejects("test").rejects("test/a").rejects("test/a").accepts("other");`
	`119`	`+ }`
	`120`	`+`
`115`	`121`	`private Builder include(String... include) {`
`116`	`122`	`return new Builder(include);`
`117`	`123`	`}`

Comments

(0)