From ddc27e818b28b04b50d892c6683d111fbdc71056 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Wed, 29 Aug 2018 20:09:11 -0700
Subject: [PATCH] Let's not yet expose this new class because it's not final

---
 .../org/kohsuke/github/GHBranchProtection.java | 10 +++++-----
 .../kohsuke/github/GHBranchProtectionTest.java | 18 ++++++------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/kohsuke/github/GHBranchProtection.java b/src/main/java/org/kohsuke/github/GHBranchProtection.java
index a73d5ae2c..423576fc1 100644
--- a/src/main/java/org/kohsuke/github/GHBranchProtection.java
+++ b/src/main/java/org/kohsuke/github/GHBranchProtection.java
@@ -31,8 +31,8 @@ public class GHBranchProtection {
 	private String url;
 	
 	@Preview @Deprecated
-    public RequiredSignatures enabledSignedCommits() throws IOException {
-        return requester().method("POST")
+    public void enabledSignedCommits() throws IOException {
+        requester().method("POST")
                 .to(url + REQUIRE_SIGNATURES_URI, RequiredSignatures.class);
     }
 
@@ -51,9 +51,9 @@ public class GHBranchProtection {
     }
 
     @Preview @Deprecated
-    public RequiredSignatures getRequiredSignatures() throws IOException {
+    public boolean getRequiredSignatures() throws IOException {
         return requester().method("GET")
-                .to(url + REQUIRE_SIGNATURES_URI, RequiredSignatures.class);
+                .to(url + REQUIRE_SIGNATURES_URI, RequiredSignatures.class).enabled;
     }
 
     public RequiredStatusChecks getRequiredStatusChecks() {
@@ -131,7 +131,7 @@ public class GHBranchProtection {
         }
 	}
 
-	public static class RequiredSignatures {
+	private static class RequiredSignatures {
 	    @JsonProperty
         private boolean enabled;
 
diff --git a/src/test/java/org/kohsuke/github/GHBranchProtectionTest.java b/src/test/java/org/kohsuke/github/GHBranchProtectionTest.java
index a6b711b6c..19e42c51b 100644
--- a/src/test/java/org/kohsuke/github/GHBranchProtectionTest.java
+++ b/src/test/java/org/kohsuke/github/GHBranchProtectionTest.java
@@ -4,7 +4,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.kohsuke.github.GHBranchProtection.EnforceAdmins;
 import org.kohsuke.github.GHBranchProtection.RequiredReviews;
-import org.kohsuke.github.GHBranchProtection.RequiredSignatures;
 import org.kohsuke.github.GHBranchProtection.RequiredStatusChecks;
 
 import java.io.FileNotFoundException;
@@ -34,11 +33,11 @@ public class GHBranchProtectionTest extends AbstractGitHubApiTestBase {
 
         if (branch.isProtected()) {
             GHBranchProtection protection = branch.getProtection();
-            if (protection.getRequiredSignatures().isEnabled()) {
+            if (protection.getRequiredSignatures()) {
                 protection.disableSignedCommits();
             }
 
-            assertFalse(protection.getRequiredSignatures().isEnabled());
+            assertFalse(protection.getRequiredSignatures());
             branch.disableProtection();
         }
 
@@ -93,17 +92,12 @@ public class GHBranchProtectionTest extends AbstractGitHubApiTestBase {
     public void testSignedCommits() throws Exception {
         GHBranchProtection protection = branch.enableProtection().enable();
 
-        RequiredSignatures signatures = protection.getRequiredSignatures();
-        assertNotNull(signatures);
-        assertFalse(signatures.isEnabled());
+        assertFalse(protection.getRequiredSignatures());
 
-        signatures = protection.enabledSignedCommits();
-        assertNotNull(signatures);
-        assertTrue(signatures.isEnabled());
+        protection.enabledSignedCommits();
+        assertTrue(protection.getRequiredSignatures());
 
         protection.disableSignedCommits();
-        signatures = protection.getRequiredSignatures();
-        assertNotNull(signatures);
-        assertFalse(signatures.isEnabled());
+        assertFalse(protection.getRequiredSignatures());
     }
 }