Use the deprecated MimeType.getCharSet() to maintain Grails 3.1.x com…

…patibility. (#120)
budjb · Sep 29, 2017 · a949843 · a949843
1 parent 6c414fd
commit a949843
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ gormVersion=6.0.12.RELEASE
 
 org.gradle.daemon=true
 
-version=3.4.0
+version=3.4.1
 group=org.grails.plugins
 
 sourceCompatibility=1.8

diff --git a/rabbitmq-native-documentation/src/docs/changelog.adoc b/rabbitmq-native-documentation/src/docs/changelog.adoc
@@ -2,6 +2,10 @@
 
 === 3.4.x
 
+==== Version 3.4.1
+* Change from using Spring's `MimeType.getCharset()` to `MimeType.getCharSet()`. The latter is deprecated but
+  using it allows Grails 3.1.x to function correctly.
+
 ==== Version 3.4.0
 * Remove support for legacy connection configuration (`rabbitmq.connection`).
 * Update RabbitMQ Client library to 4.2.0.

diff --git a/rabbitmq-native/src/main/groovy/com/budjb/rabbitmq/converter/ByteToObjectInput.groovy b/rabbitmq-native/src/main/groovy/com/budjb/rabbitmq/converter/ByteToObjectInput.groovy
@@ -113,6 +113,6 @@ class ByteToObjectInput {
      * @return
      */
     Charset getCharset() {
-        return mimeType?.getCharset() ?: UTF_8
+        return mimeType?.getCharSet() ?: UTF_8
     }
 }
diff --git a/rabbitmq-native/src/main/groovy/com/budjb/rabbitmq/converter/ObjectToByteInput.groovy b/rabbitmq-native/src/main/groovy/com/budjb/rabbitmq/converter/ObjectToByteInput.groovy
@@ -79,6 +79,6 @@ class ObjectToByteInput {
      * @param contentType
      */
     ObjectToByteInput(Object object, MimeType contentType) {
-        this(object, contentType?.getCharset() ?: UTF_8)
+        this(object, contentType?.getCharSet() ?: UTF_8)
     }
 }