sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject [sling-org-apache-sling-jcr-oak-server] 02/02: style
Date Sat, 21 Apr 2018 22:54:03 GMT
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

commit dcdfdf015d9b634d56a5ba08f11a894e4bd39c0e
Author: Oliver Lietz <olli@apache.org>
AuthorDate: Sun Apr 22 00:53:44 2018 +0200

    style
---
 bnd.bnd                                            |  6 +--
 .../server/internal/OakSlingRepositoryManager.java | 60 +++++++++++-----------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
index e0eb921..e5461b3 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -9,12 +9,12 @@ Bundle-License: Apache License, Version 2.0
 Bundle-Vendor: The Apache Software Foundation
 
 Import-Package:\
-  com.mongodb; resolution:=optional,\
+  com.mongodb;resolution:=optional,\
   org.apache.felix.jaas.boot,\
   org.apache.jackrabbit.oak,\
-  org.apache.jackrabbit.oak.security.user; resolution:=optional,\
+  org.apache.jackrabbit.oak.security.user;resolution:=optional,\
   org.apache.jackrabbit.oak.spi.security.authentication,\
-  org.apache.jackrabbit.test; resolution:=optional,\
+  org.apache.jackrabbit.test;resolution:=optional,\
   *
 
 Provide-Capability:\
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 d7b3143..e37c71c 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,11 +18,6 @@
  */
 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.Collections;
 import java.util.Dictionary;
 
@@ -69,6 +64,11 @@ import org.osgi.service.component.annotations.ReferencePolicy;
 import org.osgi.service.component.annotations.ReferencePolicyOption;
 import org.osgi.service.metatype.annotations.Designate;
 
+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;
+
 /**
  * A Sling repository implementation that wraps the Oak repository
  * implementation from the Jackrabbit Oak project.
@@ -104,7 +104,7 @@ public class OakSlingRepositoryManager extends AbstractSlingRepositoryManager
{
         policy = ReferencePolicy.STATIC,
         policyOption = ReferencePolicyOption.GREEDY
     )
-    private SecurityProvider securityProvider = null;
+    private SecurityProvider securityProvider;
 
     private ServiceRegistration nodeAggregatorRegistration;
 
@@ -124,26 +124,26 @@ public class OakSlingRepositoryManager extends AbstractSlingRepositoryManager
{
             .withAsyncIndexing("async", 5);
 
         final Jcr jcr = new Jcr(oak, false)
-        .with(new InitialContent())
-        .with(new ExtraSlingContent())
+            .with(new InitialContent())
+            .with(new ExtraSlingContent())
 
-        .with(JcrConflictHandler.createJcrConflictHandler())
-        .with(new VersionHook())
+            .with(JcrConflictHandler.createJcrConflictHandler())
+            .with(new VersionHook())
 
-        .with(securityProvider)
+            .with(securityProvider)
 
-        .with(new NameValidatorProvider())
-        .with(new NamespaceEditorProvider())
-        .with(new TypeEditorProvider())
-        .with(new ConflictValidatorProvider())
+            .with(new NameValidatorProvider())
+            .with(new NamespaceEditorProvider())
+            .with(new TypeEditorProvider())
+            .with(new ConflictValidatorProvider())
 
-        // index stuff
-        .with(indexProvider)
-        .with(indexEditorProvider)
-        .with(getDefaultWorkspace())
-        .with(whiteboard)
-        .withFastQueryResultSize(true)
-        .withObservationQueueLength(configuration.oak_observation_queue_length());
+            // index stuff
+            .with(indexProvider)
+            .with(indexEditorProvider)
+            .with(getDefaultWorkspace())
+            .with(whiteboard)
+            .withFastQueryResultSize(true)
+            .withObservationQueueLength(configuration.oak_observation_queue_length());
 
         if (commitRateLimiter != null) {
             jcr.with(commitRateLimiter);
@@ -238,14 +238,14 @@ 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,
+                        of(
+                            "jcr:createdBy",
+                            "jcr:lastModifiedBy",
+                            "sling:alias",
+                            "sling:resourceType",
+                            "sling:vanityPath"),
+                        "async");
                 }
 
             }

-- 
To stop receiving notification emails like this one, please contact
olli@apache.org.

Mime
View raw message