DATAGO-84853: cema config push resiliency (#211)

SolaceProducts · Nov 21, 2024 · 61df8ed · 61df8ed
1 parent a48766a
commit 61df8ed
Show file tree

Hide file tree

Showing 36 changed files with 39,209 additions and 182 deletions.
diff --git a/service/application/pom.xml b/service/application/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.solace.maas</groupId>
@@ -21,6 +22,7 @@
         <jackson.version>2.16.1</jackson.version>
         <awaitility.version>4.2.0</awaitility.version>
         <dockerfile-maven.version>1.4.13</dockerfile-maven.version>
+        <swagger-codegen-maven-plugin.version>2.4.43</swagger-codegen-maven-plugin.version>
     </properties>
     <repositories>
         <repository>
@@ -224,7 +226,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <version>8.0.1.Final</version>
         </dependency>
@@ -304,7 +306,6 @@
             <scope>test</scope>
         </dependency>
 
-
         <dependency>
             <groupId>com.solacesystems</groupId>
             <artifactId>solclientj</artifactId>
@@ -330,6 +331,32 @@
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
+        <!-- Swagger dependencies for compatibility -->
+        <dependency>
+            <groupId>com.squareup.okhttp</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>2.7.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+            <version>2.0.5</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.12</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>2.7.5</version>
+        </dependency>
+        <dependency>
+            <groupId>io.gsonfire</groupId>
+            <artifactId>gson-fire</artifactId>
+            <version>1.9.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -387,6 +414,65 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/generated-sources/swagger/src/main/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/generated-sources/swagger/src/test/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-codegen-maven-plugin</artifactId>
+                <version>${swagger-codegen-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>sempv2-vmr-9.12</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <inputSpec>${project.basedir}/src/main/resources/oas/semp-v2-swagger-config.json</inputSpec>
+                            <language>java</language>
+                            <output>${project.build.directory}/generated-sources/swagger</output>
+                            <invokerPackage>com.solace.client.sempv2</invokerPackage>
+                            <apiPackage>com.solace.client.sempv2.api</apiPackage>
+                            <modelPackage>com.solace.client.sempv2.model</modelPackage>
+                            <configOptions>
+                                <dateLibrary>java8</dateLibrary>
+                                <hideGenerationTimestamp>true</hideGenerationTimestamp>
+                                <sourceFolder>src/main/java</sourceFolder>
+                                <testSourceFolder>src/test/java</testSourceFolder>
+                            </configOptions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <profiles>

diff --git a/...lication/src/main/java/com/solace/maas/ep/common/model/SempAclProfileDeletionRequest.java b/...lication/src/main/java/com/solace/maas/ep/common/model/SempAclProfileDeletionRequest.java
@@ -0,0 +1,11 @@
+package com.solace.maas.ep.common.model;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class SempAclProfileDeletionRequest {
+    private String msgVpn;
+    private String aclProfileName;
+}
diff --git a/...ain/java/com/solace/maas/ep/common/model/SempAclPublishTopicExceptionDeletionRequest.java b/...ain/java/com/solace/maas/ep/common/model/SempAclPublishTopicExceptionDeletionRequest.java
@@ -0,0 +1,15 @@
+package com.solace.maas.ep.common.model;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class SempAclPublishTopicExceptionDeletionRequest {
+    private String msgVpn;
+    private String aclProfileName;
+    /**
+     * The topic string to be deleted from the ACL exception list - may include wild cards
+     */
+    private String publishTopic;
+}
diff --git a/...n/java/com/solace/maas/ep/common/model/SempAclSubscribeTopicExceptionDeletionRequest.java b/...n/java/com/solace/maas/ep/common/model/SempAclSubscribeTopicExceptionDeletionRequest.java
@@ -0,0 +1,16 @@
+package com.solace.maas.ep.common.model;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class SempAclSubscribeTopicExceptionDeletionRequest {
+
+    private String msgVpn;
+    private String aclProfileName;
+    /**
+     * The topic string to be deleted from the ACL exception list - may include wild cards
+     */
+    private String subscribeTopic;
+}
diff --git a/.../src/main/java/com/solace/maas/ep/common/model/SempAuthorizationGroupDeletionRequest.java b/.../src/main/java/com/solace/maas/ep/common/model/SempAuthorizationGroupDeletionRequest.java
@@ -0,0 +1,11 @@
+package com.solace.maas.ep.common.model;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class SempAuthorizationGroupDeletionRequest {
+    private String msgVpn;
+    private String authorizationGroupName;
+}
diff --git a/...tion/src/main/java/com/solace/maas/ep/common/model/SempClientUsernameDeletionRequest.java b/...tion/src/main/java/com/solace/maas/ep/common/model/SempClientUsernameDeletionRequest.java
@@ -0,0 +1,12 @@
+package com.solace.maas.ep.common.model;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class SempClientUsernameDeletionRequest {
+
+    private String msgVpn;
+    private String clientUsername;
+}
diff --git a/service/application/src/main/java/com/solace/maas/ep/common/model/SempEntityType.java b/service/application/src/main/java/com/solace/maas/ep/common/model/SempEntityType.java
@@ -0,0 +1,11 @@
+package com.solace.maas.ep.common.model;
+
+public enum SempEntityType {
+    solaceQueue,
+    solaceAclProfile,
+    solaceAclSubscribeTopicException,
+    solaceAclPublishTopicException,
+    solaceClientUsername,
+    solaceAuthorizationGroup,
+    solaceQueueSubscriptionTopic
+}
diff --git a/...e/application/src/main/java/com/solace/maas/ep/common/model/SempQueueDeletionRequest.java b/...e/application/src/main/java/com/solace/maas/ep/common/model/SempQueueDeletionRequest.java
@@ -0,0 +1,11 @@
+package com.solace.maas.ep.common.model;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class SempQueueDeletionRequest {
+    private String msgVpn;
+    private String queueName;
+}
diff --git a/.../main/java/com/solace/maas/ep/common/model/SempQueueTopicSubscriptionDeletionRequest.java b/.../main/java/com/solace/maas/ep/common/model/SempQueueTopicSubscriptionDeletionRequest.java
@@ -0,0 +1,12 @@
+package com.solace.maas.ep.common.model;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Builder
+@Data
+public class SempQueueTopicSubscriptionDeletionRequest {
+    private String topicName;
+    private String queueName;
+    private String msgVpn;
+}