From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Mon, 25 Mar 2019 20:23:08 +0000 (-0400)
Subject: Do not start 2 netty server
X-Git-Tag: 0.4.2~146^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F83259%2F4;p=ccsdk%2Fcds.git

Do not start 2 netty server

As webflux is enable through maven dependency, just configure the
netty server provided rather than created a new one.

Change-Id: I9aff7848b08b219f9f453a522fbc5608e6e5714c
Issue-ID: CCSDK-1182
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---

diff --git a/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/cds/blueprintsprocessor/BlueprintHttpServer.java b/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/cds/blueprintsprocessor/BlueprintHttpServer.java
index ae75488c1..85ccd1f43 100644
--- a/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/cds/blueprintsprocessor/BlueprintHttpServer.java
+++ b/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/cds/blueprintsprocessor/BlueprintHttpServer.java
@@ -16,40 +16,19 @@
 
 package org.onap.ccsdk.cds.blueprintsprocessor;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory;
-import org.springframework.boot.web.reactive.server.ReactiveWebServerFactory;
-import org.springframework.boot.web.server.WebServer;
-import org.springframework.http.server.reactive.HttpHandler;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.stereotype.Component;
 
 @Component
-public class BlueprintHttpServer {
-
-    private static Logger log = LoggerFactory.getLogger(BlueprintHttpServer.class);
+public class BlueprintHttpServer implements WebServerFactoryCustomizer<NettyReactiveWebServerFactory> {
 
     @Value("${blueprintsprocessor.httpPort}")
     private Integer httpPort;
 
-    @Autowired
-    HttpHandler httpHandler;
-
-    WebServer http;
-
-    @PostConstruct
-    public void start() {
-        ReactiveWebServerFactory factory = new NettyReactiveWebServerFactory(httpPort);
-        this.http = factory.getWebServer(this.httpHandler);
-        this.http.start();
-    }
-
-    @PreDestroy
-    public void stop() {
-        this.http.stop();
+    @Override
+    public void customize(NettyReactiveWebServerFactory serverFactory) {
+        serverFactory.setPort(httpPort);
     }
-}
+}
\ No newline at end of file