Skip to content
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
14 changes: 12 additions & 2 deletions base/src/main/java/io/quarkus/code/model/ProjectDefinition.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.Pattern;

import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
Expand All @@ -34,6 +35,7 @@ public record ProjectDefinition(
Boolean noWrapper,
Boolean noDockerfiles,
Set<String> extensions,
List<String> extraCodestarts,
Map<String, String> codestartData) {

public ProjectDefinition {
Expand All @@ -46,6 +48,7 @@ public record ProjectDefinition(
Objects.requireNonNull(noWrapper, "noWrapper is required");
Objects.requireNonNull(noDockerfiles, "noDockerfiles is required");
Objects.requireNonNull(extensions, "extensions is required");
Objects.requireNonNull(extraCodestarts, "extraCodestarts is required");
Objects.requireNonNull(codestartData, "codestartData is required");
}

Expand All @@ -68,7 +71,8 @@ public record ProjectDefinition(

public static ProjectDefinition of() {
return new ProjectDefinition(null, DEFAULT_GROUPID, DEFAULT_ARTIFACTID, DEFAULT_VERSION, null, null, DEFAULT_BUILDTOOL,
null, DEFAULT_NO_CODE, DEFAULT_NO_CODE, DEFAULT_NO_WRAPPER, DEFAULT_NO_DOCKERFILES, Set.of(), Map.of());
null, DEFAULT_NO_CODE, DEFAULT_NO_CODE, DEFAULT_NO_WRAPPER, DEFAULT_NO_DOCKERFILES, Set.of(), List.of(),
Map.of());
}

@JsonCreator
Expand All @@ -91,6 +95,7 @@ public static final class Builder {
private Boolean noWrapper = DEFAULT_NO_WRAPPER;
private Boolean noDockerfiles = DEFAULT_NO_DOCKERFILES;
private Set<String> extensions = Set.of();
private List<String> extraCodestarts = List.of();
private Map<String, String> codestartData = Map.of();

private Builder() {
Expand Down Expand Up @@ -161,14 +166,19 @@ public Builder extensions(Set<String> extensions) {
return this;
}

public Builder extraCodestarts(List<String> extraCodestarts) {
this.extraCodestarts = extraCodestarts;
return this;
}

public Builder codestartData(Map<String, String> codestartData) {
this.codestartData = codestartData;
return this;
}

public ProjectDefinition build() {
return new ProjectDefinition(streamKey, groupId, artifactId, version, className, path, buildTool, javaVersion,
noCode, noExamples, noWrapper, noDockerfiles, extensions, codestartData);
noCode, noExamples, noWrapper, noDockerfiles, extensions, extraCodestarts, codestartData);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import jakarta.ws.rs.QueryParam;

import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;

Expand Down Expand Up @@ -101,6 +102,11 @@ public class ProjectDefinitionQuery {
@Schema(description = "The set of extension ids that will be included in the generated application", required = false)
Set<String> extensions = Set.of();

@QueryParam("ec")
@Parameter(name = "ec", description = "Extra codestarts to include in the generated application", required = false)
@Schema(description = "Extra codestarts to include in the generated application", required = false)
List<String> extraCodestarts = List.of();

@QueryParam("cd")
@Parameter(name = "cd", description = "Codestart data (key=value format, e.g. cd=my.key=myvalue)", required = false)
@Schema(description = "Codestart data (key=value format, e.g. cd=my.key=myvalue)", required = false)
Expand Down Expand Up @@ -132,6 +138,7 @@ public ProjectDefinition toProjectDefinition() {
noWrapper,
noDockerfiles,
extensions,
extraCodestarts,
parseCodestartData(codestartData));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,6 @@ public Uni<CreatedProject> project(@Valid ProjectDefinition projectDefinition) {
if (!projectDefinition.extensions().isEmpty()) {
projectDefinition.extensions().forEach(extension -> params.add(new BasicNameValuePair("e", extension)));
}
if (!projectDefinition.codestartData().isEmpty()) {
projectDefinition.codestartData()
.forEach((k, v) -> params.add(new BasicNameValuePair("cd", k + "=" + v)));
}
if (projectDefinition.path() != null) {
params.add(new BasicNameValuePair("p", projectDefinition.path()));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ private void createProject(
if (gitHub) {
codestarts.add("tooling-github-action");
}
codestarts.addAll(projectDefinition.extraCodestarts());
JavaVersion javaVersion = new JavaVersion(javaVersionString);
if (javaVersion.isPresent() && !platformInfo.stream().javaCompatibility().versions().contains(javaVersion.getAsInt())) {
throw new IllegalArgumentException("This Java version is not compatible with this stream ("
Expand Down
Loading