Skip to content

Commit 61df8ed

Browse files
myneckermynecker
authored
DATAGO-84853: cema config push resiliency (#211)
1 parent a48766a commit 61df8ed

File tree

36 files changed

+39209
-182
lines changed

36 files changed

+39209
-182
lines changed

‎service/application/pom.xml‎

Lines changed: 89 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>com.solace.maas</groupId>
@@ -21,6 +22,7 @@
2122
<jackson.version>2.16.1</jackson.version>
2223
<awaitility.version>4.2.0</awaitility.version>
2324
<dockerfile-maven.version>1.4.13</dockerfile-maven.version>
25+
<swagger-codegen-maven-plugin.version>2.4.43</swagger-codegen-maven-plugin.version>
2426
</properties>
2527
<repositories>
2628
<repository>
@@ -224,7 +226,7 @@
224226
</dependency>
225227

226228
<dependency>
227-
<groupId>org.hibernate</groupId>
229+
<groupId>org.hibernate.validator</groupId>
228230
<artifactId>hibernate-validator</artifactId>
229231
<version>8.0.1.Final</version>
230232
</dependency>
@@ -304,7 +306,6 @@
304306
<scope>test</scope>
305307
</dependency>
306308

307-
308309
<dependency>
309310
<groupId>com.solacesystems</groupId>
310311
<artifactId>solclientj</artifactId>
@@ -330,6 +331,32 @@
330331
<groupId>jakarta.servlet</groupId>
331332
<artifactId>jakarta.servlet-api</artifactId>
332333
</dependency>
334+
<!-- Swagger dependencies for compatibility -->
335+
<dependency>
336+
<groupId>com.squareup.okhttp</groupId>
337+
<artifactId>okhttp</artifactId>
338+
<version>2.7.5</version>
339+
</dependency>
340+
<dependency>
341+
<groupId>org.springframework.retry</groupId>
342+
<artifactId>spring-retry</artifactId>
343+
<version>2.0.5</version>
344+
</dependency>
345+
<dependency>
346+
<groupId>io.swagger</groupId>
347+
<artifactId>swagger-annotations</artifactId>
348+
<version>1.6.12</version>
349+
</dependency>
350+
<dependency>
351+
<groupId>com.squareup.okhttp</groupId>
352+
<artifactId>logging-interceptor</artifactId>
353+
<version>2.7.5</version>
354+
</dependency>
355+
<dependency>
356+
<groupId>io.gsonfire</groupId>
357+
<artifactId>gson-fire</artifactId>
358+
<version>1.9.0</version>
359+
</dependency>
333360
</dependencies>
334361
<build>
335362
<plugins>
@@ -387,6 +414,65 @@
387414
</execution>
388415
</executions>
389416
</plugin>
417+
<plugin>
418+
<groupId>org.codehaus.mojo</groupId>
419+
<artifactId>build-helper-maven-plugin</artifactId>
420+
<version>3.6.0</version>
421+
<executions>
422+
<execution>
423+
<id>add-source</id>
424+
<phase>generate-sources</phase>
425+
<goals>
426+
<goal>add-source</goal>
427+
</goals>
428+
<configuration>
429+
<sources>
430+
<source>${project.build.directory}/generated-sources/swagger/src/main/java</source>
431+
</sources>
432+
</configuration>
433+
</execution>
434+
<execution>
435+
<id>add-test-source</id>
436+
<phase>generate-test-sources</phase>
437+
<goals>
438+
<goal>add-test-source</goal>
439+
</goals>
440+
<configuration>
441+
<sources>
442+
<source>${project.build.directory}/generated-sources/swagger/src/test/java</source>
443+
</sources>
444+
</configuration>
445+
</execution>
446+
</executions>
447+
</plugin>
448+
<plugin>
449+
<groupId>io.swagger</groupId>
450+
<artifactId>swagger-codegen-maven-plugin</artifactId>
451+
<version>${swagger-codegen-maven-plugin.version}</version>
452+
<executions>
453+
<execution>
454+
<id>sempv2-vmr-9.12</id>
455+
<phase>generate-sources</phase>
456+
<goals>
457+
<goal>generate</goal>
458+
</goals>
459+
<configuration>
460+
<inputSpec>${project.basedir}/src/main/resources/oas/semp-v2-swagger-config.json</inputSpec>
461+
<language>java</language>
462+
<output>${project.build.directory}/generated-sources/swagger</output>
463+
<invokerPackage>com.solace.client.sempv2</invokerPackage>
464+
<apiPackage>com.solace.client.sempv2.api</apiPackage>
465+
<modelPackage>com.solace.client.sempv2.model</modelPackage>
466+
<configOptions>
467+
<dateLibrary>java8</dateLibrary>
468+
<hideGenerationTimestamp>true</hideGenerationTimestamp>
469+
<sourceFolder>src/main/java</sourceFolder>
470+
<testSourceFolder>src/test/java</testSourceFolder>
471+
</configOptions>
472+
</configuration>
473+
</execution>
474+
</executions>
475+
</plugin>
390476
</plugins>
391477
</build>
392478
<profiles>

‎service/application/src/main/java/com/solace/maas/ep/common/model/SempAclProfileDeletionRequest.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.solace.maas.ep.common.model;
2+
3+
import lombok.Builder;
4+
import lombok.Data;
5+
6+
@Data
7+
@Builder
8+
public class SempAclProfileDeletionRequest {
9+
private String msgVpn;
10+
private String aclProfileName;
11+
}

‎service/application/src/main/java/com/solace/maas/ep/common/model/SempAclPublishTopicExceptionDeletionRequest.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.solace.maas.ep.common.model;
2+
3+
import lombok.Builder;
4+
import lombok.Data;
5+
6+
@Data
7+
@Builder
8+
public class SempAclPublishTopicExceptionDeletionRequest {
9+
private String msgVpn;
10+
private String aclProfileName;
11+
/**
12+
* The topic string to be deleted from the ACL exception list - may include wild cards
13+
*/
14+
private String publishTopic;
15+
}

‎service/application/src/main/java/com/solace/maas/ep/common/model/SempAclSubscribeTopicExceptionDeletionRequest.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package com.solace.maas.ep.common.model;
2+
3+
import lombok.Builder;
4+
import lombok.Data;
5+
6+
@Data
7+
@Builder
8+
public class SempAclSubscribeTopicExceptionDeletionRequest {
9+
10+
private String msgVpn;
11+
private String aclProfileName;
12+
/**
13+
* The topic string to be deleted from the ACL exception list - may include wild cards
14+
*/
15+
private String subscribeTopic;
16+
}

‎service/application/src/main/java/com/solace/maas/ep/common/model/SempAuthorizationGroupDeletionRequest.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.solace.maas.ep.common.model;
2+
3+
import lombok.Builder;
4+
import lombok.Data;
5+
6+
@Data
7+
@Builder
8+
public class SempAuthorizationGroupDeletionRequest {
9+
private String msgVpn;
10+
private String authorizationGroupName;
11+
}

‎service/application/src/main/java/com/solace/maas/ep/common/model/SempClientUsernameDeletionRequest.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.solace.maas.ep.common.model;
2+
3+
import lombok.Builder;
4+
import lombok.Data;
5+
6+
@Data
7+
@Builder
8+
public class SempClientUsernameDeletionRequest {
9+
10+
private String msgVpn;
11+
private String clientUsername;
12+
}

‎service/application/src/main/java/com/solace/maas/ep/common/model/SempEntityType.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.solace.maas.ep.common.model;
2+
3+
public enum SempEntityType {
4+
solaceQueue,
5+
solaceAclProfile,
6+
solaceAclSubscribeTopicException,
7+
solaceAclPublishTopicException,
8+
solaceClientUsername,
9+
solaceAuthorizationGroup,
10+
solaceQueueSubscriptionTopic
11+
}

‎service/application/src/main/java/com/solace/maas/ep/common/model/SempQueueDeletionRequest.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.solace.maas.ep.common.model;
2+
3+
import lombok.Builder;
4+
import lombok.Data;
5+
6+
@Data
7+
@Builder
8+
public class SempQueueDeletionRequest {
9+
private String msgVpn;
10+
private String queueName;
11+
}

‎service/application/src/main/java/com/solace/maas/ep/common/model/SempQueueTopicSubscriptionDeletionRequest.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.solace.maas.ep.common.model;
2+
3+
import lombok.Builder;
4+
import lombok.Data;
5+
6+
@Builder
7+
@Data
8+
public class SempQueueTopicSubscriptionDeletionRequest {
9+
private String topicName;
10+
private String queueName;
11+
private String msgVpn;
12+
}

0 commit comments

Comments
 (0)