UserApi Development Initialized

src/main/java/com/cdancy/bitbucket/rest/BitbucketApi.java

@@ -34,6 +34,7 @@
 import com.cdancy.bitbucket.rest.features.SystemApi;
 import com.cdancy.bitbucket.rest.features.TagApi;
 import com.cdancy.bitbucket.rest.features.TasksApi;
+import com.cdancy.bitbucket.rest.features.UserApi;
 import com.cdancy.bitbucket.rest.features.WebHookApi;
 
 
@@ -88,4 +89,8 @@ public interface BitbucketApi extends Closeable {
 
     @Delegate
     TasksApi tasksApi();
+
+    @Delegate
+    UserApi userApi();
+
 }

src/main/java/com/cdancy/bitbucket/rest/domain/pullrequest/User.java

@@ -87,9 +87,9 @@ public static User create(final List<Error> errors, final String name,
             final String emailAddress, final int id,
             final String displayName,final boolean active,
             final String slug, final String type,
-            final String directoryName, final boolean deletable,
-            final long lastAuthenticationTimestamp, final boolean mutableDetails,
-            final boolean mutableGroups) {
+            @Nullable final String directoryName, @Nullable final boolean deletable,
+            @Nullable final long lastAuthenticationTimestamp, @Nullable final boolean mutableDetails,
+            @Nullable final boolean mutableGroups) {
 
         return new AutoValue_User(BitbucketUtils.nullToEmpty(errors), name, emailAddress, id, displayName,
             active, slug, type, directoryName, deletable, lastAuthenticationTimestamp, mutableDetails, mutableGroups);

src/main/java/com/cdancy/bitbucket/rest/features/UserApi.java

@@ -0,0 +1,61 @@
+/*
+ * 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.annotations.Documentation;
+import com.cdancy.bitbucket.rest.domain.admin.UserPage;
+import com.cdancy.bitbucket.rest.fallbacks.BitbucketFallbacks;
+import com.cdancy.bitbucket.rest.filters.BitbucketAuthenticationFilter;
+import org.jclouds.javax.annotation.Nullable;
+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.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+@Produces(MediaType.APPLICATION_JSON)
+@RequestFilters(BitbucketAuthenticationFilter.class)
+@Path("/rest/api/{jclouds.api-version}/user")
+@SuppressWarnings("PMD.AvoidDuplicateLiterals")
+public interface UserApi {
+
+    @Named("user:get-user")
+    @Documentation({"https://docs.atlassian.com/bitbucket-server/rest/6.0.0/bitbucket-rest.html#idp362"})
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Path("/groups/more-members")
+    @Fallback(BitbucketFallbacks.UserPageOnError.class)
+    @GET
+    UserPage users(@Nullable @QueryParam("filter") String filter,
+                   @Nullable @QueryParam("group") String group,
+                   @Nullable @QueryParam("permission") String globalRole,
+                   @Nullable @QueryParam("permission.1") String projectRole,
+                   @Nullable @QueryParam("permission.1.projectKey") String projProjectKey,
+                   @Nullable @QueryParam("permission.1.projectId") String projProjectId,
+                   @Nullable @QueryParam("permission.2") String repoRole,
+                   @Nullable @QueryParam("permission.2.projectKey") String repoProjectKey,
+                   @Nullable @QueryParam("permission.3.projectId") String repoPrrojectId,
+                   @Nullable @QueryParam("start") Integer start,
+                   @Nullable @QueryParam("limit") Integer limit);
+
+
+}

src/test/java/com/cdancy/bitbucket/rest/features/UserApiLiveTest.java

@@ -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.BaseBitbucketApiLiveTest;
+import com.cdancy.bitbucket.rest.TestUtilities;
+import com.cdancy.bitbucket.rest.domain.admin.UserPage;
+import com.cdancy.bitbucket.rest.domain.pullrequest.User;
+
+import org.testng.annotations.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Test(groups = "live", testName = "UserApiLiveTest", singleThreaded = true)
+public class UserApiLiveTest extends BaseBitbucketApiLiveTest {
+
+    @Test
+    public void testListUsers() {
+        final User user = TestUtilities.getDefaultUser(this.bitbucketAuthentication, this.api);
+        final UserPage userPage = api().users(user.slug(), defaultBitbucketGroup, null, null,
+                null, null, null, null, null, null, null);//Further testing required
+        assertThat(userPage).isNotNull();
+        assertThat(userPage.size() > 0).isTrue();
+    }
+
+    public void testListUsersOnError() {
+        final UserPage userPage = api().users(TestUtilities.randomString(), TestUtilities.randomString(), null,
+                null, null, null, null, null, null, null, null);
+        assertThat(userPage).isNotNull();
+        assertThat(userPage.size() == 0).isTrue();
+    }
+
+    private UserApi api() {
+        return api.userApi();
+    }
+}

src/test/java/com/cdancy/bitbucket/rest/features/UserApiMockTest.java

@@ -0,0 +1,94 @@
+/*
+ * 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 static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Map;
+
+import org.testng.annotations.Test;
+
+import com.cdancy.bitbucket.rest.BaseBitbucketMockTest;
+import com.cdancy.bitbucket.rest.BitbucketApi;
+//import com.cdancy.bitbucket.rest.BitbucketApiMetadata;
+import com.cdancy.bitbucket.rest.domain.admin.UserPage;
+import com.google.common.collect.ImmutableMap;
+import com.squareup.okhttp.mockwebserver.MockResponse;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
+
+@Test(groups = "unit", testName = "UserApiMockTest")
+public class UserApiMockTest extends BaseBitbucketMockTest {
+
+    private final String localGroup = "test";
+    private final String limitKeyword = "limit";
+    private final String startKeyword = "start";
+    private final String restApiPath = "/rest/api/";
+    private final String getMethod = "GET";
+
+
+    public void testUserListUsers() throws Exception {
+
+
+        final MockWebServer server = mockWebServer();
+
+        server.enqueue(new MockResponse()
+                .setBody(payloadFromResource("/user-list-users.json"))
+                .setResponseCode(200));
+        try (final BitbucketApi baseApi = api(server.getUrl("/"))) {
+
+            final UserPage up = baseApi.userApi().users("jcitizen", "stash-users", "ADMIN", null,
+                    null, null, null, null, null, 0, 2);
+            assertThat(up).isNotNull();
+            assertThat(up.errors()).isEmpty();
+            assertThat(up.size() == 1).isTrue();
+            assertThat(up.values().get(0).slug().equals("jcitizen")).isTrue();
+
+            final Map<String, ?> queryParams = ImmutableMap.of("filter", "jcitizen",
+                    "group","stash-users" , "permission", "ADMIN","start",0,"limit",2);
+            //assertSent(server, getMethod, restApiPath + BitbucketApiMetadata.API_VERSION
+            //        + "/users", queryParams);
+        } finally {
+            server.shutdown();
+        }
+    }
+
+    public void testUserListUsersOnError() throws Exception {
+        final MockWebServer server = mockWebServer();
+
+        server.enqueue(new MockResponse().setBody(payloadFromResource("/user-list-users-error.json")).setResponseCode(401));
+        final BitbucketApi baseApi = api(server.getUrl("/"));
+        try {
+            final UserPage up = baseApi.userApi().users("blah blah", "stash-users", "ADMIN", null,
+                    null, null, null, null, null, 0, 2);            
+            assertThat(up).isNotNull();
+            assertThat(up.errors()).isNotEmpty();
+
+            final Map<String, ?> queryParams = ImmutableMap.of("filter", "blah%20blah",
+                    "group","stash-users" , "permission", "ADMIN","start",0,"limit",2);
+            //assertSent(server, getMethod, restApiPath + BitbucketApiMetadata.API_VERSION
+            //        + "/users", queryParams);
+        } finally {
+            baseApi.close();
+            server.shutdown();
+        }
+    }
+
+
+
+
+}

src/test/resources/user-list-users-error.json

@@ -0,0 +1,9 @@
+{
+    "errors": [
+        {
+            "context": null,
+            "message": "Authentication failed. Please check your credentials and try again.",
+            "exceptionName": "com.atlassian.bitbucket.auth.IncorrectPasswordAuthenticationException"
+        }
+    ]
+}

src/test/resources/user-list-users.json

@@ -0,0 +1,26 @@
+
+{
+    "size": 1,
+    "limit": 25,
+    "isLastPage": true,
+    "values": [
+	        {
+	            "name": "jcitizen",
+	            "emailAddress": "[email protected]",
+	            "id": 101,
+	            "displayName": "Jane Citizen",
+	            "active": true,
+	            "slug": "jcitizen",
+	            "type": "NORMAL",
+	            "links": {
+	        		"self": [
+	          			{
+	            		"href": "https://bitbucket.acme.com/users/jcitizen"
+	          			}
+	       	 		]
+	      		}
+      		}
+
+    		],
+    "start": 0
+}