From 312292b93eb4dbd5ebf522089d185b4c798be771 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 21 Sep 2016 17:20:49 +0100 Subject: [PATCH] Update Animal Sniffer and related annotations for Java 8 baseline Closes gh-6981 --- .../MetricRepositoryAutoConfiguration.java | 28 ----------- .../PublicMetricsAutoConfiguration.java | 5 -- .../endpoint/mvc/HeapdumpMvcEndpoint.java | 2 - .../metrics/buffer/BufferCounterService.java | 2 - .../metrics/buffer/BufferGaugeService.java | 4 +- .../metrics/buffer/BufferMetricReader.java | 4 +- .../boot/actuate/metrics/buffer/Buffers.java | 5 +- .../actuate/metrics/buffer/CounterBuffer.java | 5 +- .../metrics/buffer/CounterBuffers.java | 5 +- .../actuate/metrics/buffer/GaugeBuffers.java | 5 +- .../SpringIntegrationMetricReader.java | 4 +- .../buffer/BufferGaugeServiceSpeedTests.java | 2 - .../buffer/CounterServiceSpeedTests.java | 2 - .../DefaultCounterServiceSpeedTests.java | 2 - .../buffer/DefaultGaugeServiceSpeedTests.java | 2 - .../DropwizardCounterServiceSpeedTests.java | 2 - spring-boot-parent/pom.xml | 6 +-- .../boot/loader/tools/JarWriter.java | 3 -- .../boot/loader/tools/Repackager.java | 49 ++++--------------- .../jta/bitronix/PoolingDataSourceBean.java | 3 -- 20 files changed, 18 insertions(+), 122 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java index 1d15d8ecbe..810a120a06 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java @@ -29,8 +29,6 @@ import org.springframework.boot.actuate.metrics.export.Exporter; import org.springframework.boot.actuate.metrics.export.MetricCopyExporter; import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository; import org.springframework.boot.actuate.metrics.repository.MetricRepository; -import org.springframework.boot.actuate.metrics.writer.DefaultCounterService; -import org.springframework.boot.actuate.metrics.writer.DefaultGaugeService; import org.springframework.boot.actuate.metrics.writer.MetricWriter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnJava; @@ -81,32 +79,6 @@ import org.springframework.messaging.MessageChannel; public class MetricRepositoryAutoConfiguration { @Configuration - @ConditionalOnJava(value = JavaVersion.EIGHT, range = Range.OLDER_THAN) - @ConditionalOnMissingBean(GaugeService.class) - static class LegacyMetricServicesConfiguration { - - private final MetricWriter writer; - - LegacyMetricServicesConfiguration(@ActuatorMetricWriter MetricWriter writer) { - this.writer = writer; - } - - @Bean - @ConditionalOnMissingBean(CounterService.class) - public DefaultCounterService counterService() { - return new DefaultCounterService(this.writer); - } - - @Bean - @ConditionalOnMissingBean(GaugeService.class) - public DefaultGaugeService gaugeService() { - return new DefaultGaugeService(this.writer); - } - - } - - @Configuration - @ConditionalOnJava(JavaVersion.EIGHT) @ConditionalOnMissingBean(GaugeService.class) static class FastMetricServicesConfiguration { diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java index 2aa3aa126c..e3cad77e69 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java @@ -42,8 +42,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnJava; -import org.springframework.boot.autoconfigure.condition.ConditionalOnJava.JavaVersion; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration; @@ -53,7 +51,6 @@ import org.springframework.cache.CacheManager; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.monitor.IntegrationMBeanExporter; -import org.springframework.lang.UsesJava7; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link PublicMetrics}. @@ -141,8 +138,6 @@ public class PublicMetricsAutoConfiguration { @Configuration @ConditionalOnClass(IntegrationMBeanExporter.class) @ConditionalOnBean(IntegrationMBeanExporter.class) - @ConditionalOnJava(JavaVersion.SEVEN) - @UsesJava7 static class IntegrationMetricsConfiguration { @Bean diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java index f0ca61e698..fcb7afac8d 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java @@ -38,7 +38,6 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; -import org.springframework.lang.UsesJava7; import org.springframework.util.ClassUtils; import org.springframework.util.ReflectionUtils; import org.springframework.util.StreamUtils; @@ -187,7 +186,6 @@ public class HeapdumpMvcEndpoint extends AbstractMvcEndpoint { * {@link HeapDumper} that uses {@code com.sun.management.HotSpotDiagnosticMXBean} * available on Oracle and OpenJDK to dump the heap to a file. */ - @UsesJava7 protected static class HotSpotDiagnosticMXBeanHeapDumper implements HeapDumper { private Object diagnosticMXBean; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferCounterService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferCounterService.java index 0717b3df2b..9462a19f7e 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferCounterService.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferCounterService.java @@ -19,7 +19,6 @@ package org.springframework.boot.actuate.metrics.buffer; import java.util.concurrent.ConcurrentHashMap; import org.springframework.boot.actuate.metrics.CounterService; -import org.springframework.lang.UsesJava8; /** * Fast implementation of {@link CounterService} using {@link CounterBuffers}. @@ -27,7 +26,6 @@ import org.springframework.lang.UsesJava8; * @author Dave Syer * @since 1.3.0 */ -@UsesJava8 public class BufferCounterService implements CounterService { private final ConcurrentHashMap names = new ConcurrentHashMap(); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeService.java index 602764a634..221f51fe6e 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeService.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -19,7 +19,6 @@ package org.springframework.boot.actuate.metrics.buffer; import java.util.concurrent.ConcurrentHashMap; import org.springframework.boot.actuate.metrics.GaugeService; -import org.springframework.lang.UsesJava8; /** * Fast implementation of {@link GaugeService} using {@link GaugeBuffers}. @@ -27,7 +26,6 @@ import org.springframework.lang.UsesJava8; * @author Dave Syer * @since 1.3.0 */ -@UsesJava8 public class BufferGaugeService implements GaugeService { private final ConcurrentHashMap names = new ConcurrentHashMap(); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferMetricReader.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferMetricReader.java index 0a6ad4aacf..041c41c285 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferMetricReader.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferMetricReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -26,7 +26,6 @@ import java.util.regex.Pattern; import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.reader.MetricReader; import org.springframework.boot.actuate.metrics.reader.PrefixMetricReader; -import org.springframework.lang.UsesJava8; /** * {@link MetricReader} implementation using {@link CounterBuffers} and @@ -35,7 +34,6 @@ import org.springframework.lang.UsesJava8; * @author Dave Syer * @since 1.3.0 */ -@UsesJava8 public class BufferMetricReader implements MetricReader, PrefixMetricReader { private static final Predicate ALL = Pattern.compile(".*").asPredicate(); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/Buffers.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/Buffers.java index 920af45fc9..f76f620852 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/Buffers.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/Buffers.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -22,8 +22,6 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; -import org.springframework.lang.UsesJava8; - /** * Base class used to manage a map of {@link Buffer} objects. * @@ -31,7 +29,6 @@ import org.springframework.lang.UsesJava8; * @author Phillip Webb * @param The buffer type */ -@UsesJava8 abstract class Buffers> { private final ConcurrentHashMap buffers = new ConcurrentHashMap(); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/CounterBuffer.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/CounterBuffer.java index 8d036c6245..2d34e68acb 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/CounterBuffer.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/CounterBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -18,15 +18,12 @@ package org.springframework.boot.actuate.metrics.buffer; import java.util.concurrent.atomic.LongAdder; -import org.springframework.lang.UsesJava8; - /** * Mutable buffer containing a long adder (Java 8) and a timestamp. * * @author Dave Syer * @since 1.3.0 */ -@UsesJava8 public class CounterBuffer extends Buffer { private final LongAdder adder; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/CounterBuffers.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/CounterBuffers.java index 9a71a5c43d..ef7b3855d4 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/CounterBuffers.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/CounterBuffers.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -18,15 +18,12 @@ package org.springframework.boot.actuate.metrics.buffer; import java.util.function.Consumer; -import org.springframework.lang.UsesJava8; - /** * Fast writes to in-memory metrics store using {@link CounterBuffer}. * * @author Dave Syer * @since 1.3.0 */ -@UsesJava8 public class CounterBuffers extends Buffers { public void increment(final String name, final long delta) { diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/GaugeBuffers.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/GaugeBuffers.java index 7720443ddf..d3302a924f 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/GaugeBuffers.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/GaugeBuffers.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -18,15 +18,12 @@ package org.springframework.boot.actuate.metrics.buffer; import java.util.function.Consumer; -import org.springframework.lang.UsesJava8; - /** * Fast writes to in-memory metrics store using {@link GaugeBuffer}. * * @author Dave Syer * @since 1.3.0 */ -@UsesJava8 public class GaugeBuffers extends Buffers { public void set(final String name, final double value) { diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReader.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReader.java index 459a67bafa..62217c1a76 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReader.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 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. @@ -24,7 +24,6 @@ import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.reader.MetricReader; import org.springframework.integration.monitor.IntegrationMBeanExporter; import org.springframework.integration.support.management.Statistics; -import org.springframework.lang.UsesJava7; /** * A {@link MetricReader} for Spring Integration metrics (as provided by @@ -33,7 +32,6 @@ import org.springframework.lang.UsesJava7; * @author Dave Syer * @since 1.3.0 */ -@UsesJava7 public class SpringIntegrationMetricReader implements MetricReader { private final IntegrationMBeanExporter exporter; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeServiceSpeedTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeServiceSpeedTests.java index 123c001f2e..29e43d1f76 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeServiceSpeedTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeServiceSpeedTests.java @@ -39,7 +39,6 @@ import org.junit.runner.RunWith; import org.springframework.boot.actuate.metrics.GaugeService; import org.springframework.boot.actuate.metrics.Metric; -import org.springframework.lang.UsesJava8; import org.springframework.util.StopWatch; import static org.assertj.core.api.Assertions.assertThat; @@ -50,7 +49,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer */ @RunWith(Theories.class) -@UsesJava8 public class BufferGaugeServiceSpeedTests { @DataPoints diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/CounterServiceSpeedTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/CounterServiceSpeedTests.java index 9852f32079..25bc73b9c5 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/CounterServiceSpeedTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/CounterServiceSpeedTests.java @@ -38,7 +38,6 @@ import org.junit.runner.RunWith; import org.springframework.boot.actuate.metrics.CounterService; import org.springframework.boot.actuate.metrics.Metric; -import org.springframework.lang.UsesJava8; import org.springframework.util.StopWatch; import static org.assertj.core.api.Assertions.assertThat; @@ -49,7 +48,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer */ @RunWith(Theories.class) -@UsesJava8 public class CounterServiceSpeedTests { @DataPoints diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultCounterServiceSpeedTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultCounterServiceSpeedTests.java index f5802bcbbf..9cb2083a58 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultCounterServiceSpeedTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultCounterServiceSpeedTests.java @@ -38,7 +38,6 @@ import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.reader.MetricReader; import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository; import org.springframework.boot.actuate.metrics.writer.DefaultCounterService; -import org.springframework.lang.UsesJava8; import org.springframework.util.StopWatch; import static org.assertj.core.api.Assertions.assertThat; @@ -49,7 +48,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer */ @RunWith(Theories.class) -@UsesJava8 public class DefaultCounterServiceSpeedTests { @DataPoints diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultGaugeServiceSpeedTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultGaugeServiceSpeedTests.java index 84fcd56126..fac827f08b 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultGaugeServiceSpeedTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultGaugeServiceSpeedTests.java @@ -38,7 +38,6 @@ import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.reader.MetricReader; import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository; import org.springframework.boot.actuate.metrics.writer.DefaultGaugeService; -import org.springframework.lang.UsesJava8; import org.springframework.util.StopWatch; import static org.assertj.core.api.Assertions.assertThat; @@ -49,7 +48,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer */ @RunWith(Theories.class) -@UsesJava8 public class DefaultGaugeServiceSpeedTests { @DataPoints diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DropwizardCounterServiceSpeedTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DropwizardCounterServiceSpeedTests.java index 8413965411..86cfdd7a8b 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DropwizardCounterServiceSpeedTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DropwizardCounterServiceSpeedTests.java @@ -39,7 +39,6 @@ import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.dropwizard.DropwizardMetricServices; import org.springframework.boot.actuate.metrics.reader.MetricReader; import org.springframework.boot.actuate.metrics.reader.MetricRegistryMetricReader; -import org.springframework.lang.UsesJava8; import org.springframework.util.StopWatch; import static org.assertj.core.api.Assertions.assertThat; @@ -51,7 +50,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Dave Syer */ @RunWith(Theories.class) -@UsesJava8 public class DropwizardCounterServiceSpeedTests { @DataPoints diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml index f276a74413..10831109ba 100644 --- a/spring-boot-parent/pom.xml +++ b/spring-boot-parent/pom.xml @@ -594,12 +594,10 @@ ${disable.checks} org.codehaus.mojo.signature - java16 - 1.1 + java18 + 1.0 - org.springframework.lang.UsesJava8 - org.springframework.lang.UsesJava7 org.springframework.boot.lang.UsesUnsafeJava diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java index d5a05dd094..3eed102ae4 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java @@ -42,8 +42,6 @@ import java.util.jar.Manifest; import java.util.zip.CRC32; import java.util.zip.ZipEntry; -import org.springframework.lang.UsesJava7; - /** * Writes JAR content, ensuring valid directory entries are always create and duplicate * items are ignored. @@ -88,7 +86,6 @@ public class JarWriter { this.jarOutput = new JarOutputStream(fileOutputStream); } - @UsesJava7 private void setExecutableFilePermission(File file) { try { Path path = file.toPath(); diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java index c25129844b..fb44ec1a93 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java @@ -29,7 +29,6 @@ import java.util.jar.JarFile; import java.util.jar.Manifest; import org.springframework.boot.loader.tools.JarWriter.EntryTransformer; -import org.springframework.lang.UsesJava8; /** * Utility class that can be used to repackage an archive so that it can be executed using @@ -353,51 +352,21 @@ public class Repackager { } renamedEntry.setCompressedSize(entry.getCompressedSize()); renamedEntry.setCrc(entry.getCrc()); - setCreationTimeIfPossible(entry, renamedEntry); + if (entry.getCreationTime() != null) { + renamedEntry.setCreationTime(entry.getCreationTime()); + } if (entry.getExtra() != null) { renamedEntry.setExtra(entry.getExtra()); } - setLastAccessTimeIfPossible(entry, renamedEntry); - setLastModifiedTimeIfPossible(entry, renamedEntry); + if (entry.getLastAccessTime() != null) { + renamedEntry.setLastAccessTime(entry.getLastAccessTime()); + } + if (entry.getLastModifiedTime() != null) { + renamedEntry.setLastModifiedTime(entry.getLastModifiedTime()); + } return renamedEntry; } - @UsesJava8 - private void setCreationTimeIfPossible(JarEntry source, JarEntry target) { - try { - if (source.getCreationTime() != null) { - target.setCreationTime(source.getCreationTime()); - } - } - catch (NoSuchMethodError ex) { - // Not running on Java 8. Continue. - } - } - - @UsesJava8 - private void setLastAccessTimeIfPossible(JarEntry source, JarEntry target) { - try { - if (source.getLastAccessTime() != null) { - target.setLastAccessTime(source.getLastAccessTime()); - } - } - catch (NoSuchMethodError ex) { - // Not running on Java 8. Continue. - } - } - - @UsesJava8 - private void setLastModifiedTimeIfPossible(JarEntry source, JarEntry target) { - try { - if (source.getLastModifiedTime() != null) { - target.setLastModifiedTime(source.getLastModifiedTime()); - } - } - catch (NoSuchMethodError ex) { - // Not running on Java 8. Continue. - } - } - } } diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java b/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java index 449298bdc2..108277cdc5 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java @@ -33,7 +33,6 @@ import bitronix.tm.resource.jdbc.PoolingDataSource; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.lang.UsesJava7; import org.springframework.util.StringUtils; /** @@ -111,7 +110,6 @@ public class PoolingDataSourceBean extends PoolingDataSource } @Override - @UsesJava7 public Logger getParentLogger() throws SQLFeatureNotSupportedException { try { return ((DataSource) this).getParentLogger(); @@ -168,7 +166,6 @@ public class PoolingDataSourceBean extends PoolingDataSource } @Override - @UsesJava7 public Logger getParentLogger() throws SQLFeatureNotSupportedException { return this.dataSource.getParentLogger(); }