Changeset 5552 for ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

Timestamp:

08/13/14 16:55:59 (10 years ago)

Author:

olhsha@mpi.nl

Message:

Fixed issued arising after testing on localhost tomcat (completed)

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java (modified) (19 diffs)

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

@@ -84 +84 @@
     private GroupService groupService;
 
-    
     // 
     /**
      * Default constructor, to use this as a (spring) bean. The public registry
-     * by default. Use setRegistryStatus(), setRegistryOwner(), setGroupId() to make it another kind of
-     * registry.
+     * by default. Use setRegistryStatus(), setRegistryOwner(), setGroupId() to
+     * make it another kind of registry.
      *
-     * 
+     *
      */
     public ComponentRegistryDbImpl() throws TransformerException {
@@ -97 +96 @@
     }
 
-
     @Override
     public Owner getRegistryOwner() {
         return this.registryOwner;
     }
-    
+
     @Override
     public void setRegistryOwner(Owner registryOwner) {
         this.registryOwner = registryOwner;
     }
-    
-    
+
     @Override
     public RegistrySpace getRegistrySpace() {
@@ -123 +120 @@
         return this.groupId;
     }
-    
+
     @Override
     public void setGroupId(Number groupId) {
         this.groupId = groupId;
     }
-    
-    @Override
-    public Number getBaseDescriptionOwnerId(String cmdId){
+
+    @Override
+    public Number getBaseDescriptionOwnerId(String cmdId) {
         BaseDescription bd = componentDao.getByCmdId(cmdId);
         return bd.getDbUserId();
     }
-    
-    @Override
-    public  List<Number> getItemGroups(String cmdId){
+
+    @Override
+    public List<Number> getItemGroups(String cmdId) {
         List<Group> groups = groupService.getGroupsTheItemIsAMemberOf(cmdId);
         List<Number> result = new ArrayList<Number>();
         if (groups != null) {
-            for (Group group: groups) {
+            for (Group group : groups) {
                 result.add(group.getId());
             }
@@ -146 +143 @@
         return result;
     }
-    
+
     /**
      * @return The user id, or null if there is no owner or it is not a user.
@@ -157 +154 @@
         }
     }
-    
+
     @Override
     public List<ProfileDescription> getProfileDescriptions() throws ComponentRegistryException, UserUnauthorizedException {
@@ -180 +177 @@
 
     @Override
-    public Boolean isItemPublic(String id) throws ItemNotFoundException{
+    public Boolean isItemPublic(String id) throws ItemNotFoundException {
         BaseDescription desc = componentDao.getByCmdId(id);
         if (desc == null) {
             String idS = (id == null) ? "null" : id;
-            throw new ItemNotFoundException("The component with the id " + idS+ "is not found in the database.");
+            throw new ItemNotFoundException("The component with the id " + idS + "is not found in the database.");
         }
         return desc.isPublic();
@@ -284 +281 @@
                     return comment;
                 } else {
-                    throw new ComponentRegistryException("Comment " + commentId  + "for the profile "+profileId);
+                    throw new ItemNotFoundException("Comment " + commentId + " for the profile " + profileId + " is not found.");
                 }
             } catch (DataAccessException ex) {
@@ -322 +319 @@
                     return comment;
                 } else {
-                    throw new ComponentRegistryException("Comment " + commentId  + "for the profile "+componentId);
+                    throw new ItemNotFoundException("Comment " + commentId + " for the component " + componentId + " is not found.");
                 }
             } catch (DataAccessException ex) {
@@ -437 +434 @@
     public int registerComment(Comment comment, String principalName) throws ComponentRegistryException, ItemNotFoundException, UserUnauthorizedException {
         try {
-            if (comment.getComponentId() != null)  {
-                if (this.canCurrentUserAccessDescription(comment.getComponentId()))
-                {
-                // Convert principal name to user record id
-                Number uid = convertUserIdInComment(comment, principalName);
-                // Set date to current date
-                comment.setCommentDate(new Date());
-                comment.setUserId(uid.longValue());
-                commentsDao.saveAndFlush(comment);
-            
+            if (comment.getComponentId() != null) {
+                if (this.canCurrentUserAccessDescription(comment.getComponentId())) {
+                    // Convert principal name to user record id
+                    Number uid = convertUserIdInComment(comment, principalName);
+                    // Set date to current date
+                    comment.setCommentDate(new Date());
+                    comment.setUserId(uid.longValue());
+                    commentsDao.saveAndFlush(comment);
+
+                } else {
+                    throw new UserUnauthorizedException("The logged-in user cannot access the component/profile with id " + comment.getComponentId());
+                }
             } else {
-                throw new UserUnauthorizedException("The logged-in user cannot access the component/profile with id "+comment.getComponentId());
-            }
-            } else {
-                throw new ComponentRegistryException("The component/profile id for this comment is null.");            
+                throw new ComponentRegistryException("The component/profile id for this comment is null.");
             }
             return 0;
@@ -623 +619 @@
     public void deleteMDComponent(String componentId, boolean forceDelete)
             throws UserUnauthorizedException, DeleteFailedException, ComponentRegistryException, ItemNotFoundException {
-        BaseDescription desc = componentDao.getByCmdId(componentId);
+        BaseDescription desc = getComponentDescriptionAccessControlled(componentId);
         if (desc != null) {
             try {
@@ -639 +635 @@
         }
     }
-
-    
 
     private void invalidateCache(BaseDescription description) {
@@ -704 +698 @@
 
     private void checkAuthorisation(BaseDescription desc) throws UserUnauthorizedException, ItemNotFoundException {
-        if (!this.canCurrentUserAccessDescription(desc.getId())) {            
+        if (!this.canCurrentUserAccessDescription(desc.getId())) {
             String principalName = (registryOwner != null) ? userDao.getPrincipalNameById(registryOwner.getId()).getPrincipalName() : "null";
             throw new UserUnauthorizedException("Unauthorized operation user '" + principalName
@@ -715 +709 @@
         String principalName = userDao.getPrincipalNameById(registryOwner.getId()).getPrincipalName();
         if (!(this.isOwnerOfComment(desc, principalName) || configuration.isAdminUser(principalName))) {
-            throw new UserUnauthorizedException("Unauthorized operation user '" + principalName
-                    + "' is not the creator (nor a member of the group, nor an administrator) of the " + (desc.getId()) + "(" + desc + ").");
+            throw new UserUnauthorizedException("Unauthorized operation: user '" + principalName
+                    + "' is not the creator (nor the Administrator) of the comment " + (desc.getId()));
         }
     }
@@ -741 +735 @@
                 throw new DeleteFailedException(
                         "The "
-                        + (desc.isProfile() ? "Profile" : "Component")
-                        + " is more then a month old and cannot be deleted anymore. It might have been used to create metadata, deleting it would invalidate that metadata.");
+                        + (desc.isProfile() ? "profile" : "Ccomponent")
+                        + " is more than a month old and cannot be deleted anymore. It might have been used to create metadata, deleting it would invalidate that metadata.");
             }
         }
@@ -766 +760 @@
     }
 
-    private boolean canCurrentUserAccessDescription(String cmdId) throws ItemNotFoundException{
+    private boolean canCurrentUserAccessDescription(String cmdId) throws ItemNotFoundException {
         if (cmdId == null) {
             throw new ItemNotFoundException("Item with the null cmdIdentifier.");
         }
-        
+
         BaseDescription description = componentDao.getByCmdId(cmdId);
         if (description == null) {
-            throw new ItemNotFoundException("Item with the id "+cmdId+" is not found.");
-        }
-        
-       
+            throw new ItemNotFoundException("Item with the id " + cmdId + " is not found.");
+        }
+
+
         Number userId = getUserId();
         if (userId == null) {
@@ -785 +779 @@
             return false;
         }
-       
+
 
         if (configuration.isAdminUser(user.getPrincipalName())) {
@@ -805 +799 @@
 
     @Override
-    public void deleteComment(String commentId) throws IOException, 
+    public void deleteComment(String commentId) throws IOException,
             UserUnauthorizedException, DeleteFailedException, ItemNotFoundException {
         try {
@@ -826 +820 @@
         }
     }
-    
-  
 
     @Override
@@ -857 +849 @@
         for (String id : componentIds) {
             BaseDescription description = componentDao.getByCmdId(id);
-            components.add(ComponentUtils.toComponent(description));
+            if (description != null) {
+                components.add(ComponentUtils.toComponent(description));
+            }
         }
         return components;