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

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

Author: michael.neale at jboss.com
Date: 2008-04-29 20:46:14 -0400 (Tue, 29 Apr 2008)
New Revision: 19770

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
Log:
JBRULES-1562 can use getContent for binary stored files

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java	2008-04-29 23:02:58 UTC (rev 19769)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java	2008-04-30 00:46:14 UTC (rev 19770)
@@ -1,5 +1,6 @@
 package org.drools.repository;
 
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Calendar;
 import java.util.Iterator;
@@ -78,6 +79,9 @@
      */
     public String getContent() throws RulesRepositoryException {
         try {
+        	if (isBinary()) {
+        		return new String(this.getBinaryContentAsBytes());
+        	}
             Node ruleNode = getVersionContentNode();
             if ( ruleNode.hasProperty( CONTENT_PROPERTY_NAME ) ) {
                 Property data = ruleNode.getProperty( CONTENT_PROPERTY_NAME );
@@ -261,6 +265,9 @@
     public AssetItem updateContent(String newRuleContent) throws RulesRepositoryException {
         checkout();
         try {
+        	if (this.isBinary()) {
+        		this.updateBinaryContentAttachment(new ByteArrayInputStream(newRuleContent.getBytes()));
+        	}
             this.node.setProperty( CONTENT_PROPERTY_NAME,
                                    newRuleContent );
             return this;

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java	2008-04-29 23:02:58 UTC (rev 19769)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java	2008-04-30 00:46:14 UTC (rev 19770)
@@ -731,6 +731,8 @@
         item.updateBinaryContentAttachmentFileName( "x.x" );
         in.close();
 
+        assertEquals(data, item.getContent());
+
         assertFalse(item.getNode().hasProperty( AssetItem.CONTENT_PROPERTY_NAME ));
         assertTrue(item.getNode().hasProperty( AssetItem.CONTENT_PROPERTY_BINARY_NAME ));
         item.checkin( "lalalala" );
@@ -748,6 +750,13 @@
         assertEquals("x.x", item.getBinaryContentAttachmentFileName());
         assertTrue(item.isBinary());
 
+
+        item.updateContent("qed");
+        item.checkin("");
+        item = getRepo().loadAssetByUUID(item.getUUID());
+        assertEquals("qed", item.getContent());
+
+
     }
 
 }