Using ArrayUtils.isEmpty to test arrays and collections

diff --git a/src/com/gitblit/ConfigUserService.java b/src/com/gitblit/ConfigUserService.java
index c3d42df222513f453feacd2a464b59c6cda48278..5ba49aeaf0da07b011c7d3e31f1ca70af5b2fc1a 100644 (file)
--- a/src/com/gitblit/ConfigUserService.java
+++ b/src/com/gitblit/ConfigUserService.java
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
 \r
 import com.gitblit.models.TeamModel;\r
 import com.gitblit.models.UserModel;\r
+import com.gitblit.utils.ArrayUtils;\r
 import com.gitblit.utils.DeepCopier;\r
 import com.gitblit.utils.StringUtils;\r
 \r
@@ -668,7 +669,7 @@ public class ConfigUserService implements IUserService {
                        // repository memberships\r
                        // null check on "final" repositories because JSON-sourced UserModel\r
                        // can have a null repositories object\r
-                       if (model.repositories != null) {\r
+                       if (!ArrayUtils.isEmpty(model.repositories)) {\r
                                config.setStringList(USER, model.username, REPOSITORY, new ArrayList<String>(\r
                                                model.repositories));\r
                        }\r
@@ -678,33 +679,33 @@ public class ConfigUserService implements IUserService {
                for (TeamModel model : teams.values()) {\r
                        // null check on "final" repositories because JSON-sourced TeamModel\r
                        // can have a null repositories object\r
-                       if (model.repositories != null) {\r
+                       if (!ArrayUtils.isEmpty(model.repositories)) {\r
                                config.setStringList(TEAM, model.name, REPOSITORY, new ArrayList<String>(\r
                                                model.repositories));\r
                        }\r
 \r
                        // null check on "final" users because JSON-sourced TeamModel\r
                        // can have a null users object\r
-                       if (model.users != null) {\r
+                       if (!ArrayUtils.isEmpty(model.users)) {\r
                                config.setStringList(TEAM, model.name, USER, new ArrayList<String>(model.users));\r
                        }\r
 \r
                        // null check on "final" mailing lists because JSON-sourced\r
                        // TeamModel can have a null users object\r
-                       if (model.mailingLists != null) {\r
+                       if (!ArrayUtils.isEmpty(model.mailingLists)) {\r
                                config.setStringList(TEAM, model.name, MAILINGLIST, new ArrayList<String>(\r
                                                model.mailingLists));\r
                        }\r
 \r
                        // null check on "final" preReceiveScripts because JSON-sourced\r
                        // TeamModel can have a null preReceiveScripts object\r
-                       if (model.preReceiveScripts != null) {\r
+                       if (!ArrayUtils.isEmpty(model.preReceiveScripts)) {\r
                                config.setStringList(TEAM, model.name, PRERECEIVE, model.preReceiveScripts);\r
                        }\r
 \r
                        // null check on "final" postReceiveScripts because JSON-sourced\r
                        // TeamModel can have a null postReceiveScripts object\r
-                       if (model.postReceiveScripts != null) {\r
+                       if (!ArrayUtils.isEmpty(model.postReceiveScripts)) {\r
                                config.setStringList(TEAM, model.name, POSTRECEIVE, model.postReceiveScripts);\r
                        }\r
                }\r

diff --git a/src/com/gitblit/FederationPullExecutor.java b/src/com/gitblit/FederationPullExecutor.java
index d54395e48841e6c9a8ba6af3054a57d9c8b23776..0fd1355fbedbefd88063a696b25a25a9ac139776 100644 (file)
--- a/src/com/gitblit/FederationPullExecutor.java
+++ b/src/com/gitblit/FederationPullExecutor.java
@@ -49,6 +49,7 @@ import com.gitblit.models.FederationModel;
 import com.gitblit.models.RepositoryModel;\r
 import com.gitblit.models.TeamModel;\r
 import com.gitblit.models.UserModel;\r
+import com.gitblit.utils.ArrayUtils;\r
 import com.gitblit.utils.FederationUtils;\r
 import com.gitblit.utils.FileUtils;\r
 import com.gitblit.utils.JGitUtils;\r
@@ -339,7 +340,7 @@ public class FederationPullExecutor implements Runnable {
 \r
                                                        // update team repositories\r
                                                        TeamModel remoteTeam = user.getTeam(teamname);\r
-                                                       if (remoteTeam != null && remoteTeam.repositories != null) {\r
+                                                       if (remoteTeam != null && !ArrayUtils.isEmpty(remoteTeam.repositories)) {\r
                                                                int before = team.repositories.size();\r
                                                                team.addRepositories(remoteTeam.repositories);\r
                                                                int after = team.repositories.size();\r
@@ -399,7 +400,7 @@ public class FederationPullExecutor implements Runnable {
                                        "Failed to retrieve SETTINGS from federated gitblit ({0} @ {1})",\r
                                        registration.name, registration.url), e);\r
                }\r
-               \r
+\r
                try {\r
                        // Pull SCRIPTS\r
                        Map<String, String> scripts = FederationUtils.getScripts(registration);\r
@@ -407,9 +408,10 @@ public class FederationPullExecutor implements Runnable {
                                for (Map.Entry<String, String> script : scripts.entrySet()) {\r
                                        String scriptName = script.getKey();\r
                                        if (scriptName.endsWith(".groovy")) {\r
-                                               scriptName = scriptName.substring(0,  scriptName.indexOf(".groovy"));\r
+                                               scriptName = scriptName.substring(0, scriptName.indexOf(".groovy"));\r
                                        }\r
-                                       File file = new File(registrationFolderFile, registration.name + "_" + scriptName + ".groovy");\r
+                                       File file = new File(registrationFolderFile, registration.name + "_"\r
+                                                       + scriptName + ".groovy");\r
                                        FileUtils.writeContent(file, script.getValue());\r
                                }\r
                        }\r

diff --git a/src/com/gitblit/FileUserService.java b/src/com/gitblit/FileUserService.java
index 9c4e507dde0a2623e9d60908a887d4e031d9851d..37ca9a70ae9fcefaa310ad8142b99eaa31ce3b31 100644 (file)
--- a/src/com/gitblit/FileUserService.java
+++ b/src/com/gitblit/FileUserService.java
@@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory;
 \r
 import com.gitblit.models.TeamModel;\r
 import com.gitblit.models.UserModel;\r
+import com.gitblit.utils.ArrayUtils;\r
 import com.gitblit.utils.DeepCopier;\r
 import com.gitblit.utils.StringUtils;\r
 \r
@@ -868,29 +869,39 @@ public class FileUserService extends FileSettings implements IUserService {
 \r
        private void updateTeamCache(Properties allUsers, String teamname, TeamModel model) {\r
                StringBuilder sb = new StringBuilder();\r
-               for (String repository : model.repositories) {\r
-                       sb.append(repository);\r
-                       sb.append(',');\r
+               if (!ArrayUtils.isEmpty(model.repositories)) {\r
+                       for (String repository : model.repositories) {\r
+                               sb.append(repository);\r
+                               sb.append(',');\r
+                       }\r
                }\r
-               for (String user : model.users) {\r
-                       sb.append('!');\r
-                       sb.append(user);\r
-                       sb.append(',');\r
+               if (!ArrayUtils.isEmpty(model.users)) {\r
+                       for (String user : model.users) {\r
+                               sb.append('!');\r
+                               sb.append(user);\r
+                               sb.append(',');\r
+                       }\r
                }\r
-               for (String address : model.mailingLists) {\r
-                       sb.append('&');\r
-                       sb.append(address);\r
-                       sb.append(',');\r
+               if (!ArrayUtils.isEmpty(model.mailingLists)) {\r
+                       for (String address : model.mailingLists) {\r
+                               sb.append('&');\r
+                               sb.append(address);\r
+                               sb.append(',');\r
+                       }\r
                }\r
-               for (String script : model.preReceiveScripts) {\r
-                       sb.append('^');\r
-                       sb.append(script);\r
-                       sb.append(',');\r
+               if (!ArrayUtils.isEmpty(model.preReceiveScripts)) {\r
+                       for (String script : model.preReceiveScripts) {\r
+                               sb.append('^');\r
+                               sb.append(script);\r
+                               sb.append(',');\r
+                       }\r
                }\r
-               for (String script : model.postReceiveScripts) {\r
-                       sb.append('%');\r
-                       sb.append(script);\r
-                       sb.append(',');\r
+               if (!ArrayUtils.isEmpty(model.postReceiveScripts)) {\r
+                       for (String script : model.postReceiveScripts) {\r
+                               sb.append('%');\r
+                               sb.append(script);\r
+                               sb.append(',');\r
+                       }\r
                }\r
                // trim trailing comma\r
                sb.setLength(sb.length() - 1);\r

diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 89dcbf1a9252239e7d02610ac73570a89f99bfca..d7120569701703a897768c36709f70a137aebe8b 100644 (file)
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -75,6 +75,7 @@ import com.gitblit.models.ServerStatus;
 import com.gitblit.models.SettingModel;\r
 import com.gitblit.models.TeamModel;\r
 import com.gitblit.models.UserModel;\r
+import com.gitblit.utils.ArrayUtils;\r
 import com.gitblit.utils.ByteFormat;\r
 import com.gitblit.utils.FederationUtils;\r
 import com.gitblit.utils.JGitUtils;\r
@@ -991,14 +992,14 @@ public class GitBlit implements ServletContextListener {
                config.setString("gitblit", null, "federationStrategy",\r
                                repository.federationStrategy.name());\r
                config.setBoolean("gitblit", null, "isFederated", repository.isFederated);\r
-               if (repository.preReceiveScripts != null) {\r
+               if (!ArrayUtils.isEmpty(repository.preReceiveScripts)) {\r
                        config.setStringList("gitblit", null, "preReceiveScript", repository.preReceiveScripts);\r
                }\r
-               if (repository.postReceiveScripts != null) {\r
+               if (!ArrayUtils.isEmpty(repository.postReceiveScripts)) {\r
                        config.setStringList("gitblit", null, "postReceiveScript",\r
                                        repository.postReceiveScripts);\r
                }\r
-               if (repository.mailingLists != null) {\r
+               if (!ArrayUtils.isEmpty(repository.mailingLists)) {\r
                        config.setStringList("gitblit", null, "mailingList", repository.mailingLists);\r
                }\r
                try {\r

diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java
index e4a332ab00b15c988714e34a11b4e050959cbda5..ebc540f521213d3819d850f5d95c51d3f2bc9118 100644 (file)
--- a/src/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/com/gitblit/client/EditRepositoryDialog.java
@@ -52,6 +52,7 @@ import javax.swing.ListCellRenderer;
 import com.gitblit.Constants.AccessRestrictionType;\r
 import com.gitblit.Constants.FederationStrategy;\r
 import com.gitblit.models.RepositoryModel;\r
+import com.gitblit.utils.ArrayUtils;\r
 import com.gitblit.utils.StringUtils;\r
 \r
 /**\r
@@ -104,11 +105,11 @@ public class EditRepositoryDialog extends JDialog {
        private JPalette<String> teamsPalette;\r
 \r
        private JPalette<String> preReceivePalette;\r
-       \r
+\r
        private JLabel preReceiveInherited;\r
 \r
        private JPalette<String> postReceivePalette;\r
-       \r
+\r
        private JLabel postReceiveInherited;\r
 \r
        private Set<String> repositoryNames;\r
@@ -168,7 +169,7 @@ public class EditRepositoryDialog extends JDialog {
                                anRepository.skipSummaryMetrics);\r
                isFrozen = new JCheckBox(Translation.get("gb.isFrozenDescription"), anRepository.isFrozen);\r
 \r
-               mailingListsField = new JTextField(anRepository.mailingLists == null ? ""\r
+               mailingListsField = new JTextField(ArrayUtils.isEmpty(anRepository.mailingLists) ? ""\r
                                : StringUtils.flattenStrings(anRepository.mailingLists, " "), 50);\r
 \r
                accessRestriction = new JComboBox(AccessRestrictionType.values());\r

diff --git a/src/com/gitblit/client/GitblitClient.java b/src/com/gitblit/client/GitblitClient.java
index d37ee911053c4f4fadf5e717e6b9a8becd7d3baa..09bcaab938323c3045810b10aaf0580507f5c26a 100644 (file)
--- a/src/com/gitblit/client/GitblitClient.java
+++ b/src/com/gitblit/client/GitblitClient.java
@@ -41,6 +41,7 @@ import com.gitblit.models.ServerSettings;
 import com.gitblit.models.ServerStatus;\r
 import com.gitblit.models.TeamModel;\r
 import com.gitblit.models.UserModel;\r
+import com.gitblit.utils.ArrayUtils;\r
 import com.gitblit.utils.RpcUtils;\r
 import com.gitblit.utils.StringUtils;\r
 import com.gitblit.utils.SyndicationUtils;\r
@@ -208,7 +209,9 @@ public class GitblitClient implements Serializable {
                if (repository != null) {\r
                        for (String teamname : getPermittedTeamnames(repository)) {\r
                                TeamModel team = getTeamModel(teamname);\r
-                               scripts.addAll(team.preReceiveScripts);\r
+                               if (!ArrayUtils.isEmpty(team.preReceiveScripts)) {\r
+                                       scripts.addAll(team.preReceiveScripts);\r
+                               }\r
                        }\r
                }\r
                return new ArrayList<String>(scripts);\r
@@ -258,7 +261,9 @@ public class GitblitClient implements Serializable {
                if (repository != null) {\r
                        for (String teamname : getPermittedTeamnames(repository)) {\r
                                TeamModel team = getTeamModel(teamname);\r
-                               scripts.addAll(team.postReceiveScripts);\r
+                               if (!ArrayUtils.isEmpty(team.postReceiveScripts)) {\r
+                                       scripts.addAll(team.postReceiveScripts);\r
+                               }\r
                        }\r
                }\r
                return new ArrayList<String>(scripts);\r
@@ -278,9 +283,11 @@ public class GitblitClient implements Serializable {
 \r
                // create list of available scripts by excluding inherited scripts\r
                List<String> scripts = new ArrayList<String>();\r
-               for (String script : settings.pushScripts) {\r
-                       if (!inherited.contains(script)) {\r
-                               scripts.add(script);\r
+               if (!ArrayUtils.isEmpty(settings.pushScripts)) {                        \r
+                       for (String script : settings.pushScripts) {\r
+                               if (!inherited.contains(script)) {\r
+                                       scripts.add(script);\r
+                               }\r
                        }\r
                }\r
                return scripts;\r
@@ -489,7 +496,7 @@ public class GitblitClient implements Serializable {
                }\r
                return teamnames;\r
        }\r
-       \r
+\r
        public TeamModel getTeamModel(String name) {\r
                for (TeamModel team : allTeams) {\r
                        if (team.name.equalsIgnoreCase(name)) {\r

diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index 0f3a0bbe41acbe8541e055f62d3c34dbed165c40..7d2d64c8092a7b1fc5d816ecdcddeed53fe5066b 100644 (file)
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -47,6 +47,7 @@ import com.gitblit.GitBlitException;
 import com.gitblit.Keys;\r
 import com.gitblit.models.RepositoryModel;\r
 import com.gitblit.models.UserModel;\r
+import com.gitblit.utils.ArrayUtils;\r
 import com.gitblit.utils.StringUtils;\r
 import com.gitblit.wicket.GitBlitWebSession;\r
 import com.gitblit.wicket.WicketUtils;\r
@@ -116,7 +117,7 @@ public class EditRepositoryPage extends RootSubPage {
                                new ChoiceRenderer<String>("", ""), 5, false);\r
 \r
                // pre-receive palette\r
-               if (repositoryModel.preReceiveScripts != null) {\r
+               if (!ArrayUtils.isEmpty(repositoryModel.preReceiveScripts)) {\r
                        preReceiveScripts.addAll(repositoryModel.preReceiveScripts);\r
                }\r
                final Palette<String> preReceivePalette = new Palette<String>("preReceiveScripts",\r
@@ -125,7 +126,7 @@ public class EditRepositoryPage extends RootSubPage {
                                new ChoiceRenderer<String>("", ""), 12, true);\r
 \r
                // post-receive palette\r
-               if (repositoryModel.postReceiveScripts != null) {\r
+               if (!ArrayUtils.isEmpty(repositoryModel.postReceiveScripts)) {\r
                        postReceiveScripts.addAll(repositoryModel.postReceiveScripts);\r
                }\r
                final Palette<String> postReceivePalette = new Palette<String>("postReceiveScripts",\r
@@ -286,7 +287,7 @@ public class EditRepositoryPage extends RootSubPage {
                form.add(new CheckBox("showReadme"));\r
                form.add(new CheckBox("skipSizeCalculation"));\r
                form.add(new CheckBox("skipSummaryMetrics"));\r
-               mailingLists = new Model<String>(repositoryModel.mailingLists == null ? ""\r
+               mailingLists = new Model<String>(ArrayUtils.isEmpty(repositoryModel.mailingLists) ? ""\r
                                : StringUtils.flattenStrings(repositoryModel.mailingLists, " "));\r
                form.add(new TextField<String>("mailingLists", mailingLists));\r
                form.add(usersPalette);\r