Skip to content
This repository was archived by the owner on Mar 10, 2022. It is now read-only.

Commit 93dd890

Browse files
committed
Removed remaining parts of old daemon parameter system
1 parent e82d9e8 commit 93dd890

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

java-base/src/main/java/net/cryptic_game/backend/base/utils/DaemonUtils.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,7 @@ public static Set<ApiEndpointCollectionData> parseDaemonEndpoints(@NotNull final
3939
DaemonEndpointData.class
4040
)
4141
.stream()
42-
.peek(endpoint -> {
43-
endpoint.setDaemon(daemon);
44-
for (ApiParameterData parameter : endpoint.getParameters()) {
45-
parameter.setType(ApiParameterType.DAEMON_PARAMETER);
46-
}
47-
})
42+
.peek(endpoint -> endpoint.setDaemon(daemon))
4843
.collect(Collectors.toUnmodifiableMap(ApiEndpointData::getId, endpoint -> endpoint));
4944

5045
final DaemonEndpointCollectionData collection = new DaemonEndpointCollectionData(id, description, disabled, apiType, endpoints);

server/src/main/java/net/cryptic_game/backend/server/daemon/DaemonHandler.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@
3434
import java.nio.charset.StandardCharsets;
3535
import java.time.Duration;
3636
import java.util.AbstractMap;
37-
import java.util.ArrayList;
3837
import java.util.Arrays;
39-
import java.util.Collections;
40-
import java.util.List;
4138
import java.util.Locale;
4239
import java.util.Map;
4340
import java.util.Objects;
@@ -60,7 +57,7 @@ public final class DaemonHandler {
6057
private Map<String, ApiEndpointData> endpoints;
6158
private Object daemonSendObject;
6259
private Method daemonSendMethod;
63-
private List<ApiParameterData> daemonSendMethodParameters;
60+
private ApiParameterData[] daemonSendMethodParameters;
6461

6562
public void registerDaemon(final String name, final String url) {
6663
final Daemon daemon = new Daemon(
@@ -140,9 +137,7 @@ public void addEndpointCollections(final Set<ApiEndpointCollectionData> endpoint
140137
endpoint.setMethod(this.daemonSendMethod);
141138
endpoint.setInstance(this.daemonSendObject);
142139
endpoint.setAuthenticator(this.authenticator);
143-
final List<ApiParameterData> parameters = new ArrayList<>(this.daemonSendMethodParameters);
144-
Collections.addAll(parameters, endpoint.getParameters());
145-
endpoint.setParameters(parameters.toArray(ApiParameterData[]::new));
140+
endpoint.setParameters(this.daemonSendMethodParameters);
146141
}))
147142
.collect(Collectors.toSet())
148143
).entrySet().parallelStream()
@@ -159,11 +154,11 @@ public void setSend(final Object sendObject, final Method sendMethod) {
159154
this.daemonSendMethodParameters = parseParameters(this.daemonSendMethod.getParameters());
160155
}
161156

162-
public List<ApiParameterData> parseParameters(final Parameter[] parameters) {
157+
public ApiParameterData[] parseParameters(final Parameter[] parameters) {
163158
return Arrays.stream(parameters)
164159
.map(this::parseParameter)
165160
.filter(Objects::nonNull)
166-
.collect(Collectors.toList());
161+
.toArray(ApiParameterData[]::new);
167162
}
168163

169164
private ApiParameterData parseParameter(final Parameter parameter) {

0 commit comments

Comments
 (0)