Making compatible with Spring updates in MP 4.8, ref# FIN-12507

CHANGELOG.md

@@ -1,6 +1,7 @@
 # connector-zoom
 
 ## Change Log
++ **4.3.0** - Making compatible with Spring updates in MP 4.8 (11/04/2024) 
 + **4.2.3** - Updated Object Class names from ACCOUNT to ZoomUser and GROUP to ZoomGroup
 + **4.2.2** - Update Connector-Base Version, GAR Updates, and Update to Java 11 FIN-12386 (9/3/2024)
 + **4.2.1** - Added Email Address Change Support

build.gradle

@@ -15,12 +15,13 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id "com.google.cloud.artifactregistry.gradle-plugin" version "${google_artifact_plugin_version}"
-    id 'com.github.sherter.google-java-format' version '0.9'
+    id "com.diffplug.spotless" version "6.25.0"
     id 'idea'
 }
 
 repositories {
     mavenCentral()
+    // mavenLocal()
     maven {
         url "https://nexus.evolveum.com/nexus/content/repositories/releases/"
     }
@@ -29,8 +30,16 @@ repositories {
     }
 }
 
-googleJavaFormat {
-    exclude 'generatedConfig/**/*.java'
+spotless {
+    java {
+        googleJavaFormat('1.17.0')
+        targetExclude(
+            [
+                'generatedConfig/com/exclamationlabs/connid/base/zoom/configuration/ZoomConfiguration.java',
+                'com/exclamationlabs/connid/base/zoom/configuration/ZoomConfiguration.java'
+            ]
+        )
+    }
 }
 
 idea {
@@ -55,16 +64,14 @@ def versionNumber = "${project_version}"
 dependencies {
 
     // Required for MidPoint runtime
-    runtimeOnly 'org.codehaus.groovy:groovy:2.5.21'
     runtimeOnly 'com.evolveum.polygon:connector-common:1.5.0.0'
 
-    // HTTP/RESTful support
-    implementation 'com.google.code.gson:gson:2.10.1'
-    implementation 'org.apache.httpcomponents:httpclient:4.5.14'
-
-    implementation 'commons-codec:commons-codec:1.15'
-
-    implementation "com.exclamationlabs.connid:connector-base:${base_connector_version}-+"
+    implementation ("com.exclamationlabs.connid:connector-base:${base_connector_version}-+")
+    implementation ("com.exclamationlabs.connid:connector-base:${base_connector_version}-+") {
+        capabilities {
+            requireCapability('com.exclamationlabs.connid:connector-base-http')
+        }
+    }
 
     testImplementation "com.exclamationlabs.connid:connector-base-test-support:${test_connector_version}-+"
 

gradle.properties

@@ -1,5 +1,5 @@
-project_version=4.2.3
-base_connector_version=4.2.4
-config_plugin_version=3.0.5
+project_version=4.3.0
+base_connector_version=5.0.0
+config_plugin_version=4.0.0
 test_connector_version=3.0.1
 google_artifact_plugin_version=2.2.1

src/main/java/com/exclamationlabs/connid/base/zoom/adapter/ZoomUsersAdapter.java

@@ -246,6 +246,7 @@ protected Set<Attribute> constructAttributes(ZoomUser user) {
 
     return attributes;
   }
+
   /**
    * This utility method can be used within adapter constructModel() method in order to construct a
    * list of identifiers for assignment to another object type

src/main/java/com/exclamationlabs/connid/base/zoom/driver/rest/ZoomFaultProcessor.java

@@ -21,7 +21,7 @@
 import com.exclamationlabs.connid.base.zoom.model.response.fault.ErrorResponse;
 import com.google.gson.GsonBuilder;
 import java.io.IOException;
-import org.apache.commons.codec.Charsets;
+import java.nio.charset.StandardCharsets;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
@@ -42,7 +42,7 @@ public static ZoomFaultProcessor getInstance() {
   public void process(HttpResponse httpResponse, GsonBuilder gsonBuilder) {
     String rawResponse;
     try {
-      rawResponse = EntityUtils.toString(httpResponse.getEntity(), Charsets.UTF_8);
+      rawResponse = EntityUtils.toString(httpResponse.getEntity(), StandardCharsets.UTF_8);
       Logger.info(this, String.format("Raw Fault response %s", rawResponse));
 
       Header responseType = httpResponse.getFirstHeader("Content-Type");

src/main/java/com/exclamationlabs/connid/base/zoom/driver/rest/ZoomUsersInvocator.java

@@ -300,7 +300,9 @@ public ZoomUser getOne(ZoomDriver driver, String userId, Map<String, Object> dat
     RestResponseData<ZoomUser> response = driver.executeRequest(req);
     if (response.getResponseStatusCode() == 200) {
       user = response.getResponseObject();
-      getPhoneInfo(driver, user);
+      if (user.getFeature() != null && user.getFeature().getZoomPhone()) {
+        getPhoneInfo(driver, user);
+      }
     }
 
     return user;
@@ -326,7 +328,9 @@ public ZoomUser getOneByName(ZoomDriver driver, String userName) throws Connecto
     user = response.getResponseObject();
     if (response.getResponseStatusCode() == 200) {
       user = response.getResponseObject();
-      getPhoneInfo(driver, user);
+      if (user.getFeature() != null && user.getFeature().getZoomPhone()) {
+        getPhoneInfo(driver, user);
+      }
     }
     return user;
   }
@@ -336,6 +340,7 @@ public ZoomUser getOneByName(
       throws ConnectorException {
     return getOneByName(driver, userName);
   }
+
   /**
    * Get the phone user profile
    *