Merge branch 'main' into snyk-upgrade-0465d9ab590d4ae1fa5da79f10860705

Author: stremovsky

README.md

@@ -99,6 +99,8 @@ Then add the dependency to your `pom.xml`:
 - **Wrapping Key Generation**: Generate wrapping keys from Shamir's Secret Sharing keys
 - **Typed Patch Operations**: Use structured `PatchOperation` objects for user updates
 - **Bulk Token Operations**: Create multiple tokens efficiently with typed options
+- **Bulk User Deletion**: Delete multiple users efficiently in a single operation
+- **License Key Management**: Set system license keys for enhanced functionality
 - **Shared Record Management**: Create and retrieve shared records with partner organizations
 
 ### Improved Error Handling
@@ -185,6 +187,10 @@ System.out.println("Generated wrapping key: " + wrappingKey.get("wrappingkey"));
 // Get system metrics
 Map<String, Object> metrics = api.getSystemMetrics(null);
 System.out.println("System metrics: " + metrics);
+
+// Set system license key
+Map<String, Object> licenseResult = api.setLicenseKey("your-license-key", null);
+System.out.println("License key setting result: " + licenseResult.get("status"));
 ```
 
 ### Token Management

pom.xml

@@ -24,14 +24,14 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
+            <version>4.5.14</version>
         </dependency>
 
         <!-- Apache HttpCore -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>4.4.15</version>
+            <version>4.4.16</version>
         </dependency>
 
         <!-- Jackson for JSON processing -->

src/main/java/org/databunker/DatabunkerproApi.java

@@ -6,7 +6,6 @@
 import org.databunker.options.SharedRecordOptions;
 import org.databunker.options.LegalBasisOptions;
 import org.databunker.options.AgreementAcceptOptions;
-import org.databunker.options.ConnectorOptions;
 import org.databunker.options.TenantOptions;
 import org.databunker.options.ProcessingActivityOptions;
 import org.databunker.options.GroupOptions;
@@ -103,25 +102,8 @@ public static void main(String[] args) {
 
             Map<String, Object> agreement = api.acceptAgreement("email", "user@example.com", "marketing-consent", agreementOptions, null);
             System.out.println("Accepted agreement: " + agreement.get("status"));
-            
-            // Example 7: Create connector with typed ConnectorOptions
-            ConnectorOptions connectorOptions = ConnectorOptions.builder()
-                .connectorname("my-connector")
-                .connectortype("mysql")
-                .apikey("api-key-123")
-                .username("dbuser")
-                .connectordesc("MySQL database connector")
-                .dbhost("localhost")
-                .dbport(3306)
-                .dbname("mydb")
-                .tablename("users")
-                .status("active")
-                .build();
-            
-            Map<String, Object> connector = api.createConnector(connectorOptions, null);
-            System.out.println("Created connector: " + connector.get("connectorid"));
-            
-            // Example 8: Create processing activity with typed ProcessingActivityOptions
+
+            // Example 7: Create processing activity with typed ProcessingActivityOptions
             ProcessingActivityOptions activityOptions = ProcessingActivityOptions.builder()
                 .activity("data-processing")
                 .title("Data Processing Activity")

src/main/java/org/databunker/examples/TypedOptionsExample.java

@@ -146,51 +146,6 @@ public static Map<String, Object> toMap(AgreementAcceptOptions options) {
         return map;
     }
 
-    /**
-     * Converts ConnectorOptions to Map&lt;String, Object&gt;
-     * @param options The ConnectorOptions object
-     * @return A Map representation of the options
-     */
-    public static Map<String, Object> toMap(ConnectorOptions options) {
-        Map<String, Object> map = new HashMap<>();
-        if (options != null) {
-            if (options.getConnectorid() != null) {
-                map.put("connectorid", options.getConnectorid());
-            }
-            if (options.getConnectorname() != null) {
-                map.put("connectorname", options.getConnectorname());
-            }
-            if (options.getConnectortype() != null) {
-                map.put("connectortype", options.getConnectortype());
-            }
-            if (options.getApikey() != null) {
-                map.put("apikey", options.getApikey());
-            }
-            if (options.getUsername() != null) {
-                map.put("username", options.getUsername());
-            }
-            if (options.getConnectordesc() != null) {
-                map.put("connectordesc", options.getConnectordesc());
-            }
-            if (options.getDbhost() != null) {
-                map.put("dbhost", options.getDbhost());
-            }
-            if (options.getDbport() != null) {
-                map.put("dbport", options.getDbport());
-            }
-            if (options.getDbname() != null) {
-                map.put("dbname", options.getDbname());
-            }
-            if (options.getTablename() != null) {
-                map.put("tablename", options.getTablename());
-            }
-            if (options.getStatus() != null) {
-                map.put("status", options.getStatus());
-            }
-        }
-        return map;
-    }
-
     /**
      * Converts TenantOptions to Map&lt;String, Object&gt;
      * @param options The TenantOptions object

src/main/java/org/databunker/options/ConnectorOptions.java

@@ -82,24 +82,6 @@ AgreementAcceptOptions options = AgreementAcceptOptions.builder()
     .build();
 ```
 
-### ConnectorOptions
-Used for configuring database and API connectors.
-
-```java
-ConnectorOptions options = ConnectorOptions.builder()
-    .connectorname("my-connector")
-    .connectortype("mysql")
-    .apikey("api-key-123")
-    .username("dbuser")
-    .connectordesc("MySQL database connector")
-    .dbhost("localhost")
-    .dbport(3306)
-    .dbname("mydb")
-    .tablename("users")
-    .status("active")
-    .build();
-```
-
 ### TenantOptions
 Used for creating and managing tenants.
 
@@ -273,25 +255,6 @@ AgreementAcceptOptions options = AgreementAcceptOptions.builder()
 Map<String, Object> agreement = api.acceptAgreement("email", "user@example.com", "marketing-consent", options, null);
 ```
 
-### Creating Connectors with Typed Options
-
-```java
-ConnectorOptions options = ConnectorOptions.builder()
-    .connectorname("my-connector")
-    .connectortype("mysql")
-    .apikey("api-key-123")
-    .username("dbuser")
-    .connectordesc("MySQL database connector")
-    .dbhost("localhost")
-    .dbport(3306)
-    .dbname("mydb")
-    .tablename("users")
-    .status("active")
-    .build();
-
-Map<String, Object> connector = api.createConnector(options, null);
-```
-
 ### Creating Processing Activities with Typed Options
 
 ```java
@@ -406,7 +369,6 @@ Map<String, Object> mapOptions = OptionsConverter.toMap(userOptions);
 ## Future Enhancements
 
 Additional option classes can be added for:
-- ConnectorOptions
 - LegalBasisOptions
 - ProcessingActivityOptions
 - TenantOptions