Re-organise packages for clarity

src/main/java/com/tw/go/plugin/model/GitConfig.java → src/main/java/com/thoughtworks/go/scm/plugin/git/GitConfig.java

@@ -1,6 +1,6 @@
-package com.tw.go.plugin.model;
+package com.thoughtworks.go.scm.plugin.git;
 
-import com.tw.go.plugin.util.StringUtil;
+import com.thoughtworks.go.scm.plugin.util.StringUtil;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -37,7 +37,7 @@ public boolean isRemoteUrl() {
     }
 
     public boolean hasCredentials() {
-        return !StringUtil.isEmpty(url) && !StringUtil.isEmpty(password);
+        return !StringUtil.isBlank(url) && !StringUtil.isBlank(password);
     }
 
     public String getEffectiveUrl() {
@@ -81,7 +81,7 @@ public String getRemoteBranch() {
     }
 
     public String getEffectiveBranch() {
-        return StringUtil.isEmpty(branch) ? "master" : branch;
+        return StringUtil.isBlank(branch) ? "master" : branch;
     }
 
     public String getBranch() {

src/main/java/com/tw/go/plugin/git/GitHelper.java → src/main/java/com/thoughtworks/go/scm/plugin/git/GitHelper.java

@@ -1,12 +1,10 @@
-package com.tw.go.plugin.git;
-
-import com.tw.go.plugin.cmd.Console;
-import com.tw.go.plugin.cmd.ConsoleResult;
-import com.tw.go.plugin.cmd.InMemoryConsumer;
-import com.tw.go.plugin.cmd.ProcessOutputStreamConsumer;
-import com.tw.go.plugin.model.GitConfig;
-import com.tw.go.plugin.model.Revision;
-import com.tw.go.plugin.util.StringUtil;
+package com.thoughtworks.go.scm.plugin.git;
+
+import com.thoughtworks.go.scm.plugin.git.cmd.Console;
+import com.thoughtworks.go.scm.plugin.git.cmd.ConsoleResult;
+import com.thoughtworks.go.scm.plugin.git.cmd.InMemoryConsumer;
+import com.thoughtworks.go.scm.plugin.git.cmd.ProcessOutputStreamConsumer;
+import com.thoughtworks.go.scm.plugin.util.StringUtil;
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.io.FileUtils;
 
@@ -220,7 +218,7 @@ public void pull() {
     public void fetch(String refSpec) {
         stdOut.consumeLine("[GIT] Fetching changes");
         List<String> args = new ArrayList<>(Arrays.asList("fetch", "origin", "--prune", "--recurse-submodules=no"));
-        if (!StringUtil.isEmpty(refSpec)) {
+        if (!StringUtil.isBlank(refSpec)) {
             args.add(refSpec);
         }
         runOrBomb(Console.createCommand(args.toArray(new String[0])));

src/main/java/com/tw/go/plugin/git/GitModificationParser.java → src/main/java/com/thoughtworks/go/scm/plugin/git/GitModificationParser.java

@@ -1,7 +1,6 @@
-package com.tw.go.plugin.git;
+package com.thoughtworks.go.scm.plugin.git;
 
-import com.tw.go.plugin.model.Revision;
-import com.tw.go.plugin.util.DateUtils;
+import com.thoughtworks.go.scm.plugin.util.DateUtils;
 
 import java.util.LinkedList;
 import java.util.List;

src/main/java/com/thoughtworks/go/scm/plugin/HelperFactory.java → src/main/java/com/thoughtworks/go/scm/plugin/git/HelperFactory.java

@@ -1,9 +1,7 @@
-package com.thoughtworks.go.scm.plugin;
+package com.thoughtworks.go.scm.plugin.git;
 
 
-import com.tw.go.plugin.cmd.ProcessOutputStreamConsumer;
-import com.tw.go.plugin.git.GitHelper;
-import com.tw.go.plugin.model.GitConfig;
+import com.thoughtworks.go.scm.plugin.git.cmd.ProcessOutputStreamConsumer;
 
 import java.io.File;
 

src/main/java/com/tw/go/plugin/model/ModifiedFile.java → src/main/java/com/thoughtworks/go/scm/plugin/git/ModifiedFile.java

@@ -1,4 +1,4 @@
-package com.tw.go.plugin.model;
+package com.thoughtworks.go.scm.plugin.git;
 
 import java.util.Objects;
 

src/main/java/com/tw/go/plugin/model/Revision.java → src/main/java/com/thoughtworks/go/scm/plugin/git/Revision.java

@@ -1,4 +1,4 @@
-package com.tw.go.plugin.model;
+package com.thoughtworks.go.scm.plugin.git;
 
 import java.util.ArrayList;
 import java.util.Date;

src/main/java/com/tw/go/plugin/model/ShallowClone.java → src/main/java/com/thoughtworks/go/scm/plugin/git/ShallowClone.java

@@ -1,4 +1,4 @@
-package com.tw.go.plugin.model;
+package com.thoughtworks.go.scm.plugin.git;
 
 import java.util.Objects;
 

src/main/java/com/tw/go/plugin/cmd/Console.java → src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/Console.java

@@ -1,4 +1,4 @@
-package com.tw.go.plugin.cmd;
+package com.thoughtworks.go.scm.plugin.git.cmd;
 
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.DefaultExecutor;

src/main/java/com/tw/go/plugin/cmd/ConsoleResult.java → src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/ConsoleResult.java

@@ -1,4 +1,4 @@
-package com.tw.go.plugin.cmd;
+package com.thoughtworks.go.scm.plugin.git.cmd;
 
 import java.util.List;
 

src/main/java/com/tw/go/plugin/cmd/InMemoryConsumer.java → src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/InMemoryConsumer.java

@@ -1,4 +1,4 @@
-package com.tw.go.plugin.cmd;
+package com.thoughtworks.go.scm.plugin.git.cmd;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/tw/go/plugin/cmd/ProcessOutputStreamConsumer.java → src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/ProcessOutputStreamConsumer.java

@@ -1,4 +1,4 @@
-package com.tw.go.plugin.cmd;
+package com.thoughtworks.go.scm.plugin.git.cmd;
 
 import org.apache.commons.exec.LogOutputStream;
 

src/main/java/com/tw/go/plugin/cmd/StreamConsumer.java → src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/StreamConsumer.java

@@ -1,4 +1,4 @@
-package com.tw.go.plugin.cmd;
+package com.thoughtworks.go.scm.plugin.git.cmd;
 
 import java.util.List;
 

src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/CheckoutRequestHandler.java

@@ -3,12 +3,12 @@
 import com.thoughtworks.go.plugin.api.logging.Logger;
 import com.thoughtworks.go.plugin.api.request.GoPluginApiRequest;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
-import com.thoughtworks.go.scm.plugin.HelperFactory;
+import com.thoughtworks.go.scm.plugin.git.GitConfig;
+import com.thoughtworks.go.scm.plugin.git.GitHelper;
+import com.thoughtworks.go.scm.plugin.git.HelperFactory;
+import com.thoughtworks.go.scm.plugin.git.cmd.InMemoryConsumer;
+import com.thoughtworks.go.scm.plugin.git.cmd.ProcessOutputStreamConsumer;
 import com.thoughtworks.go.scm.plugin.util.JsonUtils;
-import com.tw.go.plugin.cmd.InMemoryConsumer;
-import com.tw.go.plugin.cmd.ProcessOutputStreamConsumer;
-import com.tw.go.plugin.git.GitHelper;
-import com.tw.go.plugin.model.GitConfig;
 
 import java.io.File;
 import java.util.ArrayList;

src/main/java/com/thoughtworks/go/scm/plugin/FieldValidator.java → src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/FieldValidator.java

@@ -1,4 +1,4 @@
-package com.thoughtworks.go.scm.plugin;
+package com.thoughtworks.go.scm.plugin.model.requestHandlers;
 
 import java.util.Map;
 

src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/GetLatestRevisionRequestHandler.java

@@ -3,12 +3,12 @@
 import com.thoughtworks.go.plugin.api.logging.Logger;
 import com.thoughtworks.go.plugin.api.request.GoPluginApiRequest;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
-import com.thoughtworks.go.scm.plugin.HelperFactory;
+import com.thoughtworks.go.scm.plugin.git.GitConfig;
+import com.thoughtworks.go.scm.plugin.git.GitHelper;
+import com.thoughtworks.go.scm.plugin.git.HelperFactory;
+import com.thoughtworks.go.scm.plugin.git.Revision;
 import com.thoughtworks.go.scm.plugin.util.JsonUtils;
 import com.thoughtworks.go.scm.plugin.util.Validator;
-import com.tw.go.plugin.git.GitHelper;
-import com.tw.go.plugin.model.GitConfig;
-import com.tw.go.plugin.model.Revision;
 
 import java.io.File;
 import java.util.HashMap;

src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/LatestRevisionSinceRequestHandler.java

@@ -3,12 +3,12 @@
 import com.thoughtworks.go.plugin.api.logging.Logger;
 import com.thoughtworks.go.plugin.api.request.GoPluginApiRequest;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
-import com.thoughtworks.go.scm.plugin.HelperFactory;
+import com.thoughtworks.go.scm.plugin.git.GitConfig;
+import com.thoughtworks.go.scm.plugin.git.GitHelper;
+import com.thoughtworks.go.scm.plugin.git.HelperFactory;
+import com.thoughtworks.go.scm.plugin.git.Revision;
 import com.thoughtworks.go.scm.plugin.util.JsonUtils;
 import com.thoughtworks.go.scm.plugin.util.Validator;
-import com.tw.go.plugin.git.GitHelper;
-import com.tw.go.plugin.model.GitConfig;
-import com.tw.go.plugin.model.Revision;
 
 import java.io.File;
 import java.util.HashMap;

src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/RevisionUtil.java

@@ -1,10 +1,12 @@
 package com.thoughtworks.go.scm.plugin.model.requestHandlers;
 
-import com.tw.go.plugin.model.Revision;
+import com.thoughtworks.go.scm.plugin.git.Revision;
 
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
-import java.util.*;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 public class RevisionUtil {

src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/SCMCheckConnectionRequestHandler.java

@@ -3,12 +3,12 @@
 import com.thoughtworks.go.plugin.api.logging.Logger;
 import com.thoughtworks.go.plugin.api.request.GoPluginApiRequest;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
-import com.thoughtworks.go.scm.plugin.HelperFactory;
+import com.thoughtworks.go.scm.plugin.git.GitConfig;
+import com.thoughtworks.go.scm.plugin.git.GitHelper;
+import com.thoughtworks.go.scm.plugin.git.HelperFactory;
 import com.thoughtworks.go.scm.plugin.util.JsonUtils;
+import com.thoughtworks.go.scm.plugin.util.StringUtil;
 import com.thoughtworks.go.scm.plugin.util.Validator;
-import com.tw.go.plugin.git.GitHelper;
-import com.tw.go.plugin.model.GitConfig;
-import com.tw.go.plugin.util.StringUtil;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -40,7 +40,7 @@ public GoPluginApiResponse handle(GoPluginApiRequest goPluginApiRequest) {
     private void checkConnection(GitConfig gitConfig, Map<String, Object> response, ArrayList<String> messages) {
         LOGGER.debug("SCMCheckConnectionRequestHandler In handle");
         try {
-            if (StringUtil.isEmpty(gitConfig.getUrl())) {
+            if (StringUtil.isBlank(gitConfig.getUrl())) {
                 response.put("status", "failure");
                 messages.add("URL is empty");
             } else if (gitConfig.getUrl().startsWith("/")) {

src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/SCMValidationRequestHandler.java

@@ -2,10 +2,9 @@
 
 import com.thoughtworks.go.plugin.api.request.GoPluginApiRequest;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
-import com.thoughtworks.go.scm.plugin.FieldValidator;
+import com.thoughtworks.go.scm.plugin.git.GitConfig;
 import com.thoughtworks.go.scm.plugin.util.JsonUtils;
 import com.thoughtworks.go.scm.plugin.util.Validator;
-import com.tw.go.plugin.model.GitConfig;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/com/tw/go/plugin/util/DateUtils.java → src/main/java/com/thoughtworks/go/scm/plugin/util/DateUtils.java

@@ -1,4 +1,4 @@
-package com.tw.go.plugin.util;
+package com.thoughtworks.go.scm.plugin.util;
 
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormatter;
@@ -25,19 +25,11 @@ public static Date parseISO8601(String date) {
             //fall through and try and parse other ISO standard formats
         }
         try {
-            return dateFormatFor("yyyy-MM-dd'T'HH:mm:ss", "UTC").parse(date);
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+            dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+            return dateFormat.parse(date);
         } catch (ParseException e) {
             throw new RuntimeException(e);
         }
     }
-
-    public static String formatRFC822(Date date) {
-        return new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss ZZZZZ").format(date);
-    }
-
-    private static SimpleDateFormat dateFormatFor(String simpleDateFormat, String timeZone) {
-        SimpleDateFormat dateFormat = new SimpleDateFormat(simpleDateFormat);
-        dateFormat.setTimeZone(TimeZone.getTimeZone(timeZone));
-        return dateFormat;
-    }
 }

src/main/java/com/thoughtworks/go/scm/plugin/util/JsonUtils.java

@@ -4,9 +4,9 @@
 import com.thoughtworks.go.plugin.api.logging.Logger;
 import com.thoughtworks.go.plugin.api.request.GoPluginApiRequest;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
+import com.thoughtworks.go.scm.plugin.git.GitConfig;
+import com.thoughtworks.go.scm.plugin.git.ShallowClone;
 import com.thoughtworks.go.scm.plugin.model.requestHandlers.SCMConfigurationRequestHandler;
-import com.tw.go.plugin.model.GitConfig;
-import com.tw.go.plugin.model.ShallowClone;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 

src/main/java/com/thoughtworks/go/scm/plugin/util/StringUtil.java

@@ -0,0 +1,7 @@
+package com.thoughtworks.go.scm.plugin.util;
+
+public class StringUtil {
+    public static boolean isBlank(String str) {
+        return str == null || str.isBlank();
+    }
+}

src/main/java/com/thoughtworks/go/scm/plugin/util/Validator.java

@@ -1,7 +1,6 @@
 package com.thoughtworks.go.scm.plugin.util;
 
-import com.tw.go.plugin.model.GitConfig;
-import com.tw.go.plugin.util.StringUtil;
+import com.thoughtworks.go.scm.plugin.git.GitConfig;
 
 import java.io.File;
 import java.util.Map;
@@ -17,7 +16,7 @@ public static boolean isValidURL(String url) {
     }
 
     public static void validateUrl(GitConfig gitConfig, Map<String, Object> fieldMap) {
-        if (StringUtil.isEmpty(gitConfig.getUrl())) {
+        if (StringUtil.isBlank(gitConfig.getUrl())) {
             fieldMap.put("key", "url");
             fieldMap.put("message", "URL is a required field");
         } else {

src/test/java/com/tw/go/plugin/model/GitConfigTest.java → src/test/java/com/thoughtworks/go/scm/plugin/git/GitConfigTest.java

@@ -1,4 +1,4 @@
-package com.tw.go.plugin.model;
+package com.thoughtworks.go.scm.plugin.git;
 
 import org.junit.jupiter.api.Test;