METAMODEL-148: Updated as per review remarks Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/c13405d6 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/c13405d6 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/c13405d6
Branch: refs/heads/master Commit: c13405d6b4885b64d7e8fcbae969830ddcd9283f Parents: 9191b9f Author: Kasper Sørensen <[email protected]> Authored: Fri Jun 5 15:27:59 2015 +0200 Committer: Kasper Sørensen <[email protected]> Committed: Fri Jun 5 15:27:59 2015 +0200 ---------------------------------------------------------------------- hadoop/pom.xml | 4 ---- .../main/java/org/apache/metamodel/util/HdfsResource.java | 10 +++------- .../java/org/apache/metamodel/util/HdfsResourceTest.java | 2 ++ hbase/pom.xml | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/c13405d6/hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop/pom.xml b/hadoop/pom.xml index 03b6d8d..9020a76 100644 --- a/hadoop/pom.xml +++ b/hadoop/pom.xml @@ -100,10 +100,6 @@ <artifactId>jsp-api-2.1</artifactId> </exclusion> <exclusion> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </exclusion> - <exclusion> <groupId>io.netty</groupId> <artifactId>netty</artifactId> </exclusion> http://git-wip-us.apache.org/repos/asf/metamodel/blob/c13405d6/hadoop/src/main/java/org/apache/metamodel/util/HdfsResource.java ---------------------------------------------------------------------- diff --git a/hadoop/src/main/java/org/apache/metamodel/util/HdfsResource.java b/hadoop/src/main/java/org/apache/metamodel/util/HdfsResource.java index bd98062..740b5ee 100644 --- a/hadoop/src/main/java/org/apache/metamodel/util/HdfsResource.java +++ b/hadoop/src/main/java/org/apache/metamodel/util/HdfsResource.java @@ -4,6 +4,7 @@ import java.io.Closeable; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.Arrays; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -70,7 +71,7 @@ public class HdfsResource implements Resource, Closeable { @Override public boolean isReadOnly() { - // TODO Auto-generated method stub + // We assume it is not read-only return false; } @@ -231,12 +232,7 @@ public class HdfsResource implements Resource, Closeable { @Override public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((_filepath == null) ? 0 : _filepath.hashCode()); - result = prime * result + ((_hostname == null) ? 0 : _hostname.hashCode()); - result = prime * result + _port; - return result; + return Arrays.hashCode(new Object[] { _filepath, _hostname, _port }); } @Override http://git-wip-us.apache.org/repos/asf/metamodel/blob/c13405d6/hadoop/src/test/java/org/apache/metamodel/util/HdfsResourceTest.java ---------------------------------------------------------------------- diff --git a/hadoop/src/test/java/org/apache/metamodel/util/HdfsResourceTest.java b/hadoop/src/test/java/org/apache/metamodel/util/HdfsResourceTest.java index ebbbc39..9986696 100644 --- a/hadoop/src/test/java/org/apache/metamodel/util/HdfsResourceTest.java +++ b/hadoop/src/test/java/org/apache/metamodel/util/HdfsResourceTest.java @@ -1,5 +1,7 @@ package org.apache.metamodel.util; +import java.io.InputStream; + import junit.framework.TestCase; public class HdfsResourceTest extends TestCase { http://git-wip-us.apache.org/repos/asf/metamodel/blob/c13405d6/hbase/pom.xml ---------------------------------------------------------------------- diff --git a/hbase/pom.xml b/hbase/pom.xml index fc8b4b9..c6927ae 100644 --- a/hbase/pom.xml +++ b/hbase/pom.xml @@ -21,7 +21,7 @@ <name>MetaModel module for Apache HBase</name> <properties> - <hbase.version>1.1.0.1</hbase.version> + <hbase.version>1.0.0</hbase.version> </properties> <dependencies>
