From 61cfcd1c32a88f736dfcb4cff39e7d78deae7d81 Mon Sep 17 00:00:00 2001
From: Scott Frederick <sfrederick@pivotal.io>
Date: Wed, 2 Nov 2016 20:27:36 -0500
Subject: [PATCH] Use consistent formatting in test json files.

---
 .../cloudfoundry/test-application-info.json   | 38 +++++++++----------
 .../test-mongodb-info-no-label-no-tags.json   |  8 ++--
 .../cloud/cloudfoundry/test-mongodb-info.json | 14 +++----
 .../cloudfoundry/test-monitoring-info.json    |  9 ++---
 .../test-mysql-info-with-label-no-tags.json   | 14 +++----
 .../test-mysql-info-with-label-no-uri.json    | 14 +++----
 .../cloud/cloudfoundry/test-mysql-info.json   | 14 +++----
 ...test-postgresql-info-no-label-no-tags.json |  8 ++--
 .../cloudfoundry/test-postgresql-info.json    | 14 +++----
 .../test-redis-info-no-label-no-tags.json     |  8 ++--
 .../cloud/cloudfoundry/test-redis-info.json   | 18 ++++-----
 .../cloudfoundry/test-ups-info-no-uri.json    | 22 +++++------
 .../cloud/cloudfoundry/test-ups-info.json     | 12 +++---
 13 files changed, 96 insertions(+), 97 deletions(-)

diff --git a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-application-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-application-info.json
index 78c07c7..447b8a5b 100644
--- a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-application-info.json
+++ b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-application-info.json
@@ -1,22 +1,22 @@
 {
-    "instance_id": "5b2332ca1b6ff9c2d481b5353cd117e8",
-    "instance_index": 0,
-    	"host":"0.0.0.0",
-    "port": 11338,
-	"started_at":"2013-08-15 22:44:57 +0000",
-	"started_at_timestamp":1376606697,
-	"start":"2013-08-15 22:44:57 +0000",
-	"state_timestamp":1376606697,
-	"limits":{
-		"mem":512,
-		"disk":1024,
-		"fds":16384
+	"instance_id": "5b2332ca1b6ff9c2d481b5353cd117e8",
+	"instance_index": 0,
+	"host": "0.0.0.0",
+	"port": 11338,
+	"started_at": "2013-08-15 22:44:57 +0000",
+	"started_at_timestamp": 1376606697,
+	"start": "2013-08-15 22:44:57 +0000",
+	"state_timestamp": 1376606697,
+	"limits": {
+		"mem": 512,
+		"disk": 1024,
+		"fds": 16384
 	},
-	"application_version":"37d434da-a50d-40e9-ac99-ac724b0658d9",
-	"application_name":"$name",
-	"application_uris":[$uris],
-	"version":"37d434da-a50d-40e9-ac99-ac724b0658d9",
-    "name": "$name",
-    "uris": [$uris],
-    "users": null
+	"application_version": "37d434da-a50d-40e9-ac99-ac724b0658d9",
+	"application_name": "$name",
+	"application_uris": [ $uris ],
+	"version": "37d434da-a50d-40e9-ac99-ac724b0658d9",
+	"name": "$name",
+	"uris": [ $uris ],
+	"users": null
 }
diff --git a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info-no-label-no-tags.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info-no-label-no-tags.json
index 773d40b..96f85d5 100644
--- a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info-no-label-no-tags.json
+++ b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info-no-label-no-tags.json
@@ -1,6 +1,6 @@
 {
-        "name": "$serviceName",
-        "credentials": {
-            "uri" : "mongodb://$username:$password@$hostname:$port/$db"
-        }
+	"name": "$serviceName",
+	"credentials": {
+		"uri": "mongodb://$username:$password@$hostname:$port/$db"
+	}
 }
diff --git a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info.json
index 6a55f41..fa89c81 100644
--- a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info.json
+++ b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mongodb-info.json
@@ -1,9 +1,9 @@
 {
-        "name": "$serviceName",
-        "label": "mongolab",
-        "plan": "free",
-        "tags":["mongodb"],
-        "credentials": {
-            "uri" : "mongodb://$username:$password@$hostname:$port/$db"
-        }
+	"name": "$serviceName",
+	"label": "mongolab",
+	"plan": "free",
+	"tags": [ "mongodb" ],
+	"credentials": {
+		"uri": "mongodb://$username:$password@$hostname:$port/$db"
+	}
 }
diff --git a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-monitoring-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-monitoring-info.json
index 4896740..e67f326 100644
--- a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-monitoring-info.json
+++ b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-monitoring-info.json
@@ -1,9 +1,8 @@
 {
-    "name": "$serviceName",
-	"label":"newrelic-n/a",
-	"tags":[],
-	"plan":"standard",
+	"name": "$serviceName",
+	"label": "newrelic-n/a",
+	"tags": [],
+	"plan": "standard",
 	"credentials": {
-		
 	}
 }
\ No newline at end of file
diff --git a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-tags.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-tags.json
index 6361331..929472e 100644
--- a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-tags.json
+++ b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-tags.json
@@ -1,9 +1,9 @@
 {
-        "name": "$serviceName",
-        "label": "mysql",
-        "tags": [],
-        "plan": "free",
-		"credentials":{
-			"uri" : "mysql://$user:$password@$hostname:$port/$name"
-		}
+	"name": "$serviceName",
+	"label": "mysql",
+	"tags": [],
+	"plan": "free",
+	"credentials": {
+		"uri": "mysql://$user:$password@$hostname:$port/$name"
+	}
 }
\ No newline at end of file
diff --git a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-uri.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-uri.json
index 3c7f9c1..3a5ee05 100644
--- a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-uri.json
+++ b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info-with-label-no-uri.json
@@ -1,15 +1,15 @@
 {
-    "name": "$serviceName",
-    "label": "mysql",
-	"tags":[],
-	"plan":"100",
-	"credentials":{
+	"name": "$serviceName",
+	"label": "mysql",
+	"tags": [],
+	"plan": "100",
+	"credentials": {
 		"name": "$name",
 		"hostname": "$hostname",
 		"host": "$hostname",
 		"port": $port,
 		"user": "$user",
-		"username":"$user",
-		"password":"$password"
+		"username": "$user",
+		"password": "$password"
 	}
 }
\ No newline at end of file
diff --git a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info.json
index 7c558b5..c1e9410 100644
--- a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info.json
+++ b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-mysql-info.json
@@ -1,9 +1,9 @@
 {
-        "name": "$serviceName",
-        "label": "cleardb",
-        "tags": ["mysql"],
-        "plan": "free",
-		"credentials":{
-			"uri" : "mysql://$user:$password@$hostname:$port/$name"
-		}
+	"name": "$serviceName",
+	"label": "cleardb",
+	"tags": [ "mysql" ],
+	"plan": "free",
+	"credentials": {
+		"uri": "mysql://$user:$password@$hostname:$port/$name"
+	}
 }
\ No newline at end of file
diff --git a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info-no-label-no-tags.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info-no-label-no-tags.json
index ee6025c..cdfbce1 100644
--- a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info-no-label-no-tags.json
+++ b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info-no-label-no-tags.json
@@ -1,6 +1,6 @@
 {
-        "name": "$serviceName",
-        "credentials": {
-        		"uri" : "postgres://$user:$password@$hostname:$port/$name"
-        }
+	"name": "$serviceName",
+	"credentials": {
+		"uri": "postgres://$user:$password@$hostname:$port/$name"
+	}
 }
\ No newline at end of file
diff --git a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info.json
index b03c2d9..81a673d 100644
--- a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info.json
+++ b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-postgresql-info.json
@@ -1,9 +1,9 @@
 {
-        "name": "$serviceName",
-        "label": "elephantsql",
-        "plan": "free",
-        "tags": ["postgresql"],
-        "credentials": {
-        		"uri" : "postgres://$user:$password@$hostname:$port/$name"
-        }
+	"name": "$serviceName",
+	"label": "elephantsql",
+	"plan": "free",
+	"tags": [ "postgresql" ],
+	"credentials": {
+		"uri": "postgres://$user:$password@$hostname:$port/$name"
+	}
 }
\ No newline at end of file
diff --git a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info-no-label-no-tags.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info-no-label-no-tags.json
index e661c43..923c78d 100644
--- a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info-no-label-no-tags.json
+++ b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info-no-label-no-tags.json
@@ -1,6 +1,6 @@
 {
-        "name": "$serviceName",
-        "credentials": {
-        		"uri" : "redis://$username:$password@$hostname:$port"
-        }
+	"name": "$serviceName",
+	"credentials": {
+		"uri": "redis://$username:$password@$hostname:$port"
+	}
 }
\ No newline at end of file
diff --git a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info.json
index 8c6a20b..0e0b160 100644
--- a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info.json
+++ b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-redis-info.json
@@ -1,11 +1,11 @@
 {
-        "name": "$serviceName",
-        "label": "rediscloud",
-        "plan": "free",
-        "tags":["redis","key-value"],
-        "credentials": {
-            "hostname": "$hostname",
-            "port": "$port",
-            "password": "$password"
-        }
+	"name": "$serviceName",
+	"label": "rediscloud",
+	"plan": "free",
+	"tags": [ "redis", "key-value" ],
+	"credentials": {
+		"hostname": "$hostname",
+		"port": "$port",
+		"password": "$password"
+	}
 }
\ No newline at end of file
diff --git a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info-no-uri.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info-no-uri.json
index e27a0b2..b0110cf 100644
--- a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info-no-uri.json
+++ b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info-no-uri.json
@@ -1,13 +1,13 @@
 {
-    "name": "$serviceName",
-    "label": "user-provided",
-    "tags": [],
-    "credentials": {
-        "host": "$hostname",
-        "port": "$port",
-        "username": "$user",
-        "password": "$password",
-        "name": "$name",
-        "integer": 123
-    }
+	"name": "$serviceName",
+	"label": "user-provided",
+	"tags": [],
+	"credentials": {
+		"host": "$hostname",
+		"port": "$port",
+		"username": "$user",
+		"password": "$password",
+		"name": "$name",
+		"integer": 123
+	}
 }
\ No newline at end of file
diff --git a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info.json b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info.json
index 81f75f1..97d65c0 100644
--- a/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info.json
+++ b/spring-cloud-cloudfoundry-connector/src/test/resources/org/springframework/cloud/cloudfoundry/test-ups-info.json
@@ -1,8 +1,8 @@
 {
-    "name": "$serviceName",
-    "label": "user-provided",
-    "tags": [],
-    "credentials": {
-        "uri": "$scheme//$user:$password@$hostname:$port/$name"
-    }
+	"name": "$serviceName",
+	"label": "user-provided",
+	"tags": [],
+	"credentials": {
+		"uri": "$scheme//$user:$password@$hostname:$port/$name"
+	}
 }
\ No newline at end of file