Merge pull request #13 from YunaBraska/release

Release

Former-commit-id: 4217442

Author: YunaBraska

README.md

@@ -13,7 +13,7 @@ Embedded [Nats streaming server](https://github.com/nats-io/nats-streaming-serve
 
 ### Usage
 * One annotation to setup the powerful [Nats streaming server](https://github.com/nats-io/nats-streaming-server)
-```
+```java
 @SpringBootTest
 @RunWith(SpringRunner.class)
 @EnableNatsServer(port = 4222, natsServerConfig = {"user:admin", "password:admin"})

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>berlin.yuna</groupId>
     <artifactId>nats-streaming-server-embedded</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -56,6 +56,12 @@
             <version>2.8.5</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>berlin.yuna</groupId>
+            <artifactId>config-metadata-generator</artifactId>
+            <version>0.2.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <scm>

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

@@ -54,8 +54,7 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte
         try {
             natsServerBean.start();
         } catch (Exception e) {
-            throw new IllegalArgumentException("Failed to initialise " +  EnableNatsServer.class.getSimpleName(), e);
-//            LOG.error("Failed to initialise [{}]", EnableNatsServer.class.getSimpleName(), e);
+            throw new IllegalArgumentException("Failed to initialise " + EnableNatsServer.class.getSimpleName(), e);
         }
 
         beanFactory.initializeBean(natsServerBean, NatsServer.BEAN_NAME);

src/main/java/berlin/yuna/natsserver/config/NatsServerConfig.java

@@ -9,9 +9,9 @@ public enum NatsServerConfig {
     STORE("MEMORY", "[STRING] Store type: MEMORY|FILE (default: MEMORY)"),
     DIR(null, "[STRING] For FILE store type, this is the root directory"),
     MAX_CHANNELS("0", "[INT] Max number of channels (0 for unlimited)"),
-    MAX_SUBS("0", "[INT] Max number of subscriptions per channel (0 for unlimited)"),
-    MAX_MSGS("0", "[INT] Max number of messages per channel (0 for unlimited)"),
-    MAX_BYTES("0", "[SIZE] Max messages total size per channel (0 for unlimited)"),
+    MAX_SUBS(0, "[INT] Max number of subscriptions per channel (0 for unlimited)"),
+    MAX_MSGS(0, "[INT] Max number of messages per channel (0 for unlimited)"),
+    MAX_BYTES(0L, "[SIZE] Max messages total size per channel (0 for unlimited)"),
     MAX_AGE("0s", "[DURATION] Max duration a message can be stored (\"0s\" for unlimited)"),
     MAX_INACTIVITY("0", "[DURATION] Max inactivity (no new message, no subscription) after which a channel can be garbage collected (0 for unlimited)"),
     NATS_SERVER(null, "[STRING] Connect to this external NATS Server URL (embedded otherwise)"),
@@ -51,7 +51,7 @@ public enum NatsServerConfig {
 
     //Streaming Server SQL Store Options
     SQL_DRIVER(null, "[STRING] Name of the SQL Driver (\"mysql\" or \"postgres\")"),
-    SQL_DATA_SOURCE(null, "[STRING] Datasource used when opening an SQL connection to the database"),
+    SQL_SOURCE(null, "[STRING] Datasource used when opening an SQL connection to the database"),
     SQL_NO_CACHING(null, "[BOOL] Enable/Disable caching for improved performance"),
     SQL_MAX_OPEN_CONNS(null, "[INT] Maximum number of opened connections to the database"),
 
@@ -62,49 +62,50 @@ public enum NatsServerConfig {
     TLS_CLIENT_CACERT(null, "-[STRING] Client certificate CA for the streaming server"),
 
     //Streaming Server Logging Options
-    STAN_DEBUG("false", "[BOOL] Enable STAN debugging output"),
-    STAN_TRACE("false", "[BOOL] Trace the raw STAN protocol"),
+    STAN_DEBUG(false, "[BOOL] Enable STAN debugging output"),
+    STAN_TRACE(false, "[BOOL] Trace the raw STAN protocol"),
 
     //NATS Server Options
     ADDR("0.0.0.0", "[STRING] Bind to host address (default: 0.0.0.0)"),
-    PORT("4222", "[INT] Use port for clients (default: 4222)"),
+    PORT(4222, "[INT] Use port for clients (default: 4222)"),
     PID(null, "[STRING] File to store PID"),
     HTTP_PORT(null, "[INT] Use port for http monitoring"),
     HTTPS_PORT(null, "[INT] Use port for https monitoring"),
     CONFIG(null, "[STRING] Configuration file"),
 
     //NATS Server Logging Options
     LOG(null, "[STRING] File to redirect log output"),
-    LOGTIME("true", "[BOOL] Timestamp log entries (default: true)"),
+    LOGTIME(true, "[BOOL] Timestamp log entries (default: true)"),
     SYSLOG(null, "[STRING] Enable syslog as log method"),
     REMOTE_SYSLOG(null, "[STRING] Syslog server addr (udp://localhost:514)"),
-    DEBUG("false", "[BOOL] Enable debugging output"),
-    TRACE("false", "[BOOL] Trace the raw protocol"),
+    DEBUG(false, "[BOOL] Enable debugging output"),
+    TRACE(false, "[BOOL] Trace the raw protocol"),
 
     //NATS Server Authorization Options
     USER(null, "[STRING] User required for connections"),
     PASS(null, "[STRING] Password required for connections"),
     AUTH(null, "[STRING] Authorization token required for connections"),
 
     //TLS Options
-    TLS("false", "[BOOL] Enable TLS, do not verify clients (default: false)"),
+    TLS(false, "[BOOL] Enable TLS, do not verify clients (default: false)"),
     TLSCERT(null, "[STRING] Server certificate file"),
+    TLSKEY(null, "[STRING] Private key for server certificate"),
     TLSVERIFY(null, "[BOOL] Enable TLS, verify client certificates"),
     TLSCACERT(null, "[STRING] Client certificate CA for verification"),
 
     //NATS Clustering Options
     ROUTES(null, "[STRING] Routes to solicit and connect"),
     CLUSTER(null, "[STRING] Cluster URL for solicited routes");
 
-    private final String defaultValue;
+    private final Object defaultValue;
     private final String description;
 
-    NatsServerConfig(String defaultValue, String description) {
+    NatsServerConfig(Object defaultValue, String description) {
         this.defaultValue = defaultValue;
         this.description = description;
     }
 
-    public String getDefaultValue() {
+    public Object getDefaultValue() {
         return defaultValue;
     }
 

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

@@ -128,7 +128,7 @@ public void start() throws IOException {
             throw new BindException("Address already in use [" + getPort() + "]");
         }
 
-        Path natsServerPath = getNatsServerPath();
+        Path natsServerPath = getNatsServerPath(OPERATING_SYSTEM);
         LOG.info("Starting [{}] port [{}] version [{}-{}]", BEAN_NAME, getPort(), NATS_SERVER_VERSION, OPERATING_SYSTEM);
 
         String command = prepareCommand(natsServerPath);
@@ -192,12 +192,12 @@ public void destroy() {
      *
      * @return Resource/{SIMPLE_CLASS_NAME}/{NATS_SERVER_VERSION}/{OPERATING_SYSTEM}/{SIMPLE_CLASS_NAME}
      */
-    private Path getNatsServerPath() {
+    Path getNatsServerPath(OperatingSystem operatingSystem) {
         StringBuilder relativeResource = new StringBuilder();
         relativeResource.append(BEAN_NAME.toLowerCase()).append(File.separator);
         relativeResource.append(NATS_SERVER_VERSION).append(File.separator);
-        relativeResource.append(OPERATING_SYSTEM.toString().toLowerCase()).append(File.separator);
-        relativeResource.append(BEAN_NAME.toLowerCase()).append((OPERATING_SYSTEM == WINDOWS ? ".exe" : ""));
+        relativeResource.append(operatingSystem.toString().toLowerCase()).append(File.separator);
+        relativeResource.append(BEAN_NAME.toLowerCase()).append((operatingSystem == WINDOWS ? ".exe" : ""));
         return copyResourceFile(relativeResource.toString());
     }
 
@@ -246,7 +246,7 @@ private Map<NatsServerConfig, String> getDefaultConfig() {
         Map<NatsServerConfig, String> defaultConfig = new HashMap<>();
         for (NatsServerConfig natsServerConfig : NatsServerConfig.values()) {
             if (natsServerConfig.getDefaultValue() != null) {
-                defaultConfig.put(natsServerConfig, natsServerConfig.getDefaultValue());
+                defaultConfig.put(natsServerConfig, natsServerConfig.getDefaultValue().toString());
             }
         }
         return defaultConfig;

src/main/java/berlin/yuna/natsserver/util/SystemUtil.java

@@ -58,7 +58,7 @@ public static OperatingSystem getOsType() {
 
     public static Process executeCommand(String command) throws IOException {
         ProcessBuilder builder = new ProcessBuilder();
-            builder.command(getCommandByOsType(command));
+        builder.command(getCommandByOsType(command));
         return builder.start();
     }