root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.7.x' 

Closes gh-32819
This commit is contained in:
Stephane Nicoll 2022-10-20 16:40:30 +02:00
parent 482eb49391 13691f27bd
commit 74a8eb7160
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/SomeProperties.java → spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/MyProperties.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.
@ -16,7 +16,7 @@
package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.usingannotatedtypes;
class SomeProperties {
class MyProperties {
Object getRemoteAddress() {
return null;

6
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/MyService.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.
@ -21,9 +21,9 @@ import org.springframework.stereotype.Service;
@Service
public class MyService {
private final SomeProperties properties;
private final MyProperties properties;
public MyService(SomeProperties properties) {
public MyService(MyProperties properties) {
this.properties = properties;
}

2
spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/SomeProperties.kt → spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/MyProperties.kt
View File

@ -16,7 +16,7 @@
package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.usingannotatedtypes
class SomeProperties {
class MyProperties {
val remoteAddress: Any?
get() = null

2
spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/MyService.kt
View File

@ -19,7 +19,7 @@ package org.springframework.boot.docs.features.externalconfig.typesafeconfigurat
import org.springframework.stereotype.Service
@Service
class MyService(val properties: SomeProperties) {
class MyService(val properties: MyProperties) {
fun openConnection() {
val server = Server(properties.remoteAddress)