International-Data-Spaces-Association
diff --git a/‎CHANGELOG.md‎
Lines changed: 34 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 34 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 19 additions & 9 deletions b/‎README.md‎
Lines changed: 19 additions & 9 deletions
diff --git a/‎broker/pom.xml‎
Lines changed: 1 addition & 1 deletion b/‎broker/pom.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎clearinghouse/pom.xml‎
Lines changed: 1 addition & 1 deletion b/‎clearinghouse/pom.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎core/pom.xml‎
Lines changed: 1 addition & 1 deletion b/‎core/pom.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎core/src/main/java/de/fraunhofer/ids/messaging/core/config/ClientProvider.java‎
Lines changed: 33 additions & 22 deletions b/‎core/src/main/java/de/fraunhofer/ids/messaging/core/config/ClientProvider.java‎
Lines changed: 33 additions & 22 deletions
@@ -9,6 +9,40 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## Version [5.1.0] 2021-10-20
+
+### Minor Change: Validation referringConnector vs ids:issuerConnector
+- New application.properties flag `referred.check=true/false`, to enable comparison between DAT claims `referringConnector` and `ids:issuerConnector` in message-header for the validation of incoming messages. Can only be used in `PRODUCTIVE_DEPLOYMENT`. Default if not set is `false` (not enabled). ([PR 329](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/329))
+- Automatically sends RejectionMessage on incoming messages if validation not passed. Example of text included in RejectionMessage: `ids:issuerConnector in message-header (https://w3id.org/idsa/autogen/baseConnector/691b3a17-1e09-4a5a-9d9a-5627772222e9) does not match referringConnector in body of DAT claims (http://isst_ids_framework_demo_connector.demo)!`
+
+### Patch Change: Enhancement Log-Codes
+- Log-codes now exist for different log-levels. They allow easy search for the code location that produced the log. No log-code will be printed for log-info level. ([PR 332](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/332))
+- Syntax: IMS-XY-L-1234 shortened to IMSXYL1234. Will e.g. log as [code=(IMSCOE0001)].
+  - IMS = IDS-Messaging-Services
+  - XY = Subsystem Module (CO Core, AP AppStore, BR Broker, CL ClearingHouse, ME Messaging, PA Paris, VO Vocol)
+  - L = Event Severity (E Error, W Warn, D Debug)
+  - 1234 = Error number
+
+### Patch Change: Infomodel Maintenance
+- Used Dependency Version: 4.2.5 ([PR 330](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/330))
+- Used Artifacts: java, infomodel-serializer, interaction
+
+### Patch Change: Dependency Maintenance
+- Upgrade: org.springframework:spring-core 5.3.10 -> 5.3.11 ([PR 326](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/326))
+- Upgrade: org.springframework:spring-tx 5.3.10 -> 5.3.11 ([PR 326](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/326))
+- Upgrade: org.springframework:spring-webmvc 5.3.10 -> 5.3.11 ([PR 326](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/326))
+- Upgrade: org.springframework:spring-web 5.3.10 -> 5.3.11 ([PR 326](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/326))
+- Upgrade: org.springframework:spring-test 5.3.10 -> 5.3.11 ([PR 326](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/326))
+- Upgrade: org.springframework.boot:spring-boot-starter-test 2.5.4 -> 2.5.5 ([PR 314](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/314))
+- Upgrade: org.springframework.boot:spring-boot-starter 2.5.4 -> 2.5.5 ([PR 314](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/314))
+- Upgrade: org.junit.jupiter:junit-jupiter-engine 5.8.0 -> 5.8.1 ([PR 311](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/311))
+- Upgrade: org.junit.jupiter:junit-jupiter-api 5.8.0 -> 5.8.1 ([PR 311](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/311))
+- Upgrade: org.junit.jupiter:junit-jupiter 5.8.0 -> 5.8.1 ([PR 311](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/311))
+- Upgrade: com.squareup.okhttp3:okhttp 4.9.1 -> 4.9.2 ([PR 317](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/317))
+- Upgrade: com.squareup.okhttp3:mockwebserver 4.9.1 -> 4.9.2 ([PR 318](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/318))
+- Upgrade: com.puppycrawl.tools:checkstyle 9.0 -> 9.0.1 ([PR 319](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/319))
+- Upgrade: org.projectlombok:lombok 1.18.20 -> 1.18.22 ([PR 320](https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/pull/320))
+
 ## Version [5.0.1] 2021-09-21
 
 ### Patch Change: Dependency Maintenance
 
@@ -25,9 +25,9 @@ The following IDS-Infomodel-Artifacts are used as dependencies.
 
 | Group | Artifact | Version |
 | ------ | ------ | ------ | 
-| de.fraunhofer.iais.eis.ids.infomodel | java | 4.2.3 |
-| de.fraunhofer.iais.eis.ids | infomodel-serializer | 4.2.3 |
-| de.fraunhofer.iais.eis.ids | interaction | 4.2.3 |
+| de.fraunhofer.iais.eis.ids.infomodel | java | 4.2.5 |
+| de.fraunhofer.iais.eis.ids | infomodel-serializer | 4.2.5 |
+| de.fraunhofer.iais.eis.ids | interaction | 4.2.5 |
 
 ## Overview: Supported IDS-Message protocols
 
@@ -199,6 +199,20 @@ The sendAndCheckDat() returns a Map<String, String> where, for example, response
 
 For extended instructions and info on the other modules, see the <a href="https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/wiki">GitHub-Wiki</a>.
 
+## Other: Log-Codes
+
+Log-codes exist for different log-levels. They allow easy search for the code location that produced the log.
+
+Syntax: IMS-XY-L-1234, shortened to: IMSXYL1234
+ - IMS = IDS-Messaging-Services
+ - XY = Subsystem Module (CO Core, AP AppStore, BR Broker, CL ClearingHouse, ME Messaging, PA Paris, VO Vocol)
+ - L = Event Severity (E Error, W Warn, D Debug)
+ - 1234 = Log identifier
+ 
+Will e.g. print as [code=(IMSCOE0001)]: IDS-Messaging-Services Core-Module Error 0001.
+
+No log-code will be printed for log-info level.
+
 ## Other: Project-Wiki
 
 This project has a <a href="https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/wiki">GitHub-Wiki</a> where more details about the individual java-modules and their functionalities are documented.
@@ -207,13 +221,9 @@ This project has a <a href="https://github.com/International-Data-Spaces-Associa
 
 You are very welcome to contribute to this project when you find a bug, want to suggest an improvement, or have an idea for a useful feature. Please find a set of guidelines at the <a href="https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/blob/main/CONTRIBUTING.md">CONTRIBUTING-Guideline</a> and the <a href="https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/blob/main/CODE_OF_CONDUCT.md">CODE_OF_CONDUCT-Guideline</a>.
 
-## Other: Contact Persons
+## Other: Questions and suggestions
 
-For any questions or suggestions that cannot be solved via <a href="https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/issues">GitHub-Issues</a> or the <a href="https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/discussions">GitHub-Discussion</a> area, the following contacts are available:
-* [Matthias Böckmann](https://github.com/maboeckmann), [Fraunhofer IAIS](https://www.iais.fraunhofer.de/)
-* [Stefanie Koslowski](https://github.com/stefkoslowski), [Fraunhofer IAIS](https://www.iais.fraunhofer.de/)
-* [Tim Berthold](https://github.com/tmberthold), [Fraunhofer ISST](https://www.isst.fraunhofer.de/en.html)
-* [Erik van den Akker](https://github.com/vdakker), [Fraunhofer ISST](https://www.isst.fraunhofer.de/en.html)
+For any questions or suggestions please refer to the <a href="https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/issues">GitHub-Issues</a> or the <a href="https://github.com/International-Data-Spaces-Association/IDS-Messaging-Services/discussions">GitHub-Discussion</a> area.
 
 ## Other: License
 
 
@@ -62,7 +62,7 @@
                     <dependency>
                         <groupId>org.junit.jupiter</groupId>
                         <artifactId>junit-jupiter-engine</artifactId>
-                        <version>5.7.2</version>
+                        <version>5.8.1</version>
                     </dependency>
                 </dependencies>
             </plugin>
 
@@ -61,7 +61,7 @@
                     <dependency>
                         <groupId>org.junit.jupiter</groupId>
                         <artifactId>junit-jupiter-engine</artifactId>
-                        <version>5.7.2</version>
+                        <version>5.8.1</version>
                     </dependency>
                 </dependencies>
             </plugin>
 
@@ -102,7 +102,7 @@
                     <dependency>
                         <groupId>org.junit.jupiter</groupId>
                         <artifactId>junit-jupiter-engine</artifactId>
-                        <version>5.7.2</version>
+                        <version>5.8.1</version>
                     </dependency>
                 </dependencies>
             </plugin>
 
@@ -92,7 +92,8 @@ private static OkHttpClient.Builder createClientBuilder(final ConfigurationModel
 
         if (connector.getConnectorDeployMode() == ConnectorDeployMode.PRODUCTIVE_DEPLOYMENT) {
             if (log.isDebugEnabled()) {
-                log.debug("Productive Deployment, use Trustmanager from KeyStoreManager");
+                log.debug("Productive Deployment, use Trustmanager from KeyStoreManager."
+                          + " [code=(IMSMED0066)]");
             }
 
             setSSLSocketFactory(manager, okHttpBuilder);
@@ -101,7 +102,7 @@ private static OkHttpClient.Builder createClientBuilder(final ConfigurationModel
         }
 
         if (log.isDebugEnabled()) {
-            log.debug("Created SSLSocketFactory");
+            log.debug("Created SSLSocketFactory. [code=(IMSCOD0067)]");
         }
 
         handleConnectorProxy(connector, okHttpBuilder);
@@ -125,7 +126,7 @@ private static void handleConnectorProxy(final ConfigurationModel connector,
 
             if (proxyConfiguration != null) {
                 if (log.isDebugEnabled()) {
-                    log.debug("Proxy is set active! Configuring Proxy.");
+                    log.debug("Proxy is set active! Configuring Proxy. [code=(IMSCOD0068)]");
                 }
 
                 //create and set Proxy Authenticator with BasicAuth if
@@ -135,7 +136,7 @@ private static void handleConnectorProxy(final ConfigurationModel connector,
                 //create a custom proxySelector (will select the proxy when
                 //request goes to host not in NO_PROXY list, and NO_PROXY otherwise)
                 if (log.isDebugEnabled()) {
-                    log.debug("Create a ProxySelector");
+                    log.debug("Creating a ProxySelector. [code=(IMSCOD0069)]");
                 }
                 setProxySelector(okHttpBuilder, proxyConfiguration);
             }
@@ -159,17 +160,17 @@ public List<Proxy> select(final URI uri) {
 
                 if (proxyConfiguration.getNoProxy().contains(uri)) {
                     if (log.isDebugEnabled()) {
-                        log.debug("URI is in NoProxy List, no proxy is used. [uri=({})]",
-                                  uri.toString());
+                        log.debug("URI is in NoProxy List, no proxy is used. [code=(IMSCOD0070),"
+                                  + " uri=({})]", uri.toString());
                     }
 
                     //if the called uri is in the Exceptions of the
                     //Connectors ProxyConfiguration use no proxy
                     proxyList.add(Proxy.NO_PROXY);
                 } else {
                     if (log.isDebugEnabled()) {
-                        log.debug("URI is not in NoProxy List, use configured Proxy [uri=({})]",
-                                  uri.toString());
+                        log.debug("URI is not in NoProxy List, use configured Proxy."
+                                  + " [code=(IMSCOD0071), uri=({})]", uri.toString());
                     }
 
                     //else use proxy with ProxyConfig
@@ -178,19 +179,22 @@ public List<Proxy> select(final URI uri) {
                     final int proxyPort = proxyAddress.getPort();
 
                     if (log.isDebugEnabled()) {
-                        log.debug("Address: [host=({})], Port: [port=({})]", proxyHost, proxyPort);
+                        log.debug("Address: [code=(IMSCOD0072), host=({}), port=({})]",
+                                  proxyHost, proxyPort);
                     }
 
                     if (proxyHost == null || proxyHost.trim().equals("")) {
                         if (log.isWarnEnabled()) {
                             log.warn("Proxy hostname invalid! Trying to skip using this proxy!"
-                                     + " Please check configuration! [hostname=({})]", proxyHost);
+                                     + " Please check configuration! [code=(IMSCOW0030),"
+                                     + " hostname=({})]", proxyHost);
                         }
                         proxyList.add(Proxy.NO_PROXY);
                     } else if (proxyPort == -1) {
                         if (log.isWarnEnabled()) {
                             log.warn("Proxy port invalid! Trying to skip using this proxy!"
-                                    + " Please check configuration! [port=({})]", proxyPort);
+                                    + " Please check configuration! [code=(IMSCOW0031),"
+                                     + " port=({})]", proxyPort);
                         }
                         proxyList.add(Proxy.NO_PROXY);
                     } else {
@@ -230,7 +234,7 @@ private static void setProxyAuthenticator(
             && proxyConfiguration.getProxyAuthentication().getAuthPassword() != null) {
 
             if (log.isDebugEnabled()) {
-                log.debug("Setting Proxy Authenticator");
+                log.debug("Setting Proxy Authenticator. [code=(IMSCOD0073)]");
             }
 
             final Authenticator proxyAuthenticator = (route, response) -> {
@@ -248,7 +252,7 @@ private static void setProxyAuthenticator(
             okHttpBuilder.proxyAuthenticator(proxyAuthenticator);
         } else {
             if (log.isDebugEnabled()) {
-                log.debug("No Proxy Authentication credentials are set!");
+                log.debug("No Proxy Authentication credentials are set! [code=(IMSCOD0074)]");
             }
         }
     }
@@ -264,7 +268,8 @@ private static void setAcceptingAllSSLCertificates(final OkHttpClient.Builder ok
             throws NoSuchAlgorithmException, KeyManagementException {
         if (log.isWarnEnabled()) {
             log.warn("Trustmanager is trusting all Certificates in "
-                     + "TEST_DEPLOYMENT mode, you should not use this in production!");
+                     + "TEST_DEPLOYMENT mode, you should not use this in production!"
+                     + " [code=(IMSCOW0032)]");
         }
 
         final var trustmanager = getAllTrustingTrustManager();
@@ -306,7 +311,7 @@ private static void setSSLSocketFactory(final KeyStoreManager manager,
     @NotNull
     private static OkHttpClient.Builder getOkHttpBuilder() {
         if (log.isDebugEnabled()) {
-            log.debug("Creating OkHttp client");
+            log.debug("Creating OkHttp client... [code=(IMSCOD0075)]");
         }
         return new OkHttpClient.Builder();
     }
@@ -390,7 +395,8 @@ public OkHttpClient getClientWithTimeouts(final Duration connectTimeout,
                                       callTimeout);
 
         if (log.isDebugEnabled()) {
-            log.debug("Ok Http Client Protocols: [protocols=({})]", withTimeout.protocols());
+            log.debug("Ok Http Client Protocols: [code=(IMSCOD0076),"
+                      + " protocols=({})]", withTimeout.protocols());
         }
         return withTimeout;
     }
@@ -417,37 +423,42 @@ private OkHttpClient rebuildClientWithTimeouts(final OkHttpClient client,
 
         if (connectTimeout != null) {
             if (log.isDebugEnabled()) {
-                log.debug("Setting connect timeout: [timeout=({})]", connectTimeout.toString());
+                log.debug("Setting connect timeout: [code=(IMSCOD0077),"
+                          + " timeout=({})]", connectTimeout.toString());
             }
             builder.connectTimeout(connectTimeout);
         }
         if (readTimeout != null) {
             if (log.isDebugEnabled()) {
-                log.debug("Setting read timeout: [timeout=({})]", readTimeout.toString());
+                log.debug("Setting read timeout: [code=(IMSCOD0078), timeout=({})]",
+                          readTimeout.toString());
             }
             builder.readTimeout(readTimeout);
         }
         if (writeTimeout != null) {
             if (log.isDebugEnabled()) {
-                log.debug("Setting write timeout: [timeout=({})]", writeTimeout.toString());
+                log.debug("Setting write timeout: [code=(IMSCOD0079), timeout=({})]",
+                          writeTimeout.toString());
             }
             builder.writeTimeout(writeTimeout);
         }
         if (callTimeout != null) {
             if (log.isDebugEnabled()) {
-                log.debug("Setting call timeout: [timeout=({})]", callTimeout.toString());
+                log.debug("Setting call timeout. [code=(IMSCOD0080), timeout=({})]",
+                          callTimeout.toString());
             }
             builder.callTimeout(callTimeout);
         }
 
         if (log.isDebugEnabled()) {
-            log.debug("Building client!");
+            log.debug("Building client. [code=(IMSCOD0081)]");
         }
 
         final var okHttpClient = builder.build();
 
         if (log.isDebugEnabled()) {
-            log.debug("Ok Http Client Protocols [protocols=({})]", okHttpClient.protocols());
+            log.debug("Ok Http Client Protocols [code=(IMSCOD0082),"
+                      + " protocols=({})]", okHttpClient.protocols());
         }
 
         return okHttpClient;
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,8 @@ private static OkHttpClient.Builder createClientBuilder(final ConfigurationModel`
`92`	`92`
`93`	`93`	`if (connector.getConnectorDeployMode() == ConnectorDeployMode.PRODUCTIVE_DEPLOYMENT) {`
`94`	`94`	`if (log.isDebugEnabled()) {`
`95`		`- log.debug("Productive Deployment, use Trustmanager from KeyStoreManager");`
	`95`	`+ log.debug("Productive Deployment, use Trustmanager from KeyStoreManager."`
	`96`	`+ + " [code=(IMSMED0066)]");`
`96`	`97`	`}`
`97`	`98`
`98`	`99`	`setSSLSocketFactory(manager, okHttpBuilder);`
`@@ -101,7 +102,7 @@ private static OkHttpClient.Builder createClientBuilder(final ConfigurationModel`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`if (log.isDebugEnabled()) {`
`104`		`- log.debug("Created SSLSocketFactory");`
	`105`	`+ log.debug("Created SSLSocketFactory. [code=(IMSCOD0067)]");`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`handleConnectorProxy(connector, okHttpBuilder);`
`@@ -125,7 +126,7 @@ private static void handleConnectorProxy(final ConfigurationModel connector,`
`125`	`126`
`126`	`127`	`if (proxyConfiguration != null) {`
`127`	`128`	`if (log.isDebugEnabled()) {`
`128`		`- log.debug("Proxy is set active! Configuring Proxy.");`
	`129`	`+ log.debug("Proxy is set active! Configuring Proxy. [code=(IMSCOD0068)]");`
`129`	`130`	`}`
`130`	`131`
`131`	`132`	`//create and set Proxy Authenticator with BasicAuth if`
`@@ -135,7 +136,7 @@ private static void handleConnectorProxy(final ConfigurationModel connector,`
`135`	`136`	`//create a custom proxySelector (will select the proxy when`
`136`	`137`	`//request goes to host not in NO_PROXY list, and NO_PROXY otherwise)`
`137`	`138`	`if (log.isDebugEnabled()) {`
`138`		`- log.debug("Create a ProxySelector");`
	`139`	`+ log.debug("Creating a ProxySelector. [code=(IMSCOD0069)]");`
`139`	`140`	`}`
`140`	`141`	`setProxySelector(okHttpBuilder, proxyConfiguration);`
`141`	`142`	`}`
`@@ -159,17 +160,17 @@ public List<Proxy> select(final URI uri) {`
`159`	`160`
`160`	`161`	`if (proxyConfiguration.getNoProxy().contains(uri)) {`
`161`	`162`	`if (log.isDebugEnabled()) {`
`162`		`- log.debug("URI is in NoProxy List, no proxy is used. [uri=({})]",`
`163`		`- uri.toString());`
	`163`	`+ log.debug("URI is in NoProxy List, no proxy is used. [code=(IMSCOD0070),"`
	`164`	`+ + " uri=({})]", uri.toString());`
`164`	`165`	`}`
`165`	`166`
`166`	`167`	`//if the called uri is in the Exceptions of the`
`167`	`168`	`//Connectors ProxyConfiguration use no proxy`
`168`	`169`	`proxyList.add(Proxy.NO_PROXY);`
`169`	`170`	`} else {`
`170`	`171`	`if (log.isDebugEnabled()) {`
`171`		`- log.debug("URI is not in NoProxy List, use configured Proxy [uri=({})]",`
`172`		`- uri.toString());`
	`172`	`+ log.debug("URI is not in NoProxy List, use configured Proxy."`
	`173`	`+ + " [code=(IMSCOD0071), uri=({})]", uri.toString());`
`173`	`174`	`}`
`174`	`175`
`175`	`176`	`//else use proxy with ProxyConfig`
`@@ -178,19 +179,22 @@ public List<Proxy> select(final URI uri) {`
`178`	`179`	`final int proxyPort = proxyAddress.getPort();`
`179`	`180`
`180`	`181`	`if (log.isDebugEnabled()) {`
`181`		`- log.debug("Address: [host=({})], Port: [port=({})]", proxyHost, proxyPort);`
	`182`	`+ log.debug("Address: [code=(IMSCOD0072), host=({}), port=({})]",`
	`183`	`+ proxyHost, proxyPort);`
`182`	`184`	`}`
`183`	`185`
`184`	`186`	`if (proxyHost == null \|\| proxyHost.trim().equals("")) {`
`185`	`187`	`if (log.isWarnEnabled()) {`
`186`	`188`	`log.warn("Proxy hostname invalid! Trying to skip using this proxy!"`
`187`		`- + " Please check configuration! [hostname=({})]", proxyHost);`
	`189`	`+ + " Please check configuration! [code=(IMSCOW0030),"`
	`190`	`+ + " hostname=({})]", proxyHost);`
`188`	`191`	`}`
`189`	`192`	`proxyList.add(Proxy.NO_PROXY);`
`190`	`193`	`} else if (proxyPort == -1) {`
`191`	`194`	`if (log.isWarnEnabled()) {`
`192`	`195`	`log.warn("Proxy port invalid! Trying to skip using this proxy!"`
`193`		`- + " Please check configuration! [port=({})]", proxyPort);`
	`196`	`+ + " Please check configuration! [code=(IMSCOW0031),"`
	`197`	`+ + " port=({})]", proxyPort);`
`194`	`198`	`}`
`195`	`199`	`proxyList.add(Proxy.NO_PROXY);`
`196`	`200`	`} else {`
`@@ -230,7 +234,7 @@ private static void setProxyAuthenticator(`
`230`	`234`	`&& proxyConfiguration.getProxyAuthentication().getAuthPassword() != null) {`
`231`	`235`
`232`	`236`	`if (log.isDebugEnabled()) {`
`233`		`- log.debug("Setting Proxy Authenticator");`
	`237`	`+ log.debug("Setting Proxy Authenticator. [code=(IMSCOD0073)]");`
`234`	`238`	`}`
`235`	`239`
`236`	`240`	`final Authenticator proxyAuthenticator = (route, response) -> {`
`@@ -248,7 +252,7 @@ private static void setProxyAuthenticator(`
`248`	`252`	`okHttpBuilder.proxyAuthenticator(proxyAuthenticator);`
`249`	`253`	`} else {`
`250`	`254`	`if (log.isDebugEnabled()) {`
`251`		`- log.debug("No Proxy Authentication credentials are set!");`
	`255`	`+ log.debug("No Proxy Authentication credentials are set! [code=(IMSCOD0074)]");`
`252`	`256`	`}`
`253`	`257`	`}`
`254`	`258`	`}`
`@@ -264,7 +268,8 @@ private static void setAcceptingAllSSLCertificates(final OkHttpClient.Builder ok`
`264`	`268`	`throws NoSuchAlgorithmException, KeyManagementException {`
`265`	`269`	`if (log.isWarnEnabled()) {`
`266`	`270`	`log.warn("Trustmanager is trusting all Certificates in "`
`267`		`- + "TEST_DEPLOYMENT mode, you should not use this in production!");`
	`271`	`+ + "TEST_DEPLOYMENT mode, you should not use this in production!"`
	`272`	`+ + " [code=(IMSCOW0032)]");`
`268`	`273`	`}`
`269`	`274`
`270`	`275`	`final var trustmanager = getAllTrustingTrustManager();`
`@@ -306,7 +311,7 @@ private static void setSSLSocketFactory(final KeyStoreManager manager,`
`306`	`311`	`@NotNull`
`307`	`312`	`private static OkHttpClient.Builder getOkHttpBuilder() {`
`308`	`313`	`if (log.isDebugEnabled()) {`
`309`		`- log.debug("Creating OkHttp client");`
	`314`	`+ log.debug("Creating OkHttp client... [code=(IMSCOD0075)]");`
`310`	`315`	`}`
`311`	`316`	`return new OkHttpClient.Builder();`
`312`	`317`	`}`
`@@ -390,7 +395,8 @@ public OkHttpClient getClientWithTimeouts(final Duration connectTimeout,`
`390`	`395`	`callTimeout);`
`391`	`396`
`392`	`397`	`if (log.isDebugEnabled()) {`
`393`		`- log.debug("Ok Http Client Protocols: [protocols=({})]", withTimeout.protocols());`
	`398`	`+ log.debug("Ok Http Client Protocols: [code=(IMSCOD0076),"`
	`399`	`+ + " protocols=({})]", withTimeout.protocols());`
`394`	`400`	`}`
`395`	`401`	`return withTimeout;`
`396`	`402`	`}`
`@@ -417,37 +423,42 @@ private OkHttpClient rebuildClientWithTimeouts(final OkHttpClient client,`
`417`	`423`
`418`	`424`	`if (connectTimeout != null) {`
`419`	`425`	`if (log.isDebugEnabled()) {`
`420`		`- log.debug("Setting connect timeout: [timeout=({})]", connectTimeout.toString());`
	`426`	`+ log.debug("Setting connect timeout: [code=(IMSCOD0077),"`
	`427`	`+ + " timeout=({})]", connectTimeout.toString());`
`421`	`428`	`}`
`422`	`429`	`builder.connectTimeout(connectTimeout);`
`423`	`430`	`}`
`424`	`431`	`if (readTimeout != null) {`
`425`	`432`	`if (log.isDebugEnabled()) {`
`426`		`- log.debug("Setting read timeout: [timeout=({})]", readTimeout.toString());`
	`433`	`+ log.debug("Setting read timeout: [code=(IMSCOD0078), timeout=({})]",`
	`434`	`+ readTimeout.toString());`
`427`	`435`	`}`
`428`	`436`	`builder.readTimeout(readTimeout);`
`429`	`437`	`}`
`430`	`438`	`if (writeTimeout != null) {`
`431`	`439`	`if (log.isDebugEnabled()) {`
`432`		`- log.debug("Setting write timeout: [timeout=({})]", writeTimeout.toString());`
	`440`	`+ log.debug("Setting write timeout: [code=(IMSCOD0079), timeout=({})]",`
	`441`	`+ writeTimeout.toString());`
`433`	`442`	`}`
`434`	`443`	`builder.writeTimeout(writeTimeout);`
`435`	`444`	`}`
`436`	`445`	`if (callTimeout != null) {`
`437`	`446`	`if (log.isDebugEnabled()) {`
`438`		`- log.debug("Setting call timeout: [timeout=({})]", callTimeout.toString());`
	`447`	`+ log.debug("Setting call timeout. [code=(IMSCOD0080), timeout=({})]",`
	`448`	`+ callTimeout.toString());`
`439`	`449`	`}`
`440`	`450`	`builder.callTimeout(callTimeout);`
`441`	`451`	`}`
`442`	`452`
`443`	`453`	`if (log.isDebugEnabled()) {`
`444`		`- log.debug("Building client!");`
	`454`	`+ log.debug("Building client. [code=(IMSCOD0081)]");`
`445`	`455`	`}`
`446`	`456`
`447`	`457`	`final var okHttpClient = builder.build();`
`448`	`458`
`449`	`459`	`if (log.isDebugEnabled()) {`
`450`		`- log.debug("Ok Http Client Protocols [protocols=({})]", okHttpClient.protocols());`
	`460`	`+ log.debug("Ok Http Client Protocols [code=(IMSCOD0082),"`
	`461`	`+ + " protocols=({})]", okHttpClient.protocols());`
`451`	`462`	`}`
`452`	`463`
`453`	`464`	`return okHttpClient;`