More Txn renaming

pveentjer · Apr 6, 2012 · 672a21d · 672a21d
1 parent a9859b1
commit 672a21d
Show file tree

Hide file tree

Showing 80 changed files with 190 additions and 189 deletions.
diff --git a/multiverse-core/src/main/java/org/multiverse/api/Txn.java b/multiverse-core/src/main/java/org/multiverse/api/Txn.java
@@ -54,7 +54,7 @@ public interface Txn {
      *
      * @return the TxnConfig.
      */
-    TxnConfig getConfiguration();
+    TxnConfig getConfig();
 
     /**
      * Returns the status of this Txn.

diff --git a/multiverse-core/src/main/java/org/multiverse/api/TxnFactory.java b/multiverse-core/src/main/java/org/multiverse/api/TxnFactory.java
@@ -20,7 +20,7 @@ public interface TxnFactory {
      *
      * @return the TxnConfig.
      */
-    TxnConfig getConfiguration();
+    TxnConfig getConfig();
 
     TxnFactoryBuilder getTransactionFactoryBuilder();
 

diff --git a/multiverse-core/src/main/java/org/multiverse/api/TxnFactoryBuilder.java b/multiverse-core/src/main/java/org/multiverse/api/TxnFactoryBuilder.java
@@ -24,7 +24,7 @@ public interface TxnFactoryBuilder {
      *
      * @return the used TxnConfig.
      */
-    TxnConfig getConfiguration();
+    TxnConfig getConfig();
 
     /**
      * Sets if the {@link org.multiverse.api.exceptions.ControlFlowError} is reused. Normally you don't want to reuse them

diff --git a/multiverse-core/src/main/java/org/multiverse/commitbarriers/CommitBarrier.java b/multiverse-core/src/main/java/org/multiverse/commitbarriers/CommitBarrier.java
@@ -475,7 +475,7 @@ protected final void finish(final Txn tx) {
             tx.abort();
             throw new IllegalStateException(
                     format("[%s] Didn't expect to encounter an aborted CommitBarrier",
-                            tx.getConfiguration().getFamilyName()));
+                            tx.getConfig().getFamilyName()));
         }
     }
 
@@ -498,7 +498,7 @@ protected static void ensureNotDead(final Txn tx, final String operation) {
         if (!tx.getStatus().isAlive()) {
             throw new DeadTxnException(
                     format("[%s] Txn can't be used for %s since it isn't alive",
-                            tx.getConfiguration().getFamilyName(), operation)
+                            tx.getConfig().getFamilyName(), operation)
             );
         }
     }
@@ -547,11 +547,11 @@ public void joinCommit(final Txn tx) throws InterruptedException {
                     break;
                 case Committed:
                     String committedMsg = format("Can't await commit on already committed VetoCommitBarrier " +
-                            "with transaction %s", tx.getConfiguration().getFamilyName());
+                            "with transaction %s", tx.getConfig().getFamilyName());
                     throw new CommitBarrierOpenException(committedMsg);
                 case Aborted:
                     String abortMsg = format("Can't await commit on already aborted VetoCommitBarrier " +
-                            "with transaction %s", tx.getConfiguration().getFamilyName());
+                            "with transaction %s", tx.getConfig().getFamilyName());
                     throw new CommitBarrierOpenException(abortMsg);
                 default:
                     throw new IllegalStateException();
@@ -602,13 +602,13 @@ public void joinCommitUninterruptibly(final Txn tx) {
                     tx.abort();
 
                     String abortedMsg = format("Can't call joinCommitUninterruptible on already aborted " +
-                            "CountDownCommitBarrier with transaction %s ", tx.getConfiguration().getFamilyName());
+                            "CountDownCommitBarrier with transaction %s ", tx.getConfig().getFamilyName());
                     throw new CommitBarrierOpenException(abortedMsg);
                 case Committed:
                     tx.abort();
 
                     String commitMsg = format("Can't call joinCommitUninterruptible on already committed " +
-                            "CountDownCommitBarrier with transaction %s ", tx.getConfiguration().getFamilyName());
+                            "CountDownCommitBarrier with transaction %s ", tx.getConfig().getFamilyName());
                     throw new CommitBarrierOpenException(commitMsg);
                 default:
                     throw new IllegalStateException();
@@ -653,11 +653,11 @@ public boolean tryJoinCommit(final Txn tx) {
                     break;
                 case Aborted:
                     String abortMsg = format("[%s] Can't call tryJoinCommit on already aborted " +
-                            "CountDownCommitBarrier", tx.getConfiguration().getFamilyName());
+                            "CountDownCommitBarrier", tx.getConfig().getFamilyName());
                     throw new CommitBarrierOpenException(abortMsg);
                 case Committed:
                     String commitMsg = format("[%s] Can't call tryJoinCommit on already committed " +
-                            "CountDownCommitBarrier", tx.getConfiguration().getFamilyName());
+                            "CountDownCommitBarrier", tx.getConfig().getFamilyName());
                     throw new CommitBarrierOpenException(commitMsg);
                 default:
                     throw new IllegalStateException();

diff --git a/multiverse-core/src/main/java/org/multiverse/commitbarriers/CountDownCommitBarrier.java b/multiverse-core/src/main/java/org/multiverse/commitbarriers/CountDownCommitBarrier.java
@@ -196,11 +196,11 @@ public void incParties(Txn tx, int extra) {
                 tx.abort();
                 throw new PreparedTxnException(
                         format("[%s] Can't call incParties on non active transaction because it is %s",
-                                tx.getConfiguration().getFamilyName(), tx.getStatus()));
+                                tx.getConfig().getFamilyName(), tx.getStatus()));
             } else {
                 throw new DeadTxnException(
                         format("[%s] Can't call incParties on non active transaction because it is %s",
-                                tx.getConfiguration().getFamilyName(), tx.getStatus()));
+                                tx.getConfig().getFamilyName(), tx.getStatus()));
             }
 
         }
@@ -222,11 +222,11 @@ public void incParties(Txn tx, int extra) {
                     break;
                 case Aborted:
                     String abortMsg = format("[%s] Can't call incParties on already aborted CountDownCommitBarrier",
-                            tx.getConfiguration().getFamilyName());
+                            tx.getConfig().getFamilyName());
                     throw new CommitBarrierOpenException(abortMsg);
                 case Committed:
                     String commitMsg = format("[%s] Can't call incParties on already committed CountDownCommitBarrier",
-                            tx.getConfiguration().getFamilyName());
+                            tx.getConfig().getFamilyName());
                     throw new CommitBarrierOpenException(commitMsg);
                 default:
                     throw new IllegalStateException();

diff --git a/multiverse-core/src/main/java/org/multiverse/commitbarriers/VetoCommitBarrier.java b/multiverse-core/src/main/java/org/multiverse/commitbarriers/VetoCommitBarrier.java
@@ -109,12 +109,12 @@ public void vetoCommit(Txn tx) {
                 case Aborted:
                     String abortMsg = format(
                             "[%s] Can't veto commit on already aborted VetoCommitBarrier",
-                            tx.getConfiguration().getFamilyName());
+                            tx.getConfig().getFamilyName());
                     throw new CommitBarrierOpenException(abortMsg);
                 case Committed:
                     String commitMsg = format(
                             "[%s] Can't veto commit on already committed VetoCommitBarrier",
-                            tx.getConfiguration().getFamilyName());
+                            tx.getConfig().getFamilyName());
                     throw new CommitBarrierOpenException(commitMsg);
                 default:
                     throw new IllegalStateException();

diff --git a/multiverse-core/src/main/java/org/multiverse/stms/gamma/AbstractGammaTxnExecutor.java b/multiverse-core/src/main/java/org/multiverse/stms/gamma/AbstractGammaTxnExecutor.java
@@ -19,7 +19,7 @@ public AbstractGammaTxnExecutor(final GammaTxnFactory txnFactory) {
             throw new NullPointerException();
         }
         this.txnFactory = txnFactory;
-        this.txnConfig = txnFactory.getConfiguration();
+        this.txnConfig = txnFactory.getConfig();
         this.backoffPolicy = txnConfig.backoffPolicy;
     }
 }