Give up using a type parameter for transaction operations, again

2 files changed, 9 insertions, 9 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/transaction/AbstractTransaction.java b/vespajlib/src/main/java/com/yahoo/transaction/AbstractTransaction.java
index 09f286caa90..cff02f4da53 100644
--- a/vespajlib/src/main/java/com/yahoo/transaction/AbstractTransaction.java
+++ b/vespajlib/src/main/java/com/yahoo/transaction/AbstractTransaction.java
@@ -12,27 +12,27 @@ import java.util.logging.Logger;
  * 
  * @author bratseth
  */
-public abstract class AbstractTransaction<OPERATION extends Transaction.Operation> implements Transaction<OPERATION> {
+public abstract class AbstractTransaction implements Transaction {
 
     private static final Logger log = Logger.getLogger(AbstractTransaction.class.getName());
-    private final List<OPERATION> operations = new ArrayList<>();
+    private final List<Operation> operations = new ArrayList<>();
 
     protected AbstractTransaction() { }
 
     @Override
-    public Transaction add(OPERATION operation) {
+    public Transaction add(Operation operation) {
         this.operations.add(operation);
         return this;
     }
 
     @Override
-    public Transaction add(List<OPERATION> operations) {
+    public Transaction add(List<Operation> operations) {
         this.operations.addAll(operations);
         return this;
     }
 
     @Override
-    public List<OPERATION> operations() { return operations; }
+    public List<Operation> operations() { return operations; }
 
     /** Default implementations which logs a severe message. Operations should implement toString to use this. */
     @Override
diff --git a/vespajlib/src/main/java/com/yahoo/transaction/Transaction.java b/vespajlib/src/main/java/com/yahoo/transaction/Transaction.java
index 13373671096..bde458cb150 100644
--- a/vespajlib/src/main/java/com/yahoo/transaction/Transaction.java
+++ b/vespajlib/src/main/java/com/yahoo/transaction/Transaction.java
@@ -13,7 +13,7 @@ import java.util.List;
  * @author lulf
  * @author bratseth
  */
-public interface Transaction<OPERATION extends Transaction.Operation> extends AutoCloseable {
+public interface Transaction extends AutoCloseable {
 
     /**
      * Adds an operation to this transaction. Return self for chaining.
@@ -21,7 +21,7 @@ public interface Transaction<OPERATION extends Transaction.Operation> extends Au
      * @param operation {@link Operation} to append
      * @return self, for chaining
      */
-    Transaction add(OPERATION operation);
+    Transaction add(Operation operation);
 
     /**
      * Adds multiple operations to this transaction. Return self for chaining.
@@ -29,13 +29,13 @@ public interface Transaction<OPERATION extends Transaction.Operation> extends Au
      * @param operation {@link Operation} to append
      * @return self, for chaining
      */
-    Transaction add(List<OPERATION> operation);
+    Transaction add(List<Operation> operation);
 
     /**
      * Returns the operations of this.
      * Ownership of the returned list is transferred to the caller. The ist may be ready only.
      */
-    List<OPERATION> operations();
+    List<Operation> operations();
 
     /**
      * Checks whether or not the transaction is able to commit in its current state and do any transient preparatory