Fixing tests and code

Author: Denis Rosa

.gitpod.Dockerfile

@@ -0,0 +1,5 @@
+FROM deniswsrosa/couchbase6.6.2-gitpod
+
+#Simple example on how to extend the image to install Java and maven
+RUN apt-get -qq update && \
+     apt-get install -yq maven default-jdk

.gitpod.yml

@@ -0,0 +1,32 @@
+image:
+  file: .gitpod.Dockerfile
+
+tasks:
+- name: Start Couchbase
+  command:  cd /opt/couchbase/ && ./start-cb.sh
+- name: Start app
+  init: ./mvnw package -DskipTests
+  command: while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' -u Administrator:password localhost:8091/pools/default/buckets/user_profile)" != "200" ]]; do sleep 5; done && java -jar target/*.jar
+
+# exposed ports
+ports:
+- port: 8080
+  onOpen: open-preview
+- port: 8091
+  onOpen: notify
+- port: 8092-10000
+  onOpen: ignore
+- port: 4369
+  onOpen: ignore
+
+github:
+  prebuilds:
+    # enable for the master/default branch (defaults to true)
+    master: true
+
+vscode:
+  extensions:
+    - redhat.java
+    - vscjava.vscode-java-debug
+    - vscjava.vscode-java-test
+    - pivotal.vscode-spring-boot

src.iml

@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />

src/main/java/org/couchbase/quickstart/Application.java

@@ -1,20 +1,19 @@
 package org.couchbase.quickstart;
 
-import org.couchbase.quickstart.helpers.DatabaseHelper;
+import org.couchbase.quickstart.runners.DBSetupRunner;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-//disables login since apis are open to public
 @SpringBootApplication(exclude = SecurityAutoConfiguration.class, proxyBeanMethods = false)
 public class Application {
 
+    @Autowired
+    private DBSetupRunner helper;
+
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
-
-        //bootstrap database
-        DatabaseHelper dbHelper = new DatabaseHelper();
-        dbHelper.createDb();
     }
 
 }

src/main/java/org/couchbase/quickstart/configs/CollectionNames.java

@@ -0,0 +1,6 @@
+package org.couchbase.quickstart.configs;
+
+public class CollectionNames {
+
+    public static final String PROFILE = "profile";
+}

src/main/java/org/couchbase/quickstart/configs/ConfigDb.java

@@ -1,48 +1,36 @@
 package org.couchbase.quickstart.configs;
 
-import org.springframework.beans.factory.annotation.Value;
+import com.couchbase.client.core.error.BucketExistsException;
+import com.couchbase.client.java.Bucket;
+import com.couchbase.client.java.Cluster;
+import com.couchbase.client.java.manager.bucket.BucketSettings;
+import com.couchbase.client.java.manager.bucket.BucketType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
 
 @Configuration
 public class CouchbaseConfig {
 
-    @Value("${spring.couchbase.bootstrap-hosts}")
-    private String connectionString;
+    @Autowired
+    private DBProperties dbProp;
 
-    @Value("${spring.couchbase.bucket.name}")
-    private String bucket;
-
-    @Value("${spring.couchbase.bucket.user}")
-    private String username;
-
-    @Value("${spring.couchbase.bucket.password}")
-    private String password;
-
-    @Value("${spring.couchbase.bucket.collection}")
-    private String collection;
-
-    @Value("${spring.couchbase.bucket.scope}")
-    private String scope;
-
-    public String getConnectionString() {
-        return connectionString;
+    @Bean
+    public Cluster getCouchbaseCluster(){
+        return Cluster.connect(dbProp.getHostName(), dbProp.getUsername(), dbProp.getPassword());
     }
 
-    public String getUserName() {
-        return username;
-    }
-
-    public String getPassword() { return password; }
+    @Bean
+    public Bucket getCouchbaseBucket(Cluster cluster){
 
-    public String getBucketName() {
-        return bucket;
+        //Creates the cluster if it does not exist yet
+        if( !cluster.buckets().getAllBuckets().containsKey(dbProp.getBucketName())) {
+            cluster.buckets().createBucket(BucketSettings.create(dbProp.getBucketName())
+                    .bucketType(BucketType.COUCHBASE)
+                    .ramQuotaMB(256));
+        }
+        return cluster.bucket(dbProp.getBucketName());
     }
 
-    public String getCollection(){
-        return collection;
-    }
-
-    public String getScope() {
-        return scope;
-    }
 }

src/main/java/org/couchbase/quickstart/configs/CouchbaseConfig.java

@@ -0,0 +1,32 @@
+package org.couchbase.quickstart.configs;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class DBProperties {
+
+    @Value("${spring.couchbase.bootstrap-hosts}")
+    private String hostName;
+    @Value("${spring.couchbase.bucket.user}")
+    private String username;
+    @Value("${spring.couchbase.bucket.password}")
+    private String password;
+    @Value("${spring.couchbase.bucket.name}")
+    private String bucketName;
+
+    public String getHostName() {
+        return hostName;
+    }
+    public String getUsername() {
+        return username;
+    }
+    public String getPassword() {
+        return password;
+    }
+    public String getBucketName() {
+        return bucketName;
+    }
+
+
+}

src/main/java/org/couchbase/quickstart/configs/DBProperties.java

@@ -0,0 +1,14 @@
+package org.couchbase.quickstart.configs;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+        registry.addRedirectViewController("/", "swagger-ui/");
+    }
+}