From 398f79c8d13dd8b3bc2ba85172bc0146420740ee Mon Sep 17 00:00:00 2001 From: sreeragksgh Date: Tue, 31 Aug 2021 20:05:26 +0530 Subject: [PATCH] bodhi changed to sunbird --- .../{BodhiConfig.java => SunbirdConfig.java} | 22 +++++++++---------- .../cassandra/{bodhi => sunbird}/WfRepo.java | 2 +- .../service/impl/NotificationServiceImpl.java | 2 +- .../service/impl/WorkflowServiceImpl.java | 2 +- src/main/resources/application.properties | 10 ++++----- 5 files changed, 19 insertions(+), 19 deletions(-) rename src/main/java/org/sunbird/workflow/config/db/{BodhiConfig.java => SunbirdConfig.java} (75%) rename src/main/java/org/sunbird/workflow/repository/cassandra/{bodhi => sunbird}/WfRepo.java (90%) diff --git a/src/main/java/org/sunbird/workflow/config/db/BodhiConfig.java b/src/main/java/org/sunbird/workflow/config/db/SunbirdConfig.java similarity index 75% rename from src/main/java/org/sunbird/workflow/config/db/BodhiConfig.java rename to src/main/java/org/sunbird/workflow/config/db/SunbirdConfig.java index fd3919a..0a3c80c 100644 --- a/src/main/java/org/sunbird/workflow/config/db/BodhiConfig.java +++ b/src/main/java/org/sunbird/workflow/config/db/SunbirdConfig.java @@ -15,30 +15,30 @@ import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories; @Configuration -@ConfigurationProperties("spring.data.cassandra.bodhi") -@EnableCassandraRepositories(basePackages = "org.sunbird.workflow.repository.cassandra.bodhi", cassandraTemplateRef = "bodhiTemplate") -public class BodhiConfig extends CassandraConfig { +@ConfigurationProperties("spring.data.cassandra.sunbird") +@EnableCassandraRepositories(basePackages = "org.sunbird.workflow.repository.cassandra.sunbird", cassandraTemplateRef = "sunbirdTemplate") +public class SunbirdConfig extends CassandraConfig { - private Logger logger = LoggerFactory.getLogger(BodhiConfig.class); + private Logger logger = LoggerFactory.getLogger(SunbirdConfig.class); - @Value("${spring.data.cassandra.bodhi.username}") - private String bodhiUser; + @Value("${spring.data.cassandra.sunbird.username}") + private String sunbirdUser; - @Value("${spring.data.cassandra.bodhi.password}") - private String bodhiPassword; + @Value("${spring.data.cassandra.sunbird.password}") + private String sunbirdPassword; @Override @Primary - @Bean(name = "bodhiTemplate") + @Bean(name = "sunbirdTemplate") public CassandraAdminTemplate cassandraTemplate() throws Exception { return new CassandraAdminTemplate(session().getObject(), cassandraConverter()); } @Override - @Bean(name = "bodhiSession") + @Bean(name = "sunbirdSession") public CassandraSessionFactoryBean session() { - AuthProvider authProvider = new PlainTextAuthProvider(bodhiUser, bodhiPassword); + AuthProvider authProvider = new PlainTextAuthProvider(sunbirdUser, sunbirdPassword); CassandraSessionFactoryBean session = new CassandraSessionFactoryBean(); session.setCluster(Cluster.builder().addContactPoint(getContactPoints()).withPort(getPort()) diff --git a/src/main/java/org/sunbird/workflow/repository/cassandra/bodhi/WfRepo.java b/src/main/java/org/sunbird/workflow/repository/cassandra/sunbird/WfRepo.java similarity index 90% rename from src/main/java/org/sunbird/workflow/repository/cassandra/bodhi/WfRepo.java rename to src/main/java/org/sunbird/workflow/repository/cassandra/sunbird/WfRepo.java index 975037a..e51fdaa 100644 --- a/src/main/java/org/sunbird/workflow/repository/cassandra/bodhi/WfRepo.java +++ b/src/main/java/org/sunbird/workflow/repository/cassandra/sunbird/WfRepo.java @@ -1,4 +1,4 @@ -package org.sunbird.workflow.repository.cassandra.bodhi; +package org.sunbird.workflow.repository.cassandra.sunbird; import org.springframework.data.cassandra.repository.CassandraRepository; diff --git a/src/main/java/org/sunbird/workflow/service/impl/NotificationServiceImpl.java b/src/main/java/org/sunbird/workflow/service/impl/NotificationServiceImpl.java index 5628aa6..5666fb3 100644 --- a/src/main/java/org/sunbird/workflow/service/impl/NotificationServiceImpl.java +++ b/src/main/java/org/sunbird/workflow/service/impl/NotificationServiceImpl.java @@ -16,7 +16,7 @@ import org.sunbird.workflow.models.notification.Template; import org.sunbird.workflow.postgres.entity.WfStatusEntity; import org.sunbird.workflow.postgres.repo.WfStatusRepo; -import org.sunbird.workflow.repository.cassandra.bodhi.WfRepo; +import org.sunbird.workflow.repository.cassandra.sunbird.WfRepo; import org.sunbird.workflow.service.Workflowservice; import java.util.*; diff --git a/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java b/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java index 5a0be49..b41c8d4 100644 --- a/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java +++ b/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java @@ -27,7 +27,7 @@ import org.sunbird.workflow.postgres.repo.WfAuditRepo; import org.sunbird.workflow.postgres.repo.WfStatusRepo; import org.sunbird.workflow.producer.Producer; -import org.sunbird.workflow.repository.cassandra.bodhi.WfRepo; +import org.sunbird.workflow.repository.cassandra.sunbird.WfRepo; import org.sunbird.workflow.service.UserProfileWfService; import org.sunbird.workflow.service.Workflowservice; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0b776d8..c4e379d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,10 +1,10 @@ server.port=5099 -spring.data.cassandra.bodhi.contact-points=localhost -spring.data.cassandra.bodhi.port=9042 -spring.data.cassandra.bodhi.keyspace-name=bodhi -spring.data.cassandra.bodhi.username=cassandra -spring.data.cassandra.bodhi.password=cassandra +spring.data.cassandra.sunbird.contact-points=localhost +spring.data.cassandra.sunbird.port=9042 +spring.data.cassandra.sunbird.keyspace-name=sunbird +spring.data.cassandra.sunbird.username=cassandra +spring.data.cassandra.sunbird.password=cassandra #spring data jpa for postgres spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true