Skip to content

chore: Minor code cleanup #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matt-richardson merged 2 commits into from
Jul 6, 2026
Merged

chore: Minor code cleanup #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c4fd67
Minor code cleanup
matt-richardson Jul 5, 2026
d796a46
Fix type in error log
matt-richardson Jul 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ver/src/main/java/octopus/teamcity/server/OctopusBuildInformationBuildStartProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void updateParameters(final BuildStartContext buildStartContext) {
final SRunningBuild build = buildStartContext.getBuild();
final List<VcsRootInstanceEntry> vcsRoots = build.getVcsRootEntries();

if (vcsRoots.size() != 0) {
if (!vcsRoots.isEmpty()) {
final VcsRootInstanceEntry vcsRoot = vcsRoots.get(0);
String vcsType = "Unknown";
if (vcsRoot.getVcsName().contains("git")) {
Expand All @@ -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;
}
}
Expand Down
5 changes: 2 additions & 3 deletions octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildInformationRunType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private void checkNotEmpty(
@Override
@NotNull
public Collection<InvalidProperty> process(@Nullable final Map<String, String> p) {
final Collection<InvalidProperty> result = new ArrayList<InvalidProperty>();
final Collection<InvalidProperty> result = new ArrayList<>();
if (p == null) return result;

final boolean usingConnection = !StringUtil.isEmptyOrSpaces(p.get(c.getConnectionIdKey()));
Expand Down Expand Up @@ -110,7 +110,6 @@ public String getViewRunnerParamsJspFilePath() {
@Nullable
@Override
public Map<String, String> getDefaultRunnerProperties() {
final Map<String, String> map = new HashMap<String, String>();
return map;
return new HashMap<>();
}
}
8 changes: 2 additions & 6 deletions octopus-server/src/main/java/octopus/teamcity/server/OctopusBuildRunTypeExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -21,7 +20,7 @@ public OctopusBuildRunTypeExtension(final PluginDescriptor pluginDescriptor) {

@Override
public Collection<String> getRunTypes() {
Collection<String> items = new HashSet<String>();
Collection<String> items = new HashSet<>();
items.add("MSBuild");
items.add("VS.Solution");
return items;
Expand All @@ -30,10 +29,7 @@ public Collection<String> getRunTypes() {
@Nullable
@Override
public PropertiesProcessor getRunnerPropertiesProcessor() {
return p -> {
final Collection<InvalidProperty> result = new ArrayList<>();
return result;
};
return p -> new ArrayList<>();
}

@Nullable
Expand Down
5 changes: 2 additions & 3 deletions octopus-server/src/main/java/octopus/teamcity/server/OctopusCreateReleaseRunType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private void checkNotEmpty(
@Override
@NotNull
public Collection<InvalidProperty> process(@Nullable final Map<String, String> p) {
final Collection<InvalidProperty> result = new ArrayList<InvalidProperty>();
final Collection<InvalidProperty> result = new ArrayList<>();
if (p == null) return result;

final boolean usingConnection = !StringUtil.isEmptyOrSpaces(p.get(c.getConnectionIdKey()));
Expand Down Expand Up @@ -93,7 +93,6 @@ public String getViewRunnerParamsJspFilePath() {
@Nullable
@Override
public Map<String, String> getDefaultRunnerProperties() {
final Map<String, String> map = new HashMap<String, String>();
return map;
return new HashMap<>();
}
}
5 changes: 2 additions & 3 deletions octopus-server/src/main/java/octopus/teamcity/server/OctopusDeployReleaseRunType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private void checkNotEmpty(
@Override
@NotNull
public Collection<InvalidProperty> process(@Nullable final Map<String, String> p) {
final Collection<InvalidProperty> result = new ArrayList<InvalidProperty>();
final Collection<InvalidProperty> result = new ArrayList<>();
if (p == null) return result;

final boolean usingConnection = !StringUtil.isEmptyOrSpaces(p.get(c.getConnectionIdKey()));
Expand Down Expand Up @@ -111,7 +111,6 @@ public String getViewRunnerParamsJspFilePath() {
@Nullable
@Override
public Map<String, String> getDefaultRunnerProperties() {
final Map<String, String> map = new HashMap<String, String>();
return map;
return new HashMap<>();
}
}
5 changes: 2 additions & 3 deletions octopus-server/src/main/java/octopus/teamcity/server/OctopusPackPackageRunType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private void checkNotEmpty(
@Override
@NotNull
public Collection<InvalidProperty> process(@Nullable final Map<String, String> p) {
final Collection<InvalidProperty> result = new ArrayList<InvalidProperty>();
final Collection<InvalidProperty> result = new ArrayList<>();
if (p == null) return result;

checkNotEmpty(p, c.getPackageIdKey(), "Package ID must be specified", result);
Expand Down Expand Up @@ -102,7 +102,6 @@ public String getViewRunnerParamsJspFilePath() {
@Nullable
@Override
public Map<String, String> getDefaultRunnerProperties() {
final Map<String, String> map = new HashMap<String, String>();
return map;
return new HashMap<>();
}
}
5 changes: 2 additions & 3 deletions octopus-server/src/main/java/octopus/teamcity/server/OctopusPromoteReleaseRunType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private void checkNotEmpty(
@Override
@NotNull
public Collection<InvalidProperty> process(@Nullable final Map<String, String> p) {
final Collection<InvalidProperty> result = new ArrayList<InvalidProperty>();
final Collection<InvalidProperty> result = new ArrayList<>();
if (p == null) return result;

final boolean usingConnection = !StringUtil.isEmptyOrSpaces(p.get(c.getConnectionIdKey()));
Expand Down Expand Up @@ -112,7 +112,6 @@ public String getViewRunnerParamsJspFilePath() {
@Nullable
@Override
public Map<String, String> getDefaultRunnerProperties() {
final Map<String, String> map = new HashMap<String, String>();
return map;
return new HashMap<>();
}
}
5 changes: 2 additions & 3 deletions octopus-server/src/main/java/octopus/teamcity/server/OctopusPushPackageRunType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private void checkNotEmpty(
@Override
@NotNull
public Collection<InvalidProperty> process(@Nullable final Map<String, String> p) {
final Collection<InvalidProperty> result = new ArrayList<InvalidProperty>();
final Collection<InvalidProperty> result = new ArrayList<>();
if (p == null) return result;

final boolean usingConnection = !StringUtil.isEmptyOrSpaces(p.get(c.getConnectionIdKey()));
Expand Down Expand Up @@ -109,7 +109,6 @@ public String getViewRunnerParamsJspFilePath() {
@Nullable
@Override
public Map<String, String> getDefaultRunnerProperties() {
final Map<String, String> map = new HashMap<String, String>();
return map;
return new HashMap<>();
}
}
Loading