From 0ef26c82137744ce9d991af8923a3644e1e29a97 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 17 Nov 2020 18:08:32 -0600
Subject: [PATCH] update logger deps for dsegraph

---
 .../com/datastax/ebdrivers/dsegraph/GraphAction.java     | 6 +++---
 .../com/datastax/ebdrivers/dsegraph/GraphActivity.java   | 9 +++------
 .../dsegraph/errorhandling/GraphErrorHandler.java        | 6 +++---
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphAction.java b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphAction.java
index 576493501..2dff734d6 100644
--- a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphAction.java
+++ b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphAction.java
@@ -11,15 +11,15 @@ import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver;
 import io.nosqlbench.engine.api.activityapi.core.SyncAction;
 import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.List;
 
 @SuppressWarnings("Duplicates")
 public class GraphAction implements SyncAction, ActivityDefObserver {
 
-    private static final Logger logger = LoggerFactory.getLogger(GraphAction.class);
+    private static final Logger logger = LogManager.getLogger(GraphAction.class);
     List<BindableGraphStatement> readyGraphStmts;
     private final int slot;
     private final GraphActivity activity;
diff --git a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java
index efff5f613..51150cd6f 100644
--- a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java
+++ b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphActivity.java
@@ -17,7 +17,6 @@ import io.nosqlbench.engine.api.activityapi.planning.SequencerType;
 import io.nosqlbench.engine.api.activityconfig.ParsedStmt;
 import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
 import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate;
-import io.nosqlbench.engine.api.activityconfig.yaml.StmtDef;
 import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.ParameterMap;
@@ -27,8 +26,8 @@ import io.nosqlbench.engine.api.metrics.ExceptionMeterMetrics;
 import io.nosqlbench.engine.api.scripting.NashornEvaluator;
 import io.nosqlbench.engine.api.templating.StrInterpolator;
 import io.nosqlbench.engine.api.util.TagFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -37,12 +36,10 @@ import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
 @SuppressWarnings("Duplicates")
 public class GraphActivity extends SimpleActivity implements ActivityDefObserver {
-    private final static Logger logger = LoggerFactory.getLogger(GraphActivity.class);
+    private final static Logger logger = LogManager.getLogger(GraphActivity.class);
 
     public Timer bindTimer;
     public Timer executeTimer;
diff --git a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/errorhandling/GraphErrorHandler.java b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/errorhandling/GraphErrorHandler.java
index 971f62fd4..671946e93 100644
--- a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/errorhandling/GraphErrorHandler.java
+++ b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/errorhandling/GraphErrorHandler.java
@@ -3,14 +3,14 @@ package com.datastax.ebdrivers.dsegraph.errorhandling;
 import com.datastax.driver.core.exceptions.*;
 import com.datastax.driver.dse.graph.GraphStatement;
 import io.nosqlbench.engine.api.metrics.ExceptionMeterMetrics;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.concurrent.ExecutionException;
 
 @SuppressWarnings("Duplicates")
 public class GraphErrorHandler {
-    private final static Logger logger = LoggerFactory.getLogger(GraphErrorHandler.class);
+    private final static Logger logger = LogManager.getLogger(GraphErrorHandler.class);
 
     private final ErrorResponse realErrorResponse;
     // private final ErrorResponse unappliedResponse;