Changeset 1250

Timestamp:

04/27/11 13:27:18 (13 years ago)

Author:

twagoo

Message:

Also accept group name on update & publish profile

File:

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

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

@@ -54 +54 @@
     @Context
     private HttpServletRequest request;
-
     private final static Logger LOG = LoggerFactory.getLogger(ComponentRegistryRestService.class);
-
     public static final String DATA_FORM_FIELD = "data";
     public static final String NAME_FORM_FIELD = "name";
@@ -92 +90 @@
     @GET
     @Path("/components")
-    @Produces( { MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public List<ComponentDescription> getRegisteredComponents(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
         long start = System.currentTimeMillis();
@@ -103 +101 @@
     @GET
     @Path("/profiles")
-    @Produces( { MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public List<ProfileDescription> getRegisteredProfiles(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
         long start = System.currentTimeMillis();
@@ -114 +112 @@
     @GET
     @Path("/components/{componentId}")
-    @Produces( { MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CMDComponentSpec getRegisteredComponent(@PathParam("componentId") String componentId,
             @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
@@ -123 +121 @@
     @GET
     @Path("/components/{componentId}/{rawType}")
-    @Produces( { MediaType.TEXT_XML, MediaType.APPLICATION_XML })
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML})
     public Response getRegisteredComponentRawType(@PathParam("componentId") final String componentId, @PathParam("rawType") String rawType) {
         LOG.info("Component with id: " + componentId + " and rawType:" + rawType + " is requested.");
@@ -136 +134 @@
         if ("xml".equalsIgnoreCase(rawType)) {
             result = new StreamingOutput() {
+
                 public void write(OutputStream output) throws IOException, WebApplicationException {
                     registry.getMDComponentAsXml(componentId, output);
@@ -142 +141 @@
         } else if ("xsd".equalsIgnoreCase(rawType)) {
             result = new StreamingOutput() {
+
                 public void write(OutputStream output) throws IOException, WebApplicationException {
                     registry.getMDComponentAsXsd(componentId, output);
@@ -172 +172 @@
     @GET
     @Path("/profiles/{profileId}")
-    @Produces( { MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CMDComponentSpec getRegisteredProfile(@PathParam("profileId") String profileId,
             @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
@@ -203 +203 @@
     public Response publishRegisteredProfile(@PathParam("profileId") String profileId, @FormDataParam(DATA_FORM_FIELD) InputStream input,
             @FormDataParam(NAME_FORM_FIELD) String name, @FormDataParam(DESCRIPTION_FORM_FIELD) String description,
-            @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
+            @FormDataParam(GROUP_FORM_FIELD) String group, @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
         Principal principal = checkAndGetUserPrincipal();
         ProfileDescription desc = getRegistry(true).getProfileDescription(profileId);
         if (desc != null) {
-            updateDescription(desc, name, description, domainName, null);
+            updateDescription(desc, name, description, domainName, group);
             return register(input, desc, getUserCredentials(principal), true, new PublishAction(principal));
         } else {
@@ -221 +221 @@
             @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @FormDataParam(DATA_FORM_FIELD) InputStream input,
             @FormDataParam(NAME_FORM_FIELD) String name, @FormDataParam(DESCRIPTION_FORM_FIELD) String description,
-            @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
+            @FormDataParam(GROUP_FORM_FIELD) String group, @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
         Principal principal = checkAndGetUserPrincipal();
         UserCredentials userCredentials = getUserCredentials(principal);
         ProfileDescription desc = getRegistry(userspace).getProfileDescription(profileId);
         if (desc != null) {
-            updateDescription(desc, name, description, domainName, null);
+            updateDescription(desc, name, description, domainName, group);
             return register(input, desc, userCredentials, userspace, new UpdateAction());
         } else {
@@ -344 +344 @@
     @GET
     @Path("/profiles/{profileId}/{rawType}")
-    @Produces( { MediaType.TEXT_XML, MediaType.APPLICATION_XML })
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML})
     public Response getRegisteredProfileRawType(@PathParam("profileId") final String profileId, @PathParam("rawType") String rawType) {
         LOG.info("Profile with id: " + profileId + " and rawType:" + rawType + " is requested.");
@@ -358 +358 @@
         if ("xml".equalsIgnoreCase(rawType)) {
             result = new StreamingOutput() {
+
                 public void write(OutputStream output) throws IOException, WebApplicationException {
                     registry.getMDProfileAsXml(profileId, output);
@@ -364 +365 @@
         } else if ("xsd".equalsIgnoreCase(rawType)) {
             result = new StreamingOutput() {
+
                 public void write(OutputStream output) throws IOException, WebApplicationException {
                     registry.getMDProfileAsXsd(profileId, output);
@@ -391 +393 @@
     @POST
     @Path("/profiles")
-    @Produces( { MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Consumes("multipart/form-data")
     public Response registerProfile(@FormDataParam(DATA_FORM_FIELD) InputStream input, @FormDataParam(NAME_FORM_FIELD) String name,
@@ -411 +413 @@
     @POST
     @Path("/components")
-    @Produces( { MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Consumes("multipart/form-data")
     public Response registerComponent(@FormDataParam(DATA_FORM_FIELD) InputStream input, @FormDataParam(NAME_FORM_FIELD) String name,
@@ -431 +433 @@
     @GET
     @Path("/pingSession")
-    @Produces( { MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Response pingSession() {
         boolean stillActive = false;