This is an automated email from the ASF dual-hosted git repository.
dcromberge pushed a commit to branch multi-module-experimental
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
The following commit(s) were added to refs/heads/multi-module-experimental by
this push:
new b540c6a Refactor tests module
b540c6a is described below
commit b540c6ae12a5938c86491f7b283297fea1ecb203
Author: David Cromberge <[email protected]>
AuthorDate: Thu Apr 1 17:01:20 2021 +0100
Refactor tests module
---
.../apache/datasketches/memory/AllocateDirect.java | 6 ++---
.../datasketches/memory/AllocateDirectMap.java | 6 ++---
.../{CleanerWrapper.java => MemoryCleaner.java} | 15 ++++++++---
.../memory/internal/MemoryCleanerTest.java | 9 +++----
datasketches-memory-java-nine-tests/pom.xml | 7 ++++-
.../src/main/java/module-info.java | 30 ++++------------------
.../src/test/java/module-info.java | 7 -----
...anerWrapperTest.java => MemoryCleanerTest.java} | 8 +++---
.../{CleanerWrapper.java => MemoryCleaner.java} | 13 ++++++++--
pom.xml | 2 +-
10 files changed, 49 insertions(+), 54 deletions(-)
diff --git
a/datasketches-memory-base/src/main/java/org/apache/datasketches/memory/AllocateDirect.java
b/datasketches-memory-base/src/main/java/org/apache/datasketches/memory/AllocateDirect.java
index af1034d..27211d9 100644
---
a/datasketches-memory-base/src/main/java/org/apache/datasketches/memory/AllocateDirect.java
+++
b/datasketches-memory-base/src/main/java/org/apache/datasketches/memory/AllocateDirect.java
@@ -19,7 +19,7 @@
package org.apache.datasketches.memory;
-import org.apache.datasketches.memory.internal.CleanerWrapper;
+import org.apache.datasketches.memory.internal.MemoryCleaner;
import static org.apache.datasketches.memory.UnsafeUtil.unsafe;
@@ -37,7 +37,7 @@ final class AllocateDirect implements AutoCloseable {
private final Deallocator deallocator;
private final long nativeBaseOffset;
- private final CleanerWrapper cleaner;
+ private final MemoryCleaner cleaner;
/**
* Base Constructor for allocate native memory.
@@ -67,7 +67,7 @@ final class AllocateDirect implements AutoCloseable {
nativeBaseOffset = nativeAddress;
}
deallocator = new Deallocator(nativeAddress, allocationSize,
capacityBytes);
- cleaner = new CleanerWrapper(this, deallocator);
+ cleaner = new MemoryCleaner(this, deallocator);
}
@Override
diff --git
a/datasketches-memory-base/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java
b/datasketches-memory-base/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java
index f9046c2..668654b 100644
---
a/datasketches-memory-base/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java
+++
b/datasketches-memory-base/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java
@@ -31,7 +31,7 @@ import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
import java.util.logging.Logger;
-import org.apache.datasketches.memory.internal.CleanerWrapper;
+import org.apache.datasketches.memory.internal.MemoryCleaner;
import sun.nio.ch.FileChannelImpl;
/**
@@ -93,7 +93,7 @@ class AllocateDirectMap implements Map {
}
private final Deallocator deallocator;
- private final CleanerWrapper cleaner;
+ private final MemoryCleaner cleaner;
final long capacityBytes;
final RandomAccessFile raf;
@@ -116,7 +116,7 @@ class AllocateDirectMap implements Map {
raf = mapper(file, fileOffsetBytes, capacityBytes, resourceReadOnly);
nativeBaseOffset = map(raf.getChannel(), resourceReadOnly,
fileOffsetBytes, capacityBytes);
deallocator = new Deallocator(nativeBaseOffset, capacityBytes, raf);
- cleaner = new CleanerWrapper(this, deallocator);
+ cleaner = new MemoryCleaner(this, deallocator);
}
@Override
diff --git
a/datasketches-memory-base/src/main/java/org/apache/datasketches/memory/internal/CleanerWrapper.java
b/datasketches-memory-base/src/main/java/org/apache/datasketches/memory/internal/MemoryCleaner.java
similarity index 74%
copy from
datasketches-memory-base/src/main/java/org/apache/datasketches/memory/internal/CleanerWrapper.java
copy to
datasketches-memory-base/src/main/java/org/apache/datasketches/memory/internal/MemoryCleaner.java
index 999197d..4be7abb 100644
---
a/datasketches-memory-base/src/main/java/org/apache/datasketches/memory/internal/CleanerWrapper.java
+++
b/datasketches-memory-base/src/main/java/org/apache/datasketches/memory/internal/MemoryCleaner.java
@@ -22,7 +22,7 @@ package org.apache.datasketches.memory.internal;
import sun.misc.Cleaner;
/**
- * Extracts a version-dependent reference to the `jdk.internal.ref.Cleaner`
into
+ * Extracts a version-dependent reference to the `sun.misc.Cleaner` into
* a standalone class. The package name for Cleaner has changed in
* later versions. The appropriate class will be loaded by the class loader
* depending on the Java version that is used.
@@ -30,13 +30,22 @@ import sun.misc.Cleaner;
* For more information, see:
* https://openjdk.java.net/jeps/238
*/
-public class CleanerWrapper {
+public class MemoryCleaner {
private final Cleaner cleaner;
- public CleanerWrapper(Object referent, Runnable deallocator) {
+ /**
+ * Creates a new `sun.misc.Cleaner`.
+ * @param referent the object to be cleaned
+ * @param deallocator - the cleanup code to be run when the cleaner is
invoked.
+ * return MemoryCleaner
+ */
+ public MemoryCleaner(Object referent, Runnable deallocator) {
cleaner = Cleaner.create(referent, deallocator);
}
+ /**
+ * Runs this cleaner, if it has not been run before.
+ */
public void clean() {
cleaner.clean();
}
diff --git
a/datasketches-memory-java-nine-tests/src/test/java/org/apache/datasketches/memory/java/nine/tests/CleanerWrapperTest.java
b/datasketches-memory-base/src/test/java/org/apache/datasketches/memory/internal/MemoryCleanerTest.java
similarity index 85%
copy from
datasketches-memory-java-nine-tests/src/test/java/org/apache/datasketches/memory/java/nine/tests/CleanerWrapperTest.java
copy to
datasketches-memory-base/src/test/java/org/apache/datasketches/memory/internal/MemoryCleanerTest.java
index 1a16b06..231f8c5 100644
---
a/datasketches-memory-java-nine-tests/src/test/java/org/apache/datasketches/memory/java/nine/tests/CleanerWrapperTest.java
+++
b/datasketches-memory-base/src/test/java/org/apache/datasketches/memory/internal/MemoryCleanerTest.java
@@ -17,9 +17,8 @@
* under the License.
*/
-package org.apache.datasketches.memory.java.nine.tests;
+package org.apache.datasketches.memory.internal;
-import org.apache.datasketches.memory.internal.CleanerWrapper;
import org.testng.annotations.Test;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -28,12 +27,12 @@ import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@SuppressWarnings("javadoc")
-public class CleanerWrapperTest {
+public class MemoryCleanerTest {
@Test
public void cleanerDeallocates() {
SimpleDeallocator deallocator = new SimpleDeallocator();
- CleanerWrapper cleaner = new CleanerWrapper(this, deallocator);
+ MemoryCleaner cleaner = new MemoryCleaner(this, deallocator);
cleaner.clean();
assertTrue(deallocator.getHasRun());
}
@@ -41,7 +40,7 @@ public class CleanerWrapperTest {
@Test
public void noDeallocation() {
SimpleDeallocator deallocator = new SimpleDeallocator();
- CleanerWrapper cleaner = new CleanerWrapper(this, deallocator);
+ MemoryCleaner cleaner = new MemoryCleaner(this, deallocator);
assertFalse(deallocator.getHasRun());
}
diff --git a/datasketches-memory-java-nine-tests/pom.xml
b/datasketches-memory-java-nine-tests/pom.xml
index f170018..dfd3d24 100644
--- a/datasketches-memory-java-nine-tests/pom.xml
+++ b/datasketches-memory-java-nine-tests/pom.xml
@@ -38,12 +38,16 @@
</properties>
<dependencies>
- <!-- Test Scope -->
<dependency>
<groupId>org.apache.datasketches</groupId>
<artifactId>datasketches-memory-java-nine</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>${testng.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -78,6 +82,7 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<argLine>
--add-opens
java.base/jdk.internal.ref=org.apache.datasketches.memory
+ --add-exports
org.apache.datasketches.memory.java.nine.tests/org.apache.datasketches.memory.java.nine.tests=org.testng
</argLine>
<jdkToolchain>
<version>9</version>
diff --git
a/datasketches-memory-base/src/main/java/org/apache/datasketches/memory/internal/CleanerWrapper.java
b/datasketches-memory-java-nine-tests/src/main/java/module-info.java
similarity index 54%
rename from
datasketches-memory-base/src/main/java/org/apache/datasketches/memory/internal/CleanerWrapper.java
rename to datasketches-memory-java-nine-tests/src/main/java/module-info.java
index 999197d..ec4129e 100644
---
a/datasketches-memory-base/src/main/java/org/apache/datasketches/memory/internal/CleanerWrapper.java
+++ b/datasketches-memory-java-nine-tests/src/main/java/module-info.java
@@ -17,28 +17,8 @@
* under the License.
*/
-package org.apache.datasketches.memory.internal;
-
-import sun.misc.Cleaner;
-
-/**
- * Extracts a version-dependent reference to the `jdk.internal.ref.Cleaner`
into
- * a standalone class. The package name for Cleaner has changed in
- * later versions. The appropriate class will be loaded by the class loader
- * depending on the Java version that is used.
- *
- * For more information, see:
- * https://openjdk.java.net/jeps/238
- */
-public class CleanerWrapper {
- private final Cleaner cleaner;
-
- public CleanerWrapper(Object referent, Runnable deallocator) {
- cleaner = Cleaner.create(referent, deallocator);
- }
-
- public void clean() {
- cleaner.clean();
- }
-}
-
+module org.apache.datasketches.memory.java.nine.tests {
+ requires java.base;
+ requires org.testng;
+ requires org.apache.datasketches.memory;
+}
\ No newline at end of file
diff --git a/datasketches-memory-java-nine-tests/src/test/java/module-info.java
b/datasketches-memory-java-nine-tests/src/test/java/module-info.java
deleted file mode 100644
index 90d7db5..0000000
--- a/datasketches-memory-java-nine-tests/src/test/java/module-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-module org.apache.datasketches.memory.java.nine.tests {
- requires java.base;
- requires org.testng;
- requires org.apache.datasketches.memory;
-
- exports org.apache.datasketches.memory.java.nine.tests to org.testng;
-}
\ No newline at end of file
diff --git
a/datasketches-memory-java-nine-tests/src/test/java/org/apache/datasketches/memory/java/nine/tests/CleanerWrapperTest.java
b/datasketches-memory-java-nine-tests/src/test/java/org/apache/datasketches/memory/java/nine/tests/MemoryCleanerTest.java
similarity index 88%
rename from
datasketches-memory-java-nine-tests/src/test/java/org/apache/datasketches/memory/java/nine/tests/CleanerWrapperTest.java
rename to
datasketches-memory-java-nine-tests/src/test/java/org/apache/datasketches/memory/java/nine/tests/MemoryCleanerTest.java
index 1a16b06..5ff2119 100644
---
a/datasketches-memory-java-nine-tests/src/test/java/org/apache/datasketches/memory/java/nine/tests/CleanerWrapperTest.java
+++
b/datasketches-memory-java-nine-tests/src/test/java/org/apache/datasketches/memory/java/nine/tests/MemoryCleanerTest.java
@@ -19,7 +19,7 @@
package org.apache.datasketches.memory.java.nine.tests;
-import org.apache.datasketches.memory.internal.CleanerWrapper;
+import org.apache.datasketches.memory.internal.MemoryCleaner;
import org.testng.annotations.Test;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -28,12 +28,12 @@ import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@SuppressWarnings("javadoc")
-public class CleanerWrapperTest {
+public class MemoryCleanerTest {
@Test
public void cleanerDeallocates() {
SimpleDeallocator deallocator = new SimpleDeallocator();
- CleanerWrapper cleaner = new CleanerWrapper(this, deallocator);
+ MemoryCleaner cleaner = new MemoryCleaner(this, deallocator);
cleaner.clean();
assertTrue(deallocator.getHasRun());
}
@@ -41,7 +41,7 @@ public class CleanerWrapperTest {
@Test
public void noDeallocation() {
SimpleDeallocator deallocator = new SimpleDeallocator();
- CleanerWrapper cleaner = new CleanerWrapper(this, deallocator);
+ MemoryCleaner cleaner = new MemoryCleaner(this, deallocator);
assertFalse(deallocator.getHasRun());
}
diff --git
a/datasketches-memory-java-nine/src/main/java/org/apache/datasketches/memory/internal/CleanerWrapper.java
b/datasketches-memory-java-nine/src/main/java/org/apache/datasketches/memory/internal/MemoryCleaner.java
similarity index 78%
rename from
datasketches-memory-java-nine/src/main/java/org/apache/datasketches/memory/internal/CleanerWrapper.java
rename to
datasketches-memory-java-nine/src/main/java/org/apache/datasketches/memory/internal/MemoryCleaner.java
index f257e31..3d803fc 100644
---
a/datasketches-memory-java-nine/src/main/java/org/apache/datasketches/memory/internal/CleanerWrapper.java
+++
b/datasketches-memory-java-nine/src/main/java/org/apache/datasketches/memory/internal/MemoryCleaner.java
@@ -30,13 +30,22 @@ import jdk.internal.ref.Cleaner;
* For more information, see:
* https://openjdk.java.net/jeps/238
*/
-public class CleanerWrapper {
+public class MemoryCleaner {
private final Cleaner cleaner;
- public CleanerWrapper(Object referent, Runnable deallocator) {
+ /**
+ * Creates a new `jdk.internal.ref.Cleaner`.
+ * @param referent the object to be cleaned
+ * @param deallocator - the cleanup code to be run when the cleaner is
invoked.
+ * return MemoryCleaner
+ */
+ public MemoryCleaner(Object referent, Runnable deallocator) {
cleaner = Cleaner.create(referent, deallocator);
}
+ /**
+ * Runs this cleaner, if it has not been run before.
+ */
public void clean() {
cleaner.clean();
}
diff --git a/pom.xml b/pom.xml
index df38972..1a56a12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@ under the License.
<!-- END:UNIQUE FOR THIS JAVA COMPONENT -->
<!-- Test -->
- <testng.version>7.4.0</testng.version>
+ <testng.version>7.1.0</testng.version>
<!-- System-wide properties -->
<maven.version>3.5.0</maven.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
