exact matches for groups and projects

Author: dwasinge

src/main/java/com/redhat/labs/omp/service/GroupService.java

@@ -34,20 +34,14 @@ public Optional<Group> getGitLabGroupByName(String name) throws UnexpectedGitLab
             return optional;
         }
 
-        if (1 == groupList.size()) {
-            return Optional.of(groupList.get(0));
-        }
-
-        // found more than one group with name in either 'name' or 'path' attribute
-        // should match path
+        // look for a match between returned name and provided path
         for(Group group : groupList) {
-            if(name.equalsIgnoreCase(group.getPath())) {
+            if(name.equals(group.getPath())) {
                 return Optional.of(group);
             }
         }
 
-        throw new UnexpectedGitLabResponseException(
-                "No resource found with name equal to path attribute.");
+        return optional;
 
     }
 

src/main/java/com/redhat/labs/omp/service/ProjectService.java

@@ -35,14 +35,9 @@ public Optional<Project> getProjectByName(Integer namespaceId, String name)
             return optional;
         }
 
-        if (1 == resultList.size()) {
-            return Optional.of(Project.from(resultList.get(0)));
-        }
-
-        // found more than one project with name in either 'name' or 'path' attribute
-        // should match path
+        // look for a project with name that matches the namespace id and the path
         for (ProjectSearchResults result : resultList) {
-            if (namespaceId.equals(result.getNamespace().getId()) && name.equalsIgnoreCase(result.getPath())) {
+            if (namespaceId.equals(result.getNamespace().getId()) && name.equals(result.getPath())) {
                 return Optional.of(Project.from(result));
             }
         }