Resolved some dependency deprecations.

Norconex · Aug 14, 2023 · 682b2c8 · 682b2c8
1 parent 61f058e
commit 682b2c8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/com/norconex/commons/lang/io/CachedInputStream.java b/src/main/java/com/norconex/commons/lang/io/CachedInputStream.java
@@ -408,7 +408,7 @@ private int realRead(byte[] b, int off, int len) throws IOException {
      */
     public void enforceFullCaching() throws IOException {
         if (firstRead) {
-            IOUtils.copy(this, NullOutputStream.NULL_OUTPUT_STREAM);
+            IOUtils.copy(this, NullOutputStream.INSTANCE);
             length = count;
             firstRead = false;
         }

diff --git a/src/main/java/com/norconex/commons/lang/map/Properties.java b/src/main/java/com/norconex/commons/lang/map/Properties.java
@@ -397,8 +397,10 @@ private synchronized void storeToJavaUtilProperties(
         // Store it
         if (isXML) {
             if (output instanceof Writer writer) {
-                p.storeToXML(new WriterOutputStream(writer,
-                        StandardCharsets.UTF_8), null);
+                p.storeToXML(WriterOutputStream.builder()
+                        .setCharset(UTF_8)
+                        .setWriter(writer)
+                        .get(), null);
             } else {
                 p.storeToXML((OutputStream) output, null);
             }

diff --git a/src/test/java/com/norconex/commons/lang/bean/BeanUtilTest.java b/src/test/java/com/norconex/commons/lang/bean/BeanUtilTest.java
@@ -596,7 +596,6 @@ void testVisitPropertiesObjectBiPredicateClass() {
 
     //--- Test classes ---------------------------------------------------------
 
-    @SuppressWarnings("exports")
     public static class Root implements Serializable {
         private static final long serialVersionUID = 1L;
         private Sub1Yes sub1yes = new Sub1Yes();
@@ -631,7 +630,6 @@ public void accept(Event t) {
     public static class Sub2No implements Serializable {
         private static final long serialVersionUID = 1L;
     }
-    @SuppressWarnings("exports")
     public static class Sub3Yes implements EventListener<Event>, Serializable {
         private static final long serialVersionUID = 1L;
         private Sub1Yes sub1Yes;