nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brosan...@apache.org
Subject nifi git commit: NIFI-2957 Corrections of typos, documentation, and strings Updates made regarding Intellij code inspections
Date Mon, 14 Nov 2016 22:01:05 GMT
Repository: nifi
Updated Branches:
  refs/heads/master ae4f27a62 -> 7e2373418


NIFI-2957 Corrections of typos, documentation, and strings
Updates made regarding Intellij code inspections

This closes #1218

Signed-off-by: Bryan Rosander <brosander@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7e237341
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7e237341
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7e237341

Branch: refs/heads/master
Commit: 7e237341810763ed4631fec8f568c04d8f928788
Parents: ae4f27a
Author: Jeff Storck <jtswork@gmail.com>
Authored: Mon Nov 14 13:02:16 2016 -0500
Committer: Bryan Rosander <brosander@apache.org>
Committed: Mon Nov 14 16:59:24 2016 -0500

----------------------------------------------------------------------
 nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml  |  5 +++--
 .../nifi/toolkit/zkmigrator/DataStatAclNode.java      | 14 +++++++-------
 .../nifi/toolkit/zkmigrator/ZooKeeperMigrator.java    |  9 ++++-----
 .../toolkit/zkmigrator/ZooKeeperMigratorMain.java     |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/7e237341/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
index 6def98b..536fbce 100644
--- a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
@@ -48,8 +48,8 @@
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
             <!--<exclusions>-->
-                <!-- these exclusios can be used once the ZK dependency is upgraded to
3.5.2 or 3.6.0
-                which do not have the hard dependnecy on log4j -->
+                <!-- these exclusions can be used once the ZK dependency is upgraded to
3.5.2 or 3.6.0
+                which do not have the hard dependency on log4j -->
                 <!--<exclusion>-->
                     <!--<groupId>log4j</groupId>-->
                     <!--<artifactId>log4j</artifactId>-->
@@ -69,6 +69,7 @@
             <artifactId>gson</artifactId>
         </dependency>
         <dependency>
+            <!-- explicitly declaring for logback's runtime processing of logback.groovy
-->
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/nifi/blob/7e237341/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/DataStatAclNode.java
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/DataStatAclNode.java
b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/DataStatAclNode.java
index 9d7d081..2405ce2 100644
--- a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/DataStatAclNode.java
+++ b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/DataStatAclNode.java
@@ -25,7 +25,7 @@ import org.apache.zookeeper.data.Stat;
 import java.util.List;
 import java.util.Objects;
 
-public class DataStatAclNode {
+class DataStatAclNode {
 
     private final String path;
     private final byte[] data;
@@ -33,7 +33,7 @@ public class DataStatAclNode {
     private final List<ACL> acls;
     private final long ephemeralOwner;
 
-    public DataStatAclNode(String path, byte[] data, Stat stat, List<ACL> acls, long
ephemeralOwner) {
+    DataStatAclNode(String path, byte[] data, Stat stat, List<ACL> acls, long ephemeralOwner)
{
         this.path = Preconditions.checkNotNull(path, "path can not be null");
         this.data = data;
         this.stat = Preconditions.checkNotNull(stat, "stat can not be null");
@@ -41,23 +41,23 @@ public class DataStatAclNode {
         this.ephemeralOwner = ephemeralOwner;
     }
 
-    public String getPath() {
+    String getPath() {
         return path;
     }
 
-    public byte[] getData() {
+    byte[] getData() {
         return data;
     }
 
-    public Stat getStat() {
+    Stat getStat() {
         return stat;
     }
 
-    public List<ACL> getAcls() {
+    List<ACL> getAcls() {
         return acls;
     }
 
-    public long getEphemeralOwner() {
+    long getEphemeralOwner() {
         return ephemeralOwner;
     }
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/7e237341/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/ZooKeeperMigrator.java
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/ZooKeeperMigrator.java
b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/ZooKeeperMigrator.java
index ab110a6..c2ad166 100644
--- a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/ZooKeeperMigrator.java
+++ b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/ZooKeeperMigrator.java
@@ -41,7 +41,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Spliterators;
@@ -64,9 +63,9 @@ class ZooKeeperMigrator {
 
     private final ZooKeeperEndpointConfig zooKeeperEndpointConfig;
 
-    ZooKeeperMigrator(String zookeeperEndpoint) throws URISyntaxException {
+    ZooKeeperMigrator(String zookeeperEndpoint) {
         LOGGER.debug("ZooKeeper endpoint parameter: {}", zookeeperEndpoint);
-        Preconditions.checkArgument(!Strings.isNullOrEmpty(zookeeperEndpoint), "connectString
must not be null");
+        Preconditions.checkArgument(!Strings.isNullOrEmpty(zookeeperEndpoint), "zookeeper
endpoint must not be null");
         final String[] connectStringPath = zookeeperEndpoint.split("/", 2);
         Preconditions.checkArgument(connectStringPath.length >= 1, "invalid ZooKeeper
endpoint: %s", zookeeperEndpoint);
         final String connectString = connectStringPath[0];
@@ -134,7 +133,7 @@ class ZooKeeperMigrator {
         Preconditions.checkArgument(!Strings.isNullOrEmpty(sourceZooKeeperEndpointConfig.getConnectString())
&& !Strings.isNullOrEmpty(sourceZooKeeperEndpointConfig.getPath()),
                 "Source ZooKeeper %s from %s is invalid", sourceZooKeeperEndpointConfig,
zkData);
         Preconditions.checkState(!zooKeeperEndpointConfig.equals(sourceZooKeeperEndpointConfig),
-                "Source ZooKeeper config %s for the data provided can not be the same as
the configured destionation ZooKeeper config %s",
+                "Source ZooKeeper config %s for the data provided can not be the same as
the configured destination ZooKeeper config %s",
                 sourceZooKeeperEndpointConfig, zooKeeperEndpointConfig);
 
         // stream through each node read from the json input
@@ -277,7 +276,7 @@ class ZooKeeperMigrator {
             // set data without caring what the previous version of the data at that path
             zooKeeper.setData(node.getPath(), node.getData(), -1);
             zooKeeper.setACL(node.getPath(), node.getAcls(), -1);
-            LOGGER.info("transfered node {} in {}", node, zooKeeperEndpointConfig);
+            LOGGER.info("transferred node {} in {}", node, zooKeeperEndpointConfig);
         } catch (Exception e) {
             throw new RuntimeException(String.format("unable to transmit data to %s for path
%s", zooKeeper, node.getPath()), e);
         }

http://git-wip-us.apache.org/repos/asf/nifi/blob/7e237341/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/ZooKeeperMigratorMain.java
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/ZooKeeperMigratorMain.java
b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/ZooKeeperMigratorMain.java
index 1dbdcca..bf037a0 100644
--- a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/ZooKeeperMigratorMain.java
+++ b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/src/main/java/org/apache/nifi/toolkit/zkmigrator/ZooKeeperMigratorMain.java
@@ -45,7 +45,7 @@ public class ZooKeeperMigratorMain {
             .longOpt("zookeeper")
             .desc("ZooKeeper connect string with path (ex. host:port/path)")
             .hasArg()
-            .argName("connect-string")
+            .argName("zookeeper-endpoint")
             .required()
             .build();
     private static final Option OPTION_RECEIVE = Option.builder("r")
@@ -58,7 +58,7 @@ public class ZooKeeperMigratorMain {
             .build();
     private static final Option OPTION_ZK_AUTH_INFO = Option.builder("a")
             .longOpt("auth")
-            .desc("username and password for the given ZK path")
+            .desc("username and password for the given ZooKeeper path")
             .hasArg()
             .argName("username:password")
             .build();


Mime
View raw message