fixes #1236

niravassar · niravassar · commit 0bbdd59ca374 · 2019-04-01T12:23:12.000-05:00
diff --git a/grails-datastore-rest-client/src/main/groovy/org/grails/datastore/gorm/rest/client/json/GsonHttpMessageConverter.groovy b/grails-datastore-rest-client/src/main/groovy/org/grails/datastore/gorm/rest/client/json/GsonHttpMessageConverter.groovy
@@ -71,7 +71,7 @@ class GsonHttpMessageConverter extends AbstractHttpMessageConverter<JsonElement>
     }
 
     protected Charset getCharSetForMediaType(MediaType contentType) {
-        contentType ? (contentType.charSet ? contentType.charSet : Charset.forName("UTF-8")) : Charset.forName("UTF-8")
+        contentType ? (contentType.charset ? contentType.charset : Charset.forName("UTF-8")) : Charset.forName("UTF-8")
     }
 
 }
diff --git a/grails-datastore-rest-client/src/main/groovy/org/grails/datastore/gorm/rest/client/json/JsonHttpMessageConverter.groovy b/grails-datastore-rest-client/src/main/groovy/org/grails/datastore/gorm/rest/client/json/JsonHttpMessageConverter.groovy
@@ -61,7 +61,7 @@ class JsonHttpMessageConverter extends AbstractHttpMessageConverter<JSONElement>
     }
 
     protected Charset getCharSetForMediaType(MediaType contentType) {
-        contentType ? (contentType.charSet ? contentType.charSet : Charset.forName("UTF-8")) : Charset.forName("UTF-8")
+        contentType ? (contentType.charset ? contentType.charset : Charset.forName("UTF-8")) : Charset.forName("UTF-8")
     }
 
     @Override
diff --git a/grails-datastore-rest-client/src/main/groovy/org/grails/datastore/gorm/rest/client/utils/GrailsConverterHttpMessageConverter.groovy b/grails-datastore-rest-client/src/main/groovy/org/grails/datastore/gorm/rest/client/utils/GrailsConverterHttpMessageConverter.groovy
@@ -59,6 +59,6 @@ class GrailsConverterHttpMessageConverter extends AbstractHttpMessageConverter<C
     }
 
     protected Charset getCharSetForMediaType(MediaType contentType) {
-        contentType ? (contentType.charSet ? contentType.charSet : Charset.forName("UTF-8")) : Charset.forName("UTF-8")
+        contentType ? (contentType.charset ? contentType.charset : Charset.forName("UTF-8")) : Charset.forName("UTF-8")
     }
 }
diff --git a/grails-datastore-rest-client/src/main/groovy/org/grails/datastore/gorm/rest/client/utils/NullSafeStringHttpMessageConverter.groovy b/grails-datastore-rest-client/src/main/groovy/org/grails/datastore/gorm/rest/client/utils/NullSafeStringHttpMessageConverter.groovy
@@ -42,7 +42,7 @@ class NullSafeStringHttpMessageConverter extends StringHttpMessageConverter {
     }
 
     protected Charset getCharSetForMediaType(MediaType contentType) {
-        contentType ? (contentType.charSet ? contentType.charSet : Charset.forName("UTF-8")) : Charset.forName("UTF-8")
+        contentType ? (contentType.charset ? contentType.charset : Charset.forName("UTF-8")) : Charset.forName("UTF-8")
     }
 
 }
diff --git a/grails-datastore-rest-client/src/main/groovy/org/grails/datastore/gorm/rest/client/utils/WritableHttpMessageConverter.groovy b/grails-datastore-rest-client/src/main/groovy/org/grails/datastore/gorm/rest/client/utils/WritableHttpMessageConverter.groovy
@@ -58,7 +58,7 @@ class WritableHttpMessageConverter extends AbstractHttpMessageConverter<Writable
     }
 
     protected Charset getCharSetForMediaType(MediaType contentType) {
-        contentType ? (contentType.charSet ? contentType.charSet : Charset.forName("UTF-8")) : Charset.forName("UTF-8")
+        contentType ? (contentType.charset ? contentType.charset : Charset.forName("UTF-8")) : Charset.forName("UTF-8")
     }
 
 }
diff --git a/grails-datastore-rest-client/src/main/groovy/org/grails/datastore/gorm/rest/client/xml/GPathXmlHttpMessageConverter.groovy b/grails-datastore-rest-client/src/main/groovy/org/grails/datastore/gorm/rest/client/xml/GPathXmlHttpMessageConverter.groovy
@@ -66,6 +66,6 @@ class GPathXmlHttpMessageConverter extends AbstractHttpMessageConverter<groovy.u
     }
 
     protected Charset getCharSetForMediaType(MediaType contentType) {
-        contentType ? (contentType.charSet ? contentType.charSet : Charset.forName("UTF-8")) : Charset.forName("UTF-8")
+        contentType ? (contentType.charset ? contentType.charset : Charset.forName("UTF-8")) : Charset.forName("UTF-8")
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ class GsonHttpMessageConverter extends AbstractHttpMessageConverter<JsonElement>`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`protected Charset getCharSetForMediaType(MediaType contentType) {`
`74`		`- contentType ? (contentType.charSet ? contentType.charSet : Charset.forName("UTF-8")) : Charset.forName("UTF-8")`
	`74`	`+ contentType ? (contentType.charset ? contentType.charset : Charset.forName("UTF-8")) : Charset.forName("UTF-8")`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class JsonHttpMessageConverter extends AbstractHttpMessageConverter<JSONElement>`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`protected Charset getCharSetForMediaType(MediaType contentType) {`
`64`		`- contentType ? (contentType.charSet ? contentType.charSet : Charset.forName("UTF-8")) : Charset.forName("UTF-8")`
	`64`	`+ contentType ? (contentType.charset ? contentType.charset : Charset.forName("UTF-8")) : Charset.forName("UTF-8")`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,6 @@ class GrailsConverterHttpMessageConverter extends AbstractHttpMessageConverter<C`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`protected Charset getCharSetForMediaType(MediaType contentType) {`
`62`		`- contentType ? (contentType.charSet ? contentType.charSet : Charset.forName("UTF-8")) : Charset.forName("UTF-8")`
	`62`	`+ contentType ? (contentType.charset ? contentType.charset : Charset.forName("UTF-8")) : Charset.forName("UTF-8")`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class NullSafeStringHttpMessageConverter extends StringHttpMessageConverter {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`protected Charset getCharSetForMediaType(MediaType contentType) {`
`45`		`- contentType ? (contentType.charSet ? contentType.charSet : Charset.forName("UTF-8")) : Charset.forName("UTF-8")`
	`45`	`+ contentType ? (contentType.charset ? contentType.charset : Charset.forName("UTF-8")) : Charset.forName("UTF-8")`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class WritableHttpMessageConverter extends AbstractHttpMessageConverter<Writable`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`protected Charset getCharSetForMediaType(MediaType contentType) {`
`61`		`- contentType ? (contentType.charSet ? contentType.charSet : Charset.forName("UTF-8")) : Charset.forName("UTF-8")`
	`61`	`+ contentType ? (contentType.charset ? contentType.charset : Charset.forName("UTF-8")) : Charset.forName("UTF-8")`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,6 @@ class GPathXmlHttpMessageConverter extends AbstractHttpMessageConverter<groovy.u`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`protected Charset getCharSetForMediaType(MediaType contentType) {`
`69`		`- contentType ? (contentType.charSet ? contentType.charSet : Charset.forName("UTF-8")) : Charset.forName("UTF-8")`
	`69`	`+ contentType ? (contentType.charset ? contentType.charset : Charset.forName("UTF-8")) : Charset.forName("UTF-8")`
`70`	`70`	`}`
`71`	`71`	`}`