Merge branch '2.4.x'

philwebb · philwebb · commit 4b763c3133ac · 2020-12-16T16:54:50.000-08:00
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataResource.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataResource.java
@@ -65,7 +65,12 @@ StandardConfigDataReference getReference() {
 		return this.reference;
 	}
 
-	Resource getResource() {
+	/**
+	 * Return the underlying Spring {@link Resource} being loaded.
+	 * @return the underlying resource
+	 * @since 2.4.2
+	 */
+	public Resource getResource() {
 		return this.resource;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,12 @@ StandardConfigDataReference getReference() {`
`65`	`65`	`return this.reference;`
`66`	`66`	`}`
`67`	`67`
`68`		`- Resource getResource() {`
	`68`	`+ /**`
	`69`	`+ * Return the underlying Spring {@link Resource} being loaded.`
	`70`	`+ * @return the underlying resource`
	`71`	`+ * @since 2.4.2`
	`72`	`+ */`
	`73`	`+ public Resource getResource() {`
`69`	`74`	`return this.resource;`
`70`	`75`	`}`
`71`	`76`