Changeset 5551

Timestamp:

08/12/14 16:29:07 (10 years ago)

Author:

olhsha@mpi.nl

Message:

Fixed issued arising after testing on localhost tomcat (not fully)

Location:

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry

Files:

• impl/database/ComponentRegistryFactoryDbImpl.java (modified) (1 diff)
• rest/ComponentRegistryRestService.java (modified) (8 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImpl.java

@@ -82 +82 @@
         }
         ComponentRegistryDbImpl cr = componentRegistryBeanFactory.getNewComponentRegistry();// default public registry
-        cr.setRegistrySpace(RegistrySpace.PRIVATE);
+        cr.setRegistrySpace(RegistrySpace.GROUP);
         cr.setRegistryOwner(owner);
         cr.setGroupId(groupId);

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

@@ -163 +163 @@
     }
 
+    private boolean checkRegistrySpaceString(String registrySpace) {
+        return (registrySpace.equalsIgnoreCase("group") || registrySpace.equalsIgnoreCase("private") || registrySpace.equalsIgnoreCase("published"));
+    }
+
     @Override
     @GET
@@ -173 +177 @@
             throws ComponentRegistryException, IOException {
         long start = System.currentTimeMillis();
+
+        if (!checkRegistrySpaceString(registrySpace)) {
+            response.sendError(Status.NOT_FOUND.getStatusCode(), "illegal registry space");
+            return new ArrayList<ComponentDescription>();
+        }
 
         try {
@@ -205 +214 @@
 
         long start = System.currentTimeMillis();
+        
+        if (!checkRegistrySpaceString(registrySpace)) {
+            response.sendError(Status.NOT_FOUND.getStatusCode(), "illegal registry space");
+            return new ArrayList<ProfileDescription>();
+        }
         try {
             ComponentRegistry cr = this.initialiseRegistry(registrySpace, groupId);
@@ -349 +363 @@
                     return createDownloadResponse(result, fileName);
                 } else {
-                    return Response.status(Status.NOT_FOUND).entity("Usupported raw type "+rawType).build();
+                    return Response.status(Status.NOT_FOUND).entity("Usupported raw type " + rawType).build();
                 }
-                
+
 
             } catch (UserUnauthorizedException e2) {
@@ -758 +772 @@
         try {
             ComponentRegistry br = this.getBaseRegistry();
-            ComponentDescription desc =br.getComponentDescriptionAccessControlled(componentId);
+            ComponentDescription desc = br.getComponentDescriptionAccessControlled(componentId);
             if (desc != null) {
                 if (desc.isPublic()) {
@@ -931 +945 @@
             return Response.serverError().status(Status.FORBIDDEN)
                     .entity("" + e.getMessage()).build();
-        } 
-        catch (ComponentRegistryException e) {
-            LOG.info("Could not find comment "+commentId+ " for "+profileId);
+        } 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)
@@ -985 +997 @@
             return Response.serverError().status(Status.FORBIDDEN)
                     .entity("" + e.getMessage()).build();
-        } catch (ComponentRegistryException e) {            
-            LOG.info("Could not retrieve component "+componentId+" for the component "+componentId);
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component " + componentId + " for the component " + componentId);
             return Response.serverError().status(Status.INTERNAL_SERVER_ERROR)
                     .build();
@@ -1066 +1078 @@
                 };
             } else {
-                return Response.status(Status.NOT_FOUND).entity("Unsupported raw type "+rawType).build();
+                return Response.status(Status.NOT_FOUND).entity("Unsupported raw type " + rawType).build();
             }
             return createDownloadResponse(result, fileName);