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

Timestamp:

12/10/13 15:18:42 (10 years ago)

Author:

olhsha

Message:

lintegrity unit test reconstructed so it does not mock any more. getAnnotation works (the others are "ignored"). Needs refactoring (the subdirectory with beans and DummySecurityFilter? class.

File:

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

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

@@ -33 +33 @@
 import eu.dasish.annotation.schema.ResponseBody;
 import java.io.IOException;
+import java.net.URI;
+import java.security.Principal;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -50 +52 @@
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.ext.Providers;
@@ -77 +80 @@
     @Context
     private Providers providers;
+    
+    
     final String default_permission = "reader";
     private static final Logger logger = LoggerFactory.getLogger(AnnotationResource.class);
@@ -92 +97 @@
     }
 
+  
+    
     public void setProviders(Providers providers) {
         this.providers = providers;
@@ -104 +111 @@
     @Secured("ROLE_USER")
     public JAXBElement<Annotation> getAnnotation(@PathParam("annotationid") String ExternalIdentifier) {
-        dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
+        URI baseURI = uriInfo.getBaseUri();
+        String baseURIstr = baseURI.toString();
+        dbIntegrityService.setServiceURI(baseURIstr);
         final Number annotationID = dbIntegrityService.getAnnotationInternalIdentifier(UUID.fromString(ExternalIdentifier));
-        final Number userID = dbIntegrityService.getUserInternalIDFromRemoteID(httpServletRequest.getRemoteUser());
+        String remoteUser = httpServletRequest.getRemoteUser();
+        final Number userID = dbIntegrityService.getUserInternalIDFromRemoteID(remoteUser);
         if (canRead(userID, annotationID)) {
             final Annotation annotation = dbIntegrityService.getAnnotation(annotationID);