Add VariableDependency.lock()

LiveRampArchive · Jun 11, 2014 · 43811d7 · 43811d7
1 parent 7e4ea2c
commit 43811d7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/...k-core/src/main/java/com/liveramp/megadesk/base/transaction/BaseTransactionExecution.java b/...k-core/src/main/java/com/liveramp/megadesk/base/transaction/BaseTransactionExecution.java
@@ -110,7 +110,7 @@ private static List<Lock> orderedLocks(Dependency dependency) {
     Collections.sort(all);
     List<Lock> result = Lists.newArrayList();
     for (VariableDependency variableDependency : all) {
-      result.add(DependencyType.lock(variableDependency));
+      result.add(variableDependency.lock());
     }
     return result;
   }

diff --git a/...esk-core/src/main/java/com/liveramp/megadesk/base/transaction/BaseVariableDependency.java b/...esk-core/src/main/java/com/liveramp/megadesk/base/transaction/BaseVariableDependency.java
@@ -18,6 +18,7 @@
 
 import org.apache.commons.lang.builder.CompareToBuilder;
 
+import com.liveramp.megadesk.core.state.Lock;
 import com.liveramp.megadesk.core.state.Variable;
 import com.liveramp.megadesk.core.transaction.DependencyType;
 import com.liveramp.megadesk.core.transaction.VariableDependency;
@@ -42,6 +43,18 @@ public DependencyType type() {
     return type;
   }
 
+  @Override
+  public Lock lock() {
+    switch (type) {
+      case READ:
+        return variable.driver().lock().readLock();
+      case WRITE:
+        return variable.driver().lock().writeLock();
+      default:
+        throw new IllegalStateException(); // TODO: message
+    }
+  }
+
   public static <VALUE> BaseVariableDependency<VALUE> build(Variable<VALUE> variable, DependencyType type) {
     return new BaseVariableDependency<VALUE>(variable, type);
   }

diff --git a/megadesk-core/src/main/java/com/liveramp/megadesk/core/transaction/DependencyType.java b/megadesk-core/src/main/java/com/liveramp/megadesk/core/transaction/DependencyType.java
@@ -16,20 +16,7 @@
 
 package com.liveramp.megadesk.core.transaction;
 
-import com.liveramp.megadesk.core.state.Lock;
-
 public enum DependencyType {
   READ,
-  WRITE;
-
-  public static Lock lock(VariableDependency variableDependency) {
-    switch (variableDependency.type()) {
-      case READ:
-        return variableDependency.variable().driver().lock().readLock();
-      case WRITE:
-        return variableDependency.variable().driver().lock().writeLock();
-      default:
-        throw new IllegalStateException(); // TODO: message
-    }
-  }
+  WRITE
 }
diff --git a/megadesk-core/src/main/java/com/liveramp/megadesk/core/transaction/VariableDependency.java b/megadesk-core/src/main/java/com/liveramp/megadesk/core/transaction/VariableDependency.java
@@ -16,11 +16,14 @@
 
 package com.liveramp.megadesk.core.transaction;
 
+import com.liveramp.megadesk.core.state.Lock;
 import com.liveramp.megadesk.core.state.Variable;
 
 public interface VariableDependency<VALUE> extends Comparable<VariableDependency<VALUE>> {
 
   Variable<VALUE> variable();
 
   DependencyType type();
+
+  Lock lock();
 }