Remove deprecated methods from User and Team models

James Moger

2013-12-11 7127dfb2def0c43abb38bc363e3f76fded881bf0

Remove deprecated methods from User and Team models

Change-Id: Ief3231270e55b8e4075de45c70ee24517b05b3fc

 src/main/java/com/gitblit/models/TeamModel.java

@@ -30,7 +30,6 @@
import com.gitblit.Constants.AccountType;

import com.gitblit.Constants.PermissionType;

import com.gitblit.Constants.RegistrantType;

import com.gitblit.Constants.Unused;

import com.gitblit.utils.StringUtils;



/**

@@ -63,36 +62,6 @@
        this.name = name;

        this.accountType = AccountType.LOCAL;

    }



    /**

     * @use hasRepositoryPermission

     * @param name

     * @return

     */

    @Deprecated

    @Unused

    public boolean hasRepository(String name) {

        return hasRepositoryPermission(name);

    }



    @Deprecated

    @Unused

    public void addRepository(String name) {

        addRepositoryPermission(name);

    }



    @Deprecated

    @Unused

    public void addRepositories(Collection<String> names) {

        addRepositoryPermissions(names);

    }



    @Deprecated

    @Unused

    public void removeRepository(String name) {

        removeRepositoryPermission(name);

    }





    /**

     * Returns a list of repository permissions for this team.


 src/main/java/com/gitblit/models/UserModel.java

@@ -34,7 +34,6 @@
import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.Constants.PermissionType;

import com.gitblit.Constants.RegistrantType;

import com.gitblit.Constants.Unused;

import com.gitblit.utils.ArrayUtils;

import com.gitblit.utils.ModelUtils;

import com.gitblit.utils.StringUtils;

@@ -98,57 +97,6 @@
        return !Constants.EXTERNAL_ACCOUNT.equals(password)

                || accountType == null

                || accountType.isLocal();

    }



    /**

     * This method does not take into consideration Ownership where the

     * administrator has not explicitly granted access to the owner.

     *

     * @param repositoryName

     * @return

     */

    @Deprecated

    public boolean canAccessRepository(String repositoryName) {

        return canAdmin() || repositories.contains(repositoryName.toLowerCase())

                || hasTeamAccess(repositoryName);

    }



    @Deprecated

    @Unused

    public boolean canAccessRepository(RepositoryModel repository) {

        boolean isOwner = repository.isOwner(username);

        boolean allowAuthenticated = isAuthenticated && AuthorizationControl.AUTHENTICATED.equals(repository.authorizationControl);

        return canAdmin() || isOwner || repositories.contains(repository.name.toLowerCase())

                || hasTeamAccess(repository.name) || allowAuthenticated;

    }



    @Deprecated

    @Unused

    public boolean hasTeamAccess(String repositoryName) {

        for (TeamModel team : teams) {

            if (team.hasRepositoryPermission(repositoryName)) {

                return true;

            }

        }

        return false;

    }



    @Deprecated

    @Unused

    public boolean hasRepository(String name) {

        return hasRepositoryPermission(name);

    }



    @Deprecated

    @Unused

    public void addRepository(String name) {

        addRepositoryPermission(name);

    }



    @Deprecated

    @Unused

    public void removeRepository(String name) {

        removeRepositoryPermission(name);

    }



    /**

@@ -666,12 +614,6 @@
            emailVerified = email.equalsIgnoreCase(emailAddress);

        }

        return nameVerified && emailVerified;

    }



    @Deprecated

    public boolean hasBranchPermission(String repositoryName, String branch) {

        // Default UserModel doesn't implement branch-level security. Other Realms (i.e. Gerrit) may override this method.

        return hasRepositoryPermission(repositoryName) || hasTeamRepositoryPermission(repositoryName);

    }



    public boolean isMyPersonalRepository(String repository) {


 src/main/java/com/gitblit/servlet/AuthenticationFilter.java

@@ -184,7 +184,7 @@
            // Gitblit does not currently use actual roles in the traditional

            // servlet container sense.  That is the reason this is marked

            // deprecated, but I may want to revisit this.

            return user.canAccessRepository(role);

            return user.hasRepositoryPermission(role);

        }



        @Override