Fix line wrap and other checkstyle errors
diff --git a/src/main/java/org/apache/accumulo/proxy/Proxy.java b/src/main/java/org/apache/accumulo/proxy/Proxy.java
index 49f19a0..89c755d 100644
--- a/src/main/java/org/apache/accumulo/proxy/Proxy.java
+++ b/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -126,8 +126,8 @@
String zookeepers = opts.prop.getProperty(ZOOKEEPERS_KEY);
if (!useMini && !useMock && instance == null) {
- System.err.println(
- "Properties file must contain one of : useMiniAccumulo=true, useMockInstance=true, or instance=<instance name>");
+ System.err.println("Properties file must contain one of : useMiniAccumulo=true,"
+ + " useMockInstance=true, or instance=<instance name>");
System.exit(1);
}
diff --git a/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index 074c458..c5aeb9c 100644
--- a/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -131,7 +131,8 @@
public class ProxyServer implements AccumuloProxy.Iface {
public static final Logger logger = LoggerFactory.getLogger(ProxyServer.class);
- public static final String RPC_ACCUMULO_PRINCIPAL_MISMATCH_MSG = "RPC principal did not match requested Accumulo principal";
+ public static final String RPC_ACCUMULO_PRINCIPAL_MISMATCH_MSG = "RPC"
+ + " principal did not match requested Accumulo principal";
protected Instance instance;
protected Class<? extends AuthenticationToken> tokenClass;
@@ -414,8 +415,11 @@
.setIterators(getIteratorSettings(iterators)).setFlush(flush).setWait(wait);
if (compactionStrategy != null) {
- org.apache.accumulo.core.client.admin.CompactionStrategyConfig ccc = new org.apache.accumulo.core.client.admin.CompactionStrategyConfig(
+ // @formatter:off
+ org.apache.accumulo.core.client.admin.CompactionStrategyConfig ccc =
+ new org.apache.accumulo.core.client.admin.CompactionStrategyConfig(
compactionStrategy.getClassName());
+ // @formatter:on
if (compactionStrategy.options != null)
ccc.setOptions(compactionStrategy.options);
compactionConfig.setCompactionStrategy(ccc);
@@ -808,7 +812,10 @@
List<ActiveScan> activeScans = getConnector(login).instanceOperations()
.getActiveScans(tserver);
for (ActiveScan scan : activeScans) {
- org.apache.accumulo.proxy.thrift.ActiveScan pscan = new org.apache.accumulo.proxy.thrift.ActiveScan();
+ // @formatter:off
+ org.apache.accumulo.proxy.thrift.ActiveScan pscan =
+ new org.apache.accumulo.proxy.thrift.ActiveScan();
+ // @formatter:on
pscan.client = scan.getClient();
pscan.user = scan.getUser();
pscan.table = scan.getTable();
@@ -822,7 +829,10 @@
pscan.columns = new ArrayList<>();
if (scan.getColumns() != null) {
for (Column c : scan.getColumns()) {
- org.apache.accumulo.proxy.thrift.Column column = new org.apache.accumulo.proxy.thrift.Column();
+ // @formatter:off
+ org.apache.accumulo.proxy.thrift.Column column =
+ new org.apache.accumulo.proxy.thrift.Column();
+ // @formatter:on
column.setColFamily(c.getColumnFamily());
column.setColQualifier(c.getColumnQualifier());
column.setColVisibility(c.getColumnVisibility());
@@ -836,8 +846,11 @@
String name = parts[0];
int priority = Integer.parseInt(parts[1]);
String classname = parts[2];
- org.apache.accumulo.proxy.thrift.IteratorSetting settings = new org.apache.accumulo.proxy.thrift.IteratorSetting(
+ // @formatter:off
+ org.apache.accumulo.proxy.thrift.IteratorSetting settings =
+ new org.apache.accumulo.proxy.thrift.IteratorSetting(
priority, name, classname, scan.getSsio().get(name));
+ // @formatter:on
pscan.iterators.add(settings);
}
}
@@ -866,7 +879,10 @@
List<ActiveCompaction> active = getConnector(login).instanceOperations()
.getActiveCompactions(tserver);
for (ActiveCompaction comp : active) {
- org.apache.accumulo.proxy.thrift.ActiveCompaction pcomp = new org.apache.accumulo.proxy.thrift.ActiveCompaction();
+ // @formatter:off
+ org.apache.accumulo.proxy.thrift.ActiveCompaction pcomp =
+ new org.apache.accumulo.proxy.thrift.ActiveCompaction();
+ // @formatter:on
pcomp.age = comp.getAge();
pcomp.entriesRead = comp.getEntriesRead();
pcomp.entriesWritten = comp.getEntriesWritten();
@@ -885,9 +901,12 @@
pcomp.iterators = new ArrayList<>();
if (comp.getIterators() != null) {
for (IteratorSetting setting : comp.getIterators()) {
- org.apache.accumulo.proxy.thrift.IteratorSetting psetting = new org.apache.accumulo.proxy.thrift.IteratorSetting(
+ // @formatter:off
+ org.apache.accumulo.proxy.thrift.IteratorSetting psetting =
+ new org.apache.accumulo.proxy.thrift.IteratorSetting(
setting.getPriority(), setting.getName(), setting.getIteratorClass(),
setting.getOptions());
+ // @formatter:on
pcomp.iterators.add(psetting);
}
}
@@ -2174,8 +2193,11 @@
ConditionalMutation cmut = new ConditionalMutation(ByteBufferUtil.toBytes(cu.getKey()));
for (Condition tcond : cu.getValue().conditions) {
- org.apache.accumulo.core.data.Condition cond = new org.apache.accumulo.core.data.Condition(
+ // @formatter:off
+ org.apache.accumulo.core.data.Condition cond =
+ new org.apache.accumulo.core.data.Condition(
tcond.column.getColFamily(), tcond.column.getColQualifier());
+ // @formatter:on
if (tcond.getColumn().getColVisibility() != null
&& tcond.getColumn().getColVisibility().length > 0) {
