Changeset 2287

Timestamp:

10/05/12 11:47:03 (12 years ago)

Author:

twagoo

Message:

Some cleaning up and refactoring after code review

Location:

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/RssCreator.java (modified) (26 diffs)
• main/java/clarin/cmdi/componentregistry/RssCreatorComments.java (modified) (2 diffs)
• main/java/clarin/cmdi/componentregistry/RssCreatorDescriptions.java (modified) (2 diffs)
• main/java/clarin/cmdi/componentregistry/model/AbstractDescription.java (modified) (7 diffs)
• main/java/clarin/cmdi/componentregistry/model/Comment.java (modified) (9 diffs)
• main/java/clarin/cmdi/componentregistry/model/ComponentDescription.java (modified) (2 diffs)
• main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (36 diffs)
• test/java/clarin/cmdi/componentregistry/RssCreatorCommentsTest.java (modified) (3 diffs)
• test/java/clarin/cmdi/componentregistry/RssMarshallingTest.java (modified) (1 diff)
• test/java/clarin/cmdi/componentregistry/rest/CMDComponentSetFilenamesToNullTestHelper.java (modified) (1 diff)
• test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTest.java (modified) (4 diffs)
• test/java/clarin/cmdi/componentregistry/rest/xmlRssGeneratingRunner.java (modified) (2 diffs)

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/RssCreator.java

@@ -2 +2 @@
 
 import clarin.cmdi.componentregistry.model.AbstractDescription;
-import clarin.cmdi.componentregistry.rest.ComponentRegistryRestService;
 import clarin.cmdi.componentregistry.rss.Category;
 import clarin.cmdi.componentregistry.rss.Cloud;
@@ -9 +8 @@
 import clarin.cmdi.componentregistry.rss.Rss;
 import clarin.cmdi.componentregistry.rss.RssChannel;
-
 import clarin.cmdi.componentregistry.rss.RssItem;
 import clarin.cmdi.componentregistry.rss.SkipDaysList;
@@ -18 +16 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
-import javax.xml.bind.DatatypeConverter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
@@ -31 +25 @@
 public abstract class RssCreator<T> { // extends nothing so far, throuw nothing // make it abstract
 
-    
     private String title;
     private String link;
@@ -54 +47 @@
     private double version = 2.0; // of an rss
 
-    
-
     public double getVersion() {
-        return (version);
+        return (version);
     }
 
@@ -65 +56 @@
      */
     public void setVersion(double version) {
-        this.version = version;
+        this.version = version;
     }
 
@@ -75 +66 @@
      */
     public void setTitle(String value) {
-        this.title = value;
+        this.title = value;
     }
 
     public String getTitle() {
-        return this.title;
+        return this.title;
     }
 
@@ -89 +80 @@
      */
     public void setLink(String value) {
-        this.link = value;
+        this.link = value;
     }
 
     public String getLink() {
-        return this.link;
+        return this.link;
     }
     
@@ -110 +101 @@
      */
     public void setDescription(String value) {
-        this.description = value;
+        this.description = value;
     }
 
@@ -120 +111 @@
      */
     public void setLanguage(String value) {
-        this.language = value;
+        this.language = value;
     }
 
@@ -130 +121 @@
      */
     public void setCopyright(String value) {
-        this.copyright = value;
+        this.copyright = value;
     }
 
@@ -140 +131 @@
      */
     public void setManagingEditor(String value) {
-        this.managingEditor = value;
+        this.managingEditor = value;
     }
 
@@ -150 +141 @@
      */
     public void setWebMaster(String value) {
-        this.webMaster = value;
+        this.webMaster = value;
     }
 
@@ -160 +151 @@
      */
     public void setPubDate(String value) {
-        this.pubDate = value;
+        this.pubDate = value;
     }
 
@@ -170 +161 @@
      */
     public void setLastBuildDate(String value) {
-        this.lastBuildDate = value;
+        this.lastBuildDate = value;
     }
 
@@ -180 +171 @@
      */
     public void setCategory(Category value) {
-        this.category = value;
+        this.category = value;
     }
 
@@ -190 +181 @@
      */
     public void setGenerator(String value) {
-        this.generator = value;
+        this.generator = value;
     }
 
@@ -200 +191 @@
      */
     public void setDocs(String value) {
-        this.docs = value;
+        this.docs = value;
     }
 
@@ -210 +201 @@
      */
     public void setCloud(Cloud value) {
-        this.cloud = value;
+        this.cloud = value;
     }
 
@@ -220 +211 @@
      */
     public void setTtl(BigInteger value) {
-        this.ttl = value;
+        this.ttl = value;
     }
 
@@ -230 +221 @@
      */
     public void setImage(Image value) {
-        this.image = value;
+        this.image = value;
     }
 
@@ -240 +231 @@
      */
     public void setRating(String value) {
-        this.rating = value;
+        this.rating = value;
     }
 
@@ -250 +241 @@
      */
     public void setTextInput(TextInput value) {
-        this.textInput = value;
+        this.textInput = value;
     }
 
@@ -260 +251 @@
      */
     public void setSkipHours(SkipHoursList value) {
-        this.skipHours = value;
+        this.skipHours = value;
     }
 
@@ -270 +261 @@
      */
     public void setSkipDays(SkipDaysList value) {
-        this.skipDays = value;
+        this.skipDays = value;
     }
 
@@ -276 +267 @@
     protected abstract RssItem fromArgToRssItem(T obj) throws ParseException;
 
-    //makes (and returns ) an  rss out of a list of RssItems
+    /**
+     * Makes an rss out of a list of RssItems
+     *
+     * @param rssItems
+     * @return rss from the RssItems
+     */
     private Rss makeRssChannel(List<RssItem> rssItems) {
-
-        final Rss rss = new Rss();
-        final RssChannel channel = new RssChannel();
-
-        channel.setCategory(category);
-        channel.setCloud(cloud);
-        channel.setCopyright(copyright);
-        channel.setDescription(description);
-        channel.setDocs(docs);
-        channel.setGenerator(generator);
-        channel.setImage(image);
-        channel.setLanguage(language);
-        channel.setLastBuildDate(lastBuildDate);
-        channel.setLink(link);
-        channel.setManagingEditor(managingEditor);
-        channel.setPubDate(pubDate);
-        channel.setRating(rating);
-        channel.setSkipDays(skipDays);
-        channel.setSkipHours(skipHours);
-        channel.setTextInput(textInput);
-        channel.setTitle(title);
-        channel.setTtl(ttl);
-        channel.setWebMaster(webMaster);
-
-
-        rss.setChannel(channel);
-
-        rss.setVersion(version);
-
-
-
-
-        for (RssItem currentItem : rssItems) {
-            channel.getItem().add(currentItem);
-        }
-
-        return rss;
-    }
-
-    //makes (and returns) a list of items out a list of descriptions, return the pointer to the list of items
+        final Rss rss = new Rss();
+        final RssChannel channel = new RssChannel();
+
+        channel.setCategory(category);
+        channel.setCloud(cloud);
+        channel.setCopyright(copyright);
+        channel.setDescription(description);
+        channel.setDocs(docs);
+        channel.setGenerator(generator);
+        channel.setImage(image);
+        channel.setLanguage(language);
+        channel.setLastBuildDate(lastBuildDate);
+        channel.setLink(link);
+        channel.setManagingEditor(managingEditor);
+        channel.setPubDate(pubDate);
+        channel.setRating(rating);
+        channel.setSkipDays(skipDays);
+        channel.setSkipHours(skipHours);
+        channel.setTextInput(textInput);
+        channel.setTitle(title);
+        channel.setTtl(ttl);
+        channel.setWebMaster(webMaster);
+
+        rss.setChannel(channel);
+        rss.setVersion(version);
+
+        for (RssItem currentItem : rssItems) {
+            channel.getItem().add(currentItem);
+        }
+
+        return rss;
+    }
+
+    /**
+     * Makes a list of items out a list of descriptions, return the pointer to the list of items
+     *
+     * @param descriptions
+     * @return items out a list of descriptions
+     * @throws ParseException
+     */
     private List<RssItem> makeListOfRssItems(List<T> objs) throws ParseException {
-        List<RssItem> listOfItems = new ArrayList<RssItem>();
+        List<RssItem> listOfItems = new ArrayList<RssItem>();
 
         for (T currentObj : objs) {
-
             RssItem currentItem = fromArgToRssItem(currentObj);
-            listOfItems.add(currentItem);
-        }
-
-        return listOfItems;
+            listOfItems.add(currentItem);
+        }
+
+        return listOfItems;
     }
 
     public Rss makeRss(List<T> objs) throws ParseException {
-        return (makeRssChannel(makeListOfRssItems(objs)));
+        return (makeRssChannel(makeListOfRssItems(objs)));
     }
 
     // Helping stuff 
     protected Guid makeGuid(String href) {
-        Guid result = new Guid();
-        // result.setIsPermaLink(null);
-        result.setValue(href);
-        return result;
+        Guid result = new Guid();
+        // result.setIsPermaLink(null);
+        result.setValue(href);
+        return result;
     }
 
     /// Helping stuff: for working with dates
     private static Date parseWorks(String dateString) {
-        Date d = null;
-        try {
-            d = AbstractDescription.getDate(dateString);
-        } catch (ParseException pe) {
-            return null;
-        };
-        return d;
+        try {
+            return AbstractDescription.getDate(dateString);
+        } catch (ParseException pe) {
+            return null;
+        }
     }
 
     protected String getRFCDateTime(String dateString) {
-
-        Date date = parseWorks(dateString);
-
-        if (date == null) {
-            return dateString;
-        } else {
-            SimpleDateFormat RFC822DATEFORMAT = new SimpleDateFormat("EEE', 'dd' 'MMM' 'yyyy' 'HH:mm:ss' 'Z");
-            return RFC822DATEFORMAT.format(date);
-        }
-    }
-
-    
-    ///////
-    // returns 1 if ds1 is older (before) than ds2, returns -1 if ds1 is younger (after) than ds2
-    public static int compareDateStrings(String ds1, String ds2) {
-
-        int result = 0;
-
-        Date d1 = parseWorks(ds1);
-        Date d2 = parseWorks(ds2);
-
-        if (d1 == null) {
-            if (d2 == null) {
-                result = 0;
-            } else {
-                result = 1;
-            }
-        } else {
-            if (d2 == null) {
-                result = -1;
-            } else {
-                // cpmparteTo reurns:
-                // a value less than 0 if d2 is before d1 (d1 is younger than d2);
-                // a value greater than 0 if d2 is after  d1 (d1 is older than d2)
-                result = d2.compareTo(d1);
-            }
-
-        }
-        return result;
+        final Date date = parseWorks(dateString);
+
+        if (date == null) {
+            return dateString;
+        } else {
+            SimpleDateFormat RFC822DATEFORMAT = new SimpleDateFormat("EEE', 'dd' 'MMM' 'yyyy' 'HH:mm:ss' 'Z");
+            return RFC822DATEFORMAT.format(date);
+        }
+    }
+
+    /**
+     * Compares two date strings
+     *
+     * @param date1
+     * @param date2
+     * @return 1 if date1 is older (before) than date2, returns -1 if date1 is younger (after) than date2, 0 if they are the same
+     */
+    public static int compareDateStrings(String date1, String date2) {
+        final Date d1 = parseWorks(date1);
+        final Date d2 = parseWorks(date2);
+
+        if (d1 == null) {
+            if (d2 == null) {
+                return 0;
+            } else {
+                return 1;
+            }
+        } else {
+            if (d2 == null) {
+                return -1;
+            } else {
+                // compareTo returns:
+                // a value less than 0 if d2 is before d1 (d1 is younger than d2);
+                // a value greater than 0 if d2 is after  d1 (d1 is older than d2)
+                return d2.compareTo(d1);
+            }
+        }
     }
 }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/RssCreatorComments.java

@@ -1 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package clarin.cmdi.componentregistry;
 
-import clarin.cmdi.componentregistry.model.AbstractDescription;
 import clarin.cmdi.componentregistry.model.Comment;
 import clarin.cmdi.componentregistry.rss.RssItem;
@@ -16 +11 @@
 public class RssCreatorComments extends RssCreator<Comment> {
 
-   
-    // creator method, comment to rssItem, ovverrides the dummy method of the RssCreator class
-    // ?? is there a better way than boolean flag to arrange switch beween comment for profiles and commentss for components
-    
-   
-    
-    @Override  
-    protected RssItem fromArgToRssItem(Comment comm) throws ParseException{
+    /**
+     * creator method, comment to rssItem, overrides the dummy method of the RssCreator class
+     *
+     * @param comm
+     * @return
+     * @throws ParseException
+     */
+    @Override
+    protected RssItem fromArgToRssItem(Comment comm) throws ParseException {
+        final String href = super.getLink() + "&commentId=" + comm.getId();
 
-         
-        RssItem retval = new RssItem();
-        
-        
-                //The content 
-        retval.setDescription(comm.getComment()); 
-        String href = super.getLink()+"&commentId="+comm.getId();
-       
-        //Guid
-        retval.setGuid(makeGuid(href));
-        
-        // link
-        retval.setLink(href);
-        
-        
-        
-       
-        //date-Time
-        retval.setPubDate(getRFCDateTime(comm.getCommentDate())); 
-        
-        // Title
-        retval.setTitle(makeCommentTitle(comm.getId(), comm.getUserName()));
-       
-        return retval;
-        
-        
+        RssItem retval = new RssItem();
+        retval.setDescription(comm.getComment());
+        retval.setGuid(makeGuid(href));
+        retval.setLink(href);
+        retval.setPubDate(getRFCDateTime(comm.getCommentDate()));
+        retval.setTitle(String.format("Comment %1$s\nby %2$s", comm.getId(), comm.getUserName()));
+        return retval;
     }
-    
-     protected String  makeCommentTitle(String commentId, String user){
-         
-        return("Comment "+commentId +"\n by "+user+" ");
-           
-       }
-    
 }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/RssCreatorDescriptions.java

@@ -1 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package clarin.cmdi.componentregistry;
 
 import clarin.cmdi.componentregistry.model.AbstractDescription;
 import clarin.cmdi.componentregistry.rss.RssItem;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
@@ -14 +8 @@
  * @author olhsha
  */
-public class RssCreatorDescriptions<T extends AbstractDescription>  extends RssCreator<T> {
-    
- private final static Logger LOG = LoggerFactory.getLogger(RssCreatorDescriptions.class);
-    // creator method, desc to rssItem, ovverrides the dummy method of the RssCreatorClass
-    @Override 
+public class RssCreatorDescriptions<T extends AbstractDescription> extends RssCreator<T> {
+
+    /**
+     * creator method, desc to rssItem, overrides the dummy method of the RssCreatorClass
+     *
+     * @param desc
+     * @return
+     */
+    @Override
     protected RssItem fromArgToRssItem(T desc) {
 
-       
+        //TODO: Make more generic by requiring a link that has at least one (dummy) parameter in URL
+        String connectParam;
+        if (super.getUserspace()) {
+            connectParam = "&";
+        } else {
+            connectParam = "?";
+        }
+        String href = super.getLink() + connectParam + "item=" + desc.getId();
 
-        RssItem retval = new RssItem();
-        
-        //Description (blah-blah)
-        retval.setDescription(desc.getDescription());
-       
-       String connectParam;
-       if (super.getUserspace()) {connectParam="&";} else {connectParam="?";}
-       String href = super.getLink()+connectParam+"item="+desc.getId();
-        
-        //Guid
-        retval.setGuid(makeGuid(href));
-        
-        // link
-        
-        retval.setLink(href);
-        
-        //time-date
-        retval.setPubDate(desc.getRegistrationDate());
-        
-        //Title
-        retval.setTitle(makeDescriptionTitle(desc.getName(),desc.getCreatorName(), desc.getGroupName()));
-        
-        return retval;
-
+        RssItem retval = new RssItem();
+        retval.setDescription(desc.getDescription());
+        retval.setGuid(makeGuid(href));
+        retval.setLink(href);
+        retval.setPubDate(desc.getRegistrationDate());
+        retval.setTitle(makeDescriptionTitle(desc.getName(), desc.getCreatorName(), desc.getGroupName()));
+        return retval;
     }
 
-    protected String makeDescriptionTitle(String name, String creatorname, String group){
-        
-        String help;
-        if (group==null) {help="is unspecified";} else {help=group;};
-         
-        return(name+" by user "+creatorname+", group "+help);
-       
+    protected String makeDescriptionTitle(String name, String creatorname, String group) {
+        final String help = (group == null) ? "is unspecified" : group;
+        return (name + " by user " + creatorname + ", group " + help);
     }
 }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/AbstractDescription.java

@@ -5 +5 @@
 import java.util.Comparator;
 import java.util.Date;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -11 +10 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSeeAlso;
-
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.time.DateFormatUtils;
@@ -34 +32 @@
     private String groupName;
     private int commentsCount;
-    private final static Logger LOG = LoggerFactory.getLogger(AbstractDescription.class);
 
     public void setId(String id) {
-        this.id = id;
+        this.id = id;
     }
 
     public String getId() {
-        return id;
+        return id;
     }
 
     public void setDescription(String description) {
-        this.description = description;
+        this.description = description;
     }
 
     public String getDescription() {
-        return description;
+        return description;
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = name;
     }
 
     public String getName() {
-        return name;
+        return name;
     }
 
     public void setRegistrationDate(String registrationDate) {
-        this.registrationDate = registrationDate;
+        this.registrationDate = registrationDate;
     }
 
     public String getRegistrationDate() {
-        return registrationDate;
+        return registrationDate;
     }
 
     public void setCreatorName(String creatorName) {
-        this.creatorName = creatorName;
+        this.creatorName = creatorName;
     }
 
     public String getCreatorName() {
-        return creatorName;
+        return creatorName;
     }
 
     public void setUserId(String userId) {
-        this.userId = userId;
+        this.userId = userId;
     }
 
@@ -85 +82 @@
      */
     public String getUserId() {
-        return userId;
+        return userId;
     }
 
     public void setDomainName(String domainName) {
-        this.domainName = domainName;
+        this.domainName = domainName;
     }
 
     public String getDomainName() {
-        return domainName;
+        return domainName;
     }
 
     public void setHref(String href) {
-        this.href = href;
+        this.href = href;
     }
 
     public String getHref() {
-        return href;
+        return href;
     }
 
     public void setGroupName(String groupName) {
-        this.groupName = groupName;
+        this.groupName = groupName;
     }
 
     public String getGroupName() {
-        return groupName;
+        return groupName;
     }
 
@@ -116 +113 @@
      */
     public int getCommentsCount() {
-        return commentsCount;
+        return commentsCount;
     }
 
@@ -123 +120 @@
      */
     public void setCommentsCount(int commentsCount) {
-        this.commentsCount = commentsCount;
+        this.commentsCount = commentsCount;
     }
 
     @Override
     public String toString() {
-        return "Name=" + getName() + ", id=" + getId() + ", creatorName=" + getCreatorName() + ", userId=" + getUserId();
+        return "Name=" + getName() + ", id=" + getId() + ", creatorName=" + getCreatorName() + ", userId=" + getUserId();
     }
 
     public boolean isProfile() {
-        return this instanceof ProfileDescription;
+        return this instanceof ProfileDescription;
     }
 
     public String getType() {
-        return isProfile() ? "profile" : "component";
+        return isProfile() ? "profile" : "component";
     }
 
     public static String createNewDate() {
-        return createNewDate(new Date().getTime());
+        return createNewDate(new Date().getTime());
     }
 
     public static String createNewDate(long time) {
-        return DateFormatUtils.formatUTC(time, DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern());
+        return DateFormatUtils.formatUTC(time, DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern());
     }
 
@@ -154 +151 @@
      */
     public boolean isThisTheOwner(String userId) {
-        String userHash = DigestUtils.md5Hex(userId);
-        return userHash.equals(getUserId());
+        String userHash = DigestUtils.md5Hex(userId);
+        return userHash.equals(getUserId());
     }
 
     public static Date getDate(String registrationDate) throws ParseException {
-        return DateUtils.parseDate(registrationDate, new String[]{DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern()});
-    }
-
+        return DateUtils.parseDate(registrationDate, new String[]{DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern()});
+    }
+    
     public static String createPublicHref(String href) {
-        String result = href;
-        if (href != null) {
-            int index = href.indexOf("?");
-            if (index != -1) { //strip off query params the rest should be the public href.
-                result = href.substring(0, index);
-            }
-        }
-        return result;
-    }
+        String result = href;
+        if (href != null) {
+            int index = href.indexOf("?");
+            if (index != -1) { //strip off query params the rest should be the public href.
+                result = href.substring(0, index);
+            }
+        }
+        return result;
+    }
+    /**
+     * Compares two descriptions by the their value as returned by {@link AbstractDescription#getName() }
+     */
     public static final Comparator<? super AbstractDescription> COMPARE_ON_NAME = new Comparator<AbstractDescription>() {
-        @Override
-        public int compare(AbstractDescription o1, AbstractDescription o2) {
-            int result = 0;
-            if (o1.getName() != null && o2.getName() != null) {
-                result = o1.getName().compareToIgnoreCase(o2.getName());
-            }
-            if (o1.getId() != null && result == 0) {
-                result = o1.getId().compareTo(o2.getId());
-            }
-            return result;
-        }
+        @Override
+        public int compare(AbstractDescription o1, AbstractDescription o2) {
+            int result = 0;
+            if (o1.getName() != null && o2.getName() != null) {
+                result = o1.getName().compareToIgnoreCase(o2.getName());
+            }
+            if (o1.getId() != null && result == 0) {
+                result = o1.getId().compareTo(o2.getId());
+            }
+            return result;
+        }
     };
+    /**
+     * Compares two descriptions by the their value as returned by {@link AbstractDescription#getRegistrationDate() () }
+     */
     public static final Comparator<? super AbstractDescription> COMPARE_ON_DATE = new Comparator<AbstractDescription>() {
-        //compare two components by the date of registration
-        // returns 1 if o11 is older than o2, returns -1 if o1 is younger than o2
-        @Override
-        public int compare(AbstractDescription o1, AbstractDescription o2) {
-
-            return (RssCreator.compareDateStrings(o1.getRegistrationDate(), o2.getRegistrationDate()));
-        }
+        /**
+         * @returns 1 if o11 is older than o2, returns -1 if o1 is younger than o2
+         */
+        @Override
+        public int compare(AbstractDescription o1, AbstractDescription o2) {
+
+            return (RssCreator.compareDateStrings(o1.getRegistrationDate(), o2.getRegistrationDate()));
+        }
     };
 }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/Comment.java

@@ -2 +2 @@
 
 import clarin.cmdi.componentregistry.RssCreator;
-import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.Comparator;
 import java.util.Date;
-import javax.xml.bind.DatatypeConverter;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -13 +11 @@
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.apache.commons.lang.time.DateUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
@@ -34 +30 @@
     @XmlTransient // this prevents userId from being serialized to XML and thus exposed (which is useless and undesirable)
     private String userId;
-    private final static Logger LOG = LoggerFactory.getLogger(Comment.class);
 
     public void setComment(String comment) {
-        this.comments = comment;
+        this.comments = comment;
     }
 
     public String getComment() {
-        return comments;
+        return comments;
     }
 
     public void setCommentDate(String commentDate) {
-        this.commentDate = commentDate;
+        this.commentDate = commentDate;
     }
 
     public String getCommentDate() {
-        return commentDate;
+        return commentDate;
     }
 
     public void setId(String commentId) {
-        this.id = commentId;
+        this.id = commentId;
     }
 
     public String getId() {
-        return id;
+        return id;
     }
 
     public String getComponentDescriptionId() {
-        return componentDescriptionId;
+        return componentDescriptionId;
     }
 
     public void setComponentDescriptionId(String ComponentDescriptionId) {
-        this.componentDescriptionId = ComponentDescriptionId;
+        this.componentDescriptionId = ComponentDescriptionId;
     }
 
     public void setProfileDescriptionId(String profileDescriptionId) {
-        this.profileDescriptionId = profileDescriptionId;
+        this.profileDescriptionId = profileDescriptionId;
     }
 
     public String getProfileDescriptionId() {
-        return profileDescriptionId;
+        return profileDescriptionId;
     }
 
     public void setUserId(String userId) {
-        this.userId = userId;
+        this.userId = userId;
     }
 
     public String getUserId() {
-        return userId;
+        return userId;
     }
 
@@ -89 +84 @@
      */
     public String getUserName() {
-        return userName;
+        return userName;
     }
 
@@ -96 +91 @@
      */
     public void setUserName(String userName) {
-        this.userName = userName;
+        this.userName = userName;
     }
 
@@ -103 +98 @@
      */
     public boolean isCanDelete() {
-        return canDelete;
+        return canDelete;
     }
 
@@ -110 +105 @@
      */
     public void setCanDelete(boolean canDelete) {
-        this.canDelete = canDelete;
+        this.canDelete = canDelete;
     }
 
     public static Date getDate(String registrationDate) throws ParseException {
-        return DateUtils.parseDate(registrationDate, new String[]{DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern()});
+        return DateUtils.parseDate(registrationDate, new String[]{DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern()});
     }
 
@@ -121 +116 @@
      */
     public static String createNewDate() {
-        return createNewDate(new Date().getTime());
+        return createNewDate(new Date().getTime());
     }
 
@@ -129 +124 @@
      */
     public static String createNewDate(long time) {
-        return DateFormatUtils.formatUTC(time, DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern());
+        return DateFormatUtils.formatUTC(time, DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern());
     }
 
     public static Comment createANewComment() {
-        Comment com = new Comment();
-        com.setCommentDate(createNewDate());
-        return com;
+        Comment com = new Comment();
+        com.setCommentDate(createNewDate());
+        return com;
     }
-    
+    /**
+     * Compares two commments by their value as returned by {@link Comment#getCommentDate() }
+     */
     public static final Comparator<Comment> COMPARE_ON_DATE = new Comparator<Comment>() {
-        //compare two commments by the date of registration
-         // returns 1 if o11 is older than o2, returns -1 if o1 is younger than o2
-        @Override
-        public int compare(Comment o1, Comment o2) {
+        /**
+         * @return 1 if o11 is older than o2, returns -1 if o1 is younger than o2
+         */
+        @Override
+        public int compare(Comment o1, Comment o2) {
 
-            return (RssCreator.compareDateStrings(o1.getCommentDate(), o2.getCommentDate()));
-        }
+            return (RssCreator.compareDateStrings(o1.getCommentDate(), o2.getCommentDate()));
+        }
     };
 }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/ComponentDescription.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.model;
-
-import java.io.Serializable;
-import java.util.Comparator;
-
-import javax.xml.bind.annotation.XmlRootElement;
 
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.IdSequence;
+import java.io.Serializable;
+import java.util.Comparator;
+import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "componentDescription")
@@ -14 +12 @@
     private static final long serialVersionUID = 1L;
     public static final Comparator<? super ComponentDescription> COMPARE_ON_GROUP_AND_NAME = new Comparator<ComponentDescription>() {
-        public int compare(ComponentDescription o1, ComponentDescription o2) {
-            int result = 0;
-            if (o1.getGroupName() != null && o2.getGroupName() != null) {
-                result = o1.getGroupName().compareToIgnoreCase(o2.getGroupName());
-            }
-            if (result == 0) {
-                if (o1.getName() != null && o2.getName() != null) {
-                    result = o1.getName().compareToIgnoreCase(o2.getName());
-                } else {
-                    result = o1.getId().compareTo(o2.getId());
-                }
-            }
-            return result;
-        }
+        @Override
+        public int compare(ComponentDescription o1, ComponentDescription o2) {
+            int result = 0;
+            if (o1.getGroupName() != null && o2.getGroupName() != null) {
+                result = o1.getGroupName().compareToIgnoreCase(o2.getGroupName());
+            }
+            if (result == 0) {
+                if (o1.getName() != null && o2.getName() != null) {
+                    result = o1.getName().compareToIgnoreCase(o2.getName());
+                } else {
+                    result = o1.getId().compareTo(o2.getId());
+                }
+            }
+            return result;
+        }
     };
-    
 
     public static ComponentDescription createNewDescription() {
-        String id = ComponentRegistry.REGISTRY_ID + "c_" + IdSequence.get();
-        ComponentDescription desc = new ComponentDescription();
-        desc.setId(id);
-        desc.setRegistrationDate(createNewDate());
-        return desc;
+        String id = ComponentRegistry.REGISTRY_ID + "c_" + IdSequence.get();
+        ComponentDescription desc = new ComponentDescription();
+        desc.setId(id);
+        desc.setRegistrationDate(createNewDate());
+        return desc;
     }
 }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -6 +6 @@
 import clarin.cmdi.componentregistry.ComponentStatus;
 import clarin.cmdi.componentregistry.DeleteFailedException;
-import clarin.cmdi.componentregistry.MDMarshaller;
 import clarin.cmdi.componentregistry.Owner;
 import clarin.cmdi.componentregistry.RssCreatorComments;
@@ -23 +22 @@
 import com.sun.jersey.multipart.FormDataParam;
 import com.sun.jersey.spi.inject.Inject;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -97 +93 @@
     @Deprecated
     private static ComponentStatus getStatus(boolean userSpace) {
-        if (userSpace) {
-            return ComponentStatus.DEVELOPMENT;
-        } else {
-            return ComponentStatus.PUBLIC;
-        }
+        if (userSpace) {
+            return ComponentStatus.DEVELOPMENT;
+        } else {
+            return ComponentStatus.PUBLIC;
+        }
     }
 
     private ComponentRegistry getRegistry(ComponentStatus status) {
-        Principal userPrincipal = security.getUserPrincipal();
-        UserCredentials userCredentials = getUserCredentials(userPrincipal);
-        return getRegistry(status, null, userCredentials);
+        Principal userPrincipal = security.getUserPrincipal();
+        UserCredentials userCredentials = getUserCredentials(userPrincipal);
+        return getRegistry(status, null, userCredentials);
     }
 
     private ComponentRegistry getRegistry(ComponentStatus status, Owner owner, UserCredentials userCredentials) {
-        try {
-            return componentRegistryFactory.getComponentRegistry(status, owner, userCredentials);
-        } catch (UserUnauthorizedException uuEx) {
-            //TODO: Throw actual exception and catch nicely
-            throw new RuntimeException("Cannot access requested registry", uuEx);
-        }
+        try {
+            return componentRegistryFactory.getComponentRegistry(status, owner, userCredentials);
+        } catch (UserUnauthorizedException uuEx) {
+            //TODO: Throw actual exception and catch nicely
+            throw new RuntimeException("Cannot access requested registry", uuEx);
+        }
     }
 
@@ -125 +121 @@
      */
     private Principal checkAndGetUserPrincipal() throws UserUnauthorizedException {
-        Principal principal = security.getUserPrincipal();
-        if (principal == null) {
-            throw new UserUnauthorizedException("no user principal found.");
-        }
-        return principal;
+        Principal principal = security.getUserPrincipal();
+        if (principal == null) {
+            throw new UserUnauthorizedException("no user principal found.");
+        }
+        return principal;
     }
 
     private UserCredentials getUserCredentials(Principal userPrincipal) {
-        UserCredentials userCredentials = null;
-        if (userPrincipal != null) {
-            userCredentials = new UserCredentials(userPrincipal);
-        }
-        return userCredentials;
+        UserCredentials userCredentials = null;
+        if (userPrincipal != null) {
+            userCredentials = new UserCredentials(userPrincipal);
+        }
+        return userCredentials;
     }
 
@@ -144 +140 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public List<ComponentDescription> getRegisteredComponents(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        long start = System.currentTimeMillis();
-        List<ComponentDescription> components = getRegistry(getStatus(userspace)).getComponentDescriptions();
-        LOG.info("Releasing " + components.size() + " registered components into the world (" + (System.currentTimeMillis() - start)
-                + " millisecs)");
-        return components;
+        long start = System.currentTimeMillis();
+        List<ComponentDescription> components = getRegistry(getStatus(userspace)).getComponentDescriptions();
+        LOG.info("Releasing " + components.size() + " registered components into the world (" + (System.currentTimeMillis() - start)
+                + " millisecs)");
+        return components;
     }
 
@@ -155 +151 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public List<ProfileDescription> getRegisteredProfiles(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace,
-            @QueryParam(METADATA_EDITOR_PARAM) @DefaultValue("false") boolean metadataEditor) throws ComponentRegistryException {
-        long start = System.currentTimeMillis();
-        List<ProfileDescription> profiles;
-        if (metadataEditor) {
-            profiles = getRegistry(getStatus(userspace)).getProfileDescriptionsForMetadaEditor();
-        } else {
-            profiles = getRegistry(getStatus(userspace)).getProfileDescriptions();
-        }
-
-        LOG.info("Releasing " + profiles.size() + " registered profiles into the world (" + (System.currentTimeMillis() - start)
-                + " millisecs)");
-        return profiles;
+            @QueryParam(METADATA_EDITOR_PARAM) @DefaultValue("false") boolean metadataEditor) throws ComponentRegistryException {
+        long start = System.currentTimeMillis();
+        List<ProfileDescription> profiles;
+        if (metadataEditor) {
+            profiles = getRegistry(getStatus(userspace)).getProfileDescriptionsForMetadaEditor();
+        } else {
+            profiles = getRegistry(getStatus(userspace)).getProfileDescriptions();
+        }
+
+        LOG.info("Releasing " + profiles.size() + " registered profiles into the world (" + (System.currentTimeMillis() - start)
+                + " millisecs)");
+        return profiles;
     }
 
@@ -173 +169 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Response getRegisteredComponent(@PathParam("componentId") String componentId,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        LOG.info("Component with id: " + componentId + " is requested.");
-        CMDComponentSpec mdComponent = getRegistry(getStatus(userspace)).getMDComponent(componentId);
-        if (mdComponent == null) {
-            return Response.status(Status.NOT_FOUND).build();
-        } else {
-            return Response.ok(mdComponent).build();
-        }
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
+        LOG.info("Component with id: " + componentId + " is requested.");
+        CMDComponentSpec mdComponent = getRegistry(getStatus(userspace)).getMDComponent(componentId);
+        if (mdComponent == null) {
+            return Response.status(Status.NOT_FOUND).build();
+        } else {
+            return Response.ok(mdComponent).build();
+        }
     }
 
@@ -187 +183 @@
     @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.");
-        StreamingOutput result = null;
-        try {
-            final ComponentRegistry registry = findRegistry(componentId, new ComponentClosure());
-            if (registry == null) {
-                return Response.status(Status.NOT_FOUND).entity("Id: " + componentId + " is not registered, cannot create data.").build();
-            }
-            ComponentDescription desc = registry.getComponentDescription(componentId);
-            checkAndThrowDescription(desc, componentId);
-            String fileName = desc.getName() + "." + rawType;
-            if ("xml".equalsIgnoreCase(rawType)) {
-                result = new StreamingOutput() {
-                    @Override
-                    public void write(OutputStream output) throws IOException, WebApplicationException {
-                        try {
-                            registry.getMDComponentAsXml(componentId, output);
-                        } catch (ComponentRegistryException e) {
-                            LOG.info("Could not retrieve component", e);
-                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
-                        }
-                    }
-                };
-            } else if ("xsd".equalsIgnoreCase(rawType)) {
-                result = new StreamingOutput() {
-                    @Override
-                    public void write(OutputStream output) throws IOException, WebApplicationException {
-                        try {
-                            registry.getMDComponentAsXsd(componentId, output);
-                        } catch (ComponentRegistryException e) {
-                            LOG.info("Could not retrieve component", e);
-                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
-                        }
-
-                    }
-                };
-            } else {
-                throw new WebApplicationException(Response.serverError().entity(
-                        "unsupported rawType: " + rawType + " (only xml or xsd are supported)").build());
-            }
-            return createDownloadResponse(result, fileName);
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        }
+        LOG.info("Component with id: " + componentId + " and rawType:" + rawType + " is requested.");
+        StreamingOutput result = null;
+        try {
+            final ComponentRegistry registry = findRegistry(componentId, new ComponentClosure());
+            if (registry == null) {
+                return Response.status(Status.NOT_FOUND).entity("Id: " + componentId + " is not registered, cannot create data.").build();
+            }
+            ComponentDescription desc = registry.getComponentDescription(componentId);
+            checkAndThrowDescription(desc, componentId);
+            String fileName = desc.getName() + "." + rawType;
+            if ("xml".equalsIgnoreCase(rawType)) {
+                result = new StreamingOutput() {
+                    @Override
+                    public void write(OutputStream output) throws IOException, WebApplicationException {
+                        try {
+                            registry.getMDComponentAsXml(componentId, output);
+                        } catch (ComponentRegistryException e) {
+                            LOG.info("Could not retrieve component", e);
+                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
+                        }
+                    }
+                };
+            } else if ("xsd".equalsIgnoreCase(rawType)) {
+                result = new StreamingOutput() {
+                    @Override
+                    public void write(OutputStream output) throws IOException, WebApplicationException {
+                        try {
+                            registry.getMDComponentAsXsd(componentId, output);
+                        } catch (ComponentRegistryException e) {
+                            LOG.info("Could not retrieve component", e);
+                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
+                        }
+
+                    }
+                };
+            } else {
+                throw new WebApplicationException(Response.serverError().entity(
+                        "unsupported rawType: " + rawType + " (only xml or xsd are supported)").build());
+            }
+            return createDownloadResponse(result, fileName);
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        }
     }
 
     public ComponentRegistry findRegistry(String id, RegistryClosure<? extends AbstractDescription> clos) throws ComponentRegistryException {
-        AbstractDescription desc = null;
-        ComponentRegistry result = getRegistry(getStatus(false));
-        desc = clos.getDescription(result, id);
-        if (desc == null) {
-            List<ComponentRegistry> userRegs = componentRegistryFactory.getAllUserRegistries();
-            for (ComponentRegistry reg : userRegs) {
-                desc = clos.getDescription(reg, id);
-                if (desc != null) {
-                    result = reg;
-                    break;
-                }
-            }
-        }
-        return result;
+        AbstractDescription desc = null;
+        ComponentRegistry result = getRegistry(getStatus(false));
+        desc = clos.getDescription(result, id);
+        if (desc == null) {
+            List<ComponentRegistry> userRegs = componentRegistryFactory.getAllUserRegistries();
+            for (ComponentRegistry reg : userRegs) {
+                desc = clos.getDescription(reg, id);
+                if (desc != null) {
+                    result = reg;
+                    break;
+                }
+            }
+        }
+        return result;
     }
 
@@ -254 +250 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Response getRegisteredProfile(@PathParam("profileId") String profileId,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        LOG.info("Profile with id: " + profileId + " is requested.");
-        CMDComponentSpec mdProfile = getRegistry(getStatus(userspace)).getMDProfile(profileId);
-        if (mdProfile == null) {
-            return Response.status(Status.NOT_FOUND).build();
-        } else {
-            return Response.ok(mdProfile).build();
-        }
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
+        LOG.info("Profile with id: " + profileId + " is requested.");
+        CMDComponentSpec mdProfile = getRegistry(getStatus(userspace)).getMDProfile(profileId);
+        if (mdProfile == null) {
+            return Response.status(Status.NOT_FOUND).build();
+        } else {
+            return Response.ok(mdProfile).build();
+        }
     }
 
@@ -268 +264 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public List<AbstractDescription> getComponentUsage(@PathParam("componentId") String componentId, @QueryParam(USERSPACE_PARAM) @DefaultValue("true") boolean userspace) throws ComponentRegistryException {
-        try {
-            final long start = System.currentTimeMillis();
-            ComponentRegistry registry = getRegistry(getStatus(userspace));
-            List<ComponentDescription> components = registry.getUsageInComponents(componentId);
-            List<ProfileDescription> profiles = registry.getUsageInProfiles(componentId);
-
-            LOG.info("Found " + components.size() + " components and " + profiles.size() + " profiles that use component " + componentId
-                    + " (" + (System.currentTimeMillis() - start) + " millisecs)");
-
-            List<AbstractDescription> usages = new ArrayList<AbstractDescription>(components.size() + profiles.size());
-            usages.addAll(components);
-            usages.addAll(profiles);
-
-            return usages;
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve profile usage", e);
-            throw e;
-        }
+        try {
+            final long start = System.currentTimeMillis();
+            ComponentRegistry registry = getRegistry(getStatus(userspace));
+            List<ComponentDescription> components = registry.getUsageInComponents(componentId);
+            List<ProfileDescription> profiles = registry.getUsageInProfiles(componentId);
+
+            LOG.info("Found " + components.size() + " components and " + profiles.size() + " profiles that use component " + componentId
+                    + " (" + (System.currentTimeMillis() - start) + " millisecs)");
+
+            List<AbstractDescription> usages = new ArrayList<AbstractDescription>(components.size() + profiles.size());
+            usages.addAll(components);
+            usages.addAll(profiles);
+
+            return usages;
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve profile usage", e);
+            throw e;
+        }
     }
 
@@ -292 +288 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public List<Comment> getCommentsFromProfile(@PathParam("profileId") String profileId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        long start = System.currentTimeMillis();
-        final Principal principal = security.getUserPrincipal();
-        List<Comment> comments = getRegistry(getStatus(userspace)).getCommentsInProfile(profileId, principal);
-        LOG.info("Releasing " + comments.size() + " registered comments in Profile into the world (" + (System.currentTimeMillis() - start)
-                + " millisecs)");
-        return comments;
+        long start = System.currentTimeMillis();
+        final Principal principal = security.getUserPrincipal();
+        List<Comment> comments = getRegistry(getStatus(userspace)).getCommentsInProfile(profileId, principal);
+        LOG.info("Releasing " + comments.size() + " registered comments in Profile into the world (" + (System.currentTimeMillis() - start)
+                + " millisecs)");
+        return comments;
     }
 
@@ -304 +300 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public List<Comment> getCommentsFromComponent(@PathParam("componentId") String componentId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        long start = System.currentTimeMillis();
-        final Principal principal = security.getUserPrincipal();
-        List<Comment> comments = getRegistry(getStatus(userspace)).getCommentsInComponent(componentId, principal);
-        LOG.info("Releasing " + comments.size() + " registered comments in Component into the world (" + (System.currentTimeMillis() - start)
-                + " millisecs)");
-        return comments;
+        long start = System.currentTimeMillis();
+        final Principal principal = security.getUserPrincipal();
+        List<Comment> comments = getRegistry(getStatus(userspace)).getCommentsInComponent(componentId, principal);
+        LOG.info("Releasing " + comments.size() + " registered comments in Component into the world (" + (System.currentTimeMillis() - start)
+                + " millisecs)");
+        return comments;
     }
 
@@ -316 +312 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Comment getSpecifiedCommentFromProfile(@PathParam("profileId") String profileId, @PathParam("commentId") String commentId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        LOG.info(" Comments of component with id" + commentId + " are requested.");
-        final Principal principal = security.getUserPrincipal();
-        return getRegistry(getStatus(userspace)).getSpecifiedCommentInProfile(profileId, commentId, principal);
+        LOG.info(" Comments of component with id" + commentId + " are requested.");
+        final Principal principal = security.getUserPrincipal();
+        return getRegistry(getStatus(userspace)).getSpecifiedCommentInProfile(profileId, commentId, principal);
     }
 
@@ -325 +321 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Comment getSpecifiedCommentFromComponent(@PathParam("componentId") String componentId, @PathParam("commentId") String commentId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        LOG.info(" Comments of component with id" + commentId + " are requested.");
-        final Principal principal = security.getUserPrincipal();
-        return getRegistry(getStatus(userspace)).getSpecifiedCommentInComponent(componentId, commentId, principal);
+        LOG.info(" Comments of component with id" + commentId + " are requested.");
+        final Principal principal = security.getUserPrincipal();
+        return getRegistry(getStatus(userspace)).getSpecifiedCommentInComponent(componentId, commentId, principal);
     }
 
@@ -342 +338 @@
     @Path("/profiles/{profileId}")
     public Response manipulateRegisteredProfile(@PathParam("profileId") String profileId, @FormParam("method") String method,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        if ("delete".equalsIgnoreCase(method)) {
-            return deleteRegisteredProfile(profileId, userspace);
-        } else {
-            return Response.ok().build();
-        }
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        if ("delete".equalsIgnoreCase(method)) {
+            return deleteRegisteredProfile(profileId, userspace);
+        } else {
+            return Response.ok().build();
+        }
     }
 
@@ -353 +349 @@
     @Path("/profiles/{profileId}/comments/{commentId}")
     public Response manipulateCommentFromProfile(@PathParam("profileId") String profileId, @PathParam("commentId") String commentId, @FormParam("method") String method,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        if ("delete".equalsIgnoreCase(method)) {
-            return deleteCommentFromProfile(profileId, commentId, userspace);
-        } else {
-            return Response.ok().build();
-        }
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        if ("delete".equalsIgnoreCase(method)) {
+            return deleteCommentFromProfile(profileId, commentId, userspace);
+        } else {
+            return Response.ok().build();
+        }
     }
 
@@ -364 +360 @@
     @Path("/components/{componentId}/comments/{commentId}")
     public Response manipulateCommentFromComponent(@PathParam("componentId") String componentId, @PathParam("commentId") String commentId, @FormParam("method") String method,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        if ("delete".equalsIgnoreCase(method)) {
-            return deleteCommentFromComponent(componentId, commentId, userspace);
-        } else {
-            return Response.ok().build();
-        }
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        if ("delete".equalsIgnoreCase(method)) {
+            return deleteCommentFromComponent(componentId, commentId, userspace);
+        } else {
+            return Response.ok().build();
+        }
     }
 
@@ -376 +372 @@
     @Consumes("multipart/form-data")
     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(GROUP_FORM_FIELD) String group, @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            ProfileDescription desc = getRegistry(getStatus(true)).getProfileDescription(profileId);
-            if (desc != null) {
-                updateDescription(desc, name, description, domainName, group);
-                return register(input, desc, getUserCredentials(principal), true, new PublishAction(principal));
-            } else {
-                LOG.error("Update of nonexistent id (" + profileId + ") failed.");
-                return Response.serverError().entity("Invalid id, cannot update nonexistent profile").build();
-            }
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @FormDataParam(NAME_FORM_FIELD) String name, @FormDataParam(DESCRIPTION_FORM_FIELD) String description,
+            @FormDataParam(GROUP_FORM_FIELD) String group, @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            ProfileDescription desc = getRegistry(getStatus(true)).getProfileDescription(profileId);
+            if (desc != null) {
+                updateDescription(desc, name, description, domainName, group);
+                return register(input, desc, getUserCredentials(principal), true, new PublishAction(principal));
+            } else {
+                LOG.error("Update of nonexistent id (" + profileId + ") failed.");
+                return Response.serverError().entity("Invalid id, cannot update nonexistent profile").build();
+            }
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
     }
 
@@ -400 +396 @@
     @Consumes("multipart/form-data")
     public Response updateRegisteredProfile(@PathParam("profileId") String profileId,
-            @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(GROUP_FORM_FIELD) String group, @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            UserCredentials userCredentials = getUserCredentials(principal);
-            ProfileDescription desc = getRegistry(getStatus(userspace)).getProfileDescription(profileId);
-            if (desc != null) {
-                updateDescription(desc, name, description, domainName, group);
-                return register(input, desc, userCredentials, userspace, new UpdateAction(principal));
-            } else {
-                LOG.error("Update of nonexistent id (" + profileId + ") failed.");
-                return Response.serverError().entity("Invalid id, cannot update nonexistent profile").build();
-            }
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @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(GROUP_FORM_FIELD) String group, @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            UserCredentials userCredentials = getUserCredentials(principal);
+            ProfileDescription desc = getRegistry(getStatus(userspace)).getProfileDescription(profileId);
+            if (desc != null) {
+                updateDescription(desc, name, description, domainName, group);
+                return register(input, desc, userCredentials, userspace, new UpdateAction(principal));
+            } else {
+                LOG.error("Update of nonexistent id (" + profileId + ") failed.");
+                return Response.serverError().entity("Invalid id, cannot update nonexistent profile").build();
+            }
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
 
     }
@@ -435 +431 @@
     @Path("/components/{componentId}")
     public Response manipulateRegisteredComponent(@PathParam("componentId") String componentId, @FormParam("method") String method,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        if ("delete".equalsIgnoreCase(method)) {
-            return deleteRegisteredComponent(componentId, userspace);
-        } else {
-            return Response.ok().build();
-        }
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        if ("delete".equalsIgnoreCase(method)) {
+            return deleteRegisteredComponent(componentId, userspace);
+        } else {
+            return Response.ok().build();
+        }
     }
 
@@ -447 +443 @@
     @Consumes("multipart/form-data")
     public Response publishRegisteredComponent(@PathParam("componentId") String componentId,
-            @FormDataParam(DATA_FORM_FIELD) InputStream input, @FormDataParam(NAME_FORM_FIELD) String name,
-            @FormDataParam(DESCRIPTION_FORM_FIELD) String description, @FormDataParam(GROUP_FORM_FIELD) String group,
-            @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            // TODO: Get status from parameter
-            ComponentDescription desc = getRegistry(getStatus(true)).getComponentDescription(componentId);
-            if (desc != null) {
-                updateDescription(desc, name, description, domainName, group);
-                return register(input, desc, getUserCredentials(principal), true, new PublishAction(principal));
-            } else {
-                LOG.error("Update of nonexistent id (" + componentId + ") failed.");
-                return Response.serverError().entity("Invalid id, cannot update nonexistent profile").build();
-            }
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @FormDataParam(DATA_FORM_FIELD) InputStream input, @FormDataParam(NAME_FORM_FIELD) String name,
+            @FormDataParam(DESCRIPTION_FORM_FIELD) String description, @FormDataParam(GROUP_FORM_FIELD) String group,
+            @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            // TODO: Get status from parameter
+            ComponentDescription desc = getRegistry(getStatus(true)).getComponentDescription(componentId);
+            if (desc != null) {
+                updateDescription(desc, name, description, domainName, group);
+                return register(input, desc, getUserCredentials(principal), true, new PublishAction(principal));
+            } else {
+                LOG.error("Update of nonexistent id (" + componentId + ") failed.");
+                return Response.serverError().entity("Invalid id, cannot update nonexistent profile").build();
+            }
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
     }
 
@@ -473 +469 @@
     @Consumes("multipart/form-data")
     public Response updateRegisteredComponent(@PathParam("componentId") String componentId,
-            @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(GROUP_FORM_FIELD) String group, @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            ComponentDescription desc = getRegistry(getStatus(userspace)).getComponentDescription(componentId);
-            if (desc != null) {
-                updateDescription(desc, name, description, domainName, group);
-                return register(input, desc, getUserCredentials(principal), userspace, new UpdateAction(principal));
-            } else {
-                LOG.error("Update of nonexistent id (" + componentId + ") failed.");
-                return Response.serverError().entity("Invalid id, cannot update nonexistent component").build();
-            }
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @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(GROUP_FORM_FIELD) String group, @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            ComponentDescription desc = getRegistry(getStatus(userspace)).getComponentDescription(componentId);
+            if (desc != null) {
+                updateDescription(desc, name, description, domainName, group);
+                return register(input, desc, getUserCredentials(principal), userspace, new UpdateAction(principal));
+            } else {
+                LOG.error("Update of nonexistent id (" + componentId + ") failed.");
+                return Response.serverError().entity("Invalid id, cannot update nonexistent component").build();
+            }
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
     }
 
     private void updateDescription(AbstractDescription desc, String name, String description, String domainName, String group) {
-        desc.setName(name);
-        desc.setDescription(description);
-        desc.setDomainName(domainName);
-        desc.setGroupName(group);
-        desc.setRegistrationDate(AbstractDescription.createNewDate());
+        desc.setName(name);
+        desc.setDescription(description);
+        desc.setDomainName(domainName);
+        desc.setGroupName(group);
+        desc.setRegistrationDate(AbstractDescription.createNewDate());
     }
 
@@ -505 +501 @@
     @Path("/components/{componentId}")
     public Response deleteRegisteredComponent(@PathParam("componentId") String componentId,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            ComponentRegistry registry = getRegistry(getStatus(userspace));
-            LOG.info("Component with id: " + componentId + " set for deletion.");
-            registry.deleteMDComponent(componentId, principal, false);
-        } catch (DeleteFailedException e) {
-            LOG.info("Component with id: " + componentId + " deletion failed.", e);
-            return Response.status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
-        } catch (ComponentRegistryException e) {
-            LOG.info("Component with id: " + componentId + " deletion failed.", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (IOException e) {
-            LOG.info("Component with id: " + componentId + " deletion failed.", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException e) {
-            LOG.info("Component with id: " + componentId + " deletion failed: " + e.getMessage());
-            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
-        }
-        LOG.info("Component with id: " + componentId + " deleted.");
-        return Response.ok().build();
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            ComponentRegistry registry = getRegistry(getStatus(userspace));
+            LOG.info("Component with id: " + componentId + " set for deletion.");
+            registry.deleteMDComponent(componentId, principal, false);
+        } catch (DeleteFailedException e) {
+            LOG.info("Component with id: " + componentId + " deletion failed.", e);
+            return Response.status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
+        } catch (ComponentRegistryException e) {
+            LOG.info("Component with id: " + componentId + " deletion failed.", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (IOException e) {
+            LOG.info("Component with id: " + componentId + " deletion failed.", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException e) {
+            LOG.info("Component with id: " + componentId + " deletion failed: " + e.getMessage());
+            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
+        }
+        LOG.info("Component with id: " + componentId + " deleted.");
+        return Response.ok().build();
     }
 
@@ -531 +527 @@
     @Path("/profiles/{profileId}")
     public Response deleteRegisteredProfile(@PathParam("profileId") String profileId,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            LOG.info("Profile with id: " + profileId + " set for deletion.");
-            getRegistry(getStatus(userspace)).deleteMDProfile(profileId, principal);
-        } catch (DeleteFailedException e) {
-            LOG.info("Profile with id: " + profileId + " deletion failed: " + e.getMessage());
-            return Response.serverError().status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (IOException e) {
-            LOG.info("Profile with id: " + profileId + " deletion failed.", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException e) {
-            LOG.info("Profile with id: " + profileId + " deletion failed: " + e.getMessage());
-            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
-        }
-        LOG.info("Profile with id: " + profileId + " deleted.");
-        return Response.ok().build();
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            LOG.info("Profile with id: " + profileId + " set for deletion.");
+            getRegistry(getStatus(userspace)).deleteMDProfile(profileId, principal);
+        } catch (DeleteFailedException e) {
+            LOG.info("Profile with id: " + profileId + " deletion failed: " + e.getMessage());
+            return Response.serverError().status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (IOException e) {
+            LOG.info("Profile with id: " + profileId + " deletion failed.", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException e) {
+            LOG.info("Profile with id: " + profileId + " deletion failed: " + e.getMessage());
+            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
+        }
+        LOG.info("Profile with id: " + profileId + " deleted.");
+        return Response.ok().build();
     }
 
@@ -556 +552 @@
     @Path("/profiles/{profileId}/comments/{commentId}")
     public Response deleteCommentFromProfile(@PathParam("profileId") String profileId, @PathParam("commentId") String commentId,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        try {
-            final Principal principal = checkAndGetUserPrincipal();
-            final ComponentRegistry registry = getRegistry(getStatus(userspace));
-            final Comment comment = registry.getSpecifiedCommentInProfile(profileId, commentId, principal);
-            if (comment != null && profileId.equals(comment.getProfileDescriptionId())) {
-                LOG.info("Comment with id: " + commentId + " set for deletion.");
-                registry.deleteComment(commentId, principal);
-            } else {
-                throw new ComponentRegistryException("Comment not found for specified profile");
-            }
-        } catch (DeleteFailedException e) {
-            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
-            return Response.serverError().status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (IOException e) {
-            LOG.info("Comment with id: " + commentId + " deletion failed.", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException e) {
-            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
-            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
-        }
-        LOG.info("Comment with id: " + commentId + " deleted.");
-        return Response.ok().build();
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        try {
+            final Principal principal = checkAndGetUserPrincipal();
+            final ComponentRegistry registry = getRegistry(getStatus(userspace));
+            final Comment comment = registry.getSpecifiedCommentInProfile(profileId, commentId, principal);
+            if (comment != null && profileId.equals(comment.getProfileDescriptionId())) {
+                LOG.info("Comment with id: " + commentId + " set for deletion.");
+                registry.deleteComment(commentId, principal);
+            } else {
+                throw new ComponentRegistryException("Comment not found for specified profile");
+            }
+        } catch (DeleteFailedException e) {
+            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
+            return Response.serverError().status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (IOException e) {
+            LOG.info("Comment with id: " + commentId + " deletion failed.", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException e) {
+            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
+            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
+        }
+        LOG.info("Comment with id: " + commentId + " deleted.");
+        return Response.ok().build();
     }
 
@@ -587 +583 @@
     @Path("/components/{componentId}/comments/{commentId}")
     public Response deleteCommentFromComponent(@PathParam("componentId") String componentId, @PathParam("commentId") String commentId,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        try {
-            final Principal principal = checkAndGetUserPrincipal();
-            final ComponentRegistry registry = getRegistry(getStatus(userspace));
-            final Comment comment = registry.getSpecifiedCommentInComponent(componentId, commentId, principal);
-            if (comment != null && componentId.equals(comment.getComponentDescriptionId())) {
-                LOG.info("Comment with id: " + commentId + " set for deletion.");
-                registry.deleteComment(commentId, principal);
-            } else {
-                throw new ComponentRegistryException("Comment not found for specified component");
-            }
-        } catch (DeleteFailedException e) {
-            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
-            return Response.serverError().status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (IOException e) {
-            LOG.info("Comment with id: " + commentId + " deletion failed.", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException e) {
-            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
-            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
-        }
-        LOG.info("Comment with id: " + commentId + " deleted.");
-        return Response.ok().build();
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        try {
+            final Principal principal = checkAndGetUserPrincipal();
+            final ComponentRegistry registry = getRegistry(getStatus(userspace));
+            final Comment comment = registry.getSpecifiedCommentInComponent(componentId, commentId, principal);
+            if (comment != null && componentId.equals(comment.getComponentDescriptionId())) {
+                LOG.info("Comment with id: " + commentId + " set for deletion.");
+                registry.deleteComment(commentId, principal);
+            } else {
+                throw new ComponentRegistryException("Comment not found for specified component");
+            }
+        } catch (DeleteFailedException e) {
+            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
+            return Response.serverError().status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (IOException e) {
+            LOG.info("Comment with id: " + commentId + " deletion failed.", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException e) {
+            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
+            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
+        }
+        LOG.info("Comment with id: " + commentId + " deleted.");
+        return Response.ok().build();
     }
 
@@ -619 +615 @@
     @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.");
-        StreamingOutput result = null;
-        try {
-            final ComponentRegistry registry = findRegistry(profileId, new ProfileClosure());
-            if (registry == null) {
-                return Response.status(Status.NOT_FOUND).entity("Id: " + profileId + " is not registered, cannot create data.").build();
-            }
-            ProfileDescription desc = registry.getProfileDescription(profileId);
-            checkAndThrowDescription(desc, profileId);
-            String fileName = desc.getName() + "." + rawType;
-
-            if ("xml".equalsIgnoreCase(rawType)) {
-                result = new StreamingOutput() {
-                    @Override
-                    public void write(OutputStream output) throws IOException, WebApplicationException {
-                        try {
-                            registry.getMDProfileAsXml(profileId, output);
-                        } catch (ComponentRegistryException e) {
-                            LOG.warn("Could not retrieve component", e);
-                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
-                        }
-                    }
-                };
-            } else if ("xsd".equalsIgnoreCase(rawType)) {
-                result = new StreamingOutput() {
-                    @Override
-                    public void write(OutputStream output) throws IOException, WebApplicationException {
-                        try {
-                            registry.getMDProfileAsXsd(profileId, output);
-                        } catch (ComponentRegistryException e) {
-                            LOG.warn("Could not retrieve component", e);
-                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
-                        }
-                    }
-                };
-            } else {
-                throw new WebApplicationException(Response.serverError().entity(
-                        "unsupported rawType: " + rawType + " (only xml or xsd are supported)").build());
-            }
-            return createDownloadResponse(result, fileName);
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        }
+        LOG.info("Profile with id: " + profileId + " and rawType:" + rawType + " is requested.");
+        StreamingOutput result = null;
+        try {
+            final ComponentRegistry registry = findRegistry(profileId, new ProfileClosure());
+            if (registry == null) {
+                return Response.status(Status.NOT_FOUND).entity("Id: " + profileId + " is not registered, cannot create data.").build();
+            }
+            ProfileDescription desc = registry.getProfileDescription(profileId);
+            checkAndThrowDescription(desc, profileId);
+            String fileName = desc.getName() + "." + rawType;
+
+            if ("xml".equalsIgnoreCase(rawType)) {
+                result = new StreamingOutput() {
+                    @Override
+                    public void write(OutputStream output) throws IOException, WebApplicationException {
+                        try {
+                            registry.getMDProfileAsXml(profileId, output);
+                        } catch (ComponentRegistryException e) {
+                            LOG.warn("Could not retrieve component", e);
+                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
+                        }
+                    }
+                };
+            } else if ("xsd".equalsIgnoreCase(rawType)) {
+                result = new StreamingOutput() {
+                    @Override
+                    public void write(OutputStream output) throws IOException, WebApplicationException {
+                        try {
+                            registry.getMDProfileAsXsd(profileId, output);
+                        } catch (ComponentRegistryException e) {
+                            LOG.warn("Could not retrieve component", e);
+                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
+                        }
+                    }
+                };
+            } else {
+                throw new WebApplicationException(Response.serverError().entity(
+                        "unsupported rawType: " + rawType + " (only xml or xsd are supported)").build());
+            }
+            return createDownloadResponse(result, fileName);
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        }
     }
 
     private void checkAndThrowDescription(AbstractDescription desc, String id) {
-        if (desc == null) {
-            throw new WebApplicationException(Response.serverError().entity("Incorrect id:" + id + "cannot handle request").build());
-        }
+        if (desc == null) {
+            throw new WebApplicationException(Response.serverError().entity("Incorrect id:" + id + "cannot handle request").build());
+        }
     }
 
     private Response createDownloadResponse(StreamingOutput result, String fileName) {
-        //Making response so it triggers browsers native save as dialog.
-        Response response = Response.ok().type("application/x-download").header("Content-Disposition",
-                "attachment; filename=\"" + fileName + "\"").entity(result).build();
-        return response;
+        //Making response so it triggers browsers native save as dialog.
+        Response response = Response.ok().type("application/x-download").header("Content-Disposition",
+                "attachment; filename=\"" + fileName + "\"").entity(result).build();
+        return response;
 
     }
@@ -684 +680 @@
     @Consumes("multipart/form-data")
     public Response registerProfile(@FormDataParam(DATA_FORM_FIELD) InputStream input, @FormDataParam(NAME_FORM_FIELD) String name,
-            @FormDataParam(DESCRIPTION_FORM_FIELD) String description, @FormDataParam(GROUP_FORM_FIELD) String group, @FormDataParam(DOMAIN_FORM_FIELD) String domainName,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            UserCredentials userCredentials = getUserCredentials(principal);
-            ProfileDescription desc = createNewProfileDescription();
-            desc.setCreatorName(userCredentials.getDisplayName());
-            desc.setUserId(userCredentials.getPrincipalName()); // Hash used to be created here, now Id is constructed by impl
-            desc.setName(name);
-            desc.setDescription(description);
-            desc.setGroupName(group);
-            desc.setDomainName(domainName);
-            LOG.info("Trying to register Profile: " + desc);
-            return register(input, desc, userCredentials, userspace, new NewAction());
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @FormDataParam(DESCRIPTION_FORM_FIELD) String description, @FormDataParam(GROUP_FORM_FIELD) String group, @FormDataParam(DOMAIN_FORM_FIELD) String domainName,
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            UserCredentials userCredentials = getUserCredentials(principal);
+            ProfileDescription desc = createNewProfileDescription();
+            desc.setCreatorName(userCredentials.getDisplayName());
+            desc.setUserId(userCredentials.getPrincipalName()); // Hash used to be created here, now Id is constructed by impl
+            desc.setName(name);
+            desc.setDescription(description);
+            desc.setGroupName(group);
+            desc.setDomainName(domainName);
+            LOG.info("Trying to register Profile: " + desc);
+            return register(input, desc, userCredentials, userspace, new NewAction());
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
     }
 
@@ -708 +704 @@
     @Consumes("multipart/form-data")
     public Response registerComponent(@FormDataParam(DATA_FORM_FIELD) InputStream input, @FormDataParam(NAME_FORM_FIELD) String name,
-            @FormDataParam(DESCRIPTION_FORM_FIELD) String description, @FormDataParam(GROUP_FORM_FIELD) String group,
-            @FormDataParam(DOMAIN_FORM_FIELD) String domainName, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            UserCredentials userCredentials = getUserCredentials(principal);
-            ComponentDescription desc = createNewComponentDescription();
-            desc.setCreatorName(userCredentials.getDisplayName());
-            desc.setUserId(userCredentials.getPrincipalName()); // Hash used to be created here, now Id is constructed by impl
-            desc.setName(name);
-            desc.setDescription(description);
-            desc.setGroupName(group);
-            desc.setDomainName(domainName);
-            LOG.info("Trying to register Component: " + desc);
-            return register(input, desc, userCredentials, userspace, new NewAction());
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @FormDataParam(DESCRIPTION_FORM_FIELD) String description, @FormDataParam(GROUP_FORM_FIELD) String group,
+            @FormDataParam(DOMAIN_FORM_FIELD) String domainName, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            UserCredentials userCredentials = getUserCredentials(principal);
+            ComponentDescription desc = createNewComponentDescription();
+            desc.setCreatorName(userCredentials.getDisplayName());
+            desc.setUserId(userCredentials.getPrincipalName()); // Hash used to be created here, now Id is constructed by impl
+            desc.setName(name);
+            desc.setDescription(description);
+            desc.setGroupName(group);
+            desc.setDomainName(domainName);
+            LOG.info("Trying to register Component: " + desc);
+            return register(input, desc, userCredentials, userspace, new NewAction());
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
     }
 
@@ -732 +728 @@
     @Consumes("multipart/form-data")
     public Response registerCommentInComponent(@FormDataParam(DATA_FORM_FIELD) InputStream input,
-            @PathParam("componentId") String componentId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            UserCredentials userCredentials = getUserCredentials(principal);
-            if (null == componentRegistryFactory.getOrCreateUser(userCredentials)) {
-                throw new UserUnauthorizedException("Cannot materialize authenticated user");
-            }
-            // TODO: Add user/group param
-            ComponentRegistry registry = getRegistry(getStatus(userspace), null, userCredentials);
-            ComponentDescription description = registry.getComponentDescription(componentId);
-            if (description != null) {
-                LOG.info("Trying to register comment to " + componentId);
-                return registerComment(input, registry, userspace, description, principal, userCredentials);
-            } else {
-                LOG.error("Attempt to post comment on nonexistent component id (" + componentId + ") failed.");
-                return Response.serverError().entity("Invalid id, cannot comment on nonexistent component").build();
-            }
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @PathParam("componentId") String componentId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            UserCredentials userCredentials = getUserCredentials(principal);
+            if (null == componentRegistryFactory.getOrCreateUser(userCredentials)) {
+                throw new UserUnauthorizedException("Cannot materialize authenticated user");
+            }
+            // TODO: Add user/group param
+            ComponentRegistry registry = getRegistry(getStatus(userspace), null, userCredentials);
+            ComponentDescription description = registry.getComponentDescription(componentId);
+            if (description != null) {
+                LOG.info("Trying to register comment to " + componentId);
+                return registerComment(input, registry, userspace, description, principal, userCredentials);
+            } else {
+                LOG.error("Attempt to post comment on nonexistent component id (" + componentId + ") failed.");
+                return Response.serverError().entity("Invalid id, cannot comment on nonexistent component").build();
+            }
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
     }
 
@@ -759 +755 @@
     @Consumes("multipart/form-data")
     public Response registerCommentInProfile(@FormDataParam(DATA_FORM_FIELD) InputStream input,
-            @PathParam("profileId") String profileId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            UserCredentials userCredentials = getUserCredentials(principal);
-            if (null == componentRegistryFactory.getOrCreateUser(userCredentials)) {
-                throw new UserUnauthorizedException("Cannot materialize authenticated user");
-            }
-            // TODO: Add user/group param
-            ComponentRegistry registry = getRegistry(getStatus(userspace), null, userCredentials);
-            ProfileDescription description = registry.getProfileDescription(profileId);
-            if (description != null) {
-                LOG.info("Trying to register comment to " + profileId);
-                return registerComment(input, registry, userspace, description, principal, userCredentials);
-            } else {
-                LOG.error("Attempt to post comment on nonexistent profile id (" + profileId + ") failed.");
-                return Response.serverError().entity("Invalid id, cannot comment on nonexistent profile").build();
-            }
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @PathParam("profileId") String profileId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            UserCredentials userCredentials = getUserCredentials(principal);
+            if (null == componentRegistryFactory.getOrCreateUser(userCredentials)) {
+                throw new UserUnauthorizedException("Cannot materialize authenticated user");
+            }
+            // TODO: Add user/group param
+            ComponentRegistry registry = getRegistry(getStatus(userspace), null, userCredentials);
+            ProfileDescription description = registry.getProfileDescription(profileId);
+            if (description != null) {
+                LOG.info("Trying to register comment to " + profileId);
+                return registerComment(input, registry, userspace, description, principal, userCredentials);
+            } else {
+                LOG.error("Attempt to post comment on nonexistent profile id (" + profileId + ") failed.");
+                return Response.serverError().entity("Invalid id, cannot comment on nonexistent profile").build();
+            }
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
     }
 
@@ -785 +781 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Response pingSession() {
-        boolean stillActive = false;
-        Principal userPrincipal = security.getUserPrincipal();
-        LOG.info("ping by user: " + (userPrincipal == null ? "null" : userPrincipal.getName()));
-        if (request != null) {
-            if (userPrincipal != null && !ComponentRegistryFactory.ANONYMOUS_USER.equals(userPrincipal.getName())) {
-                stillActive = !((HttpServletRequest) request).getSession().isNew();
-            }
-        }
-        return Response.ok().entity("<session stillActive=\"" + stillActive + "\"/>").build();
+        boolean stillActive = false;
+        Principal userPrincipal = security.getUserPrincipal();
+        LOG.info("ping by user: " + (userPrincipal == null ? "null" : userPrincipal.getName()));
+        if (request != null) {
+            if (userPrincipal != null && !ComponentRegistryFactory.ANONYMOUS_USER.equals(userPrincipal.getName())) {
+                stillActive = !((HttpServletRequest) request).getSession().isNew();
+            }
+        }
+        return Response.ok().entity("<session stillActive=\"" + stillActive + "\"/>").build();
     }
 
     private Response register(InputStream input, AbstractDescription desc, UserCredentials userCredentials, boolean userspace,
-            RegisterAction action) {
-        try {
-            // TODO: Add user/group param
-            ComponentRegistry registry = getRegistry(getStatus(userspace), null, userCredentials);
-            DescriptionValidator descriptionValidator = new DescriptionValidator(desc);
-            MDValidator validator = new MDValidator(input, desc, registry, getRegistry(getStatus(true)), componentRegistryFactory.getPublicRegistry());
-            RegisterResponse response = new RegisterResponse();
-            response.setIsInUserSpace(userspace);
-            validate(response, descriptionValidator, validator);
-            if (response.getErrors().isEmpty()) {
-
-                CMDComponentSpec spec = validator.getCMDComponentSpec();
-
-                // Olha: removing filename from spec before it gets extended!!! recursion over all the components
-                setFileNamesFromListToNull(spec.getCMDComponent());
-
-
-
-                try {
-
-
-                    // Expand to check for recursion
-                    registry.getExpander().expandNestedComponent(spec.getCMDComponent(), desc.getId());
-
-
-
-                    // Add profile
-
-
-                    int returnCode = action.execute(desc, spec, response, registry);
-                    if (returnCode == 0) {
-                        response.setRegistered(true);
-                        response.setDescription(desc);
-                    } else {
-                        response.setRegistered(false);
-                        response.addError("Unable to register at this moment. Internal server error.");
-                    }
-                } catch (ComponentRegistryException ex) {
-                    // Recursion detected
-                    response.setRegistered(false);
-                    response.addError("Error while expanding specification. " + ex.getMessage());
-                }
-            } else {
-                LOG.info("Registration failed with validation errors:" + Arrays.toString(response.getErrors().toArray()));
-                response.setRegistered(false);
-            }
-            response.setIsProfile(desc.isProfile());
-            return Response.ok(response).build();
-        } finally {
-            try {
-                input.close();//either we read the input or there was an exception, we need to close it.
-            } catch (IOException e) {
-                LOG.error("Error when closing inputstream: ", e);
-            }
-        }
+            RegisterAction action) {
+        try {
+            // TODO: Add user/group param
+            ComponentRegistry registry = getRegistry(getStatus(userspace), null, userCredentials);
+            DescriptionValidator descriptionValidator = new DescriptionValidator(desc);
+            MDValidator validator = new MDValidator(input, desc, registry, getRegistry(getStatus(true)), componentRegistryFactory.getPublicRegistry());
+            RegisterResponse response = new RegisterResponse();
+            response.setIsInUserSpace(userspace);
+            validate(response, descriptionValidator, validator);
+            if (response.getErrors().isEmpty()) {
+
+                CMDComponentSpec spec = validator.getCMDComponentSpec();
+
+                // removing filename from spec before it gets extended. recursion over all the components
+                setFileNamesFromListToNull(spec.getCMDComponent());
+
+                try {
+                    // Expand to check for recursion (todo: run on copy or do a dry-run so that the actual spec does not get expanded)
+                    registry.getExpander().expandNestedComponent(spec.getCMDComponent(), desc.getId());
+
+                    // Add profile
+                    int returnCode = action.execute(desc, spec, response, registry);
+                    if (returnCode == 0) {
+                        response.setRegistered(true);
+                        response.setDescription(desc);
+                    } else {
+                        response.setRegistered(false);
+                        response.addError("Unable to register at this moment. Internal server error.");
+                    }
+                } catch (ComponentRegistryException ex) {
+                    // Recursion detected
+                    response.setRegistered(false);
+                    response.addError("Error while expanding specification. " + ex.getMessage());
+                }
+            } else {
+                LOG.info("Registration failed with validation errors:" + Arrays.toString(response.getErrors().toArray()));
+                response.setRegistered(false);
+            }
+            response.setIsProfile(desc.isProfile());
+            return Response.ok(response).build();
+        } finally {
+            try {
+                input.close();//either we read the input or there was an exception, we need to close it.
+            } catch (IOException e) {
+                LOG.error("Error when closing inputstream: ", e);
+            }
+        }
     }
 
     private Response registerComment(InputStream input, ComponentRegistry registry, boolean userspace,
-            AbstractDescription description, Principal principal, UserCredentials userCredentials) {
-        try {
-            CommentValidator validator = new CommentValidator(input, description);
-            CommentResponse response = new CommentResponse();
-            response.setIsInUserSpace(userspace);
-            validateComment(response, validator);
-            if (response.getErrors().isEmpty()) {
-                Comment com = validator.getCommentSpec();
-                //int returnCode = action.executeComment(com, response, registry, principal.getName());
-
-                // If user name is left empty, fill it using the user's display name
-                if (null == com.getUserName() || "".equals(com.getUserName())) {
-                    if (userCredentials != null) {
-                        com.setUserName(userCredentials.getDisplayName());
-                    } else {
-                        com.setUserName(principal.getName());
-                    }
-                }
-
-                int returnCode = registry.registerComment(com, principal.getName());
-                if (returnCode == 0) {
-                    response.setRegistered(true);
-                    response.setComment(com);
-                } else {
-                    response.setRegistered(false);
-                    response.addError("Unable to register at this moment. Internal server error.");
-                }
-            } else {
-                LOG.info("Registration failed with validation errors:" + Arrays.toString(response.getErrors().toArray()));
-                response.setRegistered(false);
-            }
-            return Response.ok(response).build();
-        } catch (ComponentRegistryException ex) {
-            LOG.error("Error while inserting comment: ", ex);
-            return Response.serverError().entity(ex.getMessage()).build();
-        } finally {
-            try {
-                input.close();//either we read the input or there was an exception, we need to close it.
-            } catch (IOException e) {
-                LOG.error("Error when closing inputstream: ", e);
-                return Response.serverError().build();
-            }
-        }
+            AbstractDescription description, Principal principal, UserCredentials userCredentials) {
+        try {
+            CommentValidator validator = new CommentValidator(input, description);
+            CommentResponse response = new CommentResponse();
+            response.setIsInUserSpace(userspace);
+            validateComment(response, validator);
+            if (response.getErrors().isEmpty()) {
+                Comment com = validator.getCommentSpec();
+                //int returnCode = action.executeComment(com, response, registry, principal.getName());
+
+                // If user name is left empty, fill it using the user's display name
+                if (null == com.getUserName() || "".equals(com.getUserName())) {
+                    if (userCredentials != null) {
+                        com.setUserName(userCredentials.getDisplayName());
+                    } else {
+                        com.setUserName(principal.getName());
+                    }
+                }
+
+                int returnCode = registry.registerComment(com, principal.getName());
+                if (returnCode == 0) {
+                    response.setRegistered(true);
+                    response.setComment(com);
+                } else {
+                    response.setRegistered(false);
+                    response.addError("Unable to register at this moment. Internal server error.");
+                }
+            } else {
+                LOG.info("Registration failed with validation errors:" + Arrays.toString(response.getErrors().toArray()));
+                response.setRegistered(false);
+            }
+            return Response.ok(response).build();
+        } catch (ComponentRegistryException ex) {
+            LOG.error("Error while inserting comment: ", ex);
+            return Response.serverError().entity(ex.getMessage()).build();
+        } finally {
+            try {
+                input.close();//either we read the input or there was an exception, we need to close it.
+            } catch (IOException e) {
+                LOG.error("Error when closing inputstream: ", e);
+                return Response.serverError().build();
+            }
+        }
     }
 
     private ComponentDescription createNewComponentDescription() {
-        ComponentDescription desc = ComponentDescription.createNewDescription();
-        desc.setHref(createXlink(desc.getId()));
-        return desc;
+        ComponentDescription desc = ComponentDescription.createNewDescription();
+        desc.setHref(createXlink(desc.getId()));
+        return desc;
     }
 
     private ProfileDescription createNewProfileDescription() {
-        ProfileDescription desc = ProfileDescription.createNewDescription();
-        desc.setHref(createXlink(desc.getId()));
-        return desc;
+        ProfileDescription desc = ProfileDescription.createNewDescription();
+        desc.setHref(createXlink(desc.getId()));
+        return desc;
     }
 
     private String createXlink(String id) {
-        URI uri = uriInfo.getRequestUriBuilder().path(id).build();
-        return uri.toString();
+        URI uri = uriInfo.getRequestUriBuilder().path(id).build();
+        return uri.toString();
     }
 
@@ -928 +916 @@
      */
     private String getApplicationBaseURI() {
-        return servletContext.getInitParameter(APPLICATION_BASE_URL_PARAM);
+        return servletContext.getInitParameter(APPLICATION_BASE_URL_PARAM);
     }
 
     private void validate(RegisterResponse response, Validator... validators) {
-        for (Validator validator : validators) {
-            if (!validator.validate()) {
-                for (String error : validator.getErrorMessages()) {
-                    response.addError(error);
-                }
-            }
-        }
+        for (Validator validator : validators) {
+            if (!validator.validate()) {
+                for (String error : validator.getErrorMessages()) {
+                    response.addError(error);
+                }
+            }
+        }
     }
 
     private void validateComment(CommentResponse response, Validator... validators) {
-        for (Validator validator : validators) {
-            if (!validator.validate()) {
-                for (String error : validator.getErrorMessages()) {
-                    response.addError(error);
-                }
-            }
-        }
+        for (Validator validator : validators) {
+            if (!validator.validate()) {
+                for (String error : validator.getErrorMessages()) {
+                    response.addError(error);
+                }
+            }
+        }
     }
 
@@ -955 +943 @@
      */
     public void setComponentRegistryFactory(ComponentRegistryFactory componentRegistryFactory) {
-        this.componentRegistryFactory = componentRegistryFactory;
-    }
-
-    /// two muchually recursive methods below are used to set filenames of components (and their child components) to null
+        this.componentRegistryFactory = componentRegistryFactory;
+    }
+
     /*
+     * Two muchually recursive methods below are used to set filenames of components (and their child components) to null
      * @param List<CMDComponentType> listofcomponents the list of components whose filenames (and the children's names) are to be set to null
      */
     public void setFileNamesFromListToNull(List<CMDComponentType> listofcomponents) {
 
-        for (CMDComponentType currentcomponent : listofcomponents) {
-            setFileNamesToNullCurrent(currentcomponent);
-        }
+        for (CMDComponentType currentcomponent : listofcomponents) {
+            setFileNamesToNullCurrent(currentcomponent);
+        }
 
     }
@@ -974 +962 @@
      */
     public void setFileNamesToNullCurrent(CMDComponentType currentcomponent) {
-
-        currentcomponent.setFilename(null);
-        setFileNamesFromListToNull(currentcomponent.getCMDComponent());
-
-    }
-
-    /*
-     * a working-horse method called to generate Rss feed for both, profiles and components
-     * 
+        currentcomponent.setFilename(null);
+        setFileNamesFromListToNull(currentcomponent.getCMDComponent());
+    }
+
+    /**
+     * Generates RSS feeds for profile and component descriptions
+     *
+     * @param <T> type of description
+     * @param limit number of items to include in the RSS
+     * @param descriptions descriptions to include
+     * @param channelDescription channel description
+     * @param channelTitle channel title
+     * @param channelLink channel link
+     * @return
+     * @throws ComponentRegistryException
+     * @throws ParseException
      */
-    protected <T extends AbstractDescription> Rss getRss(String limit, List<T> descs, 
-            String description, String title, String link, boolean userspace) throws ComponentRegistryException, ParseException {
-
-        
-        RssCreatorDescriptions rssCreator = new RssCreatorDescriptions();
-        
-        String space= "";
-        if (userspace) {space="?space=user";};
-        rssCreator.setUserspace(userspace); 
-        
-        rssCreator.setLink(link+space);
-        rssCreator.setDescription(description);
-        rssCreator.setTitle(title);
-
-        Collections.sort(descs, AbstractDescription.COMPARE_ON_DATE);
-
-        int limitInt = Integer.parseInt(limit);
-
-        if (descs.size() < limitInt) {
-            limitInt = descs.size();
-        };
-        List<T> sublist = descs.subList(0, limitInt);
-
-        Rss rss = rssCreator.makeRss(sublist);
-
-        return rss;
-    }
-    ////////////////////////////////////////////////
+    protected <T extends AbstractDescription> Rss getRss(String limit, List<T> descriptions,
+            String channelDescription, String channelTitle, String channelLink, boolean userspace) throws ComponentRegistryException, ParseException {
+        RssCreatorDescriptions rssCreator = new RssCreatorDescriptions();
+
+        String space = "";
+        if (userspace) {
+            space += "?space=user";
+        };
+        rssCreator.setUserspace(userspace);
+
+        rssCreator.setLink(channelLink + space);
+        rssCreator.setDescription(channelDescription);
+        rssCreator.setTitle(channelTitle);
+
+        Collections.sort(descriptions, AbstractDescription.COMPARE_ON_DATE);
+
+        int limitInt = Integer.parseInt(limit);
+
+        if (descriptions.size() < limitInt) {
+            limitInt = descriptions.size();
+        }
+        List<T> sublist = descriptions.subList(0, limitInt);
+
+        Rss rss = rssCreator.makeRss(sublist);
+
+        return rss;
+    }
 
     @GET
@@ -1017 +1011 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Rss getRssComponent(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException, ParseException {
-
-        List<ComponentDescription> components = getRegistry(getStatus(userspace)).getComponentDescriptions();
-        
-        
-        String title;
-         if (userspace) { title= "Workspace components";}
-         else {title= "Public components";
-       }
-        
-        Rss rss = getRss(limit, components,"Updates for components" , title, getApplicationBaseURI() + "/", userspace);
-
-        LOG.info("Releasing " + limit + " most recent registered components into the world");
-
-
-        return rss;
-    }
-
-    ////////////////////////////////////////////////
+        final List<ComponentDescription> components = getRegistry(getStatus(userspace)).getComponentDescriptions();
+
+        final String title = userspace ? "Workspace components" : "Public components";
+        final Rss rss = getRss(limit, components, "Updates for components", title, getApplicationBaseURI() + "/", userspace);
+        LOG.info("Releasing RSS of " + limit + " most recently registered components");
+
+        return rss;
+    }
+
     @GET
     @Path("/profiles/rss")
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Rss getRssProfile(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException, ParseException {
-
-      
-        // ?? How to get rid of the deprecated stuff ??
-        List<ProfileDescription> profiles = getRegistry(getStatus(userspace)).getProfileDescriptions();
-        
-        String title; 
-         if (userspace) { title= "Workspace profiles";}
-         else {title= "Public profiles";
-       }
-       
-        Rss rss = getRss(limit, profiles, "Updates for profiles", title, getApplicationBaseURI() + "/", userspace);
-        
-
-        LOG.info("Releasing " + limit + " most recent registered profiles into the world");
-        return rss;
-    }
-
-   
-    
-    ///////////////////////////////////////////////////////////
-    /*
-     * a  working-horse method for obtaing a comment for a given profile or a component (via the profile/component's and cpmment's Id)
+        // ?? How to get rid of the deprecated stuff ??
+        List<ProfileDescription> profiles = getRegistry(getStatus(userspace)).getProfileDescriptions();
+
+        final String title = userspace ? "Workspace profiles" : "Public profiles";
+        Rss rss = getRss(limit, profiles, "Updates for profiles", title, getApplicationBaseURI() + "/", userspace);
+        LOG.info("Releasing RSS of " + limit + " most recently registered profiles");
+        return rss;
+    }
+
+    /**
+     * Obtains a comment for a given profile or a component (via the profile/component's and comment's Id)
+     *
+     * @param limit
+     * @param comments
+     * @param channelDescription
+     * @param channelTitle
+     * @param itemId
+     * @param baseUri
+     * @return
+     * @throws ComponentRegistryException
+     * @throws ParseException
+     * @throws IOException
+     * @throws JAXBException
      */
-    protected Rss getRssOfComments(String limit, List<Comment> comments, String description,
-            String title, String id, String baseUri, boolean userspace) throws ComponentRegistryException, ParseException, IOException, JAXBException {
-
-        Collections.sort(comments, Comment.COMPARE_ON_DATE);
-
-        int limitInt = Integer.parseInt(limit);
-        if (comments.size() < limitInt) {
-            limitInt = comments.size();
-        };
-        List<Comment> sublist = comments.subList(0, limitInt);
-
-        RssCreatorComments instance = new RssCreatorComments();
-        
-        String space= "";
-        if (userspace) {space="&space=user";};
-        instance.setUserspace(userspace);
-        
-        instance.setDescription(description);
-        instance.setLink(baseUri + "?item=" + id + space+ "&browserview=comments");
-        instance.setTitle(title);
-
-        Rss result = instance.makeRss(sublist);
-        return result;
-
-    }
-
-    ///////////////////////////////////////////////////////
+    protected Rss getRssOfComments(String limit, List<Comment> comments, String channelDescription,
+            String channelTitle, String itemId, String baseUri, boolean userspace) throws ComponentRegistryException, ParseException, IOException, JAXBException {
+        Collections
+                .sort(comments, Comment.COMPARE_ON_DATE);
+
+        int limitInt = Integer.parseInt(limit);
+        if (comments.size() < limitInt) {
+            limitInt = comments.size();
+        }
+        List<Comment> sublist = comments.subList(0, limitInt);
+        RssCreatorComments rssCreator = new RssCreatorComments();
+
+        String space = "";
+        if (userspace) {
+            space = "&space=user";
+        }
+        rssCreator.setUserspace(userspace);
+        rssCreator.setDescription(channelDescription);
+        rssCreator.setLink(baseUri + "?item=" + itemId + space + "&browserview=comments");
+        rssCreator.setTitle(channelTitle);
+
+        return rssCreator.makeRss(sublist);
+    }
+
     @GET
     @Path("/profiles/{profileId}/comments/rss")
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Rss getRssOfCommentsFromProfile(@PathParam("profileId") String profileId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException, IOException, JAXBException, ParseException {
-
-
-        final Principal principal = security.getUserPrincipal();
-        List<Comment> comments = getRegistry(getStatus(userspace)).getCommentsInProfile(profileId, principal);
-
-        
-        String title = "Comments feed for the profile \""
-                + getRegistry(getStatus(userspace)).getProfileDescription(profileId).getName()
-                + "\" ";
-
-        Rss result = getRssOfComments(limit, comments, "Update of comments for the current profile",
-                title, profileId, getApplicationBaseURI() + "/", userspace);
-
-       
-        return result;
-    }
-
-    //////////////////////////////
+        final Principal principal = security.getUserPrincipal();
+        List<Comment> comments = getRegistry(getStatus(userspace)).getCommentsInProfile(profileId, principal);
+
+        final String profileName = getRegistry(getStatus(userspace)).getProfileDescription(profileId).getName();
+        final String title = String.format("Comments feed for the profile \"%1$s\"", profileName);
+        Rss result = getRssOfComments(limit, comments, "Update of comments for the current profile",
+                title, profileId, getApplicationBaseURI() + "/", userspace);
+
+        return result;
+    }
+
     @GET
     @Path("/components/{componentId}/comments/rss")
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Rss getRssOfCommentsFromComponent(@PathParam("componentId") String componentId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException, IOException, JAXBException, ParseException {
-
-      
-        final Principal principal = security.getUserPrincipal();
-        List<Comment> comments = getRegistry(getStatus(userspace)).getCommentsInComponent(componentId, principal);
-
-        String title = "Comments feed for the component \""
-                + getRegistry(getStatus(userspace)).getComponentDescription(componentId).getName()
-                + "\" ";
-
-        Rss result = getRssOfComments(limit, comments, "Update of comments for the current component",
-                title, componentId, getApplicationBaseURI() + "/", userspace);
-
-
-
-        return result;
-    }
-
-    
+        final Principal principal = security.getUserPrincipal();
+        List<Comment> comments = getRegistry(getStatus(userspace)).getCommentsInComponent(componentId, principal);
+
+        final String componentName = getRegistry(getStatus(userspace)).getComponentDescription(componentId).getName();
+        final String title = String.format("Comments feed for the component \"%1$s\" ", componentName);
+        Rss result = getRssOfComments(limit, comments, "Update of comments for the current component",
+                title, componentId, getApplicationBaseURI() + "/", userspace);
+
+        return result;
+    }
 }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/RssCreatorCommentsTest.java

@@ -1 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package clarin.cmdi.componentregistry;
 
 import clarin.cmdi.componentregistry.model.Comment;
-import clarin.cmdi.componentregistry.model.ProfileDescription;
 import clarin.cmdi.componentregistry.rss.Rss;
 import clarin.cmdi.componentregistry.rss.RssItem;
@@ -14 +9 @@
 import java.util.List;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
+
 /**
  *
@@ -20 +17 @@
  */
 public class RssCreatorCommentsTest {
-    
-    
-    
-    private Comment makeTestComment(boolean canDelete, boolean isFromProfile, String comtext, String date, String commentId, 
-            String descrId, String userName){
-        
-        Comment comm =new Comment();
-        
-        comm.setCanDelete(canDelete);
-        comm.setComment(comtext);
-        comm.setCommentDate(date);
-        if (isFromProfile) {comm.setProfileDescriptionId(descrId);}
-                else {comm.setComponentDescriptionId(descrId);}
-        comm.setId(commentId);
-        comm.setUserName(userName);
-       
-        
-         
-        return comm;
-        
+
+    private Comment makeTestComment(boolean canDelete, boolean isFromProfile, String comtext, String date, String commentId,
+            String descrId, String userName) {
+        Comment comm = new Comment();
+
+        comm.setCanDelete(canDelete);
+        comm.setComment(comtext);
+        comm.setCommentDate(date);
+        if (isFromProfile) {
+            comm.setProfileDescriptionId(descrId);
+        } else {
+            comm.setComponentDescriptionId(descrId);
+        }
+        comm.setId(commentId);
+        comm.setUserName(userName);
+
+        return comm;
     }
-    
+
     /**
-     * 
+     *
      */
-    
-    private void compareInputsVsRssItems(String href, String commtext, String date, String title, RssItem rssItem){
-        
-        
-        assertEquals(href, rssItem.getGuid().getValue());
-        assertEquals(href, rssItem.getLink());
-        assertEquals(commtext, rssItem.getDescription());
-        assertEquals(date, rssItem.getPubDate());
-        assertEquals(title, rssItem.getTitle());
-        
+    private void compareInputsVsRssItems(String href, String commtext, String date, String title, RssItem rssItem) {
+        assertEquals(href, rssItem.getGuid().getValue());
+        assertEquals(href, rssItem.getLink());
+        assertEquals(commtext, rssItem.getDescription());
+        assertEquals(date, rssItem.getPubDate());
+        assertEquals(title, rssItem.getTitle());
+
     }
-            
-            
-    
+
     @Test
-    public void testMakeRss() throws ParseException{
-        
-        String testPrfId = "p_1234";
-        String href = "http://catalog.clarin.eu/ds/ComponentRegistry/?item="+testPrfId+"&view=comments";
-        Boolean isFromProfile = true;
-        
-       
-        
-         
-        Comment comm1 = makeTestComment(true, isFromProfile, "this is comment # 1", "2012-04-02T11:38:23+00:00", "commentId1", testPrfId, 
-             "userello");
-        
-        Comment comm2 = makeTestComment(false, isFromProfile, "this is comment # 2", "2011-04-02T11:38:22+00:00", "commentId2", testPrfId, 
-             "userino");
-        
-         Comment comm3 = makeTestComment(true, isFromProfile, "this is comment # 3", "2010-05-02T11:38:22+00:00", "commentId3", testPrfId, 
-             "userito");
-        
-        Comment[] commar = {comm1, comm2, comm3};
-        List<Comment> comms = new ArrayList<Comment>(Arrays.asList(commar));
-        
-        
-        
-        RssCreatorComments instance = new RssCreatorComments();
-        instance.setLink(href);
-        
-        instance.setVersion(3.0); 
-        
-        Rss result = instance.makeRss(comms);
-        
-        assertEquals(Double.toString(result.getVersion()), "3.0"); // now, check if updating version has taken place
-        
-        String rfcdate1 = instance.getRFCDateTime("2012-04-02T11:38:23+00:00");
-        String rfcdate2 = instance.getRFCDateTime("2011-04-02T11:38:22+00:00");
-        String rfcdate3 = instance.getRFCDateTime("2010-05-02T11:38:22+00:00");
-        
-        List<RssItem> resitems = result.getChannel().getItem();
-        
-        
-        compareInputsVsRssItems(href+"&commentId=commentId1", "this is comment # 1", rfcdate1, 
-                 instance.makeCommentTitle("commentId1", "userello"), resitems.get(0));
-        compareInputsVsRssItems(href+"&commentId=commentId2", "this is comment # 2", rfcdate2, 
-                instance.makeCommentTitle("commentId2", "userino"),
-                resitems.get(1));
-        compareInputsVsRssItems(href+"&commentId=commentId3", "this is comment # 3", rfcdate3,
-                instance.makeCommentTitle("commentId3", "userito")
-                , resitems.get(2));
-        
-        System.out.println("  "); 
-        for (int i=0; i<3; i++) {
-            System.out.print("Rss-item for comment "); 
-            System.out.println(i);
-            System.out.println(resitems.get(i).getTitle());
-            System.out.println(resitems.get(i).getPubDate());
-            System.out.println(resitems.get(i).getDescription());
-            System.out.println(resitems.get(i).getLink());
-            System.out.println(resitems.get(i).getGuid().getValue());
-            System.out.println("  "); 
-        }
-        
-        
+    public void testMakeRss() throws ParseException {
+        String testPrfId = "p_1234";
+        String href = "http://catalog.clarin.eu/ds/ComponentRegistry/?item=" + testPrfId + "&view=comments";
+        boolean isFromProfile = true;
+
+        Comment comm1 = makeTestComment(true, isFromProfile, "this is comment # 1", "2012-04-02T11:38:23+00:00", "commentId1", testPrfId,
+                "userello");
+        Comment comm2 = makeTestComment(false, isFromProfile, "this is comment # 2", "2011-04-02T11:38:22+00:00", "commentId2", testPrfId,
+                "userino");
+        Comment comm3 = makeTestComment(true, isFromProfile, "this is comment # 3", "2010-05-02T11:38:22+00:00", "commentId3", testPrfId,
+                "userito");
+        List<Comment> comms = new ArrayList<Comment>(Arrays.asList(comm1, comm2, comm3));
+
+        RssCreatorComments instance = new RssCreatorComments();
+        instance.setLink(href);
+        instance.setVersion(3.0);
+
+        Rss result = instance.makeRss(comms);
+
+        assertEquals(Double.toString(result.getVersion()), "3.0"); // now, check if updating version has taken place
+
+        String rfcdate1 = instance.getRFCDateTime("2012-04-02T11:38:23+00:00");
+        String rfcdate2 = instance.getRFCDateTime("2011-04-02T11:38:22+00:00");
+        String rfcdate3 = instance.getRFCDateTime("2010-05-02T11:38:22+00:00");
+
+        List<RssItem> resitems = result.getChannel().getItem();
+
+        compareInputsVsRssItems(href + "&commentId=commentId1", "this is comment # 1", rfcdate1,
+                "Comment commentId1\nby userello", resitems.get(0));
+        compareInputsVsRssItems(href + "&commentId=commentId2", "this is comment # 2", rfcdate2,
+                "Comment commentId2\nby userino", resitems.get(1));
+        compareInputsVsRssItems(href + "&commentId=commentId3", "this is comment # 3", rfcdate3,
+                "Comment commentId3\nby userito", resitems.get(2));
     }
-    
-    /*@Test
-    public void testMakeRssNullComm() {
-        
-        System.out.println("fromArgToRssItem");
-        
-         
-        Comment comm1 = null;
-        
-        List<Comment> comms = new ArrayList<Comment>(0);
-        comms.add(comm1);
-        
-        RssCreatorComments instance = new RssCreatorComments();
-        Rss result = instance.makeRss(comms);
-        
-        
-        assertEquals(null, result.getChannel().getItem());
-        
-    }*/
-    
-    
 }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/RssMarshallingTest.java

@@ -1 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package clarin.cmdi.componentregistry;
 

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/CMDComponentSetFilenamesToNullTestHelper.java

@@ -13 +13 @@
 import java.util.List;
 import javax.xml.bind.JAXBException;
-import org.junit.Test;
+
 import static org.junit.Assert.*;
 

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTest.java

@@ -2 +2 @@
 
 import clarin.cmdi.componentregistry.ComponentRegistry;
-import clarin.cmdi.componentregistry.ComponentRegistryException;
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
 import clarin.cmdi.componentregistry.ComponentStatus;
@@ -20 +19 @@
 import com.sun.jersey.multipart.FormDataMultiPart;
 import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -34 +34 @@
 
 import static clarin.cmdi.componentregistry.rest.ComponentRegistryRestService.USERSPACE_PARAM;
-import java.util.ArrayList;
 import static org.junit.Assert.*;
 
@@ -1143 +1142 @@
         assertEquals(MDValidator.MISMATCH_ERROR, response.getErrors().get(0));
     }
-    
-    
-    
+
     /**
      * creates a tree-like component, whose root has two kids, and the kids have three their own kids each
      * the corresponding filenames are:
      * "wortel", "nodel-L", "node-R", "leaf-LL", "leaf-LM", "leaf-LR", "leaf-RL", "leaf-RM", "leaf-RR"
-     * @throws Exception 
+     *
+     * @throws Exception
      */
-    @Test 
+    @Test
     public void testSetFilenamesToNull() throws Exception {
-        
-        // helper assists in generating a test component
-        CMDComponentSetFilenamesToNullTestHelper helper = new CMDComponentSetFilenamesToNullTestHelper();
-        
-        // making an (up to ternary) tree of test components
-        //inductive explaination of the variable names, an example: leaf-LM is the middle child of the nodeL
-        // the filename is this leaf is "leaf-LM"
-        
-       // making children of the node L 
-       CMDComponentType leafLR = helper.makeTestComponent("leaf-LR", null);
-       CMDComponentType leafLM = helper.makeTestComponent("leaf-LM", null);
-       CMDComponentType leafLL = helper.makeTestComponent("leaf-LL", null);
-       
-       
-       // making node L
-       List<CMDComponentType> nodeLchild = (new ArrayList<CMDComponentType>());
-       nodeLchild.add(leafLL); nodeLchild.add(leafLM); nodeLchild.add(leafLR);
-       CMDComponentType nodeL = helper.makeTestComponent("node-L",nodeLchild);
-       
-       
-       // making children of the node R
-       CMDComponentType leafRR = helper.makeTestComponent("leaf-RR", null);
-       CMDComponentType leafRM = helper.makeTestComponent("leaf-RM", null);
-       CMDComponentType leafRL = helper.makeTestComponent("leaf-RL", null);
-       
-       // making node R
-       List<CMDComponentType> nodeRchild = (new ArrayList<CMDComponentType>());
-       nodeRchild.add(leafRL); nodeRchild.add(leafRM); nodeRchild.add(leafRR);
-       CMDComponentType nodeR = helper.makeTestComponent("node-R",nodeRchild);
-       
-       // making the root, which has children NodeL and nodeR
-       List<CMDComponentType> wortelchild = (new ArrayList<CMDComponentType>());
-       wortelchild.add(nodeL); wortelchild.add(nodeR);
-       CMDComponentType wortel = helper.makeTestComponent("wortel", wortelchild);
-       
-       //checking if the test compnent has the expected structure and the expected filenames 
-       //ALSO this checking code below shows the strtucture of the tree
-       
-       assertEquals(wortel.getCMDComponent().size(), 2);
-       assertEquals(wortel.getCMDComponent().get(0).getCMDComponent().size(), 3);
-       assertEquals(wortel.getCMDComponent().get(1).getCMDComponent().size(), 3);
-       
-       assertEquals(wortel.getFilename(), "wortel");
-       
-       assertEquals(wortel.getCMDComponent().get(0).getFilename(), "node-L");
-       assertEquals(wortel.getCMDComponent().get(1).getFilename(), "node-R");
-       
-       assertEquals(wortel.getCMDComponent().get(0).getCMDComponent().get(0).getFilename(), "leaf-LL");
-       assertEquals(wortel.getCMDComponent().get(0).getCMDComponent().get(1).getFilename(), "leaf-LM");
-       assertEquals(wortel.getCMDComponent().get(0).getCMDComponent().get(2).getFilename(), "leaf-LR");
-       
-       assertEquals(wortel.getCMDComponent().get(1).getCMDComponent().get(0).getFilename(), "leaf-RL");
-       assertEquals(wortel.getCMDComponent().get(1).getCMDComponent().get(1).getFilename(), "leaf-RM");
-       assertEquals(wortel.getCMDComponent().get(1).getCMDComponent().get(2).getFilename(), "leaf-RR");
-       
-       
-       // the actual job
-      // nulling the filenames will be called as a method of testrestservice
-        ComponentRegistryRestService restservice = new ComponentRegistryRestService();
-        restservice.setFileNamesToNullCurrent(wortel);
-        
-      
-       // check if the filenames are nulled
-       assertEquals(wortel.getFilename(), null); 
-        
-       assertEquals(wortel.getCMDComponent().get(0).getFilename(), null);
-       assertEquals(wortel.getCMDComponent().get(1).getFilename(), null);
-       
-       assertEquals(wortel.getCMDComponent().get(0).getCMDComponent().get(0).getFilename(), null);
-       assertEquals(wortel.getCMDComponent().get(0).getCMDComponent().get(1).getFilename(), null);
-       assertEquals(wortel.getCMDComponent().get(0).getCMDComponent().get(2).getFilename(), null);
-       
-       assertEquals(wortel.getCMDComponent().get(1).getCMDComponent().get(0).getFilename(), null);
-       assertEquals(wortel.getCMDComponent().get(1).getCMDComponent().get(1).getFilename(), null);
-       assertEquals(wortel.getCMDComponent().get(1).getCMDComponent().get(2).getFilename(), null);  
-        
-        
-       
-    }
-    
-    
-    
+
+        // helper assists in generating a test component
+        CMDComponentSetFilenamesToNullTestHelper helper = new CMDComponentSetFilenamesToNullTestHelper();
+
+        // making an (up to ternary) tree of test components
+        //inductive explaination of the variable names, an example: leaf-LM is the middle child of the nodeL
+        // the filename is this leaf is "leaf-LM"
+
+        // making children of the node L 
+        CMDComponentType leafLR = helper.makeTestComponent("leaf-LR", null);
+        CMDComponentType leafLM = helper.makeTestComponent("leaf-LM", null);
+        CMDComponentType leafLL = helper.makeTestComponent("leaf-LL", null);
+
+
+        // making node L
+        List<CMDComponentType> nodeLchild = (new ArrayList<CMDComponentType>());
+        nodeLchild.add(leafLL);
+        nodeLchild.add(leafLM);
+        nodeLchild.add(leafLR);
+        CMDComponentType nodeL = helper.makeTestComponent("node-L", nodeLchild);
+
+
+        // making children of the node R
+        CMDComponentType leafRR = helper.makeTestComponent("leaf-RR", null);
+        CMDComponentType leafRM = helper.makeTestComponent("leaf-RM", null);
+        CMDComponentType leafRL = helper.makeTestComponent("leaf-RL", null);
+
+        // making node R
+        List<CMDComponentType> nodeRchild = (new ArrayList<CMDComponentType>());
+        nodeRchild.add(leafRL);
+        nodeRchild.add(leafRM);
+        nodeRchild.add(leafRR);
+        CMDComponentType nodeR = helper.makeTestComponent("node-R", nodeRchild);
+
+        // making the root, which has children NodeL and nodeR
+        List<CMDComponentType> wortelchild = (new ArrayList<CMDComponentType>());
+        wortelchild.add(nodeL);
+        wortelchild.add(nodeR);
+        CMDComponentType root = helper.makeTestComponent("wortel", wortelchild);
+
+        //checking if the test compnent has the expected structure and the expected filenames 
+        //ALSO this checking code below shows the strtucture of the tree
+
+        assertEquals(root.getCMDComponent().size(), 2);
+        assertEquals(root.getCMDComponent().get(0).getCMDComponent().size(), 3);
+        assertEquals(root.getCMDComponent().get(1).getCMDComponent().size(), 3);
+
+        assertEquals(root.getFilename(), "wortel");
+
+        assertEquals(root.getCMDComponent().get(0).getFilename(), "node-L");
+        assertEquals(root.getCMDComponent().get(1).getFilename(), "node-R");
+
+        assertEquals(root.getCMDComponent().get(0).getCMDComponent().get(0).getFilename(), "leaf-LL");
+        assertEquals(root.getCMDComponent().get(0).getCMDComponent().get(1).getFilename(), "leaf-LM");
+        assertEquals(root.getCMDComponent().get(0).getCMDComponent().get(2).getFilename(), "leaf-LR");
+
+        assertEquals(root.getCMDComponent().get(1).getCMDComponent().get(0).getFilename(), "leaf-RL");
+        assertEquals(root.getCMDComponent().get(1).getCMDComponent().get(1).getFilename(), "leaf-RM");
+        assertEquals(root.getCMDComponent().get(1).getCMDComponent().get(2).getFilename(), "leaf-RR");
+
+
+        // the actual job
+        // nulling the filenames will be called as a method of testrestservice
+        ComponentRegistryRestService restservice = new ComponentRegistryRestService();
+        restservice.setFileNamesToNullCurrent(root);
+
+
+        // check if the filenames are nulled
+        assertEquals(root.getFilename(), null);
+
+        assertEquals(root.getCMDComponent().get(0).getFilename(), null);
+        assertEquals(root.getCMDComponent().get(1).getFilename(), null);
+
+        assertEquals(root.getCMDComponent().get(0).getCMDComponent().get(0).getFilename(), null);
+        assertEquals(root.getCMDComponent().get(0).getCMDComponent().get(1).getFilename(), null);
+        assertEquals(root.getCMDComponent().get(0).getCMDComponent().get(2).getFilename(), null);
+
+        assertEquals(root.getCMDComponent().get(1).getCMDComponent().get(0).getFilename(), null);
+        assertEquals(root.getCMDComponent().get(1).getCMDComponent().get(1).getFilename(), null);
+        assertEquals(root.getCMDComponent().get(1).getCMDComponent().get(2).getFilename(), null);
+    }
 }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/xmlRssGeneratingRunner.java

@@ -1 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package clarin.cmdi.componentregistry.rest;
 
@@ -30 +26 @@
  */
 public class xmlRssGeneratingRunner {
-      
-    
-    
- ////////////////   
-    
- public void  printIds(List<AbstractDescription> desc){
 
-        for (AbstractDescription current : desc) {
-            String currentId = current.getId();
-            System.out.println(currentId);
-        }
-        
- }
-        
-    
- private static void   printXmlRssToFile(Rss rssObject) throws IOException, JAXBException{
-        
-        String path = RegistryTestHelper.openTestDir("testRss");
-        String os = MDMarshaller.marshalToString(rssObject);
-        RegistryTestHelper.writeStringToFile(os, path + "testRssResl.xml");
-        
+    public void printIds(List<AbstractDescription> desc) {
+        for (AbstractDescription current : desc) {
+            String currentId = current.getId();
+            System.out.println(currentId);
+        }
     }
- 
- public static void main(String args[]) throws ComponentRegistryException, ParseException, IOException, JAXBException{
-     
-     System.out.println("Type 1, or 2, or 3, or 4, if you want to check Rss generaion ");
-     System.out.print("for profiles, components, profile comments or component comments respectively: >> ");
-     
-     BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
-     String buffer = null;
 
-      //  read the username from the command-line; need to use try/catch with the
-      //  readLine() method
-      try {
-         buffer = br.readLine();
-      } catch (IOException ioe) {
-         System.out.println("IO error trying get the number");
-         System.exit(1);
-      }
-     
-      int kind=Integer.parseInt(buffer);
-      
-      ApplicationContext applicationContext = new ClassPathXmlApplicationContext("/applicationContextJDBC.xml");
-      ComponentRegistry registry = ((ComponentRegistryFactory) applicationContext.getBean("componentRegistryFactory")).getPublicRegistry();
-       
-      ComponentRegistryRestService restService = new ComponentRegistryRestService();
-      Rss rss = null;
-      String baseUri = "http://localhost:8080/ComponentRegistry/"; // used only as a nice URi-example content for the "link"-field
-      // in this test we do not click on link, we just generate an Rss xml-file to validate it
-      // using one of the on-line rss-source vaidators
-      
-      if (kind == 1){ // testing Rss for profiles
-      List<ProfileDescription> profs = registry.getProfileDescriptions();
-      
-      System.out.println(profs.size());
-      Collections.sort(profs, AbstractDescription.COMPARE_ON_DATE);
-      System.out.println(profs.size());
-      
-      System.out.println("check if the profiles are sorted in a proper way, by the dates ");
-        for (ProfileDescription pdesc : profs) {
-            System.out.println(pdesc.getRegistrationDate()); 
-        }
-      
-      rss = restService.getRss(Integer.toString(profs.size()), profs,"Updates for profiles" , "RSS for public profiles", baseUri, false);
-      System.out.println(rss.getChannel().getItem().size());
-      
-      }
-      
-      
-      if (kind == 2){ // testing rss for components
-      List<ComponentDescription> comps = registry.getComponentDescriptions();
-      
-      Collections.sort(comps, AbstractDescription.COMPARE_ON_DATE);
-      
-      System.out.println("check if the components are sorted in a proper way, by the dates");
-        for (ComponentDescription cdesc : comps) {
-            System.out.println(cdesc.getRegistrationDate()); 
-        }
-      rss = restService.getRss(Integer.toString(comps.size()), comps,"Updates for components" , "RSS for public components", baseUri, false);
-      }
-      
-      if (kind == 3){ // testing Rss comments for profiles
-      String profileId = "clarin.eu:cr1:p_1284723009187";    
-      List<Comment> comms = registry.getCommentsInProfile(profileId, null);
-      
-      Collections.sort(comms, Comment.COMPARE_ON_DATE);
-      
-      System.out.println("check if the comments are sorted in a proper way");
-        for (Comment comm : comms) {
-            System.out.println(comm.getCommentDate());
-        }
-      
-      rss = restService.getRssOfComments(Integer.toString(comms.size()), comms, "Updates for the profile " + profileId+" comments " , "RSS for profile comments", profileId, baseUri, false);
-      }
-      
-      if (kind == 4){ // testing rss comments for components
-      String componentId = "clarin.eu:cr1:c_1288172614011";
-      List<Comment> comms = registry.getCommentsInComponent(componentId, null);
-      Collections.sort(comms, Comment.COMPARE_ON_DATE);
-      
-      System.out.println("check if the comments are sorted in a proper way");
-        for (Comment comm : comms) {
-            System.out.println(comm.getCommentDate());
-        }
-            
-      rss = restService.getRssOfComments("10", comms, "Updates for the component " +componentId+" comments", "RSS for component comments", "clarin.eu:cr1:p_1284723009187", baseUri, false);
-      }
-      
-      printXmlRssToFile(rss);
- }
-    
+    private static void printXmlRssToFile(Rss rssObject) throws IOException, JAXBException {
+
+        String path = RegistryTestHelper.openTestDir("testRss");
+        String os = MDMarshaller.marshalToString(rssObject);
+        RegistryTestHelper.writeStringToFile(os, path + "testRssResl.xml");
+
+    }
+
+    public static void main(String args[]) throws ComponentRegistryException, ParseException, IOException, JAXBException {
+
+        System.out.println("Type 1, or 2, or 3, or 4, if you want to check Rss generaion ");
+        System.out.print("for profiles, components, profile comments or component comments respectively: >> ");
+
+        BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
+        String buffer = null;
+
+        //  read the username from the command-line; need to use try/catch with the
+        //  readLine() method
+        try {
+            buffer = br.readLine();
+        } catch (IOException ioe) {
+            System.out.println("IO error trying get the number");
+            System.exit(1);
+        }
+
+        int kind = Integer.parseInt(buffer);
+
+        ApplicationContext applicationContext = new ClassPathXmlApplicationContext("/applicationContextJDBC.xml");
+        ComponentRegistry registry = ((ComponentRegistryFactory) applicationContext.getBean("componentRegistryFactory")).getPublicRegistry();
+
+        ComponentRegistryRestService restService = new ComponentRegistryRestService();
+        Rss rss = null;
+        String baseUri = "http://localhost:8080/ComponentRegistry/"; // used only as a nice URi-example content for the "link"-field
+        // in this test we do not click on link, we just generate an Rss xml-file to validate it
+        // using one of the on-line rss-source vaidators
+
+        if (kind == 1) { // testing Rss for profiles
+            List<ProfileDescription> profs = registry.getProfileDescriptions();
+
+            System.out.println(profs.size());
+            Collections.sort(profs, AbstractDescription.COMPARE_ON_DATE);
+            System.out.println(profs.size());
+
+            System.out.println("check if the profiles are sorted in a proper way, by the dates ");
+            for (ProfileDescription pdesc : profs) {
+                System.out.println(pdesc.getRegistrationDate());
+            }
+
+            rss = restService.getRss(Integer.toString(profs.size()), profs, "Updates for profiles", "RSS for public profiles", baseUri, false);
+            System.out.println(rss.getChannel().getItem().size());
+
+        }
+
+
+        if (kind == 2) { // testing rss for components
+            List<ComponentDescription> comps = registry.getComponentDescriptions();
+
+            Collections.sort(comps, AbstractDescription.COMPARE_ON_DATE);
+
+            System.out.println("check if the components are sorted in a proper way, by the dates");
+            for (ComponentDescription cdesc : comps) {
+                System.out.println(cdesc.getRegistrationDate());
+            }
+            rss = restService.getRss(Integer.toString(comps.size()), comps, "Updates for components", "RSS for public components", baseUri, false);
+        }
+
+        if (kind == 3) { // testing Rss comments for profiles
+            String profileId = "clarin.eu:cr1:p_1284723009187";
+            List<Comment> comms = registry.getCommentsInProfile(profileId, null);
+
+            Collections.sort(comms, Comment.COMPARE_ON_DATE);
+
+            System.out.println("check if the comments are sorted in a proper way");
+            for (Comment comm : comms) {
+                System.out.println(comm.getCommentDate());
+            }
+
+            rss = restService.getRssOfComments(Integer.toString(comms.size()), comms, "Updates for the profile " + profileId + " comments ", "RSS for profile comments", profileId, baseUri, false);
+        }
+
+        if (kind == 4) { // testing rss comments for components
+            String componentId = "clarin.eu:cr1:c_1288172614011";
+            List<Comment> comms = registry.getCommentsInComponent(componentId, null);
+            Collections.sort(comms, Comment.COMPARE_ON_DATE);
+
+            System.out.println("check if the comments are sorted in a proper way");
+            for (Comment comm : comms) {
+                System.out.println(comm.getCommentDate());
+            }
+
+            rss = restService.getRssOfComments("10", comms, "Updates for the component " + componentId + " comments", "RSS for component comments", "clarin.eu:cr1:p_1284723009187", baseUri, false);
+        }
+
+        printXmlRssToFile(rss);
+    }
 }