Remove obsolete and deprecated FileUserService

James Moger

2013-09-06 578319a659fba918ba720d12ca4d4fc105918595

Remove obsolete and deprecated FileUserService

Change-Id: I92d1d742e286643e1e1ab47a410b3fda146d1741

 src/main/java/com/gitblit/FileUserService.java

File was deleted

 src/main/java/com/gitblit/GitblitUserService.java

@@ -64,13 +64,9 @@
        logger.info("GUS delegating to " + serviceImpl.toString());

    }



    @SuppressWarnings("deprecation")

    protected IUserService createUserService(File realmFile) {

        IUserService service = null;

        if (realmFile.getName().toLowerCase().endsWith(".properties")) {

            // v0.5.0 - v0.7.0 properties-based realm file

            service = new FileUserService(realmFile);

        } else if (realmFile.getName().toLowerCase().endsWith(".conf")) {

        if (realmFile.getName().toLowerCase().endsWith(".conf")) {

            // v0.8.0+ config-based realm file

            service = new ConfigUserService(realmFile);

        }

@@ -91,22 +87,6 @@
            service.updateUserModel(admin);

        }



        if (service instanceof FileUserService) {

            // automatically create a users.conf realm file from the original

            // users.properties file

            File usersConfig = new File(realmFile.getParentFile(), "users.conf");

            if (!usersConfig.exists()) {

                logger.info(MessageFormat.format("Automatically creating {0} based on {1}",

                        usersConfig.getAbsolutePath(), realmFile.getAbsolutePath()));

                ConfigUserService configService = new ConfigUserService(usersConfig);

                for (String username : service.getAllUsernames()) {

                    UserModel userModel = service.getUserModel(username);

                    configService.updateUserModel(userModel);

                }

            }

            // issue suggestion about switching to users.conf

            logger.warn("Please consider using \"users.conf\" instead of the deprecated \"users.properties\" file");

        }

        return service;

    }

    


 src/test/java/com/gitblit/tests/UserServiceTest.java

@@ -26,23 +26,12 @@


import com.gitblit.ConfigUserService;

import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.FileUserService;

import com.gitblit.IUserService;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.TeamModel;

import com.gitblit.models.UserModel;



public class UserServiceTest {



    @Test

    public void testFileUserService() throws IOException {

        File file = new File("us-test.properties");

        file.delete();

        IUserService service = new FileUserService(file);

        testUsers(service);

        testTeams(service);

        file.delete();

    }



    @Test

    public void testConfigUserService() throws IOException {