Merge branch 'nightlyBuild'

1 files changed, 42 insertions, 1 deletions

diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/TransactionIdUtils.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/TransactionIdUtils.java
index 4cbcfa70..4c1601c0 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/TransactionIdUtils.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/TransactionIdUtils.java
@@ -19,6 +19,8 @@
 
 package at.gv.egiz.eaaf.core.impl.utils;
 
+import java.util.UUID;
+
 import at.gv.egiz.eaaf.core.api.IRequest;
 
 /**
@@ -29,7 +31,6 @@ import at.gv.egiz.eaaf.core.api.IRequest;
  */
 public class TransactionIdUtils {
 
-  // MDC variables for logging
   /**
    * To correlate technical logs over one single transactions.
    */
@@ -46,6 +47,11 @@ public class TransactionIdUtils {
   public static final String MDC_SERVICEPROVIDER_ID = "oaId";
 
   /**
+   * Unique application identifier that is processed in this transaction.
+   */
+  public static final String MDC_REMOTEHOST = "remoteHost";
+
+  /**
    * Set all MDC variables from pending request to this threat context.<br>
    * These includes SessionID, TransactionID, and unique service-provider
    * identifier
@@ -67,6 +73,7 @@ public class TransactionIdUtils {
     removeSessionId();
     removeTransactionId();
     removeServiceProviderId();
+    removeRemoteHost();
 
   }
 
@@ -99,6 +106,14 @@ public class TransactionIdUtils {
   }
 
   /**
+   * Set new random transactionId as an UUID.
+   */
+  public static void setTransactionId() {
+    org.slf4j.MDC.put(MDC_TRANSACTION_ID, UUID.randomUUID().toString());
+
+  }
+
+  /**
    * Set Id to correlate technical logs over one single transactions.
    *
    * @param transactionId Unique transaction Id
@@ -117,6 +132,14 @@ public class TransactionIdUtils {
   }
 
   /**
+   * Set a new random SessionId as UUID.
+   */
+  public static void setSessionId() {
+    org.slf4j.MDC.put(MDC_SESSION_ID, UUID.randomUUID().toString());
+
+  }
+
+  /**
    * Set Id to correlate technical logs over a set of transactions, like SSO.
    *
    * @param uniqueSessionId Unique Id
@@ -135,5 +158,23 @@ public class TransactionIdUtils {
 
   }
 
+  /**
+   * Set remoteHost information to correlate technical logs.
+   *
+   * @param remoteHost IP address of the remote host
+   */
+  public static void setRemoteHost(final String remoteHost) {
+    org.slf4j.MDC.put(MDC_REMOTEHOST, remoteHost);
+
+  }
+
+  /**
+   * Remove remoteHost for Logging.
+   */
+  public static void removeRemoteHost() {
+    org.slf4j.MDC.remove(MDC_REMOTEHOST);
+
+  }
+
 
 }