Merge branch 'development'

Author: Jarkko Laitinen

fi/cosky/RouteEventUpdateRequest.java

@@ -0,0 +1,55 @@
+package fi.cosky.sdk;
+
+import java.util.Date;
+
+public class RouteEventUpdateRequest extends BaseData {
+	private int clientId;
+	private int userId;
+	private int problemId;
+	private int vehicleId;
+	private int eventSequenceNumber;
+	private Date actualArrivalTime;
+	private String state;
+	public int getClientId() {
+		return clientId;
+	}
+	public void setClientId(int clientId) {
+		this.clientId = clientId;
+	}
+	public int getUserId() {
+		return userId;
+	}
+	public void setUserId(int userId) {
+		this.userId = userId;
+	}
+	public int getProblemId() {
+		return problemId;
+	}
+	public void setProblemId(int problemId) {
+		this.problemId = problemId;
+	}
+	public int getVehicleId() {
+		return vehicleId;
+	}
+	public void setVehicleId(int vehicleId) {
+		this.vehicleId = vehicleId;
+	}
+	public int getEventSequenceNumber() {
+		return eventSequenceNumber;
+	}
+	public void setEventSequenceNumber(int eventSequenceNumber) {
+		this.eventSequenceNumber = eventSequenceNumber;
+	}
+	public Date getActualArrivalTime() {
+		return actualArrivalTime;
+	}
+	public void setActualArrivalTime(Date actualArrivalTime) {
+		this.actualArrivalTime = actualArrivalTime;
+	}
+	public String getState() {
+		return state;
+	}
+	public void setState(String state) {
+		this.state = state;
+	}
+}

fi/cosky/sdk/API.java

@@ -48,6 +48,11 @@ public API(String baseUrl) {
 		this.retry  = true;
 	}
 
+	private boolean authenticate() {
+		return authenticate(this.ClientKey, this.ClientSecret);
+	}
+	
+	
 	public boolean authenticate(String username, String password) {
 		this.ClientKey = username;
 		this.ClientSecret = password;
@@ -97,7 +102,7 @@ public <T extends BaseData> T navigate(Class<T> tClass, Link l,	HashMap<String,
 
 		if (l.getRel().equals("authenticate")) {
 			HashMap<String, String> headers = new HashMap<String, String>();
-			String authorization = "Basic " + Base64.encodeBase64String((ClientKey + ":" + ClientSecret).getBytes());
+			String authorization = "Basic " + Base64.encodeBase64String((this.ClientKey + ":" + this.ClientSecret).getBytes());
 			headers.put("authorization", authorization);
 			result = sendRequestWithAddedHeaders(Verb.POST,	this.baseUrl + l.getUri(), tClass, null, headers);
 			return (T) result;
@@ -226,7 +231,7 @@ private <T extends BaseData> T sendRequest(Verb verb, String url, Class<T> tClas
 					osw.close();
 				}
 			}
-			else if (verb == verb.POST && object == null) {
+			else if (verb == Verb.POST && object == null) {
 				connection.addRequestProperty("Content-Length",	"0");
 				OutputStreamWriter osw = new OutputStreamWriter(connection.getOutputStream());
 				osw.write("");
@@ -247,8 +252,9 @@ else if (verb == verb.POST && object == null) {
 			if (connection.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED) {
 				System.out.println("Authentication expired " + connection.getResponseMessage());
 				if (retry && this.tokenData != null) {
+					this.tokenData = null;
 					retry = false;
-					if( authenticate(this.ClientKey, this.ClientSecret) ) {
+					if( authenticate() ) {
 						System.out.println("Authenticated again");
 						return sendRequest(verb, url, tClass, object);
 					}
@@ -297,7 +303,6 @@ else if (connection.getResponseCode() >= HttpURLConnection.HTTP_INTERNAL_ERROR )
 			String abba = null;
 			if ((abba = connection.getHeaderField("ETag")) != null) {
 				sb.insert(sb.lastIndexOf("}"), ",\"VersionNumber\":" + abba	+ "");
-
 			}
 
 			result = sb.toString();
@@ -361,7 +366,8 @@ private <T extends BaseData> T sendRequestWithAddedHeaders(Verb verb, String url
 				System.out.println("Authentication expired: " + connection.getResponseMessage());
 				if ( retry && this.tokenData != null ) {
 					retry = false;
-					if( authenticate(this.ClientKey, this.ClientSecret) ) {
+					this.tokenData = null;
+					if( authenticate() ) {
 						System.out.println("Authenticated again");
 						return sendRequestWithAddedHeaders(verb, url, tClass, object, headers);
 					}

fi/cosky/sdk/TaskData.java

@@ -14,6 +14,7 @@ public class TaskData extends BaseData {
     private int Id;
     private int VersionNumber;
     private List<String> IncompatibleVehicleTypes;
+    private List<String> CompatibleVehicleTypes;
     private double Profit;
 
     public String getInfo() {
@@ -67,7 +68,15 @@ public List<String> getIncompatibleVehicleTypes() {
 	public void setIncompatibleVehicleTypes(List<String> incompatibleVehicleTypes) {
 		IncompatibleVehicleTypes = incompatibleVehicleTypes;
 	}
+	
+	public List<String> getCompatibleVehicleTypes() {
+		return CompatibleVehicleTypes;
+	}
 
+	public void setCompatibleVehicleTypes(List<String> compatibleVehicleTypes) {
+		CompatibleVehicleTypes = compatibleVehicleTypes;
+	}
+	
 	public double getProfit() {
 		return Profit;
 	}

fi/cosky/sdk/TaskUpdateRequest.java

@@ -15,6 +15,7 @@ public class TaskUpdateRequest extends BaseData {
     private int ClientId;
     private int UserId;
     private List<String> IncompatibleVehicleTypes;
+    private List<String> CompatibleVehicleTypes;
     private double Profit;
 
     public String getInfo() {
@@ -73,6 +74,14 @@ public void setIncompatibleVehicleTypes(List<String> incompatibleVehicleTypes) {
 		IncompatibleVehicleTypes = incompatibleVehicleTypes;
 	}
 
+	public List<String> getCompatibleVehicleTypes() {
+		return CompatibleVehicleTypes;
+	}
+
+	public void setCompatibleVehicleTypes(List<String> compatibleVehicleTypes) {
+		CompatibleVehicleTypes = compatibleVehicleTypes;
+	}
+
 	public List<TaskEventUpdateRequest> getTaskEvents() {
         return TaskEvents;
     }