From da869efa41d05bac5d05b0fee40e607a22127e84 Mon Sep 17 00:00:00 2001
From: Sorin Zamfir <sorin.zamfir@outlook.com>
Date: Mon, 27 Jan 2020 21:14:55 +0200
Subject: [PATCH] BAEL-3777: Fixed some spring init issues

---
 .../repository/CassandraDbOrderRepository.java        | 11 +++++++++++
 .../repository/MongoDbOrderRepository.java            |  2 ++
 .../SpringDataCassandraOrderRepository.java           |  2 ++
 ddd/src/main/resources/ddd-layers.properties          |  2 +-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/CassandraDbOrderRepository.java b/ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/CassandraDbOrderRepository.java
index f16a546576..a648a1f041 100644
--- a/ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/CassandraDbOrderRepository.java
+++ b/ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/CassandraDbOrderRepository.java
@@ -3,11 +3,22 @@ package com.baeldung.dddhexagonalspring.infrastracture.repository;
 import java.util.Optional;
 import java.util.UUID;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.baeldung.dddhexagonalspring.domain.Order;
 import com.baeldung.dddhexagonalspring.domain.repository.OrderRepository;
 
+@Component
 public class CassandraDbOrderRepository implements OrderRepository {
 
+    private final SpringDataCassandraOrderRepository orderRepository;
+    
+    @Autowired
+    public CassandraDbOrderRepository(SpringDataCassandraOrderRepository orderRepository) {
+        this.orderRepository = orderRepository;
+    }
+
     @Override
     public Optional<Order> findById(UUID id) {
         // TODO Auto-generated method stub
diff --git a/ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/MongoDbOrderRepository.java b/ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/MongoDbOrderRepository.java
index bde0007ced..cf1d900821 100644
--- a/ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/MongoDbOrderRepository.java
+++ b/ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/MongoDbOrderRepository.java
@@ -3,12 +3,14 @@ package com.baeldung.dddhexagonalspring.infrastracture.repository;
 import com.baeldung.dddhexagonalspring.domain.Order;
 import com.baeldung.dddhexagonalspring.domain.repository.OrderRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 
 import java.util.Optional;
 import java.util.UUID;
 
 @Component
+@Primary
 public class MongoDbOrderRepository implements OrderRepository {
 
     private final SpringDataMongoOrderRepository orderRepository;
diff --git a/ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/SpringDataCassandraOrderRepository.java b/ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/SpringDataCassandraOrderRepository.java
index 9df128f035..dd7c7dbc81 100644
--- a/ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/SpringDataCassandraOrderRepository.java
+++ b/ddd/src/main/java/com/baeldung/dddhexagonalspring/infrastracture/repository/SpringDataCassandraOrderRepository.java
@@ -3,9 +3,11 @@ package com.baeldung.dddhexagonalspring.infrastracture.repository;
 import java.util.UUID;
 
 import org.springframework.data.cassandra.repository.CassandraRepository;
+import org.springframework.stereotype.Repository;
 
 import com.baeldung.dddhexagonalspring.domain.Order;
 
+@Repository
 public interface SpringDataCassandraOrderRepository extends CassandraRepository<Order, UUID>{
 
 }
diff --git a/ddd/src/main/resources/ddd-layers.properties b/ddd/src/main/resources/ddd-layers.properties
index 3b2aa35efe..d0ad343b66 100644
--- a/ddd/src/main/resources/ddd-layers.properties
+++ b/ddd/src/main/resources/ddd-layers.properties
@@ -4,7 +4,7 @@ spring.data.mongodb.database=order-database
 spring.data.mongodb.username=order
 spring.data.mongodb.password=order
 
-spring.data.cassandra.keyspaceName=order-database
+spring.data.cassandra.keyspaceName=order_database
 spring.data.cassandra.username=cassandra
 spring.data.cassandra.password=cassandra
 spring.data.cassandra.contactPoints=localhost