Upgrade checkstyle to version 7.5

This commit upgrades the checkstyle configuration from version 5.9 to
version 7.5, the latest version as of today. The main enhancement
obtained via this upgrade is better detection of redundant modifiers.

Relates elastic/elasticsearch#4810

Original commit: elastic/x-pack-elasticsearch@2c9b7d23dc

elasticsearch/src/main/java/org/elasticsearch/license/ExpirationCallback.java

@@ -31,7 +31,7 @@ abstract class ExpirationCallback {
          * @param max       earliest relative time to execute before license expiry
          * @param frequency interval between execution
          */
-        public Pre(TimeValue min, TimeValue max, TimeValue frequency) {
+        Pre(TimeValue min, TimeValue max, TimeValue frequency) {
             super(Orientation.PRE, min, max, frequency);
         }
     }
@@ -50,7 +50,7 @@ abstract class ExpirationCallback {
          * @param max       latest relative time to execute after license expiry
          * @param frequency interval between execution
          */
-        public Post(TimeValue min, TimeValue max, TimeValue frequency) {
+        Post(TimeValue min, TimeValue max, TimeValue frequency) {
             super(Orientation.POST, min, max, frequency);
         }
     }

elasticsearch/src/main/java/org/elasticsearch/license/LicensesMetaData.java

@@ -49,7 +49,7 @@ class LicensesMetaData extends AbstractNamedDiffable<MetaData.Custom> implements
 
     private License license;
 
-    public LicensesMetaData(License license) {
+    LicensesMetaData(License license) {
         this.license = license;
     }
 
@@ -131,7 +131,7 @@ class LicensesMetaData extends AbstractNamedDiffable<MetaData.Custom> implements
         }
     }
 
-    public LicensesMetaData(StreamInput streamInput) throws IOException {
+    LicensesMetaData(StreamInput streamInput) throws IOException {
         if (streamInput.readBoolean()) {
             license = License.readLicense(streamInput);
         } else {

elasticsearch/src/main/java/org/elasticsearch/xpack/extensions/XPackExtensionPolicy.java

@@ -32,7 +32,7 @@ final class XPackExtensionPolicy extends Policy {
      * @param basePolicy The base policy
      * @param extensions Extra code source extension's policy
      */
-    public XPackExtensionPolicy(Policy basePolicy, Map<String, Policy> extensions) {
+    XPackExtensionPolicy(Policy basePolicy, Map<String, Policy> extensions) {
         this.basePolicy = basePolicy;
         this.extensions = extensions;
         xpackURL = XPackExtensionPolicy.class.getProtectionDomain().getCodeSource().getLocation();

elasticsearch/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java

@@ -64,7 +64,7 @@ public class TransportGraphExploreAction extends HandledTransportAction<GraphExp
 
     static class VertexPriorityQueue extends PriorityQueue<Vertex> {
 
-        public VertexPriorityQueue(int maxSize) {
+        VertexPriorityQueue(int maxSize) {
             super(maxSize);
         }
 

elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringBulkAction.java

@@ -53,7 +53,7 @@ public class TransportMonitoringBulkAction extends HandledTransportAction<Monito
         private final Exporters exportService;
         private final ClusterService clusterService;
 
-        public AsyncAction(MonitoringBulkRequest request, ActionListener<MonitoringBulkResponse> listener,
+        AsyncAction(MonitoringBulkRequest request, ActionListener<MonitoringBulkResponse> listener,
                            Exporters exportService, ClusterService clusterService) {
             this.request = request;
             this.listener = listener;

elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/cleaner/CleanerService.java

@@ -157,7 +157,7 @@ public class CleanerService extends AbstractLifecycleComponent {
         /**
          * Enable automatic logging and stopping of the runnable based on the {@link #lifecycle}.
          */
-        public IndicesCleaner() {
+        IndicesCleaner() {
             super(lifecycle, logger);
         }
 

elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExportBulk.java

@@ -56,7 +56,7 @@ class HttpExportBulk extends ExportBulk {
      */
     private byte[] payload = null;
 
-    public HttpExportBulk(final String name, final RestClient client, final Map<String, String> parameters,
+    HttpExportBulk(final String name, final RestClient client, final Map<String, String> parameters,
                           final ResolversRegistry registry) {
         super(name);
 
@@ -69,7 +69,7 @@ class HttpExportBulk extends ExportBulk {
     public void doAdd(Collection<MonitoringDoc> docs) throws ExportException {
         try {
             if (docs != null && docs.isEmpty() == false) {
-                try (final BytesStreamOutput payload = new BytesStreamOutput()) {
+                try (BytesStreamOutput payload = new BytesStreamOutput()) {
                     for (MonitoringDoc monitoringDoc : docs) {
                         // any failure caused by an individual doc will be written as an empty byte[], thus not impacting the rest
                         payload.write(toBulkBytes(monitoringDoc));
@@ -108,7 +108,7 @@ class HttpExportBulk extends ExportBulk {
         final XContentType xContentType = XContentType.JSON;
         final XContent xContent = xContentType.xContent();
 
-        try (final BytesStreamOutput out = new BytesStreamOutput()) {
+        try (BytesStreamOutput out = new BytesStreamOutput()) {
             MonitoringIndexNameResolver<MonitoringDoc> resolver = registry.getResolver(doc);
 
             if (resolver != null) {

elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExportBulkResponseListener.java

@@ -51,7 +51,7 @@ class HttpExportBulkResponseListener implements ResponseListener {
     @Override
     public void onSuccess(final Response response) {
         // EMPTY is safe here because we never call namedObject
-        try (final XContentParser parser = xContent.createParser(NamedXContentRegistry.EMPTY, response.getEntity().getContent())) {
+        try (XContentParser parser = xContent.createParser(NamedXContentRegistry.EMPTY, response.getEntity().getContent())) {
             // avoid parsing the entire payload if we don't need too
             XContentParser.Token token = parser.nextToken();
 

elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpResource.java

@@ -167,6 +167,6 @@ public abstract class HttpResource {
      * @param client The REST client to make the request(s).
      * @return {@code true} if the resource is available for use. {@code false} to stop.
      */
-    protected abstract boolean doCheckAndPublish(final RestClient client);
+    protected abstract boolean doCheckAndPublish(RestClient client);
 
 }

elasticsearch/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/PublishableHttpResource.java

@@ -140,7 +140,7 @@ public abstract class PublishableHttpResource extends HttpResource {
      * @param client The REST client to make the request(s).
      * @return Never {@code null}.
      */
-    protected abstract CheckResponse doCheck(final RestClient client);
+    protected abstract CheckResponse doCheck(RestClient client);
 
     /**
      * Determine if the current {@code resourceName} exists at the {@code resourceBasePath} endpoint.
@@ -235,7 +235,7 @@ public abstract class PublishableHttpResource extends HttpResource {
      * @param client The REST client to make the request(s).
      * @return {@code true} if it exists.
      */
-    protected abstract boolean doPublish(final RestClient client);
+    protected abstract boolean doPublish(RestClient client);
 
     /**
      * Upload the {@code resourceName} to the {@code resourceBasePath} endpoint.

elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Account.java

@@ -180,7 +180,7 @@ public class Account {
         final Smtp smtp;
         final EmailDefaults defaults;
 
-        public Config(String name, Settings settings) {
+        Config(String name, Settings settings) {
             this.name = name;
             profile = Profile.resolve(settings.get("profile"), Profile.STANDARD);
             defaults = new EmailDefaults(name, settings.getAsSettings("email_defaults"));
@@ -203,7 +203,7 @@ public class Account {
             final char[] password;
             final Properties properties;
 
-            public Smtp(Settings settings) {
+            Smtp(Settings settings) {
                 host = settings.get("host", settings.get("localaddress", settings.get("local_address")));
                 port = settings.getAsInt("port", settings.getAsInt("localport", settings.getAsInt("local_port", 25)));
                 user = settings.get("user", settings.get("from", null));
@@ -275,7 +275,7 @@ public class Account {
             final Email.AddressList bcc;
             final String subject;
 
-            public EmailDefaults(String accountName, Settings settings) {
+            EmailDefaults(String accountName, Settings settings) {
                 try {
                     from = Email.Address.parse(settings, Email.Field.FROM.getPreferredName());
                     replyTo = Email.AddressList.parse(settings, Email.Field.REPLY_TO.getPreferredName());

elasticsearch/src/main/java/org/elasticsearch/xpack/notification/email/Attachment.java

@@ -177,7 +177,7 @@ public abstract class Attachment extends BodyPartSource {
             private final String contentType;
             private final Provider<InputStream> source;
 
-            public StreamDataSource(String name, String contentType, Provider<InputStream> source) {
+            StreamDataSource(String name, String contentType, Provider<InputStream> source) {
                 this.name = name;
                 this.contentType = contentType;
                 this.source = source;

elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/IntegrationAccount.java

@@ -134,7 +134,7 @@ public class IntegrationAccount extends HipChatAccount {
         @Nullable final Color color;
         @Nullable final Boolean notify;
 
-        public Defaults(Settings settings) {
+        Defaults(Settings settings) {
             this.format = Format.resolve(settings, DEFAULT_FORMAT_SETTING, null);
             this.color = Color.resolve(settings, DEFAULT_COLOR_SETTING, null);
             this.notify = settings.getAsBoolean(DEFAULT_NOTIFY_SETTING, null);

elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/UserAccount.java

@@ -175,7 +175,7 @@ public class UserAccount extends HipChatAccount {
         @Nullable final Color color;
         @Nullable final Boolean notify;
 
-        public Defaults(Settings settings) {
+        Defaults(Settings settings) {
             this.rooms = settings.getAsArray(DEFAULT_ROOM_SETTING, null);
             this.users = settings.getAsArray(DEFAULT_USER_SETTING, null);
             this.format = Format.resolve(settings, DEFAULT_FORMAT_SETTING, null);

elasticsearch/src/main/java/org/elasticsearch/xpack/notification/hipchat/V1Account.java

@@ -128,7 +128,7 @@ public class V1Account extends HipChatAccount {
         @Nullable final Color color;
         @Nullable final Boolean notify;
 
-        public Defaults(Settings settings) {
+        Defaults(Settings settings) {
             this.rooms = settings.getAsArray(DEFAULT_ROOM_SETTING, null);
             this.from = settings.get(DEFAULT_FROM_SETTING);
             this.format = Format.resolve(settings, DEFAULT_FORMAT_SETTING, null);

elasticsearch/src/main/java/org/elasticsearch/xpack/notification/pagerduty/IncidentEventDefaults.java

@@ -42,7 +42,7 @@ public class IncidentEventDefaults {
             final String href;
             final String text;
 
-            public LinkDefaults(Settings settings) {
+            LinkDefaults(Settings settings) {
                 href = settings.get(IncidentEventContext.XField.HREF.getPreferredName(), null);
                 text = settings.get(IncidentEventContext.XField.TEXT.getPreferredName(), null);
             }
@@ -68,7 +68,7 @@ public class IncidentEventDefaults {
             final String src;
             final String alt;
 
-            public ImageDefaults(Settings settings) {
+            ImageDefaults(Settings settings) {
                 href = settings.get(IncidentEventContext.XField.HREF.getPreferredName(), null);
                 src = settings.get(IncidentEventContext.XField.SRC.getPreferredName(), null);
                 alt = settings.get(IncidentEventContext.XField.ALT.getPreferredName(), null);

elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/Attachment.java

@@ -157,7 +157,7 @@ public class Attachment implements MessageElement {
         final TextTemplate imageUrl;
         final TextTemplate thumbUrl;
 
-        public Template(TextTemplate fallback, TextTemplate color, TextTemplate pretext, TextTemplate authorName,
+        Template(TextTemplate fallback, TextTemplate color, TextTemplate pretext, TextTemplate authorName,
                         TextTemplate authorLink, TextTemplate authorIcon, TextTemplate title, TextTemplate titleLink,
                         TextTemplate text, Field.Template[] fields, TextTemplate imageUrl, TextTemplate thumbUrl) {
 

elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/Field.java

@@ -22,7 +22,7 @@ class Field implements MessageElement {
     final String value;
     final boolean isShort;
 
-    public Field(String title, String value, boolean isShort) {
+    Field(String title, String value, boolean isShort) {
         this.title = title;
         this.value = value;
         this.isShort = isShort;
@@ -63,7 +63,7 @@ class Field implements MessageElement {
         final TextTemplate value;
         final Boolean isShort;
 
-        public Template(TextTemplate title, TextTemplate value, Boolean isShort) {
+        Template(TextTemplate title, TextTemplate value, Boolean isShort) {
             this.title = title;
             this.value = value;
             this.isShort = isShort;

elasticsearch/src/main/java/org/elasticsearch/xpack/notification/slack/message/SlackMessageDefaults.java

@@ -146,7 +146,7 @@ public class SlackMessageDefaults {
             public final String value;
             public final Boolean isShort;
 
-            public FieldDefaults(Settings settings) {
+            FieldDefaults(Settings settings) {
                 title = settings.get(TITLE_SETTING, null);
                 value = settings.get(VALUE_SETTING, null);
                 isShort = settings.getAsBoolean(SHORT_SETTING, null);

elasticsearch/src/main/java/org/elasticsearch/xpack/scheduler/SchedulerEngine.java

@@ -148,7 +148,7 @@ public class SchedulerEngine {
         private volatile ScheduledFuture<?> future;
         private volatile long scheduledTime;
 
-        public ActiveSchedule(String name, Schedule schedule, long startTime) {
+        ActiveSchedule(String name, Schedule schedule, long startTime) {
             this.name = name;
             this.schedule = schedule;
             this.startTime = startTime;

elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/FieldSubsetReader.java

@@ -321,7 +321,7 @@ public final class FieldSubsetReader extends FilterLeafReader {
      */
     class FieldFilterFields extends FilterFields {
 
-        public FieldFilterFields(Fields in) {
+        FieldFilterFields(Fields in) {
             super(in);
         }
 

elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/accesscontrol/SecurityIndexSearcherWrapper.java

@@ -178,7 +178,7 @@ public class SecurityIndexSearcherWrapper extends IndexSearcherWrapper {
 
     static class IndexSearcherWrapper extends IndexSearcher {
 
-        public IndexSearcherWrapper(DocumentSubsetDirectoryReader r) {
+        IndexSearcherWrapper(DocumentSubsetDirectoryReader r) {
             super(r);
         }
 

elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/client/WatchSourceBuilder.java

@@ -171,7 +171,7 @@ public class WatchSourceBuilder extends ToXContentToBytes implements ToXContent
         @Nullable private final Condition condition;
         @Nullable private final Transform transform;
 
-        public TransformedAction(String id, Action action, @Nullable TimeValue throttlePeriod,
+        TransformedAction(String id, Action action, @Nullable TimeValue throttlePeriod,
                                  @Nullable Condition condition, @Nullable Transform transform) {
             this.id = id;
             this.throttlePeriod = throttlePeriod;

elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionService.java

@@ -487,7 +487,7 @@ public final class ExecutionService extends AbstractComponent {
 
     private static final class StartupExecutionContext extends TriggeredExecutionContext {
 
-        public StartupExecutionContext(Watch watch, DateTime executionTime, TriggerEvent triggerEvent, TimeValue defaultThrottlePeriod) {
+        StartupExecutionContext(Watch watch, DateTime executionTime, TriggerEvent triggerEvent, TimeValue defaultThrottlePeriod) {
             super(watch, executionTime, triggerEvent, defaultThrottlePeriod);
         }
 

elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/engine/TickerScheduleTriggerEngine.java

@@ -103,7 +103,7 @@ public class TickerScheduleTriggerEngine extends ScheduleTriggerEngine {
 
         private volatile long scheduledTime;
 
-        public ActiveSchedule(String name, Schedule schedule, long startTime) {
+        ActiveSchedule(String name, Schedule schedule, long startTime) {
             this.name = name;
             this.schedule = schedule;
             this.startTime = startTime;
@@ -130,7 +130,7 @@ public class TickerScheduleTriggerEngine extends ScheduleTriggerEngine {
         private volatile boolean active = true;
         private final CountDownLatch closeLatch = new CountDownLatch(1);
 
-        public Ticker() {
+        Ticker() {
             super("ticker-schedule-trigger-engine");
             setDaemon(true);
             start();

elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/DayOfWeek.java

@@ -25,7 +25,7 @@ public enum DayOfWeek implements ToXContent {
 
     private final String cronKey;
 
-    private DayOfWeek(String cronKey) {
+    DayOfWeek(String cronKey) {
         this.cronKey = cronKey;
     }
 

elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/support/Month.java

@@ -30,7 +30,7 @@ public enum Month implements ToXContent {
 
     private final String cronKey;
 
-    private Month(String cronKey) {
+    Month(String cronKey) {
         this.cronKey = cronKey;
     }
 

elasticsearch/src/test/java/org/elasticsearch/bench/HasherBenchmark.java

@@ -72,7 +72,7 @@ public class HasherBenchmark {
         final MeanMetric hash = new MeanMetric();
         final MeanMetric verify = new MeanMetric();
 
-        public Metrics(Hasher hasher) {
+        Metrics(Hasher hasher) {
             this.name = hasher.name();
         }
 

elasticsearch/src/test/java/org/elasticsearch/license/ExpirationCallbackTests.java

@@ -134,7 +134,7 @@ public class ExpirationCallbackTests extends ESTestCase {
 
     private static class NoopPostExpirationCallback extends ExpirationCallback.Post {
 
-        public NoopPostExpirationCallback(TimeValue min, TimeValue max, TimeValue frequency) {
+        NoopPostExpirationCallback(TimeValue min, TimeValue max, TimeValue frequency) {
             super(min, max, frequency);
         }
 
@@ -144,7 +144,7 @@ public class ExpirationCallbackTests extends ESTestCase {
 
     private static class NoopPreExpirationCallback extends ExpirationCallback.Pre {
 
-        public NoopPreExpirationCallback(TimeValue min, TimeValue max, TimeValue frequency) {
+        NoopPreExpirationCallback(TimeValue min, TimeValue max, TimeValue frequency) {
             super(min, max, frequency);
         }
 

elasticsearch/src/test/java/org/elasticsearch/license/LicensesAcknowledgementTests.java

@@ -42,7 +42,7 @@ public class LicensesAcknowledgementTests extends AbstractLicenseServiceTestCase
         private final LicensesStatus expectedStatus;
         private final boolean expectAckMessages;
 
-        public AssertingLicensesUpdateResponse(boolean expectedAcknowledgement, LicensesStatus expectedStatus,
+        AssertingLicensesUpdateResponse(boolean expectedAcknowledgement, LicensesStatus expectedStatus,
                                                boolean expectAckMessages) {
             this.expectedAcknowledgement = expectedAcknowledgement;
             this.expectedStatus = expectedStatus;

elasticsearch/src/test/java/org/elasticsearch/test/http/MockWebServer.java

@@ -137,7 +137,7 @@ public class MockWebServer implements Closeable {
 
         private final boolean needClientAuth;
 
-        public CustomHttpsConfigurator(SSLContext sslContext, boolean needClientAuth) {
+        CustomHttpsConfigurator(SSLContext sslContext, boolean needClientAuth) {
             super(sslContext);
             this.needClientAuth = needClientAuth;
         }

elasticsearch/src/test/java/org/elasticsearch/xpack/graph/test/GraphTests.java

@@ -51,7 +51,7 @@ public class GraphTests extends ESSingleNodeTestCase {
         String description;
         String decade;
 
-        public DocTemplate(int numDocs, String decade, String description, String... people) {
+        DocTemplate(int numDocs, String decade, String description, String... people) {
             super();
             this.decade = decade;
             this.numDocs = numDocs;

elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringServiceTests.java

@@ -123,7 +123,7 @@ public class MonitoringServiceTests extends ESTestCase {
 
         private final AtomicInteger exports = new AtomicInteger(0);
 
-        public CountingExporter() {
+        CountingExporter() {
             super(Settings.EMPTY, Collections.emptyMap(), clusterService);
         }
 

elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringBulkActionTests.java

@@ -259,7 +259,7 @@ public class TransportMonitoringBulkActionTests extends ESTestCase {
 
         private final Collection<MonitoringDoc> exported = ConcurrentCollections.newConcurrentSet();
 
-        public CapturingExporters() {
+        CapturingExporters() {
             super(Settings.EMPTY, Collections.emptyMap(), clusterService);
         }
 
@@ -280,7 +280,7 @@ public class TransportMonitoringBulkActionTests extends ESTestCase {
 
         private final Consumer<Collection<? extends MonitoringDoc>> consumer;
 
-        public ConsumingExporters(Consumer<Collection<? extends MonitoringDoc>> consumer) {
+        ConsumingExporters(Consumer<Collection<? extends MonitoringDoc>> consumer) {
             super(Settings.EMPTY, Collections.emptyMap(), clusterService);
             this.consumer = consumer;
         }

elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/exporter/ExportersTests.java

@@ -276,7 +276,7 @@ public class ExportersTests extends ESTestCase {
     }
 
     static class TestExporter extends Exporter {
-        public TestExporter(Config config) {
+        TestExporter(Config config) {
             super(config);
         }
 
@@ -319,7 +319,7 @@ public class ExportersTests extends ESTestCase {
         private static final AtomicInteger count = new AtomicInteger(0);
         private List<CountingBulk> bulks = new CopyOnWriteArrayList<>();
 
-        public CountingExporter(Config config) {
+        CountingExporter(Config config) {
             super(config);
         }
 
@@ -347,7 +347,7 @@ public class ExportersTests extends ESTestCase {
 
         private final AtomicInteger count = new AtomicInteger();
 
-        public CountingBulk(String name) {
+        CountingBulk(String name) {
             super(name);
         }
 

elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterTests.java

@@ -241,7 +241,7 @@ public class HttpExporterTests extends ESTestCase {
         when(response.getEntity()).thenReturn(entity);
         when(client.performRequest(eq("get"), eq("/_nodes/http"), anyMapOf(String.class, String.class))).thenReturn(response);
 
-        try (final Sniffer sniffer = HttpExporter.createSniffer(config, client, listener)) {
+        try (Sniffer sniffer = HttpExporter.createSniffer(config, client, listener)) {
             assertThat(sniffer, not(nullValue()));
 
             verify(listener).setSniffer(sniffer);
@@ -365,7 +365,7 @@ public class HttpExporterTests extends ESTestCase {
         final ResolversRegistry resolvers = mock(ResolversRegistry.class);
         final HttpResource resource = new MockHttpResource(exporterName(), true, PublishableHttpResource.CheckResponse.ERROR, false);
 
-        try (final HttpExporter exporter = new HttpExporter(config, client, sniffer, listener, resolvers, resource)) {
+        try (HttpExporter exporter = new HttpExporter(config, client, sniffer, listener, resolvers, resource)) {
             verify(listener).setResource(resource);
 
             assertThat(exporter.openBulk(), nullValue());
@@ -381,7 +381,7 @@ public class HttpExporterTests extends ESTestCase {
         // sometimes dirty to start with and sometimes not; but always succeeds on checkAndPublish
         final HttpResource resource = new MockHttpResource(exporterName(), randomBoolean());
 
-        try (final HttpExporter exporter = new HttpExporter(config, client, sniffer, listener, resolvers, resource)) {
+        try (HttpExporter exporter = new HttpExporter(config, client, sniffer, listener, resolvers, resource)) {
             verify(listener).setResource(resource);
 
             final HttpExportBulk bulk = exporter.openBulk();

elasticsearch/src/test/java/org/elasticsearch/xpack/security/SecurityTemplateServiceTests.java

@@ -381,21 +381,21 @@ public class SecurityTemplateServiceTests extends ESTestCase {
     }
 
     private static class TestPutMappingResponse extends PutMappingResponse {
-        public TestPutMappingResponse(boolean acknowledged) {
+        TestPutMappingResponse(boolean acknowledged) {
             super(acknowledged);
         }
 
-        public TestPutMappingResponse() {
+        TestPutMappingResponse() {
             super();
         }
     }
 
     private static class TestPutIndexTemplateResponse extends PutIndexTemplateResponse {
-        public TestPutIndexTemplateResponse(boolean acknowledged) {
+        TestPutIndexTemplateResponse(boolean acknowledged) {
             super(acknowledged);
         }
 
-        public TestPutIndexTemplateResponse() {
+        TestPutIndexTemplateResponse() {
             super();
         }
     }

elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/RealmsTests.java

@@ -419,7 +419,7 @@ public class RealmsTests extends ESTestCase {
 
     static class DummyRealm extends Realm {
 
-        public DummyRealm(String type, RealmConfig config) {
+        DummyRealm(String type, RealmConfig config) {
             super(type, config);
         }
 

elasticsearch/src/test/java/org/elasticsearch/xpack/security/authc/file/FileRealmTests.java

@@ -224,13 +224,13 @@ public class FileRealmTests extends ESTestCase {
     }
 
     static class UserPasswdStore extends FileUserPasswdStore {
-        public UserPasswdStore(RealmConfig config) {
+        UserPasswdStore(RealmConfig config) {
             super(config, mock(ResourceWatcherService.class));
         }
     }
 
     static class UserRolesStore extends FileUserRolesStore {
-        public UserRolesStore(RealmConfig config) {
+        UserRolesStore(RealmConfig config) {
             super(config, mock(ResourceWatcherService.class));
         }
     }

elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/jira/ExecutableJiraActionTests.java

@@ -301,7 +301,7 @@ public class ExecutableJiraActionTests extends ESTestCase {
      */
     class UpperCaseTextTemplateEngine extends TextTemplateEngine {
 
-        public UpperCaseTextTemplateEngine() {
+        UpperCaseTextTemplateEngine() {
             super(Settings.EMPTY, mock(ScriptService.class));
         }
 

elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/actions/jira/JiraActionTests.java

@@ -282,7 +282,7 @@ public class JiraActionTests extends ESTestCase {
 
         private final Map<String, Object> model;
 
-        public ModelTextTemplateEngine(Map<String, Object> model) {
+        ModelTextTemplateEngine(Map<String, Object> model) {
             super(Settings.EMPTY, mock(ScriptService.class));
             this.model = model;
         }

elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryStoreTests.java

@@ -156,7 +156,7 @@ public class HistoryStoreTests extends ESTestCase {
         private String username;
         private String password;
 
-        public IndexRequestNoPasswordMatcher(String username, String password) {
+        IndexRequestNoPasswordMatcher(String username, String password) {
             this.username = username;
             this.password = password;
         }

elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java

@@ -134,7 +134,7 @@ public class WatcherScheduleEngineBenchmark {
                     .put("node.data", false)
                     .build();
             try (Node node = new MockNode(settings, Arrays.asList(XPackPlugin.class, XPackPlugin.class))) {
-                try (final Client client = node.client()) {
+                try (Client client = node.client()) {
                     client.admin().cluster().prepareHealth().setWaitForNodes("2").get();
                     client.admin().indices().prepareDelete(HistoryStore.INDEX_PREFIX_WITH_TEMPLATE + "*").get();
                     client.admin().cluster().prepareHealth(Watch.INDEX, "test").setWaitForYellowStatus().get();

elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/transform/chain/ChainTransformTests.java

@@ -137,11 +137,11 @@ public class ChainTransformTests extends ESTestCase {
             NamedExecutableTransform.Result> {
         private static final String TYPE = "named";
 
-        public NamedExecutableTransform(String name) {
+        NamedExecutableTransform(String name) {
             this(new Transform(name));
         }
 
-        public NamedExecutableTransform(Transform transform) {
+        NamedExecutableTransform(Transform transform) {
             super(transform, Loggers.getLogger(NamedExecutableTransform.class));
         }
 
@@ -163,7 +163,7 @@ public class ChainTransformTests extends ESTestCase {
 
             private final String name;
 
-            public Transform(String name) {
+            Transform(String name) {
                 this.name = name;
             }
 
@@ -180,7 +180,7 @@ public class ChainTransformTests extends ESTestCase {
 
         public static class Result extends Transform.Result {
 
-            public Result(String type, Payload payload) {
+            Result(String type, Payload payload) {
                 super(type, payload);
             }
 
@@ -191,7 +191,7 @@ public class ChainTransformTests extends ESTestCase {
         }
 
         public static class Factory extends TransformFactory<Transform, Result, NamedExecutableTransform> {
-            public Factory(Logger transformLogger) {
+            Factory(Logger transformLogger) {
                 super(transformLogger);
             }
 
@@ -227,7 +227,7 @@ public class ChainTransformTests extends ESTestCase {
             FailingExecutableTransform.Result> {
         private static final String TYPE = "throwing";
 
-        public FailingExecutableTransform(Logger logger) {
+        FailingExecutableTransform(Logger logger) {
             super(new Transform(), logger);
         }
 
@@ -249,7 +249,7 @@ public class ChainTransformTests extends ESTestCase {
         }
 
         public static class Result extends Transform.Result {
-            public Result(String type) {
+            Result(String type) {
                 super(type, new Exception("_error"));
             }
 
@@ -260,7 +260,7 @@ public class ChainTransformTests extends ESTestCase {
         }
 
         public static class Factory extends TransformFactory<Transform, Result, FailingExecutableTransform> {
-            public Factory(Logger transformLogger) {
+            Factory(Logger transformLogger) {
                 super(transformLogger);
             }
 

elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTestCase.java

@@ -362,7 +362,7 @@ public abstract class ScheduleTestCase extends ESTestCase {
         int hour;
         int minute;
 
-        public HourAndMinute(int hour, int minute) {
+        HourAndMinute(int hour, int minute) {
             this.hour = hour;
             this.minute = minute;
         }

elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java

@@ -527,7 +527,7 @@ public class WatchTests extends ESTestCase {
 
     static class ParseOnlyScheduleTriggerEngine extends ScheduleTriggerEngine {
 
-        public ParseOnlyScheduleTriggerEngine(Settings settings, ScheduleRegistry registry, Clock clock) {
+        ParseOnlyScheduleTriggerEngine(Settings settings, ScheduleRegistry registry, Clock clock) {
             super(settings, registry, clock);
         }