Merge pull request #474 from apache/Revert_to_classLoader_getResource

Revert to class loader get resource

Author: leerho

.gitignore

@@ -49,6 +49,7 @@ tmp/
 
 # Build artifacts
 target/
+target2/
 out/
 build/
 jarsIn/

pom.xml

@@ -188,7 +188,7 @@ under the License.
               <configuration>
                 <rules>
                   <requireJavaVersion>
-                    <version>[1.8,1.9),[8],[11,14)</version>
+                    <version>[1.8,1.9),[8],[11,12)</version>
                   </requireJavaVersion>
                   <requireMavenVersion>
                     <version>[${maven.version},)</version>

src/main/java/org/apache/datasketches/cpc/PreambleUtil.java

@@ -812,8 +812,8 @@ static void checkLoPreamble(final Memory mem) {
     Objects.requireNonNull(mem, "Source Memory must not be null");
     checkBounds(0, 8, mem.getCapacity()); //need min 8 bytes
     rtAssertEquals(getSerVer(mem), SER_VER & 0XFF);
-    final Format fmt = getFormat(mem);
-    final int preIntsDef = getDefinedPreInts(fmt) & 0XFF;
+    final Format fmat = getFormat(mem);
+    final int preIntsDef = getDefinedPreInts(fmat) & 0XFF;
     rtAssertEquals(getPreInts(mem), preIntsDef);
     final Family fam = getFamily(mem);
     rtAssert(fam == Family.CPC);

src/main/java/org/apache/datasketches/kll/KllDirectCompactItemsSketch.java

@@ -168,7 +168,7 @@ int getRetainedItemsSizeBytes() {
   T getSingleItem() {
     if (getN() != 1) { throw new SketchesArgumentException(NOT_SINGLE_ITEM_MSG); }
     final int offset = getCompactDataOffset(); //both single & full
-    return (T) (serDe.deserializeFromMemory(mem, offset, 1)[0]);
+    return (serDe.deserializeFromMemory(mem, offset, 1)[0]);
   }
 
   @Override

src/main/java/org/apache/datasketches/kll/KllHeapItemsSketch.java

@@ -106,9 +106,9 @@ final class KllHeapItemsSketch<T> extends KllItemsSketch<T> {
     } else if (memStruct == COMPACT_FULL) {
       int offset = DATA_START_ADR + memVal.numLevels * Integer.BYTES;
       this.minItem = serDe.deserializeFromMemory(srcMem, offset, 1)[0];
-      offset += serDe.sizeOf((T) minItem);
+      offset += serDe.sizeOf(minItem);
       this.maxItem = serDe.deserializeFromMemory(srcMem, offset, 1)[0];
-      offset += serDe.sizeOf((T) maxItem);
+      offset += serDe.sizeOf(maxItem);
       final int numRetained = levelsArr[memVal.numLevels] - levelsArr[0];
       final Object[] retItems = serDe.deserializeFromMemory(srcMem, offset, numRetained);
       System.arraycopy(retItems, 0, itemsArr, levelsArr[0], numRetained);
@@ -153,8 +153,8 @@ int getMinK() {
 
   @Override
   byte[] getMinMaxByteArr() {
-    final byte[] minBytes = serDe.serializeToByteArray((T)minItem);
-    final byte[] maxBytes = serDe.serializeToByteArray((T)maxItem);
+    final byte[] minBytes = serDe.serializeToByteArray(minItem);
+    final byte[] maxBytes = serDe.serializeToByteArray(maxItem);
     final byte[] minMaxBytes = new byte[minBytes.length + maxBytes.length];
     copyBytes(minBytes, 0, minMaxBytes, 0, minBytes.length);
     copyBytes(maxBytes, 0, minMaxBytes, minBytes.length, maxBytes.length);
@@ -163,8 +163,8 @@ byte[] getMinMaxByteArr() {
 
   @Override
   int getMinMaxSizeBytes() {
-    final int minBytes = serDe.sizeOf((T)minItem);
-    final int maxBytes = serDe.sizeOf((T)maxItem);
+    final int minBytes = serDe.sizeOf(minItem);
+    final int maxBytes = serDe.sizeOf(maxItem);
     return minBytes + maxBytes;
   }
 

src/main/java/org/apache/datasketches/kll/KllHelper.java

@@ -622,7 +622,7 @@ else if (sketchType == FLOATS_SKETCH) {
       }
       else { //sketchType == KllItemsSketch
         final KllItemsSketch<T> itmSk = (KllItemsSketch<T>) sketch;
-        final T[] myItemsArr = (T[]) itmSk.getTotalItemsArray();
+        final T[] myItemsArr = itmSk.getTotalItemsArray();
         sb.append(outputItemsData(numLevels, fullLevelsArr, myItemsArr, serDe));
       }
     }

src/main/java/org/apache/datasketches/kll/KllItemsSketch.java

@@ -77,7 +77,7 @@ public static <T> KllItemsSketch<T> newHeapInstance(
       final Comparator<? super T> comparator,
       final ArrayOfItemsSerDe<T> serDe) {
       final KllItemsSketch<T> itmSk =
-          new KllHeapItemsSketch<T>(DEFAULT_K, DEFAULT_M, comparator, serDe);
+          new KllHeapItemsSketch<>(DEFAULT_K, DEFAULT_M, comparator, serDe);
     return itmSk;
   }
 
@@ -96,7 +96,7 @@ public static <T> KllItemsSketch<T> newHeapInstance(
       final int k,
       final Comparator<? super T> comparator,
       final ArrayOfItemsSerDe<T> serDe) {
-    return new KllHeapItemsSketch<T>(k, DEFAULT_M, comparator, serDe);
+    return new KllHeapItemsSketch<>(k, DEFAULT_M, comparator, serDe);
   }
 
   // Factory to create an heap instance from a Memory image
@@ -114,7 +114,7 @@ public static <T> KllItemsSketch<T> heapify(
       final Memory srcMem,
       final Comparator<? super T> comparator,
       final ArrayOfItemsSerDe<T> serDe) {
-    return new KllHeapItemsSketch<T>(srcMem, comparator, serDe);
+    return new KllHeapItemsSketch<>(srcMem, comparator, serDe);
   }
 
   //Factory to wrap a Read-Only Memory
@@ -137,7 +137,7 @@ public static <T> KllItemsSketch<T> wrap(
       final Comparator<? super T> comparator,
       final ArrayOfItemsSerDe<T> serDe) {
     final KllMemoryValidate memVal = new KllMemoryValidate(srcMem, SketchType.ITEMS_SKETCH, serDe);
-    return new KllDirectCompactItemsSketch<T>(memVal, comparator, serDe);
+    return new KllDirectCompactItemsSketch<>(memVal, comparator, serDe);
   }
 
   //END of Constructors
@@ -157,7 +157,7 @@ public GenericPartitionBoundaries<T> getPartitionBoundaries(final int numEqually
     final Object[] boundaries = getQuantiles(ranks, searchCrit);
     boundaries[0] = getMinItem();
     boundaries[boundaries.length - 1] = getMaxItem();
-    final GenericPartitionBoundaries<T> gpb = new GenericPartitionBoundaries<T>();
+    final GenericPartitionBoundaries<T> gpb = new GenericPartitionBoundaries<>();
     gpb.N = this.getN();
     gpb.ranks = ranks;
     gpb.boundaries = (T[])boundaries;
@@ -248,7 +248,7 @@ public final KllItemsSketchSortedView<T> getSortedView() {
 
   @Override
   public QuantilesGenericSketchIterator<T> iterator() {
-    return new KllItemsSketchIterator<T>(
+    return new KllItemsSketchIterator<>(
         getTotalItemsArray(), getLevelsArray(SketchStructure.UPDATABLE), getNumLevels());
   }
 
@@ -303,7 +303,7 @@ MemoryRequestServer getMemoryRequestServer() {
 
   private final KllItemsSketchSortedView<T> refreshSortedView() {
     final KllItemsSketchSortedView<T> sv = (kllItemsSV == null)
-        ? kllItemsSV = new KllItemsSketchSortedView<T>(this)
+        ? kllItemsSV = new KllItemsSketchSortedView<>(this)
         : kllItemsSV;
     return sv;
   }

src/main/java/org/apache/datasketches/kll/KllItemsSketchSortedView.java

@@ -169,7 +169,7 @@ public boolean isEmpty() {
 
   @Override
   public KllItemsSketchSortedViewIterator<T> iterator() {
-    return new KllItemsSketchSortedViewIterator<T>((T[])quantiles, cumWeights);
+    return new KllItemsSketchSortedViewIterator<>((T[])quantiles, cumWeights);
   }
 
   //restricted methods

src/main/java/org/apache/datasketches/quantiles/DoublesUnionImpl.java

@@ -177,7 +177,7 @@ static UpdateDoublesSketch updateLogic(final int myMaxK, final UpdateDoublesSket
     UpdateDoublesSketch ret = null;
 
     switch (outCase) {
-      case 0: ret = null; break; //return null
+      case 0: break; //return null
       case 1: ret = myQS; break; //no-op
       case 2: { //myQS = null,  other = valid; stream or downsample to myMaxK
         assert other != null;

src/main/java/org/apache/datasketches/quantiles/ItemsSketch.java

@@ -302,7 +302,7 @@ public GenericPartitionBoundaries<T> getPartitionBoundaries(final int numEqually
     final T[] boundaries = getQuantiles(ranks, searchCrit);
     boundaries[0] = getMinItem();
     boundaries[boundaries.length - 1] = getMaxItem();
-    final GenericPartitionBoundaries<T> gpb = new GenericPartitionBoundaries<T>();
+    final GenericPartitionBoundaries<T> gpb = new GenericPartitionBoundaries<>();
     gpb.N = this.getN();
     gpb.ranks = ranks;
     gpb.boundaries = boundaries;
@@ -608,7 +608,7 @@ public void update(final T item) {
 
   private final ItemsSketchSortedView<T> refreshSortedView() {
     final ItemsSketchSortedView<T> sv = (classicQisSV == null)
-        ? classicQisSV = new ItemsSketchSortedView<T>(this)
+        ? classicQisSV = new ItemsSketchSortedView<>(this)
         : classicQisSV;
     return sv;
   }