#325 simple optimistic lock, without error page customization

devgateway · Oct 23, 2020 · 5c8d64d · 5c8d64d
1 parent b15bd17
commit 5c8d64d
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 3 deletions.
diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/EditUserPage.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/user/EditUserPage.java
@@ -205,8 +205,6 @@ public SaveEditPageButton getSaveEditPageButton() {
 
             @Override
             protected void onSubmit(final AjaxRequestTarget target) {
-                super.onSubmit(target);
-
                 final Person person = editForm.getModelObject();
                 // encode the password
                 if (person.getChangeProfilePassword()) {
@@ -218,7 +216,7 @@ protected void onSubmit(final AjaxRequestTarget target) {
                     person.setChangePasswordNextSignIn(false);
                 }
 
-                jpaService.save(person);
+                super.onSubmit(target);
                 setResponsePage(EditUserPage.this.getResponsePage());
             }
         };

diff --git a/persistence/src/main/java/org/devgateway/toolkit/persistence/dao/GenericPersistable.java b/persistence/src/main/java/org/devgateway/toolkit/persistence/dao/GenericPersistable.java
@@ -22,12 +22,21 @@
 import nl.dries.wicket.hibernate.dozer.proxy.Proxied;
 import org.springframework.data.jpa.domain.AbstractPersistable;
 
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
+
 /**
  * @author mpostelnicu
  *
  */
+@MappedSuperclass
 public class GenericPersistable extends AbstractPersistable<Long> implements Serializable {
 
+    @Version
+    @Column(name = "optlock")
+    private Integer version;
+
     /**
      * Custom serialization for id is needed since Spring Data JPA 2.x AbstractPersistable no longer implements
      * Serializable.
@@ -48,4 +57,8 @@ private void readObject(final ObjectInputStream in) throws IOException, ClassNot
 
         in.defaultReadObject();
     }
+
+    public Integer getVersion() {
+        return version;
+    }
 }
diff --git a/persistence/src/main/resources/liquibase-changelog.xml b/persistence/src/main/resources/liquibase-changelog.xml
@@ -60,4 +60,46 @@
         <sqlFile path="Person_roles.sql" />
     </changeSet>
 
+    <changeSet id="#325-optlock" author="mpostelnicu">
+        <preConditions onFail="CONTINUE">
+            <columnExists tableName="ADMIN_SETTINGS" columnName="optlock"/>
+            <columnExists tableName="CATEGORY" columnName="optlock"/>
+            <columnExists tableName="FILE_CONTENT" columnName="optlock"/>
+            <columnExists tableName="FILE_METADATA" columnName="optlock"/>
+            <columnExists tableName="PERSON" columnName="optlock"/>
+            <columnExists tableName="ROLE" columnName="optlock"/>
+            <columnExists tableName="STATUS_CHANGED_COMMENT" columnName="optlock"/>
+            <columnExists tableName="TEST_FORM" columnName="optlock"/>
+            <columnExists tableName="TEST_FORM_CHILD" columnName="optlock"/>
+        </preConditions>
+
+        <update tableName="ADMIN_SETTINGS">
+            <column name="optlock" valueNumeric="0"/>
+        </update>
+        <update tableName="CATEGORY">
+            <column name="optlock" valueNumeric="0"/>
+        </update>
+        <update tableName="FILE_CONTENT">
+            <column name="optlock" valueNumeric="0"/>
+        </update>
+        <update tableName="FILE_METADATA">
+            <column name="optlock" valueNumeric="0"/>
+        </update>
+        <update tableName="PERSON">
+            <column name="optlock" valueNumeric="0"/>
+        </update>
+        <update tableName="ROLE">
+            <column name="optlock" valueNumeric="0"/>
+        </update>
+        <update tableName="STATUS_CHANGED_COMMENT">
+            <column name="optlock" valueNumeric="0"/>
+        </update>
+        <update tableName="TEST_FORM">
+            <column name="optlock" valueNumeric="0"/>
+        </update>
+        <update tableName="TEST_FORM_CHILD">
+            <column name="optlock" valueNumeric="0"/>
+        </update>
+    </changeSet>
+
 </databaseChangeLog>