From 1bb596bd6f5359846d9395ac6955cac9a11c148a Mon Sep 17 00:00:00 2001
From: "veysel.pehlivan" <veysel.pehlivan@n11.com>
Date: Fri, 4 Feb 2022 15:00:00 +0300
Subject: [PATCH] circular dependency error is fixed

---
 .../configuration/CassandraSessionConfig.java | 19 +++++++++++++++++++
 .../configuration/EventApisFactory.java       | 14 ++------------
 2 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 spring-integration/src/main/java/io/splitet/core/spring/configuration/CassandraSessionConfig.java

diff --git a/spring-integration/src/main/java/io/splitet/core/spring/configuration/CassandraSessionConfig.java b/spring-integration/src/main/java/io/splitet/core/spring/configuration/CassandraSessionConfig.java
new file mode 100644
index 0000000..a8235dc
--- /dev/null
+++ b/spring-integration/src/main/java/io/splitet/core/spring/configuration/CassandraSessionConfig.java
@@ -0,0 +1,19 @@
+package io.splitet.core.spring.configuration;
+
+import io.splitet.core.cassandra.CassandraSession;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PreDestroy;
+
+@Configuration
+public class CassandraSessionConfig {
+
+    @Autowired
+    private CassandraSession cassandraSession;
+
+    @PreDestroy
+    public void destroy() {
+        cassandraSession.destroy();
+    }
+}
diff --git a/spring-integration/src/main/java/io/splitet/core/spring/configuration/EventApisFactory.java b/spring-integration/src/main/java/io/splitet/core/spring/configuration/EventApisFactory.java
index 9999878..7e24c0b 100644
--- a/spring-integration/src/main/java/io/splitet/core/spring/configuration/EventApisFactory.java
+++ b/spring-integration/src/main/java/io/splitet/core/spring/configuration/EventApisFactory.java
@@ -1,6 +1,8 @@
 package io.splitet.core.spring.configuration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import feign.RequestInterceptor;
 import io.splitet.core.api.IUserContext;
 import io.splitet.core.api.impl.EmptyUserContext;
 import io.splitet.core.cassandra.CassandraSession;
@@ -14,8 +16,6 @@
 import io.splitet.core.kafka.PublishedEventWrapper;
 import io.splitet.core.pojos.Operation;
 import io.splitet.core.spring.filter.OpContextFilter;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import feign.RequestInterceptor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +36,6 @@
 import org.springframework.transaction.TransactionException;
 import org.springframework.transaction.TransactionStatus;
 
-import javax.annotation.PreDestroy;
 import javax.servlet.DispatcherType;
 import java.util.EnumSet;
 
@@ -51,9 +50,6 @@ public class EventApisFactory {
     @Autowired
     private EventApisConfiguration eventApisConfiguration;
 
-    @Autowired
-    private CassandraSession cassandraSession;
-
     @Bean
     public OperationContext createOperationContext() {
         return new OperationContext();
@@ -64,12 +60,6 @@ CassandraSession cassandraSession() {
         return new CassandraSession(eventApisConfiguration.getStoreConfig());
     }
 
-    @PreDestroy
-    public void destroy() {
-        cassandraSession.destroy();
-    }
-
-
     @Bean
     public FilterRegistrationBean createOpContextFilter(@Autowired OperationContext operationContext) {
         FilterRegistrationBean registration = new FilterRegistrationBean();