[sling-org-apache-sling-jcr-oak-server] branch master updated: SLING-10029 Remove Guava dependency

[olli]

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

olli pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-oak-server.git


The following commit(s) were added to refs/heads/master by this push:
     new 0dcb904  SLING-10029 Remove Guava dependency
0dcb904 is described below

commit 0dcb90452e0cc27db3501a21a99d7de1f72c2425
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Wed Jan 13 21:10:09 2021 +0100

    SLING-10029 Remove Guava dependency
    
    remove usage of com.google.common.collect.ImmutableSet.of
---
 .../server/internal/OakSlingRepositoryManager.java | 36 ++++++++++++++--------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java
 
b/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java
index af07d74..43088da 100644
--- 
a/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java
+++ 
b/src/main/java/org/apache/sling/jcr/oak/server/internal/OakSlingRepositoryManager.java
@@ -18,13 +18,11 @@
  */
 package org.apache.sling.jcr.oak.server.internal;
 
-import static com.google.common.collect.ImmutableSet.of;
-import static java.util.Collections.singleton;
-import static 
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
-import static 
org.apache.jackrabbit.oak.plugins.index.IndexUtils.createIndexDefinition;
-
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Dictionary;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.jcr.Repository;
 
@@ -67,6 +65,10 @@ import 
org.osgi.service.component.annotations.ReferencePolicy;
 import org.osgi.service.component.annotations.ReferencePolicyOption;
 import org.osgi.service.metatype.annotations.Designate;
 
+import static java.util.Collections.singleton;
+import static 
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
+import static 
org.apache.jackrabbit.oak.plugins.index.IndexUtils.createIndexDefinition;
+
 /**
  * A Sling repository implementation that wraps the Oak repository
  * implementation from the Jackrabbit Oak project.
@@ -82,6 +84,16 @@ import org.osgi.service.metatype.annotations.Designate;
 )
 public class OakSlingRepositoryManager extends AbstractSlingRepositoryManager {
 
+    private static final Set<String> LUCENE_INDEX_EXCLUDES = new HashSet<>(
+        Arrays.asList(
+            "jcr:createdBy",
+            "jcr:lastModifiedBy",
+            "sling:alias",
+            "sling:resourceType",
+            "sling:vanityPath"
+        )
+    );
+
     @Reference
     private ServiceUserMapper serviceUserMapper;
 
@@ -241,14 +253,12 @@ public class OakSlingRepositoryManager extends 
AbstractSlingRepositoryManager {
                 // lucene full-text index
                 if (!index.hasChildNode("lucene")) {
                     LuceneIndexHelper.newLuceneIndexDefinition(
-                        index, "lucene", 
LuceneIndexHelper.JR_PROPERTY_INCLUDES,
-                        of(
-                            "jcr:createdBy",
-                            "jcr:lastModifiedBy",
-                            "sling:alias",
-                            "sling:resourceType",
-                            "sling:vanityPath"),
-                        "async");
+                        index,
+                        "lucene",
+                        LuceneIndexHelper.JR_PROPERTY_INCLUDES,
+                        LUCENE_INDEX_EXCLUDES,
+                        "async"
+                    );
                 }
 
             }