bugfix/port configuration

Former-commit-id: e2131d5

Author: YunaBraska

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>berlin.yuna</groupId>
     <artifactId>nats-streaming-server-embedded</artifactId>
-    <version>0.4.2</version>
+    <version>0.4.3</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

src/main/java/berlin/yuna/natsserver/annotation/EnableNatsServerContextCustomizer.java

@@ -50,6 +50,7 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte
         }
 
         NatsServer natsServerBean = new NatsServer(enableNatsServer.natsServerConfig());
+        natsServerBean.port(overwritePort(natsServerBean));
         String sourceUrl = environment.getProperty("nats.source.default");
         natsServerBean.source(isEmpty(sourceUrl) ? natsServerBean.source() : sourceUrl);
         natsServerBean.setNatsServerConfig(mergeConfig(environment, natsServerBean.getNatsServerConfig()));
@@ -66,6 +67,10 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte
         ((DefaultSingletonBeanRegistry) beanFactory).registerDisposableBean(NatsServer.BEAN_NAME, natsServerBean);
     }
 
+    private int overwritePort(NatsServer natsServerBean) {
+        return enableNatsServer.port() != (Integer) NatsServerConfig.PORT.getDefaultValue() ? enableNatsServer.port() : natsServerBean.port();
+    }
+
     private Map<NatsServerConfig, String> mergeConfig(final ConfigurableEnvironment environment, final Map<NatsServerConfig, String> originalConfig) {
         Map<NatsServerConfig, String> mergedConfig = new HashMap<>(originalConfig);
         for (NatsServerConfig natsServerConfig : NatsServerConfig.values()) {

src/main/java/berlin/yuna/natsserver/logic/NatsServer.java

@@ -29,6 +29,7 @@
 import static berlin.yuna.natsserver.config.NatsServerConfig.PORT;
 import static berlin.yuna.system.logic.SystemUtil.OperatingSystem.WINDOWS;
 import static berlin.yuna.system.logic.SystemUtil.getOsType;
+import static berlin.yuna.system.logic.SystemUtil.killProcessByName;
 import static java.nio.channels.Channels.newChannel;
 import static java.nio.file.attribute.PosixFilePermission.OTHERS_EXECUTE;
 import static java.nio.file.attribute.PosixFilePermission.OTHERS_READ;
@@ -173,9 +174,10 @@ public NatsServer start() throws IOException {
     public NatsServer stop() {
         try {
             LOG.info("Stopping [{}]", BEAN_NAME);
+//            Runtime.getRuntime().addShutdownHook(new Thread(() -> process.destroy()));
+//            killProcessByName(getNatsServerPath(OPERATING_SYSTEM).getFileName().toString());
             process.destroy();
             process.waitFor();
-//            killProcessByName(getNatsServerPath(OPERATING_SYSTEM).getFileName().toString());
         } catch (NullPointerException | InterruptedException e) {
             LOG.warn("Could not stop [{}] cause cant find process", BEAN_NAME);
         } finally {