Merge branch '2.6.x' into 2.7.x

snicoll · snicoll · commit 2b3827332fed · 2021-12-09T15:09:46.000+01:00
Closes gh-28946
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/stackdriver/StackdriverProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/stackdriver/StackdriverProperties.java
@@ -78,11 +78,11 @@ public void setResourceLabels(Map<String, String> resourceLabels) {
 		this.resourceLabels = resourceLabels;
 	}
 
-	boolean isUseSemanticMetricTypes() {
+	public boolean isUseSemanticMetricTypes() {
 		return this.useSemanticMetricTypes;
 	}
 
-	void setUseSemanticMetricTypes(boolean useSemanticMetricTypes) {
+	public void setUseSemanticMetricTypes(boolean useSemanticMetricTypes) {
 		this.useSemanticMetricTypes = useSemanticMetricTypes;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -78,11 +78,11 @@ public void setResourceLabels(Map<String, String> resourceLabels) {`
`78`	`78`	`this.resourceLabels = resourceLabels;`
`79`	`79`	`}`
`80`	`80`
`81`		`- boolean isUseSemanticMetricTypes() {`
	`81`	`+ public boolean isUseSemanticMetricTypes() {`
`82`	`82`	`return this.useSemanticMetricTypes;`
`83`	`83`	`}`
`84`	`84`
`85`		`- void setUseSemanticMetricTypes(boolean useSemanticMetricTypes) {`
	`85`	`+ public void setUseSemanticMetricTypes(boolean useSemanticMetricTypes) {`
`86`	`86`	`this.useSemanticMetricTypes = useSemanticMetricTypes;`
`87`	`87`	`}`
`88`	`88`