diff options
4 files changed, 15 insertions, 10 deletions
diff --git a/configserver/pom.xml b/configserver/pom.xml index cf75eb3b999..f346cde63a3 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -240,6 +240,7 @@ <arg>-Xlint:deprecation</arg> <arg>-Xlint:all</arg> <arg>-Xlint:-serial</arg> + <arg>-Xlint:-try</arg> <arg>-Werror</arg> </compilerArgs> </configuration> diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java index 10ee1a22bab..37784b313b6 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java @@ -4,16 +4,18 @@ package com.yahoo.vespa.config.server.session; import com.google.common.io.Files; import com.yahoo.component.Version; import com.yahoo.config.application.api.ApplicationFile; +import com.yahoo.config.model.application.provider.BaseDeployLogger; +import com.yahoo.config.model.application.provider.FilesApplicationPackage; +import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.NetworkPorts; import com.yahoo.config.provision.TenantName; import com.yahoo.path.Path; -import com.yahoo.config.model.application.provider.*; import com.yahoo.slime.Slime; import com.yahoo.transaction.NestedTransaction; -import com.yahoo.vespa.config.server.*; +import com.yahoo.vespa.config.server.SuperModelGenerationCounter; import com.yahoo.vespa.config.server.application.MemoryTenantApplications; import com.yahoo.vespa.config.server.deploy.DeployHandlerLogger; import com.yahoo.vespa.config.server.deploy.TenantFileSystemDirs; @@ -30,10 +32,16 @@ import org.junit.Test; import java.io.File; import java.time.Instant; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Optional; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; /** * @author Ulf Lilleengen @@ -210,4 +218,5 @@ public class LocalSessionTest { return new DeployHandlerLogger(new Slime().get(), verbose, new ApplicationId.Builder().tenant("testtenant").applicationName("testapp").build()); } + } diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index c6504ff9315..0826826f433 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -130,6 +130,7 @@ <compilerArgs> <arg>-Xlint:all</arg> <arg>-Xlint:-serial</arg> + <arg>-Xlint:-try</arg> <arg>-Werror</arg> </compilerArgs> </configuration> diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceModelProvider.java b/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceModelProvider.java index dbcc6ff7b9b..c6947810fa0 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceModelProvider.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceModelProvider.java @@ -38,11 +38,6 @@ public class ServiceModelProvider implements Supplier<ServiceModel> { @Override public ServiceModel get() { try (LatencyMeasurement measurement = metrics.startServiceModelSnapshotLatencyMeasurement()) { - // Reference 'measurement' in a dummy statement, otherwise the compiler - // complains about "auto-closeable resource is never referenced in body of - // corresponding try statement". Why hasn't javac fixed this!? - dummy(measurement); - // WARNING: The monitor manager may be out-of-sync with duper model (no locking) List<ApplicationInfo> applicationInfos = duperModelManager.getApplicationInfos(); @@ -50,5 +45,4 @@ public class ServiceModelProvider implements Supplier<ServiceModel> { } } - private void dummy(LatencyMeasurement measurement) {} } |