From 4501468f1ffe1a8141e0c8711cd3cf78260df0c9 Mon Sep 17 00:00:00 2001 From: Christof Rabensteiner Date: Thu, 16 May 2019 13:31:53 +0200 Subject: Refactor: Merge Converter, Validator, and Merger into Util - Reason: All three classes opertate with the same data type, have the same clients, and have the same reasons for change. - Makes code in client more readable as it reduces number of dependencies. --- .../egiz/moazs/preprocess/ConfigProfileMerger.java | 46 ---------------------- 1 file changed, 46 deletions(-) delete mode 100644 src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileMerger.java (limited to 'src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileMerger.java') diff --git a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileMerger.java b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileMerger.java deleted file mode 100644 index c94723e..0000000 --- a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileMerger.java +++ /dev/null @@ -1,46 +0,0 @@ -package at.gv.egiz.moazs.preprocess; - -import at.gv.zustellung.app2mzs.xsd.ConfigType; -import at.gv.zustellung.app2mzs.xsd.ServerType; -import org.springframework.stereotype.Component; - -import static at.gv.zustellung.app2mzs.xsd.ConfigType.configTypeBuilder; -import static at.gv.zustellung.app2mzs.xsd.ServerType.serverTypeBuilder; - -@Component -public class ConfigProfileMerger { - - public ConfigType merge(ConfigType primary, ConfigType fallback) { - - var builder = configTypeBuilder(fallback); - - if(primary != null) { - - if(primary.getServer() != null) { - builder.withServer(merge(primary.getServer(), fallback.getServer())); - } - - if(primary.isPerformQueryPersonRequest() != null) { - builder.withPerformQueryPersonRequest(primary.isPerformQueryPersonRequest()); - } - - } - - return builder.build(); - - } - - private ServerType merge(ServerType primary, ServerType fallback) { - - if (fallback == null) { - return primary; - } - - var builder = serverTypeBuilder(fallback); - - if (primary.getX509() != null) builder.withX509 (primary.getX509() ); - if (primary.getZUSEUrlID() != null) builder.withZUSEUrlID(primary.getZUSEUrlID()); - - return builder.build(); - } -} -- cgit v1.2.3