Merge pull request #3 from TheovanKraay/master

address issue 6320063

.gitignore

@@ -1,5 +1,5 @@
-target/
-pom.xml.tag
+
+target/pom.xml.tag
 pom.xml.releaseBackup
 pom.xml.versionsBackup
 pom.xml.next
@@ -9,4 +9,21 @@ buildNumber.properties
 .mvn/timing.properties
 
 # Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
+
 !/.mvn/wrapper/maven-wrapper.jar
+target/
+pom.xml.tag
+*.iml
+.idea/
+logs
+project/project
+project/target
+target
+tmp
+dist
+.cache
+.settings
+.project
+*.classpath
+.DS_Store
+/bin

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}

README.md

@@ -25,9 +25,9 @@ Azure Cosmos DB is a globally distributed multi-model database. One of the suppo
 ## Running this sample
 1. Clone this repository using `git clone [email protected]:Azure-Samples/azure-cosmos-db-cassandra-java-getting-started.git cosmosdb`.
 
-2. Change directories to the repo using `cd cosmosdb/java-examples`
+2. Change directories to the repo using `cd cosmosdb`
 
-3. Next, substitute the Cassandra host, username, password  `java-examples\src\main\resources\config.properties` with your Cosmos DB account's values from connectionstring panel of the portal.
+3. Next, substitute the Cassandra host, username, password  `src\main\resources\config.properties` with your Cosmos DB account's values from connectionstring panel of the portal.
 
     ```
     cassandra_host=<FILLME>
@@ -39,7 +39,7 @@ Azure Cosmos DB is a globally distributed multi-model database. One of the suppo
     If ssl_keystore_file_path is not given in config.properties, then by default <JAVA_HOME>/jre/lib/security/cacerts will be used
     If ssl_keystore_password is not given in config.properties, then the default password 'changeit' will be used
 
-5. Run `mvn clean install` from java-examples folder to build the project. This will generate cosmosdb-cassandra-examples.jar under target folder.
+5. Run `mvn clean install` from cosmosdb folder to build the project. This will generate cosmosdb-cassandra-examples.jar under target folder.
  
 6. Run `java -cp target/cosmosdb-cassandra-examples.jar com.azure.cosmosdb.cassandra.examples.UserProfile` in a terminal to start your java application.
    ![Console output](./media/output.png)
@@ -91,7 +91,7 @@ If you're interested in learning how the database resources are created in the c
         return session.prepare(insertStatement);
     }
 
-	public void insertUser(PreparedStatement statement, int id, String name, String city) {
+    public void insertUser(PreparedStatement statement, int id, String name, String city) {
         BoundStatement boundStatement = new BoundStatement(statement);
         session.execute(boundStatement.bind(id, name, city));
     }

java-examples/pom.xml → pom.xml

@@ -61,8 +61,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>

java-examples/src/main/resources/config.properties → src/main/resources/config.properties

@@ -1,7 +1,7 @@
 ###Cassandra endpoint details on cosmosdb
 cassandra_host=<Cassandra endpoint host>
 cassandra_port=10350
-cassandra_username=<cassandra endpoint username>
-cassandra_password=<cassandra endpoint password>
+cassandra_username=<Cassandra endpoint username>
+cassandra_password=<Cassandra endpoint password>
 #ssl_keystore_file_path=<SSL key store file location>
 #ssl_keystore_password=<SSL key store password>