Changeset 5550 for ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

Timestamp:

08/12/14 14:59:10 (10 years ago)

Author:

olhsha@mpi.nl

Message:

Fixed exception that have appeared while unit-testing

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (8 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -28 +28 @@
 import clarin.cmdi.componentregistry.rss.RssCreatorDescriptions;
 import com.google.common.collect.Lists;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
 
 import com.sun.jersey.api.core.InjectParam;
@@ -311 +313 @@
                         }
                     };
+                    return createDownloadResponse(result, fileName);
                 } else if ("xsd".equalsIgnoreCase(rawType)) {
                     result = new StreamingOutput() {
@@ -344 +347 @@
                         }
                     };
+                    return createDownloadResponse(result, fileName);
                 } else {
-                    throw new WebApplicationException(Response
-                            .serverError()
-                            .entity("unsupported rawType: " + rawType
-                            + " (only xml or xsd are supported)").build());
+                    return Response.status(Status.NOT_FOUND).entity("Usupported raw type "+rawType).build();
                 }
-                return createDownloadResponse(result, fileName);
+                
 
             } catch (UserUnauthorizedException e2) {
@@ -876 +877 @@
                     .build();
         } catch (ItemNotFoundException e) {
-            LOG.warn("Profile with id " + profileId + " is not found.",
-                    e);
+            LOG.warn("Profile with id " + profileId + " is not found.");
             return Response.serverError().status(Status.NOT_FOUND)
                     .build();
@@ -931 +931 @@
             return Response.serverError().status(Status.FORBIDDEN)
                     .entity("" + e.getMessage()).build();
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
+        } 
+        catch (ComponentRegistryException e) {
+            LOG.info("Could not find comment "+commentId+ " for "+profileId);
             return Response.serverError().status(Status.INTERNAL_SERVER_ERROR)
                     .build();
-        } catch (IOException e) {
+        } 
+        catch (IOException e) {
             LOG.error("Comment with id: " + commentId + " deletion failed.", e);
             return Response.serverError().status(Status.INTERNAL_SERVER_ERROR)
@@ -983 +985 @@
             return Response.serverError().status(Status.FORBIDDEN)
                     .entity("" + e.getMessage()).build();
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
+        } catch (ComponentRegistryException e) {            
+            LOG.info("Could not retrieve component "+componentId+" for the component "+componentId);
             return Response.serverError().status(Status.INTERNAL_SERVER_ERROR)
                     .build();
@@ -1012 +1014 @@
     public Response getRegisteredProfileRawType(
             @PathParam("profileId") final String profileId,
-            @PathParam("rawType") String rawType) throws ComponentRegistryException {
+            @PathParam("rawType") String rawType) throws ComponentRegistryException, IllegalArgumentException {
 
 
@@ -1064 +1066 @@
                 };
             } else {
-                throw new WebApplicationException(Response
-                        .serverError()
-                        .entity("unsupported rawType: " + rawType
-                        + " (only xml or xsd are supported)").build());
+                return Response.status(Status.NOT_FOUND).entity("Unsupported raw type "+rawType).build();
             }
             return createDownloadResponse(result, fileName);