#1747 issue number is long

jcabi · Jun 5, 2024 · c6a1b75 · c6a1b75
1 parent 13236a3
commit c6a1b75
Show file tree

Hide file tree

Showing 25 changed files with 206 additions and 54 deletions.
diff --git a/.rultor.yml b/.rultor.yml
@@ -1,5 +1,5 @@
 docker:
-  image: yegor256/rultor-image:1.13.0
+  image: yegor256/rultor-image:1.23.1
 assets:
   settings.xml: yegor256/home#assets/jcabi/settings.xml
   secring.gpg: yegor256/home#assets/secring.gpg

diff --git a/src/main/java/com/jcabi/github/Comment.java b/src/main/java/com/jcabi/github/Comment.java
@@ -32,6 +32,8 @@
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.text.ParseException;
 import java.util.Collection;
@@ -79,7 +81,7 @@ public interface Comment
      * Number.
      * @return Comment number
      */
-    int number();
+    long number();
 
     /**
      * Delete the comment.
@@ -161,7 +163,11 @@ public void body(final String text) throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL url() throws IOException {
-            return new URL(this.jsn.text("url"));
+            try {
+                return new URI(this.jsn.text("url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
         /**
          * When this comment was created.
@@ -196,7 +202,7 @@ public Issue issue() {
             return this.comment.issue();
         }
         @Override
-        public int number() {
+        public long number() {
             return this.comment.number();
         }
         @Override

diff --git a/src/main/java/com/jcabi/github/Commit.java b/src/main/java/com/jcabi/github/Commit.java
@@ -32,6 +32,8 @@
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import javax.json.JsonObject;
 import lombok.EqualsAndHashCode;
@@ -106,7 +108,11 @@ public String message() throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL url() throws IOException {
-            return new URL(this.jsn.text("url"));
+            try {
+                return new URI(this.jsn.text("url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
         @Override
         public Repo repo() {

diff --git a/src/main/java/com/jcabi/github/Content.java b/src/main/java/com/jcabi/github/Content.java
@@ -33,6 +33,8 @@
 import com.jcabi.aspects.Loggable;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import javax.json.JsonObject;
 import javax.xml.bind.DatatypeConverter;
@@ -134,23 +136,35 @@ public String sha() throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL url() throws IOException {
-            return new URL(this.jsn.text("url"));
+            try {
+                return new URI(this.jsn.text("url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
         /**
          * Get its HTML URL.
          * @return URL of content
          * @throws IOException If there is any I/O problem
          */
         public URL htmlUrl() throws IOException {
-            return new URL(this.jsn.text("html_url"));
+            try {
+                return new URI(this.jsn.text("html_url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
         /**
          * Get its GIT URL.
          * @return URL of content
          * @throws IOException If there is any I/O problem
          */
         public URL gitUrl() throws IOException {
-            return new URL(this.jsn.text("git_url"));
+            try {
+                return new URI(this.jsn.text("git_url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
         /**
          * Get its encoded content.

diff --git a/src/main/java/com/jcabi/github/DeployKey.java b/src/main/java/com/jcabi/github/DeployKey.java
@@ -32,6 +32,8 @@
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import javax.json.Json;
 import javax.json.JsonObject;
@@ -118,7 +120,11 @@ public void key(final String value) throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL url() throws IOException {
-            return new URL(this.jsn.text("url"));
+            try {
+                return new URI(this.jsn.text("url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
 
         /**

diff --git a/src/main/java/com/jcabi/github/Event.java b/src/main/java/com/jcabi/github/Event.java
@@ -33,6 +33,8 @@
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.text.ParseException;
 import java.util.Date;
@@ -223,7 +225,11 @@ public String type() throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL url() throws IOException {
-            return new URL(this.jsn.text("url"));
+            try {
+                return new URI(this.jsn.text("url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
         /**
          * When this issue was created.

diff --git a/src/main/java/com/jcabi/github/Fork.java b/src/main/java/com/jcabi/github/Fork.java
@@ -32,6 +32,8 @@
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import javax.json.JsonObject;
 import lombok.EqualsAndHashCode;
@@ -103,7 +105,11 @@ public String organization() throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL url() throws IOException {
-            return new URL(this.jsn.text("url"));
+            try {
+                return new URI(this.jsn.text("url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
 
         /**
@@ -130,7 +136,11 @@ public String description() throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL htmlUrl() throws IOException {
-            return new URL(this.jsn.text("html_url"));
+            try {
+                return new URI(this.jsn.text("html_url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
 
         /**
@@ -139,7 +149,11 @@ public URL htmlUrl() throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL cloneUrl() throws IOException {
-            return new URL(this.jsn.text("clone_url"));
+            try {
+                return new URI(this.jsn.text("clone_url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
 
         /**
@@ -166,7 +180,11 @@ public String sshUrl() throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL svnUrl() throws IOException {
-            return new URL(this.jsn.text("svn_url"));
+            try {
+                return new URI(this.jsn.text("svn_url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
 
         /**
@@ -184,7 +202,11 @@ public String mirrorUrl() throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL homeUrl() throws IOException {
-            return new URL(this.jsn.text("homepage"));
+            try {
+                return new URI(this.jsn.text("homepage")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
 
         /**

diff --git a/src/main/java/com/jcabi/github/GistComment.java b/src/main/java/com/jcabi/github/GistComment.java
@@ -32,6 +32,8 @@
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.text.ParseException;
 import java.util.Date;
@@ -149,7 +151,11 @@ public void body(final String text) throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL url() throws IOException {
-            return new URL(this.jsn.text("url"));
+            try {
+                return new URI(this.jsn.text("url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
 
         /**

diff --git a/src/main/java/com/jcabi/github/Issue.java b/src/main/java/com/jcabi/github/Issue.java
@@ -32,6 +32,8 @@
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -320,15 +322,23 @@ public void assign(final String login) throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL url() throws IOException {
-            return new URL(this.jsn.text("url"));
+            try {
+                return new URI(this.jsn.text("url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
         /**
          * Get its HTML URL.
          * @return URL of issue
          * @throws IOException If there is any I/O problem
          */
         public URL htmlUrl() throws IOException {
-            return new URL(this.jsn.text("html_url"));
+            try {
+                return new URI(this.jsn.text("html_url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
         /**
          * When this issue was created.

diff --git a/src/main/java/com/jcabi/github/Milestone.java b/src/main/java/com/jcabi/github/Milestone.java
@@ -32,6 +32,8 @@
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.text.ParseException;
 import java.util.Date;
@@ -245,7 +247,11 @@ public void description(
          * @throws IOException If there is any I/O problem
          */
         public URL url() throws IOException {
-            return new URL(this.jsn.text("url"));
+            try {
+                return new URI(this.jsn.text("url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
 
         /**

diff --git a/src/main/java/com/jcabi/github/Organization.java b/src/main/java/com/jcabi/github/Organization.java
@@ -32,6 +32,8 @@
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.text.ParseException;
 import java.util.Date;
@@ -245,7 +247,11 @@ public String blog() throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL url() throws IOException {
-            return new URL(this.jsn.text("url"));
+            try {
+                return new URI(this.jsn.text("url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
 
         /**
@@ -254,7 +260,11 @@ public URL url() throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL htmlUrl() throws IOException {
-            return new URL(this.jsn.text("html_url"));
+            try {
+                return new URI(this.jsn.text("html_url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
 
         /**
@@ -263,7 +273,11 @@ public URL htmlUrl() throws IOException {
          * @throws IOException If there is any I/O problem
          */
         public URL avatarUrl() throws IOException {
-            return new URL(this.jsn.text("avatar_url"));
+            try {
+                return new URI(this.jsn.text("avatar_url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
 
         /**

diff --git a/src/main/java/com/jcabi/github/PublicKey.java b/src/main/java/com/jcabi/github/PublicKey.java
@@ -32,6 +32,8 @@
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import javax.json.Json;
 import javax.json.JsonObject;
@@ -132,7 +134,11 @@ public void key(
          * @throws IOException If there is any I/O problem
          */
         public URL url() throws IOException {
-            return new URL(this.jsn.text("url"));
+            try {
+                return new URI(this.jsn.text("url")).toURL();
+            } catch (final URISyntaxException ex) {
+                throw new IllegalArgumentException(ex);
+            }
         }
 
         /**