From 2e60c8e9dfb20dca9512ced210dcc24a5d81cde9 Mon Sep 17 00:00:00 2001 From: "said.mengi" Date: Fri, 21 Jan 2022 17:07:12 +0300 Subject: [PATCH 1/2] circular dependency error fixed --- emon-lib/pom.xml | 2 +- emon/pom.xml | 2 +- java-api/pom.xml | 2 +- pom.xml | 2 +- spring-integration/pom.xml | 2 +- .../configuration/CassandraSessionConfig.java | 19 +++++++++++++++++++ .../configuration/EventApisFactory.java | 10 ---------- spring-jpa-view/pom.xml | 2 +- 8 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 spring-integration/src/main/java/com/kloia/eventapis/spring/configuration/CassandraSessionConfig.java diff --git a/emon-lib/pom.xml b/emon-lib/pom.xml index 8a9ea13..a16fdc7 100644 --- a/emon-lib/pom.xml +++ b/emon-lib/pom.xml @@ -7,7 +7,7 @@ com.kloia.eventapis eventapis-parent - 0.7.1 + 0.7.2-SNAPSHOT emon-lib diff --git a/emon/pom.xml b/emon/pom.xml index dbb1754..0e8b7d8 100644 --- a/emon/pom.xml +++ b/emon/pom.xml @@ -7,7 +7,7 @@ com.kloia.eventapis eventapis-parent - 0.7.1 + 0.7.2-SNAPSHOT emon diff --git a/java-api/pom.xml b/java-api/pom.xml index ba7b228..bf8298e 100644 --- a/java-api/pom.xml +++ b/java-api/pom.xml @@ -7,7 +7,7 @@ com.kloia.eventapis eventapis-parent - 0.7.1 + 0.7.2-SNAPSHOT java-api diff --git a/pom.xml b/pom.xml index 199a01f..b2645ba 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.kloia.eventapis eventapis-parent - 0.7.1 + 0.7.2-SNAPSHOT pom eventapis-parent diff --git a/spring-integration/pom.xml b/spring-integration/pom.xml index ed54269..91a29d1 100644 --- a/spring-integration/pom.xml +++ b/spring-integration/pom.xml @@ -7,7 +7,7 @@ com.kloia.eventapis eventapis-parent - 0.7.1 + 0.7.2-SNAPSHOT spring-integration diff --git a/spring-integration/src/main/java/com/kloia/eventapis/spring/configuration/CassandraSessionConfig.java b/spring-integration/src/main/java/com/kloia/eventapis/spring/configuration/CassandraSessionConfig.java new file mode 100644 index 0000000..503ba4b --- /dev/null +++ b/spring-integration/src/main/java/com/kloia/eventapis/spring/configuration/CassandraSessionConfig.java @@ -0,0 +1,19 @@ +package com.kloia.eventapis.spring.configuration; + +import com.kloia.eventapis.cassandra.CassandraSession; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PreDestroy; + +@Component +public class CassandraSessionConfig { + + @Autowired + private CassandraSession cassandraSession; + + @PreDestroy + public void destroy() { + cassandraSession.destroy(); + } +} diff --git a/spring-integration/src/main/java/com/kloia/eventapis/spring/configuration/EventApisFactory.java b/spring-integration/src/main/java/com/kloia/eventapis/spring/configuration/EventApisFactory.java index f79e929..9612906 100644 --- a/spring-integration/src/main/java/com/kloia/eventapis/spring/configuration/EventApisFactory.java +++ b/spring-integration/src/main/java/com/kloia/eventapis/spring/configuration/EventApisFactory.java @@ -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(); diff --git a/spring-jpa-view/pom.xml b/spring-jpa-view/pom.xml index 9a0286b..e685617 100644 --- a/spring-jpa-view/pom.xml +++ b/spring-jpa-view/pom.xml @@ -7,7 +7,7 @@ com.kloia.eventapis eventapis-parent - 0.7.1 + 0.7.2-SNAPSHOT spring-jpa-view From 1c0d8ad0952b570b1452d5e658b1f2692853387e Mon Sep 17 00:00:00 2001 From: "veysel.pehlivan" Date: Fri, 28 Jan 2022 20:43:01 +0300 Subject: [PATCH 2/2] component converted to configuration --- .../spring/configuration/CassandraSessionConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-integration/src/main/java/com/kloia/eventapis/spring/configuration/CassandraSessionConfig.java b/spring-integration/src/main/java/com/kloia/eventapis/spring/configuration/CassandraSessionConfig.java index 503ba4b..0a4f98d 100644 --- a/spring-integration/src/main/java/com/kloia/eventapis/spring/configuration/CassandraSessionConfig.java +++ b/spring-integration/src/main/java/com/kloia/eventapis/spring/configuration/CassandraSessionConfig.java @@ -2,11 +2,11 @@ import com.kloia.eventapis.cassandra.CassandraSession; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; +import org.springframework.context.annotation.Configuration; import javax.annotation.PreDestroy; -@Component +@Configuration public class CassandraSessionConfig { @Autowired