Removed transactional annotations from simple select queries.
Change-Id: Ifb8e17237b67e59a5247ee4bc1b62eeda046b2d9
Change-Id: Ifb8e17237b67e59a5247ee4bc1b62eeda046b2d9
diff --git a/core/Changes b/core/Changes
index 11265f7..8589452 100644
--- a/core/Changes
+++ b/core/Changes
@@ -8,6 +8,8 @@
- Added support for multiple cq parameters (margaretha, resolved #46)
13/12/2019
- Handled pipe errors and added tests (margaretha)
+20/12/2019
+ - Removed transactional annotations from simple select queries (margaretha)
# version 0.62.2
13/11/2019
diff --git a/core/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java b/core/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
index 0c527d7..b7b576c 100644
--- a/core/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
+++ b/core/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
@@ -32,7 +32,6 @@
*
*/
@Repository
-@Transactional
public class AnnotationDao {
@PersistenceContext
@@ -154,6 +153,7 @@
}
+ @Transactional
public Annotation createAnnotation (String code, String type, String text,
String description) {
Annotation ann = new Annotation(code, type, text, description);
@@ -161,6 +161,7 @@
return ann;
}
+ @Transactional
public AnnotationLayer createAnnotationLayer (Annotation foundry,
Annotation layer) throws KustvaktException {
ParameterChecker.checkObjectValue(foundry, "foundry");
@@ -175,14 +176,17 @@
return annotationLayer;
}
+ @Transactional
public void updateAnnotationLayer (AnnotationLayer layer) {
entityManager.merge(layer);
}
+ @Transactional
public void updateAnnotationKey (AnnotationKey key) {
entityManager.merge(key);
}
+ @Transactional
public AnnotationKey createAnnotationKey (AnnotationLayer layer,
Annotation key) {
AnnotationKey annotation =
diff --git a/core/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java b/core/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
index d12ff3f..da3298c 100644
--- a/core/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
+++ b/core/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
@@ -27,7 +27,6 @@
* @author margaretha
*
*/
-@Transactional
@Repository
public class ResourceDao {
@@ -67,6 +66,7 @@
}
}
+ @Transactional
public void createResource (String id, String germanTitle,
String englishTitle, String englishDescription,
Set<AnnotationLayer> layers) throws KustvaktException {