chore: switch examples to application properties configuration (#466)

* chore: switch examples to application properties configuration Remove usage of AsyncApiDocket bean configuration * chore: update build.gradle dependencies in examples
springwolf · Nov 24, 2023 · cf978b4 · cf978b4
1 parent 491e1aa
commit cf978b4
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 1,049 deletions.
diff --git a/springwolf-examples/springwolf-amqp-example/build.gradle b/springwolf-examples/springwolf-amqp-example/build.gradle
@@ -20,12 +20,10 @@ dependencies {
     implementation "org.springframework.amqp:spring-rabbit"
     implementation "org.slf4j:slf4j-api:${slf4jApiVersion}"
     implementation "io.swagger.core.v3:swagger-annotations:${swaggerVersion}"
-    implementation "com.asyncapi:asyncapi-core:${asyncapiCoreVersion}"
 
     implementation "org.springframework.amqp:spring-amqp"
     implementation "org.springframework.boot:spring-boot-autoconfigure"
     implementation "org.springframework.boot:spring-boot"
-    implementation "org.springframework:spring-beans"
     implementation "org.springframework:spring-context"
 
     testRuntimeOnly "org.junit.jupiter:junit-jupiter:${junitJupiterVersion}"
@@ -38,6 +36,7 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
 
     testImplementation "org.springframework.boot:spring-boot-test"
+    testImplementation "org.springframework:spring-beans"
     testImplementation "org.springframework:spring-web"
     testImplementation "org.springframework:spring-test"
 

diff --git a/...ava/io/github/stavshamir/springwolf/example/amqp/configuration/AsyncApiConfiguration.java b/...ava/io/github/stavshamir/springwolf/example/amqp/configuration/AsyncApiConfiguration.java
diff --git a/...t/java/io/github/stavshamir/springwolf/example/amqp/ApiWithDocketBeanIntegrationTest.java b/...t/java/io/github/stavshamir/springwolf/example/amqp/ApiWithDocketBeanIntegrationTest.java
diff --git a/...ithub/stavshamir/springwolf/example/amqp/ApiWithDocketFromEnvironmentIntegrationTest.java b/...ithub/stavshamir/springwolf/example/amqp/ApiWithDocketFromEnvironmentIntegrationTest.java
diff --git a/...le/src/test/java/io/github/stavshamir/springwolf/example/amqp/BaseApiIntegrationTest.java b/...le/src/test/java/io/github/stavshamir/springwolf/example/amqp/BaseApiIntegrationTest.java
diff --git a/.../test/java/io/github/stavshamir/springwolf/example/amqp/SpringContextIntegrationTest.java b/.../test/java/io/github/stavshamir/springwolf/example/amqp/SpringContextIntegrationTest.java
@@ -14,34 +14,10 @@
 
 public class SpringContextIntegrationTest {
 
-    @Nested
-    @SpringBootTest(classes = SpringwolfAmqpExampleApplication.class)
-    class AsyncApiDocketTest {
-
-        @Autowired
-        private ApplicationContext context;
-
-        @Autowired
-        private AsyncApiService asyncApiService;
-
-        @Test
-        void testContextWithAsyncApiDocketBean() {
-            assertNotNull(context);
-
-            assertThat(asyncApiService.getAsyncAPI()).isNotNull();
-        }
-
-        @Test
-        void testAllChannelsAreFound() {
-            assertThat(asyncApiService.getAsyncAPI().getChannels()).hasSize(7);
-        }
-    }
-
     @Nested
     @SpringBootTest(classes = SpringwolfAmqpExampleApplication.class)
     @TestPropertySource(
             properties = {
-                "customAsyncApiDocketBean=false",
                 "springwolf.enabled=true",
                 "springwolf.docket.info.title=Info title was loaded from spring properties",
                 "springwolf.docket.info.version=1.0.0",
@@ -66,7 +42,6 @@ void testContextWithApplicationProperties() {
 
         @Test
         void testAllChannelsAreFound() {
-            // 2 channels defined in the AsyncDocket are not found (7 - 2 = 5)
             assertThat(asyncApiService.getAsyncAPI().getChannels()).hasSize(5);
         }
     }

diff --git a/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json
@@ -74,88 +74,6 @@
         }
       }
     },
-    "example-manual-consumer-channel": {
-      "publish": {
-        "operationId": "example-manual-consumer-channel_publish",
-        "description": "example-manual-consumer-channel-description",
-        "bindings": {
-          "amqp": {
-            "cc": [
-              "example-consumer-topic-routing-key"
-            ],
-            "bindingVersion": "0.2.0"
-          }
-        },
-        "message": {
-          "schemaFormat": "application/vnd.oai.openapi+json;version=3.0.0",
-          "name": "io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto",
-          "title": "AnotherPayloadDto",
-          "description": "Another payload model",
-          "payload": {
-            "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto"
-          },
-          "headers": {
-            "$ref": "#/components/schemas/HeadersNotDocumented"
-          },
-          "bindings": {
-            "amqp": {
-              "bindingVersion": "0.2.0"
-            }
-          }
-        }
-      },
-      "bindings": {
-        "amqp": {
-          "is": "routingKey",
-          "exchange": {
-            "name": "example-consumer-topic-exchange",
-            "vhost": "/"
-          },
-          "bindingVersion": "0.2.0"
-        }
-      }
-    },
-    "example-producer-channel": {
-      "subscribe": {
-        "operationId": "example-producer-channel_subscribe",
-        "description": "example-producer-channel-description",
-        "bindings": {
-          "amqp": {
-            "cc": [
-              "example-topic-routing-key"
-            ],
-            "bindingVersion": "0.2.0"
-          }
-        },
-        "message": {
-          "schemaFormat": "application/vnd.oai.openapi+json;version=3.0.0",
-          "name": "io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto",
-          "title": "AnotherPayloadDto",
-          "description": "Another payload model",
-          "payload": {
-            "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto"
-          },
-          "headers": {
-            "$ref": "#/components/schemas/HeadersNotDocumented"
-          },
-          "bindings": {
-            "amqp": {
-              "bindingVersion": "0.2.0"
-            }
-          }
-        }
-      },
-      "bindings": {
-        "amqp": {
-          "is": "routingKey",
-          "exchange": {
-            "name": "example-topic-exchange",
-            "vhost": "/"
-          },
-          "bindingVersion": "0.2.0"
-        }
-      }
-    },
     "example-producer-channel-publisher": {
       "subscribe": {
         "operationId": "example-producer-channel-publisher_subscribe",