Changeset 4539 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java

Timestamp:

02/20/14 15:52:16 (10 years ago)

Author:

olhsha

Message:

refactoring repetitive code for different sort of resources. Replaced with one code using enum type Resource

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java (modified) (5 diffs)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/TargetResource.java

@@ -21 +21 @@
 import com.sun.jersey.multipart.MultiPart;
 import eu.dasish.annotation.backend.BackendConstants;
+import eu.dasish.annotation.backend.Resource;
 import eu.dasish.annotation.backend.dao.DBIntegrityService;
 import eu.dasish.annotation.schema.CachedRepresentationInfo;
@@ -91 +92 @@
             dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
             try {
-                final Number targetID = dbIntegrityService.getTargetInternalIdentifier(UUID.fromString(externalIdentifier));
+                final Number targetID = dbIntegrityService.getResourceInternalIdentifier(UUID.fromString(externalIdentifier), Resource.TARGET);
                 if (targetID != null) {
                     final Target target = dbIntegrityService.getTarget(targetID);
@@ -118 +119 @@
             dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
             try {
-                final Number targetID = dbIntegrityService.getTargetInternalIdentifier(UUID.fromString(externalIdentifier));
+                final Number targetID = dbIntegrityService.getResourceInternalIdentifier(UUID.fromString(externalIdentifier), Resource.TARGET);
                 if (targetID != null) {
                     final ReferenceList siblings = dbIntegrityService.getTargetsForTheSameLinkAs(targetID);
@@ -148 +149 @@
             dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
             try {
-                final Number targetID = dbIntegrityService.getTargetInternalIdentifier(UUID.fromString(targetIdentifier));
+                final Number targetID = dbIntegrityService.getResourceInternalIdentifier(UUID.fromString(targetIdentifier), Resource.TARGET);
                 if (targetID != null) {
                     CachedRepresentationInfo metadata = multiPart.getBodyParts().get(0).getEntityAs(CachedRepresentationInfo.class);
@@ -177 +178 @@
             dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
             try {
-                final Number targetID = dbIntegrityService.getTargetInternalIdentifier(UUID.fromString(targetExternalIdentifier));
-                if (targetID != null) {
-                    final Number cachedID = dbIntegrityService.getCachedRepresentationInternalIdentifier(UUID.fromString(cachedExternalIdentifier));
+                final Number targetID = dbIntegrityService.getResourceInternalIdentifier(UUID.fromString(targetExternalIdentifier), Resource.TARGET);
+                if (targetID != null) {
+                    final Number cachedID = dbIntegrityService.getResourceInternalIdentifier(UUID.fromString(cachedExternalIdentifier), Resource.CACHED_REPRESENTATION);
                     if (cachedID != null) {
                         int[] resultDelete = dbIntegrityService.deleteCachedRepresentationOfTarget(targetID, cachedID);