Merge pull request apache#715 from afs/jena1870-txn-abort-exceptions

JENA-1870: Remove assembler-only TransactionAbortException

jena-core/src/main/java/org/apache/jena/assembler/assemblers/ModelAssembler.java

@@ -18,13 +18,15 @@
 
 package org.apache.jena.assembler.assemblers;
 
-import java.util.*;
+import java.util.List;
 import java.util.function.Function;
 
-import org.apache.jena.assembler.* ;
-import org.apache.jena.assembler.exceptions.* ;
+import org.apache.jena.assembler.Assembler;
+import org.apache.jena.assembler.Content;
+import org.apache.jena.assembler.JA;
+import org.apache.jena.assembler.Mode;
 import org.apache.jena.rdf.model.* ;
-import org.apache.jena.shared.* ;
+import org.apache.jena.shared.PrefixMapping;
 import org.apache.jena.vocabulary.RDF ;
 
 public abstract class ModelAssembler extends AssemblerBase implements Assembler
@@ -41,19 +43,15 @@ protected Model openModel( Assembler a, Resource root, Content initial, Mode mod
     /** Execute an action in a transaction if the model supports transactions.*/
     private static void exec(Model m, Resource root, Runnable action) {
         boolean b = m.supportsTransactions();
+        // No m.executeInTxn because of test MockModel. 
         if ( b ) m.begin();
         try {
             action.run();
             if ( b ) m.commit();
         }
         catch (Throwable t) {
-            // Compatibility ... 
-            if ( b ) {
-                m.abort();
-                throw new TransactionAbortedException(root, t);
-            }
-            else
-                throw t;
+            if ( b ) m.abort();
+            throw t;
         }
     }
 

jena-core/src/test/java/org/apache/jena/assembler/test/TestModelContent.java

@@ -21,7 +21,6 @@
 import java.util.*;
 
 import org.apache.jena.assembler.* ;
-import org.apache.jena.assembler.exceptions.TransactionAbortedException ;
 import org.apache.jena.rdf.model.* ;
 
 public class TestModelContent extends AssemblerTestBase
@@ -94,9 +93,8 @@ public void testContentTransactionsAbort()
             a.open( Assembler.content, root  );
             fail( "should throw (wrapped) failing exception" );
             }
-        catch (TransactionAbortedException  e)
+        catch (Exception  e)
             {
-            assertEquals( resource( "x" ), e.getRoot() );
             assertEquals( listOfStrings( "supports[true] begin add abort" ), history );
             assertIsoModels( expected, toDeliver );
             }