From 3ee3c150edcfd39b8e72b49e33b2028938e27d0e Mon Sep 17 00:00:00 2001
From: Degubi <gergonoorbi@gmail.com>
Date: Sun, 31 Mar 2019 21:28:12 +0200
Subject: [PATCH 1/2] Remove boolean wrappers in JsonElement

---
 .../src/main/java/com/google/gson/JsonElement.java | 13 -------------
 .../main/java/com/google/gson/JsonPrimitive.java   | 14 ++------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/gson/src/main/java/com/google/gson/JsonElement.java b/gson/src/main/java/com/google/gson/JsonElement.java
index 315ff82e..2ab1a160 100644
--- a/gson/src/main/java/com/google/gson/JsonElement.java
+++ b/gson/src/main/java/com/google/gson/JsonElement.java
@@ -153,19 +153,6 @@ public abstract class JsonElement {
     throw new UnsupportedOperationException(getClass().getSimpleName());
   }
 
-  /**
-   * convenience method to get this element as a {@link Boolean} value.
-   *
-   * @return get this element as a {@link Boolean} value.
-   * @throws ClassCastException if the element is of not a {@link JsonPrimitive} and is not a valid
-   * boolean value.
-   * @throws IllegalStateException if the element is of the type {@link JsonArray} but contains
-   * more than a single element.
-   */
-  Boolean getAsBooleanWrapper() {
-    throw new UnsupportedOperationException(getClass().getSimpleName());
-  }
-
   /**
    * convenience method to get this element as a {@link Number}.
    *
diff --git a/gson/src/main/java/com/google/gson/JsonPrimitive.java b/gson/src/main/java/com/google/gson/JsonPrimitive.java
index d4640293..ec852707 100644
--- a/gson/src/main/java/com/google/gson/JsonPrimitive.java
+++ b/gson/src/main/java/com/google/gson/JsonPrimitive.java
@@ -91,16 +91,6 @@ public final class JsonPrimitive extends JsonElement {
     return value instanceof Boolean;
   }
 
-  /**
-   * convenience method to get this element as a {@link Boolean}.
-   *
-   * @return get this element as a {@link Boolean}.
-   */
-  @Override
-  Boolean getAsBooleanWrapper() {
-    return (Boolean) value;
-  }
-
   /**
    * convenience method to get this element as a boolean value.
    *
@@ -109,7 +99,7 @@ public final class JsonPrimitive extends JsonElement {
   @Override
   public boolean getAsBoolean() {
     if (isBoolean()) {
-      return getAsBooleanWrapper().booleanValue();
+      return ((Boolean) value).booleanValue();
     } else {
       // Check to see if the value as a String is "true" in any case.
       return Boolean.parseBoolean(getAsString());
@@ -155,7 +145,7 @@ public final class JsonPrimitive extends JsonElement {
     if (isNumber()) {
       return getAsNumber().toString();
     } else if (isBoolean()) {
-      return getAsBooleanWrapper().toString();
+      return ((Boolean) value).toString();
     } else {
       return (String) value;
     }

From 46d0f58d1266c17a9fe6354344e9b1b7145fcb3d Mon Sep 17 00:00:00 2001
From: Degubi <gergonoorbi@gmail.com>
Date: Fri, 5 Apr 2019 16:20:06 +0200
Subject: [PATCH 2/2] Remove unnecessary explicit else statement

---
 gson/src/main/java/com/google/gson/JsonPrimitive.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gson/src/main/java/com/google/gson/JsonPrimitive.java b/gson/src/main/java/com/google/gson/JsonPrimitive.java
index ec852707..5e95d5a8 100644
--- a/gson/src/main/java/com/google/gson/JsonPrimitive.java
+++ b/gson/src/main/java/com/google/gson/JsonPrimitive.java
@@ -100,10 +100,9 @@ public final class JsonPrimitive extends JsonElement {
   public boolean getAsBoolean() {
     if (isBoolean()) {
       return ((Boolean) value).booleanValue();
-    } else {
-      // Check to see if the value as a String is "true" in any case.
-      return Boolean.parseBoolean(getAsString());
     }
+	// Check to see if the value as a String is "true" in any case.
+    return Boolean.parseBoolean(getAsString());
   }
 
   /**