diff options
Diffstat (limited to 'src/main')
11 files changed, 28 insertions, 32 deletions
diff --git a/src/main/java/at/gv/egiz/moazs/config/MzsServiceConfig.java b/src/main/java/at/gv/egiz/moazs/config/MzsServiceConfig.java index 713c616..9fd14eb 100644 --- a/src/main/java/at/gv/egiz/moazs/config/MzsServiceConfig.java +++ b/src/main/java/at/gv/egiz/moazs/config/MzsServiceConfig.java @@ -1,6 +1,6 @@ package at.gv.egiz.moazs.config; -import at.gv.egiz.moazs.mzs.MzsService; +import at.gv.egiz.moazs.scheme.MzsService; import at.gv.zustellung.app2mzs.xsd.App2Mzs; import org.apache.cxf.Bus; import org.apache.cxf.jaxws.EndpointImpl; diff --git a/src/main/java/at/gv/egiz/moazs/config/PreprocessConfig.java b/src/main/java/at/gv/egiz/moazs/config/PreprocessConfig.java index b90b6a3..b24db28 100644 --- a/src/main/java/at/gv/egiz/moazs/config/PreprocessConfig.java +++ b/src/main/java/at/gv/egiz/moazs/config/PreprocessConfig.java @@ -1,6 +1,6 @@ package at.gv.egiz.moazs.config; -import at.gv.egiz.moazs.mzs.MzsValidator; +import at.gv.egiz.moazs.scheme.MzsDeliveryRequestValidator; import at.gv.egiz.moazs.preprocess.*; import at.gv.zustellung.app2mzs.xsd.ConfigType; import org.springframework.beans.factory.annotation.Autowired; @@ -28,7 +28,7 @@ public class PreprocessConfig { @Autowired public ConfigProfileGenerator configProfileGenerator( SpringPropertiesFacade properties, - MzsValidator validator, + MzsDeliveryRequestValidator validator, ConfigUtil util) { return configProfileGeneratorBuilder() diff --git a/src/main/java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java b/src/main/java/at/gv/egiz/moazs/pipeline/SingleThreadedDeliveryPipeline.java index ecf580d..783df32 100644 --- a/src/main/java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java +++ b/src/main/java/at/gv/egiz/moazs/pipeline/SingleThreadedDeliveryPipeline.java @@ -2,11 +2,11 @@ package at.gv.egiz.moazs.pipeline; import at.gv.egiz.moazs.MoaZSException; -import at.gv.egiz.moazs.msg.ClientFactory; +import at.gv.egiz.moazs.util.ClientFactory; import at.gv.egiz.moazs.repository.DeliveryRepository; import at.gv.egiz.moazs.scheme.Mzs2MsgConverter; import at.gv.egiz.moazs.scheme.NameSpace; -import at.gv.egiz.moazs.tnvz.TnvzHelper; +import at.gv.egiz.moazs.scheme.TnvzHelper; import at.gv.egiz.moazs.verify.SignatureVerifier; import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType; import at.gv.zustellung.msg.xsd.App2ZusePort; @@ -27,9 +27,9 @@ import static java.lang.String.format; @Component @Profile("!cluster") -public class SameThreadDeliveryPipeline implements DeliveryPipeline { +public class SingleThreadedDeliveryPipeline implements DeliveryPipeline { - private static final Logger log = Logger.getLogger(SameThreadDeliveryPipeline.class); + private static final Logger log = Logger.getLogger(SingleThreadedDeliveryPipeline.class); private final DeliveryRepository repository; private final TnvzHelper tnvzHelper; @@ -38,11 +38,11 @@ public class SameThreadDeliveryPipeline implements DeliveryPipeline { private final SignatureVerifier verifier; @Autowired - public SameThreadDeliveryPipeline(DeliveryRepository repository, - TnvzHelper tnvzHelper, - Mzs2MsgConverter converter, - ClientFactory clientFactory, - SignatureVerifier verifier + public SingleThreadedDeliveryPipeline(DeliveryRepository repository, + TnvzHelper tnvzHelper, + Mzs2MsgConverter converter, + ClientFactory clientFactory, + SignatureVerifier verifier ) { this.repository = repository; this.tnvzHelper = tnvzHelper; diff --git a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileGenerator.java b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileGenerator.java index c2f2415..d651570 100644 --- a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileGenerator.java +++ b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileGenerator.java @@ -1,7 +1,7 @@ package at.gv.egiz.moazs.preprocess; import at.gv.egiz.moazs.MoaZSException; -import at.gv.egiz.moazs.mzs.MzsValidator; +import at.gv.egiz.moazs.scheme.MzsDeliveryRequestValidator; import at.gv.egiz.moazs.util.StringUtils; import at.gv.zustellung.app2mzs.xsd.ConfigType; import org.slf4j.Logger; @@ -30,7 +30,7 @@ public class ConfigProfileGenerator { private final SpringPropertiesFacade properties; private final ConfigUtil util; - private final MzsValidator validator; + private final MzsDeliveryRequestValidator validator; private final boolean verifyCompletenessOfDefaultConfiguration; private final String profilePrefix; private final String defaultConfigKey; @@ -42,7 +42,7 @@ public class ConfigProfileGenerator { private ConfigProfileGenerator( SpringPropertiesFacade properties, ConfigUtil util, - MzsValidator validator, boolean verifyCompletenessOfDefaultConfiguration, + MzsDeliveryRequestValidator validator, boolean verifyCompletenessOfDefaultConfiguration, String profilePrefix, String defaultConfigKey) { this.util = util; @@ -113,7 +113,7 @@ public class ConfigProfileGenerator { public static class ConfigProfileGeneratorBuilder { private SpringPropertiesFacade properties; private ConfigUtil util; - private MzsValidator validator; + private MzsDeliveryRequestValidator validator; private boolean verify = true; private String profilePrefix = "delivery-request-configuration-profiles"; private String defaultConfigKey = "default"; @@ -128,7 +128,7 @@ public class ConfigProfileGenerator { return this; } - public ConfigProfileGeneratorBuilder withValidator(MzsValidator validator) { + public ConfigProfileGeneratorBuilder withValidator(MzsDeliveryRequestValidator validator) { this.validator = validator; return this; } diff --git a/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java b/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java index 37dbdc5..783536c 100644 --- a/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java +++ b/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java @@ -1,6 +1,6 @@ package at.gv.egiz.moazs.preprocess; -import at.gv.egiz.moazs.mzs.MzsValidator; +import at.gv.egiz.moazs.scheme.MzsDeliveryRequestValidator; import at.gv.zustellung.app2mzs.xsd.ConfigType; import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType; import org.springframework.beans.factory.annotation.Autowired; @@ -16,7 +16,7 @@ public class DeliveryRequestAugmenter { private final ConfigUtil util; private final Map<String, ConfigType> configs; - private final MzsValidator validator; + private final MzsDeliveryRequestValidator validator; private static final String INCOMPLETE_TNVZ_ERROR_MESSAGE = "mzs:DeliveryRequest is incomplete because mandatory " + "fields for sending a tnvz:QueryPersonRequest are missing."; @@ -27,7 +27,7 @@ public class DeliveryRequestAugmenter { "configuration is incomplete."; @Autowired - public DeliveryRequestAugmenter(Map<String, ConfigType> deliveryRequestConfigs, ConfigUtil util, MzsValidator validator) { + public DeliveryRequestAugmenter(Map<String, ConfigType> deliveryRequestConfigs, ConfigUtil util, MzsDeliveryRequestValidator validator) { this.configs = deliveryRequestConfigs; this.util = util; this.validator = validator; diff --git a/src/main/java/at/gv/egiz/moazs/mzs/MzsClient.java b/src/main/java/at/gv/egiz/moazs/scheme/MzsClient.java index 980dce1..98e0bc8 100644 --- a/src/main/java/at/gv/egiz/moazs/mzs/MzsClient.java +++ b/src/main/java/at/gv/egiz/moazs/scheme/MzsClient.java @@ -1,4 +1,4 @@ -package at.gv.egiz.moazs.mzs; +package at.gv.egiz.moazs.scheme; import at.gv.zustellung.app2mzs.xsd.DeliveryResponseType; import org.springframework.stereotype.Component; diff --git a/src/main/java/at/gv/egiz/moazs/mzs/MzsValidator.java b/src/main/java/at/gv/egiz/moazs/scheme/MzsDeliveryRequestValidator.java index 26ea7dc..03f2664 100644 --- a/src/main/java/at/gv/egiz/moazs/mzs/MzsValidator.java +++ b/src/main/java/at/gv/egiz/moazs/scheme/MzsDeliveryRequestValidator.java @@ -1,4 +1,4 @@ -package at.gv.egiz.moazs.mzs; +package at.gv.egiz.moazs.scheme; import at.gv.zustellung.app2mzs.xsd.ClientType; import at.gv.zustellung.app2mzs.xsd.ConfigType; @@ -8,7 +8,7 @@ import org.springframework.lang.Nullable; import org.springframework.stereotype.Component; @Component -public class MzsValidator { +public class MzsDeliveryRequestValidator { /** * Checks if the mandatory fields that are needed to send a tnvz:QueryPersonRequest are present. diff --git a/src/main/java/at/gv/egiz/moazs/mzs/MzsService.java b/src/main/java/at/gv/egiz/moazs/scheme/MzsService.java index f4ecfdb..f245b93 100644 --- a/src/main/java/at/gv/egiz/moazs/mzs/MzsService.java +++ b/src/main/java/at/gv/egiz/moazs/scheme/MzsService.java @@ -1,9 +1,8 @@ -package at.gv.egiz.moazs.mzs; +package at.gv.egiz.moazs.scheme; import at.gv.egiz.moazs.pipeline.DeliveryPipeline; import at.gv.egiz.moazs.preprocess.DeliveryRequestAugmenter; import at.gv.egiz.moazs.repository.DeliveryRepository; -import at.gv.egiz.moazs.scheme.Msg2MzsConverter; import at.gv.zustellung.app2mzs.xsd.App2MzsPortType; import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType; import at.gv.zustellung.app2mzs.xsd.DeliveryResponseType; diff --git a/src/main/java/at/gv/egiz/moazs/tnvz/TnvzHelper.java b/src/main/java/at/gv/egiz/moazs/scheme/TnvzHelper.java index f71b992..70c20bb 100644 --- a/src/main/java/at/gv/egiz/moazs/tnvz/TnvzHelper.java +++ b/src/main/java/at/gv/egiz/moazs/scheme/TnvzHelper.java @@ -1,4 +1,4 @@ -package at.gv.egiz.moazs.tnvz; +package at.gv.egiz.moazs.scheme; import at.gv.egiz.moazs.MoaZSException; import at.gv.egiz.moazs.scheme.Mzs2MsgConverter; diff --git a/src/main/java/at/gv/egiz/moazs/msg/ClientFactory.java b/src/main/java/at/gv/egiz/moazs/util/ClientFactory.java index c2ad4a7..e7761fe 100644 --- a/src/main/java/at/gv/egiz/moazs/msg/ClientFactory.java +++ b/src/main/java/at/gv/egiz/moazs/util/ClientFactory.java @@ -1,11 +1,8 @@ -package at.gv.egiz.moazs.msg; +package at.gv.egiz.moazs.util; -import at.gv.egiz.moazs.util.FileUtils; -import at.gv.egiz.moazs.util.SSLContextCreator; import at.gv.zustellung.app2mzs.xsd.ClientType; import at.gv.zustellung.app2mzs.xsd.KeyStoreType; import at.gv.zustellung.app2mzs.xsd.SSLType; -import javax.xml.ws.soap.SOAPBinding; import org.apache.cxf.configuration.jsse.TLSClientParameters; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; @@ -21,6 +18,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Nullable; import javax.net.ssl.SSLContext; import javax.xml.ws.BindingProvider; +import javax.xml.ws.soap.SOAPBinding; import static at.gv.zustellung.app2mzs.xsd.KeyStoreType.keyStoreTypeBuilder; diff --git a/src/main/java/at/gv/egiz/moazs/msg/StoreSOAPBodyBinaryInRepositoryInterceptor.java b/src/main/java/at/gv/egiz/moazs/util/StoreSOAPBodyBinaryInRepositoryInterceptor.java index ac3acc6..2db81ab 100644 --- a/src/main/java/at/gv/egiz/moazs/msg/StoreSOAPBodyBinaryInRepositoryInterceptor.java +++ b/src/main/java/at/gv/egiz/moazs/util/StoreSOAPBodyBinaryInRepositoryInterceptor.java @@ -1,8 +1,7 @@ -package at.gv.egiz.moazs.msg; +package at.gv.egiz.moazs.util; import at.gv.egiz.moazs.repository.DeliveryRepository; import at.gv.egiz.moazs.scheme.SOAPUtils; -import at.gv.egiz.moazs.util.CXFMessageUtils; import org.apache.cxf.message.Message; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; |