Renamed sprocId to lockId

Author: Maciej Rosiek

src/main/java/de/zalando/sprocwrapper/SProcCall.java

@@ -22,35 +22,35 @@ public static class AdvisoryLock {
 
         public static class NoLock {
             public static final String NAME = "NO_LOCK";
-            public static final long SPROC_ID = 0L;
-            public static final AdvisoryLock LOCK = new AdvisoryLock(NAME, SPROC_ID);
+            public static final long LOCK_ID = 0L;
+            public static final AdvisoryLock LOCK = new AdvisoryLock(NAME, LOCK_ID);
         }
 
         public static class LockOne {
             public static final String NAME = "LOCK_ONE";
-            public static final long SPROC_ID = 1L;
-            public static final AdvisoryLock LOCK = new AdvisoryLock(NAME, SPROC_ID);
+            public static final long LOCK_ID = 1L;
+            public static final AdvisoryLock LOCK = new AdvisoryLock(NAME, LOCK_ID);
         }
 
         private final String name;
-        private final long sprocId;
+        private final long lockId;
 
-        public AdvisoryLock(final String name, final long sprocId) {
+        public AdvisoryLock(final String name, final long lockId) {
             Preconditions.checkNotNull(name, "Name parameter cannot be null.");
-            Preconditions.checkArgument(sprocId == NoLock.SPROC_ID && Objects.equals(name, NoLock.NAME)
-                    || sprocId != NoLock.SPROC_ID && !Objects.equals(name, NoLock.NAME),
-                "SprocId parameter is different than %s (%s) but the name parameter was not changed: [name: %s, sprocId: %s]",
-                NoLock.SPROC_ID, NoLock.NAME, name, sprocId);
+            Preconditions.checkArgument(lockId == NoLock.LOCK_ID && Objects.equals(name, NoLock.NAME)
+                    || lockId != NoLock.LOCK_ID && !Objects.equals(name, NoLock.NAME),
+                "LockId parameter is different than %s (%s) but the name parameter was not changed: [name: %s, lockId: %s]",
+                NoLock.LOCK_ID, NoLock.NAME, name, lockId);
             this.name = name;
-            this.sprocId = sprocId;
+            this.lockId = lockId;
         }
 
         public String getName() {
             return name;
         }
 
-        public long getSprocId() {
-            return sprocId;
+        public long getLockId() {
+            return lockId;
         }
 
         @Override
@@ -65,7 +65,7 @@ public boolean equals(final Object o) {
 
             final AdvisoryLock that = (AdvisoryLock) o;
 
-            if (sprocId != that.sprocId) {
+            if (lockId != that.lockId) {
                 return false;
             }
 
@@ -79,13 +79,13 @@ public boolean equals(final Object o) {
         @Override
         public int hashCode() {
             int result = name.hashCode();
-            result = 31 * result + (int) (sprocId ^ (sprocId >>> 32));
+            result = 31 * result + (int) (lockId ^ (lockId >>> 32));
             return result;
         }
 
         @Override
         public String toString() {
-            return "AdvisoryLock{" + "name='" + name + '\'' + ", sprocId=" + sprocId + '}';
+            return "AdvisoryLock{" + "name='" + name + '\'' + ", lockId=" + lockId + '}';
         }
     }
 
@@ -149,7 +149,7 @@ public static enum WriteTransaction {
 
     long timeoutInMilliSeconds() default 0;
 
-    long adivsoryLockSprocId() default AdvisoryLock.NoLock.SPROC_ID;
+    long adivsoryLockId() default AdvisoryLock.NoLock.LOCK_ID;
 
     String adivsoryLockName() default AdvisoryLock.NoLock.NAME;
 

src/main/java/de/zalando/sprocwrapper/proxy/SProcProxyBuilder.java

@@ -137,7 +137,7 @@ public static <T> T build(final DataSourceProvider d, final Class<T> c) {
                 storedProcedure = new StoredProcedure(name, method.getGenericReturnType(), sprocStrategy,
                         scA.runOnAllShards(), scA.searchShards(), scA.parallel(), resultMapper,
                         scA.timeoutInMilliSeconds(),
-                        new SProcCall.AdvisoryLock(scA.adivsoryLockName(), scA.adivsoryLockSprocId()), useValidation,
+                        new SProcCall.AdvisoryLock(scA.adivsoryLockName(), scA.adivsoryLockId()), useValidation,
                         scA.readOnly(), writeTransaction);
                 if (!"".equals(scA.sql())) {
                     storedProcedure.setQuery(scA.sql());

src/main/java/de/zalando/sprocwrapper/proxy/executors/ExecutorWrapper.java

@@ -65,7 +65,7 @@ private boolean lockAdvisoryLock(final Connection conn) throws SQLException {
         }
 
         final Statement st = conn.createStatement();
-        final ResultSet rs = st.executeQuery("SELECT pg_advisory_lock(" + lock.getSprocId() + ") AS \"" + lock
+        final ResultSet rs = st.executeQuery("SELECT pg_advisory_lock(" + lock.getLockId() + ") AS \"" + lock
                     .getName() + "\";");
 
         boolean b = false;
@@ -84,7 +84,7 @@ private boolean unlockAdvisoryLock(final Connection conn) throws SQLException {
         }
 
         final Statement st = conn.createStatement();
-        final ResultSet rs = st.executeQuery("SELECT pg_advisory_unlock(" + lock.getSprocId() + ")");
+        final ResultSet rs = st.executeQuery("SELECT pg_advisory_unlock(" + lock.getLockId() + ")");
         boolean b = false;
         if (rs.next()) {
             b = rs.getBoolean(1);

src/test/java/de/zalando/sprocwrapper/AdvisoryLockTest.java

@@ -7,7 +7,7 @@ public class AdvisoryLockTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldNotCreateAdvisoryLockWithWrongName() {
-        new SProcCall.AdvisoryLock(SProcCall.AdvisoryLock.NoLock.NAME, SProcCall.AdvisoryLock.NoLock.SPROC_ID + 1);
+        new SProcCall.AdvisoryLock(SProcCall.AdvisoryLock.NoLock.NAME, SProcCall.AdvisoryLock.NoLock.LOCK_ID + 1);
     }
 
     @Test
@@ -18,9 +18,9 @@ public void shouldCreateAdvisoryLockWithCorrectName() {
     @Test
     public void shouldCompareLocksCorrectly() {
         Assert.assertEquals(SProcCall.AdvisoryLock.NoLock.LOCK,
-            new SProcCall.AdvisoryLock(SProcCall.AdvisoryLock.NoLock.NAME, SProcCall.AdvisoryLock.NoLock.SPROC_ID));
+            new SProcCall.AdvisoryLock(SProcCall.AdvisoryLock.NoLock.NAME, SProcCall.AdvisoryLock.NoLock.LOCK_ID));
         Assert.assertNotEquals(SProcCall.AdvisoryLock.LockOne.LOCK,
-            new SProcCall.AdvisoryLock(SProcCall.AdvisoryLock.NoLock.NAME, SProcCall.AdvisoryLock.NoLock.SPROC_ID));
+            new SProcCall.AdvisoryLock(SProcCall.AdvisoryLock.NoLock.NAME, SProcCall.AdvisoryLock.NoLock.LOCK_ID));
     }
 
 }