Skip to content

Commit 7f55cae

Browse files
mhalbrittermhalbritter
committed
Merge branch '3.2.x'
2 parents a62d4e6 + 4387b79 commit 7f55cae

File tree

50 files changed

+68
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+68
-8
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementWebServerFactoryCustomizer.java

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ private void customizeSameAsParentContext(T factory) {
8181
customizers.add(BeanFactoryUtils.beanOfTypeIncludingAncestors(this.beanFactory, customizerClass));
8282
}
8383
catch (NoSuchBeanDefinitionException ex) {
84+
// Ignore
8485
}
8586
}
8687
invokeCustomizers(factory, customizers);

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java

+1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ private void cleanExpiredCachedResponses(long accessTime) {
110110
this.cachedResponses.entrySet().removeIf((entry) -> entry.getValue().isStale(accessTime, this.timeToLive));
111111
}
112112
catch (Exception ex) {
113+
// Ignore
113114
}
114115
}
115116

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthEndpointTests.java

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ void healthWhenIndicatorIsSlow(CapturedOutput output) {
7979
Thread.sleep(100);
8080
}
8181
catch (InterruptedException ex) {
82+
// Ignore
8283
}
8384
return this.up;
8485
};

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/SharedMetadataReaderFactoryContextInitializer.java

+1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ private void configureConfigurationClassPostProcessor(BeanDefinitionRegistry reg
124124
registry.getBeanDefinition(AnnotationConfigUtils.CONFIGURATION_ANNOTATION_PROCESSOR_BEAN_NAME));
125125
}
126126
catch (NoSuchBeanDefinitionException ex) {
127+
// Ignore
127128
}
128129
}
129130

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheCondition.java

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM
5656
}
5757
}
5858
catch (BindException ex) {
59+
// Ignore
5960
}
6061
return ConditionOutcome.noMatch(message.because("unknown cache type"));
6162
}

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java

+1
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ private Set<Class<?>> resolveWhenPossible(Set<String> classNames) {
500500
resolved.add(resolve(className, this.classLoader));
501501
}
502502
catch (ClassNotFoundException | NoClassDefFoundError ex) {
503+
// Ignore
503504
}
504505
}
505506
return resolved;

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java

+1
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,7 @@ private Resource getIndexHtmlResource(Resource location) {
495495
}
496496
}
497497
catch (Exception ex) {
498+
// Ignore
498499
}
499500
return null;
500501
}

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewResolver.java

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ private ModelAndView resolveResource(String viewName, Map<String, Object> model)
126126
}
127127
}
128128
catch (Exception ex) {
129+
// Ignore
129130
}
130131
}
131132
return null;

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java

+1
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw
603603
jobRegistry.register(getJobFactory());
604604
}
605605
catch (DuplicateJobException ex) {
606+
// Ignore
606607
}
607608
}
608609
return bean;

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java

+1
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ void filterIsRegisteredWithAsyncErrorAndRequestDispatcherTypes() {
106106
delegatingFilterProxy.doFilter(null, null, null);
107107
}
108108
catch (Exception ex) {
109+
// Ignore
109110
}
110111
assertThat(delegatingFilterProxy).extracting("delegate")
111112
.isSameAs(context.getBean(SessionRepositoryFilter.class));

‎spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/TcpConnectServiceReadinessCheck.java

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ private void check(RunningService service, int port, Socket socket) throws IOExc
7272
}
7373
}
7474
catch (SocketTimeoutException ex) {
75+
// Ignore
7576
}
7677
}
7778

‎spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTypeExcludeFilter.java

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public final class JsonTypeExcludeFilter extends StandardAnnotationCustomizableT
4343
includes.add(ClassUtils.forName(JACKSON_MODULE, null));
4444
}
4545
catch (Exception ex) {
46+
// Ignore
4647
}
4748
includes.add(JsonComponent.class);
4849
DEFAULT_INCLUDES = Collections.unmodifiableSet(includes);

‎spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) t
204204
registry.removeBeanDefinition(ImportsConfiguration.BEAN_NAME);
205205
}
206206
catch (NoSuchBeanDefinitionException ex) {
207+
// Ignore
207208
}
208209
}
209210

‎spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java

+2
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ private Method getMainMethod(MergedContextConfiguration mergedConfig, UseMainMet
167167
mainMethod = ReflectionUtils.findMethod(kotlinClass, "main", String[].class);
168168
}
169169
catch (ClassNotFoundException ex) {
170+
// Ignore
170171
}
171172
}
172173
Assert.state(mainMethod != null || useMainMethod == UseMainMethod.WHEN_AVAILABLE,
@@ -555,6 +556,7 @@ private ApplicationContext run(ThrowingSupplier<ConfigurableApplicationContext>
555556
}
556557
}
557558
catch (AbandonedRunException ex) {
559+
// Ignore
558560
}
559561
catch (Exception ex) {
560562
if (this.failedContexts.size() == 1) {

‎spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java

+1
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ public ApplicationContextAssert<C> doesNotHaveBean(String name) {
203203
getApplicationContext(), name, bean));
204204
}
205205
catch (NoSuchBeanDefinitionException ex) {
206+
// Ignore
206207
}
207208
return this;
208209
}

‎spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java

+1
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ private void closeQuietly(Closeable closeable) {
316316
closeable.close();
317317
}
318318
catch (IOException ex) {
319+
// Ignore
319320
}
320321
}
321322

‎spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java

+1
Original file line numberDiff line numberDiff line change
@@ -1095,6 +1095,7 @@ void assertDoesNotHavePath() {
10951095
failWithMessage("Expecting no JSON path \"%s\"", this.expression);
10961096
}
10971097
catch (PathNotFoundException ex) {
1098+
// Ignore
10981099
}
10991100
}
11001101

‎spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleBeanFactoryPostProcessor.java

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
5050
}
5151
}
5252
catch (NoSuchBeanDefinitionException ex) {
53+
// Ignore
5354
}
5455
}
5556
}

‎spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionDetailsFactory.java

+1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ public final D getConnectionDetails(ContainerConnectionSource<C> source) {
9393
}
9494
}
9595
catch (NoClassDefFoundError ex) {
96+
// Ignore
9697
}
9798
return null;
9899
}

‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PrivateKeyParser.java

+1
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ private PrivateKey parse(byte[] bytes) {
203203
return keyFactory.generatePrivate(keySpec);
204204
}
205205
catch (InvalidKeySpecException | NoSuchAlgorithmException ex) {
206+
// Ignore
206207
}
207208
}
208209
return null;

‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressListenerTests.java

+1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public void onUpdate(TestImageUpdateEvent event) {
7878
Thread.sleep(10);
7979
}
8080
catch (InterruptedException ex) {
81+
// Ignore
8182
}
8283
}
8384

‎spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSON.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ static Double toDouble(Object value) {
5151
try {
5252
return Double.valueOf((String) value);
5353
}
54-
catch (NumberFormatException ignored) {
54+
catch (NumberFormatException ex) {
55+
// Ignore
5556
}
5657
}
5758
return null;
@@ -68,7 +69,8 @@ static Integer toInteger(Object value) {
6869
try {
6970
return (int) Double.parseDouble((String) value);
7071
}
71-
catch (NumberFormatException ignored) {
72+
catch (NumberFormatException ex) {
73+
// Ignore
7274
}
7375
}
7476
return null;
@@ -85,7 +87,8 @@ static Long toLong(Object value) {
8587
try {
8688
return (long) Double.parseDouble((String) value);
8789
}
88-
catch (NumberFormatException ignored) {
90+
catch (NumberFormatException ex) {
91+
// Ignore
8992
}
9093
}
9194
return null;

‎spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONObject.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,8 @@ else if (o.getClass().isArray()) {
827827
return o.toString();
828828
}
829829
}
830-
catch (Exception ignored) {
830+
catch (Exception ex) {
831+
// Ignore
831832
}
832833
return null;
833834
}

‎spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,8 @@ else if (number.startsWith("0") && number.length() > 1) {
320320
try {
321321
return Double.valueOf(literal);
322322
}
323-
catch (NumberFormatException ignored) {
323+
catch (NumberFormatException ex) {
324+
// Ignore
324325
}
325326

326327
/* ... finally give up. We have an unquoted string */

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ private void closeQuietly(OutputStream outputStream) {
204204
outputStream.close();
205205
}
206206
catch (IOException ex) {
207+
// Ignore
207208
}
208209
}
209210

‎spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE
127127
return result;
128128
}
129129
catch (ClassNotFoundException ex) {
130+
// Ignore
130131
}
131132
}
132133
if (this.exploded) {

‎spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java

+1
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ private Path createUnpackDirectory(Path parent) {
151151
return unpackDirectory;
152152
}
153153
catch (IOException ex) {
154+
// Ignore
154155
}
155156
}
156157
throw new IllegalStateException("Failed to create unpack directory in directory '" + parent + "'");

‎spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/Handler.java

+4
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ private URLConnection openFallbackTomcatConnection(URL url) {
140140
return connection;
141141
}
142142
catch (IOException ex) {
143+
// Ignore
143144
}
144145
}
145146
return null;
@@ -154,6 +155,7 @@ private boolean isTomcatWarUrl(String file) {
154155
}
155156
}
156157
catch (Exception ex) {
158+
// Ignore
157159
}
158160
}
159161
return false;
@@ -174,6 +176,7 @@ private URLConnection openFallbackContextConnection(URL url) {
174176
}
175177
}
176178
catch (Exception ex) {
179+
// Ignore
177180
}
178181
return null;
179182
}
@@ -425,6 +428,7 @@ static void captureJarContextUrl() {
425428
}
426429
}
427430
catch (Exception ex) {
431+
// Ignore
428432
}
429433
}
430434
finally {

‎spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/JarFile.java

+1
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ private JarFile(RandomAccessDataFile rootFile, String pathFromRoot, RandomAccess
144144
super.close();
145145
}
146146
catch (IOException ioex) {
147+
// Ignore
147148
}
148149
throw ex;
149150
}

‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/nio/file/NestedFileSystem.java

+1
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ private void closeZipFileSystem(FileSystem zipFileSystem) {
138138
zipFileSystem.close();
139139
}
140140
catch (Exception ex) {
141+
// Ignore
141142
}
142143
}
143144

‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/ZipContentTests.java

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ void tearDown() throws Exception {
8888
this.zipContent.close();
8989
}
9090
catch (IllegalStateException ex) {
91+
// Ignore
9192
}
9293
}
9394
}

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java

+1
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@ void repackagedJarContainsTheLayersIndexByDefault(MavenBuild mavenBuild) {
349349
.anyMatch((dependency) -> dependency.startsWith("BOOT-INF/lib/log4j-api-2"));
350350
}
351351
catch (IOException ex) {
352+
// Ignore
352353
}
353354
});
354355
}

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/WarIntegrationTests.java

+1
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ void repackagedWarContainsTheLayersIndexByDefault(MavenBuild mavenBuild) {
167167
.anyMatch((dependency) -> dependency.startsWith("WEB-INF/lib-provided/"));
168168
}
169169
catch (IOException ex) {
170+
// Ignore
170171
}
171172
});
172173
}

‎spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java

+2
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ private static boolean isShortenedIntelliJJar(URL url) {
186186
return createdBy != null && createdBy.contains("IntelliJ");
187187
}
188188
catch (Exception ex) {
189+
// Ignore
189190
}
190191
}
191192
return false;
@@ -330,6 +331,7 @@ private boolean isExcluded(URL url) {
330331
}
331332
}
332333
catch (URISyntaxException ex) {
334+
// Ignore
333335
}
334336
}
335337
return false;

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiPropertySource.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ AnsiElement getElement(String postfix) {
150150
try {
151151
return this.factory.apply(Integer.parseInt(postfix));
152152
}
153-
catch (IllegalArgumentException ignored) {
153+
catch (IllegalArgumentException ex) {
154+
// Ignore
154155
}
155156
}
156157
return null;

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBean.java

+1
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ private static Map<String, ConfigurationPropertiesBean> getAll(ConfigurableAppli
157157
}
158158
}
159159
catch (Exception ex) {
160+
// Ignore
160161
}
161162
}
162163
}

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/handler/NoUnboundElementsBindHandler.java

+1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ private void collectUnbound(ConfigurationPropertyName name, Set<ConfigurationPro
110110
source.filter((candidate) -> isUnbound(name, candidate)).getConfigurationProperty(unboundName));
111111
}
112112
catch (Exception ex) {
113+
// Ignore
113114
}
114115
}
115116
}

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandler.java

+1
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ private <T> T getBoundField(Map<ConfigurationPropertyName, T> boundFields, Strin
212212
}
213213
}
214214
catch (Exception ex) {
215+
// Ignore
215216
}
216217
return null;
217218
}

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesPropertyResolver.java

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public boolean containsProperty(String key) {
4949
return attached.findConfigurationProperty(name) != null;
5050
}
5151
catch (Exception ex) {
52+
// Ignore
5253
}
5354
}
5455
}
@@ -91,6 +92,7 @@ private Object findPropertyValue(String key) {
9192
return (configurationProperty != null) ? configurationProperty.getValue() : null;
9293
}
9394
catch (Exception ex) {
95+
// Ignore
9496
}
9597
}
9698
}

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/DefaultPropertyMapper.java

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ private ConfigurationPropertyName tryMap(String propertySourceName) {
7575
}
7676
}
7777
catch (Exception ex) {
78+
// Ignore
7879
}
7980
return ConfigurationPropertyName.EMPTY;
8081
}

0 commit comments

Comments
 (0)