-
Notifications
You must be signed in to change notification settings - Fork 73
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
`createLaunchConfig`, `mergeDiagnosticsJson`, `createInitScript` and `createCheckScript` can all now run in parallel within the same project.
- Loading branch information
Showing
18 changed files
with
533 additions
and
494 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| type: fix | ||
| fix: | ||
| description: '`createLaunchConfig`, `mergeDiagnosticsJson`, `createInitScript` and | ||
| `createCheckScript` can all now run in parallel within the same project.' | ||
| links: | ||
| - https://github.com/palantir/sls-packaging/pull/1434 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
...le-sls-packaging/src/main/java/com/palantir/gradle/dist/service/MergeDiagnosticsJson.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * (c) Copyright 2020 Palantir Technologies Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.palantir.gradle.dist.service; | ||
|
|
||
| import com.fasterxml.jackson.databind.node.ObjectNode; | ||
| import com.palantir.gradle.autoparallelizable.AutoParallelizable; | ||
| import com.palantir.gradle.dist.ObjectMappers; | ||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.util.Comparator; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
| import org.gradle.api.GradleException; | ||
| import org.gradle.api.file.ConfigurableFileCollection; | ||
| import org.gradle.api.file.RegularFileProperty; | ||
| import org.gradle.api.tasks.InputFiles; | ||
| import org.gradle.api.tasks.OutputFile; | ||
| import org.gradle.api.tasks.PathSensitive; | ||
| import org.gradle.api.tasks.PathSensitivity; | ||
|
|
||
| @AutoParallelizable | ||
| final class MergeDiagnosticsJson { | ||
| interface Params { | ||
| @InputFiles | ||
| @PathSensitive(PathSensitivity.NONE) | ||
| ConfigurableFileCollection getClasspath(); | ||
|
|
||
| @OutputFile | ||
| RegularFileProperty getOutputJsonFile(); | ||
| } | ||
|
|
||
| static void action(Params params) { | ||
| List<ObjectNode> aggregated = params.getClasspath().getFiles().stream() | ||
| .flatMap(file -> Diagnostics.parse(file).stream()) | ||
| .distinct() | ||
| .sorted(Comparator.comparing(node -> node.get("type").asText())) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| File out = params.getOutputJsonFile().getAsFile().get(); | ||
| try { | ||
| ObjectMappers.jsonMapper.writeValue(out, aggregated); | ||
| } catch (IOException e) { | ||
| throw new GradleException("Failed to write " + out, e); | ||
| } | ||
| } | ||
|
|
||
| private MergeDiagnosticsJson() {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
...sls-packaging/src/main/java/com/palantir/gradle/dist/service/tasks/CreateCheckScript.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.palantir.gradle.dist.service.tasks; | ||
|
|
||
| import com.google.common.base.Joiner; | ||
| import com.google.common.collect.ImmutableMap; | ||
| import com.palantir.gradle.autoparallelizable.AutoParallelizable; | ||
| import com.palantir.gradle.dist.service.JavaServiceDistributionPlugin; | ||
| import com.palantir.gradle.dist.service.util.EmitFiles; | ||
| import org.gradle.api.file.RegularFileProperty; | ||
| import org.gradle.api.provider.ListProperty; | ||
| import org.gradle.api.provider.Property; | ||
| import org.gradle.api.tasks.Input; | ||
| import org.gradle.api.tasks.OutputFile; | ||
|
|
||
| @AutoParallelizable | ||
| public final class CreateCheckScript { | ||
| interface Params { | ||
| @Input | ||
| Property<String> getServiceName(); | ||
|
|
||
| @Input | ||
| ListProperty<String> getCheckArgs(); | ||
|
|
||
| @OutputFile | ||
| RegularFileProperty getOutputFile(); | ||
| } | ||
|
|
||
| static void action(Params params) { | ||
| if (!params.getCheckArgs().get().isEmpty()) { | ||
| EmitFiles.replaceVars( | ||
| JavaServiceDistributionPlugin.class.getResourceAsStream("/check.sh"), | ||
| params.getOutputFile().get().getAsFile().toPath(), | ||
| ImmutableMap.of( | ||
| "@serviceName@", params.getServiceName().get(), | ||
| "@checkArgs@", | ||
| Joiner.on(" ") | ||
| .join(params.getCheckArgs().get()))) | ||
| .toFile() | ||
| .setExecutable(true); | ||
| } | ||
| } | ||
|
|
||
| private CreateCheckScript() {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
...-sls-packaging/src/main/java/com/palantir/gradle/dist/service/tasks/CreateInitScript.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * (c) Copyright 2016 Palantir Technologies Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.palantir.gradle.dist.service.tasks; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
| import com.palantir.gradle.autoparallelizable.AutoParallelizable; | ||
| import com.palantir.gradle.dist.service.JavaServiceDistributionPlugin; | ||
| import com.palantir.gradle.dist.service.util.EmitFiles; | ||
| import org.gradle.api.file.RegularFileProperty; | ||
| import org.gradle.api.provider.Property; | ||
| import org.gradle.api.tasks.Input; | ||
| import org.gradle.api.tasks.OutputFile; | ||
|
|
||
| @AutoParallelizable | ||
| public final class CreateInitScript { | ||
| interface Params { | ||
| @Input | ||
| Property<String> getServiceName(); | ||
|
|
||
| @OutputFile | ||
| RegularFileProperty getOutputFile(); | ||
| } | ||
|
|
||
| static void action(Params params) { | ||
| EmitFiles.replaceVars( | ||
| JavaServiceDistributionPlugin.class.getResourceAsStream("/init.sh"), | ||
| params.getOutputFile().get().getAsFile().toPath(), | ||
| ImmutableMap.of("@serviceName@", params.getServiceName().get())) | ||
| .toFile() | ||
| .setExecutable(true); | ||
| } | ||
|
|
||
| private CreateInitScript() {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.