Move BranchDeserializer to its own file

Author: chondent

src/main/java/com/spotify/github/v3/repos/Branch.java

@@ -21,20 +21,11 @@
 package com.spotify.github.v3.repos;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.spotify.github.GithubStyle;
-import com.spotify.github.v3.git.ImmutableShaLink;
 import com.spotify.github.v3.git.ShaLink;
-import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import javax.annotation.Nullable;
 import org.immutables.value.Value;
@@ -62,45 +53,3 @@ public interface Branch {
   Optional<URI> protectionUrl();
 }
 
-class BranchDeserializer extends JsonDeserializer<ImmutableBranch> {
-
-  private URI fixInvalidGithubUrl(final String invalidUrl) throws IOException {
-    // There's a bug in github where it gives you back non-url-encoded characters
-    // in the protection_url field. For example if your branch has a single "%" in its name.
-    // As of this writing, the protection URL looks something like this
-    // https://github-server.tld/api/v3/repos/owner/repo-name/branches/branch-name/protection
-    final String[] schemaAndPath = invalidUrl.split("//");
-    String[] pathParts = schemaAndPath[1].split("/");
-    for (int i = 0; i < pathParts.length; i++) {
-      pathParts[i] = URLEncoder.encode(pathParts[i], StandardCharsets.UTF_8);
-    }
-    String fixedUrlString = schemaAndPath[0] + "//" + String.join("/", pathParts);
-    return URI.create(fixedUrlString);
-  }
-
-  @Override
-  public ImmutableBranch deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext)
-      throws IOException {
-    JsonNode node = jsonParser.getCodec().readTree(jsonParser);
-    URI protectionUrl;
-    var immutableBranchBuilder = ImmutableBranch.builder();
-    if (node.has("protected")) {
-      immutableBranchBuilder.isProtected(node.get("protected").asBoolean());
-      String protectionUrlString = node.get("protection_url").asText();
-      try {
-        protectionUrl = new URI(protectionUrlString);
-      } catch (URISyntaxException e) {
-        protectionUrl = fixInvalidGithubUrl(protectionUrlString);
-      }
-      immutableBranchBuilder.protectionUrl(protectionUrl);
-    }
-    ImmutableShaLink shaLink = ImmutableShaLink.builder()
-        .sha(node.get("commit").get("sha").asText())
-        .url(URI.create(node.at("/commit/url").asText()))
-        .build();
-    return immutableBranchBuilder
-        .name(node.get("name").textValue())
-        .commit(shaLink)
-        .build();
-  }
-}

src/main/java/com/spotify/github/v3/repos/BranchDeserializer.java

@@ -0,0 +1,76 @@
+/*-
+ * -\-\-
+ * github-api
+ * --
+ * Copyright (C) 2016 - 2020 Spotify AB
+ * --
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * -/-/-
+ */
+
+package com.spotify.github.v3.repos;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.spotify.github.v3.git.ImmutableShaLink;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+public class BranchDeserializer extends JsonDeserializer<ImmutableBranch> {
+
+  private URI fixInvalidGithubUrl(final String invalidUrl) throws IOException {
+    // There's a bug in github where it gives you back non-url-encoded characters
+    // in the protection_url field. For example if your branch has a single "%" in its name.
+    // As of this writing, the protection URL looks something like this
+    // https://github-server.tld/api/v3/repos/owner/repo-name/branches/branch-name/protection
+    final String[] schemaAndPath = invalidUrl.split("//");
+    String[] pathParts = schemaAndPath[1].split("/");
+    for (int i = 0; i < pathParts.length; i++) {
+      pathParts[i] = URLEncoder.encode(pathParts[i], StandardCharsets.UTF_8);
+    }
+    String fixedUrlString = schemaAndPath[0] + "//" + String.join("/", pathParts);
+    return URI.create(fixedUrlString);
+  }
+
+  @Override
+  public ImmutableBranch deserialize(final JsonParser jsonParser,
+      final DeserializationContext deserializationContext)
+      throws IOException {
+    JsonNode node = jsonParser.getCodec().readTree(jsonParser);
+    URI protectionUrl;
+    var immutableBranchBuilder = ImmutableBranch.builder();
+    if (node.has("protected")) {
+      immutableBranchBuilder.isProtected(node.get("protected").asBoolean());
+      String protectionUrlString = node.get("protection_url").asText();
+      try {
+        protectionUrl = new URI(protectionUrlString);
+      } catch (URISyntaxException e) {
+        protectionUrl = fixInvalidGithubUrl(protectionUrlString);
+      }
+      immutableBranchBuilder.protectionUrl(protectionUrl);
+    }
+    ImmutableShaLink shaLink = ImmutableShaLink.builder()
+        .sha(node.get("commit").get("sha").asText())
+        .url(URI.create(node.at("/commit/url").asText()))
+        .build();
+    return immutableBranchBuilder
+        .name(node.get("name").textValue())
+        .commit(shaLink)
+        .build();
+  }
+}