aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>2019-06-27 15:02:03 +0200
committerChristof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>2019-06-27 15:02:03 +0200
commit8b80ea299ef6fadfbc0ec59308e0937612eb8c35 (patch)
tree8cf3759cafe1a2c2f7b21d1bcec23ff7a2ad7561 /src
parent9556dc6bd7e327dfbfc3c2d5228ad920ad7b9f8e (diff)
downloadmoa-zs-8b80ea299ef6fadfbc0ec59308e0937612eb8c35.tar.gz
moa-zs-8b80ea299ef6fadfbc0ec59308e0937612eb8c35.tar.bz2
moa-zs-8b80ea299ef6fadfbc0ec59308e0937612eb8c35.zip
Minor Fixes
Diffstat (limited to 'src')
-rw-r--r--src/main/java/at/gv/egiz/moazs/msg/MsgClientFactory.java2
-rw-r--r--src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java5
-rw-r--r--src/main/java/at/gv/egiz/moazs/util/StringUtils.java2
3 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/at/gv/egiz/moazs/msg/MsgClientFactory.java b/src/main/java/at/gv/egiz/moazs/msg/MsgClientFactory.java
index c40aec1..389fa5c 100644
--- a/src/main/java/at/gv/egiz/moazs/msg/MsgClientFactory.java
+++ b/src/main/java/at/gv/egiz/moazs/msg/MsgClientFactory.java
@@ -5,7 +5,6 @@ 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.msg.xsd.App2ZusePort;
-import com.sun.istack.Nullable;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
@@ -18,6 +17,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.annotation.Nullable;
import javax.net.ssl.SSLContext;
import static at.gv.zustellung.app2mzs.xsd.KeyStoreType.keyStoreTypeBuilder;
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 2392ce0..14fb377 100644
--- a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java
+++ b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java
@@ -229,12 +229,13 @@ public class ConfigUtil {
}
private boolean isTVNZClientConfigured(ClientType tnvzClient, Boolean isPerformQueryPersonRequest) {
- return (tnvzClient != null
+ return (isPerformQueryPersonRequest
+ && tnvzClient != null
&& tnvzClient.getURL() != null
&& tnvzClient.getReceiveTimeout() != null
&& tnvzClient.getConnectionTimeout() != null
&& isSSLConfigured(tnvzClient))
- || isPerformQueryPersonRequest == false;
+ || !isPerformQueryPersonRequest;
}
private boolean isMSGClientConfigured(ClientType msgClientParams) {
diff --git a/src/main/java/at/gv/egiz/moazs/util/StringUtils.java b/src/main/java/at/gv/egiz/moazs/util/StringUtils.java
index fd40f6e..948af6d 100644
--- a/src/main/java/at/gv/egiz/moazs/util/StringUtils.java
+++ b/src/main/java/at/gv/egiz/moazs/util/StringUtils.java
@@ -2,6 +2,8 @@ package at.gv.egiz.moazs.util;
public class StringUtils {
+ private StringUtils(){}
+
public static boolean hasPrefix(String name) {
return name.indexOf('.') != -1;
}