jcabi-http instead of rexsl-test

jcabi · Jan 28, 2014 · b890c5d · b890c5d
1 parent 986a0d2
commit b890c5d
Show file tree

Hide file tree

Showing 47 changed files with 174 additions and 146 deletions.
diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,7 @@
         <version>1.0.1</version>
     </parent>
     <artifactId>jcabi-github</artifactId>
-    <version>0.7.1</version>
+    <version>0.7.2</version>
     <packaging>jar</packaging>
     <name>jcabi-github</name>
     <description>Object Oriented Github API</description>
@@ -73,6 +73,11 @@
             <groupId>com.jcabi</groupId>
             <artifactId>jcabi-xml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.jcabi</groupId>
+            <artifactId>jcabi-http</artifactId>
+            <version>1.0</version>
+        </dependency>
         <dependency>
             <groupId>com.jcabi.incubator</groupId>
             <artifactId>xembly</artifactId>
@@ -114,7 +119,8 @@
         <dependency>
             <groupId>com.rexsl</groupId>
             <artifactId>rexsl-test</artifactId>
-            <version>0.11</version>
+            <version>0.12</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>javax.json</groupId>
@@ -210,4 +216,26 @@
             </plugin>
         </plugins>
     </build>
-</project>
+    <profiles>
+        <profile>
+            <id>qulice</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.ning.maven.plugins</groupId>
+                        <artifactId>maven-duplicate-finder-plugin</artifactId>
+                        <configuration>
+                            <ignoredDependencies combine.children="append">
+                                <dependency>
+                                    <groupId>com.sun.xml.bind</groupId>
+                                    <artifactId>jaxb-core</artifactId>
+                                    <version>2.2.8-b01</version>
+                                </dependency>
+                            </ignoredDependencies>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/src/main/java/com/jcabi/github/Github.java b/src/main/java/com/jcabi/github/Github.java
@@ -30,7 +30,7 @@
 package com.jcabi.github;
 
 import com.jcabi.aspects.Immutable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -52,7 +52,7 @@
  * Issue issue = issues.post("issue title", "issue body");</pre>
  *
  * <p>It is strongly recommended to use
- * {@link com.rexsl.test.wire.RetryWire} to avoid
+ * {@link com.jcabi.http.wire.RetryWire} to avoid
  * accidental I/O exceptions:
  *
  * <pre> Github github = new RtGithub(

diff --git a/src/main/java/com/jcabi/github/RtComment.java b/src/main/java/com/jcabi/github/RtComment.java
@@ -31,8 +31,8 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.JsonObject;

diff --git a/src/main/java/com/jcabi/github/RtComments.java b/src/main/java/com/jcabi/github/RtComments.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.Json;

diff --git a/src/main/java/com/jcabi/github/RtCommit.java b/src/main/java/com/jcabi/github/RtCommit.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import lombok.EqualsAndHashCode;

diff --git a/src/main/java/com/jcabi/github/RtEvent.java b/src/main/java/com/jcabi/github/RtEvent.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import lombok.EqualsAndHashCode;

diff --git a/src/main/java/com/jcabi/github/RtGist.java b/src/main/java/com/jcabi/github/RtGist.java
@@ -31,10 +31,10 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.Response;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.Response;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URI;

diff --git a/src/main/java/com/jcabi/github/RtGists.java b/src/main/java/com/jcabi/github/RtGists.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.Json;

diff --git a/src/main/java/com/jcabi/github/RtGithub.java b/src/main/java/com/jcabi/github/RtGithub.java
@@ -31,10 +31,10 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
+import com.jcabi.http.Request;
+import com.jcabi.http.request.ApacheRequest;
+import com.jcabi.http.response.JsonResponse;
 import com.jcabi.manifests.Manifests;
-import com.rexsl.test.Request;
-import com.rexsl.test.request.ApacheRequest;
-import com.rexsl.test.response.JsonResponse;
 import java.io.IOException;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;
@@ -54,7 +54,7 @@
  * Issue issue = issues.post("issue title", "issue body");</pre>
  *
  * <p>It is strongly recommended to use
- * {@link com.rexsl.test.wire.RetryWire} to avoid
+ * {@link com.jcabi.http.wire.RetryWire} to avoid
  * accidental I/O exceptions:
  *
  * <pre> Github github = new RtGithub(

diff --git a/src/main/java/com/jcabi/github/RtIssue.java b/src/main/java/com/jcabi/github/RtIssue.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;

diff --git a/src/main/java/com/jcabi/github/RtIssueLabels.java b/src/main/java/com/jcabi/github/RtIssueLabels.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.Json;

diff --git a/src/main/java/com/jcabi/github/RtIssues.java b/src/main/java/com/jcabi/github/RtIssues.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.util.Map;

diff --git a/src/main/java/com/jcabi/github/RtJson.java b/src/main/java/com/jcabi/github/RtJson.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.net.HttpURLConnection;

diff --git a/src/main/java/com/jcabi/github/RtLabel.java b/src/main/java/com/jcabi/github/RtLabel.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;

diff --git a/src/main/java/com/jcabi/github/RtLabels.java b/src/main/java/com/jcabi/github/RtLabels.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.Json;

diff --git a/src/main/java/com/jcabi/github/RtLimit.java b/src/main/java/com/jcabi/github/RtLimit.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import lombok.EqualsAndHashCode;

diff --git a/src/main/java/com/jcabi/github/RtLimits.java b/src/main/java/com/jcabi/github/RtLimits.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import lombok.EqualsAndHashCode;
 
 /**

diff --git a/src/main/java/com/jcabi/github/RtMarkdown.java b/src/main/java/com/jcabi/github/RtMarkdown.java
@@ -31,8 +31,8 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.net.HttpURLConnection;

diff --git a/src/main/java/com/jcabi/github/RtMilestone.java b/src/main/java/com/jcabi/github/RtMilestone.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;

diff --git a/src/main/java/com/jcabi/github/RtMilestones.java b/src/main/java/com/jcabi/github/RtMilestones.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.util.Map;

diff --git a/src/main/java/com/jcabi/github/RtPagination.java b/src/main/java/com/jcabi/github/RtPagination.java
@@ -30,10 +30,10 @@
 package com.jcabi.github;
 
 import com.jcabi.aspects.Immutable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
-import com.rexsl.test.response.WebLinkingResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
+import com.jcabi.http.response.WebLinkingResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.util.Iterator;

diff --git a/src/main/java/com/jcabi/github/RtPull.java b/src/main/java/com/jcabi/github/RtPull.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.Json;

diff --git a/src/main/java/com/jcabi/github/RtPulls.java b/src/main/java/com/jcabi/github/RtPulls.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.Json;

diff --git a/src/main/java/com/jcabi/github/RtRepo.java b/src/main/java/com/jcabi/github/RtRepo.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;

diff --git a/src/main/java/com/jcabi/github/RtRepos.java b/src/main/java/com/jcabi/github/RtRepos.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;

diff --git a/src/main/java/com/jcabi/github/RtUser.java b/src/main/java/com/jcabi/github/RtUser.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;

diff --git a/src/main/java/com/jcabi/github/RtUsers.java b/src/main/java/com/jcabi/github/RtUsers.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;
 import lombok.EqualsAndHashCode;

diff --git a/src/main/java/com/jcabi/github/mock/MkGithub.java b/src/main/java/com/jcabi/github/mock/MkGithub.java
@@ -37,8 +37,8 @@
 import com.jcabi.github.Markdown;
 import com.jcabi.github.Repos;
 import com.jcabi.github.Users;
-import com.rexsl.test.Request;
-import com.rexsl.test.request.FakeRequest;
+import com.jcabi.http.Request;
+import com.jcabi.http.request.FakeRequest;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.Json;

diff --git a/src/test/java/com/jcabi/github/BulkTest.java b/src/test/java/com/jcabi/github/BulkTest.java
@@ -29,8 +29,8 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.Request;
-import com.rexsl.test.request.FakeRequest;
+import com.jcabi.http.Request;
+import com.jcabi.http.request.FakeRequest;
 import javax.json.JsonObject;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;

diff --git a/src/test/java/com/jcabi/github/RtCommentTest.java b/src/test/java/com/jcabi/github/RtCommentTest.java
@@ -30,7 +30,7 @@
 package com.jcabi.github;
 
 import com.jcabi.github.mock.MkGithub;
-import com.rexsl.test.request.FakeRequest;
+import com.jcabi.http.request.FakeRequest;
 import javax.json.Json;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;