Merge pull request #17 from maciej-rosiek/master

Refactored AdvisoryLock to more extendable form

Author: Jan-M

README.md

@@ -17,7 +17,7 @@ To use SProcWrapper, add the following lines to your pom.xml:
 <dependency>
     <groupId>de.zalando</groupId>
     <artifactId>zalando-sprocwrapper</artifactId>
-    <version>1.2.4</version>
+    <version>1.3.0</version>
 </dependency>
 ```
 

database/test/21_shard1/21_schema1/03_types/20_partial_object.sql

@@ -0,0 +1,3 @@
+create type partial_object as (
+    name text
+);

database/test/21_shard1/21_schema1/05_stored_procedures/20_get_partial_object.sql

@@ -0,0 +1,10 @@
+CREATE OR REPLACE FUNCTION get_partial_object(p partial_object)
+RETURNS partial_object AS
+$$
+DECLARE
+    r partial_object;
+BEGIN
+  r.name := p.name;
+  return r;
+END;
+$$ LANGUAGE plpgsql SECURITY DEFINER;

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>de.zalando</groupId>
     <artifactId>zalando-sprocwrapper</artifactId>
-    <version>1.2.4</version>
+    <version>1.3.0</version>
     <packaging>jar</packaging>
     <name>Stored Procedure Wrapper</name>
     <description>Library to make PostgreSQL stored procedures available through simple Java "*SProcService" interfaces including automatic object serialization and deserialization (using typemapper and convention-over-configuration). Supports sharding, advisory locking, statement timeouts and PostgreSQL types such as enums and hstore.</description>

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

@@ -6,6 +6,10 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import java.util.Objects;
+
+import com.google.common.base.Preconditions;
+
 /**
  * @author  jmussler
  */
@@ -14,24 +18,75 @@
 @Inherited
 public @interface SProcCall {
 
-    public static enum AdvisoryLock {
-        NO_LOCK(0L),
-        LOCK_ONE(1L);
+    public static class AdvisoryLock {
 
-        /*
-         * Add more values to this enum if you need additional types of locks
-         */
+        public static class NoLock {
+            public static final String NAME = "NO_LOCK";
+            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 LOCK_ID = 1L;
+            public static final AdvisoryLock LOCK = new AdvisoryLock(NAME, LOCK_ID);
+        }
+
+        private final String name;
+        private final long lockId;
+
+        public AdvisoryLock(final String name, final long lockId) {
+            Preconditions.checkNotNull(name, "Name parameter cannot be null.");
+            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.lockId = lockId;
+        }
+
+        public String getName() {
+            return name;
+        }
 
-        private AdvisoryLock(final long sprocId) {
-            this.sprocId = sprocId;
+        public long getLockId() {
+            return lockId;
         }
 
-        private final long sprocId;
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
 
-        public long getSprocId() {
-            return sprocId;
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            final AdvisoryLock that = (AdvisoryLock) o;
+
+            if (lockId != that.lockId) {
+                return false;
+            }
+
+            if (!name.equals(that.name)) {
+                return false;
+            }
+
+            return true;
         }
 
+        @Override
+        public int hashCode() {
+            int result = name.hashCode();
+            result = 31 * result + (int) (lockId ^ (lockId >>> 32));
+            return result;
+        }
+
+        @Override
+        public String toString() {
+            return "AdvisoryLock{" + "name='" + name + '\'' + ", lockId=" + lockId + '}';
+        }
     }
 
     public static enum Validate {
@@ -94,7 +149,10 @@ public static enum WriteTransaction {
 
     long timeoutInMilliSeconds() default 0;
 
-    AdvisoryLock adivsoryLockType() default AdvisoryLock.NO_LOCK;
+    long adivsoryLockId() default AdvisoryLock.NoLock.LOCK_ID;
+
+    String adivsoryLockName() default AdvisoryLock.NoLock.NAME;
 
     Validate validate() default Validate.AS_DEFINED_IN_SERVICE;
+
 }

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

@@ -136,8 +136,9 @@ 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(), scA.adivsoryLockType(), useValidation, scA.readOnly(),
-                        writeTransaction);
+                        scA.timeoutInMilliSeconds(),
+                        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/StoredProcedure.java

@@ -152,7 +152,7 @@ public StoredProcedure(final String name, final java.lang.reflect.Type genericTy
             }
         }
 
-        if (this.timeout > 0 || this.adivsoryLock != AdvisoryLock.NO_LOCK) {
+        if (this.timeout > 0 || (this.adivsoryLock != null && !(this.adivsoryLock.equals(AdvisoryLock.NoLock.LOCK)))) {
 
             // Wrapper provides locking and changing of session settings functionality
             this.executor = new ExecutorWrapper(executor, this.timeout, this.adivsoryLock);

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

@@ -60,13 +60,13 @@ private void resetTimeout(final Connection conn) throws SQLException {
     }
 
     private boolean lockAdvisoryLock(final Connection conn) throws SQLException {
-        if (lock == AdvisoryLock.NO_LOCK) {
+        if (lock == null || lock.equals(AdvisoryLock.NoLock.LOCK)) {
             return true;
         }
 
         final Statement st = conn.createStatement();
-        final ResultSet rs = st.executeQuery("SELECT pg_advisory_lock(" + lock.getSprocId() + ") AS \"" + lock.name()
-                    + "\";");
+        final ResultSet rs = st.executeQuery("SELECT pg_advisory_lock(" + lock.getLockId() + ") AS \"" + lock
+                    .getName() + "\";");
 
         boolean b = false;
         if (rs.next()) {
@@ -79,12 +79,12 @@ private boolean lockAdvisoryLock(final Connection conn) throws SQLException {
     }
 
     private boolean unlockAdvisoryLock(final Connection conn) throws SQLException {
-        if (lock == AdvisoryLock.NO_LOCK) {
+        if (lock == null || lock.equals(AdvisoryLock.NoLock.LOCK)) {
             return true;
         }
 
         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);
@@ -108,7 +108,7 @@ public Object executeSProc(final DataSource ds, final String sql, final Object[]
             setTimeout(sameConnDs.getConnection());
 
             if (!lockAdvisoryLock(sameConnDs.getConnection())) {
-                throw new RuntimeException("Could not acquire AdvisoryLock " + lock.name());
+                throw new RuntimeException("Could not acquire AdvisoryLock " + lock.getName());
             }
 
             return executor.executeSProc(sameConnDs, sql, args, types, invocationContext, returnType);
@@ -130,7 +130,7 @@ public Object executeSProc(final DataSource ds, final String sql, final Object[]
                     }
 
                     // unlock in all cases, locks not owned by this session cannot be unlocked
-                    if (lock != AdvisoryLock.NO_LOCK) {
+                    if (lock != null && !lock.equals(AdvisoryLock.NoLock.LOCK)) {
                         try {
                             unlockAdvisoryLock(sameConnDs.getConnection());
                         } catch (final SQLException ex) {

src/main/java/de/zalando/typemapper/annotations/DatabaseType.java

@@ -20,4 +20,10 @@
      * Flattens hierarchical structure of object and makes parent fields exposed to PgTypeHelper.
      */
     boolean inheritance() default false;
+
+    /**
+     * Annotated java class can have more @DatabaseField annotated fields than corresponding database type.
+     */
+    boolean partial() default false;
+
 }

src/main/java/de/zalando/typemapper/core/DatabaseFieldDescriptor.java

@@ -40,4 +40,5 @@ public int getPosition() {
     public Class<? extends ObjectMapper<?>> getMapper() {
         return mapper;
     }
+
 }