You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by dc...@apache.org on 2021/03/29 22:20:50 UTC
[datasketches-memory] branch multi-module-experimental updated:
Remove slf4j dependency
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 cf5e480 Remove slf4j dependency
cf5e480 is described below
commit cf5e48082c1fdf62ced522463b2bfb6505cad4d8
Author: David Cromberge <da...@gmail.com>
AuthorDate: Mon Mar 29 23:20:37 2021 +0100
Remove slf4j dependency
---
README.md | 5 +----
.../org/apache/datasketches/memory/AllocateDirect.java | 11 ++++-------
.../org/apache/datasketches/memory/AllocateDirectMap.java | 8 +++-----
datasketches-memory-java9/src/main/java/module-info.java | 2 +-
pom.xml | 14 --------------
5 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/README.md b/README.md
index 0eb082b..64d4bc6 100644
--- a/README.md
+++ b/README.md
@@ -71,10 +71,7 @@ This will create the following Jars:
### Dependencies
-#### Run-time
-There is one run-time dependency:
-
-* org.slf4j:slf4j-api
+There are no run-time dependencies.
#### Testing
See the pom.xml file for test dependencies.
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 b38f75a..7130487 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
@@ -21,10 +21,7 @@ package org.apache.datasketches.memory;
import static org.apache.datasketches.memory.UnsafeUtil.unsafe;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import sun.misc.Cleaner;
+import java.util.logging.Logger;
/**
* Provides access to direct (native) memory.
@@ -34,7 +31,7 @@ import sun.misc.Cleaner;
*/
@SuppressWarnings({"restriction","synthetic-access"})
final class AllocateDirect implements AutoCloseable {
- private static final Logger LOG = LoggerFactory.getLogger(AllocateDirect.class);
+ private static final Logger LOG = Logger.getLogger(AllocateDirect.class.getCanonicalName());
private final Deallocator deallocator;
private final long nativeBaseOffset;
@@ -129,7 +126,7 @@ final class AllocateDirect implements AutoCloseable {
if (valid.change()) {
if (calledFromCleaner) {
// Warn about non-deterministic resource cleanup.
- LOG.warn("A WritableDirectHandle was not closed manually");
+ LOG.warning("A WritableDirectHandle was not closed manually");
}
unsafe.freeMemory(nativeAddress);
NioBits.unreserveMemory(allocationSize, capacity);
@@ -141,4 +138,4 @@ final class AllocateDirect implements AutoCloseable {
}
}
-}
\ No newline at end of file
+}
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 a956a65..9362320 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
@@ -29,9 +29,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.logging.Logger;
import sun.nio.ch.FileChannelImpl;
@@ -55,7 +53,7 @@ import sun.nio.ch.FileChannelImpl;
*/
@SuppressWarnings({"restriction","synthetic-access"})
class AllocateDirectMap implements Map {
- private static final Logger LOG = LoggerFactory.getLogger(AllocateDirectMap.class);
+ private static final Logger LOG = Logger.getLogger(AllocateDirectMap.class.getCanonicalName());
private static final int MAP_RO = 0;
private static final int MAP_RW = 1;
@@ -283,7 +281,7 @@ class AllocateDirectMap implements Map {
if (valid.change()) {
if (calledFromCleaner) {
// Warn about non-deterministic resource cleanup.
- LOG.warn("A WritableMapHandle was not closed manually");
+ LOG.warning("A WritableMapHandle was not closed manually");
}
try {
unmap();
diff --git a/datasketches-memory-java9/src/main/java/module-info.java b/datasketches-memory-java9/src/main/java/module-info.java
index 8260021..e802741 100644
--- a/datasketches-memory-java9/src/main/java/module-info.java
+++ b/datasketches-memory-java9/src/main/java/module-info.java
@@ -19,8 +19,8 @@
module org.apache.datasketches.memory {
requires java.base;
+ requires java.logging;
requires jdk.unsupported;
- requires org.slf4j;
exports org.apache.datasketches.memory;
}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 02220f5..aabed50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,8 +83,6 @@ under the License.
<properties>
<!-- UNIQUE FOR THIS JAVA COMPONENT -->
- <slf4j-api.version>1.7.30</slf4j-api.version>
- <slf4j-simple.version>1.7.30</slf4j-simple.version>
<protobuf-java.version>3.6.0</protobuf-java.version>
<!-- Used for UTF8 testing -->
<zero-allocation-hashing.version>0.8</zero-allocation-hashing.version>
@@ -160,20 +158,8 @@ under the License.
</repositories>
<dependencies>
- <!-- UNIQUE FOR THIS JAVA COMPONENT -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j-api.version}</version>
- </dependency>
<!-- Test Scope -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j-simple.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<!-- Used for UTF8 testing -->
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org