Skip to content
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.

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

chore(spotless): upgrade spinnaker gradle plugin #827

Merged
merged 1 commit into from
Jul 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
fiatVersion=1.22.0
korkVersion=7.56.0
org.gradle.parallel=true
spinnakerGradleVersion=8.3.0
spinnakerGradleVersion=8.4.0

# To enable a composite reference to a project, set the
# project property `'<projectName>Composite=true'`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ public class DebDetailsDecorator implements ArtifactDetailsDecorator {

@Override
public GenericArtifact decorate(GenericArtifact genericArtifact) {
return genericArtifact
.toBuilder()
return genericArtifact.toBuilder()
.name(extractName(genericArtifact.getFileName()))
.version(extractVersion(genericArtifact.getFileName()))
.type(packageType)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ public class RpmDetailsDecorator implements ArtifactDetailsDecorator {

@Override
public GenericArtifact decorate(GenericArtifact genericArtifact) {
return genericArtifact
.toBuilder()
return genericArtifact.toBuilder()
.name(extractName(genericArtifact.getFileName()))
.version(extractVersion(genericArtifact.getFileName()))
.type(packageType)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,7 @@ public List<V3Build> getLatestBuilds() {
}

private List<V3Build> getBuildsForSpecificRepos(Collection<String> repositories) {
return repositories
.parallelStream()
return repositories.parallelStream()
.map(this::fetchBuilds)
.filter(Either::isLeft)
.map(Either::getLeft)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ protected BuildPollingDelta generateDelta(PollContext ctx) {
kv("master", master));

List<BuildDelta> delta = new ArrayList<>();
projects
.parallelStream()
projects.parallelStream()
.forEach(
project -> {
List<Pipeline> pipelines =
Expand Down Expand Up @@ -149,9 +148,7 @@ protected void commitDelta(BuildPollingDelta delta, boolean sendEvents) {
final GitlabCiService gitlabCiService =
(GitlabCiService) buildServices.getService(delta.master);

delta
.items
.parallelStream()
delta.items.parallelStream()
.forEach(
item -> {
log.info(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,11 @@ private static class OnFailure {
}

public List<Resource> getResources() {
return Optional.ofNullable(plan.getOnFailure()).map(OnFailure::getStep).map(InnerPlan::getDoes)
.orElse(plan.getDoes()).stream()
return Optional.ofNullable(plan.getOnFailure())
.map(OnFailure::getStep)
.map(InnerPlan::getDoes)
.orElse(plan.getDoes())
.stream()
.map(Op::getResource)
.filter(Objects::nonNull)
.collect(Collectors.toList());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,8 @@ public List<Build> getBuilds(String jobPath, @Nullable Long since) {
return emptyList();
}

return client.getBuildService()
return client
.getBuildService()
.builds(
job.getTeamName(),
job.getPipelineName(),
Expand Down