From 7c4fd671b74f67fdb63e8c9055edb4f3294214e3 Mon Sep 17 00:00:00 2001 From: Matt Richardson Date: Mon, 6 Jul 2026 09:14:11 +1000 Subject: [PATCH 1/2] Minor code cleanup --- .../OctopusBuildInformationBuildStartProcessor.java | 2 +- .../teamcity/server/OctopusBuildInformationRunType.java | 5 ++--- .../teamcity/server/OctopusBuildRunTypeExtension.java | 8 ++------ .../teamcity/server/OctopusCreateReleaseRunType.java | 5 ++--- .../teamcity/server/OctopusDeployReleaseRunType.java | 5 ++--- .../teamcity/server/OctopusPackPackageRunType.java | 5 ++--- .../teamcity/server/OctopusPromoteReleaseRunType.java | 5 ++--- .../teamcity/server/OctopusPushPackageRunType.java | 5 ++--- 8 files changed, 15 insertions(+), 25 deletions(-) diff --git a/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java b/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java index a8231672..67f90865 100644 --- a/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java +++ b/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java @@ -36,7 +36,7 @@ public void updateParameters(final BuildStartContext buildStartContext) { final SRunningBuild build = buildStartContext.getBuild(); final List vcsRoots = build.getVcsRootEntries(); - if (vcsRoots.size() != 0) { + if (!vcsRoots.isEmpty()) { final VcsRootInstanceEntry vcsRoot = vcsRoots.get(0); String vcsType = "Unknown"; if (vcsRoot.getVcsName().contains("git")) { diff --git a/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationRunType.java b/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationRunType.java index 9cc54b05..0802b083 100644 --- a/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationRunType.java +++ b/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationRunType.java @@ -75,7 +75,7 @@ private void checkNotEmpty( @Override @NotNull public Collection process(@Nullable final Map p) { - final Collection result = new ArrayList(); + final Collection result = new ArrayList<>(); if (p == null) return result; final boolean usingConnection = !StringUtil.isEmptyOrSpaces(p.get(c.getConnectionIdKey())); @@ -110,7 +110,6 @@ public String getViewRunnerParamsJspFilePath() { @Nullable @Override public Map getDefaultRunnerProperties() { - final Map map = new HashMap(); - return map; + return new HashMap<>(); } } diff --git a/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildRunTypeExtension.java b/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildRunTypeExtension.java index 12235831..ee7692fd 100644 --- a/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildRunTypeExtension.java +++ b/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildRunTypeExtension.java @@ -6,7 +6,6 @@ import java.util.HashSet; import java.util.Map; -import jetbrains.buildServer.serverSide.InvalidProperty; import jetbrains.buildServer.serverSide.PropertiesProcessor; import jetbrains.buildServer.serverSide.RunTypeExtension; import jetbrains.buildServer.web.openapi.PluginDescriptor; @@ -21,7 +20,7 @@ public OctopusBuildRunTypeExtension(final PluginDescriptor pluginDescriptor) { @Override public Collection getRunTypes() { - Collection items = new HashSet(); + Collection items = new HashSet<>(); items.add("MSBuild"); items.add("VS.Solution"); return items; @@ -30,10 +29,7 @@ public Collection getRunTypes() { @Nullable @Override public PropertiesProcessor getRunnerPropertiesProcessor() { - return p -> { - final Collection result = new ArrayList<>(); - return result; - }; + return p -> new ArrayList<>(); } @Nullable diff --git a/octopus-server/src/main/java/octopus/teamcity/server/OctopusCreateReleaseRunType.java b/octopus-server/src/main/java/octopus/teamcity/server/OctopusCreateReleaseRunType.java index acd959ec..4f32438c 100644 --- a/octopus-server/src/main/java/octopus/teamcity/server/OctopusCreateReleaseRunType.java +++ b/octopus-server/src/main/java/octopus/teamcity/server/OctopusCreateReleaseRunType.java @@ -59,7 +59,7 @@ private void checkNotEmpty( @Override @NotNull public Collection process(@Nullable final Map p) { - final Collection result = new ArrayList(); + final Collection result = new ArrayList<>(); if (p == null) return result; final boolean usingConnection = !StringUtil.isEmptyOrSpaces(p.get(c.getConnectionIdKey())); @@ -93,7 +93,6 @@ public String getViewRunnerParamsJspFilePath() { @Nullable @Override public Map getDefaultRunnerProperties() { - final Map map = new HashMap(); - return map; + return new HashMap<>(); } } diff --git a/octopus-server/src/main/java/octopus/teamcity/server/OctopusDeployReleaseRunType.java b/octopus-server/src/main/java/octopus/teamcity/server/OctopusDeployReleaseRunType.java index cf24f63e..43ce3e59 100644 --- a/octopus-server/src/main/java/octopus/teamcity/server/OctopusDeployReleaseRunType.java +++ b/octopus-server/src/main/java/octopus/teamcity/server/OctopusDeployReleaseRunType.java @@ -75,7 +75,7 @@ private void checkNotEmpty( @Override @NotNull public Collection process(@Nullable final Map p) { - final Collection result = new ArrayList(); + final Collection result = new ArrayList<>(); if (p == null) return result; final boolean usingConnection = !StringUtil.isEmptyOrSpaces(p.get(c.getConnectionIdKey())); @@ -111,7 +111,6 @@ public String getViewRunnerParamsJspFilePath() { @Nullable @Override public Map getDefaultRunnerProperties() { - final Map map = new HashMap(); - return map; + return new HashMap<>(); } } diff --git a/octopus-server/src/main/java/octopus/teamcity/server/OctopusPackPackageRunType.java b/octopus-server/src/main/java/octopus/teamcity/server/OctopusPackPackageRunType.java index 610dc292..d01bda3d 100644 --- a/octopus-server/src/main/java/octopus/teamcity/server/OctopusPackPackageRunType.java +++ b/octopus-server/src/main/java/octopus/teamcity/server/OctopusPackPackageRunType.java @@ -73,7 +73,7 @@ private void checkNotEmpty( @Override @NotNull public Collection process(@Nullable final Map p) { - final Collection result = new ArrayList(); + final Collection result = new ArrayList<>(); if (p == null) return result; checkNotEmpty(p, c.getPackageIdKey(), "Package ID must be specified", result); @@ -102,7 +102,6 @@ public String getViewRunnerParamsJspFilePath() { @Nullable @Override public Map getDefaultRunnerProperties() { - final Map map = new HashMap(); - return map; + return new HashMap<>(); } } diff --git a/octopus-server/src/main/java/octopus/teamcity/server/OctopusPromoteReleaseRunType.java b/octopus-server/src/main/java/octopus/teamcity/server/OctopusPromoteReleaseRunType.java index 70bbae5c..e3307a2e 100644 --- a/octopus-server/src/main/java/octopus/teamcity/server/OctopusPromoteReleaseRunType.java +++ b/octopus-server/src/main/java/octopus/teamcity/server/OctopusPromoteReleaseRunType.java @@ -75,7 +75,7 @@ private void checkNotEmpty( @Override @NotNull public Collection process(@Nullable final Map p) { - final Collection result = new ArrayList(); + final Collection result = new ArrayList<>(); if (p == null) return result; final boolean usingConnection = !StringUtil.isEmptyOrSpaces(p.get(c.getConnectionIdKey())); @@ -112,7 +112,6 @@ public String getViewRunnerParamsJspFilePath() { @Nullable @Override public Map getDefaultRunnerProperties() { - final Map map = new HashMap(); - return map; + return new HashMap<>(); } } diff --git a/octopus-server/src/main/java/octopus/teamcity/server/OctopusPushPackageRunType.java b/octopus-server/src/main/java/octopus/teamcity/server/OctopusPushPackageRunType.java index cd2d35e3..29e99105 100644 --- a/octopus-server/src/main/java/octopus/teamcity/server/OctopusPushPackageRunType.java +++ b/octopus-server/src/main/java/octopus/teamcity/server/OctopusPushPackageRunType.java @@ -75,7 +75,7 @@ private void checkNotEmpty( @Override @NotNull public Collection process(@Nullable final Map p) { - final Collection result = new ArrayList(); + final Collection result = new ArrayList<>(); if (p == null) return result; final boolean usingConnection = !StringUtil.isEmptyOrSpaces(p.get(c.getConnectionIdKey())); @@ -109,7 +109,6 @@ public String getViewRunnerParamsJspFilePath() { @Nullable @Override public Map getDefaultRunnerProperties() { - final Map map = new HashMap(); - return map; + return new HashMap<>(); } } From d796a465641fc85b85080281ca00b92f0c8fe827 Mon Sep 17 00:00:00 2001 From: Matt Richardson Date: Mon, 6 Jul 2026 09:17:41 +1000 Subject: [PATCH 2/2] Fix type in error log --- .../server/OctopusBuildInformationBuildStartProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java b/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java index 67f90865..346c28c1 100644 --- a/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java +++ b/octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java @@ -48,7 +48,7 @@ public void updateParameters(final BuildStartContext buildStartContext) { buildStartContext.addSharedParameter("externalBuildUrl", buildUrl); } } catch (final Throwable t) { - logger.error("Failed to write VCS type into the buildstartContext's shared parameters", t); + logger.error("Failed to write VCS type into the buildStartContext's shared parameters", t); throw t; } }