Changeset 239

Timestamp:

03/17/10 13:45:10 (14 years ago)

Author:

oschonef

Message:

• return user error, if submitted internal collection format is invalid

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry

Files:

• VirtualCollectionRegistryMarshaller.java (modified) (2 diffs)
• rest/VirtualCollectionRegistryExceptionMapper.java (modified) (1 diff)
• rest/VirtualCollectionRegistryRestService.java (modified) (2 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistryMarshaller.java

@@ -92 +92 @@
 
         public VirtualCollection unmarshal(InputStream input, Format format,
-                        String encoding) throws IOException {
+                        String encoding) throws VirtualCollectionRegistryException, IOException {
                 if (input == null) {
                         throw new NullPointerException("input == null");
@@ -104 +104 @@
                         return vc;
                 } catch (UnmarshalException e) {
-                        logger.log(Level.WARNING, "error unmarshalling virtual collection",
-                                        e.getLinkedException());
-                        throw new IOException("error unmarshalling virtual collection",
-                                        e.getLinkedException());
+                        throw new VirtualCollectionRegistryUsageException("invalid " +
+                                        "virtual collection format", e.getLinkedException());
                 } catch (Exception e) {
                         logger.log(Level.WARNING, "error unmarshalling virtual collection", e);

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/VirtualCollectionRegistryExceptionMapper.java

@@ -57 +57 @@
                 while (t != null) {
                         if (t instanceof SAXParseException) {
-                                SAXParseException e = (SAXParseException) t;
-                                errors.add(e.getMessage() + ", line = " + e.getLineNumber()
-                                                + ", column = " + e.getColumnNumber());
+                                final SAXParseException e = (SAXParseException) t;
+                                String message = e.getMessage();
+                                if (message.startsWith("cvc")) {
+                                        int pos = message.indexOf(':');
+                                        if (pos != 0) {
+                                                message = message.substring(pos + 1);
+                                        }
+                                }
+                                errors.add(message +
+                           " [line = " + e.getLineNumber() +
+                                                   ", column = " + e.getColumnNumber() + "]");
+                        } else if (t instanceof XMLStreamException) {
+                                final XMLStreamException e = (XMLStreamException) t;
+                                String message = e.getMessage();
+                                if (message.startsWith("ParseError")) {
+                                        int pos = message.indexOf(':');
+                                        if (pos != -1) {
+                                                pos = message.indexOf(':', pos + 1);
+                                                if (pos != -1) {
+                                                        message = message.substring(pos + 1);
+                                                }
+                                        }
+                                }
+                                if (e.getLocation() != null) {
+                                        message = message +
+                                                " [line = " + e.getLocation().getLineNumber() +
+                                                ", column = " + e.getLocation().getColumnNumber() +
+                        "]";
+                                }
+                                errors.add(message); 
                         } else {
                                 errors.add(t.getMessage());

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/VirtualCollectionRegistryRestService.java

@@ -85 +85 @@
                                         .build();
                         return Response.created(uri).entity(response).build();
-                } catch (Exception e) {
+                } catch (IOException e) {
                         throw new VirtualCollectionRegistryException("create", e);
                 }
@@ -117 +117 @@
                                 MediaType.APPLICATION_JSON })
         public Response updateVirtualCollection(@PathParam("id") long id,
-                        VirtualCollection vc) throws VirtualCollectionRegistryException {
+                        InputStream input) throws VirtualCollectionRegistryException {
                 Principal principal = security.getUserPrincipal();
                 if (principal == null) {
                         throw new NullPointerException("princial == null");
                 }
-                registry.updateVirtualCollection(principal, id, vc);
-                RestResponse response = new RestResponse();
-                response.setIsSuccess(true);
-                response.setInfo("updated");
-                response.setId(id);
-                return Response.ok(response).build();
+                try {
+                        Format format = getInputFormat();
+                        String encoding = getInputEncoding();
+                        VirtualCollection vc = registry.getMarshaller()
+                                .unmarshal(input, format, encoding);
+                        registry.updateVirtualCollection(principal, id, vc);
+                        RestResponse response = new RestResponse();
+                        response.setIsSuccess(true);
+                        response.setInfo("updated");
+                        response.setId(id);
+                        return Response.ok(response).build();
+                } catch (IOException e) {
+                        throw new VirtualCollectionRegistryException("update", e);
+
+                }
         }