1 files changed, 110 insertions, 117 deletions

diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/Main.java b/policy-management/src/main/java/org/onap/policy/drools/system/Main.java
index 49dfafca..bcc59c71 100644
--- a/policy-management/src/main/java/org/onap/policy/drools/system/Main.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/Main.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,15 +20,14 @@
 
 package org.onap.policy.drools.system;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Properties;
 
 import org.onap.policy.drools.persistence.SystemPersistence;
-import org.onap.policy.drools.utils.PropertyUtil;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.utils.LoggerUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,116 +36,110 @@ import org.slf4j.LoggerFactory;
  */
 public class Main {
 
-	/**
-	 * logback configuration file system property
-	 */
-	public static final String LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY = "logback.configurationFile";
-	
-	/**
-	 * logback configuration file system property
-	 */
-	public static final String LOGBACK_CONFIGURATION_FILE_DEFAULT = "config/logback.xml";
-	
-	/**
-	 * constructor (hides public default one)
-	 */
-	private Main() {}	
-	
-	/**
-	 * main
-	 * 
-	 * @param args program arguments
-	 * @throws IOException 
-	 */
-	public static void main(String args[]) {
-		
-		/* make sure the configuration directory exists */
-		
-		Path configDir = Paths.get(SystemPersistence.CONFIG_DIR_NAME);
-		if (Files.notExists(configDir)) {
-			try {
-				Files.createDirectories(configDir);
-			} catch (IOException e) {
-				throw new IllegalStateException("cannot create " + SystemPersistence.CONFIG_DIR_NAME, e);
-			}
-		}
-		
-		if (!Files.isDirectory(configDir))
-			throw new IllegalStateException
-						("config directory: " + configDir + " is not a directory");
-		
-		/* logging defaults */
-		
-		if (System.getProperty(LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY) == null)
-			System.setProperty(LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY, LOGBACK_CONFIGURATION_FILE_DEFAULT);
-		
-		/* 0. boot */
-		
-		PolicyEngine.manager.boot(args);
-		
-		/* start logger */
-		
-		Logger logger = LoggerFactory.getLogger(Main.class);		
-		
-		/* 1. Configure the Engine */
-		
-		Path policyEnginePath = Paths.get(configDir.toString(), SystemPersistence.PROPERTIES_FILE_ENGINE);
-		try {
-			if (Files.exists(policyEnginePath))
-				PolicyEngine.manager.configure(PropertyUtil.getProperties(policyEnginePath.toFile()));
-			else
-				PolicyEngine.manager.configure(PolicyEngine.manager.defaultTelemetryConfig());
-		} catch (Exception e) {
-			logger.warn("Main: {} could not find custom configuration in {}.", 
-					    PolicyEngine.manager, SystemPersistence.PROPERTIES_FILE_ENGINE, e);
-			
-			/* continue without telemetry or other custom components - this is OK */
-		}
-		
-		/* 2. Start the Engine with the basic services only (no Policy Controllers) */
-		
-		try {
-			boolean success = PolicyEngine.manager.start();
-			if (!success) {
-				logger.warn("Main: {} has been partially started", PolicyEngine.manager);		
-			}
-		} catch (IllegalStateException e) {
-			logger.warn("Main: cannot start {} (bad state) because of {}", PolicyEngine.manager, e.getMessage(), e);
-		} catch (Exception e) {
-			logger.warn("Main: cannot start {} because of {}", PolicyEngine.manager, e.getMessage(), e);
-			System.exit(1);
-		}
-		
-		/* 3. Create and start the controllers */
-		
-		File[] controllerFiles = configDir.toFile().listFiles();
-		for (File config : controllerFiles) {
-
-			if (config.getName().endsWith(SystemPersistence.PROPERTIES_FILE_CONTROLLER_SUFFIX)) {
-				int idxSuffix = 
-						config.getName().indexOf(SystemPersistence.PROPERTIES_FILE_CONTROLLER_SUFFIX);
-				int lastIdxSuffix = 
-						config.getName().lastIndexOf(SystemPersistence.PROPERTIES_FILE_CONTROLLER_SUFFIX);
-				if (idxSuffix != lastIdxSuffix) {
-					throw new IllegalArgumentException
-								("Improper naming of controller properties file: " +
-				                 "Expected <controller-name>" + 
-				                 SystemPersistence.PROPERTIES_FILE_CONTROLLER_SUFFIX);
-				}
-
-				String name = 
-						config.getName().substring(0, lastIdxSuffix);
-				try {
-					Properties properties = PropertyUtil.getProperties(config);
-					PolicyController controller = PolicyEngine.manager.createPolicyController(name, properties);
-					controller.start();
-				} catch (Exception e) {
-					logger.error("Main: cannot instantiate policy-controller {} because of {}", name, e.getMessage(), e);
-				} catch (LinkageError e) {
-					logger.warn("Main: cannot instantiate policy-controller {} (linkage) because of {}", 
-							    name, e.getMessage(), e);
-				}
-			}
-		}
-	}
+  /**
+   * logback configuration file system property
+   */
+  public static final String LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY =
+      "logback.configurationFile";
+
+  /**
+   * logback configuration file system property
+   */
+  public static final String LOGBACK_CONFIGURATION_FILE_DEFAULT = "config/logback.xml";
+
+  /**
+   * constructor (hides public default one)
+   */
+  private Main() {}
+
+  /**
+   * main
+   *
+   * @param args program arguments
+   * @throws IOException
+   */
+  public static void main(String args[]) {
+
+    /* logging defaults */
+
+    if (System.getProperty(LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY) == null) {
+      if (Files.exists(Paths.get(LOGBACK_CONFIGURATION_FILE_DEFAULT))) {
+        System.setProperty(LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY,
+            LOGBACK_CONFIGURATION_FILE_DEFAULT);
+      } else {
+        LoggerUtil.setLevel(LoggerUtil.ROOT_LOGGER, ch.qos.logback.classic.Level.INFO.toString());
+      }
+    }
+
+    /* make sure the default configuration directory is properly set up */
+
+    SystemPersistence.manager.setConfigurationDir(null);
+
+    /* logging defaults */
+
+    if (System.getProperty(LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY) == null) {
+      if (Files.exists(Paths.get(LOGBACK_CONFIGURATION_FILE_DEFAULT))) {
+        System.setProperty(LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY,
+            LOGBACK_CONFIGURATION_FILE_DEFAULT);
+      } else {
+        LoggerUtil.setLevel(LoggerUtil.ROOT_LOGGER, ch.qos.logback.classic.Level.INFO.toString());
+      }
+    }
+
+    /* 0. boot */
+
+    PolicyEngine.manager.boot(args);
+
+    /* start logger */
+
+    final Logger logger = LoggerFactory.getLogger(Main.class);
+
+    /* 1.a. Configure the Engine */
+
+    Properties engineProperties = SystemPersistence.manager.getEngineProperties();
+    if (engineProperties == null)
+      engineProperties = PolicyEngine.manager.defaultTelemetryConfig();
+
+    PolicyEngine.manager.configure(PolicyEngine.manager.defaultTelemetryConfig());
+
+    /* 1.b. Load Installation Environment(s) */
+
+    for (final Properties env : SystemPersistence.manager.getEnvironmentProperties()) {
+      PolicyEngine.manager.setEnvironment(env);
+    }
+
+    /* 2. Start the Engine with the basic services only (no Policy Controllers) */
+
+    try {
+      final boolean success = PolicyEngine.manager.start();
+      if (!success) {
+        logger.warn("Main: {} has been partially started", PolicyEngine.manager);
+      }
+    } catch (final IllegalStateException e) {
+      logger.warn("Main: cannot start {} (bad state) because of {}", PolicyEngine.manager,
+          e.getMessage(), e);
+    } catch (final Exception e) {
+      logger.warn("Main: cannot start {} because of {}", PolicyEngine.manager, e.getMessage(), e);
+      System.exit(1);
+    }
+
+    /* 3. Create and start the controllers */
+
+    for (final Properties controllerProperties : SystemPersistence.manager
+        .getControllerProperties()) {
+      final String controllerName =
+          controllerProperties.getProperty(PolicyProperties.PROPERTY_CONTROLLER_NAME);
+      try {
+        final PolicyController controller =
+            PolicyEngine.manager.createPolicyController(controllerName, controllerProperties);
+        controller.start();
+      } catch (final Exception e) {
+        logger.error("Main: cannot instantiate policy-controller {} because of {}", controllerName,
+            e.getMessage(), e);
+      } catch (final LinkageError e) {
+        logger.warn("Main: cannot instantiate policy-controller {} (linkage) because of {}",
+            controllerName, e.getMessage(), e);
+      }
+    }
+  }
 }