update graph-api plugin to LSC 2.2 (#7)

Author: David Coutadeur

README.md

@@ -49,7 +49,10 @@ 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"
+Be sure to have java 21 installed, then run by default (on debian):
+
+```
+JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64 mvn clean package
+```
 
 WIP

pom.xml

@@ -6,7 +6,7 @@
     <groupId>org.lsc.plugins.connectors</groupId>
     <artifactId>microsoft-graph-api</artifactId>
     <name>LDAP Synchronization Connector for Microsoft graph API</name>
-    <version>1.1</version>
+    <version>1.2</version>
     <description>
         This project provides a Microsoft graph API source plugin for LSC
     </description>
@@ -67,10 +67,10 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.13.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>21</source>
+                    <target>21</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
                 <executions>
@@ -85,19 +85,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>3.3.1</version>
                 <configuration>
                     <encoding>utf-8</encoding>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
+                <version>3.11.2</version>
                 <configuration>
                     <show>public</show>
-                    <links>
-                        <link>http://java.sun.com/j2se/1.6.0/docs/api/</link>
-                    </links>
                     <encoding>utf-8</encoding>
                 </configuration>
                 <executions>
@@ -111,7 +108,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4</version>
+                <version>2.6</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -131,7 +128,7 @@
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-ssh</artifactId>
-                <version>2.12</version>
+                <version>3.5.3</version>
             </extension>
         </extensions>
     </build>
@@ -172,7 +169,7 @@
         <dependency>
             <groupId>org.lsc</groupId>
             <artifactId>lsc-core</artifactId>
-            <version>2.1.4</version>
+            <version>2.2.0</version>
             <type>jar</type>
             <optional>false</optional>
             <exclusions>
@@ -197,59 +194,59 @@
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
-            <version>3.8.2</version>
+            <version>4.5.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
-            <version>2.2</version>
+            <version>4.0.0-M2</version>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>json-path</artifactId>
-            <version>3.3.0</version>
+            <version>5.5.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>3.3.0</version>
+            <version>5.5.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.10.0</version>
+            <version>4.0.0-M1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
-            <version>2.2</version>
+            <version>4.0.0-M2</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.2.0</version>
+            <version>5.13.0-M2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
-            <version>5.2.0</version>
+            <version>5.13.0-M2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.21.0</version>
+            <version>5.17.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.11.1</version>
+            <version>1.20.6</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -264,6 +261,12 @@
             <version>2.3.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.17.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <distributionManagement>

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

@@ -42,13 +42,13 @@
  */
 package org.lsc.plugins.connectors.msgraphapi;
 
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.Form;
+import jakarta.ws.rs.core.Response;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.glassfish.jersey.jackson.JacksonFeature;
 import org.lsc.plugins.connectors.msgraphapi.beans.AuthenticationResponse;
 

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

@@ -48,18 +48,18 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.commons.lang.StringUtils;
-import org.codehaus.jackson.type.TypeReference;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
+import org.apache.commons.lang3.StringUtils;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.glassfish.jersey.jackson.JacksonFeature;
 import org.lsc.exception.LscServiceException;
 import org.lsc.plugins.connectors.msgraphapi.beans.User;

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

@@ -44,6 +44,8 @@
 
 import static org.lsc.plugins.connectors.msgraphapi.MsGraphApiDao.ID;
 
+import java.util.Collection;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -52,12 +54,13 @@
 import java.util.Optional;
 import java.util.LinkedHashMap;
 
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.WebApplicationException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.WebApplicationException;
 
 import org.lsc.LscDatasets;
 import org.lsc.beans.IBean;
+import org.lsc.configuration.ConnectionType;
 import org.lsc.configuration.PluginConnectionType;
 import org.lsc.configuration.TaskType;
 import org.lsc.exception.LscServiceCommunicationException;
@@ -245,4 +248,10 @@ public Map<String, LscDatasets> getListPivots() throws LscServiceException {
             throw new LscServiceException(e);
         }
     }
+
+    public Collection<Class<? extends ConnectionType>> getSupportedConnectionType() {
+        Collection<Class<? extends ConnectionType>> list = new ArrayList<Class<? extends ConnectionType>>();
+        return list;
+    }
+
 }

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

@@ -42,8 +42,8 @@
  */
 package org.lsc.plugins.connectors.msgraphapi.beans;
 
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class AuthenticationResponse {
     private final String tokenType;

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

@@ -45,8 +45,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class UsersListResponse {
     private final String context;