Browse Source

Merge pull request #38508 from izeye

* pr/38508:
  Polish

Closes gh-38508
pull/38550/head
Moritz Halbritter 2 years ago
parent
commit
8f2d7d4cef
  1. 2
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java
  2. 2
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java
  3. 4
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
  4. 2
      spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/data-access.adoc
  5. 2
      spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc
  6. 2
      spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/NestedJarFile.java
  7. 2
      spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/UrlJarFileFactory.java

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java

@ -236,7 +236,7 @@ public class ConcurrentKafkaListenerContainerFactoryConfigurer { @@ -236,7 +236,7 @@ public class ConcurrentKafkaListenerContainerFactoryConfigurer {
map.from(properties::getLogContainerConfig).to(container::setLogContainerConfig);
map.from(properties::isMissingTopicsFatal).to(container::setMissingTopicsFatal);
map.from(properties::isImmediateStop).to(container::setStopImmediate);
map.from(properties::getObservationEnabled).to(container::setObservationEnabled);
map.from(properties::isObservationEnabled).to(container::setObservationEnabled);
map.from(this.transactionManager).to(container::setTransactionManager);
map.from(this.rebalanceListener).to(container::setConsumerRebalanceListener);
map.from(this.listenerTaskExecutor).to(container::setListenerTaskExecutor);

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java

@ -98,7 +98,7 @@ public class KafkaAutoConfiguration { @@ -98,7 +98,7 @@ public class KafkaAutoConfiguration {
map.from(kafkaProducerListener).to(kafkaTemplate::setProducerListener);
map.from(this.properties.getTemplate().getDefaultTopic()).to(kafkaTemplate::setDefaultTopic);
map.from(this.properties.getTemplate().getTransactionIdPrefix()).to(kafkaTemplate::setTransactionIdPrefix);
map.from(this.properties.getTemplate().getObservationEnabled()).to(kafkaTemplate::setObservationEnabled);
map.from(this.properties.getTemplate().isObservationEnabled()).to(kafkaTemplate::setObservationEnabled);
return kafkaTemplate;
}

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java

@ -1005,7 +1005,7 @@ public class KafkaProperties { @@ -1005,7 +1005,7 @@ public class KafkaProperties {
this.transactionIdPrefix = transactionIdPrefix;
}
public boolean getObservationEnabled() {
public boolean isObservationEnabled() {
return this.observationEnabled;
}
@ -1279,7 +1279,7 @@ public class KafkaProperties { @@ -1279,7 +1279,7 @@ public class KafkaProperties {
this.changeConsumerThreadName = changeConsumerThreadName;
}
public boolean getObservationEnabled() {
public boolean isObservationEnabled() {
return this.observationEnabled;
}

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/data-access.adoc

@ -150,7 +150,7 @@ Note that each `configuration` sub namespace provides advanced settings based on @@ -150,7 +150,7 @@ Note that each `configuration` sub namespace provides advanced settings based on
[[howto.data-access.spring-data-repositories]]
=== Use Spring Data Repositories
Spring Data can create implementations of `@Repository` interfaces of various flavors.
Spring Boot handles all of that for you, as long as those `@Repositories` are included in one of the <<using#using.auto-configuration.packages,auto-configuration packages>>, typically the package (or a sub-package) of your main application class that is annotated with `@SpringBootApplication` or `@EnableAutoConfiguration`.
Spring Boot handles all of that for you, as long as those `@Repository` annotations are included in one of the <<using#using.auto-configuration.packages,auto-configuration packages>>, typically the package (or a sub-package) of your main application class that is annotated with `@SpringBootApplication` or `@EnableAutoConfiguration`.
For many applications, all you need is to put the right Spring Data dependencies on your classpath.
There is a `spring-boot-starter-data-jpa` for JPA, `spring-boot-starter-data-mongodb` for Mongodb, and various other starters for supported technologies.

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc

@ -624,7 +624,7 @@ include::code:MySameSiteConfiguration[] @@ -624,7 +624,7 @@ include::code:MySameSiteConfiguration[]
The character encoding behavior of the embedded servlet container for request and response handling can be configured using the `server.servlet.encoding.*` configuration properties.
When a request's `Accept-Language` header indicates a locale for the request it will be automatically mapped to a charset by the servlet container.
Each containers providers default locale to charset mappings and you should verify that they meet your application's needs.
Each container provides default locale to charset mappings and you should verify that they meet your application's needs.
When they do not, use the configprop:server.servlet.encoding.mapping[] configuration property to customize the mappings, as shown in the following example:
[source,yaml,indent=0,subs="verbatim",configprops,configblocks]

2
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/NestedJarFile.java

@ -814,7 +814,7 @@ public class NestedJarFile extends JarFile { @@ -814,7 +814,7 @@ public class NestedJarFile extends JarFile {
private volatile boolean closed;
protected RawZipDataInputStream(InputStream in) {
RawZipDataInputStream(InputStream in) {
super(in);
}

2
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/UrlJarFileFactory.java

@ -60,7 +60,7 @@ class UrlJarFileFactory { @@ -60,7 +60,7 @@ class UrlJarFileFactory {
private Runtime.Version getVersion(URL url) {
// The standard JDK handler uses #runtime to indicate that the runtime version
// should be used. This unfortunately doesn't work for us as
// jdk.internal.loaderURLClassPath only adds the runtime fragment when the URL
// jdk.internal.loader.URLClassPath only adds the runtime fragment when the URL
// is using the internal JDK handler. We need to flip the default to use
// the runtime version. See gh-38050
return "base".equals(url.getRef()) ? JarFile.baseVersion() : JarFile.runtimeVersion();

Loading…
Cancel
Save