accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [6/8] accumulo git commit: ACCUMULO-4099 Update checkstyle plugins
Date Tue, 05 Jan 2016 22:32:36 GMT
ACCUMULO-4099 Update checkstyle plugins

* Update checkstyle plugin to 2.17, and checkstyle to 6.14.1
* Fix style issues (extra semi-colons)
* Fix a few extra asterisks in javadoc comments


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0e9f2085
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0e9f2085
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0e9f2085

Branch: refs/heads/master
Commit: 0e9f2085a79b2bb7e5b52e2f33ff914c23f0778d
Parents: 46e27b2
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Jan 5 17:11:58 2016 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Jan 5 17:11:58 2016 -0500

----------------------------------------------------------------------
 .../accumulo/core/file/blockfile/impl/CachableBlockFile.java     | 4 ++--
 .../accumulo/core/iterators/system/SynchronizedIterator.java     | 2 +-
 pom.xml                                                          | 4 ++--
 .../org/apache/accumulo/shell/commands/NamespacesCommand.java    | 2 +-
 .../java/org/apache/accumulo/shell/commands/TablesCommand.java   | 2 +-
 .../org/apache/accumulo/test/ArbitraryTablePropertiesIT.java     | 2 +-
 .../apache/accumulo/test/CreateTableWithNewTableConfigIT.java    | 2 +-
 test/src/test/java/org/apache/accumulo/test/VolumeChooserIT.java | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0e9f2085/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
index d00a797..b966d14 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
@@ -41,7 +41,7 @@ import org.apache.hadoop.fs.Path;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/***
+/**
  *
  * This is a wrapper class for BCFile that includes a cache for independent caches for datablocks
and metadatablocks
  */
@@ -103,7 +103,7 @@ public class CachableBlockFile {
     public BlockWrite(BlockAppender ba) {
       super(ba);
       this._ba = ba;
-    };
+    }
 
     @Override
     public long getCompressedSize() throws IOException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0e9f2085/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
index ca7cd86..a095106 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
@@ -27,7 +27,7 @@ import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableComparable;
 
-/***
+/**
  * Wraps a SortedKeyValueIterator so that all of its methods are synchronized. The intent
is that user iterators which are multi-threaded have the possibility
  * to call parent methods concurrently. The SynchronizedIterators aims to reduce the likelihood
of unwanted concurrent access.
  */

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0e9f2085/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 681c5ba..99cd925 100644
--- a/pom.xml
+++ b/pom.xml
@@ -542,7 +542,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.15</version>
+          <version>2.17</version>
         </plugin>
         <plugin>
           <groupId>com.github.ekryd.sortpom</groupId>
@@ -1081,7 +1081,7 @@
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>6.1.1</version>
+            <version>6.14.1</version>
           </dependency>
         </dependencies>
         <executions>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0e9f2085/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
b/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
index d822cf6..d88d6f1 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/NamespacesCommand.java
@@ -54,7 +54,7 @@ public class NamespacesCommand extends Command {
           return String.format(TablesCommand.NAME_AND_ID_FORMAT, name, id);
         else
           return name;
-      };
+      }
     });
 
     shellState.printLines(it, !cl.hasOption(disablePaginationOpt.getOpt()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0e9f2085/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
index 5bded8d..a70cc13 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/TablesCommand.java
@@ -75,7 +75,7 @@ public class TablesCommand extends Command {
           return String.format(NAME_AND_ID_FORMAT, tableName, tableId);
         else
           return tableName;
-      };
+      }
     });
 
     shellState.printLines(it, !cl.hasOption(disablePaginationOpt.getOpt()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0e9f2085/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java b/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java
index 8ed0e2a..ddea17d 100644
--- a/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java
@@ -37,7 +37,7 @@ public class ArbitraryTablePropertiesIT extends SharedMiniClusterIT {
   @Override
   protected int defaultTimeoutSeconds() {
     return 30;
-  };
+  }
 
   // Test set, get, and remove arbitrary table properties on the root account
   @Test

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0e9f2085/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
b/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
index dd97458..0f13109 100644
--- a/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
@@ -49,7 +49,7 @@ public class CreateTableWithNewTableConfigIT extends SharedMiniClusterIT
{
   @Override
   protected int defaultTimeoutSeconds() {
     return 30;
-  };
+  }
 
   public int numProperties(Connector connector, String tableName) throws AccumuloException,
TableNotFoundException {
     return Iterators.size(connector.tableOperations().getProperties(tableName).iterator());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0e9f2085/test/src/test/java/org/apache/accumulo/test/VolumeChooserIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/VolumeChooserIT.java b/test/src/test/java/org/apache/accumulo/test/VolumeChooserIT.java
index 6e182bc..ce07373 100644
--- a/test/src/test/java/org/apache/accumulo/test/VolumeChooserIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/VolumeChooserIT.java
@@ -70,7 +70,7 @@ public class VolumeChooserIT extends ConfigurableMacIT {
   @Override
   protected int defaultTimeoutSeconds() {
     return 30;
-  };
+  }
 
   @Override
   public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {


Mime
View raw message