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.

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

Rename tooling codestarts #36194

Merged
merged 1 commit into from
Oct 25, 2023
Merged

Rename tooling codestarts #36194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...base-codestarts/src/main/filtered/codestarts/quarkus/tooling/gradle-wrapper/codestart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: gradle-wrapper
name: tooling-gradle-wrapper
type: tooling
ia3andy marked this conversation as resolved.
Show resolved Hide resolved
output-strategy:
"gradlew": "executable"
Expand Down
2 changes: 1 addition & 1 deletion .../base-codestarts/src/main/filtered/codestarts/quarkus/tooling/maven-wrapper/codestart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: maven-wrapper
name: tooling-maven-wrapper
type: tooling
output-strategy:
"mvnw": "executable"
Expand Down
2 changes: 1 addition & 1 deletion ...s/base-codestarts/src/main/resources/codestarts/quarkus/tooling/dockerfiles/codestart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: dockerfiles
name: tooling-dockerfiles
type: tooling
language:
base:
Expand Down
2 changes: 1 addition & 1 deletion ...base-codestarts/src/main/resources/codestarts/quarkus/tooling/github-action/codestart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
name: github-action
name: tooling-github-action
type: tooling
13 changes: 7 additions & 6 deletions ...-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ public enum Language implements DataKey {
}

public enum Tooling implements DataKey {
GRADLE_WRAPPER,
MAVEN_WRAPPER,
DOCKERFILES
TOOLING_GRADLE_WRAPPER,
TOOLING_MAVEN_WRAPPER,
TOOLING_DOCKERFILES,
TOOLING_GITHUB_ACTION
}

public enum ExtensionCodestart implements DataKey {
Expand Down Expand Up @@ -244,17 +245,17 @@ private List<String> getToolingCodestarts(QuarkusCodestartProjectInput projectIn
switch (projectInput.getBuildTool()) {
case GRADLE:
case GRADLE_KOTLIN_DSL:
codestarts.add(QuarkusCodestartCatalog.Tooling.GRADLE_WRAPPER.key());
codestarts.add(Tooling.TOOLING_GRADLE_WRAPPER.key());
break;
case MAVEN:
codestarts.add(QuarkusCodestartCatalog.Tooling.MAVEN_WRAPPER.key());
codestarts.add(Tooling.TOOLING_MAVEN_WRAPPER.key());
break;
default:
throw new IllegalArgumentException("Unsupported build tool wrapper: " + projectInput.getBuildTool());
}
}
if (projectInput.getAppContent().contains(AppContent.DOCKERFILES)) {
codestarts.add(QuarkusCodestartCatalog.Tooling.DOCKERFILES.key());
codestarts.add(QuarkusCodestartCatalog.Tooling.TOOLING_DOCKERFILES.key());
}
return codestarts;
}
Expand Down
8 changes: 4 additions & 4 deletions ...ing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ void createProjectTestNoExample() throws IOException {
.isEqualTo("java");
assertThat(projectDefinition.getBaseCodestarts()).hasSize(4);
assertThat(projectDefinition.getExtraCodestarts()).extracting(Codestart::getName)
.containsExactlyInAnyOrder("dockerfiles",
"maven-wrapper");
.containsExactlyInAnyOrder("tooling-dockerfiles",
"tooling-maven-wrapper");
}

@Test
Expand Down Expand Up @@ -136,8 +136,8 @@ void prepareProjectTestResteasy() throws IOException {
.contains("config-properties");
assertThat(projectDefinition.getExtraCodestarts()).extracting(Codestart::getName)
.containsExactlyInAnyOrder(
"dockerfiles",
"maven-wrapper",
"tooling-dockerfiles",
"tooling-maven-wrapper",
"resteasy-codestart");
}

Expand Down
4 changes: 2 additions & 2 deletions .../src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ public void generateGradleWrapperGithubAction(TestInfo testInfo) throws Throwabl
final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
.buildTool(BuildTool.GRADLE)
.addData(getGenerationTestInputData())
.addCodestarts(Collections.singletonList("github-action"))
.addCodestarts(Collections.singletonList("tooling-github-action"))
.build();
Path projectDir = testDirPath.resolve("gradle-github");
getCatalog().createProject(input).generate(projectDir);
Expand All @@ -284,7 +284,7 @@ public void generateGradleNoWrapperGithubAction(TestInfo testInfo) throws Throwa
.buildTool(BuildTool.GRADLE)
.noBuildToolWrapper()
.addData(getGenerationTestInputData())
.addCodestarts(Collections.singletonList("github-action"))
.addCodestarts(Collections.singletonList("tooling-github-action"))
.build();
Path projectDir = testDirPath.resolve("gradle-nowrapper-github");
getCatalog().createProject(input).generate(projectDir);
Expand Down
Loading