Merge pull request #625 from mikewalch/update-parent
Updated fluo-io-parent to version 2 and removed markings where format…
diff --git a/modules/accumulo/src/main/java/io/fluo/accumulo/util/ByteArrayUtil.java b/modules/accumulo/src/main/java/io/fluo/accumulo/util/ByteArrayUtil.java
index 8d55930..ed2a12a 100644
--- a/modules/accumulo/src/main/java/io/fluo/accumulo/util/ByteArrayUtil.java
+++ b/modules/accumulo/src/main/java/io/fluo/accumulo/util/ByteArrayUtil.java
@@ -63,12 +63,10 @@
* @return long value
*/
public static long decodeLong(byte[] ba, int offset) {
- // @formatter:off - Due to formatter putting return statement on one line that is > 100 chars
return ((((long) ba[offset + 0] << 56) + ((long) (ba[offset + 1] & 255) << 48)
+ ((long) (ba[offset + 2] & 255) << 40) + ((long) (ba[offset + 3] & 255) << 32)
+ ((long) (ba[offset + 4] & 255) << 24) + ((ba[offset + 5] & 255) << 16)
+ ((ba[offset + 6] & 255) << 8) + ((ba[offset + 7] & 255) << 0)));
- // @formatter:on
}
/**
diff --git a/modules/cluster/src/main/java/io/fluo/cluster/runner/AppRunner.java b/modules/cluster/src/main/java/io/fluo/cluster/runner/AppRunner.java
index 190b323..09005e3 100644
--- a/modules/cluster/src/main/java/io/fluo/cluster/runner/AppRunner.java
+++ b/modules/cluster/src/main/java/io/fluo/cluster/runner/AppRunner.java
@@ -240,10 +240,7 @@
return entriesFound;
}
- // @formatter:off - Due to formatter putting method on one line that is > 100 chars
- private static void appendLib(StringBuilder classpath, String libDirName,
- boolean useLibJarsFormat) {
- // @formatter:on
+ private static void appendLib(StringBuilder classpath, String libDirName, boolean useLibJarsFormat) {
File libDir = new File(libDirName);
if (!libDir.exists()) {
System.err.println("ERROR - Directory needed for classpath does not exist: " + libDirName);
diff --git a/modules/core/src/main/java/io/fluo/core/impl/TransactorCache.java b/modules/core/src/main/java/io/fluo/core/impl/TransactorCache.java
index 9819266..1f816d8 100644
--- a/modules/core/src/main/java/io/fluo/core/impl/TransactorCache.java
+++ b/modules/core/src/main/java/io/fluo/core/impl/TransactorCache.java
@@ -70,11 +70,7 @@
lockTs);
}
- // @formatter:off - Due to formatter putting method on one line that is > 100 chars
- public void addTimedoutTransactor(final Long transactorId, final long lockTs,
- final Long startTime) {
- // @formatter:on
-
+ public void addTimedoutTransactor(final Long transactorId, final long lockTs, final Long startTime) {
try {
AtomicLong cachedLockTs = timeoutCache.get(transactorId, new Callable<AtomicLong>() {
@Override
diff --git a/pom.xml b/pom.xml
index da639a2..96216fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>io.fluo</groupId>
<artifactId>fluo-io-parent</artifactId>
- <version>1</version>
+ <version>2</version>
</parent>
<artifactId>fluo-parent</artifactId>
<version>1.0.0-beta-3-SNAPSHOT</version>
