Changeset 3192

Timestamp:

07/25/13 09:52:01 (11 years ago)

Author:

olhsha

Message:

removing AnnotationRooted?.class. Using Peter's work-aroun to make an annotation JAXB-able, for now, before the schema is updated.

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src

Files:

• main/java/eu/dasish/annotation/backend/AnnotationRooted.java (deleted)
• main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified) (2 diffs)
• test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (modified) (2 diffs)
• test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified) (3 diffs)

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

@@ -18 +18 @@
 package eu.dasish.annotation.backend.rest;
 
-import eu.dasish.annotation.backend.AnnotationRooted;
 import eu.dasish.annotation.backend.BackendConstants;
 import eu.dasish.annotation.backend.dao.AnnotationDao;
@@ -70 +69 @@
     @Produces(MediaType.APPLICATION_XML)
     @Path("")
-    public JAXBElement<Annotation> createAnnotation(AnnotationRooted annotation) {
+    public JAXBElement<Annotation> createAnnotation(Annotation annotation) {
         AnnotationIdentifier newAnnotationIdentifier = annotationDao.addAnnotation(annotation);
         //return newAnnotationIdentifier.toString();

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java

@@ -19 +19 @@
 
 import com.sun.jersey.api.client.GenericType;
-import eu.dasish.annotation.backend.AnnotationRooted;
 import eu.dasish.annotation.backend.TestBackendConstants;
 import eu.dasish.annotation.backend.TestInstances;
@@ -122 +121 @@
     public void testCreateAnnotation() throws SQLException, InstantiationException, IllegalAccessException {
         System.out.println("test createAnnotation");
-        final AnnotationRooted annotationToAdd = new GenericType<AnnotationRooted>(){}.getRawClass().newInstance();
+        final Annotation annotationToAdd = new GenericType<Annotation>(){}.getRawClass().newInstance();
         final AnnotationIdentifier newAnnotationID = new GenericType<AnnotationIdentifier>(){}.getRawClass().newInstance();
         

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java

@@ -20 +20 @@
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.GenericType;
-import eu.dasish.annotation.backend.AnnotationRooted;
 import eu.dasish.annotation.backend.TestBackendConstants;
 import eu.dasish.annotation.backend.dao.AnnotationDao;
 import eu.dasish.annotation.backend.identifiers.AnnotationIdentifier;
 import eu.dasish.annotation.schema.Annotation;
+import eu.dasish.annotation.schema.Notebook;
 import eu.dasish.annotation.schema.ObjectFactory;
 import java.sql.SQLException;
 import javax.ws.rs.core.GenericEntity;
 import javax.ws.rs.core.MediaType;
+import javax.xml.bind.JAXBElement;
+import javax.xml.namespace.QName;
 import org.jmock.Expectations;
 import org.junit.Test;
@@ -128 +130 @@
     @Test
     //@Ignore
-    public void testAddAnnotation() throws SQLException, InstantiationException, IllegalAccessException{
+    public void testCreateAnnotation() throws SQLException, InstantiationException, IllegalAccessException{
         System.out.println("test createAnnotation");
         //final Annotation annotationToAdd = new ObjectFactory().createAnnotation();
-       final AnnotationRooted annotationToAdd = new GenericType<AnnotationRooted>(){}.getRawClass().newInstance();
+       final Annotation annotationToAdd = new GenericType<Annotation>(){}.getRawClass().newInstance();
        final AnnotationIdentifier newAnnotationID = new GenericType<AnnotationIdentifier>(){}.getRawClass().newInstance();
         
         mockery.checking(new Expectations() {
             {
-                oneOf(annotationDao).addAnnotation(with(aNonNull(AnnotationRooted.class)));
+                oneOf(annotationDao).addAnnotation(with(aNonNull(Annotation.class)));
                 will(returnValue(newAnnotationID));
             }
@@ -146 +148 @@
         System.out.println("requestUrl: " + requestUrl);
         
-        ClientResponse response = resource().path(requestUrl).type(MediaType.APPLICATION_XML).post(ClientResponse.class, new GenericEntity<AnnotationRooted>(annotationToAdd){});
+        // Peter's workaround on absence of "PnjectFactory.create... for annotations
+        final JAXBElement<Annotation> jaxbElement = new JAXBElement<Annotation>(new QName("http://www.dasish.eu/ns/addit", "annotation"), Annotation.class, null, annotationToAdd);
+                
+        ClientResponse response = resource().path(requestUrl).type(MediaType.APPLICATION_XML).post(ClientResponse.class, jaxbElement);
         assertEquals(200, response.getStatus());