From 3b114adee71e1e2477898d55c91cd573f0e48857 Mon Sep 17 00:00:00 2001 From: Christof Rabensteiner Date: Tue, 3 Sep 2019 13:06:48 +0200 Subject: Rename MzsClient to AppClient ...since it's a client that communicates with the app. --- src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java | 14 +++++++------- .../egiz/moazs/preprocess/MzsDeliveryRequestValidator.java | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/main/java/at/gv/egiz/moazs/preprocess') diff --git a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java index 48c1605..d256616 100644 --- a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java +++ b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java @@ -43,7 +43,7 @@ public class ConfigUtil { public static final String ACTIVE_KEY = "active"; public static final String SAVE_RESPONSE_TO_FILE_PATH_KEY = "path"; public static final String FORWARD_RESPONSE_TO_SERVICE_KEY = "forward-response-to-service"; - public static final String MZS_CLIENT_KEY = "mzs-client"; + public static final String APP_CLIENT_KEY = "app-client"; public static final String SERVICE_TIMEOUT_KEY = "service-timeout"; public static final String CUSTOM_HTTP_HEADERS_KEY = "custom-http-headers"; @@ -174,13 +174,13 @@ public class ConfigUtil { private ForwardResponseToServiceType buildForwardResponse(Map params) { var isActive = booleanOrNull(params.get(ACTIVE_KEY)); - var mzsClientParams = filterMapByPrefix(params, MZS_CLIENT_KEY); - ClientType mzsClient = mzsClientParams.isEmpty() - ? null : buildClient(mzsClientParams); + var appClientParams = filterMapByPrefix(params, APP_CLIENT_KEY); + ClientType appClient = appClientParams.isEmpty() + ? null : buildClient(appClientParams); return forwardResponseToServiceTypeBuilder() .withActive(isActive) - .withMzsClient(mzsClient) + .withAppClient(appClient) .build(); } @@ -366,8 +366,8 @@ public class ConfigUtil { builder.withActive(primary.isActive()); } - if (primary.getMzsClient() != null) { - builder.withMzsClient(merge(primary.getMzsClient(), fallback.getMzsClient())); + if (primary.getAppClient() != null) { + builder.withAppClient(merge(primary.getAppClient(), fallback.getAppClient())); } return builder.build(); diff --git a/src/main/java/at/gv/egiz/moazs/preprocess/MzsDeliveryRequestValidator.java b/src/main/java/at/gv/egiz/moazs/preprocess/MzsDeliveryRequestValidator.java index b0568d7..127d067 100644 --- a/src/main/java/at/gv/egiz/moazs/preprocess/MzsDeliveryRequestValidator.java +++ b/src/main/java/at/gv/egiz/moazs/preprocess/MzsDeliveryRequestValidator.java @@ -158,7 +158,7 @@ public class MzsDeliveryRequestValidator { if (forwardSink.isActive()) { try { - isClientConfigured(forwardSink.getMzsClient()); + isClientConfigured(forwardSink.getAppClient()); } catch (MoaZSException e) { throw mzse("ForwardResponseToService", e.getMessage()); } -- cgit v1.2.3