Merge pull request #22 from zuliaio/micronaut

Micronaut

gradle.properties

@@ -1,5 +1,6 @@
 org.gradle.jvmargs=-Djavax.xml.accessExternalSchema=all
 luceneVersion=8.3.0
-mongoDriverVersion=3.11.0
+mongoDriverVersion=3.12.0
 grpcVersion=1.23.0
-protobufVersion=3.9.0
+protobufVersion=3.9.0
+micronautVersion=1.2.8

zulia-common/src/main/java/io/zulia/ZuliaConstants.java

@@ -24,7 +24,7 @@ public interface ZuliaConstants {
 	String FIELDS_URL = "fields";
 	String TERMS_URL = "terms";
 	String INDEX_URL = "index";
-	String INDEXES_URL = "indexes";
+	String INDEXES_URL = "/indexes";
 	String NODES_URL = "nodes";
 	String STATS_URL = "stats";
 

zulia-server/build.gradle.kts

@@ -8,6 +8,7 @@ description = "Zulia Server"
 val luceneVersion: String by project
 val mongoDriverVersion: String by project
 val protobufVersion: String by project
+val micronautVersion: String by project
 
 defaultTasks("build", "installDist")
 
@@ -34,6 +35,20 @@ dependencies {
     api("com.cedarsoftware:json-io:4.10.1")
 
     api("org.mongodb:mongodb-driver-sync:$mongoDriverVersion")
+
+    implementation("io.reactivex.rxjava2:rxjava:2.2.0")
+
+    annotationProcessor("io.micronaut:micronaut-inject-java:$micronautVersion")
+    implementation("io.micronaut:micronaut-http-client:$micronautVersion")
+    implementation("io.micronaut:micronaut-http-server-netty:$micronautVersion")
+    implementation("io.micronaut:micronaut-inject:$micronautVersion")
+    implementation("io.micronaut:micronaut-runtime:$micronautVersion")
+
+    compileOnly("io.micronaut:micronaut-inject-java:$micronautVersion")
+    testCompile("junit:junit:4.12")
+
+    implementation("javax.annotation:javax.annotation-api:1.3.2")
+    annotationProcessor("javax.annotation:javax.annotation-api:1.3.2")
 }
 
 val zuliaScriptTask = tasks.getByName<CreateStartScripts>("startScripts")

zulia-server/src/main/java/io/zulia/server/cmd/ZuliaD.java

@@ -23,6 +23,7 @@
 import io.zulia.server.node.ZuliaNode;
 import io.zulia.server.util.MongoProvider;
 import io.zulia.server.util.ServerNameHelper;
+import io.zulia.server.util.ZuliaNodeProvider;
 import org.apache.lucene.facet.FacetsConfig;
 import org.apache.lucene.search.BooleanQuery;
 
@@ -181,6 +182,8 @@ public static void main(String[] args) {
 					displayNodes(nodeService, "Registered nodes:");
 
 					ZuliaNode zuliaNode = new ZuliaNode(zuliaConfig, nodeService);
+
+					ZuliaNodeProvider.setZuliaNode(zuliaNode);
 					zuliaNode.start();
 				}
 				else {

zulia-server/src/main/java/io/zulia/server/config/ZuliaConfig.java

@@ -3,9 +3,11 @@
 import io.zulia.server.config.cluster.MongoAuth;
 import io.zulia.server.config.cluster.MongoServer;
 
+import javax.inject.Singleton;
 import java.util.Collections;
 import java.util.List;
 
+@Singleton
 public class ZuliaConfig {
 
 	private String dataPath = "data";

zulia-server/src/main/java/io/zulia/server/config/cluster/MongoNodeService.java

@@ -10,10 +10,12 @@
 import org.bson.Document;
 import org.bson.conversions.Bson;
 
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+@Singleton
 public class MongoNodeService implements NodeService {
 
 	private static final String NODES = "nodes";
@@ -22,7 +24,7 @@ public class MongoNodeService implements NodeService {
 	private static final String REST_PORT = "restPort";
 	private static final String HEARTBEAT = "heartbeat";
 
-	private final MongoClient mongoClient;
+	private MongoClient mongoClient;
 	private final String clusterName;
 
 	public MongoNodeService(MongoClient mongoClient, String clusterName) {
@@ -35,7 +37,6 @@ public MongoNodeService(MongoClient mongoClient, String clusterName) {
 	}
 
 	private MongoCollection<Document> getCollection() {
-		//return mongoClient.getDatabase(clusterName).getCollection(NODES).withWriteConcern(WriteConcern.MAJORITY);
 		return mongoClient.getDatabase(clusterName).getCollection(NODES);
 	}
 

zulia-server/src/main/java/io/zulia/server/index/ZuliaIndexManager.java

@@ -199,8 +199,7 @@ public InputStream getAssociatedDocumentStream(String indexName, String uniqueId
 		return i.getAssociatedDocumentStream(uniqueId, fileName);
 	}
 
-	public void storeAssociatedDocument(String indexName, String uniqueId, String fileName, InputStream is, Document metadata)
-			throws Exception {
+	public void storeAssociatedDocument(String indexName, String uniqueId, String fileName, InputStream is, Document metadata) throws Exception {
 		ZuliaIndex i = getIndexFromName(indexName);
 		long timestamp = System.currentTimeMillis();
 		i.storeAssociatedDocument(uniqueId, fileName, is, timestamp, metadata);

zulia-server/src/main/java/io/zulia/server/node/ZuliaNode.java

@@ -1,10 +1,11 @@
 package io.zulia.server.node;
 
+import io.micronaut.runtime.Micronaut;
 import io.zulia.server.config.NodeService;
 import io.zulia.server.config.ZuliaConfig;
 import io.zulia.server.connection.server.ZuliaServiceServer;
 import io.zulia.server.index.ZuliaIndexManager;
-import io.zulia.server.rest.ZuliaRESTServiceManager;
+import io.zulia.server.rest.ZuliaRESTService;
 
 import java.util.Collection;
 import java.util.Timer;
@@ -15,7 +16,6 @@
 public class ZuliaNode {
 
 	private final ZuliaIndexManager indexManager;
-	private final ZuliaRESTServiceManager restServiceManager;
 
 	private final ZuliaServiceServer zuliaServiceServer;
 
@@ -30,7 +30,6 @@ public ZuliaNode(ZuliaConfig zuliaConfig, NodeService nodeService) throws Except
 		this.zuliaConfig = zuliaConfig;
 		this.nodeService = nodeService;
 		this.indexManager = new ZuliaIndexManager(zuliaConfig, nodeService);
-		this.restServiceManager = new ZuliaRESTServiceManager(zuliaConfig, indexManager);
 
 		this.zuliaServiceServer = new ZuliaServiceServer(zuliaConfig, indexManager);
 
@@ -65,19 +64,16 @@ protected void handleNodeAdded(Collection<Node> currentOtherNodesActive, Node ne
 		membershipTimer.scheduleAtFixedRate(membershipTask, 1000, 1000);
 
 		indexManager.init();
-		restServiceManager.start();
 		zuliaServiceServer.start();
+		Micronaut.run(ZuliaRESTService.class);
 		LOG.info(getLogPrefix() + "started");
 
 	}
 
-
-
 	public void shutdown() {
 		LOG.info(getLogPrefix() + "stopping");
 		membershipTimer.cancel();
 		nodeService.removeHeartbeat(zuliaConfig.getServerAddress(), zuliaConfig.getServicePort());
-		restServiceManager.shutdown();
 		zuliaServiceServer.shutdown();
 		indexManager.shutdown();
 		LOG.info(getLogPrefix() + "stopped");
@@ -96,4 +92,7 @@ private String getLogPrefix() {
 		return zuliaConfig.getServerAddress() + ":" + zuliaConfig.getServicePort() + " ";
 	}
 
+	public ZuliaIndexManager getIndexManager() {
+		return indexManager;
+	}
 }