Changeset 5393 for DASISH


Ignore:
Timestamp:
06/26/14 18:18:01 (10 years ago)
Author:
olhsha@mpi.nl
Message:

testing, debugging, fixing randomuuid-ncname issue

Location:
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/pom.xml

    r5266 r5393  
    3131            <version>2.5</version>
    3232            <scope>provided</scope>
    33         </dependency>
     33        </dependency>       
    3434<!--        <dependency>
    3535            <groupId>com.sun.jersey</groupId>

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/Helpers.java

    r5266 r5393  
    2323import java.io.InputStream;
    2424import java.util.Map;
     25import java.util.UUID;
    2526import javax.xml.parsers.DocumentBuilder;
    2627import javax.xml.parsers.DocumentBuilderFactory;
    … …  
    3233import org.w3c.dom.ls.LSSerializer;
    3334import org.xml.sax.SAXException;
    34 
     35import java.util.Random;
    3536/**
    3637 *
    … …  
    4041
    4142    //exception messages
    42     final static public String INVALID_BODY_EXCEPTION = "Invalide annotation body: both, text and xml options, are null.";
    43 
     43    //final static public String INVALID_BODY_EXCEPTION = "Invalide annotation body: both, text and xml options, are null.";
     44    final static String hexa = "ABCDEabcde";
     45    final static int hexan= hexa.length();
     46   
    4447    public static String replace(String text, Map<String, ?> pairs) {
    4548        StringBuilder result = new StringBuilder(text);
    … …  
    119122        return encoder.encodePassword(pswd, salt);
    120123    }
     124   
     125    public static UUID generateUUID(){
     126        UUID result = UUID.randomUUID();
     127        char[] chars = result.toString().toCharArray();
     128        if (chars[0] >= 'a'  && chars[0] <='z') {
     129            return result;
     130        } else {
     131            Random r = new Random();
     132            chars[0] = hexa.charAt(r.nextInt(hexan));
     133            result = UUID.fromString(new String(chars));
     134            return result;
     135        }       
     136    }
    121137}

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java

    r5385 r5393  
    464464
    465465        // generate a new annotation ID
    466         UUID externalID = UUID.randomUUID();
     466        UUID externalID = Helpers.generateUUID();
    467467        Map<String, Object> params = new HashMap<String, Object>();
    468468        params.put("externalId", externalID.toString());

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDao.java

    r5385 r5393  
    1818package eu.dasish.annotation.backend.dao.impl;
    1919
     20import eu.dasish.annotation.backend.Helpers;
    2021import eu.dasish.annotation.backend.NotInDataBaseException;
    2122import eu.dasish.annotation.backend.dao.CachedRepresentationDao;
    … …  
    152153    public Number addCachedRepresentation(CachedRepresentationInfo cachedInfo, InputStream streamCached) throws NotInDataBaseException, IOException {
    153154
    154         UUID externalIdentifier = UUID.randomUUID();
     155        UUID externalIdentifier = Helpers.generateUUID();
    155156        Map<String, Object> params = new HashMap<String, Object>();
    156157        params.put("externalId", externalIdentifier.toString());

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcNotebookDao.java

    r5385 r5393  
    1818package eu.dasish.annotation.backend.dao.impl;
    1919
     20import eu.dasish.annotation.backend.Helpers;
    2021import eu.dasish.annotation.backend.NotInDataBaseException;
    2122import eu.dasish.annotation.backend.dao.NotebookDao;
    … …  
    239240    public Number createNotebookWithoutAccesssAndAnnotations(Notebook notebook, Number ownerID) throws NotInDataBaseException {
    240241
    241         UUID externalID = UUID.randomUUID();
     242        UUID externalID = Helpers.generateUUID();
    242243        Map<String, Object> params = new HashMap<String, Object>();
    243244        params.put("externalId", externalID.toString());

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDao.java

    r5385 r5393  
    197197    public Number addPrincipal(Principal principal, String remoteID) throws NotInDataBaseException {
    198198
    199         UUID externalIdentifier = UUID.randomUUID();
     199        UUID externalIdentifier = Helpers.generateUUID();
    200200        String newExternalIdentifier = externalIdentifier.toString();
    201201        Map<String, Object> params = new HashMap<String, Object>();

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDao.java

    r5385 r5393  
    1818package eu.dasish.annotation.backend.dao.impl;
    1919
     20import eu.dasish.annotation.backend.Helpers;
    2021import eu.dasish.annotation.backend.NotInDataBaseException;
    2122import eu.dasish.annotation.backend.dao.TargetDao;
    … …  
    188189    public Number addTarget(Target target) throws NotInDataBaseException {
    189190
    190         UUID externalID = UUID.randomUUID();
     191        UUID externalID = Helpers.generateUUID();
    191192        String[] linkParts = splitLink(target.getLink());
    192193        Map<String, Object> params = new HashMap<String, Object>();

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/WEB-INF/web.xml

    r5385 r5393  
    3232    <context-param>
    3333        <param-name>eu.dasish.annotation.backend.schemaLocation</param-name>
    34         <param-value>/Users/olhsha/repositories/DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/DASISH-schema.xsd</param-value>   
     34        <param-value>http://lux17.mpi.nl/schemacat/schemas/s16/files/DASISH-schema.xsd</param-value>   
    3535    </context-param>
    3636    <context-param>

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp

    r5266 r5393  
    5454        GET <a href="api/annotations?link=Sagrada_Fam%C3%ADlia">api/annotations?link=Sagrada_Fam%C3%ADlia</a>  <br>
    5555        GET <a href="api/annotations?link=Antoni_Gaud%C3%AD">api/annotations?link=Antoni_Gaud%C3%AD</a>  <br>
    56         GET <a href="api/annotations?after=2014-02-04 15:57:58.046908&before=2014-04-06 10:08:16.213186">api/annotations?after=2014-02-04 15:57:58.046908&before=2014-04-06 10:08:16.213186</a><br>
     56        GET <a href="api/annotations?after=2013-02-04 15:57:58.046908&before=2014-06-25 10:08:16.213186">api/annotations?after=2014-02-04 15:57:58.046908&before=2014-04-06 10:08:16.213186</a><br>
    5757<!--        !Comment: What is "namespace" query parameter? Must be implemented and tested <br>-->
    5858        GET <a href="api/annotations/00000000-0000-0000-0000-000000000022">api/annotations/00000000-0000-0000-0000-000000000022</a>  </br>
    … …  
    6161        GET <a href="api/targets/00000000-0000-0000-0000-000000000032">api/targets/00000000-0000-0000-0000-000000000032</a>  <br>
    6262        GET <a href="api/targets/00000000-0000-0000-0000-000000000032/versions">api/targets/00000000-0000-0000-0000-000000000032/versions</a>   <br>
    63         GET <a href="api/cached/654809f6-1202-4073-86b8-a1f6fe0f2409/metadata">api/cached/654809f6-1202-4073-86b8-a1f6fe0f2409/metadata</a><br>
    64         GET <a href="api/cached/654809f6-1202-4073-86b8-a1f6fe0f2409/stream">api/cached/654809f6-1202-4073-86b8-a1f6fe0f2409/stream</a><br>
     63        GET <a href="api/cached/b0d3f18c-eecf-40ea-9979-eecbbdca7d68/metadata">api/cached/b0d3f18c-eecf-40ea-9979-eecbbdca7d68//metadata</a><br>
     64        GET <a href="api/cached/b0d3f18c-eecf-40ea-9979-eecbbdca7d68/stream">api/cached/b0d3f18c-eecf-40ea-9979-eecbbdca7d68/stream</a><br>
    6565        GET <a href="api/cached/00000000-0000-0000-0000-000000000051/content">api/cached/00000000-0000-0000-0000-000000000051/content</a><br>
     66        GET <a href="api/cached/de82f9d5-6b84-4c9d-8b8a-0736c8b1dd79/stream">api/cached/de82f9d5-6b84-4c9d-8b8a-0736c8b1dd79/stream</a><br>
     67       
    6668       
    6769       

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/TestInstances.java

    r5385 r5393  
    8787
    8888    private Annotation makeAnnotationToAdd(String relativePath) {
    89         Annotation result = makeAnnotation(relativePath, "<html><body>some html 3</body></html>", "text/plain", "Annotation to add to test DAO", "00000000-0000-0000-0000-000000000113",  UUID.randomUUID().toString());
     89        Annotation result = makeAnnotation(relativePath, "<html><body>some html 3</body></html>", "text/plain", "Annotation to add to test DAO", "00000000-0000-0000-0000-000000000113",  Helpers.generateUUID().toString());
    9090
    9191        TargetInfo TargetInfo = new TargetInfo();

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBDispatcherTest.java

    r5385 r5393  
    1818package eu.dasish.annotation.backend.dao.impl;
    1919
     20import eu.dasish.annotation.backend.Helpers;
    2021import eu.dasish.annotation.backend.NotInDataBaseException;
    2122import eu.dasish.annotation.backend.PrincipalCannotBeDeleted;
    … …  
    687688        String type = "text";
    688689        String tool = "latex";
    689         String externalID = UUID.randomUUID().toString();
     690        String externalID = Helpers.generateUUID().toString();
    690691        final CachedRepresentationInfo newCachedInfo = new CachedRepresentationInfo();
    691692        newCachedInfo.setMimeType(mime);
    … …  
    754755        // test 2: adding a new Target
    755756        TargetInfo testTargetTwo = new TargetInfo();
    756         final String tempTargetID = "/api/targets/"+UUID.randomUUID().toString();
     757        final String tempTargetID = "/api/targets/"+Helpers.generateUUID().toString();
    757758        testTargetTwo.setHref(tempTargetID);
    758759        testTargetTwo.setLink("http://www.sagradafamilia.cat/docs_instit/historia.php");
    … …  
    761762        mockTargetListTwo.add(testTargetTwo);
    762763
    763         final UUID mockNewTargetUUID = UUID.randomUUID();
     764        final UUID mockNewTargetUUID = Helpers.generateUUID();
    764765        final NotInDataBaseException e = new NotInDataBaseException("target", "external ID", tempTargetID);
    765766
    … …  
    16531654        final NotInDataBaseException e = new NotInDataBaseException("annotation", "external ID", "00000000-0000-0000-0000-000000000031");
    16541655        final String mockTempID = "00000000-0000-0000-0000-000000000031";
    1655         final UUID mockNewID = UUID.randomUUID();
     1656        final UUID mockNewID = Helpers.generateUUID();
    16561657        final PermissionList permissions = annotation.getPermissions();
    16571658

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java

    r5385 r5393  
    6666        System.out.println("test stringURItoExternalID");
    6767        jdbcAnnotationDao.setResourcePath("/api/annotations/");
    68         String randomUUID = UUID.randomUUID().toString();
     68        String randomUUID = Helpers.generateUUID().toString();
    6969        String uri = "/api/annotations/" + randomUUID;
    7070        String uuid = jdbcAnnotationDao.hrefToExternalID(uri);
    … …  
    8080        System.out.println("test externalIDtoHref");
    8181        jdbcAnnotationDao.setResourcePath("/api/annotations/");
    82         String randomUUID = UUID.randomUUID().toString();
     82        String randomUUID = Helpers.generateUUID().toString();
    8383        String uri = "/api/annotations/" + randomUUID;
    8484        String uriResult = jdbcAnnotationDao.externalIDtoHref(randomUUID);

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDaoTest.java

    r5385 r5393  
    1818package eu.dasish.annotation.backend.dao.impl;
    1919
     20import eu.dasish.annotation.backend.Helpers;
    2021import eu.dasish.annotation.backend.NotInDataBaseException;
    2122import eu.dasish.annotation.schema.CachedRepresentationInfo;
    … …  
    5152        System.out.println("test hrefToExternalID");
    5253        jdbcCachedRepresentationDao.setResourcePath("/api/cached/");
    53         String randomUUID = UUID.randomUUID().toString();
     54        String randomUUID = Helpers.generateUUID().toString();
    5455        String uri = "/api/cached/" + randomUUID;
    5556        String check = jdbcCachedRepresentationDao.hrefToExternalID(uri);
    … …  
    6566        System.out.println("test stringURItoExternalID");
    6667        jdbcCachedRepresentationDao.setResourcePath("/api/cached/");
    67         String randomUUID = UUID.randomUUID().toString();
     68        String randomUUID = Helpers.generateUUID().toString();
    6869        String uri = "/api/cached/"+randomUUID;
    6970        String uriResult = jdbcCachedRepresentationDao.externalIDtoHref(randomUUID);
    … …  
    191192        byte[] newBytes = new byte[blobBytes.length];
    192193        is.read(newBytes);
    193         assertEquals(blobString, new String(newBytes));
    194        
    195     }
     194        String test =new String(newBytes);
     195        assertEquals(blobString, test);
     196       
     197    }
     198   
     199    @Test
     200    public void testGetCachedRepresentationBlob() throws IOException{
     201        System.out.println("test getCachedRepresentationBlob");
     202        jdbcCachedRepresentationDao.setResourcePath("/api/cached/");
     203       
     204        InputStream is = jdbcCachedRepresentationDao.getCachedRepresentationBlob(7);
     205        byte[] newBytes = new byte[2];
     206        is.read(newBytes);
     207        assertEquals("12", new String(newBytes));
     208       
     209    }
     210   
     211    @Test
     212    public void testHelpersUUIDgeneration(){
     213        for (int i=0; i<50; i++) {
     214            String test = Helpers.generateUUID().toString();
     215            char c = test.charAt(0);
     216            assertTrue('a'<=c && c<='z');
     217        }
     218    }
     219
    196220   
    197221}

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcPrincipalDaoTest.java

    r5385 r5393  
    1919
    2020
     21import eu.dasish.annotation.backend.Helpers;
    2122import eu.dasish.annotation.backend.NotInDataBaseException;
    2223import eu.dasish.annotation.backend.PrincipalCannotBeDeleted;
    23 import eu.dasish.annotation.backend.TestInstances;
    2424import eu.dasish.annotation.schema.Access;
    2525import eu.dasish.annotation.schema.Principal;
    … …  
    5353        System.out.println("test hrefToExternalID");
    5454        jdbcPrincipalDao.setResourcePath("/api/principals/");
    55         String randomUUID = UUID.randomUUID().toString();
     55        String randomUUID = Helpers.generateUUID().toString();
    5656        String uri = "/api/principals/" + randomUUID;
    5757        String externalID = jdbcPrincipalDao.hrefToExternalID(uri).toString();
    … …  
    6767        System.out.println("test stringURItoExternalID");
    6868        jdbcPrincipalDao.setResourcePath("/api/principals/");
    69         String randomUUID = UUID.randomUUID().toString();
     69        String randomUUID = Helpers.generateUUID().toString();
    7070        String uri = "/api/principals/"+randomUUID;
    7171        String uriResult = jdbcPrincipalDao.externalIDtoHref(randomUUID);

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDaoTest.java

    r5174 r5393  
    1818package eu.dasish.annotation.backend.dao.impl;
    1919
     20import eu.dasish.annotation.backend.Helpers;
    2021import java.io.File;
    2122import java.io.FileNotFoundException;
    … …  
    3233import org.springframework.test.context.ContextConfiguration;
    3334import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
     35import static org.junit.Assert.*;
    3436/**
    3537 *
    … …  
    9092       
    9193    }
    92 
     94   
     95   
    9396}

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDaoTest.java

    r5385 r5393  
    1818package eu.dasish.annotation.backend.dao.impl;
    1919
     20import eu.dasish.annotation.backend.Helpers;
    2021import eu.dasish.annotation.backend.NotInDataBaseException;
    2122import eu.dasish.annotation.schema.Target;
    … …  
    5253        System.out.println("test hrefToExternalID");
    5354        jdbcTargetDao.setResourcePath("/api/targets/");
    54         String randomUUID = UUID.randomUUID().toString();
     55        String randomUUID = Helpers.generateUUID().toString();
    5556        String uri = "/api/targets/" + randomUUID;
    5657        String externalID = (jdbcTargetDao.hrefToExternalID(uri)).toString();
    … …  
    6667        System.out.println("test stringURItoExternalID");
    6768        jdbcTargetDao.setResourcePath("/api/targets/");
    68         String randomUUID = UUID.randomUUID().toString();
     69        String randomUUID = Helpers.generateUUID().toString();
    6970        String uri = "/api/targets/" + randomUUID;
    7071        String uriResult = jdbcTargetDao.externalIDtoHref(randomUUID);

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

    r5385 r5393  
    1818package eu.dasish.annotation.backend.rest;
    1919
     20import eu.dasish.annotation.backend.Helpers;
    2021import eu.dasish.annotation.backend.NotInDataBaseException;
    2122import eu.dasish.annotation.backend.Resource;
    … …  
    4243import org.springframework.test.context.ContextConfiguration;
    4344import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
    44 import java.net.URI;
    4545import java.util.UUID;
    4646import org.springframework.mock.web.MockHttpServletRequest;
    … …  
    177177
    178178        final Annotation addedAnnotation = (new ObjectFactory()).createAnnotation(annotationToAdd).getValue();
    179         String externalId = UUID.randomUUID().toString();
     179        String externalId = Helpers.generateUUID().toString();
    180180        addedAnnotation.setId(externalId);
    181181        addedAnnotation.setHref("/backend/api/annotations/" + externalId);

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/resources/test-data/InsertTestData.sql

    r4903 r5393  
    8383INSERT INTO cached_representation (external_id, mime_type, tool, type_, file_) VALUES ('00000000-0000-0000-0000-000000000055', 'image/jpg', 'photomaster', 'image', X'1005'); --5
    8484INSERT INTO cached_representation (external_id, mime_type, tool, type_, file_) VALUES ('00000000-0000-0000-0000-000000000056', 'text/plain', 'some tool', 'text', X'1006'); --6  not used
    85 INSERT INTO cached_representation (external_id, mime_type, tool, type_, file_) VALUES ('00000000-0000-0000-0000-000000000057', 'text/html', 'some tool 2', 'text', X'1007'); --7
     85INSERT INTO cached_representation (external_id, mime_type, tool, type_, file_) VALUES ('00000000-0000-0000-0000-000000000057', 'text/html', 'some tool 2', 'text', X'3132'); --7
    8686
    8787 -- PostgreSQL --
Note: See TracChangeset for help on using the changeset viewer.