[jboss-svn-commits] JBL Code SVN: r9002 - 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: 2007-01-24 04:41:16 -0500 (Wed, 24 Jan 2007)
New Revision: 9002

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
Log:
api change to use stronger types for restore

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2007-01-24 02:32:44 UTC (rev 9001)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2007-01-24 09:41:16 UTC (rev 9002)
@@ -444,16 +444,23 @@
             }
         }
     }    
-    
-    public void restoreHistoricalAsset(String versionUUID, String assetUUID, String comment) {
-        AssetItem head = loadAssetByUUID( assetUUID );
-        String oldVersionNumber = head.getVersionNumber();
+
+    /**
+     * This will restore the historical version, save, and check it in as a new
+     * version with the given comment.
+     * 
+     * @param versionToRestore
+     * @param headVersion
+     * @param comment
+     */
+    public void restoreHistoricalAsset(AssetItem versionToRestore, AssetItem headVersion, String comment) {
         
-        AssetItem version = loadAssetByUUID( versionUUID );
-        Version v = (Version) version.getNode();
+        String oldVersionNumber = headVersion.getVersionNumber();
+        
+        Version v = (Version) versionToRestore.getNode();
         try {
             this.session.getWorkspace().restore( new Version[] {v}, false );
-            AssetItem newHead = loadAssetByUUID( assetUUID );
+            AssetItem newHead = loadAssetByUUID( headVersion.getUUID() );
             newHead.updateStringProperty( oldVersionNumber, VersionableItem.VERSION_NUMBER_PROPERTY_NAME );
             newHead.checkin( comment );
         } catch ( RepositoryException e ) {

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	2007-01-24 02:32:44 UTC (rev 9001)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java	2007-01-24 09:41:16 UTC (rev 9002)
@@ -424,12 +424,13 @@
             assertEquals("test content", predecessorRuleItem.getContent());
  
             //now try restoring
-            String oldVersionUUID = predecessorRuleItem.getVersionSnapshotUUID();
             String oldVersionNumber = ruleItem1.getVersionNumber();
             
-            getRepo().restoreHistoricalAsset( oldVersionUUID, ruleItem1.getUUID(), "cause I want to"  );
+            AssetItem toRestore = getRepo().loadAssetByUUID( predecessorRuleItem.getVersionSnapshotUUID() );
             
+            getRepo().restoreHistoricalAsset( toRestore, ruleItem1, "cause I want to"  );
             
+            
             AssetItem restored = getRepo().loadDefaultPackage().loadAsset( "testGetPrecedingVersion" );
 
             //assertEquals( predecessorRuleItem.getCheckinComment(), restored.getCheckinComment());