Skip to content

Commit

Permalink
Fixes wrong property file name with unknown name and unknown version (#…
Browse files Browse the repository at this point in the history 
…6813)

* fixes wrong property file name and update headers for all json files
  • Loading branch information
@mssfang
mssfang authored Dec 13, 2019
1 parent 9f9a455 commit bf2c9ea
Show file tree
Hide file tree
Showing 37 changed files with 5,797 additions and 5,797 deletions.
2 changes: 1 addition & 1 deletion ...nfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationClientBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public final class ConfigurationClientBuilder {
private static final String ACCEPT_HEADER = "Accept";
private static final String ACCEPT_HEADER_VALUE = "application/vnd.microsoft.azconfig.kv+json";
// This is properties file's name.
private static final String APP_CONFIG_PROPERTIES = "azure-appconfig.properties";
private static final String APP_CONFIG_PROPERTIES = "azure-data-appconfiguration.properties";
private static final String SDK_NAME = "name";
private static final String SDK_VERSION = "version";
private static final RetryPolicy DEFAULT_RETRY_POLICY = new RetryPolicy("retry-after-ms", ChronoUnit.MILLIS);
Expand Down
24 changes: 12 additions & 12 deletions ...-appconfiguration/src/test/resources/session-records/aadAuthenticationAzConfigClient.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"Method" : "PUT",
"Uri" : "https://appconfigtestshawnfang.azconfig.io/kv/newKey?api-version=1.0",
"Headers" : {
"User-Agent" : "azsdk-java-UnknownName/UnknownVersion (11.0.4; Windows 10 10.0)",
"x-ms-client-request-id" : "8758e18e-43e3-4965-8ddb-68926f91470d",
"User-Agent" : "azsdk-java-azure-data-appconfiguration/1.0.0-beta.8 (11.0.4; Windows 10 10.0)",
"x-ms-client-request-id" : "b4db8473-0460-4c0d-9754-9b7541a61eb3",
"Content-Type" : "application/json"
},
"Response" : {
Expand All @@ -13,20 +13,20 @@
"Access-Control-Allow-Origin" : "*",
"Access-Control-Allow-Methods" : "GET, PUT, POST, DELETE, PATCH, OPTIONS",
"Connection" : "keep-alive",
"Last-Modified" : "Sun, 24 Nov 2019 16:05:15 GMT",
"Last-Modified" : "Fri, 13 Dec 2019 00:50:18 GMT",
"retry-after" : "0",
"StatusCode" : "200",
"Date" : "Sun, 24 Nov 2019 16:05:14 GMT",
"Access-Control-Allow-Headers" : "DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Authorization, x-ms-client-request-id, x-ms-content-sha256, x-ms-date, host, Accept, Accept-Datetime, Date, If-Match, If-None-Match, Sync-Token, x-ms-return-client-request-id, ETag, Last-Modified, Link, Memento-Datetime, x-ms-retry-after, x-ms-request-id, WWW-Authenticate",
"x-ms-correlation-request-id" : "b96803a1-d123-4eac-9b1a-a546888087f2",
"Date" : "Fri, 13 Dec 2019 00:50:18 GMT",
"Access-Control-Allow-Headers" : "DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Authorization, x-ms-client-request-id, x-ms-command-name, x-ms-content-sha256, x-ms-date, host, Accept, Accept-Datetime, Date, If-Match, If-None-Match, Sync-Token, x-ms-return-client-request-id, ETag, Last-Modified, Link, Memento-Datetime, x-ms-retry-after, x-ms-request-id, WWW-Authenticate",
"x-ms-correlation-request-id" : "1275cbf9-d230-4a4d-baf6-fcd214450a8f",
"Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
"Access-Control-Expose-Headers" : "DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Authorization, x-ms-client-request-id, x-ms-content-sha256, x-ms-date, host, Accept, Accept-Datetime, Date, If-Match, If-None-Match, Sync-Token, x-ms-return-client-request-id, ETag, Last-Modified, Link, Memento-Datetime, x-ms-retry-after, x-ms-request-id, WWW-Authenticate",
"ETag" : "\"mRbQHloEVRE3X0nAg0QPNWGKCBB\"",
"Access-Control-Expose-Headers" : "DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Authorization, x-ms-client-request-id, x-ms-command-name, x-ms-content-sha256, x-ms-date, host, Accept, Accept-Datetime, Date, If-Match, If-None-Match, Sync-Token, x-ms-return-client-request-id, ETag, Last-Modified, Link, Memento-Datetime, x-ms-retry-after, x-ms-request-id, WWW-Authenticate",
"ETag" : "\"862c4nPqzdE63FQ2IGyLerzHJAj\"",
"Access-Control-Allow-Credentials" : "true",
"Sync-Token" : "zAJw6V16=MDotMSM1Njg4NDA=;sn=568840",
"x-ms-request-id" : "b96803a1-d123-4eac-9b1a-a546888087f2",
"Body" : "{\"etag\":\"mRbQHloEVRE3X0nAg0QPNWGKCBB\",\"key\":\"newKey\",\"label\":null,\"content_type\":null,\"value\":\"newValue\",\"tags\":{},\"locked\":false,\"last_modified\":\"2019-11-24T16:05:15+00:00\"}",
"x-ms-client-request-id" : "8758e18e-43e3-4965-8ddb-68926f91470d",
"Sync-Token" : "zAJw6V16=MDotMSM2NTQ5OTU=;sn=654995",
"x-ms-request-id" : "1275cbf9-d230-4a4d-baf6-fcd214450a8f",
"Body" : "{\"etag\":\"862c4nPqzdE63FQ2IGyLerzHJAj\",\"key\":\"newKey\",\"label\":null,\"content_type\":null,\"value\":\"newValue\",\"tags\":{},\"locked\":false,\"last_modified\":\"2019-12-13T00:50:18+00:00\"}",
"x-ms-client-request-id" : "b4db8473-0460-4c0d-9754-9b7541a61eb3",
"Content-Type" : "application/vnd.microsoft.appconfig.kv+json; charset=utf-8"
},
"Exception" : null
Expand Down
128 changes: 64 additions & 64 deletions ...ure-data-appconfiguration/src/test/resources/session-records/addConfigurationSetting.json
View file

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions ...-appconfiguration/src/test/resources/session-records/addConfigurationSettingEmptyKey.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"Method" : "PUT",
"Uri" : "https://appconfigtestshawnfang.azconfig.io/kv/?api-version=1.0",
"Headers" : {
"User-Agent" : "azsdk-java-UnknownName/UnknownVersion (11.0.4; Windows 10 10.0)",
"x-ms-client-request-id" : "e7d5c05f-13dd-4ac6-a24e-0176a647a5dc",
"User-Agent" : "azsdk-java-azure-data-appconfiguration/1.0.0-beta.8 (11.0.4; Windows 10 10.0)",
"x-ms-client-request-id" : "982ec8b1-95d6-4933-9850-5916b240dc2e",
"Content-Type" : "application/json"
},
"Response" : {
Expand All @@ -14,23 +14,23 @@
"Connection" : "keep-alive",
"retry-after" : "0",
"StatusCode" : "405",
"Date" : "Sun, 24 Nov 2019 16:06:08 GMT",
"Access-Control-Allow-Headers" : "DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Authorization, x-ms-client-request-id, x-ms-content-sha256, x-ms-date, host, Accept, Accept-Datetime, Date, If-Match, If-None-Match, Sync-Token, x-ms-return-client-request-id, ETag, Last-Modified, Link, Memento-Datetime, x-ms-retry-after, x-ms-request-id, WWW-Authenticate",
"x-ms-correlation-request-id" : "a4948a48-4ed5-43b0-9e58-d18c11f789a1",
"Date" : "Fri, 13 Dec 2019 00:51:09 GMT",
"Access-Control-Allow-Headers" : "DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Authorization, x-ms-client-request-id, x-ms-command-name, x-ms-content-sha256, x-ms-date, host, Accept, Accept-Datetime, Date, If-Match, If-None-Match, Sync-Token, x-ms-return-client-request-id, ETag, Last-Modified, Link, Memento-Datetime, x-ms-retry-after, x-ms-request-id, WWW-Authenticate",
"x-ms-correlation-request-id" : "f1cf469e-2629-4340-8875-1ded02e28b5b",
"Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
"Access-Control-Expose-Headers" : "DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Authorization, x-ms-client-request-id, x-ms-content-sha256, x-ms-date, host, Accept, Accept-Datetime, Date, If-Match, If-None-Match, Sync-Token, x-ms-return-client-request-id, ETag, Last-Modified, Link, Memento-Datetime, x-ms-retry-after, x-ms-request-id, WWW-Authenticate",
"Access-Control-Expose-Headers" : "DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Authorization, x-ms-client-request-id, x-ms-command-name, x-ms-content-sha256, x-ms-date, host, Accept, Accept-Datetime, Date, If-Match, If-None-Match, Sync-Token, x-ms-return-client-request-id, ETag, Last-Modified, Link, Memento-Datetime, x-ms-retry-after, x-ms-request-id, WWW-Authenticate",
"Access-Control-Allow-Credentials" : "true",
"Content-Length" : "0",
"x-ms-request-id" : "a4948a48-4ed5-43b0-9e58-d18c11f789a1",
"x-ms-client-request-id" : "e7d5c05f-13dd-4ac6-a24e-0176a647a5dc"
"x-ms-request-id" : "f1cf469e-2629-4340-8875-1ded02e28b5b",
"x-ms-client-request-id" : "982ec8b1-95d6-4933-9850-5916b240dc2e"
},
"Exception" : null
}, {
"Method" : "GET",
"Uri" : "https://appconfigtestshawnfang.azconfig.io/kv?key=key29674%2a&api-version=1.0",
"Uri" : "https://appconfigtestshawnfang.azconfig.io/kv?key=key52896%2a&api-version=1.0",
"Headers" : {
"User-Agent" : "azsdk-java-UnknownName/UnknownVersion (11.0.4; Windows 10 10.0)",
"x-ms-client-request-id" : "d0909815-8541-42cc-996c-0c70862da3b6",
"User-Agent" : "azsdk-java-azure-data-appconfiguration/1.0.0-beta.8 (11.0.4; Windows 10 10.0)",
"x-ms-client-request-id" : "22cfa1cc-3ca0-4f55-ba01-b2bbfad2ab00",
"Content-Type" : "application/json"
},
"Response" : {
Expand All @@ -41,18 +41,18 @@
"Connection" : "keep-alive",
"retry-after" : "0",
"StatusCode" : "200",
"Date" : "Sun, 24 Nov 2019 16:06:08 GMT",
"Access-Control-Allow-Headers" : "DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Authorization, x-ms-client-request-id, x-ms-content-sha256, x-ms-date, host, Accept, Accept-Datetime, Date, If-Match, If-None-Match, Sync-Token, x-ms-return-client-request-id, ETag, Last-Modified, Link, Memento-Datetime, x-ms-retry-after, x-ms-request-id, WWW-Authenticate",
"x-ms-correlation-request-id" : "d8ecd469-c1d9-4dc6-ac11-8919744c1a20",
"Date" : "Fri, 13 Dec 2019 00:51:09 GMT",
"Access-Control-Allow-Headers" : "DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Authorization, x-ms-client-request-id, x-ms-command-name, x-ms-content-sha256, x-ms-date, host, Accept, Accept-Datetime, Date, If-Match, If-None-Match, Sync-Token, x-ms-return-client-request-id, ETag, Last-Modified, Link, Memento-Datetime, x-ms-retry-after, x-ms-request-id, WWW-Authenticate",
"x-ms-correlation-request-id" : "0b61c2ca-c33b-4b72-82c7-ce1886cb42b1",
"Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
"Access-Control-Expose-Headers" : "DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Authorization, x-ms-client-request-id, x-ms-content-sha256, x-ms-date, host, Accept, Accept-Datetime, Date, If-Match, If-None-Match, Sync-Token, x-ms-return-client-request-id, ETag, Last-Modified, Link, Memento-Datetime, x-ms-retry-after, x-ms-request-id, WWW-Authenticate",
"Access-Control-Expose-Headers" : "DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Authorization, x-ms-client-request-id, x-ms-command-name, x-ms-content-sha256, x-ms-date, host, Accept, Accept-Datetime, Date, If-Match, If-None-Match, Sync-Token, x-ms-return-client-request-id, ETag, Last-Modified, Link, Memento-Datetime, x-ms-retry-after, x-ms-request-id, WWW-Authenticate",
"Access-Control-Allow-Credentials" : "true",
"x-ms-request-id" : "d8ecd469-c1d9-4dc6-ac11-8919744c1a20",
"x-ms-request-id" : "0b61c2ca-c33b-4b72-82c7-ce1886cb42b1",
"Body" : "{\"items\":[]}",
"x-ms-client-request-id" : "d0909815-8541-42cc-996c-0c70862da3b6",
"x-ms-client-request-id" : "22cfa1cc-3ca0-4f55-ba01-b2bbfad2ab00",
"Content-Type" : "application/vnd.microsoft.appconfig.kvset+json; charset=utf-8"
},
"Exception" : null
} ],
"variables" : [ "key29674", "b4274fd0" ]
"variables" : [ "key52896", "c58bd729" ]
}
Loading

0 comments on commit bf2c9ea

Please sign in to comment.