refactor: get rid of Guava (#669)

eclipse-lyo · Jan 9, 2025 · ca11575 · ca11575
1 parent b1681ef
commit ca11575
Show file tree

Hide file tree

Showing 22 changed files with 125 additions and 95 deletions.
diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcOAuthClient.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcOAuthClient.java
@@ -21,8 +21,8 @@
 import java.util.Map;
 import java.util.Optional;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.HttpClient;
+import org.eclipse.lyo.core.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,7 +58,7 @@ public OslcOAuthClient(
 
         oauthRealmName = "Jazz";
         // Change if a different name was detected
-        if (!StringUtils.isEmpty(realm)) {
+        if (!StringUtils.isNullOrEmpty(realm)) {
             oauthRealmName = realm;
         }
 

diff --git a/core/lyo-core-settings/pom.xml b/core/lyo-core-settings/pom.xml
@@ -82,10 +82,6 @@
       <artifactId>jersey-common</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/core/lyo-core-settings/src/main/java/org/eclipse/lyo/core/util/StringUtils.java b/core/lyo-core-settings/src/main/java/org/eclipse/lyo/core/util/StringUtils.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License 1.0
+ * which is available at http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+ */
+package org.eclipse.lyo.core.util;
+
+import java.text.Normalizer;
+import java.util.regex.Pattern;
+
+/**
+ * @since 7.0.0
+ */
+public class StringUtils {
+    /**
+     * Pattern to match control characters in the Unicode Cc category that are not CR, LF, or TAB
+     */
+    private static final Pattern CONTROL_CHAR_PATTERN = Pattern.compile("^\\p{Cc}&&[^\\r\\n\\t]+$");
+
+    /**
+     * Trim and strip control chars (in the Unicode Cc category that are not CR, LF, or TAB)
+     */
+    public static String cleanWithoutNormalization(String str) {
+        if (str == null) return null;
+
+        return CONTROL_CHAR_PATTERN.matcher(str).replaceAll("").trim();
+    }
+
+    /**
+     * Trim and strip control chars (in the Unicode Cc category that are not CR, LF, or TAB);
+     * returns an empty string if a null is encountered
+     */
+    public static String cleanWithoutNormalizationNonNull(String str) {
+        if (str == null) return "";
+
+        return CONTROL_CHAR_PATTERN.matcher(str).replaceAll("").trim();
+    }
+
+    /**
+     * Trim, strip control chars (in the Unicode Cc category that are not CR, LF, or TAB), and
+     * normalize the string to NFC as per W3C recommendations
+     */
+    public static String clean(String str) {
+        if (str == null) return null;
+
+        return Normalizer.normalize(CONTROL_CHAR_PATTERN.matcher(str).replaceAll("").trim(),
+            Normalizer.Form.NFC);
+    }
+
+    /**
+     * Trim, strip control chars (in the Unicode Cc category that are not CR, LF, or TAB), and
+     * normalize the string to NFC as per W3C recommendations;
+     * returns an empty string if a null is encountered
+     */
+    public static String cleanNonNull(String str) {
+        if (str == null) return "";
+
+        return Normalizer.normalize(CONTROL_CHAR_PATTERN.matcher(str).replaceAll("").trim(),
+            Normalizer.Form.NFC);
+    }
+
+    public static boolean isNullOrWhitespace(String str) {
+        return str == null || str.isBlank();
+    }
+
+    public static boolean isNullOrEmpty(String str) {
+        return str == null || str.isEmpty();
+    }
+}
diff --git a/core/lyo-core-settings/src/main/java/org/eclipse/lyo/oslc4j/core/OSLC4JUtils.java b/core/lyo-core-settings/src/main/java/org/eclipse/lyo/oslc4j/core/OSLC4JUtils.java
@@ -36,14 +36,14 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import com.google.common.base.Strings;
 import org.apache.jena.datatypes.DatatypeFormatException;
 import org.apache.jena.datatypes.RDFDatatype;
 import org.apache.jena.datatypes.TypeMapper;
 import org.apache.jena.datatypes.xsd.XSDDatatype;
 import org.apache.jena.datatypes.xsd.XSDDateTime;
 import org.apache.jena.datatypes.xsd.impl.XMLLiteralType;
 import org.apache.jena.rdf.model.Property;
+import org.eclipse.lyo.core.util.StringUtils;
 import org.eclipse.lyo.oslc4j.core.model.ResourceShape;
 import org.eclipse.lyo.oslc4j.core.model.XMLLiteral;
 import org.slf4j.Logger;
@@ -550,7 +550,7 @@ private static Boolean parseBooleanPropertyOrDefault(final String key,
 			final boolean defaultValue) {
 		Boolean value;
 		final String property = System.getProperty(key);
-		if (Strings.isNullOrEmpty(property)) {
+		if (StringUtils.isNullOrEmpty(property)) {
 			value = defaultValue;
 		} else {
 			try {

diff --git a/core/oslc4j-jena-provider/pom.xml b/core/oslc4j-jena-provider/pom.xml
@@ -131,11 +131,6 @@
       <version>${v.jersey}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/...jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/JenaModelHelperTest.java b/...jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/JenaModelHelperTest.java
@@ -17,9 +17,9 @@
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
+import java.util.List;
 import javax.xml.datatype.DatatypeConfigurationException;
 
-import com.google.common.collect.ImmutableList;
 import org.apache.jena.datatypes.DatatypeFormatException;
 import org.apache.jena.rdf.model.Model;
 import org.eclipse.lyo.oslc4j.core.exception.LyoModelException;
@@ -53,7 +53,7 @@ public void testSeqMarshalling()
         final Model expectedModel = RDFHelper.loadResourceModel("container-element.ttl");
         final Container container = new Container();
         container.setAbout(URI.create("urn:containerA"));
-        final ImmutableList<Element> children = ImmutableList.of(element("A"), element("B"));
+        final List<Element> children = List.of(element("A"), element("B"));
         container.setChildrenL(children);
         container.setChildrenB(children);
 

diff --git a/...c4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/JsonLdTest.java b/...c4j-jena-provider/src/test/java/org/eclipse/lyo/oslc4j/provider/jena/test/JsonLdTest.java
@@ -18,10 +18,11 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
-import com.google.common.collect.ImmutableList;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.model.ServiceProvider;
 import org.eclipse.lyo.oslc4j.provider.jena.OslcJsonLdArrayProvider;
@@ -72,7 +73,7 @@ public void testWrite() throws Exception {
                 .getAnnotations(), OslcMediaType.APPLICATION_JSON_LD_TYPE, new
                 MultivaluedHashMap<>(), outputStream);
 
-        final String jsonLD = outputStream.toString("UTF-8");
+        final String jsonLD = outputStream.toString(StandardCharsets.UTF_8);
 
         assertTrue("Provider was not read", jsonLD.contains("Hello world"));
 
@@ -94,7 +95,7 @@ public void testWriteArray() throws Exception {
                          new MultivaluedHashMap<>(),
                          outputStream);
 
-        final String jsonLD = outputStream.toString("UTF-8");
+        final String jsonLD = outputStream.toString(StandardCharsets.UTF_8);
 
         assertTrue("Provider was not read", jsonLD.contains("Hello world"));
     }
@@ -107,7 +108,7 @@ public void testWriteCollection() throws Exception {
 
         ServiceProvider sp = new ServiceProvider();
         sp.setDescription("Hello world");
-        final Collection<ServiceProvider> objects = ImmutableList.of(sp);
+        final Collection<ServiceProvider> objects = List.of(sp);
         provider.writeTo(
             new ArrayList<>(objects),
                 objects.getClass(),
@@ -117,7 +118,7 @@ public void testWriteCollection() throws Exception {
                 new MultivaluedHashMap<>(),
                 outputStream);
 
-        final String jsonLD = outputStream.toString("UTF-8");
+        final String jsonLD = outputStream.toString(StandardCharsets.UTF_8);
 
         assertTrue("Provider was not read", jsonLD.contains("Hello world"));
     }

diff --git a/core/shacl/pom.xml b/core/shacl/pom.xml
@@ -27,10 +27,6 @@
       <artifactId>oslc4j-jena-provider</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/core/shacl/src/main/java/org/eclipse/lyo/shacl/Shape.java b/core/shacl/src/main/java/org/eclipse/lyo/shacl/Shape.java
@@ -14,7 +14,6 @@
 
 package org.eclipse.lyo.shacl;
 
-import com.google.common.collect.ImmutableList;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
@@ -26,7 +25,6 @@
 
 /**
  * @author Yash Khatri
- * @version $version-stub$
  * @since 2.3.0
  */
 @OslcNamespace(ShaclConstants.SHACL_CORE_NAMESPACE)
@@ -133,8 +131,7 @@ public void setTargetObjectsOf(final URI targetObjectsOf) {
     @OslcTitle("Properties")
     @OslcValueType(ValueType.LocalResource)
     public List<Property> getShaclProperties() {
-        return ImmutableList.copyOf(
-                properties.values().toArray(new Property[properties.size()]));
+        return List.of(properties.values().toArray(new Property[0]));
     }
 
     public void setShaclProperties(final List<Property> properties) {

diff --git a/pom.xml b/pom.xml
@@ -28,8 +28,6 @@
     <v.jackson>2.18.2</v.jackson>
     <v.httpclient>4.5.14</v.httpclient>
     <v.slf4j>2.0.16</v.slf4j>
-
-    <v.guava>33.3.1-jre</v.guava>
   </properties>
 
 
@@ -393,11 +391,6 @@
         <artifactId>commons-codec</artifactId>
         <version>1.17.2</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>${v.guava}</version>
-      </dependency>
       <dependency>
         <groupId>jakarta.activation</groupId>
         <artifactId>jakarta.activation-api</artifactId>
@@ -476,7 +469,6 @@
               <link>https://jakarta.ee/specifications/platform/9/apidocs/</link>
               <link>https://jena.apache.org/documentation/javadoc/jena/</link>
               <link>https://jena.apache.org/documentation/javadoc/arq/</link>
-              <link>https://guava.dev/releases/${v.guava}/api/docs/</link>
             </links>
           </configuration>
           <executions>

diff --git a/server/oslc-ui-model/pom.xml b/server/oslc-ui-model/pom.xml
@@ -25,10 +25,6 @@
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-core</artifactId>
         </dependency>
-        <dependency>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-lang3</artifactId>
-        </dependency>
     </dependencies>
     <build>
       <plugins>

diff --git a/server/oslc-ui-model/src/main/java/org/eclipse/lyo/server/ui/model/PreviewFactory.java b/server/oslc-ui-model/src/main/java/org/eclipse/lyo/server/ui/model/PreviewFactory.java
@@ -15,7 +15,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.lang3.StringUtils;
+import org.eclipse.lyo.core.util.StringUtils;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcName;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcOccurs;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcPropertyDefinition;
@@ -143,7 +143,7 @@ private static org.eclipse.lyo.server.ui.model.Link constructLink(Link link) {
         if (null == link) {
             return null;
         }
-        if (StringUtils.isBlank(link.getLabel())) {
+        if (StringUtils.isNullOrWhitespace(link.getLabel())) {
             return constructLink(link.getValue().toString(), link.getValue().toString());
         } else {
             return constructLink(link.getValue().toString(), link.getLabel());

diff --git a/store/store-core/pom.xml b/store/store-core/pom.xml
@@ -101,10 +101,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
 
     <!-- Test -->
     <dependency>

diff --git a/store/store-core/src/main/java/org/eclipse/lyo/store/internals/SparqlStoreImpl.java b/store/store-core/src/main/java/org/eclipse/lyo/store/internals/SparqlStoreImpl.java
@@ -33,7 +33,6 @@
  * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
  */
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jena.arq.querybuilder.DescribeBuilder;
 import org.apache.jena.arq.querybuilder.ExprFactory;
 import org.apache.jena.arq.querybuilder.Order;
@@ -67,6 +66,7 @@
 import org.eclipse.lyo.core.query.UriRefValue;
 import org.eclipse.lyo.core.query.Value;
 import org.eclipse.lyo.core.query.WhereClause;
+import org.eclipse.lyo.core.util.StringUtils;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcName;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace;
@@ -295,8 +295,8 @@ public <T extends IResource> List<T> getResources(final URI namedGraph, final Cl
         String _prefixes = prefixes;
         String _where = where;
 
-        _prefixes = (StringUtils.isEmpty(_prefixes) ? "" : _prefixes + ",") + oslcQueryPrefixes(clazz);
-        _where = (StringUtils.isEmpty(_where) ? "" : _where + " and ") + oslcQueryWhere(clazz);
+        _prefixes = (StringUtils.isNullOrEmpty(_prefixes) ? "" : _prefixes + ",") + oslcQueryPrefixes(clazz);
+        _where = (StringUtils.isNullOrEmpty(_where) ? "" : _where + " and ") + oslcQueryWhere(clazz);
         Model model = getResources(namedGraph, _prefixes, _where, searchTerms, limit, offset, additionalDistinctVars,
             additionalQueryFilter);
         return getResourcesFromModel(model, clazz);
@@ -595,7 +595,7 @@ private SelectBuilder constructSparqlWhere(final String prefixes, final String w
         //Setup prefixes
         Map<String, String> prefixesMap = new HashMap<>();
         try {
-            if (!StringUtils.isEmpty(prefixes)) {
+            if (!StringUtils.isNullOrEmpty(prefixes)) {
                 prefixesMap = QueryUtils.parsePrefixes(prefixes);
                 for (Entry<String, String> prefix : prefixesMap.entrySet()) {
                     distinctResourcesQuery.addPrefix(prefix.getKey(), prefix.getValue());
@@ -622,7 +622,7 @@ private SelectBuilder constructSparqlWhere(final String prefixes, final String w
         //Setup where
         WhereClause whereClause = null;
         try {
-            if (!StringUtils.isEmpty(where)) {
+            if (!StringUtils.isNullOrEmpty(where)) {
                 whereClause = QueryUtils.parseWhere(where, prefixesMap);
                 List<SimpleTerm> parseChildren = whereClause.children();
                 for (SimpleTerm simpleTerm : parseChildren) {
@@ -672,7 +672,7 @@ private SelectBuilder constructSparqlWhere(final String prefixes, final String w
 
         //Setup searchTerms
         //Add a sparql filter "FILTER regex(?o, "<searchTerms>", "i")" to the distinctResourcesQuery
-        if (!StringUtils.isEmpty(searchTerms)) {
+        if (!StringUtils.isNullOrEmpty(searchTerms)) {
             ExprFactory factory = new ExprFactory();
             E_Regex regex = factory.regex(factory.str("?o"), searchTerms, "i");
             distinctResourcesQuery.addFilter(regex);