Merge bc38d58 into a6f527e

src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java

@@ -31,6 +31,7 @@
  * @author Praveenkumar Venkatesan
  * @author Roman Leventov
  */
+@SuppressWarnings({"restriction"})
 final class AccessByteBuffer {
 
   static final ByteBuffer ZERO_READ_ONLY_DIRECT_BYTE_BUFFER =

src/main/java/org/apache/datasketches/memory/AllocateDirect.java

@@ -32,6 +32,7 @@
  * @author Roman Leventov
  * @author Lee Rhodes
  */
+@SuppressWarnings({"restriction","synthetic-access"})
 final class AllocateDirect implements AutoCloseable {
   private static final Logger LOG = LoggerFactory.getLogger(AllocateDirect.class);
 
@@ -83,9 +84,9 @@ boolean doClose() {
         // because the valid state is already changed.
         cleaner.clean();
         return true;
-      } else {
-        return false;
       }
+      return false;
+
     } finally {
       BaseState.reachabilityFence(this);
     }
@@ -135,9 +136,8 @@ boolean deallocate(final boolean calledFromCleaner) {
         BaseState.currentDirectMemoryAllocations_.decrementAndGet();
         BaseState.currentDirectMemoryAllocated_.addAndGet(-capacity);
         return true;
-      } else {
-        return false;
-      }
+      } 
+      return false;
     }
   }
 

src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java

@@ -54,6 +54,7 @@
  * @author Lee Rhodes
  * @author Praveenkumar Venkatesan
  */
+@SuppressWarnings({"restriction","synthetic-access"})
 class AllocateDirectMap implements Map {
   private static final Logger LOG = LoggerFactory.getLogger(AllocateDirectMap.class);
 
@@ -162,9 +163,8 @@ boolean doClose() {
         // because the valid state is already changed.
         cleaner.clean();
         return true;
-      } else {
-        return false;
-      }
+      } 
+      return false;
     } finally {
       BaseState.reachabilityFence(this);
     }
@@ -294,9 +294,8 @@ boolean deallocate(final boolean calledFromCleaner) {
           BaseState.currentDirectMemoryMapAllocated_.addAndGet(-myCapacity);
         }
         return true;
-      } else {
-        return false;
-      }
+      } 
+      return false;
     }
 
     /**

src/main/java/org/apache/datasketches/memory/BaseState.java

@@ -34,6 +34,7 @@
  *
  * @author Lee Rhodes
  */
+@SuppressWarnings({"restriction"})
 abstract class BaseState {
 
   //Byte Order related

src/main/java/org/apache/datasketches/memory/BaseWritableBufferImpl.java

@@ -49,6 +49,7 @@
  * Common base of native-ordered and non-native-ordered {@link WritableBuffer} implementations.
  * Contains methods which are agnostic to the byte order.
  */
+@SuppressWarnings({"restriction"})
 abstract class BaseWritableBufferImpl extends WritableBuffer {
   final BaseWritableMemoryImpl originMemory;
 

src/main/java/org/apache/datasketches/memory/BaseWritableMemoryImpl.java

@@ -52,6 +52,7 @@
  * Common base of native-ordered and non-native-ordered {@link WritableMemory} implementations.
  * Contains methods which are agnostic to the byte order.
  */
+@SuppressWarnings({"restriction"})
 abstract class BaseWritableMemoryImpl extends WritableMemory {
 
 

src/main/java/org/apache/datasketches/memory/CompareAndCopy.java

@@ -31,6 +31,7 @@
 /**
  * @author Lee Rhodes
  */
+@SuppressWarnings({"restriction"})
 final class CompareAndCopy {
 
   /**

src/main/java/org/apache/datasketches/memory/Ints.java

@@ -28,8 +28,7 @@ static int checkedCast(final long v) {
     final int result = (int) v;
     if (result != v) {
       throw new IllegalArgumentException("Out of range: " + v);
-    } else {
-      return result;
-    }
+    } 
+    return result;
   }
 }

src/main/java/org/apache/datasketches/memory/JDK7Compatible.java

@@ -19,6 +19,7 @@
 
 package org.apache.datasketches.memory;
 
+@SuppressWarnings({"restriction"})
 final class JDK7Compatible {
 
   private JDK7Compatible() {}

src/main/java/org/apache/datasketches/memory/NioBits.java

@@ -30,6 +30,7 @@
  *
  * @author Lee Rhodes
  */
+@SuppressWarnings({"restriction"})
 final class NioBits {
   private static final Class<?> VM_CLASS;
   private static final Method VM_MAX_DIRECT_MEMORY_METHOD;

src/main/java/org/apache/datasketches/memory/NonNativeWritableBufferImpl.java

@@ -48,6 +48,7 @@
  * @author Roman Leventov
  * @author Lee Rhodes
  */
+@SuppressWarnings({"restriction"})
 abstract class NonNativeWritableBufferImpl extends BaseWritableBufferImpl {
 
   //Pass-through ctor

src/main/java/org/apache/datasketches/memory/NonNativeWritableMemoryImpl.java

@@ -48,6 +48,7 @@
  * @author Roman Leventov
  * @author Lee Rhodes
  */
+@SuppressWarnings({"restriction"})
 abstract class NonNativeWritableMemoryImpl extends BaseWritableMemoryImpl {
 
   //Pass-through ctor

src/main/java/org/apache/datasketches/memory/UnsafeUtil.java

@@ -29,7 +29,7 @@
  *
  * @author Lee Rhodes
  */
-@SuppressWarnings("javadoc")
+@SuppressWarnings({"javadoc","restriction"})
 public final class UnsafeUtil {
   public static final Unsafe unsafe;
   public static final String JDK; //must be at least "1.8"

src/main/java/org/apache/datasketches/memory/Utf8.java

@@ -45,6 +45,7 @@
  * @author Lee Rhodes
  * @author Roman Leventov
  */
+@SuppressWarnings({"restriction","synthetic-access"})
 final class Utf8 {
 
   private Utf8() { }

src/main/java/org/apache/datasketches/memory/WritableBufferImpl.java

@@ -55,6 +55,7 @@
  * @author Roman Leventov
  * @author Lee Rhodes
  */
+@SuppressWarnings({"restriction"})
 abstract class WritableBufferImpl extends BaseWritableBufferImpl {
 
   //Pass-through ctor

src/main/java/org/apache/datasketches/memory/WritableMemoryImpl.java

@@ -55,6 +55,7 @@
  * @author Roman Leventov
  * @author Lee Rhodes
  */
+@SuppressWarnings({"restriction"})
 abstract class WritableMemoryImpl extends BaseWritableMemoryImpl {
 
   //Pass-through ctor

src/main/java/org/apache/datasketches/memory/XxHash64.java

@@ -53,6 +53,7 @@
  *
  * @author Lee Rhodes
  */
+@SuppressWarnings({"restriction"})
 public class XxHash64 {
   // Unsigned, 64-bit primes
   private static final long P1 = -7046029288634856825L;

src/test/java/org/apache/datasketches/memory/UnsafeUtilTest.java

@@ -32,7 +32,7 @@
 /**
  * @author Lee Rhodes
  */
-@SuppressWarnings("javadoc")
+@SuppressWarnings({"javadoc","restriction"})
 public class UnsafeUtilTest {
   long testField = 1; //Do not remove & cannot be static. Used in reflection check.