[jboss-svn-commits] JBL Code SVN: r19752 - in labs/jbossrules/trunk/drools-repository/src: test/java/org/drools/repository/remoteapi and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: michael.neale at jboss.com
Date: 2008-04-29 03:50:49 -0400 (Tue, 29 Apr 2008)
New Revision: 19752

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/remoteapi/RestAPI.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/remoteapi/RestAPITest.java
Log:
JBRULES-1562 remote REST api

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/remoteapi/RestAPI.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/remoteapi/RestAPI.java	2008-04-29 06:03:36 UTC (rev 19751)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/remoteapi/RestAPI.java	2008-04-29 07:50:49 UTC (rev 19752)
@@ -30,6 +30,12 @@
 		this.repo = repo;
 	}
 
+	/**
+	 * This works off:
+	 * packages/<packageName> --> returns list of : <asset name>=<ISO date time last modified>,<versionNumber>
+	 * packages/<packageName>/.package --> the contents of the package header
+	 * packages/<packageName>/<assetName> --> the contents of the package
+	 */
 	public Response get(String path) throws UnsupportedEncodingException {
 		String[] bits = split(path);
 		if (bits[0].equals("packages")) {
@@ -89,11 +95,11 @@
 		PackageItem pkg = repo.loadPackage(URLDecoder.decode(pkgName, "UTF-8"));
 		StringBuilder sb = new StringBuilder();
 		Iterator<AssetItem> it = pkg.getAssets();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+		SimpleDateFormat sdf = getISODateFormat();
 
 		while (it.hasNext()) {
 			AssetItem a = it.next();
-			sb.append(a.getName() + "." + a.getFormat() + "=" + sdf.format(a.getLastModified().getTime()));
+			sb.append(a.getName() + "." + a.getFormat() + "=" + sdf.format(a.getLastModified().getTime()) + "," + a.getVersionNumber());
 			sb.append('\n');
 		}
 
@@ -103,6 +109,10 @@
 		return r;
 	}
 
+	public static SimpleDateFormat getISODateFormat() {
+		return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+	}
+
 	/** post is for new content.
 	 * @throws IOException
 	 * @throws RulesRepositoryException */

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/remoteapi/RestAPITest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/remoteapi/RestAPITest.java	2008-04-29 06:03:36 UTC (rev 19751)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/remoteapi/RestAPITest.java	2008-04-29 07:50:49 UTC (rev 19752)
@@ -85,13 +85,17 @@
 		assertTrue(p.containsKey("asset3.xls"));
 
 		assertNotNull(p.getProperty("asset1.drl"));
-		String dt = p.getProperty("asset1.drl");
-		System.err.println(dt);
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-		Date d= sdf.parse(dt);
+		String prop = p.getProperty("asset1.drl");
+		System.err.println(prop);
+		String[] dt = prop.split(",");
+
+
+		SimpleDateFormat sdf = RestAPI.getISODateFormat();
+		Date d= sdf.parse(dt[0]);
 		assertNotNull(d);
 
-		assertEquals(sdf.format(asset1.getLastModified().getTime()), dt);
+		assertEquals(sdf.format(asset1.getLastModified().getTime()), dt[0]);
+		assertEquals(asset1.getVersionNumber(), Long.parseLong(dt[1]));
 
 
 		//try text