Ready for merge

Author: jlaitinen

UsingCoSkyAPIv2.java

@@ -18,7 +18,7 @@ public class UsingCoSkyAPIv2 {
     @SuppressWarnings("deprecation")
 	public static void main (String[] args) {
         API api = new API("");
-        boolean success = api.authenticate("user", "pass");
+        boolean success = api.authenticate("", "");
 
 
         if (success) {

fi/cosky/sdk/API.java

@@ -152,7 +152,7 @@ private <T extends BaseData> T sendRequest(Verb verb, String url, Class<T> tClas
 			}
 			connection.setRequestProperty("Content-Type", "application/json");
 			connection.setRequestProperty("Accept", "application/json");
-
+			/*
 			if (verb == Verb.GET) {
 				Field f = null;
 				Object fromCache = null;
@@ -172,28 +172,31 @@ private <T extends BaseData> T sendRequest(Verb verb, String url, Class<T> tClas
 				}
 				
 			}
-
+			*/
 			Field f = null;
 			if (object != null) {
-				try {
-					f = object.getClass().getDeclaredField("VersionNumber");
-				} catch (NoSuchFieldException e) {
+				Object fromCache = null;
+				if (objectCache.containsUri(url))  {
+					try {
+						fromCache = objectCache.getObject(url);
+						f = fromCache.getClass().getDeclaredField("VersionNumber");
+					} catch (NoSuchFieldException e) {
 					// Object does not have versionnumber.
+					}
+					if (f != null) {
+						f.setAccessible(true);
+						int versionNumber = f.getInt(fromCache);
+						connection.setRequestProperty("If-None-Match", versionNumber + "");
+					}
 				}
-				if (f != null) {
-					f.setAccessible(true);
-					int versionNumber = f.getInt(object);
-					connection.setRequestProperty("If-None-Match", versionNumber + "");
-
-				}
-
 				if ((verb == Verb.POST || verb == Verb.PUT)) {
 					String json = gson.toJson(object);
 					connection.addRequestProperty("Content-Length",	json.getBytes("UTF-8").length + "");
 					OutputStreamWriter osw = new OutputStreamWriter(connection.getOutputStream());
 					osw.write(json);
 					osw.flush();
 					osw.close();
+					System.out.println(json);
 				}
 			}
 

fi/cosky/sdk/ObjectCache.java

@@ -1,5 +1,10 @@
 package fi.cosky.sdk;
 
+/*
+ * This file is subject to the terms and conditions defined in
+ * file 'LICENSE.txt', which is part of this source code package.
+ */
+
 import java.util.HashMap;
 
 public class ObjectCache {

fi/cosky/sdk/RouteData.java

@@ -7,6 +7,7 @@
 
 public class RouteData extends BaseData {
     private int[] Items;
+    private int VersionNumber;
 
     public int[] getItems() {
         return Items;
@@ -15,4 +16,12 @@ public int[] getItems() {
     public void setItems(int[] items) {
         Items = items;
     }
+
+	int getVersionNumber() {
+		return VersionNumber;
+	}
+
+	void setVersionNumber(int versionNumber) {
+		VersionNumber = versionNumber;
+	}
 }

fi/cosky/sdk/RouteUpdateRequest.java

@@ -10,7 +10,8 @@ public class RouteUpdateRequest extends BaseData {
 	private int UserId;
 	private int ProblemId;
 	private int VehicleId;
-	private int[] Sequence;
+	private int[] Items;
+	private int VersionNumber;
 
 	public int getClientId() {
 		return ClientId;
@@ -37,10 +38,22 @@ public void setVehicleId(int vehicleId) {
 		VehicleId = vehicleId;
 	}
 	public int[] getSequence() {
-		return Sequence;
+		return Items;
 	}
 	public void setSequence(int[] sequence) {
-		Sequence = sequence;
+		Items = sequence;
+	}
+	public int[] getItems() {
+		return Items;
+	}
+	public void setItems(int[] items) {
+		Items = items;
+	}
+	int getVersionNumber() {
+		return VersionNumber;
+	}
+	void setVersionNumber(int versionNumber) {
+		VersionNumber = versionNumber;
 	}
 
 }

fi/cosky/sdk/tests/SdkTests.java

@@ -1,5 +1,10 @@
 package fi.cosky.sdk.tests;
 
+/*
+ * This file is subject to the terms and conditions defined in
+ * file 'LICENSE.txt', which is part of this source code package.
+ */
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -154,7 +159,7 @@ public void T08AccessingTaskSeqTest() {
 		UserData user = TestHelper.getOrCreateUser(api);
 		RoutingProblemData problem = TestHelper.createProblemWithDemoData(api, user);
 				VehicleData vehicle = TestHelper.getVehicle(api, user, problem);
-		
+				RouteData routes = api.navigate(RouteData.class, vehicle.getLink("get-route"));
 		RouteUpdateRequest route = new RouteUpdateRequest();
 		int[] sd = {11,12};
 		route.setClientId(user.getClientId());
@@ -178,7 +183,7 @@ public void T09AccessingRouteTest() {
 		UserData user = TestHelper.getOrCreateUser(api);
 		RoutingProblemData problem = TestHelper.createProblemWithDemoData(api, user);
 		VehicleData vehicle = TestHelper.getVehicle(api, user, problem);
-		
+		RouteData routes = api.navigate(RouteData.class, vehicle.getLink("get-route"));
 		RouteUpdateRequest route = new RouteUpdateRequest();
 		int[] sequence = {11,12};
 		route.setClientId(user.getClientId());
@@ -204,13 +209,15 @@ public void T10UpdatingRouteTest() {
 		VehicleData vehicle = TestHelper.getVehicle(api, user, problem);
 
 		//##BEGIN EXAMPLE updatingroute##
+		RouteData routes = api.navigate(RouteData.class, vehicle.getLink("get-route"));
 		RouteUpdateRequest route = new RouteUpdateRequest();
 		int[] sequence = {11 , 12, 21, 22};		
 		route.setSequence(sequence);
 		ResponseData asdf = api.navigate(ResponseData.class, vehicle.getLink("set-route"), route);
 		//##END EXAMPLE##
 
 		RouteData routeData = api.navigate(RouteData.class, vehicle.getLink("get-route"));
+		System.out.println(routeData);
 		assertArrayEquals(routeData.getItems(), sequence);
 	}
 
@@ -226,7 +233,7 @@ public void T11StartingOptimizationTest() {
 		update.setState("Running");
 		ResponseData result = api.navigate(ResponseData.class, problem.getLink("toggle-optimization"), update);
 		//##END EXAMPLE##
-		
+		System.out.println(result);
 		assertNotNull(result);;
 	}
 

fi/cosky/sdk/tests/TestData.java

@@ -4,6 +4,10 @@
 import java.util.Date;
 
 import fi.cosky.sdk.*;
+/*
+ * This file is subject to the terms and conditions defined in
+ * file 'LICENSE.txt', which is part of this source code package.
+ */
 
 public class TestData {
 

fi/cosky/sdk/tests/TestHelper.java

@@ -1,4 +1,10 @@
 package fi.cosky.sdk.tests;
+
+/*
+ * This file is subject to the terms and conditions defined in
+ * file 'LICENSE.txt', which is part of this source code package.
+ */
+
 import java.util.ArrayList;
 import java.util.List;