(sling-org-apache-sling-testing-jcr-mock) branch master updated: cosmetic: eliminate deprecation warnings

[sseifert]

This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-jcr-mock.git


The following commit(s) were added to refs/heads/master by this push:
     new 1dd30ed  cosmetic: eliminate deprecation warnings
1dd30ed is described below

commit 1dd30ed83cbf4dde5004caa3f69cb676292e933c
Author: Stefan Seifert <stefanseif...@users.noreply.github.com>
AuthorDate: Thu Nov 16 16:40:04 2023 +0100

    cosmetic: eliminate deprecation warnings
---
 src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java        | 5 +++--
 src/main/java/org/apache/sling/testing/mock/jcr/MockRepository.java | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java 
b/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
index 258bffb..76daaf2 100644
--- a/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
+++ b/src/main/java/org/apache/sling/testing/mock/jcr/MockJcr.java
@@ -20,6 +20,7 @@ package org.apache.sling.testing.mock.jcr;
 
 import java.io.Reader;
 import java.util.List;
+import java.util.Objects;
 
 import javax.jcr.NamespaceRegistry;
 import javax.jcr.Node;
@@ -90,8 +91,8 @@ public final class MockJcr {
     public static @NotNull Session newSession(@Nullable String userId, 
@Nullable String workspaceName) {
         try {
             return newRepository().login(
-                    new SimpleCredentials(StringUtils.defaultString(userId, 
DEFAULT_USER_ID), new char[0]),
-                    StringUtils.defaultString(workspaceName, DEFAULT_WORKSPACE)
+                    new SimpleCredentials(Objects.toString(userId, 
DEFAULT_USER_ID), new char[0]),
+                    Objects.toString(workspaceName, DEFAULT_WORKSPACE)
             );
         } catch (RepositoryException ex) {
             throw new RuntimeException("Creating mocked JCR session failed.", 
ex);
diff --git 
a/src/main/java/org/apache/sling/testing/mock/jcr/MockRepository.java 
b/src/main/java/org/apache/sling/testing/mock/jcr/MockRepository.java
index 40b2e18..1945093 100644
--- a/src/main/java/org/apache/sling/testing/mock/jcr/MockRepository.java
+++ b/src/main/java/org/apache/sling/testing/mock/jcr/MockRepository.java
@@ -20,6 +20,7 @@ package org.apache.sling.testing.mock.jcr;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Objects;
 
 import javax.jcr.Credentials;
 import javax.jcr.NamespaceRegistry;
@@ -32,7 +33,6 @@ import javax.jcr.nodetype.NodeTypeManager;
 import javax.jcr.observation.ObservationManager;
 
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * Mock {@link Repository} implementation. The data is stored inside the mocked
@@ -74,8 +74,8 @@ class MockRepository implements Repository {
             userId = ((SimpleCredentials)credentials).getUserID();
         }
         return new MockSession(this, items,
-                StringUtils.defaultString(userId, MockJcr.DEFAULT_USER_ID),
-                StringUtils.defaultString(workspaceName, 
MockJcr.DEFAULT_WORKSPACE));
+                Objects.toString(userId, MockJcr.DEFAULT_USER_ID),
+                Objects.toString(workspaceName, MockJcr.DEFAULT_WORKSPACE));
     }
 
     @Override