#249 Adding support for SWAGGER_PROMOTE_HOME

containing a conf directory that is  used to load environment properties.

modules/swagger-promote-core/src/main/java/com/axway/apim/App.java

@@ -125,9 +125,10 @@ public static int run(String args[]) {
 			option.setArgName("true/[false]");
 			options.addOption(option);
 
-			option = new Option("confDir", true, "The absolite path to the conf directory containing your stage environment properties.");
+			option = new Option("swaggerPromoteHome", true, "The absolute path to the Swagger-Promote home directory containing for instance your conf folder.\n"
+					+ "You may also set the environment variable: '"+CommandParameters.SWAGGER_PROMOTE_HOME+"'");
 			option.setRequired(false);
-			option.setArgName("/home/chris/swagger-promote/conf");
+			option.setArgName("/home/chris/swagger-promote");
 			options.addOption(option);
 
 			option = new Option("iq", "ignoreQuotas", true, "Use this flag to ignore configured API quotas.");
@@ -201,7 +202,7 @@ public static int run(String args[]) {
 			Transaction.deleteInstance();
 			RollbackHandler.deleteInstance();
 
-			CommandParameters params = new CommandParameters(cmd, internalCmd, new EnvironmentProperties(cmd.getOptionValue("stage"), cmd.getOptionValue("confDir")));
+			CommandParameters params = new CommandParameters(cmd, internalCmd, new EnvironmentProperties(cmd.getOptionValue("stage"), cmd.getOptionValue("swaggerPromoteHome")));
 
 			APIManagerAdapter apimAdapter = APIManagerAdapter.getInstance();
 

modules/swagger-promote-core/src/main/java/com/axway/apim/lib/CommandParameters.java

@@ -14,6 +14,8 @@ public class CommandParameters {
 	public static String MODE_IGNORE	= "ignore";
 	public static String MODE_ADD		= "add";
 
+	public static String SWAGGER_PROMOTE_HOME = "SWAGGER_PROMOTE_HOME";
+
 	private static CommandParameters instance;
 
 	int port = 8075;

modules/swagger-promote-core/src/main/java/com/axway/apim/lib/EnvironmentProperties.java

@@ -1,6 +1,5 @@
 package com.axway.apim.lib;
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.Collection;
@@ -18,7 +17,7 @@ public class EnvironmentProperties implements Map<String, String> {
 	private static Logger LOG = LoggerFactory.getLogger(EnvironmentProperties.class);
 
 	private String stage;
-	private String confDir;
+	private String swaggerPromoteHome;
 
 	private Properties mainProperties = new Properties();
 	private Properties stageProperties = new Properties();
@@ -28,10 +27,15 @@ public EnvironmentProperties(String stage) throws AppException {
 		this(stage, null);
 	}
 
-	public EnvironmentProperties(String stage, String confDir) throws AppException {
+	public EnvironmentProperties(String stage, String swaggerPromoteHome) throws AppException {
 		super();
 		this.stage = stage;
-		this.confDir = confDir;
+		this.swaggerPromoteHome = swaggerPromoteHome;
+		if(swaggerPromoteHome==null) {
+			// Try to use SWAGGER_PROMOTE_HOME if not given by a parameter
+			this.swaggerPromoteHome = System.getenv(CommandParameters.SWAGGER_PROMOTE_HOME);
+		}
+		if(this.swaggerPromoteHome!=null) this.swaggerPromoteHome += "/conf";
 		initProperties();
 	}
 
@@ -44,22 +48,22 @@ private void initProperties() throws AppException {
 	}
 
 	private Properties loadProperties(String stage) {
+		/*
+		 * We load properties in the following order:
+		 * SwaggerPromote Home is used
+		 * if ConfDir is not set
+		 * if ConfDir is not set, the Classpath is used
+		 */
 		String pathToUse = null;
 		InputStream is;
 		Properties props = new Properties();
 		try {
-			if(confDir!=null && stage==null) {
-				pathToUse = confDir + File.separator + "env.properties";
-				is = new FileInputStream(pathToUse);
-			} else if(confDir!=null && stage!=null) {
-				pathToUse = confDir + File.separator + "env."+stage+".properties";
+			if(swaggerPromoteHome!=null) {
+				pathToUse = (stage==null) ? swaggerPromoteHome + "/env.properties" : swaggerPromoteHome + "/env."+stage+".properties";
 				is = new FileInputStream(pathToUse);
-			} else if(confDir==null && stage!=null) {
-				pathToUse = "env."+stage+".properties";
-				is = APIMHttpClient.class.getClassLoader().getResourceAsStream("env."+stage+".properties");
 			} else {
-				pathToUse = "env.properties";
-				is = APIMHttpClient.class.getClassLoader().getResourceAsStream("env.properties");
+				pathToUse = (stage==null) ? "env.properties" : "env."+stage+".properties";
+				is = APIMHttpClient.class.getClassLoader().getResourceAsStream(pathToUse);
 			}
 			props.load(is);
 			LOG.info("Loaded environment properties from file: " + pathToUse);

modules/swagger-promote-core/src/test/java/com/axway/apim/test/envProperties/EnvPropertiesTest.java

@@ -23,7 +23,7 @@ public void testNoStage() throws AppException, IOException {
 	}
 
 	@Test
-	public void testAnyOtherStage() throws AppException, IOException {
+	public void testStage() throws AppException, IOException {
 		EnvironmentProperties properties = new EnvironmentProperties("anyOtherStage");
 
 		Assert.assertEquals(properties.containsKey("thisKeyExists"), true);
@@ -33,34 +33,34 @@ public void testAnyOtherStage() throws AppException, IOException {
 	}
 
 	@Test
-	public void testNoStageFromConfFolder() throws AppException, IOException, URISyntaxException {
+	public void testNoStageFromConfDir() throws AppException, IOException, URISyntaxException {
 		// A given path should be used to load the Environent-Config file from
 		String path = EnvPropertiesTest.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath();
-		path += "/envProperties";
-		 
+		path += "envPropertiesTest/swaggerPromoteHome";
+
 		EnvironmentProperties properties = new EnvironmentProperties(null, path);
 
 		Assert.assertEquals(properties.containsKey("thisKeyExists"), true);
-		Assert.assertEquals(properties.get("thisKeyExists"), "BasicConfigFromPath");
+		Assert.assertEquals(properties.get("thisKeyExists"), "keyFromSwaggerPromoteHome");
 
 
-		Assert.assertEquals(properties.get("admin_username"), "basicUserFromPathProperty");
-		Assert.assertEquals(properties.get("admin_password"), "basicPasswordFromPathProperty");
+		Assert.assertEquals(properties.get("admin_username"), "userFromSwaggerPromoteHome");
+		Assert.assertEquals(properties.get("admin_password"), "passwordFromSwaggerPromoteHome");
 	}
 
 	@Test
-	public void testAnyOtherStageFromConfFolder() throws AppException, IOException, URISyntaxException {
+	public void testStageFromConfDir() throws AppException, IOException, URISyntaxException {
 		// A given path should be used to load the Environent-Config file from
 		String path = EnvPropertiesTest.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath();
-		path += "/envProperties";
-		 
-		EnvironmentProperties properties = new EnvironmentProperties("fromPath", path);
+		path += "envPropertiesTest/swaggerPromoteHome";
+
+		EnvironmentProperties properties = new EnvironmentProperties("fromSwaggerPromoteHome", path);
 
 		Assert.assertEquals(properties.containsKey("thisKeyExists"), true);
-		Assert.assertEquals(properties.get("thisKeyExists"), "ThisIsComingFromAPath");
+		Assert.assertEquals(properties.get("thisKeyExists"), "stageKeyFromSwaggerPromoteHome");
 
 
-		Assert.assertEquals(properties.get("admin_username"), "userFromPathProperty");
-		Assert.assertEquals(properties.get("admin_password"), "passwordFromPathProperty");
+		Assert.assertEquals(properties.get("admin_username"), "stageUserFromSwaggerPromoteHome");
+		Assert.assertEquals(properties.get("admin_password"), "stageUasswordFromSwaggerPromoteHome");
 	}
 }

modules/swagger-promote-core/src/test/resources/envPropertiesTest/swaggerPromoteHome/conf/env.fromSwaggerPromoteHome.properties

@@ -0,0 +1,4 @@
+admin_username=stageUserFromSwaggerPromoteHome
+admin_password=stageUasswordFromSwaggerPromoteHome
+
+thisKeyExists=stageKeyFromSwaggerPromoteHome

modules/swagger-promote-core/src/test/resources/envPropertiesTest/swaggerPromoteHome/conf/env.properties

@@ -0,0 +1,4 @@
+admin_username=userFromSwaggerPromoteHome
+admin_password=passwordFromSwaggerPromoteHome
+
+thisKeyExists=keyFromSwaggerPromoteHome