You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2019/02/17 19:44:01 UTC
[accumulo] branch master updated: Remove unnecessary semicolons
(#966)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/master by this push:
new 493ef1e Remove unnecessary semicolons (#966)
493ef1e is described below
commit 493ef1e87df5e76f11a6f00af1502599a75f9fcf
Author: Mike Walch <mw...@apache.org>
AuthorDate: Sun Feb 17 14:43:56 2019 -0500
Remove unnecessary semicolons (#966)
---
.../org/apache/accumulo/core/client/security/SecurityErrorCode.java | 2 +-
.../apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBase.java | 2 +-
.../accumulo/core/clientImpl/mapreduce/lib/FileOutputConfigurator.java | 2 +-
core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java | 2 +-
.../java/org/apache/accumulo/core/master/state/tables/TableState.java | 2 +-
core/src/main/java/org/apache/accumulo/core/spi/cache/CacheType.java | 2 +-
.../java/org/apache/accumulo/core/spi/crypto/CryptoEnvironment.java | 2 +-
core/src/main/java/org/apache/accumulo/core/util/ServerServices.java | 2 +-
.../accumulo/hadoopImpl/mapreduce/lib/FileOutputConfigurator.java | 2 +-
server/base/src/main/java/org/apache/accumulo/server/TabletLevel.java | 2 +-
.../main/java/org/apache/accumulo/server/master/state/MergeState.java | 2 +-
.../java/org/apache/accumulo/monitor/rest/status/StatusResource.java | 2 +-
.../src/main/java/org/apache/accumulo/tserver/logger/LogEvents.java | 2 +-
.../src/main/java/org/apache/accumulo/start/spi/KeywordExecutable.java | 2 +-
.../src/main/java/org/apache/accumulo/test/functional/DeleteFailIT.java | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/SecurityErrorCode.java b/core/src/main/java/org/apache/accumulo/core/client/security/SecurityErrorCode.java
index efa75e5..3af7edc 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/security/SecurityErrorCode.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/SecurityErrorCode.java
@@ -35,5 +35,5 @@ public enum SecurityErrorCode {
TOKEN_EXPIRED,
SERIALIZATION_ERROR,
INSUFFICIENT_PROPERTIES,
- NAMESPACE_DOESNT_EXIST;
+ NAMESPACE_DOESNT_EXIST
}
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBase.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBase.java
index d5a282f..4a7a296 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBase.java
@@ -82,7 +82,7 @@ public class ConfiguratorBase {
* @since 1.6.0
*/
public enum InstanceOpts {
- TYPE, NAME, ZOO_KEEPERS, CLIENT_CONFIG;
+ TYPE, NAME, ZOO_KEEPERS, CLIENT_CONFIG
}
/**
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/FileOutputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/FileOutputConfigurator.java
index f23e880..ec4a7fc 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/FileOutputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/FileOutputConfigurator.java
@@ -41,7 +41,7 @@ public class FileOutputConfigurator extends ConfiguratorBase {
* @since 1.6.0
*/
public static enum Opts {
- ACCUMULO_PROPERTIES;
+ ACCUMULO_PROPERTIES
}
/**
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java b/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
index ab8b433..4c473c4 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
@@ -68,7 +68,7 @@ public class IteratorUtil {
* Also this type can not be moved.
*/
public static enum IteratorScope {
- majc, minc, scan;
+ majc, minc, scan
}
private static Comparator<IterInfo> ITER_INFO_COMPARATOR = Comparator
diff --git a/core/src/main/java/org/apache/accumulo/core/master/state/tables/TableState.java b/core/src/main/java/org/apache/accumulo/core/master/state/tables/TableState.java
index cbf6f4c..1821e75 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/state/tables/TableState.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/state/tables/TableState.java
@@ -31,5 +31,5 @@ public enum TableState {
// UNKNOWN is NOT a valid state; it is reserved for unrecognized serialized
// representations of table state
- UNKNOWN;
+ UNKNOWN
}
diff --git a/core/src/main/java/org/apache/accumulo/core/spi/cache/CacheType.java b/core/src/main/java/org/apache/accumulo/core/spi/cache/CacheType.java
index 072fb13..5ee482b 100644
--- a/core/src/main/java/org/apache/accumulo/core/spi/cache/CacheType.java
+++ b/core/src/main/java/org/apache/accumulo/core/spi/cache/CacheType.java
@@ -22,6 +22,6 @@ package org.apache.accumulo.core.spi.cache;
*/
public enum CacheType {
- DATA, INDEX, SUMMARY;
+ DATA, INDEX, SUMMARY
}
diff --git a/core/src/main/java/org/apache/accumulo/core/spi/crypto/CryptoEnvironment.java b/core/src/main/java/org/apache/accumulo/core/spi/crypto/CryptoEnvironment.java
index 8753e8d..90df727 100644
--- a/core/src/main/java/org/apache/accumulo/core/spi/crypto/CryptoEnvironment.java
+++ b/core/src/main/java/org/apache/accumulo/core/spi/crypto/CryptoEnvironment.java
@@ -26,7 +26,7 @@ public interface CryptoEnvironment {
* Where in Accumulo the on-disk file encryption takes place.
*/
enum Scope {
- WAL, RFILE;
+ WAL, RFILE
}
Scope getScope();
diff --git a/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java b/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
index c8fc6e4..53feb85 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ServerServices.java
@@ -20,7 +20,7 @@ import java.util.EnumMap;
public class ServerServices implements Comparable<ServerServices> {
public static enum Service {
- TSERV_CLIENT, GC_CLIENT;
+ TSERV_CLIENT, GC_CLIENT
}
public static final String SERVICE_SEPARATOR = ";";
diff --git a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/FileOutputConfigurator.java b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/FileOutputConfigurator.java
index 5f4dc60..771e0f4 100644
--- a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/FileOutputConfigurator.java
+++ b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/lib/FileOutputConfigurator.java
@@ -45,7 +45,7 @@ public class FileOutputConfigurator extends ConfiguratorBase {
* @since 1.6.0
*/
public static enum Opts {
- ACCUMULO_PROPERTIES;
+ ACCUMULO_PROPERTIES
}
/**
diff --git a/server/base/src/main/java/org/apache/accumulo/server/TabletLevel.java b/server/base/src/main/java/org/apache/accumulo/server/TabletLevel.java
index 7120804..8465c78 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/TabletLevel.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/TabletLevel.java
@@ -17,6 +17,6 @@
package org.apache.accumulo.server;
public enum TabletLevel {
- ROOT, META, NORMAL;
+ ROOT, META, NORMAL
}
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/MergeState.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/MergeState.java
index c12d38c..818b9ac 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/MergeState.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/MergeState.java
@@ -46,6 +46,6 @@ public enum MergeState {
/**
* merge is complete, the resulting tablet can be brought online, remove the marker in zookeeper
*/
- COMPLETE;
+ COMPLETE
}
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java
index 03b6750..f6a7119 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java
@@ -41,7 +41,7 @@ import org.apache.log4j.Level;
public class StatusResource {
public enum Status {
- OK, ERROR, WARN;
+ OK, ERROR, WARN
}
/**
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogEvents.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogEvents.java
index 137fe06..7a67a5c 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogEvents.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogEvents.java
@@ -18,5 +18,5 @@ package org.apache.accumulo.tserver.logger;
public enum LogEvents {
// DO NOT CHANGE ORDER OF ENUMS, ORDER IS USED IN SERIALIZATION
- OPEN, DEFINE_TABLET, MUTATION, MANY_MUTATIONS, COMPACTION_START, COMPACTION_FINISH;
+ OPEN, DEFINE_TABLET, MUTATION, MANY_MUTATIONS, COMPACTION_START, COMPACTION_FINISH
}
diff --git a/start/src/main/java/org/apache/accumulo/start/spi/KeywordExecutable.java b/start/src/main/java/org/apache/accumulo/start/spi/KeywordExecutable.java
index dfa8f00..2ef95e9 100644
--- a/start/src/main/java/org/apache/accumulo/start/spi/KeywordExecutable.java
+++ b/start/src/main/java/org/apache/accumulo/start/spi/KeywordExecutable.java
@@ -42,7 +42,7 @@ import java.util.ServiceLoader;
public interface KeywordExecutable {
enum UsageGroup {
- CORE, PROCESS, OTHER;
+ CORE, PROCESS, OTHER
}
/**
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteFailIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteFailIT.java
index 8f5fc44..bfd3eca 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteFailIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteFailIT.java
@@ -48,7 +48,7 @@ public class DeleteFailIT extends AccumuloClusterHarness {
writer.addMutation(m);
}
- try (Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY);) {
+ try (Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY)) {
scanner.forEach(e -> {});
fail("Expected scan to fail because deletes are present.");
} catch (RuntimeException e) {}