diff --git a/.java-version b/.java-version new file mode 100644 index 0000000..6259340 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +1.8 diff --git a/README.md b/README.md index 7053837..081778f 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Get the artifact from [Maven](http://search.maven.org/#search|ga|1|g%3A%22com.pa     com.patreon     patreon -    0.4.2 +    0.4.3-SNAPSHOT ``` diff --git a/pom.xml b/pom.xml index ad4df3c..c9bb0c3 100644 --- a/pom.xml +++ b/pom.xml @@ -8,11 +8,11 @@ src/main/config - src/main/resources - - version.properties - - true + src/main/resources + + version.properties + + true @@ -78,7 +78,7 @@ and https://issues.apache.org/jira/browse/SUREFIRE-1588 --> com.patreon patreon - 0.4.2 + 0.4.3-SNAPSHOT ${project.groupId}:${project.artifactId} Interact with the Patreon API via OAuth @@ -113,14 +113,14 @@ and https://issues.apache.org/jira/browse/SUREFIRE-1588 --> - 1.7.3 + 2.0.2 com.github.jasminb jsonapi-converter - 0.8 + 0.11 org.json @@ -130,17 +130,17 @@ and https://issues.apache.org/jira/browse/SUREFIRE-1588 --> org.jsoup jsoup - 1.10.3 + 1.15.3 com.google.code.gson gson - 2.8.2 + 2.9.1 org.apache.httpcomponents httpclient - 4.2.3 + 4.5.13 org.slf4j @@ -161,7 +161,7 @@ and https://issues.apache.org/jira/browse/SUREFIRE-1588 --> org.powermock - powermock-api-mockito + powermock-api-mockito2 ${powermock.version} test @@ -235,16 +235,16 @@ and https://issues.apache.org/jira/browse/SUREFIRE-1588 --> - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.0 - - - - - + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0 + + + + + diff --git a/src/main/java/com/patreon/resources/RequestUtil.java b/src/main/java/com/patreon/resources/RequestUtil.java index cabb20e..773dac5 100644 --- a/src/main/java/com/patreon/resources/RequestUtil.java +++ b/src/main/java/com/patreon/resources/RequestUtil.java @@ -13,7 +13,7 @@ public class RequestUtil { public InputStream request(String pathSuffix, String accessToken) throws IOException { - String prefix = BASE_URI + "/api/oauth2/api/"; + String prefix = BASE_URI + "/api/oauth2/api"; URL url = new URL(prefix.concat(pathSuffix)); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setRequestProperty("Authorization", "Bearer ".concat(accessToken)); diff --git a/src/test/java/com/patreon/PatreonAPITest.java b/src/test/java/com/patreon/PatreonAPITest.java index 34876f6..ff42caa 100644 --- a/src/test/java/com/patreon/PatreonAPITest.java +++ b/src/test/java/com/patreon/PatreonAPITest.java @@ -89,7 +89,7 @@ public void testFetchUser() throws Exception { JSONAPIDocument user = api.fetchUser(); - verify(requestUtil).request(eq("current_user?include=pledges"), eq(MOCK_TOKEN)); + verify(requestUtil).request(eq("/current_user?include=pledges"), eq(MOCK_TOKEN)); assertEquals("https://www.patreon.com/api/user/32187", user.getLinks().getSelf().toString()); assertEquals(5, user.get().getPledges().size()); assertEquals("corgi", user.get().getVanity()); @@ -109,7 +109,7 @@ public void testFetchUserOptionalFields() throws Exception { verify(requestUtil).request(captor.capture(), eq(MOCK_TOKEN)); String arg = captor.getValue(); - assertTrue(arg.startsWith("current_user?")); + assertTrue("should start with '/current_user?'", arg.startsWith("/current_user?")); //Extract and decode the query params from the URL List parsed = URLEncodedUtils.parse(arg.substring(arg.indexOf('?') + 1), Charset.forName("UTF-8")); @@ -161,7 +161,7 @@ public void testFetchUserUnknownProperties() throws Exception { ); JSONAPIDocument user = api.fetchUser(); - verify(requestUtil).request(eq("current_user?include=pledges"), eq(MOCK_TOKEN)); + verify(requestUtil).request(eq("/current_user?include=pledges"), eq(MOCK_TOKEN)); assertEquals("https://www.patreon.com/api/user/32187", user.getLinks().getSelf().toString()); } }