- Added clientId constant.

srathod · srathod · commit 9ebd59fe676e · 2016-08-13T01:46:44.000+05:30
diff --git a/build.xml b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <project name="anet-java-sdk" default="compile" basedir=".">
-	<property name="version" value="1.8.2" />
+	<property name="version" value="1.9.0" />
 	<property name="dirs.base" value="${basedir}" />
 	<property name="src.dir" value="${basedir}/src/main/java" />
 	<property name="javadocs.dir" value="${basedir}/docs/javadocs" />
diff --git a/src/main/java/net/authorize/api/controller/base/ApiOperationBase.java b/src/main/java/net/authorize/api/controller/base/ApiOperationBase.java
@@ -15,6 +15,7 @@
 import net.authorize.api.contract.v1.MessageTypeEnum;
 import net.authorize.api.contract.v1.MessagesType;
 import net.authorize.api.contract.v1.MessagesType.Message;
+import net.authorize.util.Constants;
 import net.authorize.util.HttpUtility;
 import net.authorize.util.LogHelper;
 
@@ -75,9 +76,7 @@ protected void setApiRequest(Q apiRequest) {
 	}
 	
 	protected void setClientId() {
-		String clientId = "sdk-java-" + getVersion();
-		
-		this.apiRequest.setClientId(clientId);
+		this.apiRequest.setClientId(getClientId());
 	}
 
 	public S getApiResponse() {
@@ -253,26 +252,7 @@ private void validateAndSetMerchantAuthentication() {
 		}
 	}
 	
-	public synchronized String getVersion() {
-	    String version = null;
-
-	    // try to load from maven properties first
-	    try {
-	        Properties p = new Properties();
-	        InputStream is = getClass().getResourceAsStream("/META-INF/maven/net.authorize/anet-java-sdk/pom.properties");
-	        if (is != null) {
-	            p.load(is);
-	            version = p.getProperty("version", "");
-	        }
-	    } catch (Exception e) {
-	        // ignore
-	    }
-
-	    if (version == null) {
-	        // we could not compute the version so use a blank
-	        version = "";
-	    }
-
-	    return version;
+	public synchronized String getClientId() {
+		return Constants.CLIENT_ID;
 	} 
 }
diff --git a/src/main/java/net/authorize/util/Constants.java b/src/main/java/net/authorize/util/Constants.java
@@ -32,4 +32,6 @@ public final class Constants {
 	
 	public static final String HTTP_READ_TIME_OUT = "http.ReadTimeout";
 	public static final int HTTP_READ_TIME_OUT_DEFAULT_VALUE = 30000;
+	
+	public static final String CLIENT_ID = "sdk-java-1.9.0";
 }

Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,6 @@ public final class Constants {`
`32`	`32`
`33`	`33`	`public static final String HTTP_READ_TIME_OUT = "http.ReadTimeout";`
`34`	`34`	`public static final int HTTP_READ_TIME_OUT_DEFAULT_VALUE = 30000;`
	`35`	`+`
	`36`	`+ public static final String CLIENT_ID = "sdk-java-1.9.0";`
`35`	`37`	`}`