Merge pull request #6 from Axway-API-Management-Plus/develop

Develop

manifest.yml

@@ -3,5 +3,5 @@ applications:
 - name: axway-apim-service-broker
   memory: 1G
   random-route: true
-  path: target/apim-service-broker-1.1.7.jar
+  path: target/apim-service-broker-1.1.8.jar
 

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.axway.apim</groupId>
 	<artifactId>apim-service-broker</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.8</version>
 	<packaging>jar</packaging>
 	<name>axway-apim-service-broker</name>
 	<description>Axway APIM Service Broker</description>

src/main/java/com/axway/apim/servicebroker/AxwayServiceBrokerApplication.java

@@ -1,12 +1,17 @@
 package com.axway.apim.servicebroker;
 
+import com.axway.apim.servicebroker.service.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class AxwayServiceBrokerApplication {
+    private static final Logger logger = LoggerFactory.getLogger(AxwayServiceBrokerApplication.class);
 
-	public static void main(String[] args) {
-		SpringApplication.run(AxwayServiceBrokerApplication.class, args);
-	}
+    public static void main(String[] args) {
+    	logger.info("Version : {}", Constants.VERSION);
+        SpringApplication.run(AxwayServiceBrokerApplication.class, args);
+    }
 }

src/main/java/com/axway/apim/servicebroker/model/APIOrganization.java

@@ -13,12 +13,9 @@ public class APIOrganization {
 	private String phone;
 	private boolean enabled = true;
 	private boolean development = true;
-
 	//custom attribute
 	private String service_instance_id;
-
-
-
+
 	public String getId() {
 		return id;
 	}
@@ -73,6 +70,4 @@ public String getService_instance_id() {
 	public void setService_instance_id(String service_instance_id) {
 		this.service_instance_id = service_instance_id;
 	}
-
-
 }

src/main/java/com/axway/apim/servicebroker/model/APIOrganizationAccess.java

@@ -5,21 +5,22 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class APIOrganizationAccess {
 
-	private String id;
-	private String apiId;
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getApiId() {
-		return apiId;
-	}
-	public void setApiId(String apiId) {
-		this.apiId = apiId;
-	}
-
-
+    private String id;
+    private String apiId;
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getApiId() {
+        return apiId;
+    }
+
+    public void setApiId(String apiId) {
+        this.apiId = apiId;
+    }
 }

src/main/java/com/axway/apim/servicebroker/model/APISecurity.java

@@ -7,8 +7,7 @@ public class APISecurity {
 	private String name = "Pass Through";
 	private String type = "passThrough";
 	private int order = 1;
-
-
+
 	private Properties properties;
 
 	public APISecurity(){
@@ -17,8 +16,7 @@ public APISecurity(){
 		properties.setProperty("removeCredentialsOnSuccess", "true");
 
 	}
-
-
+
 	public String getName() {
 		return name;
 	}
@@ -50,6 +48,4 @@ public Properties getProperties() {
 	public void setProperties(Properties properties) {
 		this.properties = properties;
 	}
-
-
 }

src/main/java/com/axway/apim/servicebroker/model/APIUser.java

@@ -18,9 +18,7 @@ public class APIUser {
 	private long createdOn; //(integer, optional): Epoch/Unix time stamp when the organization was created ,
 	private String state = "approved"; //(string, optional): The current state of the account, one of: approved, pending ,
 	private String type = "internal"; //(string, optional): Indicates the type of user. Possible values: internal, external ,
-
-
-
+
 	public String getId() {
 		return id;
 	}
@@ -75,7 +73,6 @@ public String getRole() {
 	public void setRole(String role) {
 		this.role = role;
 	}
-
 	public boolean isEnabled() {
 		return enabled;
 	}
@@ -100,6 +97,4 @@ public String getType() {
 	public void setType(String type) {
 		this.type = type;
 	}
-
-
 }

src/main/java/com/axway/apim/servicebroker/model/FrondendAPI.java → src/main/java/com/axway/apim/servicebroker/model/FrontendAPI.java

@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class FrondendAPI {
+public class FrontendAPI {
 
 	private String id;
 	private String apiId;

src/main/java/com/axway/apim/servicebroker/model/Type.java

@@ -2,5 +2,4 @@
 
 public enum Type {
 	SWAGGER, WSDL
-
 }