Merge branch 'development'

Author: Jarkko Laitinen

fi/cosky/sdk/API.java

@@ -51,10 +51,12 @@ public API(String baseUrl) {
 	public boolean authenticate(String username, String password) {
 		this.ClientKey = username;
 		this.ClientSecret = password;
+		System.out.println("Authenticating API with username: " +username + " and pass: " + password);
 		try {
 			ResponseData result = navigate(ResponseData.class, getAuthLink());
 
 			if (result == null || result.getItems() != null) {
+				System.out.println("Could not authenticate, please check credentials");
 				return false;
 			}
 
@@ -243,10 +245,10 @@ else if (verb == verb.POST && object == null) {
 			}
 
 			if (connection.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED) {
-				System.out.println("Authentication expired");
-				if (retry) {
+				System.out.println("Authentication expired " + connection.getResponseMessage());
+				if (retry && this.tokenData != null) {
 					retry = false;
-					if( this.authenticate(ClientKey, ClientSecret) ) {
+					if( authenticate(this.ClientKey, this.ClientSecret) ) {
 						System.out.println("Authenticated again");
 						return sendRequest(verb, url, tClass, object);
 					}
@@ -259,7 +261,8 @@ else if (verb == verb.POST && object == null) {
 			}
 
 			if (connection.getResponseCode() >= HttpURLConnection.HTTP_BAD_REQUEST && connection.getResponseCode() < HttpURLConnection.HTTP_INTERNAL_ERROR) {
-				System.out.println("code: " + connection.getResponseCode() + " " + connection.getResponseMessage() + " " + url);
+				System.out.println("ErrorCode: " + connection.getResponseCode() + " " + connection.getResponseMessage() +
+									" " + url + ", verb: " + verb);
 				InputStream stream = connection.getErrorStream();
 				br = new BufferedReader(new InputStreamReader(stream));
 				StringBuilder sb = new StringBuilder();
@@ -355,19 +358,21 @@ private <T extends BaseData> T sendRequestWithAddedHeaders(Verb verb, String url
 			}
 
 			if (connection.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED) {
-				System.out.println("Authentication expired");
-				if (retry) {
+				System.out.println("Authentication expired: " + connection.getResponseMessage());
+				if ( retry && this.tokenData != null ) {
 					retry = false;
-					if( this.authenticate(ClientKey, ClientSecret) ) {
+					if( authenticate(this.ClientKey, this.ClientSecret) ) {
 						System.out.println("Authenticated again");
 						return sendRequestWithAddedHeaders(verb, url, tClass, object, headers);
 					}
+					System.out.println("Could not authenticate");
 				}
 				else throw new IOException("Could not authenticate");	
 			}
 
 			if (connection.getResponseCode() >= HttpURLConnection.HTTP_BAD_REQUEST && connection.getResponseCode() < HttpURLConnection.HTTP_INTERNAL_ERROR) {
-				System.out.println("code: " + connection.getResponseCode() + " " + connection.getResponseMessage() + " " + url);
+				System.out.println("ErrorCode: " + connection.getResponseCode() + " " + connection.getResponseMessage() +
+									" " + url + ", verb: " + verb);
 				InputStream stream = connection.getErrorStream();
 				br = new BufferedReader(new InputStreamReader(stream));
 				StringBuilder sb = new StringBuilder();

fi/cosky/sdk/NFleetRequestException.java

@@ -28,4 +28,13 @@ public void setItems(List<ErrorData> items) {
 		Items = items;
 	}	
 
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		
+		for( ErrorData e : Items) {
+			sb.append(" ErrorCode: "+e.getCode() + " ErrorMessage: " + e.getMessage());
+		}
+		return sb.toString();
+	}
 }

fi/cosky/sdk/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/TaskData.java

@@ -14,6 +14,7 @@ public class TaskData extends BaseData {
     private int Id;
     private int VersionNumber;
     private List<String> IncompatibleVehicleTypes;
+    private double Profit;
 
     public String getInfo() {
         return Info;
@@ -67,6 +68,14 @@ public void setIncompatibleVehicleTypes(List<String> incompatibleVehicleTypes) {
 		IncompatibleVehicleTypes = incompatibleVehicleTypes;
 	}
 
+	public double getProfit() {
+		return Profit;
+	}
+
+	public void setProfit(double profit) {
+		Profit = profit;
+	}
+
 	public TaskUpdateRequest toRequest() {
 		List<TaskEventUpdateRequest> taskevents = new ArrayList<TaskEventUpdateRequest>();
 

fi/cosky/sdk/TaskEventData.java

@@ -91,6 +91,7 @@ public TaskEventUpdateRequest toRequest() {
 		TaskEventUpdateRequest request = new TaskEventUpdateRequest(Type, Location, Capacities);
 		request.setServiceTime(ServiceTime);
 		request.setTaskEventId(Id);
+		request.setTimeWindows(TimeWindows);
 		return request;
 	}
 }

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 double Profit;
 
     public String getInfo() {
         return Info;
@@ -81,7 +82,15 @@ public void setTaskEvents(List<TaskEventUpdateRequest> taskEvents) {
     }
 
 
-    public TaskUpdateRequest(List<TaskEventUpdateRequest> taskEvents) {
+    public double getProfit() {
+		return Profit;
+	}
+
+	public void setProfit(double profit) {
+		Profit = profit;
+	}
+
+	public TaskUpdateRequest(List<TaskEventUpdateRequest> taskEvents) {
         this.TaskEvents = taskEvents;
     }
 }

fi/cosky/sdk/VehicleData.java

@@ -16,6 +16,10 @@ public class VehicleData extends BaseData {
     private RouteData Route;
     private int VersionNumber;
     private String VehicleType;
+    
+    private double FixedCost;
+    private double KilometerCost;
+    private double HourCost;
 
     public RouteData getRoute() {
         return Route;
@@ -97,6 +101,30 @@ public ArrayList<TimeWindowData> getTimeWindows() {
 		return TimeWindows;
 	}
 
+	public double getFixedCost() {
+		return FixedCost;
+	}
+
+	public void setFixedCost(double fixedCost) {
+		FixedCost = fixedCost;
+	}
+
+	public double getKilometerCost() {
+		return KilometerCost;
+	}
+
+	public void setKilometerCost(double kilometerCost) {
+		KilometerCost = kilometerCost;
+	}
+
+	public double getHourCost() {
+		return HourCost;
+	}
+
+	public void setHourCost(double hourCost) {
+		HourCost = hourCost;
+	}
+
 	public VehicleUpdateRequest toRequest() {
 		VehicleUpdateRequest request = new VehicleUpdateRequest(Name, Capacities, StartLocation, EndLocation);
 		request.setVersionNumber(VersionNumber);

fi/cosky/sdk/VehiclePlanData.java

@@ -0,0 +1,40 @@
+package fi.cosky.sdk;
+
+import java.util.List;
+
+public class VehiclePlanData {
+	private String Name;
+	private String Uri;
+	private List<RouteEventData> Events;
+	private KPIData KPIs;
+		
+	public String getName() {
+		return Name;
+	}
+	public void setName(String name) {
+		Name = name;
+	}
+	public String getUri() {
+		return Uri;
+	}
+	public void setUri(String uri) {
+		Uri = uri;
+	}
+	public KPIData getKPIs() {
+		return KPIs;
+	}
+	public void setKPIs(KPIData kPIs) {
+		KPIs = kPIs;
+	}
+	public List<RouteEventData> getEvents() {
+		return Events;
+	}
+	public void setEvents(List<RouteEventData> events) {
+		Events = events;
+	}
+	
+	@Override
+	public String toString() {
+		return this.Name + " " + this.Uri + " " + Events;
+	}
+}

fi/cosky/sdk/VehicleUpdateRequest.java

@@ -16,6 +16,10 @@ public class VehicleUpdateRequest extends BaseData {
     private RouteData Route;
     private int VersionNumber;
     private String VehicleType;
+    
+    private double FixedCost;
+    private double KilometerCost;
+    private double HourCost;
 
     public RouteData getRoute() {
         return Route;
@@ -109,4 +113,28 @@ public String getVehicleType() {
 	public void setVehicleType(String vehicleType) {
 		VehicleType = vehicleType;
 	}
+
+	public double getFixedCost() {
+		return FixedCost;
+	}
+
+	public void setFixedCost(double fixedCost) {
+		FixedCost = fixedCost;
+	}
+
+	public double getKilometerCost() {
+		return KilometerCost;
+	}
+
+	public void setKilometerCost(double kilometerCost) {
+		KilometerCost = kilometerCost;
+	}
+
+	public double getHourCost() {
+		return HourCost;
+	}
+
+	public void setHourCost(double hourCost) {
+		HourCost = hourCost;
+	}
 }