Skip to content

fix: allow repetition of jvm options and command line arguments #1163

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

Merged
0utplay merged 1 commit into from
Mar 17, 2023
Merged

fix: allow repetition of jvm options and command line arguments #1163

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
22 changes: 11 additions & 11 deletions driver/src/main/java/eu/cloudnetservice/driver/service/ProcessConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
package eu.cloudnetservice.driver.service;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import lombok.NonNull;
import org.jetbrains.annotations.Range;
Expand All @@ -41,8 +41,8 @@
public record ProcessConfiguration(
@NonNull String environment,
int maxHeapMemorySize,
@Unmodifiable @NonNull Set<String> jvmOptions,
@Unmodifiable @NonNull Set<String> processParameters,
@Unmodifiable @NonNull List<String> jvmOptions,
@Unmodifiable @NonNull List<String> processParameters,
@Unmodifiable @NonNull Map<String, String> environmentVariables
) implements Cloneable {

Expand Down Expand Up @@ -95,8 +95,8 @@ public static class Builder {
protected String environment;
protected int maxHeapMemorySize = 512;

protected Set<String> jvmOptions = new LinkedHashSet<>();
protected Set<String> processParameters = new LinkedHashSet<>();
protected List<String> jvmOptions = new LinkedList<>();
protected List<String> processParameters = new LinkedList<>();
protected Map<String, String> environmentVariables = new HashMap<>();

/**
Expand Down Expand Up @@ -154,7 +154,7 @@ public static class Builder {
* @throws NullPointerException if the given options collection is null.
*/
public @NonNull Builder jvmOptions(@NonNull Collection<String> jvmOptions) {
this.jvmOptions = new LinkedHashSet<>(jvmOptions);
this.jvmOptions = new LinkedList<>(jvmOptions);
return this;
}

Expand Down Expand Up @@ -188,7 +188,7 @@ public static class Builder {
* @throws NullPointerException if the given parameters' collection is null.
*/
public @NonNull Builder processParameters(@NonNull Collection<String> processParameters) {
this.processParameters = new LinkedHashSet<>(processParameters);
this.processParameters = new LinkedList<>(processParameters);
return this;
}

Expand Down Expand Up @@ -246,8 +246,8 @@ public static class Builder {
return new ProcessConfiguration(
this.environment,
this.maxHeapMemorySize,
ImmutableSet.copyOf(this.jvmOptions),
ImmutableSet.copyOf(this.processParameters),
ImmutableList.copyOf(this.jvmOptions),
ImmutableList.copyOf(this.processParameters),
Map.copyOf(this.environmentVariables));
}
}
Expand Down