Merge pull request #51 from jateeter/master

Attempted work-around for NoResultException.x.TransactionRollback error

Author: jateeter

src/main/java/org/energyos/espi/common/repositories/jpa/UsagePointRepositoryImpl.java

@@ -106,7 +106,9 @@ public void createOrReplaceByUUID(UsagePoint usagePoint) {
             if (existingUsagePoint.getUpLink() != null) {
                 usagePoint.setUpLink(existingUsagePoint.getUpLink());
             }
-
+            usagePoint.setPublished(existingUsagePoint.getPublished());
+            usagePoint.setUpdated(existingUsagePoint.getUpdated());
+            
             em.merge(usagePoint);
         } catch (NoResultException e) {
             usagePoint.setPublished(new GregorianCalendar());

src/main/java/org/energyos/espi/common/service/ResourceService.java

@@ -16,6 +16,8 @@ List<IdentifiedObject> findByAllParentsHref(String relatedHref,
 
 	<T> T findByUUID(UUID uuid, Class<T> clazz);
 
+	<T extends IdentifiedObject> T testById(Long id, Class<T> clazz);
+	
 	<T extends IdentifiedObject> T findById(Long id, Class<T> clazz);
 
 	<T extends IdentifiedObject> List<Long> findAllIds(Class<T> clazz);

src/main/java/org/energyos/espi/common/service/impl/ResourceServiceImpl.java

@@ -56,8 +56,15 @@ public <T> T findByUUID(UUID uuid, Class<T> clazz) {
         return repository.findByUUID(uuid, clazz);
     }
 
-    @Override
+    // the following is used to query for the existence of the object in the DB within 
+    // a closed transactional space. Callers will need a Catch on the NoResultExecption for failure.
+	@Override
     @Transactional( readOnly = true)  
+	public <T extends IdentifiedObject> T testById(Long id, Class<T> clazz) {
+		return repository.findById(id, clazz);
+	}
+	
+    @Override
     public <T extends IdentifiedObject> T findById(Long id, Class<T> clazz) {
         return repository.findById(id, clazz);
     }
@@ -127,4 +134,6 @@ public void setRepository(ResourceRepository repository) {
     }
 
 
+
+
 }