This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch main24 in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit fc35d38604f06b6cf9641fa79392360c22d9c996 Author: Lee Rhodes <[email protected]> AuthorDate: Fri May 9 14:47:14 2025 -0700 Missing Finals. --- DS-Java-Memory-24.code-workspace | 13 ++++ pom.xml | 2 +- .../org/apache/datasketches/memory/Buffer.java | 6 +- .../memory/DefaultMemoryRequestServer.java | 2 +- .../org/apache/datasketches/memory/Memory.java | 54 +++++++------- .../org/apache/datasketches/memory/Resource.java | 2 +- .../apache/datasketches/memory/WritableBuffer.java | 8 +- .../apache/datasketches/memory/WritableMemory.java | 86 +++++++++++----------- .../memory/internal/AllocateDirectMemoryTest.java | 6 +- .../AllocateDirectWritableMapMemoryTest.java | 4 +- .../datasketches/memory/internal/BufferTest.java | 2 +- .../memory/internal/CommonMemoryTest.java | 2 - .../memory/internal/CopyMemoryTest.java | 6 +- .../internal/ExampleMemoryRequestServerTest.java | 2 - .../memory/internal/MemoryBoundaryCheckTest.java | 2 - .../memory/internal/MemoryReadWriteSafetyTest.java | 4 +- .../datasketches/memory/internal/MemoryTest.java | 3 +- .../datasketches/memory/internal/ResourceTest.java | 5 +- .../datasketches/memory/internal/UtilForTest.java | 5 -- tools/MemoryCheckstyle.xml | 8 +- 20 files changed, 109 insertions(+), 113 deletions(-) diff --git a/DS-Java-Memory-24.code-workspace b/DS-Java-Memory-24.code-workspace new file mode 100644 index 00000000..5285c6ef --- /dev/null +++ b/DS-Java-Memory-24.code-workspace @@ -0,0 +1,13 @@ +{ + "folders": [ + { + "path": "." + }, + { + "path": "../datasketches-java21" + } + ], + "settings": { + "maven.view": "flat" + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6b61492f..04293ba0 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ under the License. <!-- System-wide properties --> <maven.version>3.6.3</maven.version> - <java.version>22</java.version> + <java.version>24</java.version> <jvm-arguments></jvm-arguments> <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> diff --git a/src/main/java/org/apache/datasketches/memory/Buffer.java b/src/main/java/org/apache/datasketches/memory/Buffer.java index f1bec23d..103b7976 100644 --- a/src/main/java/org/apache/datasketches/memory/Buffer.java +++ b/src/main/java/org/apache/datasketches/memory/Buffer.java @@ -43,7 +43,7 @@ public interface Buffer extends Positional, Resource { * @param byteBuffer the given ByteBuffer, must not be null. * @return a new <i>Buffer</i> for read-only operations on the given ByteBuffer. */ - static Buffer wrap(ByteBuffer byteBuffer) { + static Buffer wrap(final ByteBuffer byteBuffer) { return wrap(byteBuffer, ByteOrder.nativeOrder()); } @@ -60,8 +60,8 @@ public interface Buffer extends Positional, Resource { * @return a new <i>Buffer</i> for read-only operations on the given ByteBuffer. */ static Buffer wrap( - ByteBuffer byteBuffer, - ByteOrder byteOrder) { + final ByteBuffer byteBuffer, + final ByteOrder byteOrder) { return WritableBufferImpl.wrapByteBuffer(byteBuffer, true, byteOrder, null); } diff --git a/src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java b/src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java index 1077cfe4..df31154d 100644 --- a/src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java +++ b/src/main/java/org/apache/datasketches/memory/DefaultMemoryRequestServer.java @@ -70,7 +70,7 @@ import java.nio.ByteOrder; * * @author Lee Rhodes */ -@SuppressWarnings("resource") //can't use TWRs here +//@SuppressWarnings("resource") //can't use TWRs here public final class DefaultMemoryRequestServer implements MemoryRequestServer { private final long alignmentBytes; private final ByteOrder byteOrder; diff --git a/src/main/java/org/apache/datasketches/memory/Memory.java b/src/main/java/org/apache/datasketches/memory/Memory.java index 3ef3d341..e5e4f36f 100644 --- a/src/main/java/org/apache/datasketches/memory/Memory.java +++ b/src/main/java/org/apache/datasketches/memory/Memory.java @@ -47,7 +47,7 @@ public interface Memory extends Resource { * @param byteBuffer the given <i>ByteBuffer</i>. It must be non-null. * @return a new <i>Memory</i> for read-only operations on the given <i>ByteBuffer</i>. */ - static Memory wrap(ByteBuffer byteBuffer) { + static Memory wrap(final ByteBuffer byteBuffer) { return wrap(byteBuffer, ByteOrder.nativeOrder()); } @@ -62,8 +62,8 @@ public interface Memory extends Resource { * @return a new <i>Memory</i> for read-only operations on the given <i>ByteBuffer</i>. */ static Memory wrap( - ByteBuffer byteBuffer, - ByteOrder byteOrder) { + final ByteBuffer byteBuffer, + final ByteOrder byteOrder) { return WritableMemoryImpl.wrapByteBuffer(byteBuffer, true, byteOrder, null); } @@ -85,7 +85,7 @@ public interface Memory extends Resource { * @throws SecurityException If a security manager is installed and it denies an unspecified permission * required by the implementation. */ - static Memory map(File file, Arena arena) throws IOException { + static Memory map(final File file, final Arena arena) throws IOException { return map(file, 0, file.length(), ByteOrder.nativeOrder(), arena); } @@ -105,11 +105,11 @@ public interface Memory extends Resource { * required by the implementation. */ static Memory map( - File file, - long fileOffsetBytes, - long capacityBytes, - ByteOrder byteOrder, - Arena arena) throws IOException { + final File file, + final long fileOffsetBytes, + final long capacityBytes, + final ByteOrder byteOrder, + final Arena arena) throws IOException { return WritableMemoryImpl.wrapMap(file, fileOffsetBytes, capacityBytes, byteOrder, true, arena); } @@ -128,8 +128,8 @@ public interface Memory extends Resource { * offsetBytes and capacityBytes. */ default Memory region( - long offsetBytes, - long capacityBytes) { + final long offsetBytes, + final long capacityBytes) { return region(offsetBytes, capacityBytes, getTypeByteOrder()); } @@ -147,9 +147,9 @@ public interface Memory extends Resource { * offsetBytes, capacityBytes and byteOrder. */ Memory region( - long offsetBytes, - long capacityBytes, - ByteOrder byteOrder); + final long offsetBytes, + final long capacityBytes, + final ByteOrder byteOrder); //AS BUFFER /** @@ -192,7 +192,7 @@ public interface Memory extends Resource { * @param array the given primitive array. It must be non-null. * @return a new <i>Memory</i> for read operations */ - static Memory wrap(byte[] array) { + static Memory wrap(final byte[] array) { return wrap(array, 0, array.length, ByteOrder.nativeOrder()); } @@ -203,8 +203,8 @@ public interface Memory extends Resource { * @return a new <i>Memory</i> for read operations */ static Memory wrap( - byte[] array, - ByteOrder byteOrder) { + final byte[] array, + final ByteOrder byteOrder) { return wrap(array, 0, array.length, byteOrder); } @@ -217,10 +217,10 @@ public interface Memory extends Resource { * @return a new <i>Memory</i> for read operations */ static Memory wrap( - byte[] array, - int offsetBytes, - int lengthBytes, - ByteOrder byteOrder) { + final byte[] array, + final int offsetBytes, + final int lengthBytes, + final ByteOrder byteOrder) { final MemorySegment slice = MemorySegment.ofArray(array).asSlice(offsetBytes, lengthBytes).asReadOnly(); return WritableMemoryImpl.wrapSegment(slice, byteOrder); } @@ -232,7 +232,7 @@ public interface Memory extends Resource { * @param array the given primitive array. It must be non-null. * @return a new <i>Memory</i> for read operations */ - static Memory wrap(char[] array) { + static Memory wrap(final char[] array) { final MemorySegment seg = MemorySegment.ofArray(array).asReadOnly(); return WritableMemoryImpl.wrapSegment(seg, ByteOrder.nativeOrder()); } @@ -242,7 +242,7 @@ public interface Memory extends Resource { * @param array the given primitive array. It must be non-null. * @return a new <i>Memory</i> for read operations */ - static Memory wrap(short[] array) { + static Memory wrap(final short[] array) { final MemorySegment seg = MemorySegment.ofArray(array).asReadOnly(); return WritableMemoryImpl.wrapSegment(seg, ByteOrder.nativeOrder()); } @@ -252,7 +252,7 @@ public interface Memory extends Resource { * @param array the given primitive array. It must be non-null. * @return a new <i>Memory</i> for read operations */ - static Memory wrap(int[] array) { + static Memory wrap(final int[] array) { final MemorySegment seg = MemorySegment.ofArray(array).asReadOnly(); return WritableMemoryImpl.wrapSegment(seg, ByteOrder.nativeOrder()); } @@ -262,7 +262,7 @@ public interface Memory extends Resource { * @param array the given primitive array. It must be non-null. * @return a new <i>Memory</i> for read operations */ - static Memory wrap(long[] array) { + static Memory wrap(final long[] array) { final MemorySegment seg = MemorySegment.ofArray(array).asReadOnly(); return WritableMemoryImpl.wrapSegment(seg, ByteOrder.nativeOrder()); } @@ -272,7 +272,7 @@ public interface Memory extends Resource { * @param array the given primitive array. It must be non-null. * @return a new <i>Memory</i> for read operations */ - static Memory wrap(float[] array) { + static Memory wrap(final float[] array) { final MemorySegment seg = MemorySegment.ofArray(array).asReadOnly(); return WritableMemoryImpl.wrapSegment(seg, ByteOrder.nativeOrder()); } @@ -282,7 +282,7 @@ public interface Memory extends Resource { * @param array the given primitive array. It must be non-null. * @return a new <i>Memory</i> for read operations */ - static Memory wrap(double[] array) { + static Memory wrap(final double[] array) { final MemorySegment seg = MemorySegment.ofArray(array).asReadOnly(); return WritableMemoryImpl.wrapSegment(seg, ByteOrder.nativeOrder()); } diff --git a/src/main/java/org/apache/datasketches/memory/Resource.java b/src/main/java/org/apache/datasketches/memory/Resource.java index ab67f9c1..7b68999a 100644 --- a/src/main/java/org/apache/datasketches/memory/Resource.java +++ b/src/main/java/org/apache/datasketches/memory/Resource.java @@ -115,7 +115,7 @@ public interface Resource { * @param that the given Resource object * @return true if the given object has equal contents to this object. */ - default boolean equalTo(Resource that) { + default boolean equalTo(final Resource that) { if (that == null || this.getCapacity() != that.getCapacity()) { return false; } return equalTo(0, that, 0, that.getCapacity()); } diff --git a/src/main/java/org/apache/datasketches/memory/WritableBuffer.java b/src/main/java/org/apache/datasketches/memory/WritableBuffer.java index 37b5bf48..1183cb5c 100644 --- a/src/main/java/org/apache/datasketches/memory/WritableBuffer.java +++ b/src/main/java/org/apache/datasketches/memory/WritableBuffer.java @@ -43,7 +43,7 @@ public interface WritableBuffer extends Buffer { * @param byteBuffer the given ByteBuffer. It must be non-null and writable. * @return a new <i>WritableBuffer</i> for write operations on the given <i>ByteBuffer</i>. */ - static WritableBuffer writableWrap(ByteBuffer byteBuffer) { + static WritableBuffer writableWrap(final ByteBuffer byteBuffer) { return writableWrap(byteBuffer, byteBuffer.order(), null); } @@ -63,9 +63,9 @@ public interface WritableBuffer extends Buffer { * @throws IllegalArgumentException if ByteBuffer is not writable */ static WritableBuffer writableWrap( - ByteBuffer byteBuffer, - ByteOrder byteOrder, - MemoryRequestServer memReqSvr) { + final ByteBuffer byteBuffer, + final ByteOrder byteOrder, + final MemoryRequestServer memReqSvr) { return WritableBufferImpl.wrapByteBuffer(byteBuffer, false, byteOrder, memReqSvr); } diff --git a/src/main/java/org/apache/datasketches/memory/WritableMemory.java b/src/main/java/org/apache/datasketches/memory/WritableMemory.java index 69656ac1..c8da6735 100644 --- a/src/main/java/org/apache/datasketches/memory/WritableMemory.java +++ b/src/main/java/org/apache/datasketches/memory/WritableMemory.java @@ -43,7 +43,7 @@ public interface WritableMemory extends Memory { * @param byteBuffer the given <i>ByteBuffer</i>. It must be non-null and writable. * @return a new <i>WritableMemory</i> for write operations on the given <i>ByteBuffer</i>. */ - static WritableMemory writableWrap(ByteBuffer byteBuffer) { + static WritableMemory writableWrap(final ByteBuffer byteBuffer) { return writableWrap(byteBuffer, byteBuffer.order(), null); } @@ -61,9 +61,9 @@ public interface WritableMemory extends Memory { * @throws IllegalArgumentException if ByteBuffer is not writable. */ static WritableMemory writableWrap( - ByteBuffer byteBuffer, - ByteOrder byteOrder, - MemoryRequestServer memReqSvr) { + final ByteBuffer byteBuffer, + final ByteOrder byteOrder, + final MemoryRequestServer memReqSvr) { return WritableMemoryImpl.wrapByteBuffer(byteBuffer, false, byteOrder, memReqSvr); } @@ -83,7 +83,7 @@ public interface WritableMemory extends Memory { * @throws SecurityException If a security manager is installed and it denies an unspecified permission * required by the implementation. */ - static WritableMemory writableMap(File file, Arena arena) throws IOException { + static WritableMemory writableMap(final File file, final Arena arena) throws IOException { return WritableMemoryImpl.wrapMap(file, 0, file.length(), ByteOrder.nativeOrder(), false, arena); } @@ -103,11 +103,11 @@ public interface WritableMemory extends Memory { * required by the implementation. */ static WritableMemory writableMap( - File file, - long fileOffsetBytes, - long capacityBytes, - ByteOrder byteOrder, - Arena arena) throws IOException { + final File file, + final long fileOffsetBytes, + final long capacityBytes, + final ByteOrder byteOrder, + final Arena arena) throws IOException { return WritableMemoryImpl.wrapMap(file, fileOffsetBytes, capacityBytes, byteOrder, false, arena); } @@ -127,7 +127,7 @@ public interface WritableMemory extends Memory { * * @return a WritableMemory for this off-heap resource. */ - static WritableMemory allocateDirect(long capacityBytes, Arena arena) { + static WritableMemory allocateDirect(final long capacityBytes, final Arena arena) { return allocateDirect(capacityBytes, 8, ByteOrder.nativeOrder(), new DefaultMemoryRequestServer(), arena); } @@ -146,7 +146,7 @@ public interface WritableMemory extends Memory { * * @return a WritableMemory for this off-heap resource. */ - static WritableMemory allocateDirect(long capacityBytes, MemoryRequestServer memReqSvr, Arena arena) { + static WritableMemory allocateDirect(final long capacityBytes, final MemoryRequestServer memReqSvr, final Arena arena) { return allocateDirect(capacityBytes, 8, ByteOrder.nativeOrder(), memReqSvr, arena); } @@ -168,11 +168,11 @@ public interface WritableMemory extends Memory { * @return a WritableMemory for this off-heap resource. */ static WritableMemory allocateDirect( - long capacityBytes, - long alignmentBytes, - ByteOrder byteOrder, - MemoryRequestServer memReqSvr, - Arena arena) { + final long capacityBytes, + final long alignmentBytes, + final ByteOrder byteOrder, + final MemoryRequestServer memReqSvr, + final Arena arena) { return WritableMemoryImpl.wrapDirect(capacityBytes, alignmentBytes, byteOrder, memReqSvr, arena); } @@ -191,8 +191,8 @@ public interface WritableMemory extends Memory { * @return a new <i>WritableMemory</i> representing the defined writable region. */ default WritableMemory writableRegion( - long offsetBytes, - long capacityBytes) { + final long offsetBytes, + final long capacityBytes) { return writableRegion(offsetBytes, capacityBytes, getTypeByteOrder()); } @@ -256,7 +256,7 @@ public interface WritableMemory extends Memory { * @param capacityBytes the given capacity in bytes. * @return a new WritableMemory for write operations on a new byte array. */ - static WritableMemory allocate(int capacityBytes) { + static WritableMemory allocate(final int capacityBytes) { return allocate(capacityBytes, ByteOrder.nativeOrder(), null); } @@ -267,8 +267,8 @@ public interface WritableMemory extends Memory { * @return a new WritableMemory for write operations on a new byte array. */ static WritableMemory allocate( - int capacityBytes, - ByteOrder byteOrder) { + final int capacityBytes, + final ByteOrder byteOrder) { return allocate(capacityBytes, byteOrder, null); } @@ -281,9 +281,9 @@ public interface WritableMemory extends Memory { * @return a new WritableMemory for write operations on a new byte array. */ static WritableMemory allocate( - int capacityBytes, - ByteOrder byteOrder, - MemoryRequestServer memReqSvr) { + final int capacityBytes, + final ByteOrder byteOrder, + final MemoryRequestServer memReqSvr) { final byte[] arr = new byte[capacityBytes]; return writableWrap(arr, 0, capacityBytes, byteOrder, memReqSvr); } @@ -298,7 +298,7 @@ public interface WritableMemory extends Memory { * @param array the given primitive array. It must be non-null. * @return a new WritableMemory for write operations on the given primitive array. */ - static WritableMemory writableWrap(byte[] array) { + static WritableMemory writableWrap(final byte[] array) { return writableWrap(array, 0, array.length, ByteOrder.nativeOrder(), null); } @@ -312,8 +312,8 @@ public interface WritableMemory extends Memory { * @return a new WritableMemory for write operations on the given primitive array. */ static WritableMemory writableWrap( - byte[] array, - ByteOrder byteOrder) { + final byte[] array, + final ByteOrder byteOrder) { return writableWrap(array, 0, array.length, byteOrder, null); } @@ -329,10 +329,10 @@ public interface WritableMemory extends Memory { * @return a new WritableMemory for write operations on the given primitive array. */ static WritableMemory writableWrap( - byte[] array, - int offsetBytes, - int lengthBytes, - ByteOrder byteOrder) { + final byte[] array, + final int offsetBytes, + final int lengthBytes, + final ByteOrder byteOrder) { return writableWrap(array, offsetBytes, lengthBytes, byteOrder, null); } @@ -352,11 +352,11 @@ public interface WritableMemory extends Memory { * @return a new WritableMemory for write operations on the given primitive array. */ static WritableMemory writableWrap( - byte[] array, - int offsetBytes, - int lengthBytes, - ByteOrder byteOrder, - MemoryRequestServer memReqSvr) { + final byte[] array, + final int offsetBytes, + final int lengthBytes, + final ByteOrder byteOrder, + final MemoryRequestServer memReqSvr) { final MemorySegment slice = MemorySegment.ofArray(array).asSlice(offsetBytes, lengthBytes); return WritableMemoryImpl.wrapSegment(slice, byteOrder, memReqSvr); } @@ -368,7 +368,7 @@ public interface WritableMemory extends Memory { * @param array the given primitive array. It must be non-null. * @return a new WritableMemory for write operations on the given primitive array. */ - static WritableMemory writableWrap(char[] array) { + static WritableMemory writableWrap(final char[] array) { final MemorySegment seg = MemorySegment.ofArray(array); return WritableMemoryImpl.wrapSegment(seg, ByteOrder.nativeOrder()); } @@ -378,7 +378,7 @@ public interface WritableMemory extends Memory { * @param array the given primitive array. It must be non-null. * @return a new WritableMemory for write operations on the given primitive array. */ - static WritableMemory writableWrap(short[] array) { + static WritableMemory writableWrap(final short[] array) { final MemorySegment seg = MemorySegment.ofArray(array); return WritableMemoryImpl.wrapSegment(seg, ByteOrder.nativeOrder()); } @@ -388,7 +388,7 @@ public interface WritableMemory extends Memory { * @param array the given primitive array. It must be non-null. * @return a new WritableMemory for write operations on the given primitive array. */ - static WritableMemory writableWrap(int[] array) { + static WritableMemory writableWrap(final int[] array) { final MemorySegment seg = MemorySegment.ofArray(array); return WritableMemoryImpl.wrapSegment(seg, ByteOrder.nativeOrder()); } @@ -398,7 +398,7 @@ public interface WritableMemory extends Memory { * @param array the given primitive array. It must be non-null. * @return a new WritableMemory for write operations on the given primitive array. */ - static WritableMemory writableWrap(long[] array) { + static WritableMemory writableWrap(final long[] array) { final MemorySegment seg = MemorySegment.ofArray(array); return WritableMemoryImpl.wrapSegment(seg, ByteOrder.nativeOrder()); } @@ -408,7 +408,7 @@ public interface WritableMemory extends Memory { * @param array the given primitive array. It must be non-null. * @return a new WritableMemory for write operations on the given primitive array. */ - static WritableMemory writableWrap(float[] array) { + static WritableMemory writableWrap(final float[] array) { final MemorySegment seg = MemorySegment.ofArray(array); return WritableMemoryImpl.wrapSegment(seg, ByteOrder.nativeOrder()); } @@ -418,7 +418,7 @@ public interface WritableMemory extends Memory { * @param array the given primitive array. It must be non-null. * @return a new WritableMemory for write operations on the given primitive array. */ - static WritableMemory writableWrap(double[] array) { + static WritableMemory writableWrap(final double[] array) { final MemorySegment seg = MemorySegment.ofArray(array); return WritableMemoryImpl.wrapSegment(seg, ByteOrder.nativeOrder()); } diff --git a/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java b/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java index 135d236f..6c81befe 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMemoryTest.java @@ -57,8 +57,7 @@ public class AllocateDirectMemoryTest { @Test public void checkDefaultMemoryRequestServer() { - boolean oneArena = false; - boolean offHeap = false; + //params: origArena, oneArena, offHeap checkDefaultMemoryRequestServerVariations(false, false, false); checkDefaultMemoryRequestServerVariations(false, false, true); checkDefaultMemoryRequestServerVariations(false, true, false); @@ -69,7 +68,7 @@ public class AllocateDirectMemoryTest { checkDefaultMemoryRequestServerVariations(true, true, true); } - private void checkDefaultMemoryRequestServerVariations(boolean origArena, boolean oneArena, boolean offHeap) { + private static void checkDefaultMemoryRequestServerVariations(boolean origArena, boolean oneArena, boolean offHeap) { int longs1 = 32; int bytes1 = longs1 << 3; WritableMemory origWmem, newWmem; @@ -140,6 +139,7 @@ public class AllocateDirectMemoryTest { } @Test + @SuppressWarnings("resource") public void checkExplicitCloseNoTWR() { final long cap = 128; Arena arena = Arena.ofConfined(); diff --git a/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java b/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java index 38e0fc15..6d9f0332 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java @@ -51,7 +51,7 @@ public class AllocateDirectWritableMapMemoryTest { private final MemoryRequestServer memReqSvr = Resource.defaultMemReqSvr; @BeforeClass - public void setReadOnly() throws IOException { + public void setReadOnly() throws IllegalStateException { UtilTest.setGettysburgAddressFileToReadOnly(); } @@ -104,6 +104,7 @@ public class AllocateDirectWritableMapMemoryTest { } @Test + @SuppressWarnings("resource") public void checkNonNativeFile() throws IllegalArgumentException, InvalidPathException, IllegalStateException, UnsupportedOperationException, IOException, SecurityException { @@ -149,6 +150,7 @@ public class AllocateDirectWritableMapMemoryTest { } @Test(expectedExceptions = IllegalArgumentException.class) + @SuppressWarnings("resource") public void checkReadException() throws IllegalArgumentException, InvalidPathException, IllegalStateException, UnsupportedOperationException, IOException, SecurityException { diff --git a/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java b/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java index 133f5934..ca46eeab 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/BufferTest.java @@ -311,7 +311,7 @@ public class BufferTest { public void checkCheckNotAliveAfterTWR() { Buffer buf; try (Arena arena = Arena.ofConfined()) { - WritableMemory wmem = WritableMemory.allocateDirect(100, Arena.ofConfined()); + WritableMemory wmem = WritableMemory.allocateDirect(100, arena); buf = wmem.asBuffer(); } try { diff --git a/src/test/java/org/apache/datasketches/memory/internal/CommonMemoryTest.java b/src/test/java/org/apache/datasketches/memory/internal/CommonMemoryTest.java index 8a6502df..6229327c 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/CommonMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/CommonMemoryTest.java @@ -24,7 +24,6 @@ import static org.apache.datasketches.memory.internal.Util.isAllBitsClear; import static org.apache.datasketches.memory.internal.Util.isAllBitsSet; import static org.apache.datasketches.memory.internal.Util.isAnyBitsClear; import static org.apache.datasketches.memory.internal.Util.isAnyBitsSet; -import static org.apache.datasketches.memory.internal.Util.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -32,7 +31,6 @@ import static org.testng.Assert.assertTrue; import java.lang.foreign.Arena; import java.nio.ByteOrder; -import org.apache.datasketches.memory.Memory; import org.apache.datasketches.memory.MemoryRequestServer; import org.apache.datasketches.memory.Resource; import org.apache.datasketches.memory.WritableMemory; diff --git a/src/test/java/org/apache/datasketches/memory/internal/CopyMemoryTest.java b/src/test/java/org/apache/datasketches/memory/internal/CopyMemoryTest.java index 5fe681d6..1a03492f 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/CopyMemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/CopyMemoryTest.java @@ -19,17 +19,15 @@ package org.apache.datasketches.memory.internal; -import java.lang.foreign.Arena; -import java.lang.foreign.MemorySegment; - import static org.testng.Assert.assertEquals; +import java.lang.foreign.Arena; import java.nio.ByteOrder; import java.util.concurrent.ThreadLocalRandom; -import org.apache.datasketches.memory.Resource; import org.apache.datasketches.memory.Memory; import org.apache.datasketches.memory.MemoryRequestServer; +import org.apache.datasketches.memory.Resource; import org.apache.datasketches.memory.WritableMemory; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/src/test/java/org/apache/datasketches/memory/internal/ExampleMemoryRequestServerTest.java b/src/test/java/org/apache/datasketches/memory/internal/ExampleMemoryRequestServerTest.java index d24005f0..7bbe6f48 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/ExampleMemoryRequestServerTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/ExampleMemoryRequestServerTest.java @@ -24,7 +24,6 @@ import java.nio.ByteOrder; import org.apache.datasketches.memory.DefaultMemoryRequestServer; import org.apache.datasketches.memory.MemoryRequestServer; -import org.apache.datasketches.memory.Resource; import org.apache.datasketches.memory.WritableMemory; import org.testng.annotations.Test; @@ -92,7 +91,6 @@ public class ExampleMemoryRequestServerTest { //Not big enough, expand oldWorkingCap = newWorkingCap; newWorkingCap = 2 * oldWorkingCap; - Arena arena = Arena.ofConfined(); // new confined scope for each iteration newMem = memReqSvr.request(workingMem, newWorkingCap); //done with old memory, close it diff --git a/src/test/java/org/apache/datasketches/memory/internal/MemoryBoundaryCheckTest.java b/src/test/java/org/apache/datasketches/memory/internal/MemoryBoundaryCheckTest.java index c29db01e..238469b1 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/MemoryBoundaryCheckTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/MemoryBoundaryCheckTest.java @@ -19,12 +19,10 @@ package org.apache.datasketches.memory.internal; -import java.lang.foreign.Arena; import static org.testng.Assert.fail; import org.apache.datasketches.memory.WritableBuffer; import org.apache.datasketches.memory.WritableMemory; -import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/src/test/java/org/apache/datasketches/memory/internal/MemoryReadWriteSafetyTest.java b/src/test/java/org/apache/datasketches/memory/internal/MemoryReadWriteSafetyTest.java index 072a6ee0..fa93e32d 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/MemoryReadWriteSafetyTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/MemoryReadWriteSafetyTest.java @@ -28,10 +28,8 @@ import java.nio.ByteOrder; import org.apache.datasketches.memory.Memory; import org.apache.datasketches.memory.WritableMemory; -import org.testng.annotations.Test; - -import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; public class MemoryReadWriteSafetyTest { diff --git a/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java b/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java index 86f8fa68..13a0a3fd 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java @@ -32,7 +32,6 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import java.io.IOException; import java.lang.foreign.Arena; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -51,7 +50,7 @@ public class MemoryTest { final MemoryRequestServer myMemReqSvr = Resource.defaultMemReqSvr; @BeforeClass - public void setReadOnly() throws IOException { + public void setReadOnly() throws IllegalStateException { UtilTest.setGettysburgAddressFileToReadOnly(); } diff --git a/src/test/java/org/apache/datasketches/memory/internal/ResourceTest.java b/src/test/java/org/apache/datasketches/memory/internal/ResourceTest.java index 5be59c85..1491d2c1 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/ResourceTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/ResourceTest.java @@ -19,16 +19,13 @@ package org.apache.datasketches.memory.internal; -import java.lang.foreign.Arena; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import static java.lang.foreign.ValueLayout.JAVA_BYTE; +import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; -import java.lang.foreign.ValueLayout; -import java.lang.foreign.ValueLayout.OfByte; import java.nio.ByteOrder; import org.apache.datasketches.memory.Buffer; diff --git a/src/test/java/org/apache/datasketches/memory/internal/UtilForTest.java b/src/test/java/org/apache/datasketches/memory/internal/UtilForTest.java index 27ed4fa8..266a854a 100644 --- a/src/test/java/org/apache/datasketches/memory/internal/UtilForTest.java +++ b/src/test/java/org/apache/datasketches/memory/internal/UtilForTest.java @@ -19,11 +19,6 @@ package org.apache.datasketches.memory.internal; -import static org.apache.datasketches.memory.internal.ResourceImpl.NATIVE_BYTE_ORDER; -import static org.apache.datasketches.memory.internal.ResourceImpl.NON_NATIVE_BYTE_ORDER; - -import java.nio.ByteOrder; - public class UtilForTest { //Java does not provide reverse bytes on doubles or floats diff --git a/tools/MemoryCheckstyle.xml b/tools/MemoryCheckstyle.xml index 20790411..77d69c43 100644 --- a/tools/MemoryCheckstyle.xml +++ b/tools/MemoryCheckstyle.xml @@ -38,16 +38,16 @@ under the License. <property name="fileExtensions" value="java"/> <property name="basedir" value="${basedir}"/> - <!-- Exclude all module-info.java files + <!-- Exclude all module-info.java files and all test files https://checkstyle.org/filefilters/beforeexecutionexclusionfilefilter.html#BeforeExecutionExclusionFileFilter --> <module name="BeforeExecutionExclusionFileFilter"> - <property name="fileNamePattern" value="module\-info\.java$"/> + <property name="fileNamePattern" value="(.*[\\/]test[\\/].*$)|(module\-info\.java$)"/> </module> - <!-- Exclude all src/test/... files --> + <!-- Exclude all src/test/... files and all module-info files <module name="BeforeExecutionExclusionFileFilter"> <property name="fileNamePattern" value=".*[\\/]src[\\/]test[\\/].*$"/> - </module> + </module> --> <module name="FileTabCharacter"> <property name="eachLine" value="true"/> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
