Allowing path customization directly into usersUrl.

Managing new json property odata 'count' returned by MS graphapi

Author: zuglah

README.md

@@ -29,7 +29,7 @@ The values to configure are:
 ##### Connection
 
   - `connections.pluginConnection.msGraphApiConnectionSettings.authenticationURL`: The base URL used for authentication (default is https://login.microsoftonline.com/) (optional)
-  - `connections.pluginConnection.msGraphApiConnectionSettings.usersURL`: The base URL used for operations on users (default is https://graph.microsoft.com) (optional)
+  - `connections.pluginConnection.msGraphApiConnectionSettings.usersURL`: The base URL used for operations on users (default is https://graph.microsoft.com/v1.0/users) (optional)
   - `connections.pluginConnection.msGraphApiConnectionSettings.scope`: The scope url used during authentication (default is https://graph.microsoft.com/.default) (optional)
   - `connections.pluginConnection.msGraphApiConnectionSettings.clientId`: The client id for the application
   - `connections.pluginConnection.msGraphApiConnectionSettings.clientSecret`: The client secret used to connect to the application
@@ -48,4 +48,8 @@ JAVA_OPTS="-DLSC.PLUGINS.PACKAGEPATH=org.lsc.plugins.connectors.msgraphapi.gener
 ```
 ### Packaging
 
+Clone project then cd inside.
+Be sure to have java 8 install then run by default (on debian)::
+"JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 mvn clean package"
+
 WIP

src/main/java/org/lsc/plugins/connectors/msgraphapi/MsGraphApiDao.java

@@ -72,7 +72,7 @@
 public class MsGraphApiDao {
     public static final String USER_PATH = "/users";
     public static final String DEFAULT_PIVOT = "mail";
-    public static final String DEFAULT_USERS_URL = "https://graph.microsoft.com";
+    public static final String DEFAULT_USERS_URL = "https://graph.microsoft.com/v1.0/users";
     public static final String ID = "id";
     private static final Logger LOGGER = LoggerFactory.getLogger(MsGraphApiDao.class);
 
@@ -97,9 +97,7 @@ public MsGraphApiDao(String token, MsGraphApiConnectionSettings settings, MsGrap
         client = ClientBuilder.newClient()
             .register(JacksonFeature.class);
         usersClient = client
-            .target(this.usersURL)
-            .path("v1.0")
-            .path(USER_PATH);
+            .target(this.usersURL);
     }
 
     private Optional<String> getStringParameter(String parameter) {
@@ -114,6 +112,7 @@ private List<User> getUsersList(Optional<String> computedFilter) {
         WebTarget target = pivot.equals(ID) ? usersClient.queryParam("$select", pivot) : usersClient.queryParam("$select","id," + pivot);
 
         if (computedFilter.isPresent()) {
+            target = target.queryParam("$count", "true");
             target = target.queryParam("$filter", computedFilter.get());
         }
         if (pageSize.isPresent()) {
@@ -153,6 +152,7 @@ private UsersListResponse getUsersListResponse(WebTarget target) {
         try {
             response = target.request()
                 .header(HttpHeaders.AUTHORIZATION, authorizationBearer)
+                .header("ConsistencyLevel", "eventual")
                 .accept(MediaType.APPLICATION_JSON_TYPE)
                 .get();
             if (checkResponse(response)) {

src/main/java/org/lsc/plugins/connectors/msgraphapi/beans/UsersListResponse.java

@@ -50,12 +50,14 @@
 
 public class UsersListResponse {
     private final String context;
+    private final String count;
     private final String nextLink;
     private final List<Map<String, Object>> value;
 
     @JsonCreator
-    public UsersListResponse(@JsonProperty("@odata.context") String context, @JsonProperty("@odata.nextLink") String nextLink, @JsonProperty("value") List<Map<String, Object>> value) {
+    public UsersListResponse(@JsonProperty("@odata.context") String context, @JsonProperty("@odata.count") String count, @JsonProperty("@odata.nextLink") String nextLink, @JsonProperty("value") List<Map<String, Object>> value) {
         this.context = context;
+        this.count = count;
         this.nextLink = nextLink;
         this.value = value;
     }
@@ -64,6 +66,10 @@ public String getContext() {
         return context;
     }
 
+    public String getCount() {
+        return count;
+    }
+
     public String getNextLink() {
         return nextLink;
     }