Move bloom addon settings to separate file

enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextFactory.java

@@ -27,30 +27,27 @@
 import java.nio.file.Paths;
 
 import org.neo4j.function.Factory;
-import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.kernel.api.impl.index.IndexWriterConfigs;
 import org.neo4j.kernel.api.impl.index.builder.LuceneIndexStorageBuilder;
 import org.neo4j.kernel.api.impl.index.partition.WritableIndexPartitionFactory;
-import org.neo4j.kernel.configuration.Config;
 
 import static org.neo4j.kernel.api.impl.index.LuceneKernelExtensions.directoryFactory;
 
 public class FulltextFactory
 {
     private final FileSystemAbstraction fileSystem;
-    private final String[] properties;
     private final WritableIndexPartitionFactory partitionFactory;
     private final Factory<IndexWriterConfig> population;
     private final File storeDir;
     private final Analyzer analyzer;
 
-    public LuceneFulltext createFulltextHelper( String identifier, FULLTEXT_HELPER_TYPE type )
+    public LuceneFulltext createFulltextHelper( String identifier, FULLTEXT_HELPER_TYPE type, String[] properties )
     {
         LuceneIndexStorageBuilder storageBuilder = LuceneIndexStorageBuilder.create();
         storageBuilder.withFileSystem( fileSystem ).withIndexIdentifier( identifier ).withDirectoryFactory(
                 directoryFactory( false, this.fileSystem ) ).withIndexRootFolder( Paths.get( this.storeDir.getAbsolutePath(), "fulltextHelper" ).toFile() );
-        return new LuceneFulltext( storageBuilder.build(), partitionFactory, this.properties, analyzer, identifier, type );
+        return new LuceneFulltext( storageBuilder.build(), partitionFactory, properties, analyzer, identifier, type );
     }
 
     public enum FULLTEXT_HELPER_TYPE
@@ -59,19 +56,10 @@ public enum FULLTEXT_HELPER_TYPE
         RELATIONSHIPS
     }
 
-    public FulltextFactory( FileSystemAbstraction fileSystem, File storeDir, Config config ) throws IOException
+    public FulltextFactory( FileSystemAbstraction fileSystem, File storeDir, Analyzer analyzer ) throws IOException
     {
+        this.analyzer = analyzer;
         this.fileSystem = fileSystem;
-        this.properties = config.get( GraphDatabaseSettings.bloom_indexed_properties ).toArray( new String[0] );
-        try
-        {
-            Class configuredAnalayzer = Class.forName( config.get( GraphDatabaseSettings.bloom_analyzer ) );
-            analyzer = (Analyzer) configuredAnalayzer.newInstance();
-        }
-        catch ( Exception e )
-        {
-            throw new RuntimeException( "Could not create the configured analyzer", e );
-        }
         population = () -> IndexWriterConfigs.population( analyzer );
         partitionFactory = new WritableIndexPartitionFactory( population );
         this.storeDir = storeDir;

enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomKernelExtension.java

@@ -19,6 +19,8 @@
  */
 package org.neo4j.kernel.api.impl.fulltext.integrations.bloom;
 
+import org.apache.lucene.analysis.Analyzer;
+
 import java.io.File;
 import java.io.IOException;
 
@@ -53,11 +55,23 @@ public BloomKernelExtension( FileSystemAbstraction fileSystemAbstraction, File s
     @Override
     public void init() throws IOException, ProcedureException
     {
+        String[] properties = config.get( LoadableBloomFulltextConfig.bloom_indexed_properties ).toArray( new String[0] );
+        Analyzer analyzer;
+        try
+        {
+            Class configuredAnalayzer = Class.forName( config.get( LoadableBloomFulltextConfig.bloom_analyzer ) );
+            analyzer = (Analyzer) configuredAnalayzer.newInstance();
+        }
+        catch ( Exception e )
+        {
+            throw new RuntimeException( "Could not create the configured analyzer", e );
+        }
+
         FulltextProvider provider = FulltextProvider.instance( db );
-        fulltextFactory = new FulltextFactory( fileSystemAbstraction, storeDir, config );
-        LuceneFulltext nodes = fulltextFactory.createFulltextHelper( "bloomNodes", FulltextFactory.FULLTEXT_HELPER_TYPE.NODES );
+        fulltextFactory = new FulltextFactory( fileSystemAbstraction, storeDir, analyzer );
+        LuceneFulltext nodes = fulltextFactory.createFulltextHelper( "bloomNodes", FulltextFactory.FULLTEXT_HELPER_TYPE.NODES, properties );
         LuceneFulltext relationships =
-                fulltextFactory.createFulltextHelper( "bloomRelationships", FulltextFactory.FULLTEXT_HELPER_TYPE.RELATIONSHIPS );
+                fulltextFactory.createFulltextHelper( "bloomRelationships", FulltextFactory.FULLTEXT_HELPER_TYPE.RELATIONSHIPS, properties );
         provider.register( nodes );
         provider.register( relationships );
 

enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomProcedure.java

@@ -37,15 +37,15 @@
 public class BloomProcedure extends CallableProcedure.BasicProcedure
 {
     private static final String PROCEDURE_NAME = "bloomFulltext";
-
-    private static final String[] PROCEDURE_NAMESPACE = {"dbms", "fulltext"};
+    private static final String[] PROCEDURE_NAMESPACE = {"db", "fulltext"};
+    public static final String OUTPUT_NAME = "entityid";
     private final LuceneFulltext luceneFulltext;
     private String type;
 
     BloomProcedure( String type, LuceneFulltext luceneFulltext )
     {
         super( procedureSignature( new QualifiedName( PROCEDURE_NAMESPACE, PROCEDURE_NAME + type ) ).in( "terms",
-                Neo4jTypes.NTList( Neo4jTypes.NTString ) ).out( "entityid", Neo4jTypes.NTInteger ).description(
+                Neo4jTypes.NTList( Neo4jTypes.NTString ) ).out( OUTPUT_NAME, Neo4jTypes.NTInteger ).description(
                 String.format( "Queries the bloom index for %s.", type ) ).build() );
         this.luceneFulltext = luceneFulltext;
         this.type = type;

enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/LoadableBloomFulltextConfig.java

@@ -0,0 +1,27 @@
+package org.neo4j.kernel.api.impl.fulltext.integrations.bloom;
+
+import java.util.List;
+
+import org.neo4j.configuration.Description;
+import org.neo4j.configuration.Internal;
+import org.neo4j.configuration.LoadableConfig;
+import org.neo4j.graphdb.config.Setting;
+
+import static org.neo4j.kernel.configuration.Settings.NO_DEFAULT;
+import static org.neo4j.kernel.configuration.Settings.STRING;
+import static org.neo4j.kernel.configuration.Settings.STRING_LIST;
+import static org.neo4j.kernel.configuration.Settings.setting;
+
+public class LoadableBloomFulltextConfig implements LoadableConfig
+{
+
+    // Bloom index
+    @Internal
+    public static final Setting<List<String>> bloom_indexed_properties = setting( "unsupported.dbms.bloom_indexed_properties", STRING_LIST, NO_DEFAULT );
+
+    @Description( "Define the analyzer to use for the bloom index. Expects the fully qualified classname of the analyzer to use" )
+    @Internal
+    public static final Setting<String> bloom_analyzer =
+            setting( "unsupported.dbms.bloom_analyzer", STRING, "org.apache.lucene.analysis.standard.StandardAnalyzer" );
+
+}

enterprise/fulltext-addon/src/main/resources/META-INF/services/org.neo4j.configuration.LoadableConfig

@@ -0,0 +1 @@
+org.neo4j.kernel.api.impl.fulltext.integrations.bloom.LoadableBloomFulltextConfig