Skip to content

Commit

Permalink
chore(java): Convert all Groovy in orca-core to Java
Browse files Browse the repository at this point in the history
  • Loading branch information
robfletcher committed Feb 1, 2018
1 parent 7b6f0d2 commit fc87a8e
Show file tree
Hide file tree
Showing 178 changed files with 3,592 additions and 3,552 deletions.
Expand Up @@ -100,7 +100,7 @@ class CreateBakeTaskSpec extends Specification {

@Shared
def buildInfoWithUrl = new BuildInfo(
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/".toURI(),
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/",
[
new JenkinsArtifact("hodor_1.1_all.deb", "."),
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
Expand All @@ -110,7 +110,7 @@ class CreateBakeTaskSpec extends Specification {

@Shared
def buildInfoWithFoldersUrl = new BuildInfo(
"name", 0, "http://spinnaker.builds.test.netflix.net/job/folder/job/SPINNAKER-package-echo/69/".toURI(),
"name", 0, "http://spinnaker.builds.test.netflix.net/job/folder/job/SPINNAKER-package-echo/69/",
[
new JenkinsArtifact("hodor_1.1_all.deb", "."),
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
Expand All @@ -120,7 +120,7 @@ class CreateBakeTaskSpec extends Specification {

@Shared
def buildInfoWithUrlAndSCM = new BuildInfo(
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/".toURI(),
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/",
[
new JenkinsArtifact("hodor_1.1_all.deb", "."),
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
Expand All @@ -132,7 +132,7 @@ class CreateBakeTaskSpec extends Specification {

@Shared
def buildInfoWithUrlAndTwoSCMs = new BuildInfo(
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/".toURI(),
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/",
[
new JenkinsArtifact("hodor_1.1_all.deb", "."),
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
Expand All @@ -145,7 +145,7 @@ class CreateBakeTaskSpec extends Specification {

@Shared
def buildInfoWithUrlAndMasterAndDevelopSCMs = new BuildInfo(
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/".toURI(),
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/",
[
new JenkinsArtifact("hodor_1.1_all.deb", "."),
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
Expand Down
Expand Up @@ -17,6 +17,10 @@

package com.netflix.spinnaker.orca.clouddriver.tasks.manifest;

import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableMap;
import com.netflix.spinnaker.kork.artifacts.model.Artifact;
Expand All @@ -38,15 +42,6 @@
import org.yaml.snakeyaml.Yaml;
import retrofit.client.Response;

import javax.annotation.Nonnull;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Component
@Slf4j
public class DeployManifestTask extends AbstractCloudProviderAwareTask implements Task {
Expand Down Expand Up @@ -102,7 +97,8 @@ public TaskResult execute(@Nonnull Stage stage) {

manifestWrapper = contextParameterProcessor.process(
manifestWrapper,
contextParameterProcessor.buildExecutionContext(stage, true)
contextParameterProcessor.buildExecutionContext(stage, true),
true
);

if (manifestWrapper.containsKey("expressionEvaluationSummary")) {
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion orca-core/orca-core.gradle
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

apply from: "$rootDir/gradle/groovy.gradle"
apply from: "$rootDir/gradle/spock.gradle"

dependencies {
compile project(":orca-extensionpoint")
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit fc87a8e

Please sign in to comment.