Commit e16276a3 authored by opencadc-admin's avatar opencadc-admin Committed by GitHub
Browse files

Merge pull request #4 from yeunga/master 

Story 1965. Fixed some javadoc warnings.
parents c26fc29e 31089ac5

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ language: java 
jdk:

  - openjdk7

  - oraclejdk8

script: for mod in cadc-access-control  cadc-access-control-admin  cadc-access-control-identity  cadc-access-control-server  cadc-tomcat; do cd $mod; gradle assemble check install || break -1; cd ..; done

script: for mod in cadc-access-control  cadc-access-control-identity  cadc-access-control-server cadc-access-control-admin cadc-tomcat; do cd $mod; gradle assemble check install || break -1; cd ..; done

cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ public class ACIdentityManager implements IdentityManager 
    /**

     * The returned CheckResource is the same as the one from AuthenticatorImpl.

     *

     * @return

     * @return the CheckResource

     */

    public static CheckResource getAvailabilityCheck()

    {

cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/GroupPersistence.java

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ public interface GroupPersistence 
    /**

     * Obtain a Collection of Groups that fit the given query.

     *

     * @param userID The userID.

     * @param role Role of the user, either owner, member, or read/write.

     * @param groupID The Group ID.

     *

cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java

+2 −3
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ public class LdapGroupDAO extends LdapDAO 
     * Persists a group.

     *

     * @param group The group to create

     * @return created group

     * @throws GroupAlreadyExistsException If a group with the same ID already

     *                                     exists.

     * @throws TransientException          If an temporary, unexpected problem occurred.
@@ -791,7 +790,7 @@ public class LdapGroupDAO extends LdapDAO 


    /**

     * @param groupID

     * @return

     * @return the Distinguished Name of the group

     */

    protected DN getGroupDN(final String groupID) throws TransientException

    {
@@ -809,7 +808,7 @@ public class LdapGroupDAO extends LdapDAO 


    /**

     * @param groupID

     * @return

     * @return the Distinguished Name of the admin group

     */

    protected DN getAdminGroupDN(final String groupID) throws TransientException

    {

cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ public class LdapGroupPersistence extends LdapPersistence implements GroupPersis 
     *

     * @param role

     * @param groupID check membership in a specific group or null to get all groups

     * @return

     * @return the groups

     * @throws UserNotFoundException

     * @throws GroupNotFoundException

     * @throws TransientException