try and handle ropey social urls

Author: dehora

intercom-java/src/main/java/io/intercom/api/SocialProfile.java

@@ -26,6 +26,7 @@ public class SocialProfile extends TypedData {
 
     @JsonProperty("url")
     @JsonDeserialize(using = URIDeserializer.class)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     private URI url;
 
     public SocialProfile() {

intercom-java/src/main/java/io/intercom/api/URIDeserializer.java

@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.node.ValueNode;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -22,11 +23,22 @@ public URIDeserializer() {
     public URI deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
         final ObjectMapper mapper = (ObjectMapper) jp.getCodec();
         final ValueNode vNode = mapper.readTree(jp);
+
+        URI uri = null;
         try {
-            final URL url = new URL(vNode.asText());
-            return new URI(url.getProtocol(), url.getHost(), url.getPath(), url.getQuery(), url.getRef());
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
+            uri = new URI(vNode.asText());
+        } catch (URISyntaxException ignored) {
+        }
+
+        if (uri == null) {
+            try {
+                final URL url = new URL(vNode.asText());
+                uri = new URI(url.getProtocol(), url.getHost(), url.getPath(), url.getQuery(), url.getRef());
+            } catch (MalformedURLException ignored) {
+            } catch (URISyntaxException ignored) {
+            }
         }
+
+        return uri;
     }
 }

intercom-java/src/test/java/io/intercom/api/SocialProfileTest.java

@@ -0,0 +1,39 @@
+package io.intercom.api;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static io.intercom.api.TestSupport.load;
+import static org.junit.Assert.assertTrue;
+
+public class SocialProfileTest {
+
+
+    private static ObjectMapper mapper;
+
+    @BeforeClass
+    public static void beforeClass() {
+        mapper = MapperSupport.objectMapper();
+    }
+
+    @Test
+    public void testURLMarshalling() throws Exception {
+        String json = load("social_profile_url_1.json");
+        SocialProfile socialProfile = mapper.readValue(json, SocialProfile.class);
+        assertTrue(socialProfile.getUrl() != null);
+
+        json = load("social_profile_url_2.json");
+        socialProfile = mapper.readValue(json, SocialProfile.class);
+        assertTrue(socialProfile.getUrl() != null);
+
+        json = load("social_profile_url_3.json");
+        socialProfile = mapper.readValue(json, SocialProfile.class);
+        assertTrue(socialProfile.getUrl() == null);
+
+        json = load("social_profile_url_4.json");
+        socialProfile = mapper.readValue(json, SocialProfile.class);
+        assertTrue(socialProfile.getUrl() != null);
+    }
+
+}

intercom-java/src/test/resources/social_profile_url_1.json

@@ -0,0 +1,6 @@
+{
+    "name": "Social",
+    "id": "1235d3213",
+    "username": "th1sland",
+    "url": "th1sland.example.com"
+}

intercom-java/src/test/resources/social_profile_url_2.json

@@ -0,0 +1,6 @@
+{
+    "name": "Social",
+    "id": "1235d3213",
+    "username": "th1sland",
+    "url": "./relative.html"
+}

intercom-java/src/test/resources/social_profile_url_3.json

@@ -0,0 +1,6 @@
+{
+    "name": "Social",
+    "id": "1235d3213",
+    "username": "th1sland",
+    "url": "./relative troll"
+}

intercom-java/src/test/resources/social_profile_url_4.json

@@ -0,0 +1,6 @@
+{
+    "name": "Social",
+    "id": "1235d3213",
+    "username": "th1sland",
+    "url": "http://example.net/absolute troll"
+}