From 9f1991f52c8d6a3d4d6e01f252ff0c9d4def1b5c Mon Sep 17 00:00:00 2001 From: Chad Wilson Date: Mon, 3 Jul 2023 15:12:51 +0800 Subject: [PATCH] Re-organise packages for clarity --- .../go/scm/plugin/git}/GitConfig.java | 8 ++-- .../go/scm}/plugin/git/GitHelper.java | 18 ++++----- .../plugin/git/GitModificationParser.java | 5 +-- .../scm/plugin/{ => git}/HelperFactory.java | 6 +-- .../go/scm/plugin/git}/ModifiedFile.java | 2 +- .../go/scm/plugin/git}/Revision.java | 2 +- .../go/scm/plugin/git}/ShallowClone.java | 2 +- .../go/scm/plugin/git}/cmd/Console.java | 2 +- .../go/scm/plugin/git}/cmd/ConsoleResult.java | 2 +- .../scm/plugin/git}/cmd/InMemoryConsumer.java | 2 +- .../git}/cmd/ProcessOutputStreamConsumer.java | 2 +- .../scm/plugin/git}/cmd/StreamConsumer.java | 2 +- .../CheckoutRequestHandler.java | 10 ++--- .../requestHandlers}/FieldValidator.java | 2 +- .../GetLatestRevisionRequestHandler.java | 8 ++-- .../LatestRevisionSinceRequestHandler.java | 8 ++-- .../model/requestHandlers/RevisionUtil.java | 6 ++- .../SCMCheckConnectionRequestHandler.java | 10 ++--- .../SCMValidationRequestHandler.java | 3 +- .../go/scm}/plugin/util/DateUtils.java | 16 ++------ .../go/scm/plugin/util/JsonUtils.java | 4 +- .../go/scm/plugin/util/StringUtil.java | 7 ++++ .../go/scm/plugin/util/Validator.java | 5 +-- .../com/tw/go/plugin/util/StringUtil.java | 7 ---- .../go/scm/plugin/git}/GitConfigTest.java | 2 +- .../go/scm}/plugin/git/GitHelperTest.java | 39 +++++++++---------- .../go/scm/plugin/git}/RevisionTest.java | 2 +- .../CheckoutRequestHandlerTest.java | 8 ++-- .../GetLatestRevisionRequestHandlerTest.java | 8 ++-- ...JsonUtilsTests.java => JsonUtilsTest.java} | 4 +- src/test/java/com/tw/go/plugin/Pair.java | 11 ------ 31 files changed, 93 insertions(+), 120 deletions(-) rename src/main/java/com/{tw/go/plugin/model => thoughtworks/go/scm/plugin/git}/GitConfig.java (94%) rename src/main/java/com/{tw/go => thoughtworks/go/scm}/plugin/git/GitHelper.java (98%) rename src/main/java/com/{tw/go => thoughtworks/go/scm}/plugin/git/GitModificationParser.java (95%) rename src/main/java/com/thoughtworks/go/scm/plugin/{ => git}/HelperFactory.java (70%) rename src/main/java/com/{tw/go/plugin/model => thoughtworks/go/scm/plugin/git}/ModifiedFile.java (96%) rename src/main/java/com/{tw/go/plugin/model => thoughtworks/go/scm/plugin/git}/Revision.java (98%) rename src/main/java/com/{tw/go/plugin/model => thoughtworks/go/scm/plugin/git}/ShallowClone.java (96%) rename src/main/java/com/{tw/go/plugin => thoughtworks/go/scm/plugin/git}/cmd/Console.java (96%) rename src/main/java/com/{tw/go/plugin => thoughtworks/go/scm/plugin/git}/cmd/ConsoleResult.java (91%) rename src/main/java/com/{tw/go/plugin => thoughtworks/go/scm/plugin/git}/cmd/InMemoryConsumer.java (92%) rename src/main/java/com/{tw/go/plugin => thoughtworks/go/scm/plugin/git}/cmd/ProcessOutputStreamConsumer.java (92%) rename src/main/java/com/{tw/go/plugin => thoughtworks/go/scm/plugin/git}/cmd/StreamConsumer.java (72%) rename src/main/java/com/thoughtworks/go/scm/plugin/{ => model/requestHandlers}/FieldValidator.java (65%) rename src/main/java/com/{tw/go => thoughtworks/go/scm}/plugin/util/DateUtils.java (65%) create mode 100644 src/main/java/com/thoughtworks/go/scm/plugin/util/StringUtil.java delete mode 100644 src/main/java/com/tw/go/plugin/util/StringUtil.java rename src/test/java/com/{tw/go/plugin/model => thoughtworks/go/scm/plugin/git}/GitConfigTest.java (99%) rename src/test/java/com/{tw/go => thoughtworks/go/scm}/plugin/git/GitHelperTest.java (94%) rename src/test/java/com/{tw/go/plugin/model => thoughtworks/go/scm/plugin/git}/RevisionTest.java (96%) rename src/test/java/com/thoughtworks/go/scm/plugin/util/{JsonUtilsTests.java => JsonUtilsTest.java} (98%) delete mode 100644 src/test/java/com/tw/go/plugin/Pair.java diff --git a/src/main/java/com/tw/go/plugin/model/GitConfig.java b/src/main/java/com/thoughtworks/go/scm/plugin/git/GitConfig.java similarity index 94% rename from src/main/java/com/tw/go/plugin/model/GitConfig.java rename to src/main/java/com/thoughtworks/go/scm/plugin/git/GitConfig.java index 7076a315..8177543c 100644 --- a/src/main/java/com/tw/go/plugin/model/GitConfig.java +++ b/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() { diff --git a/src/main/java/com/tw/go/plugin/git/GitHelper.java b/src/main/java/com/thoughtworks/go/scm/plugin/git/GitHelper.java similarity index 98% rename from src/main/java/com/tw/go/plugin/git/GitHelper.java rename to src/main/java/com/thoughtworks/go/scm/plugin/git/GitHelper.java index c3339ecc..ea2821cb 100644 --- a/src/main/java/com/tw/go/plugin/git/GitHelper.java +++ b/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 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]))); diff --git a/src/main/java/com/tw/go/plugin/git/GitModificationParser.java b/src/main/java/com/thoughtworks/go/scm/plugin/git/GitModificationParser.java similarity index 95% rename from src/main/java/com/tw/go/plugin/git/GitModificationParser.java rename to src/main/java/com/thoughtworks/go/scm/plugin/git/GitModificationParser.java index 4bea331b..35e43372 100644 --- a/src/main/java/com/tw/go/plugin/git/GitModificationParser.java +++ b/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; diff --git a/src/main/java/com/thoughtworks/go/scm/plugin/HelperFactory.java b/src/main/java/com/thoughtworks/go/scm/plugin/git/HelperFactory.java similarity index 70% rename from src/main/java/com/thoughtworks/go/scm/plugin/HelperFactory.java rename to src/main/java/com/thoughtworks/go/scm/plugin/git/HelperFactory.java index 55817af2..1d8d0438 100644 --- a/src/main/java/com/thoughtworks/go/scm/plugin/HelperFactory.java +++ b/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; diff --git a/src/main/java/com/tw/go/plugin/model/ModifiedFile.java b/src/main/java/com/thoughtworks/go/scm/plugin/git/ModifiedFile.java similarity index 96% rename from src/main/java/com/tw/go/plugin/model/ModifiedFile.java rename to src/main/java/com/thoughtworks/go/scm/plugin/git/ModifiedFile.java index f075b688..29e5b402 100644 --- a/src/main/java/com/tw/go/plugin/model/ModifiedFile.java +++ b/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; diff --git a/src/main/java/com/tw/go/plugin/model/Revision.java b/src/main/java/com/thoughtworks/go/scm/plugin/git/Revision.java similarity index 98% rename from src/main/java/com/tw/go/plugin/model/Revision.java rename to src/main/java/com/thoughtworks/go/scm/plugin/git/Revision.java index 2520c9b5..265138b1 100644 --- a/src/main/java/com/tw/go/plugin/model/Revision.java +++ b/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; diff --git a/src/main/java/com/tw/go/plugin/model/ShallowClone.java b/src/main/java/com/thoughtworks/go/scm/plugin/git/ShallowClone.java similarity index 96% rename from src/main/java/com/tw/go/plugin/model/ShallowClone.java rename to src/main/java/com/thoughtworks/go/scm/plugin/git/ShallowClone.java index 147510bb..7a30fb81 100644 --- a/src/main/java/com/tw/go/plugin/model/ShallowClone.java +++ b/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; diff --git a/src/main/java/com/tw/go/plugin/cmd/Console.java b/src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/Console.java similarity index 96% rename from src/main/java/com/tw/go/plugin/cmd/Console.java rename to src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/Console.java index 7e55a20c..48427815 100644 --- a/src/main/java/com/tw/go/plugin/cmd/Console.java +++ b/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; diff --git a/src/main/java/com/tw/go/plugin/cmd/ConsoleResult.java b/src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/ConsoleResult.java similarity index 91% rename from src/main/java/com/tw/go/plugin/cmd/ConsoleResult.java rename to src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/ConsoleResult.java index c83aea93..b57f5e5e 100644 --- a/src/main/java/com/tw/go/plugin/cmd/ConsoleResult.java +++ b/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; diff --git a/src/main/java/com/tw/go/plugin/cmd/InMemoryConsumer.java b/src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/InMemoryConsumer.java similarity index 92% rename from src/main/java/com/tw/go/plugin/cmd/InMemoryConsumer.java rename to src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/InMemoryConsumer.java index 92ac0a0c..706310c2 100644 --- a/src/main/java/com/tw/go/plugin/cmd/InMemoryConsumer.java +++ b/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; diff --git a/src/main/java/com/tw/go/plugin/cmd/ProcessOutputStreamConsumer.java b/src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/ProcessOutputStreamConsumer.java similarity index 92% rename from src/main/java/com/tw/go/plugin/cmd/ProcessOutputStreamConsumer.java rename to src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/ProcessOutputStreamConsumer.java index 5ffffbb1..1592d7f4 100644 --- a/src/main/java/com/tw/go/plugin/cmd/ProcessOutputStreamConsumer.java +++ b/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; diff --git a/src/main/java/com/tw/go/plugin/cmd/StreamConsumer.java b/src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/StreamConsumer.java similarity index 72% rename from src/main/java/com/tw/go/plugin/cmd/StreamConsumer.java rename to src/main/java/com/thoughtworks/go/scm/plugin/git/cmd/StreamConsumer.java index a0d0d59d..c1c55b64 100644 --- a/src/main/java/com/tw/go/plugin/cmd/StreamConsumer.java +++ b/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; diff --git a/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/CheckoutRequestHandler.java b/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/CheckoutRequestHandler.java index 5205d620..5a09a6c9 100644 --- a/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/CheckoutRequestHandler.java +++ b/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; diff --git a/src/main/java/com/thoughtworks/go/scm/plugin/FieldValidator.java b/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/FieldValidator.java similarity index 65% rename from src/main/java/com/thoughtworks/go/scm/plugin/FieldValidator.java rename to src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/FieldValidator.java index efb8b07e..933ae704 100644 --- a/src/main/java/com/thoughtworks/go/scm/plugin/FieldValidator.java +++ b/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; diff --git a/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/GetLatestRevisionRequestHandler.java b/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/GetLatestRevisionRequestHandler.java index c6277bf6..0e2d6061 100644 --- a/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/GetLatestRevisionRequestHandler.java +++ b/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; diff --git a/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/LatestRevisionSinceRequestHandler.java b/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/LatestRevisionSinceRequestHandler.java index 1258fa50..b1727eee 100644 --- a/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/LatestRevisionSinceRequestHandler.java +++ b/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; diff --git a/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/RevisionUtil.java b/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/RevisionUtil.java index ef3b791d..3e2d9098 100644 --- a/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/RevisionUtil.java +++ b/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 { diff --git a/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/SCMCheckConnectionRequestHandler.java b/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/SCMCheckConnectionRequestHandler.java index accb6b3c..e0e4b976 100644 --- a/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/SCMCheckConnectionRequestHandler.java +++ b/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 response, ArrayList 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("/")) { diff --git a/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/SCMValidationRequestHandler.java b/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/SCMValidationRequestHandler.java index 4296f67c..751035a7 100644 --- a/src/main/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/SCMValidationRequestHandler.java +++ b/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; diff --git a/src/main/java/com/tw/go/plugin/util/DateUtils.java b/src/main/java/com/thoughtworks/go/scm/plugin/util/DateUtils.java similarity index 65% rename from src/main/java/com/tw/go/plugin/util/DateUtils.java rename to src/main/java/com/thoughtworks/go/scm/plugin/util/DateUtils.java index 5bbb86d6..39633175 100644 --- a/src/main/java/com/tw/go/plugin/util/DateUtils.java +++ b/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; - } } diff --git a/src/main/java/com/thoughtworks/go/scm/plugin/util/JsonUtils.java b/src/main/java/com/thoughtworks/go/scm/plugin/util/JsonUtils.java index d2c4cc4b..444ca452 100644 --- a/src/main/java/com/thoughtworks/go/scm/plugin/util/JsonUtils.java +++ b/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; diff --git a/src/main/java/com/thoughtworks/go/scm/plugin/util/StringUtil.java b/src/main/java/com/thoughtworks/go/scm/plugin/util/StringUtil.java new file mode 100644 index 00000000..30976f47 --- /dev/null +++ b/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(); + } +} diff --git a/src/main/java/com/thoughtworks/go/scm/plugin/util/Validator.java b/src/main/java/com/thoughtworks/go/scm/plugin/util/Validator.java index 35165cb9..97252578 100644 --- a/src/main/java/com/thoughtworks/go/scm/plugin/util/Validator.java +++ b/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 fieldMap) { - if (StringUtil.isEmpty(gitConfig.getUrl())) { + if (StringUtil.isBlank(gitConfig.getUrl())) { fieldMap.put("key", "url"); fieldMap.put("message", "URL is a required field"); } else { diff --git a/src/main/java/com/tw/go/plugin/util/StringUtil.java b/src/main/java/com/tw/go/plugin/util/StringUtil.java deleted file mode 100644 index d83d4430..00000000 --- a/src/main/java/com/tw/go/plugin/util/StringUtil.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.tw.go.plugin.util; - -public class StringUtil { - public static boolean isEmpty(String str) { - return str == null || str.trim().isEmpty(); - } -} diff --git a/src/test/java/com/tw/go/plugin/model/GitConfigTest.java b/src/test/java/com/thoughtworks/go/scm/plugin/git/GitConfigTest.java similarity index 99% rename from src/test/java/com/tw/go/plugin/model/GitConfigTest.java rename to src/test/java/com/thoughtworks/go/scm/plugin/git/GitConfigTest.java index f5cc848f..d6fc264c 100644 --- a/src/test/java/com/tw/go/plugin/model/GitConfigTest.java +++ b/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; diff --git a/src/test/java/com/tw/go/plugin/git/GitHelperTest.java b/src/test/java/com/thoughtworks/go/scm/plugin/git/GitHelperTest.java similarity index 94% rename from src/test/java/com/tw/go/plugin/git/GitHelperTest.java rename to src/test/java/com/thoughtworks/go/scm/plugin/git/GitHelperTest.java index 14d31cd5..df7308db 100644 --- a/src/test/java/com/tw/go/plugin/git/GitHelperTest.java +++ b/src/test/java/com/thoughtworks/go/scm/plugin/git/GitHelperTest.java @@ -1,13 +1,10 @@ -package com.tw.go.plugin.git; - -import com.tw.go.plugin.Pair; -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.model.ShallowClone; +package com.thoughtworks.go.scm.plugin.git; + +import com.thoughtworks.go.scm.plugin.git.cmd.InMemoryConsumer; +import com.thoughtworks.go.scm.plugin.git.cmd.ProcessOutputStreamConsumer; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; @@ -105,7 +102,7 @@ public void shouldGetRevisionForRepository() throws Exception { assertThat(git.currentRevision()).isEqualTo("012e893acea10b140688d11beaa728e8c60bd9f6"); Revision revision = git.getDetailsForRevision("012e893acea10b140688d11beaa728e8c60bd9f6"); - verifyRevision(revision, "012e893acea10b140688d11beaa728e8c60bd9f6", "1", 1422184635000L, List.of(new Pair("a.txt", "added"))); + verifyRevision(revision, "012e893acea10b140688d11beaa728e8c60bd9f6", "1", 1422184635000L, List.of(Pair.of("a.txt", "added"))); } @Test @@ -121,7 +118,7 @@ public void shouldPollRepository() throws Exception { Revision revision = git.getLatestRevision(); - verifyRevision(revision, "012e893acea10b140688d11beaa728e8c60bd9f6", "1", 1422184635000L, List.of(new Pair("a.txt", "added"))); + verifyRevision(revision, "012e893acea10b140688d11beaa728e8c60bd9f6", "1", 1422184635000L, List.of(Pair.of("a.txt", "added"))); // Fetch & Get LatestRevisionsSince FileUtils.deleteQuietly(simpleGitRepository.getAbsoluteFile()); @@ -135,8 +132,8 @@ public void shouldPollRepository() throws Exception { List newerRevisions = git.getRevisionsSince("012e893acea10b140688d11beaa728e8c60bd9f6"); assertThat(newerRevisions.size()).isEqualTo(2); - verifyRevision(newerRevisions.get(0), "24ce45d1a1427b643ae859777417bbc9f0d7cec8", "3\ntest multiline\ncomment", 1422189618000L, List.of(new Pair("a.txt", "modified"), new Pair("b.txt", "added"))); - verifyRevision(newerRevisions.get(1), "1320a78055558603a2c29d803bbaa50d3542ff50", "2", 1422189545000L, List.of(new Pair("a.txt", "modified"))); + verifyRevision(newerRevisions.get(0), "24ce45d1a1427b643ae859777417bbc9f0d7cec8", "3\ntest multiline\ncomment", 1422189618000L, List.of(Pair.of("a.txt", "modified"), Pair.of("b.txt", "added"))); + verifyRevision(newerRevisions.get(1), "1320a78055558603a2c29d803bbaa50d3542ff50", "2", 1422189545000L, List.of(Pair.of("a.txt", "modified"))); // poll again git.cloneOrFetch(); @@ -160,7 +157,7 @@ public void shouldGetLatestRevisionForSubpaths() throws Exception { assertThat(aRevision.getRevision()).isEqualTo("7d14db6ec07f2cfac82195e401780bf127349ddb"); assertThat(aRevision.getModifiedFiles()).hasSize(1); - verifyRevision(aRevision, "7d14db6ec07f2cfac82195e401780bf127349ddb", "Change to a.txt", 1567878351000L, List.of(new Pair("a.txt", "modified"))); + verifyRevision(aRevision, "7d14db6ec07f2cfac82195e401780bf127349ddb", "Change to a.txt", 1567878351000L, List.of(Pair.of("a.txt", "modified"))); assertThat(bRevision.getRevision()).isEqualTo("24ce45d1a1427b643ae859777417bbc9f0d7cec8"); assertThat(bRevision.getModifiedFiles()).hasSize(2); @@ -170,7 +167,7 @@ public void shouldGetLatestRevisionForSubpaths() throws Exception { List aRevisions = git.getRevisionsSince("24ce45d1a1427b643ae859777417bbc9f0d7cec8", List.of("a.txt")); assertThat(aRevisions).hasSize(1); - verifyRevision(aRevisions.get(0), "7d14db6ec07f2cfac82195e401780bf127349ddb", "Change to a.txt", 1567878351000L, List.of(new Pair("a.txt", "modified"))); + verifyRevision(aRevisions.get(0), "7d14db6ec07f2cfac82195e401780bf127349ddb", "Change to a.txt", 1567878351000L, List.of(Pair.of("a.txt", "modified"))); List bRevisions = git.getRevisionsSince("24ce45d1a1427b643ae859777417bbc9f0d7cec8", List.of("b.txt")); assertThat(bRevisions).hasSize(0); @@ -311,7 +308,7 @@ public void shouldReturnModifiedFilesForMergeCommit() throws Exception { GitHelper git = getHelper(new GitConfig(mergeCommitGitRepository.getAbsolutePath()), mergeCommitGitRepository); Revision revision = git.getDetailsForRevision("66a1b17514622a8e4a620a033cca3715ef870e71"); - verifyRevision(revision, "66a1b17514622a8e4a620a033cca3715ef870e71", "Merge branch 'master' into test-branch", 1477248891000L, List.of(new Pair("file.txt", "modified"))); + verifyRevision(revision, "66a1b17514622a8e4a620a033cca3715ef870e71", "Merge branch 'master' into test-branch", 1477248891000L, List.of(Pair.of("file.txt", "modified"))); assertTrue(revision.isMergeCommit(), "Revision should be a merge commit"); } @@ -328,7 +325,7 @@ public void shouldShallowClone() throws Exception { assertThat(git.getCommitCount()).isEqualTo(1); Revision revision = git.getLatestRevision(); - verifyRevision(revision, "24ce45d1a1427b643ae859777417bbc9f0d7cec8", "3\ntest multiline\ncomment", 1422189618000L, List.of(new Pair("a.txt", "added"), new Pair("b.txt", "added"))); + verifyRevision(revision, "24ce45d1a1427b643ae859777417bbc9f0d7cec8", "3\ntest multiline\ncomment", 1422189618000L, List.of(Pair.of("a.txt", "added"), Pair.of("b.txt", "added"))); List newerRevisions = git.getRevisionsSince("24ce45d1a1427b643ae859777417bbc9f0d7cec8"); assertThat(newerRevisions.isEmpty()).isEqualTo(true); @@ -340,7 +337,7 @@ public void shouldShallowClone() throws Exception { git.cloneOrFetch(); assertThat(git.getCommitCount()).isEqualTo(2); - verifyRevision(revision, "24ce45d1a1427b643ae859777417bbc9f0d7cec8", "3\ntest multiline\ncomment", 1422189618000L, List.of(new Pair("a.txt", "added"), new Pair("b.txt", "added"))); + verifyRevision(revision, "24ce45d1a1427b643ae859777417bbc9f0d7cec8", "3\ntest multiline\ncomment", 1422189618000L, List.of(Pair.of("a.txt", "added"), Pair.of("b.txt", "added"))); } @Test @@ -376,7 +373,7 @@ public void shouldCloneWithNoCheckout() throws Exception { assertThat(git.getCommitCount()).isEqualTo(3); Revision revision = git.getLatestRevision(); - verifyRevision(revision, "24ce45d1a1427b643ae859777417bbc9f0d7cec8", "3\ntest multiline\ncomment", 1422189618000L, List.of(new Pair("a.txt", "modified"), new Pair("b.txt", "added"))); + verifyRevision(revision, "24ce45d1a1427b643ae859777417bbc9f0d7cec8", "3\ntest multiline\ncomment", 1422189618000L, List.of(Pair.of("a.txt", "modified"), Pair.of("b.txt", "added"))); // poll again git.cloneOrFetch(); @@ -429,14 +426,14 @@ private void extractFile(ZipInputStream zipInputStream, String filePath) throws bufferedOutputStream.close(); } - protected void verifyRevision(Revision revision, String sha, String comment, long timestamp, List files) { + protected void verifyRevision(Revision revision, String sha, String comment, long timestamp, List> files) { assertThat(revision.getRevision()).isEqualTo(sha); assertThat(revision.getTimestamp().getTime()).isEqualTo(timestamp); assertThat(revision.getComment()).isEqualTo(comment); assertThat(revision.getModifiedFiles().size()).isEqualTo(files.size()); for (int i = 0; i < files.size(); i++) { - assertThat(revision.getModifiedFiles().get(i).getFileName()).isEqualTo(files.get(i).a); - assertThat(revision.getModifiedFiles().get(i).getAction()).isEqualTo(files.get(i).b); + assertThat(revision.getModifiedFiles().get(i).getFileName()).isEqualTo(files.get(i).getLeft()); + assertThat(revision.getModifiedFiles().get(i).getAction()).isEqualTo(files.get(i).getRight()); } } } diff --git a/src/test/java/com/tw/go/plugin/model/RevisionTest.java b/src/test/java/com/thoughtworks/go/scm/plugin/git/RevisionTest.java similarity index 96% rename from src/test/java/com/tw/go/plugin/model/RevisionTest.java rename to src/test/java/com/thoughtworks/go/scm/plugin/git/RevisionTest.java index b3e58abf..22475a54 100644 --- a/src/test/java/com/tw/go/plugin/model/RevisionTest.java +++ b/src/test/java/com/thoughtworks/go/scm/plugin/git/RevisionTest.java @@ -1,4 +1,4 @@ -package com.tw.go.plugin.model; +package com.thoughtworks.go.scm.plugin.git; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/CheckoutRequestHandlerTest.java b/src/test/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/CheckoutRequestHandlerTest.java index 961764d4..9f85e733 100644 --- a/src/test/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/CheckoutRequestHandlerTest.java +++ b/src/test/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/CheckoutRequestHandlerTest.java @@ -2,11 +2,11 @@ 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.ProcessOutputStreamConsumer; import com.thoughtworks.go.scm.plugin.util.JsonUtils; -import com.tw.go.plugin.cmd.ProcessOutputStreamConsumer; -import com.tw.go.plugin.git.GitHelper; -import com.tw.go.plugin.model.GitConfig; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; diff --git a/src/test/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/GetLatestRevisionRequestHandlerTest.java b/src/test/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/GetLatestRevisionRequestHandlerTest.java index 444c4bb4..41ad68cc 100644 --- a/src/test/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/GetLatestRevisionRequestHandlerTest.java +++ b/src/test/java/com/thoughtworks/go/scm/plugin/model/requestHandlers/GetLatestRevisionRequestHandlerTest.java @@ -2,11 +2,11 @@ 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.tw.go.plugin.git.GitHelper; -import com.tw.go.plugin.model.GitConfig; -import com.tw.go.plugin.model.Revision; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; diff --git a/src/test/java/com/thoughtworks/go/scm/plugin/util/JsonUtilsTests.java b/src/test/java/com/thoughtworks/go/scm/plugin/util/JsonUtilsTest.java similarity index 98% rename from src/test/java/com/thoughtworks/go/scm/plugin/util/JsonUtilsTests.java rename to src/test/java/com/thoughtworks/go/scm/plugin/util/JsonUtilsTest.java index 678b6941..77ea9ed4 100644 --- a/src/test/java/com/thoughtworks/go/scm/plugin/util/JsonUtilsTests.java +++ b/src/test/java/com/thoughtworks/go/scm/plugin/util/JsonUtilsTest.java @@ -2,8 +2,8 @@ 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.helpers.JsonHelper; -import com.tw.go.plugin.model.GitConfig; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -15,7 +15,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class JsonUtilsTests { +public class JsonUtilsTest { private static class Response { private final String message; diff --git a/src/test/java/com/tw/go/plugin/Pair.java b/src/test/java/com/tw/go/plugin/Pair.java deleted file mode 100644 index d1f4110f..00000000 --- a/src/test/java/com/tw/go/plugin/Pair.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.tw.go.plugin; - -public class Pair { - public final String a; - public final String b; - - public Pair(String a, String b) { - this.a = a; - this.b = b; - } -}