FORGE-1916: added handling for OptimisticLock exception

forge · Jul 1, 2014 · 74853c4 · 74853c4
1 parent 214b9b8
commit 74853c4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/javaee/impl/src/main/resources/org/jboss/forge/addon/javaee/rest/generator/impl/Endpoint.jv b/javaee/impl/src/main/resources/org/jboss/forge/addon/javaee/rest/generator/impl/Endpoint.jv
@@ -5,6 +5,7 @@ import java.util.List;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
+import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.ws.rs.*;
@@ -83,7 +84,12 @@ public class ${entityTable}Endpoint
    @Consumes("${contentType}")
    public Response update(${entity.getName()} entity)
    {
-      entity = em.merge(entity);
+      try {
+        entity = em.merge(entity);
+      } catch (OptimisticLockException e) {
+          return Response.status(Response.Status.CONFLICT).entity(e.getEntity()).build();
+      }
+
       return Response.noContent().build();
    }
 }
diff --git a/...pl/src/main/resources/org/jboss/forge/addon/javaee/rest/generator/impl/EndpointWithDTO.jv b/...pl/src/main/resources/org/jboss/forge/addon/javaee/rest/generator/impl/EndpointWithDTO.jv
@@ -6,6 +6,7 @@ import java.util.List;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
+import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.ws.rs.*;
@@ -100,7 +101,11 @@ public class ${entityTable}Endpoint
          entity = null;
       }
       entity = dto.fromDTO(entity, em);
-      entity = em.merge(entity);
+      try {
+        entity = em.merge(entity);
+      } catch (OptimisticLockException e) {
+          return Response.status(Response.Status.CONFLICT).entity(e.getEntity()).build();
+      }
       return Response.noContent().build();
    }
 }