Core: регистрация сервиса настроек ASys

core/build.gradle

@@ -1,5 +1,5 @@
 group = 'asys'
-version = '0.2-SNAPSHOT'
+version = '0.3-SNAPSHOT'
 
 apply plugin: 'application'
 

core/src/main/java/asys/api/Config.java

@@ -0,0 +1,14 @@
+/*
+ * DmitriyMX <dimon550@gmail.com>
+ * 2017-04-29
+ */
+package asys.api;
+
+public interface Config {
+    String getString(String key);
+    String getString(String key, String defaultValue);
+    int getInt(String key);
+    int getInt(String key, int defaultValue);
+    long getLong(String key);
+    long getLong(String key, long defaultValue);
+}

core/src/main/java/asys/core/ConfigImpl.java

@@ -0,0 +1,47 @@
+/*
+ * DmitriyMX <dimon550@gmail.com>
+ * 2017-04-29
+ */
+package asys.core;
+
+import asys.api.Config;
+
+import java.util.Properties;
+
+public class ConfigImpl implements Config {
+    private Properties properties;
+
+    public void loadByProperties(Properties properties) {
+        this.properties = properties;
+    }
+
+    @Override
+    public String getString(String key) {
+        return getString(key, null);
+    }
+
+    @Override
+    public String getString(String key, String defaultValue) {
+        return properties.getProperty(key, defaultValue);
+    }
+
+    @Override
+    public int getInt(String key) {
+        return getInt(key, 0);
+    }
+
+    @Override
+    public int getInt(String key, int defaultValue) {
+        return (int) properties.getOrDefault(key, defaultValue);
+    }
+
+    @Override
+    public long getLong(String key) {
+        return getLong(key, 0L);
+    }
+
+    @Override
+    public long getLong(String key, long defaultValue) {
+        return (long) properties.getOrDefault(key, defaultValue);
+    }
+}

core/src/main/java/asys/core/Core.java

@@ -12,8 +12,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import uk.org.lidalia.sysoutslf4j.context.SysOutOverSLF4J;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.util.*;
 
 import static org.apache.felix.framework.util.FelixConstants.SYSTEMBUNDLE_ACTIVATORS_PROP;
@@ -22,18 +20,20 @@ public class Core {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
     private Felix felix;
     private BundleActivator hostActivator;
-    private Properties properties;
+    private ConfigImpl config = new ConfigImpl();
 
     public Core() {
         logger.trace("core created");
     }
 
-    public void setProperties(Properties properties) {
+    public void setConfiguration(Properties properties) {
-        this.properties = properties;
+        config.loadByProperties(properties);
     }
 
     public void start() {
-        hostActivator = new HostActivator(properties.getProperty("asys.bundles.dir"));
+        hostActivator = new HostActivator(
+                config.getString("asys.bundles.dir", "modules"),
+                config);
         startFelix();
     }
 

core/src/main/java/asys/core/HostActivator.java

@@ -4,10 +4,8 @@
  */
 package asys.core;
 
-import org.osgi.framework.Bundle;
+import asys.api.Config;
-import org.osgi.framework.BundleActivator;
+import org.osgi.framework.*;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -22,13 +20,18 @@ import java.util.List;
 public class HostActivator implements BundleActivator {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
     private final Path BUNDLES_DIR;
+    private final Config config;
+    private ServiceRegistration<?> serviceConfig;
 
-    public HostActivator(String bundlesDir) {
+    HostActivator(String bundlesDir, Config config) {
         this.BUNDLES_DIR = Paths.get(bundlesDir);
+        this.config = config;
     }
 
     @Override
     public void start(BundleContext bundleContext) throws Exception {
+        serviceConfig = bundleContext.registerService(Config.class, config, null);
+
         List<Bundle> bundleList = new ArrayList<>();
 
         Files.list(BUNDLES_DIR).forEach(path -> {
@@ -56,5 +59,6 @@ public class HostActivator implements BundleActivator {
     @Override
     public void stop(BundleContext bundleContext) throws Exception {
         logger.trace("call [HostActivator.stop(BundleContext)]");
+        serviceConfig.unregister();
     }
 }

core/src/main/java/asys/core/Main.java

@@ -15,7 +15,7 @@ public class Main {
 
     public static void main(String[] args) {
         Core asysCore = new Core();
-        asysCore.setProperties(getProperties());
+        asysCore.setConfiguration(getProperties());
         asysCore.start();
     }