Changeset 5719 for ComponentRegistry

Timestamp:

10/15/14 15:22:05 (10 years ago)

Author:

olhsha@mpi.nl

Message:

Nice titles for RSS feeds (needs to be tested), and groupId should be replaced or completed with the group name

Location:

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

Files:

• rest/ComponentRegistryRestService.java (modified) (10 diffs)
• rss/RssCreator.java (modified) (1 diff)
• rss/RssCreatorComments.java (modified) (1 diff)
• rss/RssCreatorDescriptions.java (modified) (2 diffs)

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

@@ -200 +200 @@
             return new ArrayList<ComponentDescription>();
 
-        
-        
+
+
         } catch (ItemNotFoundException e) {
             response.sendError(Status.NOT_FOUND.getStatusCode(), e.toString());
@@ -241 +241 @@
             response.sendError(Status.FORBIDDEN.getStatusCode(), e.toString());
             return new ArrayList<ProfileDescription>();
-        
-        
+
+
         } catch (ItemNotFoundException e) {
             response.sendError(Status.NOT_FOUND.getStatusCode(), e.toString());
@@ -1538 +1538 @@
     }
 
+    private String helpToMakeTitleForRssDescriptions(String registrySpace, String groupId, String resource) {
+        if (registrySpace == null || (registrySpace.equalsIgnoreCase("group") && groupId == null)
+                || resource == null) {
+            return "Undefined registry space or uindefined type of resource";
+        }
+        if (registrySpace.equalsIgnoreCase("published")) {
+            return "Published " + resource;
+        }
+        if (registrySpace.equalsIgnoreCase("private")) {
+            return "Private " + resource;
+        }
+        if (registrySpace.equalsIgnoreCase("group") && groupId != null) {
+            return resource + " of group " + groupId;
+        }
+
+        return "Undefined registry space or uindefined type of resource";
+    }
+
     /**
      *
@@ -1567 +1585 @@
             response.sendError(Status.FORBIDDEN.getStatusCode(), e.toString());
             return new Rss();
-        }
-        catch (ItemNotFoundException e) {
+        } catch (ItemNotFoundException e) {
             response.sendError(Status.NOT_FOUND.getStatusCode(), e.toString());
             return new Rss();
         }
         // obsolete, add group Id
-        final RssCreatorDescriptions instance = new RssCreatorDescriptions(!registrySpace.equalsIgnoreCase("published"), getApplicationBaseURI(), "components",
+        String title = this.helpToMakeTitleForRssDescriptions(registrySpace, groupId, "Components");
+        final RssCreatorDescriptions instance = new RssCreatorDescriptions(getApplicationBaseURI(), "components",
                 Integer.parseInt(limit), components,
-                BaseDescription.COMPARE_ON_DATE);
+                BaseDescription.COMPARE_ON_DATE, title);
         final Rss rss = instance.getRss();
         LOG.debug("Releasing RSS of {} most recently registered components",
@@ -1611 +1629 @@
             response.sendError(Status.FORBIDDEN.getStatusCode(), e.toString());
             return new Rss();
-        
+
         } catch (ItemNotFoundException e) {
             response.sendError(Status.NOT_FOUND.getStatusCode(), e.toString());
             return new Rss();
         }
-        final RssCreatorDescriptions instance = new RssCreatorDescriptions(
-                !registrySpace.equalsIgnoreCase("published"), getApplicationBaseURI(), "profiles",
+        String title = this.helpToMakeTitleForRssDescriptions(registrySpace, groupId, "Profiles");
+        final RssCreatorDescriptions instance = new RssCreatorDescriptions(getApplicationBaseURI(), "profiles",
                 Integer.parseInt(limit), profiles,
-                BaseDescription.COMPARE_ON_DATE);
+                BaseDescription.COMPARE_ON_DATE, title);
         final Rss rss = instance.getRss();
         LOG.debug("Releasing RSS of {} most recently registered profiles",
                 limit);
         return rss;
+    }
+
+    private String helpToMakeTitleForRssComments(String itemId, String resource) {
+        if (itemId == null || resource == null) {
+            return "Undefined description";
+        }
+        return ("Comments for "+resource+ " "+itemId);
     }
 
@@ -1655 +1680 @@
             final ProfileDescription pd = cr.getProfileDescriptionAccessControlled(profileId);
             final String profileName = pd.getName();
-            boolean profileIsPrivate = !pd.isPublic();
-            // obsolete, status must be involved, not boolean profileIsPrivate
-            final RssCreatorComments instance = new RssCreatorComments(profileIsPrivate,
+           
+            String title = this.helpToMakeTitleForRssComments(profileId, "profile");
+            final RssCreatorComments instance = new RssCreatorComments(
                     getApplicationBaseURI(), Integer.parseInt(limit), profileId,
-                    profileName, "profile", comments, Comment.COMPARE_ON_DATE);
+                    profileName, "profile", comments, Comment.COMPARE_ON_DATE, title);
             final Rss rss = instance.getRss();
             LOG.debug("Releasing RSS of {} most recent post on profile {}", limit,
@@ -1704 +1729 @@
             final ComponentDescription cd = cr.getComponentDescriptionAccessControlled(componentId);
             final String componentName = cd.getName();
-            final boolean isPrivate = !cd.isPublic();
             //oboslete. status must be involved, not boolean isPrivate
-            final RssCreatorComments instance = new RssCreatorComments(isPrivate,
+            String title = this.helpToMakeTitleForRssComments(componentId, "component");
+            final RssCreatorComments instance = new RssCreatorComments(
                     getApplicationBaseURI(), Integer.parseInt(limit), componentId,
-                    componentName, "component", comments, Comment.COMPARE_ON_DATE);
+                    componentName, "component", comments, Comment.COMPARE_ON_DATE, title);
             final Rss rss = instance.getRss();
             LOG.debug("Releasing RSS of {} most recent post on component {}",
@@ -1889 +1914 @@
         } catch (ItemNotFoundException e) {
             return Response.status(Status.NOT_FOUND).entity(e.getMessage()).build();
-        
+
         } catch (AuthenticationFailException e) {
             return Response.status(Status.UNAUTHORIZED).build();
         }
     }
-    
+
 //    @Override
 //    @DELETE
@@ -1914 +1939 @@
 //        }
 //    }
-
     @Override
     @GET
@@ -1992 +2016 @@
             this.strings = strings;
         }
-        
-       
     }
 }

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rss/RssCreator.java

@@ -20 +20 @@
     private String channelTitle;
     private Comparator<T> comparator;
-    protected final boolean isPrivate;
     private List<T> objs;
     private int limit;
 
-    protected RssCreator(boolean isPrivate, String baseURI, int limit, List<T> objs) {
-        this.isPrivate = isPrivate;
+    protected RssCreator(String baseURI, int limit, List<T> objs) {
         this.baseURI = baseURI;
         this.limit = limit;

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rss/RssCreatorComments.java

@@ -27 +27 @@
      * @param comparator compare comments by dates
      */
-    public RssCreatorComments(boolean isPrivate, String baseURI, int limit,
-            String descriptionId, String descriptionName, String descriptionType, List<Comment> comms, Comparator<Comment> comparator) {
-        super(isPrivate, baseURI, limit, comms);
-        setChannelLink(baseURI + "?item=" + descriptionId + ((isPrivate) ? "&space=user" : "") + "&browserview=comments");
-        setChannelTitle((isPrivate ? "Private " : "Public ") + descriptionType + " \"" + descriptionName + "\"");
+    public RssCreatorComments(String baseURI, int limit,
+            String descriptionId, String descriptionName, String descriptionType, List<Comment> comms, Comparator<Comment> comparator, String title) {
+        super(baseURI, limit, comms);
+        setChannelLink(baseURI + "?item=" + descriptionId + "&browserview=comments");
+        setChannelTitle(title);
         setChannelDescription(String.format("Comments feed for the %s \"%s\"", descriptionType, descriptionName));
         setComparator(comparator);

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rss/RssCreatorDescriptions.java

@@ -23 +23 @@
      * @param comparator compare descriptions by dates
      */
-    public RssCreatorDescriptions(boolean isPrivate, String baseURI, String descriptionType,
-            int limit, List<T> descriptions, Comparator<T> comparator) {
-        super(isPrivate, baseURI, limit, descriptions);
+    public RssCreatorDescriptions(String baseURI, String descriptionType,
+            int limit, List<T> descriptions, Comparator<T> comparator, String title) {
+        super(baseURI, limit, descriptions);
         setChannelLink(baseURI + "/");
-        setChannelTitle((isPrivate ? "Private " : "Public ") + descriptionType);
+        setChannelTitle(title);
         setChannelDescription(String.format("News feed for the %s", descriptionType));
         setComparator(comparator);
@@ -41 +41 @@
     @Override
     protected RssItem fromArgToRssItem(T desc) {
-        String href = getBaseURI() + "?item=" + desc.getId() + (isPrivate ? "&space=user" : "");
+        String href = getBaseURI() + "?item=" + desc.getId();
         RssItem retval = new RssItem();
         retval.setDescription(desc.getDescription());