Fix build for newer Java

Author: ctubbsii

modules/accumulo/src/main/java/org/apache/fluo/accumulo/values/LockValue.java

@@ -27,7 +27,7 @@
 /**
  *
  */
-public class LockValue {
+public final class LockValue {
 
   private final Bytes prow;
   private final Column pcol;

modules/accumulo/src/main/java/org/apache/fluo/accumulo/values/ReadLockValue.java

@@ -24,7 +24,7 @@
 
 import static org.apache.fluo.accumulo.format.FluoFormatter.encNonAscii;
 
-public class ReadLockValue {
+public final class ReadLockValue {
   private final Bytes prow;
   private final Column pcol;
   private final Long transactor;

modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/TestData.java

@@ -38,7 +38,7 @@
 import org.apache.fluo.api.data.Bytes;
 import org.apache.fluo.api.data.Column;
 
-public class TestData {
+public final class TestData {
   TreeMap<Key, Value> data = new TreeMap<>();
   Counter counter = new Counter();
 

modules/accumulo/src/test/java/org/apache/fluo/accumulo/util/LongUtilTest.java

@@ -4,9 +4,9 @@
  * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance with the License. You may obtain a
  * copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
@@ -25,14 +25,14 @@ public class LongUtilTest {
 
   @Test
   public void testAll() {
-    Long longVal = new Long("34886");
+    Long longVal = Long.parseLong("34886");
     String radixStr = LongUtil.toMaxRadixString(longVal);
     Assert.assertEquals("qx2", radixStr);
     Assert.assertEquals(longVal, LongUtil.fromMaxRadixString(radixStr));
     Assert.assertEquals(longVal,
         LongUtil.fromMaxRadixByteArray(LongUtil.toMaxRadixByteArray(longVal)));
 
-    longVal = new Long("63832");
+    longVal = Long.parseLong("63832");
     Assert.assertEquals(longVal, LongUtil.fromByteArray(LongUtil.toByteArray(longVal)));
   }
 }

modules/api/pom.xml

@@ -91,7 +91,6 @@
       <plugin>
         <groupId>net.revelc.code</groupId>
         <artifactId>apilyzer-maven-plugin</artifactId>
-        <version>1.0.1</version>
         <executions>
           <execution>
             <id>apilyzer</id>

modules/api/src/main/java/org/apache/fluo/api/client/Snapshot.java

@@ -15,8 +15,6 @@
 
 package org.apache.fluo.api.client;
 
-import java.util.Collection;
-
 /**
  * Allows users to read from a Fluo table at a certain point in time. Snapshot extends
  * {@link SnapshotBase} to include a {@link #close} method which must be called when you are

modules/api/src/main/java/org/apache/fluo/api/config/SimpleConfiguration.java

@@ -4,9 +4,9 @@
  * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance with the License. You may obtain a
  * copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
@@ -177,7 +177,7 @@ public String getString(String key, String defaultValue) {
 
   /**
    * Loads configuration from InputStream. Later loads have lower priority.
-   * 
+   *
    * @param in InputStream to load from
    * @since 1.2.0
    */
@@ -193,7 +193,7 @@ public void load(InputStream in) {
 
   /**
    * Loads configuration from File. Later loads have lower priority.
-   * 
+   *
    * @param file File to load from
    * @since 1.2.0
    */
@@ -262,6 +262,7 @@ public void setProperties(String key, String... values) {
    */
   public String[] getProperties(String key) {
     // TODO fix cast class; use Properties?
+    @SuppressWarnings("unchecked")
     ArrayList<String> values = (ArrayList<String>) internalConfig.getProperty(key);
     if (values == null) {
       return new String[0];
@@ -283,7 +284,7 @@ public SimpleConfiguration subset(String prefix) {
    * @param fallback SimpleConfiguration to join together
    * @return a new simple configuration that contains all of the current properties from this plus
    *         the properties from fallback that are not present in this.
-   * 
+   *
    * @since 1.2.0
    */
   public SimpleConfiguration orElse(SimpleConfiguration fallback) {
@@ -374,7 +375,7 @@ private String stream2String(InputStream in) {
         result.write(buffer, 0, length);
       }
 
-      return result.toString(UTF_8.name());
+      return result.toString(UTF_8);
     } catch (IOException e) {
       throw new UncheckedIOException(e);
     }
@@ -397,4 +398,11 @@ private Reader checkProps(InputStream in) {
 
     return new StringReader(propsData);
   }
+
+  // CHECKSTYLE:OFF: NoFinalizer
+  @Override
+  public final void finalize() {
+    // prevent CT_CONSTRUCTOR_THROW spotbugs warning about finalizer attacks
+  }
+  // CHECKSTYLE:ON: NoFinalizer
 }

modules/api/src/main/java/org/apache/fluo/api/data/Bytes.java

@@ -512,7 +512,6 @@ public BytesBuilder append(CharSequence cs) {
         return append((String) cs);
       }
 
-
       ByteBuffer bb = StandardCharsets.UTF_8.encode(CharBuffer.wrap(cs));
 
       int length = bb.remaining();
@@ -582,7 +581,9 @@ public BytesBuilder append(byte[] bytes, int offset, int length) {
      */
     public BytesBuilder append(InputStream in, int length) throws IOException {
       ensureCapacity(len + length);
-      new DataInputStream(in).readFully(ba, len, length);
+      // create an anonymous subclass of DataInputStream to avoid unclosed resource warnings
+      // we don't close it because we don't want to close the provided InputStream it is wrapping
+      new DataInputStream(in) {}.readFully(ba, len, length);
       len += length;
       return this;
     }

modules/api/src/test/java/org/apache/fluo/api/config/FluoConfigurationTest.java

@@ -17,10 +17,10 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -175,9 +175,9 @@ public void testHasMiniFluoProps() {
 
   @Test
   public void testLoadingDistPropsFile() {
-    File connectionProps = new File("../distribution/src/main/config/fluo-conn.properties");
+    var connectionProps = Path.of("../distribution/src/main/config/fluo-conn.properties").toFile();
     Assert.assertTrue(connectionProps.exists());
-    File applicationProps = new File("../distribution/src/main/config/fluo-app.properties");
+    var applicationProps = Path.of("../distribution/src/main/config/fluo-app.properties").toFile();
     Assert.assertTrue(applicationProps.exists());
 
     FluoConfiguration config = new FluoConfiguration(connectionProps);
@@ -211,7 +211,7 @@ public void testLoadingDistPropsFile() {
 
   @Test
   public void testLoadingOldTestPropsFile() {
-    File propsFile = new File("src/test/resources/fluo.properties");
+    var propsFile = Path.of("src/test/resources/fluo.properties").toFile();
     Assert.assertTrue(propsFile.exists());
 
     FluoConfiguration config = new FluoConfiguration(propsFile);
@@ -233,7 +233,7 @@ public void testLoadingOldTestPropsFile() {
 
   @Test
   public void testLoadingTestPropsFile() {
-    File applicationProps = new File("src/test/resources/fluo-app.properties");
+    var applicationProps = Path.of("src/test/resources/fluo-app.properties").toFile();
     Assert.assertTrue(applicationProps.exists());
 
     FluoConfiguration config = new FluoConfiguration(applicationProps);
@@ -251,7 +251,7 @@ public void testLoadingTestPropsFile() {
     Assert.assertEquals(30000, config.getZookeeperTimeout());
     Assert.assertEquals(-1, config.getConnectionRetryTimeout());
 
-    File connectionProps = new File("src/test/resources/fluo-conn.properties");
+    var connectionProps = Path.of("src/test/resources/fluo-conn.properties").toFile();
     Assert.assertTrue(applicationProps.exists());
     config.load(connectionProps);
     Assert.assertEquals("localhost/test-fluo", config.getInstanceZookeepers());

modules/api/src/test/java/org/apache/fluo/api/data/ColumnTest.java

@@ -16,7 +16,6 @@
 package org.apache.fluo.api.data;
 
 import java.util.Arrays;
-import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;