summaryrefslogtreecommitdiff
path: root/eaaf_core/src/main/java
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2019-04-12 13:36:24 +0200
committerThomas Lenz <thomas.lenz@egiz.gv.at>2019-04-12 13:36:24 +0200
commitf689c1e404b5cf22d17346da75a296c825a3ba03 (patch)
tree2fd3ae17613daab57ca0f993efb99bc7cf8558ce /eaaf_core/src/main/java
parenta4d179661754e04c882c1686e3c83f1b458717df (diff)
downloadEAAF-Components-f689c1e404b5cf22d17346da75a296c825a3ba03.tar.gz
EAAF-Components-f689c1e404b5cf22d17346da75a296c825a3ba03.tar.bz2
EAAF-Components-f689c1e404b5cf22d17346da75a296c825a3ba03.zip
minor changes
Diffstat (limited to 'eaaf_core/src/main/java')
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java4
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/HttpClientFactory.java14
2 files changed, 9 insertions, 9 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java
index 85c609e0..8b0f2620 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java
@@ -82,7 +82,7 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer
@Autowired(required=true) private IStatusMessenger statusMessager;
@Autowired(required=true) private IRequestStorage requestStorage;
- @Autowired private ISSOManager ssoManager;
+ @Autowired(required=false) private ISSOManager ssoManager;
@Autowired private IStatisticLogger statisticLogger;
@Autowired private IRevisionLogger revisionsLogger;
@@ -163,7 +163,7 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer
}
- } catch (Exception e) {
+ } catch (final Exception e) {
log.error("Finalize authentication protocol FAILED." , e);
buildProtocolSpecificErrorResponse(e, req, resp, pendingReq);
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/HttpClientFactory.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/HttpClientFactory.java
index 6f6f9f49..a5b79f6a 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/HttpClientFactory.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/HttpClientFactory.java
@@ -58,10 +58,10 @@ public class HttpClientFactory {
private void initalize() {
//initialize http client
log.trace("Initializing HTTP Client-builder ... ");
- HttpClientBuilder httpClientBuilder = HttpClients.custom();
-
+ httpClientBuilder = HttpClients.custom();
+
//set default request configuration
- RequestConfig requestConfig = RequestConfig.custom()
+ final RequestConfig requestConfig = RequestConfig.custom()
.setConnectTimeout(Integer.valueOf(basicConfig.getBasicConfiguration(
PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION,
DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION)) * 1000)
@@ -78,7 +78,7 @@ public class HttpClientFactory {
if (basicConfig.getBasicMOAIDConfigurationBoolean(
PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_USE,
true)) {
- PoolingHttpClientConnectionManager pool = new PoolingHttpClientConnectionManager();
+ final PoolingHttpClientConnectionManager pool = new PoolingHttpClientConnectionManager();
pool.setDefaultMaxPerRoute(Integer.valueOf(basicConfig.getBasicConfiguration(
PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXPERROUTE,
DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXPERROUTE)));
@@ -95,7 +95,7 @@ public class HttpClientFactory {
try {
log.trace("Initializing SSL Context ... ");
- SSLContext sslContext = SSLContext.getDefault();
+ final SSLContext sslContext = SSLContext.getDefault();
HostnameVerifier hostnameVerifier = null;
if (basicConfig.getBasicMOAIDConfigurationBoolean(
PROP_CONFIG_CLIENT_HTTP_SSL_HOSTNAMEVERIFIER_TRUSTALL,
@@ -104,10 +104,10 @@ public class HttpClientFactory {
log.warn("HTTP client-builder deactivates SSL Host-name verification!");
}
- LayeredConnectionSocketFactory sslSocketFactory = new SSLConnectionSocketFactory(sslContext , hostnameVerifier);
+ final LayeredConnectionSocketFactory sslSocketFactory = new SSLConnectionSocketFactory(sslContext , hostnameVerifier);
httpClientBuilder.setSSLSocketFactory(sslSocketFactory );
- } catch (NoSuchAlgorithmException e) {
+ } catch (final NoSuchAlgorithmException e) {
log.warn("HTTP client-builder can NOT initialze SSL-Context", e);
}