[jboss-svn-commits] JBL Code SVN: r20868 - 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-07-02 03:37:07 -0400 (Wed, 02 Jul 2008)
New Revision: 20868

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:
doesn't list zero version now (as it was not relevant)

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-07-02 07:36:52 UTC (rev 20867)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/remoteapi/RestAPI.java	2008-07-02 07:37:07 UTC (rev 20868)
@@ -100,25 +100,28 @@
 					AssetHistoryIterator it =  asset.getHistory();
 					StringBuilder buf = new StringBuilder();
 					while(it.hasNext()) {
+
 						AssetItem h = it.next();
-						String checkinComment = h.getCheckinComment();
-						//String lastMo ... hmm what is needed?
-						String lastMofiedBy = h.getLastContributor();
-						if (lastMofiedBy == null || lastMofiedBy.equals("")) {
-							lastMofiedBy = asset.getCreator();
+						if (h.getVersionNumber() != 0) {
+							String checkinComment = h.getCheckinComment();
+							//String lastMo ... hmm what is needed?
+							String lastMofiedBy = h.getLastContributor();
+							if (lastMofiedBy == null || lastMofiedBy.equals("")) {
+								lastMofiedBy = asset.getCreator();
+							}
+							SimpleDateFormat sdf = getISODateFormat();
+							Calendar lastModDate = h.getLastModified();
+							if (lastModDate == null ) {
+								lastModDate = asset.getCreatedDate();
+							}
+							String lastModifiedOn = sdf.format(lastModDate.getTime());
+							buf.append(h.getVersionNumber());
+							buf.append("=");
+							buf.append(lastModifiedOn + "," + lastMofiedBy + "," + checkinComment);
+							if (it.hasNext()) {
+								buf.append('\n');
+							}
 						}
-						SimpleDateFormat sdf = getISODateFormat();
-						Calendar lastModDate = h.getLastModified();
-						if (lastModDate == null ) {
-							lastModDate = asset.getCreatedDate();
-						}
-						String lastModifiedOn = sdf.format(lastModDate.getTime());
-						buf.append(h.getVersionNumber());
-						buf.append("=");
-						buf.append(lastModifiedOn + "," + lastMofiedBy + "," + checkinComment);
-						if (it.hasNext()) {
-							buf.append('\n');
-						}
 
 					}
 					Text r = new Text();

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-07-02 07:36:52 UTC (rev 20867)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/remoteapi/RestAPITest.java	2008-07-02 07:37:07 UTC (rev 20868)
@@ -160,6 +160,9 @@
 		System.err.println(d);
 		assertTrue(d.indexOf(",alan_parsons,This is something") > 0);
 		assertTrue(d.indexOf(",alan_parsons,This is another") > 0);
+		assertTrue(d.indexOf("1=") > -1);
+		assertTrue(d.indexOf("2=") > -1);
+		assertEquals(-1, d.indexOf("0="));
 
 		res = api.get("packages/testRestGetVersionHistory/asset1.drl?version=1");
 		out = new ByteArrayOutputStream();