-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ISSUE-37: Added CommitsApi with 'get' endpoint.
- Loading branch information
Showing
12 changed files
with
248 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
src/main/java/com/cdancy/bitbucket/rest/features/CommitsApi.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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.cdancy.bitbucket.rest.features; | ||
|
|
||
| import com.cdancy.bitbucket.rest.domain.commit.Commit; | ||
| import com.cdancy.bitbucket.rest.fallbacks.BitbucketFallbacks; | ||
| import com.cdancy.bitbucket.rest.filters.BitbucketAuthentication; | ||
| import org.jclouds.rest.annotations.Fallback; | ||
| import org.jclouds.rest.annotations.RequestFilters; | ||
|
|
||
| import javax.inject.Named; | ||
| import javax.ws.rs.Consumes; | ||
| import javax.ws.rs.GET; | ||
| import javax.ws.rs.Path; | ||
| import javax.ws.rs.PathParam; | ||
| import javax.ws.rs.Produces; | ||
| import javax.ws.rs.QueryParam; | ||
|
|
||
| import javax.ws.rs.core.MediaType; | ||
| import org.jclouds.javax.annotation.Nullable; | ||
|
|
||
| @Produces(MediaType.APPLICATION_JSON) | ||
| @RequestFilters(BitbucketAuthentication.class) | ||
| @Path("/rest/api/{jclouds.api-version}/projects") | ||
| public interface CommitsApi { | ||
|
|
||
| @Named("commits:get") | ||
| @Consumes(MediaType.APPLICATION_JSON) | ||
| @Path("/{project}/repos/{repo}/commits/{commitId}") | ||
| @Fallback(BitbucketFallbacks.CommitOnError.class) | ||
| @GET | ||
| Commit get(@PathParam("project") String project, | ||
| @PathParam("repo") String repo, | ||
| @PathParam("commitId") String commitId, | ||
| @Nullable @QueryParam("path") String path); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
src/test/java/com/cdancy/bitbucket/rest/features/CommitsApiLiveTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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.cdancy.bitbucket.rest.features; | ||
|
|
||
| import com.cdancy.bitbucket.rest.BaseBitbucketApiLiveTest; | ||
| import com.cdancy.bitbucket.rest.domain.commit.Commit; | ||
|
|
||
| import org.testng.annotations.Test; | ||
|
|
||
| import static org.testng.Assert.assertNotNull; | ||
| import static org.testng.Assert.assertTrue; | ||
|
|
||
| @Test(groups = "live", testName = "CommitsApiLiveTest", singleThreaded = true) | ||
| public class CommitsApiLiveTest extends BaseBitbucketApiLiveTest { | ||
|
|
||
| String projectKey = "TEST"; | ||
| String repoKey = "dev"; | ||
| String commitHash = "d90ca08fa076e2e4c076592fce3832aba80a494f"; | ||
|
|
||
| @Test | ||
| public void testGetCommit() { | ||
| Commit commit = api().get(projectKey, repoKey, commitHash, null); | ||
| assertNotNull(commit); | ||
| assertTrue(commit.errors().isEmpty()); | ||
| assertTrue(commit.id().equals(commitHash)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetCommitNonExistent() { | ||
| Commit commit = api().get(projectKey, repoKey, "1234567890", null); | ||
| assertNotNull(commit); | ||
| assertTrue(commit.errors().size() > 0); | ||
| } | ||
|
|
||
| private CommitsApi api() { | ||
| return api.commitsApi(); | ||
| } | ||
| } |
84 changes: 84 additions & 0 deletions
84
src/test/java/com/cdancy/bitbucket/rest/features/CommitsApiMockTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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.cdancy.bitbucket.rest.features; | ||
|
|
||
| import com.cdancy.bitbucket.rest.BitbucketApi; | ||
| import com.cdancy.bitbucket.rest.BitbucketApiMetadata; | ||
| import com.cdancy.bitbucket.rest.domain.commit.Commit; | ||
| import com.cdancy.bitbucket.rest.internal.BaseBitbucketMockTest; | ||
| import com.squareup.okhttp.mockwebserver.MockResponse; | ||
| import com.squareup.okhttp.mockwebserver.MockWebServer; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import static org.testng.Assert.assertNotNull; | ||
| import static org.testng.Assert.assertNull; | ||
| import static org.testng.Assert.assertTrue; | ||
|
|
||
| /** | ||
| * Mock tests for the {@link CommitsApi} class. | ||
| */ | ||
| @Test(groups = "unit", testName = "CommitApiMockTest") | ||
| public class CommitsApiMockTest extends BaseBitbucketMockTest { | ||
|
|
||
| public void testGetCommit() throws Exception { | ||
| MockWebServer server = mockEtcdJavaWebServer(); | ||
|
|
||
| server.enqueue(new MockResponse().setBody(payloadFromResource("/commit.json")).setResponseCode(200)); | ||
| BitbucketApi baseApi = api(server.getUrl("/")); | ||
| CommitsApi api = baseApi.commitsApi(); | ||
| try { | ||
| String projectKey = "PRJ"; | ||
| String repoKey = "myrepo"; | ||
| String commitHash = "abcdef0123abcdef4567abcdef8987abcdef6543"; | ||
|
|
||
| Commit commit = api.get(projectKey, repoKey, commitHash, null); | ||
| assertNotNull(commit); | ||
| assertTrue(commit.errors().isEmpty()); | ||
| assertTrue(commit.id().equalsIgnoreCase(commitHash)); | ||
|
|
||
| assertSent(server, "GET", "/rest/api/" + BitbucketApiMetadata.API_VERSION | ||
| + "/projects/" + projectKey + "/repos/" + repoKey + "/commits/" + commitHash); | ||
| } finally { | ||
| baseApi.close(); | ||
| server.shutdown(); | ||
| } | ||
| } | ||
|
|
||
| public void testGetCommitNonExistent() throws Exception { | ||
| MockWebServer server = mockEtcdJavaWebServer(); | ||
|
|
||
| server.enqueue(new MockResponse().setBody(payloadFromResource("/commit-error.json")).setResponseCode(404)); | ||
| BitbucketApi baseApi = api(server.getUrl("/")); | ||
| CommitsApi api = baseApi.commitsApi(); | ||
| try { | ||
| String projectKey = "PRJ"; | ||
| String repoKey = "myrepo"; | ||
| String commitHash = "abcdef0123abcdef4567abcdef8987abcdef6543"; | ||
|
|
||
| Commit commit = api.get(projectKey, repoKey, commitHash, null); | ||
| assertNotNull(commit); | ||
| assertTrue(commit.errors().size() > 0); | ||
|
|
||
| assertSent(server, "GET", "/rest/api/" + BitbucketApiMetadata.API_VERSION | ||
| + "/projects/" + projectKey + "/repos/" + repoKey + "/commits/" + commitHash); | ||
| } finally { | ||
| baseApi.close(); | ||
| server.shutdown(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "errors":[ | ||
| { | ||
| "context":null, | ||
| "message":"The changeset '1234567890' does not exist in repository 'prpc-platform'", | ||
| "exceptionName":"com.atlassian.stash.exception.NoSuchChangesetException" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "id": "abcdef0123abcdef4567abcdef8987abcdef6543", | ||
| "displayId": "abcdef0123a", | ||
| "author": { | ||
| "name": "charlie", | ||
| "emailAddress": "charlie@example.com" | ||
| }, | ||
| "authorTimestamp": 1484800877151, | ||
| "message": "WIP on feature 1", | ||
| "parents": [ | ||
| { | ||
| "id": "abcdef0123abcdef4567abcdef8987abcdef6543", | ||
| "displayId": "abcdef0" | ||
| } | ||
| ] | ||
| } |