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
......@@ -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
......@@ -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()
{
......
......@@ -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.
*
......
......@@ -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
{
......
......@@ -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
......
......@@ -84,7 +84,7 @@ public class PosixDetails
public String loginShell;
/**
* @param userName user name
* @param username user name
* @param uid posix uid
* @param gid posix gid
* @param homeDirectory home directory
......
......@@ -168,7 +168,7 @@ public class User
* of this Users set of identities.
*
* @param superset
* @return
* @return true if the user is consistent, false otherwise
*/
public boolean isConsistent(final User superset)
{
......
......@@ -76,7 +76,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.security.AccessControlContext;
import java.security.AccessControlException;
......@@ -999,7 +998,7 @@ public class GMSClient implements TransferListener
* Check group membership of the current Subject.
*
* @param groupName
* @return
* @return true if the current Subject is a member of the group, false otherwise
* @throws UserNotFoundException
* @throws AccessControlException
* @throws IOException
......@@ -1014,7 +1013,7 @@ public class GMSClient implements TransferListener
*
* @param groupName
* @param role
* @return
* @return true if the current Subject is a member of the group with the specified role, false otherwise
* @throws UserNotFoundException
* @throws AccessControlException
* @throws IOException
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment