minor changes for naming consistency

DataStax-Examples · Jun 10, 2020 · a7d43ee · a7d43ee
1 parent fc2dd20
commit a7d43ee
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 30 deletions.
diff --git a/...y/spring-boot/spring-boot-deployment.yaml → ...oy/spring-boot/spring-boot-deployment.yml b/...y/spring-boot/spring-boot-deployment.yaml → ...oy/spring-boot/spring-boot-deployment.yml
diff --git a/deploy/spring-boot/spring-boot-rbac.yaml → deploy/spring-boot/spring-boot-rbac.yml b/deploy/spring-boot/spring-boot-rbac.yaml → deploy/spring-boot/spring-boot-rbac.yml
diff --git a/deploy/spring-boot/spring-boot-service-configmap.yaml b/deploy/spring-boot/spring-boot-service-configmap.yaml
diff --git a/...g-data/spring-data-service-configmap.yaml → ...ng-boot/spring-boot-service-configmap.yml b/...g-data/spring-data-service-configmap.yaml → ...ng-boot/spring-boot-service-configmap.yml
@@ -1,7 +1,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: spring-data-service
+  name: spring-boot-service
 data:
   application.yml: |-
-    cassandra.contact-points: cluster1-dc1-service.cass-operator
+    cassandra.contact-points: cluster1-dc1-service.cass-operator
+    cassandra.keyspace: betterbotz
+    cassandra.local-datacenter: dc1
+    cassandra.port: 9042
diff --git a/deploy/spring-boot/spring-boot-service.yaml → deploy/spring-boot/spring-boot-service.yml b/deploy/spring-boot/spring-boot-service.yaml → deploy/spring-boot/spring-boot-service.yml
diff --git a/...y/spring-data/spring-data-deployment.yaml → ...oy/spring-data/spring-data-deployment.yml b/...y/spring-data/spring-data-deployment.yaml → ...oy/spring-data/spring-data-deployment.yml
diff --git a/deploy/spring-data/spring-data-rbac.yaml → deploy/spring-data/spring-data-rbac.yml b/deploy/spring-data/spring-data-rbac.yaml → deploy/spring-data/spring-data-rbac.yml
diff --git a/deploy/spring-data/spring-data-service-configmap.yml b/deploy/spring-data/spring-data-service-configmap.yml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: spring-data-service
+data:
+  application.yml: |-
+    spring.data.cassandra.contact-points: cluster1-dc1-service.cass-operator
+    spring.data.cassandra.port: 9042
+    spring.data.cassandra.keyspace-name: betterbotz
+    spring.data.cassandra.local-datacenter: dc1
+    spring.data.cassandra.schema-action: create-if-not-exists
+    spring.data.cassandra.rest.basePath: /api
diff --git a/deploy/spring-data/spring-data-service.yaml → deploy/spring-data/spring-data-service.yml b/deploy/spring-data/spring-data-service.yaml → deploy/spring-data/spring-data-service.yml
diff --git a/...pring-boot/src/main/java/com/datastax/examples/conf/SpringBootCassandraConfiguration.java b/...pring-boot/src/main/java/com/datastax/examples/conf/SpringBootCassandraConfiguration.java
@@ -69,7 +69,7 @@ public DriverConfigLoaderBuilderCustomizer driverConfigLoaderBuilderCustomizer()
             return builder -> builder.without(DefaultDriverOption.CONTACT_POINTS);
         }
         return builder -> builder
-                .withString(DefaultDriverOption.SESSION_KEYSPACE, this.keyspace);
+                .withString(DefaultDriverOption.SESSION_NAME, "spring-boot-service");
     }
 
     @Bean

diff --git a/microservice-spring-boot/src/main/resources/application.yml b/microservice-spring-boot/src/main/resources/application.yml
@@ -7,13 +7,12 @@ management:
   server:
     port: 8084
 
-cassandra.contact-points: host.docker.internal
-cassandra.keyspace: betterbotz
-cassandra.local-datacenter: datastax-desktop
-cassandra.port: 9042
 ---
 spring.profiles: docker
 cassandra.contact-points: host.docker.internal
+cassandra.keyspace: betterbotz
+cassandra.local-datacenter: dc1
+cassandra.port: 9042
 ---
 spring.profiles: kubernetes
 spring.cloud.kubernetes.enabled: true

diff --git a/...pring-data/src/main/java/com/datastax/examples/conf/SpringDataCassandraConfiguration.java b/...pring-data/src/main/java/com/datastax/examples/conf/SpringDataCassandraConfiguration.java
@@ -37,9 +37,6 @@ public class SpringDataCassandraConfiguration extends AbstractCassandraConfigura
     @Value("${DB_PASSWORD:cassandra}")
     private String password;
 
-    @Value("${cassandra.contact-points:localhost}")
-    private String contactPoints;
-
     @Override
     protected String getKeyspaceName() {
         return cassandraProperties.getKeyspaceName();
@@ -55,10 +52,6 @@ protected int getPort() {
         return cassandraProperties.getPort();
     }
 
-    protected String getContactPoints(){
-        return contactPoints;
-    }
-
     @Override
     protected SessionBuilderConfigurer getSessionBuilderConfigurer() {
         return new SessionBuilderConfigurer() {
@@ -71,14 +64,15 @@ public CqlSessionBuilder configure(CqlSessionBuilder cqlSessionBuilder) {
                 }
                 else{
                     return cqlSessionBuilder
-                            .addContactPoint(new InetSocketAddress(contactPoints, getPort()))
+                            .addContactPoint(new InetSocketAddress(
+                                    cassandraProperties.getContactPoints().get(0),
+                                    cassandraProperties.getPort()))
                             .withAuthCredentials(username, password);
                 }
             }
         };
     }
 
-    /** {@inheritDoc} */
     @Override
     protected List<CreateKeyspaceSpecification> getKeyspaceCreations() {
         if (!astraSecureConnectBundle.equals("none")) {
@@ -90,14 +84,12 @@ protected List<CreateKeyspaceSpecification> getKeyspaceCreations() {
         }
         return Arrays.asList();
     }
-
-    /** {@inheritDoc} */
+
     @Override
     public SchemaAction getSchemaAction() {
         return SchemaAction.CREATE_IF_NOT_EXISTS;
     }
-
-    /** {@inheritDoc} */
+
     @Override
     protected KeyspacePopulator keyspacePopulator() {
         ResourceKeyspacePopulator keyspacePopulate = new ResourceKeyspacePopulator();
@@ -106,7 +98,6 @@ protected KeyspacePopulator keyspacePopulator() {
         return keyspacePopulate;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String[] getEntityBasePackages() {
         return new String[]{ SpringDataApplication.class.getPackageName() + ".model" };

diff --git a/microservice-spring-data/src/main/resources/application.yml b/microservice-spring-data/src/main/resources/application.yml
@@ -4,16 +4,18 @@ server.port: 8081
 
 management.server.port: 8082
 
+---
+spring.profiles: docker
 spring:
   data:
     cassandra:
       port: 9042
+      contact-points: host.docker.internal
       keyspace-name: betterbotz
-      local-datacenter: localhost
+      local-datacenter: dc1
       schema-action: create-if-not-exists
     rest:
       basePath: /api
-
 ---
 spring.profiles: kubernetes
 spring.cloud.kubernetes.enabled: true