diff --git a/.gitignore b/.gitignore
index 85ca116dc..960d17f1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,9 @@ asyncapi.actual.json
.classpath
.project
.settings/
+
+# VsCode
+.vscode/
+
+# Mac
+.DS_Store
diff --git a/springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/stavshamir/springwolf/addons/common_model_converters/configuration/CommonModelConvertersAutoConfiguration.java b/springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/springwolf/addons/common_model_converters/configuration/CommonModelConvertersAutoConfiguration.java
similarity index 70%
rename from springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/stavshamir/springwolf/addons/common_model_converters/configuration/CommonModelConvertersAutoConfiguration.java
rename to springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/springwolf/addons/common_model_converters/configuration/CommonModelConvertersAutoConfiguration.java
index 0145b7102..5dcce6287 100644
--- a/springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/stavshamir/springwolf/addons/common_model_converters/configuration/CommonModelConvertersAutoConfiguration.java
+++ b/springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/springwolf/addons/common_model_converters/configuration/CommonModelConvertersAutoConfiguration.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.addons.common_model_converters.configuration;
+package io.github.springwolf.addons.common_model_converters.configuration;
-import io.github.stavshamir.springwolf.addons.common_model_converters.converters.monetaryamount.MonetaryAmountConverter;
+import io.github.springwolf.addons.common_model_converters.converters.monetaryamount.MonetaryAmountConverter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/stavshamir/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmount.java b/springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmount.java
similarity index 81%
rename from springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/stavshamir/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmount.java
rename to springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmount.java
index 7efab0293..dd784cb47 100644
--- a/springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/stavshamir/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmount.java
+++ b/springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmount.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.addons.common_model_converters.converters.monetaryamount;
+package io.github.springwolf.addons.common_model_converters.converters.monetaryamount;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/stavshamir/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmountConverter.java b/springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmountConverter.java
similarity index 90%
rename from springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/stavshamir/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmountConverter.java
rename to springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmountConverter.java
index d10d2203c..90142f8d1 100644
--- a/springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/stavshamir/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmountConverter.java
+++ b/springwolf-add-ons/springwolf-common-model-converters/src/main/java/io/github/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmountConverter.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.addons.common_model_converters.converters.monetaryamount;
+package io.github.springwolf.addons.common_model_converters.converters.monetaryamount;
import com.fasterxml.jackson.databind.JavaType;
import io.swagger.v3.core.converter.AnnotatedType;
diff --git a/springwolf-add-ons/springwolf-common-model-converters/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springwolf-add-ons/springwolf-common-model-converters/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 82cd271e3..edb607be8 100644
--- a/springwolf-add-ons/springwolf-common-model-converters/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/springwolf-add-ons/springwolf-common-model-converters/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-io.github.stavshamir.springwolf.addons.common_model_converters.configuration.CommonModelConvertersAutoConfiguration
+io.github.springwolf.addons.common_model_converters.configuration.CommonModelConvertersAutoConfiguration
diff --git a/springwolf-add-ons/springwolf-common-model-converters/src/test/java/io/github/stavshamir/springwolf/addons/common_model_converters/converters/MonetaryAmountConverterTest.java b/springwolf-add-ons/springwolf-common-model-converters/src/test/java/io/github/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmountConverterTest.java
similarity index 86%
rename from springwolf-add-ons/springwolf-common-model-converters/src/test/java/io/github/stavshamir/springwolf/addons/common_model_converters/converters/MonetaryAmountConverterTest.java
rename to springwolf-add-ons/springwolf-common-model-converters/src/test/java/io/github/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmountConverterTest.java
index dc5d43602..57f203db6 100644
--- a/springwolf-add-ons/springwolf-common-model-converters/src/test/java/io/github/stavshamir/springwolf/addons/common_model_converters/converters/MonetaryAmountConverterTest.java
+++ b/springwolf-add-ons/springwolf-common-model-converters/src/test/java/io/github/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmountConverterTest.java
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.addons.common_model_converters.converters;
+package io.github.springwolf.addons.common_model_converters.converters.monetaryamount;
-import io.github.stavshamir.springwolf.addons.common_model_converters.converters.monetaryamount.MonetaryAmountConverter;
import io.swagger.v3.core.converter.AnnotatedType;
import io.swagger.v3.core.converter.ModelConverters;
import io.swagger.v3.oas.models.media.Schema;
diff --git a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/AsyncGenericOperationBinding.java b/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/AsyncGenericOperationBinding.java
similarity index 82%
rename from springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/AsyncGenericOperationBinding.java
rename to springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/AsyncGenericOperationBinding.java
index d32103d73..23480ed24 100644
--- a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/AsyncGenericOperationBinding.java
+++ b/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/AsyncGenericOperationBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.addons.generic_binding.annotation;
+package io.github.springwolf.addons.generic_binding.annotation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/configuration/SpringwolfGenericBindingAutoConfiguration.java b/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/configuration/SpringwolfGenericBindingAutoConfiguration.java
similarity index 62%
rename from springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/configuration/SpringwolfGenericBindingAutoConfiguration.java
rename to springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/configuration/SpringwolfGenericBindingAutoConfiguration.java
index bf9a93ab1..c07b6b25c 100644
--- a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/configuration/SpringwolfGenericBindingAutoConfiguration.java
+++ b/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/configuration/SpringwolfGenericBindingAutoConfiguration.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.addons.generic_binding.annotation.configuration;
+package io.github.springwolf.addons.generic_binding.annotation.configuration;
-import io.github.stavshamir.springwolf.addons.generic_binding.annotation.processor.AsyncGenericOperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingProcessorPriority;
+import io.github.springwolf.addons.generic_binding.annotation.processor.AsyncGenericOperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingProcessorPriority;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
diff --git a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessor.java b/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessor.java
similarity index 64%
rename from springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessor.java
rename to springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessor.java
index 0d721d5b6..59278265c 100644
--- a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessor.java
+++ b/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessor.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.addons.generic_binding.annotation.processor;
+package io.github.springwolf.addons.generic_binding.annotation.processor;
-import io.github.stavshamir.springwolf.addons.generic_binding.annotation.AsyncGenericOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.AbstractOperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.addons.generic_binding.annotation.AsyncGenericOperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.processor.AbstractOperationBindingProcessor;
import java.util.HashMap;
import java.util.Map;
diff --git a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/processor/PropertiesUtil.java b/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/processor/PropertiesUtil.java
similarity index 95%
rename from springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/processor/PropertiesUtil.java
rename to springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/processor/PropertiesUtil.java
index 35d023bcd..7a4b1c96e 100644
--- a/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/processor/PropertiesUtil.java
+++ b/springwolf-add-ons/springwolf-generic-binding/src/main/java/io/github/springwolf/addons/generic_binding/annotation/processor/PropertiesUtil.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.addons.generic_binding.annotation.processor;
+package io.github.springwolf.addons.generic_binding.annotation.processor;
import lombok.extern.slf4j.Slf4j;
diff --git a/springwolf-add-ons/springwolf-generic-binding/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springwolf-add-ons/springwolf-generic-binding/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index c201ab823..d03f6e98b 100644
--- a/springwolf-add-ons/springwolf-generic-binding/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/springwolf-add-ons/springwolf-generic-binding/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-io.github.stavshamir.springwolf.addons.generic_binding.annotation.configuration.SpringwolfGenericBindingAutoConfiguration
+io.github.springwolf.addons.generic_binding.annotation.configuration.SpringwolfGenericBindingAutoConfiguration
diff --git a/springwolf-add-ons/springwolf-generic-binding/src/test/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessorTest.java b/springwolf-add-ons/springwolf-generic-binding/src/test/java/io/github/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessorTest.java
similarity index 93%
rename from springwolf-add-ons/springwolf-generic-binding/src/test/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessorTest.java
rename to springwolf-add-ons/springwolf-generic-binding/src/test/java/io/github/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessorTest.java
index 40b50c3f1..33622515e 100644
--- a/springwolf-add-ons/springwolf-generic-binding/src/test/java/io/github/stavshamir/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessorTest.java
+++ b/springwolf-add-ons/springwolf-generic-binding/src/test/java/io/github/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessorTest.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.addons.generic_binding.annotation.processor;
+package io.github.springwolf.addons.generic_binding.annotation.processor;
-import io.github.stavshamir.springwolf.addons.generic_binding.annotation.AsyncGenericOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.addons.generic_binding.annotation.AsyncGenericOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
diff --git a/springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/stavshamir/springwolf/addons/json_schema/JsonSchemaCustomizer.java b/springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/springwolf/addons/json_schema/JsonSchemaCustomizer.java
similarity index 82%
rename from springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/stavshamir/springwolf/addons/json_schema/JsonSchemaCustomizer.java
rename to springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/springwolf/addons/json_schema/JsonSchemaCustomizer.java
index d9c347150..564537386 100644
--- a/springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/stavshamir/springwolf/addons/json_schema/JsonSchemaCustomizer.java
+++ b/springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/springwolf/addons/json_schema/JsonSchemaCustomizer.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.addons.json_schema;
+package io.github.springwolf.addons.json_schema;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiCustomizer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.core.asyncapi.AsyncApiCustomizer;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/stavshamir/springwolf/addons/json_schema/JsonSchemaGenerator.java b/springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/springwolf/addons/json_schema/JsonSchemaGenerator.java
similarity index 96%
rename from springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/stavshamir/springwolf/addons/json_schema/JsonSchemaGenerator.java
rename to springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/springwolf/addons/json_schema/JsonSchemaGenerator.java
index a5802f0a9..4bcbfc2d0 100644
--- a/springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/stavshamir/springwolf/addons/json_schema/JsonSchemaGenerator.java
+++ b/springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/springwolf/addons/json_schema/JsonSchemaGenerator.java
@@ -1,13 +1,13 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.addons.json_schema;
+package io.github.springwolf.addons.json_schema;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.components.ComponentSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.model.components.ComponentSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
diff --git a/springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/stavshamir/springwolf/addons/json_schema/configuration/SpringwolfJsonSchemaAutoConfiguration.java b/springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/springwolf/addons/json_schema/configuration/SpringwolfJsonSchemaAutoConfiguration.java
similarity index 66%
rename from springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/stavshamir/springwolf/addons/json_schema/configuration/SpringwolfJsonSchemaAutoConfiguration.java
rename to springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/springwolf/addons/json_schema/configuration/SpringwolfJsonSchemaAutoConfiguration.java
index 43bd05a87..3d4810c76 100644
--- a/springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/stavshamir/springwolf/addons/json_schema/configuration/SpringwolfJsonSchemaAutoConfiguration.java
+++ b/springwolf-add-ons/springwolf-json-schema/src/main/java/io/github/springwolf/addons/json_schema/configuration/SpringwolfJsonSchemaAutoConfiguration.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.addons.json_schema.configuration;
+package io.github.springwolf.addons.json_schema.configuration;
import com.fasterxml.jackson.databind.ObjectMapper;
-import io.github.stavshamir.springwolf.addons.json_schema.JsonSchemaCustomizer;
-import io.github.stavshamir.springwolf.addons.json_schema.JsonSchemaGenerator;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiCustomizer;
+import io.github.springwolf.addons.json_schema.JsonSchemaCustomizer;
+import io.github.springwolf.addons.json_schema.JsonSchemaGenerator;
+import io.github.springwolf.core.asyncapi.AsyncApiCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/springwolf-add-ons/springwolf-json-schema/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springwolf-add-ons/springwolf-json-schema/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 43fd6dc14..95c58ee20 100644
--- a/springwolf-add-ons/springwolf-json-schema/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/springwolf-add-ons/springwolf-json-schema/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-io.github.stavshamir.springwolf.addons.json_schema.configuration.SpringwolfJsonSchemaAutoConfiguration
+io.github.springwolf.addons.json_schema.configuration.SpringwolfJsonSchemaAutoConfiguration
diff --git a/springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/stavshamir/springwolf/addons/json_schema/JsonSchemaCustomizerTest.java b/springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/springwolf/addons/json_schema/JsonSchemaCustomizerTest.java
similarity index 86%
rename from springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/stavshamir/springwolf/addons/json_schema/JsonSchemaCustomizerTest.java
rename to springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/springwolf/addons/json_schema/JsonSchemaCustomizerTest.java
index b1a64b510..436a5193d 100644
--- a/springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/stavshamir/springwolf/addons/json_schema/JsonSchemaCustomizerTest.java
+++ b/springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/springwolf/addons/json_schema/JsonSchemaCustomizerTest.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.addons.json_schema;
+package io.github.springwolf.addons.json_schema;
import com.fasterxml.jackson.core.JsonProcessingException;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.components.Components;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.components.Components;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/stavshamir/springwolf/addons/json_schema/JsonSchemaGeneratorTest.java b/springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/springwolf/addons/json_schema/JsonSchemaGeneratorTest.java
similarity index 97%
rename from springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/stavshamir/springwolf/addons/json_schema/JsonSchemaGeneratorTest.java
rename to springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/springwolf/addons/json_schema/JsonSchemaGeneratorTest.java
index c1fd93b25..9bea6ee30 100644
--- a/springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/stavshamir/springwolf/addons/json_schema/JsonSchemaGeneratorTest.java
+++ b/springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/springwolf/addons/json_schema/JsonSchemaGeneratorTest.java
@@ -1,15 +1,15 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.addons.json_schema;
+package io.github.springwolf.addons.json_schema;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.networknt.schema.JsonSchemaFactory;
import com.networknt.schema.SpecVersionDetector;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.components.ComponentSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
-import io.github.stavshamir.springwolf.schemas.SwaggerSchemaUtil;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.components.ComponentSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.core.schemas.SwaggerSchemaUtil;
import io.swagger.v3.core.util.Json;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.BooleanSchema;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/ChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/ChannelBinding.java
similarity index 61%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/ChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/ChannelBinding.java
index b23b27699..e7b913720 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/ChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/ChannelBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings;
+package io.github.springwolf.asyncapi.v3.bindings;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
import lombok.EqualsAndHashCode;
/**
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/MessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/MessageBinding.java
similarity index 56%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/MessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/MessageBinding.java
index 1c3bee48a..26e5e11de 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/MessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/MessageBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings;
+package io.github.springwolf.asyncapi.v3.bindings;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/OperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/OperationBinding.java
similarity index 62%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/OperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/OperationBinding.java
index 0cc1ac83e..595a041bf 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/OperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/OperationBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings;
+package io.github.springwolf.asyncapi.v3.bindings;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
import lombok.EqualsAndHashCode;
/**
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/ServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/ServerBinding.java
similarity index 62%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/ServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/ServerBinding.java
index add4e3e9c..b8024f2c4 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/ServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/ServerBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings;
+package io.github.springwolf.asyncapi.v3.bindings;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
import lombok.EqualsAndHashCode;
/**
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelBinding.java
similarity index 88%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelBinding.java
index 4e3ed8af8..0c17d3e2f 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp;
+package io.github.springwolf.asyncapi.v3.bindings.amqp;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelExchangeProperties.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelExchangeProperties.java
similarity index 95%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelExchangeProperties.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelExchangeProperties.java
index f92e151c5..c0a8fb41d 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelExchangeProperties.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelExchangeProperties.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp;
+package io.github.springwolf.asyncapi.v3.bindings.amqp;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.Size;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelExchangeType.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelExchangeType.java
similarity index 88%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelExchangeType.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelExchangeType.java
index d5f66f294..838584140 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelExchangeType.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelExchangeType.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp;
+package io.github.springwolf.asyncapi.v3.bindings.amqp;
public enum AMQPChannelExchangeType {
TOPIC("topic"),
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelQueueProperties.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelQueueProperties.java
similarity index 94%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelQueueProperties.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelQueueProperties.java
index 02c78a985..c639482c1 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelQueueProperties.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelQueueProperties.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp;
+package io.github.springwolf.asyncapi.v3.bindings.amqp;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.Size;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelType.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelType.java
similarity index 85%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelType.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelType.java
index edce99490..ed70c6a54 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelType.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPChannelType.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp;
+package io.github.springwolf.asyncapi.v3.bindings.amqp;
public enum AMQPChannelType {
QUEUE("queue"),
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPMessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPMessageBinding.java
similarity index 86%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPMessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPMessageBinding.java
index 0157651b9..4229e2390 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPMessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPMessageBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp;
+package io.github.springwolf.asyncapi.v3.bindings.amqp;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPOperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPOperationBinding.java
similarity index 95%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPOperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPOperationBinding.java
index 941071daa..416e388ac 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPOperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPOperationBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp;
+package io.github.springwolf.asyncapi.v3.bindings.amqp;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.PositiveOrZero;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPServerBinding.java
similarity index 78%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPServerBinding.java
index 9d9e6bc0a..d152bc929 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPServerBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp;
+package io.github.springwolf.asyncapi.v3.bindings.amqp;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ServerBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ServerBinding;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp1/AMQP1ChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp1/AMQP1ChannelBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp1/AMQP1ChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp1/AMQP1ChannelBinding.java
index e684bbd64..c85807fb8 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp1/AMQP1ChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp1/AMQP1ChannelBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp1;
+package io.github.springwolf.asyncapi.v3.bindings.amqp1;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp1/AMQP1MessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp1/AMQP1MessageBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp1/AMQP1MessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp1/AMQP1MessageBinding.java
index 9295f5877..40b556280 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp1/AMQP1MessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp1/AMQP1MessageBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp1;
+package io.github.springwolf.asyncapi.v3.bindings.amqp1;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp1/AMQP1OperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp1/AMQP1OperationBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp1/AMQP1OperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp1/AMQP1OperationBinding.java
index 37a202b17..5498f68e2 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp1/AMQP1OperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp1/AMQP1OperationBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp1;
+package io.github.springwolf.asyncapi.v3.bindings.amqp1;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp1/AMQP1ServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp1/AMQP1ServerBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp1/AMQP1ServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp1/AMQP1ServerBinding.java
index b5e701b7c..c1afaff3a 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp1/AMQP1ServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/amqp1/AMQP1ServerBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp1;
+package io.github.springwolf.asyncapi.v3.bindings.amqp1;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ServerBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ServerBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubChannelBinding.java
similarity index 91%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubChannelBinding.java
index 94d64c142..05ecb502c 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubChannelBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.googlepubsub;
+package io.github.springwolf.asyncapi.v3.bindings.googlepubsub;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubMessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubMessageBinding.java
similarity index 91%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubMessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubMessageBinding.java
index 110868658..596a037be 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubMessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubMessageBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.googlepubsub;
+package io.github.springwolf.asyncapi.v3.bindings.googlepubsub;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubMessageStoragePolicy.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubMessageStoragePolicy.java
similarity index 90%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubMessageStoragePolicy.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubMessageStoragePolicy.java
index b8bf78d6c..f5af5ee0d 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubMessageStoragePolicy.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubMessageStoragePolicy.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.googlepubsub;
+package io.github.springwolf.asyncapi.v3.bindings.googlepubsub;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubOperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubOperationBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubOperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubOperationBinding.java
index fbd396610..21e7065c7 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubOperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubOperationBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.googlepubsub;
+package io.github.springwolf.asyncapi.v3.bindings.googlepubsub;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubSchema.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubSchema.java
similarity index 92%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubSchema.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubSchema.java
index cb25beea6..20a3cb101 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubSchema.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubSchema.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.googlepubsub;
+package io.github.springwolf.asyncapi.v3.bindings.googlepubsub;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubSchemaSettings.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubSchemaSettings.java
similarity index 93%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubSchemaSettings.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubSchemaSettings.java
index f1573e8ff..2891654ca 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubSchemaSettings.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubSchemaSettings.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.googlepubsub;
+package io.github.springwolf.asyncapi.v3.bindings.googlepubsub;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubServerBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubServerBinding.java
index 9853b661c..d67ea7924 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubServerBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.googlepubsub;
+package io.github.springwolf.asyncapi.v3.bindings.googlepubsub;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSChannelBinding.java
similarity index 91%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSChannelBinding.java
index 28b5db095..cc6fa8e8e 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSChannelBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms;
+package io.github.springwolf.asyncapi.v3.bindings.jms;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSChannelBindingDestinationType.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSChannelBindingDestinationType.java
similarity index 87%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSChannelBindingDestinationType.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSChannelBindingDestinationType.java
index 8174576a1..5e3f0c894 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSChannelBindingDestinationType.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSChannelBindingDestinationType.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms;
+package io.github.springwolf.asyncapi.v3.bindings.jms;
public enum JMSChannelBindingDestinationType {
QUEUE("queue"),
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSMessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSMessageBinding.java
similarity index 84%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSMessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSMessageBinding.java
index 90bfe3c58..33235f148 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSMessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSMessageBinding.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms;
+package io.github.springwolf.asyncapi.v3.bindings.jms;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.Schema;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.model.schema.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSOperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSOperationBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSOperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSOperationBinding.java
index 5350f9e02..a8e282584 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSOperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSOperationBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms;
+package io.github.springwolf.asyncapi.v3.bindings.jms;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSServerBinding.java
similarity index 91%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSServerBinding.java
index 379947655..2c6785278 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSServerBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms;
+package io.github.springwolf.asyncapi.v3.bindings.jms;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ServerBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ServerBinding;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelBinding.java
similarity index 91%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelBinding.java
index 6f2f2d71e..d24dbd34f 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka;
+package io.github.springwolf.asyncapi.v3.bindings.kafka;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import jakarta.validation.constraints.Positive;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelTopicCleanupPolicy.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelTopicCleanupPolicy.java
similarity index 86%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelTopicCleanupPolicy.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelTopicCleanupPolicy.java
index 53cb8832a..4b293ae04 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelTopicCleanupPolicy.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelTopicCleanupPolicy.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka;
+package io.github.springwolf.asyncapi.v3.bindings.kafka;
public enum KafkaChannelTopicCleanupPolicy {
COMPACT("compact"),
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelTopicConfiguration.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelTopicConfiguration.java
similarity index 96%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelTopicConfiguration.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelTopicConfiguration.java
index db117a94a..4d6f68730 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelTopicConfiguration.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaChannelTopicConfiguration.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka;
+package io.github.springwolf.asyncapi.v3.bindings.kafka;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.Min;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaMessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaMessageBinding.java
similarity index 87%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaMessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaMessageBinding.java
index c94bd5310..e3daab8de 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaMessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaMessageBinding.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka;
+package io.github.springwolf.asyncapi.v3.bindings.kafka;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.Schema;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.model.schema.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaOperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaOperationBinding.java
similarity index 82%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaOperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaOperationBinding.java
index 7b12b66df..3dd6a0130 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaOperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaOperationBinding.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka;
+package io.github.springwolf.asyncapi.v3.bindings.kafka;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.Schema;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.schema.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaServerBinding.java
similarity index 89%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaServerBinding.java
index 3fc9f42f9..d3e008159 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaServerBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka;
+package io.github.springwolf.asyncapi.v3.bindings.kafka;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ServerBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ServerBinding;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mercure/MercureChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mercure/MercureChannelBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mercure/MercureChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mercure/MercureChannelBinding.java
index f1df61c9d..72d4d0503 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mercure/MercureChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mercure/MercureChannelBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.mercure;
+package io.github.springwolf.asyncapi.v3.bindings.mercure;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mercure/MercureMessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mercure/MercureMessageBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mercure/MercureMessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mercure/MercureMessageBinding.java
index bb9521e76..d28136c67 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mercure/MercureMessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mercure/MercureMessageBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.mercure;
+package io.github.springwolf.asyncapi.v3.bindings.mercure;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mercure/MercureOperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mercure/MercureOperationBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mercure/MercureOperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mercure/MercureOperationBinding.java
index 8fb649fa3..213fe4829 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mercure/MercureOperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mercure/MercureOperationBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.mercure;
+package io.github.springwolf.asyncapi.v3.bindings.mercure;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mercure/MercureServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mercure/MercureServerBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mercure/MercureServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mercure/MercureServerBinding.java
index 95a9a16cd..4a97f1998 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mercure/MercureServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mercure/MercureServerBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.mercure;
+package io.github.springwolf.asyncapi.v3.bindings.mercure;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTChannelBinding.java
similarity index 76%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTChannelBinding.java
index cbf114757..aa83f3b69 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTChannelBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.mqtt;
+package io.github.springwolf.asyncapi.v3.bindings.mqtt;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTMessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTMessageBinding.java
similarity index 92%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTMessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTMessageBinding.java
index 5f15f4aa8..2c5f34192 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTMessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTMessageBinding.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.mqtt;
+package io.github.springwolf.asyncapi.v3.bindings.mqtt;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.Schema;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.model.schema.Schema;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import lombok.AllArgsConstructor;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTOperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTOperationBinding.java
similarity index 91%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTOperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTOperationBinding.java
index 9eb954b21..c04095409 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTOperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTOperationBinding.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.mqtt;
+package io.github.springwolf.asyncapi.v3.bindings.mqtt;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.Schema;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.schema.Schema;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import lombok.AllArgsConstructor;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTServerBinding.java
similarity index 93%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTServerBinding.java
index 886f331b0..97f039be2 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTServerBinding.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.mqtt;
+package io.github.springwolf.asyncapi.v3.bindings.mqtt;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ServerBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.Schema;
+import io.github.springwolf.asyncapi.v3.bindings.ServerBinding;
+import io.github.springwolf.asyncapi.v3.model.schema.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTServerLastWill.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTServerLastWill.java
similarity index 94%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTServerLastWill.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTServerLastWill.java
index 3d380d01c..5db7698bf 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTServerLastWill.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTServerLastWill.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.mqtt;
+package io.github.springwolf.asyncapi.v3.bindings.mqtt;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.Max;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/nats/NATSChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/nats/NATSChannelBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/nats/NATSChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/nats/NATSChannelBinding.java
index d93b8170f..14f121436 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/nats/NATSChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/nats/NATSChannelBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.nats;
+package io.github.springwolf.asyncapi.v3.bindings.nats;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/nats/NATSMessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/nats/NATSMessageBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/nats/NATSMessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/nats/NATSMessageBinding.java
index d6a822405..a4d5d2328 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/nats/NATSMessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/nats/NATSMessageBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.nats;
+package io.github.springwolf.asyncapi.v3.bindings.nats;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/nats/NATSOperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/nats/NATSOperationBinding.java
similarity index 85%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/nats/NATSOperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/nats/NATSOperationBinding.java
index bec478f3a..778a62ad3 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/nats/NATSOperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/nats/NATSOperationBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.nats;
+package io.github.springwolf.asyncapi.v3.bindings.nats;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/nats/NATSServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/nats/NATSServerBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/nats/NATSServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/nats/NATSServerBinding.java
index 8c3f177a7..e5e5a4829 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/nats/NATSServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/nats/NATSServerBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.nats;
+package io.github.springwolf.asyncapi.v3.bindings.nats;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ServerBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ServerBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarChannelBinding.java
similarity index 94%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarChannelBinding.java
index 36b8cff43..cbdd4fb49 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarChannelBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.pulsar;
+package io.github.springwolf.asyncapi.v3.bindings.pulsar;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarMessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarMessageBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarMessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarMessageBinding.java
index bdb7d9a76..2aec9c34f 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarMessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarMessageBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.pulsar;
+package io.github.springwolf.asyncapi.v3.bindings.pulsar;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarOperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarOperationBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarOperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarOperationBinding.java
index b133a1a8b..45db19c47 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarOperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarOperationBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.pulsar;
+package io.github.springwolf.asyncapi.v3.bindings.pulsar;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarRetention.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarRetention.java
similarity index 90%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarRetention.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarRetention.java
index 072bda22b..11c41b74d 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarRetention.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarRetention.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.pulsar;
+package io.github.springwolf.asyncapi.v3.bindings.pulsar;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarServerBinding.java
similarity index 87%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarServerBinding.java
index 72ecca3c7..a4b259a57 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarServerBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.pulsar;
+package io.github.springwolf.asyncapi.v3.bindings.pulsar;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ServerBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ServerBinding;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/redis/RedisChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/redis/RedisChannelBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/redis/RedisChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/redis/RedisChannelBinding.java
index 652a5ccb2..80ff157d7 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/redis/RedisChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/redis/RedisChannelBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.redis;
+package io.github.springwolf.asyncapi.v3.bindings.redis;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/redis/RedisMessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/redis/RedisMessageBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/redis/RedisMessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/redis/RedisMessageBinding.java
index 90f454504..183efda95 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/redis/RedisMessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/redis/RedisMessageBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.redis;
+package io.github.springwolf.asyncapi.v3.bindings.redis;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/redis/RedisOperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/redis/RedisOperationBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/redis/RedisOperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/redis/RedisOperationBinding.java
index 2e1979e96..70ada57db 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/redis/RedisOperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/redis/RedisOperationBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.redis;
+package io.github.springwolf.asyncapi.v3.bindings.redis;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/redis/RedisServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/redis/RedisServerBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/redis/RedisServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/redis/RedisServerBinding.java
index 38a4ffe04..4fa240ad9 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/redis/RedisServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/redis/RedisServerBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.redis;
+package io.github.springwolf.asyncapi.v3.bindings.redis;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ServerBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ServerBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBinding.java
similarity index 93%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBinding.java
index 7d9ea9e10..515a81afa 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns;
+package io.github.springwolf.asyncapi.v3.bindings.sns;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingEffect.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingEffect.java
similarity index 86%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingEffect.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingEffect.java
index 84d1c0155..2293cd6dc 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingEffect.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingEffect.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns;
+package io.github.springwolf.asyncapi.v3.bindings.sns;
public enum SNSChannelBindingEffect {
ALLOW("Allow"),
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingOrdering.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingOrdering.java
similarity index 92%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingOrdering.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingOrdering.java
index 81419c102..d08f5d0bf 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingOrdering.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingOrdering.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns;
+package io.github.springwolf.asyncapi.v3.bindings.sns;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingOrderingType.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingOrderingType.java
similarity index 87%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingOrderingType.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingOrderingType.java
index 6c9acb98c..ca27db50e 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingOrderingType.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingOrderingType.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns;
+package io.github.springwolf.asyncapi.v3.bindings.sns;
public enum SNSChannelBindingOrderingType {
STANDARD("standard"),
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingPolicy.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingPolicy.java
similarity index 89%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingPolicy.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingPolicy.java
index ec7a8a044..7524409bd 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingPolicy.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingPolicy.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns;
+package io.github.springwolf.asyncapi.v3.bindings.sns;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingStatements.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingStatements.java
similarity index 92%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingStatements.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingStatements.java
index bc38b8ca4..6725742f2 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingStatements.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSChannelBindingStatements.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns;
+package io.github.springwolf.asyncapi.v3.bindings.sns;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSMessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSMessageBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSMessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSMessageBinding.java
index 665bdbfa5..f7e1dcfd8 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSMessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSMessageBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns;
+package io.github.springwolf.asyncapi.v3.bindings.sns;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBinding.java
similarity index 95%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBinding.java
index 77c590338..50e710ab4 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns;
+package io.github.springwolf.asyncapi.v3.bindings.sns;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingConsumer.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingConsumer.java
similarity index 98%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingConsumer.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingConsumer.java
index f9e4a0acd..a470de287 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingConsumer.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingConsumer.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns;
+package io.github.springwolf.asyncapi.v3.bindings.sns;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingDeliveryPolicy.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingDeliveryPolicy.java
similarity index 97%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingDeliveryPolicy.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingDeliveryPolicy.java
index fe6ee2b01..7701453f7 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingDeliveryPolicy.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingDeliveryPolicy.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns;
+package io.github.springwolf.asyncapi.v3.bindings.sns;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingIdentifier.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingIdentifier.java
similarity index 96%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingIdentifier.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingIdentifier.java
index 3e29d4ea4..4a32a9189 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingIdentifier.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingIdentifier.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns;
+package io.github.springwolf.asyncapi.v3.bindings.sns;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingRedrivePolicy.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingRedrivePolicy.java
similarity index 95%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingRedrivePolicy.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingRedrivePolicy.java
index 51ae41784..b71020b70 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingRedrivePolicy.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSOperationBindingRedrivePolicy.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns;
+package io.github.springwolf.asyncapi.v3.bindings.sns;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSServerBinding.java
similarity index 78%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSServerBinding.java
index 38e106368..b2cffc71f 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSServerBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns;
+package io.github.springwolf.asyncapi.v3.bindings.sns;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ServerBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ServerBinding;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBinding.java
similarity index 94%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBinding.java
index 60db161b9..6bd40d995 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs;
+package io.github.springwolf.asyncapi.v3.bindings.sqs;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingDeduplicationScope.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingDeduplicationScope.java
similarity index 87%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingDeduplicationScope.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingDeduplicationScope.java
index e5cf75814..b63e66914 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingDeduplicationScope.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingDeduplicationScope.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs;
+package io.github.springwolf.asyncapi.v3.bindings.sqs;
public enum SQSChannelBindingDeduplicationScope {
MESSAGE_GROUP("messageGroup"),
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingFifoThroughput.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingFifoThroughput.java
similarity index 87%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingFifoThroughput.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingFifoThroughput.java
index 8c1fdf360..0b5606164 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingFifoThroughput.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingFifoThroughput.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs;
+package io.github.springwolf.asyncapi.v3.bindings.sqs;
public enum SQSChannelBindingFifoThroughput {
PER_QUEUE("perQueue"),
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingPolicy.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingPolicy.java
similarity index 89%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingPolicy.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingPolicy.java
index 2fb7d94dd..074279ca2 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingPolicy.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingPolicy.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs;
+package io.github.springwolf.asyncapi.v3.bindings.sqs;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingQueue.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingQueue.java
similarity index 98%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingQueue.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingQueue.java
index 1ac3dee36..4a4a5b79e 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingQueue.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingQueue.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs;
+package io.github.springwolf.asyncapi.v3.bindings.sqs;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.Max;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingStatement.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingStatement.java
similarity index 92%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingStatement.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingStatement.java
index 6d1601fac..1adca89bd 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingStatement.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingStatement.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs;
+package io.github.springwolf.asyncapi.v3.bindings.sqs;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingStatementEffect.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingStatementEffect.java
similarity index 87%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingStatementEffect.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingStatementEffect.java
index 2b44bab6c..5d19f8c54 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingStatementEffect.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSChannelBindingStatementEffect.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs;
+package io.github.springwolf.asyncapi.v3.bindings.sqs;
public enum SQSChannelBindingStatementEffect {
ALLOW("Allow"),
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSMessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSMessageBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSMessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSMessageBinding.java
index b43ae67be..d8b310990 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSMessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSMessageBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs;
+package io.github.springwolf.asyncapi.v3.bindings.sqs;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSOperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSOperationBinding.java
similarity index 91%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSOperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSOperationBinding.java
index d3995b0fa..b06264e7b 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSOperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSOperationBinding.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs;
+package io.github.springwolf.asyncapi.v3.bindings.sqs;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSServerBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSServerBinding.java
index e6b7a46d6..1e3032fc6 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSServerBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs;
+package io.github.springwolf.asyncapi.v3.bindings.sqs;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ServerBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ServerBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/stomp/StompChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/stomp/StompChannelBinding.java
similarity index 73%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/stomp/StompChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/stomp/StompChannelBinding.java
index 8e3972a94..d420c547b 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/stomp/StompChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/stomp/StompChannelBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.stomp; // SPDX-License-Identifier: Apache-2.0
+package io.github.springwolf.asyncapi.v3.bindings.stomp; // SPDX-License-Identifier: Apache-2.0
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/stomp/StompMessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/stomp/StompMessageBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/stomp/StompMessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/stomp/StompMessageBinding.java
index 2c13f4ca7..9c8c6ee4d 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/stomp/StompMessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/stomp/StompMessageBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.stomp;
+package io.github.springwolf.asyncapi.v3.bindings.stomp;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/stomp/StompOperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/stomp/StompOperationBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/stomp/StompOperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/stomp/StompOperationBinding.java
index ae7fec87a..f6e98ec22 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/stomp/StompOperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/stomp/StompOperationBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.stomp;
+package io.github.springwolf.asyncapi.v3.bindings.stomp;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/stomp/StompServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/stomp/StompServerBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/stomp/StompServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/stomp/StompServerBinding.java
index 18aa5b6b0..e3b86f400 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/stomp/StompServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/stomp/StompServerBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.stomp;
+package io.github.springwolf.asyncapi.v3.bindings.stomp;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ServerBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ServerBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/websockets/WebSocketChannelBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/websockets/WebSocketChannelBinding.java
similarity index 89%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/websockets/WebSocketChannelBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/websockets/WebSocketChannelBinding.java
index 66e7ab61c..a2d710bc0 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/websockets/WebSocketChannelBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/websockets/WebSocketChannelBinding.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.websockets;
+package io.github.springwolf.asyncapi.v3.bindings.websockets;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.Schema;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.model.schema.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/websockets/WebSocketMessageBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/websockets/WebSocketMessageBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/websockets/WebSocketMessageBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/websockets/WebSocketMessageBinding.java
index c84d84b34..e33d2ed50 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/websockets/WebSocketMessageBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/websockets/WebSocketMessageBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.websockets;
+package io.github.springwolf.asyncapi.v3.bindings.websockets;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/websockets/WebSocketOperationBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/websockets/WebSocketOperationBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/websockets/WebSocketOperationBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/websockets/WebSocketOperationBinding.java
index bada7c3c5..ca98b1cae 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/websockets/WebSocketOperationBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/websockets/WebSocketOperationBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.websockets;
+package io.github.springwolf.asyncapi.v3.bindings.websockets;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/websockets/WebSocketServerBinding.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/websockets/WebSocketServerBinding.java
similarity index 77%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/websockets/WebSocketServerBinding.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/websockets/WebSocketServerBinding.java
index 4e5b9ad03..c68f96a6b 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/websockets/WebSocketServerBinding.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/bindings/websockets/WebSocketServerBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.websockets;
+package io.github.springwolf.asyncapi.v3.bindings.websockets;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ServerBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ServerBinding;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/AsyncApiSerializerService.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/AsyncApiSerializerService.java
similarity index 82%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/AsyncApiSerializerService.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/AsyncApiSerializerService.java
index 927352b9e..e5f82ea9d 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/AsyncApiSerializerService.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/AsyncApiSerializerService.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.jackson;
+package io.github.springwolf.asyncapi.v3.jackson;
import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/DefaultAsyncApiSerializer.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/DefaultAsyncApiSerializer.java
similarity index 97%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/DefaultAsyncApiSerializer.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/DefaultAsyncApiSerializer.java
index 9fb8cc617..ccd347169 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/DefaultAsyncApiSerializer.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/DefaultAsyncApiSerializer.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.jackson;
+package io.github.springwolf.asyncapi.v3.jackson;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.PrettyPrinter;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/model/channel/message/ComponentSchemaSerializer.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/model/channel/message/ComponentSchemaSerializer.java
similarity index 81%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/model/channel/message/ComponentSchemaSerializer.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/model/channel/message/ComponentSchemaSerializer.java
index 4003680dd..9a029b535 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/model/channel/message/ComponentSchemaSerializer.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/model/channel/message/ComponentSchemaSerializer.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.jackson.model.channel.message;
+package io.github.springwolf.asyncapi.v3.jackson.model.channel.message;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.components.ComponentSchema;
+import io.github.springwolf.asyncapi.v3.model.components.ComponentSchema;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/model/channel/message/MessageHeadersSerializer.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/model/channel/message/MessageHeadersSerializer.java
similarity index 80%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/model/channel/message/MessageHeadersSerializer.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/model/channel/message/MessageHeadersSerializer.java
index 7c6829306..165128bd6 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/model/channel/message/MessageHeadersSerializer.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/model/channel/message/MessageHeadersSerializer.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.jackson.model.channel.message;
+package io.github.springwolf.asyncapi.v3.jackson.model.channel.message;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/model/channel/message/MessagePayloadSerializer.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/model/channel/message/MessagePayloadSerializer.java
similarity index 80%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/model/channel/message/MessagePayloadSerializer.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/model/channel/message/MessagePayloadSerializer.java
index 66e9ecb1e..4997c8b8c 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/jackson/model/channel/message/MessagePayloadSerializer.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/jackson/model/channel/message/MessagePayloadSerializer.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.jackson.model.channel.message;
+package io.github.springwolf.asyncapi.v3.jackson.model.channel.message;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/AsyncAPI.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/AsyncAPI.java
similarity index 91%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/AsyncAPI.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/AsyncAPI.java
index cc2930dc5..b5a9a8b35 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/AsyncAPI.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/AsyncAPI.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model;
+package io.github.springwolf.asyncapi.v3.model;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.components.Components;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.components.Components;
+import io.github.springwolf.asyncapi.v3.model.info.Info;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/ExtendableObject.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/ExtendableObject.java
similarity index 95%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/ExtendableObject.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/ExtendableObject.java
index f06e1cb3a..165056b76 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/ExtendableObject.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/ExtendableObject.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model;
+package io.github.springwolf.asyncapi.v3.model;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/ExternalDocumentation.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/ExternalDocumentation.java
similarity index 95%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/ExternalDocumentation.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/ExternalDocumentation.java
index 480f52dec..f273e48ef 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/ExternalDocumentation.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/ExternalDocumentation.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model;
+package io.github.springwolf.asyncapi.v3.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/Reference.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/Reference.java
similarity index 94%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/Reference.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/Reference.java
index a203b975f..ae75643f6 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/Reference.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/Reference.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model;
+package io.github.springwolf.asyncapi.v3.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/Tag.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/Tag.java
similarity index 94%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/Tag.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/Tag.java
index b3332b4f6..e78da216d 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/Tag.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/Tag.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model;
+package io.github.springwolf.asyncapi.v3.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/Channel.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/Channel.java
similarity index 70%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/Channel.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/Channel.java
index 3da07afd0..f56e69a7c 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/Channel.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/Channel.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel;
+package io.github.springwolf.asyncapi.v3.model.channel;
/**
* Represents a Channel. A Channel can be a ChannelObject or a ChannelReference.
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelObject.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelObject.java
similarity index 89%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelObject.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelObject.java
index 957f05ba7..ecd62685e 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelObject.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelObject.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel;
+package io.github.springwolf.asyncapi.v3.model.channel;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExternalDocumentation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Tag;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.Message;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExternalDocumentation;
+import io.github.springwolf.asyncapi.v3.model.Tag;
+import io.github.springwolf.asyncapi.v3.model.channel.message.Message;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelParameter.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelParameter.java
similarity index 88%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelParameter.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelParameter.java
index d43503e57..5941d45d8 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelParameter.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelParameter.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel;
+package io.github.springwolf.asyncapi.v3.model.channel;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Reference;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.Reference;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelReference.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelReference.java
similarity index 80%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelReference.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelReference.java
index 5cc96914d..bdae87404 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelReference.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelReference.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel;
+package io.github.springwolf.asyncapi.v3.model.channel;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Reference;
+import io.github.springwolf.asyncapi.v3.model.Reference;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/CorrelationID.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/CorrelationID.java
similarity index 85%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/CorrelationID.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/CorrelationID.java
index 97a3136a7..624061e54 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/CorrelationID.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/CorrelationID.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel;
+package io.github.springwolf.asyncapi.v3.model.channel;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ServerReference.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/ServerReference.java
similarity index 75%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ServerReference.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/ServerReference.java
index 097eefdd8..2cb92919e 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ServerReference.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/ServerReference.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel;
+package io.github.springwolf.asyncapi.v3.model.channel;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Reference;
+import io.github.springwolf.asyncapi.v3.model.Reference;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/Message.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/Message.java
similarity index 67%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/Message.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/Message.java
index 7283d3ee8..c82b88e08 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/Message.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/Message.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message;
+package io.github.springwolf.asyncapi.v3.model.channel.message;
/**
* Represents a Message. A Message can be a MessageObject or a MessageReference.
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageExample.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageExample.java
similarity index 87%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageExample.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageExample.java
index d164f7afd..3a1d3bd8d 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageExample.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageExample.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message;
+package io.github.springwolf.asyncapi.v3.model.channel.message;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageHeaders.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageHeaders.java
similarity index 75%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageHeaders.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageHeaders.java
index 0740a5405..7173c9f52 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageHeaders.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageHeaders.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message;
+package io.github.springwolf.asyncapi.v3.model.channel.message;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.model.channel.message.MessageHeadersSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.jackson.model.channel.message.MessageHeadersSerializer;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageObject.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageObject.java
similarity index 89%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageObject.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageObject.java
index d632512cb..9b1ff989e 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageObject.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageObject.java
@@ -1,13 +1,13 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message;
+package io.github.springwolf.asyncapi.v3.model.channel.message;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExternalDocumentation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Tag;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.CorrelationID;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExternalDocumentation;
+import io.github.springwolf.asyncapi.v3.model.Tag;
+import io.github.springwolf.asyncapi.v3.model.channel.CorrelationID;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessagePayload.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessagePayload.java
similarity index 75%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessagePayload.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessagePayload.java
index 04125cada..9ccf6e1cb 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessagePayload.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessagePayload.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message;
+package io.github.springwolf.asyncapi.v3.model.channel.message;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.model.channel.message.MessagePayloadSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.jackson.model.channel.message.MessagePayloadSerializer;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageReference.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageReference.java
similarity index 92%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageReference.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageReference.java
index fcffe4dcd..b938b4d48 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageReference.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageReference.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message;
+package io.github.springwolf.asyncapi.v3.model.channel.message;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Reference;
+import io.github.springwolf.asyncapi.v3.model.Reference;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageTrait.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageTrait.java
similarity index 86%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageTrait.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageTrait.java
index 3fb04b71a..1d513155d 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/message/MessageTrait.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/channel/message/MessageTrait.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message;
+package io.github.springwolf.asyncapi.v3.model.channel.message;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExternalDocumentation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Reference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Tag;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.CorrelationID;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExternalDocumentation;
+import io.github.springwolf.asyncapi.v3.model.Reference;
+import io.github.springwolf.asyncapi.v3.model.Tag;
+import io.github.springwolf.asyncapi.v3.model.channel.CorrelationID;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/components/ComponentSchema.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/components/ComponentSchema.java
similarity index 70%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/components/ComponentSchema.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/components/ComponentSchema.java
index 411478127..da0190165 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/components/ComponentSchema.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/components/ComponentSchema.java
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.components;
+package io.github.springwolf.asyncapi.v3.model.components;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.model.channel.message.ComponentSchemaSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.jackson.model.channel.message.ComponentSchemaSerializer;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
import lombok.Getter;
@Getter
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/components/Components.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/components/Components.java
similarity index 70%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/components/Components.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/components/Components.java
index 6e3f6a840..e07cc7184 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/components/Components.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/components/Components.java
@@ -1,27 +1,27 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.components;
+package io.github.springwolf.asyncapi.v3.model.components;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ServerBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExternalDocumentation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Tag;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelParameter;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.CorrelationID;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.Message;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageTrait;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationReply;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationReplyAddress;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationTraits;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.SecurityScheme;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.ServerVariable;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ServerBinding;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExternalDocumentation;
+import io.github.springwolf.asyncapi.v3.model.Tag;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelParameter;
+import io.github.springwolf.asyncapi.v3.model.channel.CorrelationID;
+import io.github.springwolf.asyncapi.v3.model.channel.message.Message;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageTrait;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationReply;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationReplyAddress;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationTraits;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.model.security_scheme.SecurityScheme;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.asyncapi.v3.model.server.ServerVariable;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/Contact.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/info/Contact.java
similarity index 87%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/Contact.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/info/Contact.java
index b9a6fe0a0..ae3a1c363 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/Contact.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/info/Contact.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.info;
+package io.github.springwolf.asyncapi.v3.model.info;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/Info.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/info/Info.java
similarity index 88%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/Info.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/info/Info.java
index e3f3998b7..1327d935f 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/Info.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/info/Info.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.info;
+package io.github.springwolf.asyncapi.v3.model.info;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExternalDocumentation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Tag;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExternalDocumentation;
+import io.github.springwolf.asyncapi.v3.model.Tag;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/License.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/info/License.java
similarity index 86%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/License.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/info/License.java
index 3dbe6e2f8..a40a5f03c 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/License.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/info/License.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.info;
+package io.github.springwolf.asyncapi.v3.model.info;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/Operation.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/Operation.java
similarity index 87%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/Operation.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/Operation.java
index 7b1a9b2f5..bd1228775 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/Operation.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/Operation.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.operation;
+package io.github.springwolf.asyncapi.v3.model.operation;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExternalDocumentation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Tag;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.SecurityScheme;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExternalDocumentation;
+import io.github.springwolf.asyncapi.v3.model.Tag;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.security_scheme.SecurityScheme;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationAction.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/OperationAction.java
similarity index 85%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationAction.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/OperationAction.java
index f9c95f7e4..e96a276fa 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationAction.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/OperationAction.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.operation;
+package io.github.springwolf.asyncapi.v3.model.operation;
public enum OperationAction {
SEND("send"),
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationReply.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/OperationReply.java
similarity index 88%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationReply.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/OperationReply.java
index 65a0172f6..74ffaad48 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationReply.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/OperationReply.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.operation;
+package io.github.springwolf.asyncapi.v3.model.operation;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Reference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.Reference;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationReplyAddress.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/OperationReplyAddress.java
similarity index 84%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationReplyAddress.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/OperationReplyAddress.java
index 560da78dc..d0353c660 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationReplyAddress.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/OperationReplyAddress.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.operation;
+package io.github.springwolf.asyncapi.v3.model.operation;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Reference;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.Reference;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationTraits.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/OperationTraits.java
similarity index 82%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationTraits.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/OperationTraits.java
index c3444ff20..141604c47 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationTraits.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/operation/OperationTraits.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.operation;
+package io.github.springwolf.asyncapi.v3.model.operation;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExternalDocumentation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Reference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Tag;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.SecurityScheme;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExternalDocumentation;
+import io.github.springwolf.asyncapi.v3.model.Reference;
+import io.github.springwolf.asyncapi.v3.model.Tag;
+import io.github.springwolf.asyncapi.v3.model.security_scheme.SecurityScheme;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/MultiFormatSchema.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/MultiFormatSchema.java
similarity index 94%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/MultiFormatSchema.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/MultiFormatSchema.java
index 292e1a694..91913f8fd 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/MultiFormatSchema.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/MultiFormatSchema.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.schema;
+package io.github.springwolf.asyncapi.v3.model.schema;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/Schema.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/Schema.java
similarity index 69%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/Schema.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/Schema.java
index 3cd4da28b..22ed056a2 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/Schema.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/Schema.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.schema;
+package io.github.springwolf.asyncapi.v3.model.schema;
/**
* Represents a Schema. A Schema can be a SchemaObject or a SchemaReference.
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaFormat.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaFormat.java
similarity index 67%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaFormat.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaFormat.java
index a209ec4ae..c82e21368 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaFormat.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaFormat.java
@@ -1,16 +1,16 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.schema;
+package io.github.springwolf.asyncapi.v3.model.schema;
-import static io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI.ASYNCAPI_DEFAULT_VERSION;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
public enum SchemaFormat {
/**
* This is the default when a schemaFormat is not provided.
*/
- DEFAULT("application/vnd.aai.asyncapi+json;version=" + ASYNCAPI_DEFAULT_VERSION),
- ASYNCAPI_V3("application/vnd.aai.asyncapi;version=" + ASYNCAPI_DEFAULT_VERSION),
- ASYNCAPI_V3_JSON("application/vnd.aai.asyncapi+json;version=" + ASYNCAPI_DEFAULT_VERSION),
- ASYNCAPI_V3_YAML("application/vnd.aai.asyncapi+yaml;version=" + ASYNCAPI_DEFAULT_VERSION),
+ DEFAULT("application/vnd.aai.asyncapi+json;version=" + AsyncAPI.ASYNCAPI_DEFAULT_VERSION),
+ ASYNCAPI_V3("application/vnd.aai.asyncapi;version=" + AsyncAPI.ASYNCAPI_DEFAULT_VERSION),
+ ASYNCAPI_V3_JSON("application/vnd.aai.asyncapi+json;version=" + AsyncAPI.ASYNCAPI_DEFAULT_VERSION),
+ ASYNCAPI_V3_YAML("application/vnd.aai.asyncapi+yaml;version=" + AsyncAPI.ASYNCAPI_DEFAULT_VERSION),
JSON_SCHEMA_JSON("application/schema+json;version=draft-07"),
JSON_SCHEMA_YAML("application/schema+yaml;version=draft-07"),
AVRO_V1_9_0("application/vnd.apache.avro;version=1.9.0"),
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaObject.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaObject.java
similarity index 93%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaObject.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaObject.java
index 8096aedf0..710a3ed03 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaObject.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaObject.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.schema;
+package io.github.springwolf.asyncapi.v3.model.schema;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExternalDocumentation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.components.ComponentSchema;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExternalDocumentation;
+import io.github.springwolf.asyncapi.v3.model.components.ComponentSchema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaReference.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaReference.java
similarity index 82%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaReference.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaReference.java
index 3523ea76f..2384a1535 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaReference.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaReference.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.schema;
+package io.github.springwolf.asyncapi.v3.model.schema;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Reference;
+import io.github.springwolf.asyncapi.v3.model.Reference;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaType.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaType.java
similarity index 87%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaType.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaType.java
index 16e50fbcc..fdc9ded2f 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaType.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaType.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.schema;
+package io.github.springwolf.asyncapi.v3.model.schema;
public class SchemaType {
public static final String NULL = "null";
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/ApiKeySecurityScheme.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/ApiKeySecurityScheme.java
similarity index 94%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/ApiKeySecurityScheme.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/ApiKeySecurityScheme.java
index d943f0a9d..132b659fb 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/ApiKeySecurityScheme.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/ApiKeySecurityScheme.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme;
+package io.github.springwolf.asyncapi.v3.model.security_scheme;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/HttpApiKeySecurityScheme.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/HttpApiKeySecurityScheme.java
similarity index 95%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/HttpApiKeySecurityScheme.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/HttpApiKeySecurityScheme.java
index 137d8e9c8..0ba022d88 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/HttpApiKeySecurityScheme.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/HttpApiKeySecurityScheme.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme;
+package io.github.springwolf.asyncapi.v3.model.security_scheme;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/HttpSecurityScheme.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/HttpSecurityScheme.java
similarity index 94%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/HttpSecurityScheme.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/HttpSecurityScheme.java
index 2e73c7c4f..1aceaec0b 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/HttpSecurityScheme.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/HttpSecurityScheme.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme;
+package io.github.springwolf.asyncapi.v3.model.security_scheme;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/OAuth2SecurityScheme.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/OAuth2SecurityScheme.java
similarity index 86%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/OAuth2SecurityScheme.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/OAuth2SecurityScheme.java
index 9fc9f3fd9..5c04467e1 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/OAuth2SecurityScheme.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/OAuth2SecurityScheme.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme;
+package io.github.springwolf.asyncapi.v3.model.security_scheme;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.oauth2.OAuthFlows;
+import io.github.springwolf.asyncapi.v3.model.security_scheme.oauth2.OAuthFlows;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/OpenIdConnectSecurityScheme.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/OpenIdConnectSecurityScheme.java
similarity index 91%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/OpenIdConnectSecurityScheme.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/OpenIdConnectSecurityScheme.java
index 8c7213abb..9e79a7a9c 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/OpenIdConnectSecurityScheme.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/OpenIdConnectSecurityScheme.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme;
+package io.github.springwolf.asyncapi.v3.model.security_scheme;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/SecurityScheme.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/SecurityScheme.java
similarity index 91%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/SecurityScheme.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/SecurityScheme.java
index 7774371f9..93ebfba4c 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/SecurityScheme.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/SecurityScheme.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme;
+package io.github.springwolf.asyncapi.v3.model.security_scheme;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Reference;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.Reference;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/SecurityType.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/SecurityType.java
similarity index 90%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/SecurityType.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/SecurityType.java
index e59d677f4..978f90053 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/SecurityType.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/SecurityType.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme;
+package io.github.springwolf.asyncapi.v3.model.security_scheme;
public enum SecurityType {
USER_PASSWORD("userPassword"),
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/OAuthFlows.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/OAuthFlows.java
similarity index 64%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/OAuthFlows.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/OAuthFlows.java
index 7757b83ee..d9b40e723 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/OAuthFlows.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/OAuthFlows.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.oauth2;
+package io.github.springwolf.asyncapi.v3.model.security_scheme.oauth2;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows.AuthorizationCodeOAuthFlow;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows.ClientCredentialsOAuthFlow;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows.ImplicitOAuthFlow;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows.PasswordOAuthFlow;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows.AuthorizationCodeOAuthFlow;
+import io.github.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows.ClientCredentialsOAuthFlow;
+import io.github.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows.ImplicitOAuthFlow;
+import io.github.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows.PasswordOAuthFlow;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/AuthorizationCodeOAuthFlow.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/AuthorizationCodeOAuthFlow.java
similarity index 93%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/AuthorizationCodeOAuthFlow.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/AuthorizationCodeOAuthFlow.java
index 88a4803a7..bb388103c 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/AuthorizationCodeOAuthFlow.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/AuthorizationCodeOAuthFlow.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows;
+package io.github.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/ClientCredentialsOAuthFlow.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/ClientCredentialsOAuthFlow.java
similarity index 91%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/ClientCredentialsOAuthFlow.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/ClientCredentialsOAuthFlow.java
index ea97fe9aa..c57da40eb 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/ClientCredentialsOAuthFlow.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/ClientCredentialsOAuthFlow.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows;
+package io.github.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/ImplicitOAuthFlow.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/ImplicitOAuthFlow.java
similarity index 91%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/ImplicitOAuthFlow.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/ImplicitOAuthFlow.java
index b9480a576..a0c3c5c6b 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/ImplicitOAuthFlow.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/ImplicitOAuthFlow.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows;
+package io.github.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/OAuthFlow.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/OAuthFlow.java
similarity index 85%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/OAuthFlow.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/OAuthFlow.java
index d4e0cc896..ccaed101d 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/OAuthFlow.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/OAuthFlow.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows;
+package io.github.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/PasswordOAuthFlow.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/PasswordOAuthFlow.java
similarity index 91%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/PasswordOAuthFlow.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/PasswordOAuthFlow.java
index 03d954ad4..0958a6db6 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/PasswordOAuthFlow.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/PasswordOAuthFlow.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows;
+package io.github.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/server/Server.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/server/Server.java
similarity index 87%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/server/Server.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/server/Server.java
index 239292cca..1b9ecf810 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/server/Server.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/server/Server.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.server;
+package io.github.springwolf.asyncapi.v3.model.server;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ServerBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExternalDocumentation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Reference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Tag;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.SecurityScheme;
+import io.github.springwolf.asyncapi.v3.bindings.ServerBinding;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExternalDocumentation;
+import io.github.springwolf.asyncapi.v3.model.Reference;
+import io.github.springwolf.asyncapi.v3.model.Tag;
+import io.github.springwolf.asyncapi.v3.model.security_scheme.SecurityScheme;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/server/ServerVariable.java b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/server/ServerVariable.java
similarity index 90%
rename from springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/server/ServerVariable.java
rename to springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/server/ServerVariable.java
index d258894c4..44588a1d7 100644
--- a/springwolf-asyncapi/src/main/java/io/github/stavshamir/springwolf/asyncapi/v3/model/server/ServerVariable.java
+++ b/springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/server/ServerVariable.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.server;
+package io.github.springwolf.asyncapi.v3.model.server;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExtendableObject;
+import io.github.springwolf.asyncapi.v3.model.ExtendableObject;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/ClasspathUtil.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/ClasspathUtil.java
similarity index 87%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/ClasspathUtil.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/ClasspathUtil.java
index cf2bec14d..2bc9ae53c 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/ClasspathUtil.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/ClasspathUtil.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf;
+package io.github.springwolf.asyncapi.v3;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
import java.io.IOException;
import java.io.InputStream;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPBindingTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPBindingTest.java
similarity index 91%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPBindingTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPBindingTest.java
index 916d6ed6b..3757d0ae5 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/amqp/AMQPBindingTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPBindingTest.java
@@ -1,13 +1,13 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp;
+package io.github.springwolf.asyncapi.v3.bindings.amqp;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubBindingTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubBindingTest.java
similarity index 91%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubBindingTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubBindingTest.java
index 58de73762..c8b850c71 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubBindingTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubBindingTest.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.googlepubsub;
+package io.github.springwolf.asyncapi.v3.bindings.googlepubsub;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.components.Components;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.components.Components;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSBindingTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSBindingTest.java
similarity index 85%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSBindingTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSBindingTest.java
index 1f1802c05..36ebc083d 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/jms/JMSBindingTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/jms/JMSBindingTest.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms;
+package io.github.springwolf.asyncapi.v3.bindings.jms;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaBindingTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaBindingTest.java
similarity index 90%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaBindingTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaBindingTest.java
index c7bc44719..74cf26e20 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/kafka/KafkaBindingTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/kafka/KafkaBindingTest.java
@@ -1,15 +1,15 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka;
+package io.github.springwolf.asyncapi.v3.bindings.kafka;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTBindingTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTBindingTest.java
similarity index 89%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTBindingTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTBindingTest.java
index e4f690535..687cb762c 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/mqtt/MQTTBindingTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/mqtt/MQTTBindingTest.java
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.mqtt;
+package io.github.springwolf.asyncapi.v3.bindings.mqtt;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarBindingTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarBindingTest.java
similarity index 86%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarBindingTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarBindingTest.java
index 7a1d1e324..55b517ecb 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/pulsar/PulsarBindingTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/pulsar/PulsarBindingTest.java
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.pulsar;
+package io.github.springwolf.asyncapi.v3.bindings.pulsar;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSBindingTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSBindingTest.java
similarity index 89%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSBindingTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSBindingTest.java
index 76ff5bdeb..dae2028e4 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sns/SNSBindingTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/sns/SNSBindingTest.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns;
+package io.github.springwolf.asyncapi.v3.bindings.sns;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSBindingTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSBindingTest.java
similarity index 76%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSBindingTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSBindingTest.java
index fc601b77a..a28ddf3c5 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/bindings/sqs/SQSBindingTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/sqs/SQSBindingTest.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs;
+package io.github.springwolf.asyncapi.v3.bindings.sqs;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/AsyncAPITest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/AsyncAPITest.java
similarity index 92%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/AsyncAPITest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/AsyncAPITest.java
index 265209f2c..bdeca849f 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/AsyncAPITest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/AsyncAPITest.java
@@ -1,28 +1,28 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model;
+package io.github.springwolf.asyncapi.v3.model;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelParameter;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageTrait;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.components.Components;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.License;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationTraits;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.SecurityScheme;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.SecurityType;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelParameter;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageTrait;
+import io.github.springwolf.asyncapi.v3.model.components.Components;
+import io.github.springwolf.asyncapi.v3.model.info.Info;
+import io.github.springwolf.asyncapi.v3.model.info.License;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationTraits;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import io.github.springwolf.asyncapi.v3.model.security_scheme.SecurityScheme;
+import io.github.springwolf.asyncapi.v3.model.security_scheme.SecurityType;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelObjectTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelObjectTest.java
similarity index 79%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelObjectTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelObjectTest.java
index 9de45680f..3b89df6c0 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelObjectTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelObjectTest.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel;
+package io.github.springwolf.asyncapi.v3.model.channel;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelQueueProperties;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelType;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExternalDocumentation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Tag;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelQueueProperties;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelType;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.ExternalDocumentation;
+import io.github.springwolf.asyncapi.v3.model.Tag;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelParameterTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelParameterTest.java
similarity index 84%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelParameterTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelParameterTest.java
index 73eb9e166..03df27fb0 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/ChannelParameterTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/channel/ChannelParameterTest.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel;
+package io.github.springwolf.asyncapi.v3.model.channel;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/CorrelationIDTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/channel/CorrelationIDTest.java
similarity index 77%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/CorrelationIDTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/channel/CorrelationIDTest.java
index 555220b94..fd40841c4 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/CorrelationIDTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/channel/CorrelationIDTest.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel;
+package io.github.springwolf.asyncapi.v3.model.channel;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/MessageTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/channel/MessageTest.java
similarity index 79%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/MessageTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/channel/MessageTest.java
index cca3cb035..921563435 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/channel/MessageTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/channel/MessageTest.java
@@ -1,16 +1,16 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.channel;
+package io.github.springwolf.asyncapi.v3.model.channel;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Tag;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageExample;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageTrait;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.Tag;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageExample;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageTrait;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/ContactTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/info/ContactTest.java
similarity index 77%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/ContactTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/info/ContactTest.java
index efca63bae..e266db651 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/ContactTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/info/ContactTest.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.info;
+package io.github.springwolf.asyncapi.v3.model.info;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/InfoTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/info/InfoTest.java
similarity index 81%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/InfoTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/info/InfoTest.java
index 20bdedc92..f870fcef6 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/InfoTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/info/InfoTest.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.info;
+package io.github.springwolf.asyncapi.v3.model.info;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExternalDocumentation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Tag;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.ExternalDocumentation;
+import io.github.springwolf.asyncapi.v3.model.Tag;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/LicenseTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/info/LicenseTest.java
similarity index 76%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/LicenseTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/info/LicenseTest.java
index 9c16a31fa..d4beb37d7 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/info/LicenseTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/info/LicenseTest.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.info;
+package io.github.springwolf.asyncapi.v3.model.info;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationReplyAddressTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/operation/OperationReplyAddressTest.java
similarity index 78%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationReplyAddressTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/operation/OperationReplyAddressTest.java
index a18d99c10..195f9affd 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationReplyAddressTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/operation/OperationReplyAddressTest.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.operation;
+package io.github.springwolf.asyncapi.v3.model.operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/operation/OperationTest.java
similarity index 79%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/operation/OperationTest.java
index 6162e84e6..7a5d36d40 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/operation/OperationTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/operation/OperationTest.java
@@ -1,13 +1,13 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.operation;
+package io.github.springwolf.asyncapi.v3.model.operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Tag;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.SecurityScheme;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.Tag;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.security_scheme.SecurityScheme;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaTest.java
similarity index 98%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaTest.java
index 352e53470..c1e492f32 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/schema/SchemaTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/schema/SchemaTest.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.schema;
+package io.github.springwolf.asyncapi.v3.model.schema;
import com.fasterxml.jackson.core.JsonProcessingException;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.components.ComponentSchema;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.components.ComponentSchema;
import org.junit.jupiter.api.Test;
import java.math.BigDecimal;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/SecuritySchemeTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/security_scheme/SecuritySchemeTest.java
similarity index 91%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/SecuritySchemeTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/security_scheme/SecuritySchemeTest.java
index 37ccad6c7..30f53bab3 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/SecuritySchemeTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/security_scheme/SecuritySchemeTest.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme;
+package io.github.springwolf.asyncapi.v3.model.security_scheme;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.oauth2.OAuthFlows;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows.ImplicitOAuthFlow;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.security_scheme.oauth2.OAuthFlows;
+import io.github.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows.ImplicitOAuthFlow;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/OAuthFlowTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/OAuthFlowTest.java
similarity index 80%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/OAuthFlowTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/OAuthFlowTest.java
index 8b5ab1237..521b83ffa 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/OAuthFlowTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/security_scheme/oauth2/flows/OAuthFlowTest.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows;
+package io.github.springwolf.asyncapi.v3.model.security_scheme.oauth2.flows;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/server/ServerTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/server/ServerTest.java
similarity index 78%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/server/ServerTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/server/ServerTest.java
index ee1e89f18..6a8e73fbc 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/server/ServerTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/server/ServerTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.server;
+package io.github.springwolf.asyncapi.v3.model.server;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.Tag;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.Tag;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/server/ServerVariableTest.java b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/server/ServerVariableTest.java
similarity index 85%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/server/ServerVariableTest.java
rename to springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/server/ServerVariableTest.java
index 0dc4281ae..2fb65a013 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/model/server/ServerVariableTest.java
+++ b/springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/server/ServerVariableTest.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3.model.server;
+package io.github.springwolf.asyncapi.v3.model.server;
-import io.github.stavshamir.springwolf.asyncapi.v3.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.ClasspathUtil;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfAutoConfiguration.java b/springwolf-core/src/main/java/io/github/springwolf/core/SpringwolfAutoConfiguration.java
similarity index 67%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfAutoConfiguration.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/SpringwolfAutoConfiguration.java
index 4b594a825..76d0b896d 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfAutoConfiguration.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/SpringwolfAutoConfiguration.java
@@ -1,37 +1,37 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf;
-
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiCustomizer;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
-import io.github.stavshamir.springwolf.asyncapi.ChannelsService;
-import io.github.stavshamir.springwolf.asyncapi.DefaultAsyncApiService;
-import io.github.stavshamir.springwolf.asyncapi.DefaultChannelsService;
-import io.github.stavshamir.springwolf.asyncapi.DefaultOperationsService;
-import io.github.stavshamir.springwolf.asyncapi.OperationsService;
-import io.github.stavshamir.springwolf.asyncapi.SpringwolfInitApplicationListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.OperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
-import io.github.stavshamir.springwolf.configuration.DefaultAsyncApiDocketService;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
-import io.github.stavshamir.springwolf.schemas.DefaultComponentsService;
-import io.github.stavshamir.springwolf.schemas.SwaggerSchemaUtil;
-import io.github.stavshamir.springwolf.schemas.example.DefaultExampleXmlValueSerializer;
-import io.github.stavshamir.springwolf.schemas.example.DefaultExampleYamlValueSerializer;
-import io.github.stavshamir.springwolf.schemas.example.DefaultSchemaWalker;
-import io.github.stavshamir.springwolf.schemas.example.ExampleJsonValueGenerator;
-import io.github.stavshamir.springwolf.schemas.example.ExampleXmlValueGenerator;
-import io.github.stavshamir.springwolf.schemas.example.ExampleXmlValueSerializer;
-import io.github.stavshamir.springwolf.schemas.example.ExampleYamlValueGenerator;
-import io.github.stavshamir.springwolf.schemas.example.ExampleYamlValueSerializer;
-import io.github.stavshamir.springwolf.schemas.example.SchemaWalker;
-import io.github.stavshamir.springwolf.schemas.example.SchemaWalkerProvider;
-import io.github.stavshamir.springwolf.schemas.postprocessor.AvroSchemaPostProcessor;
-import io.github.stavshamir.springwolf.schemas.postprocessor.ExampleGeneratorPostProcessor;
-import io.github.stavshamir.springwolf.schemas.postprocessor.SchemasPostProcessor;
+package io.github.springwolf.core;
+
+import io.github.springwolf.core.asyncapi.AsyncApiCustomizer;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
+import io.github.springwolf.core.asyncapi.ChannelsService;
+import io.github.springwolf.core.asyncapi.DefaultAsyncApiService;
+import io.github.springwolf.core.asyncapi.DefaultChannelsService;
+import io.github.springwolf.core.asyncapi.DefaultOperationsService;
+import io.github.springwolf.core.asyncapi.OperationsService;
+import io.github.springwolf.core.asyncapi.SpringwolfInitApplicationListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.ChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.OperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.configuration.DefaultAsyncApiDocketService;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.core.schemas.DefaultComponentsService;
+import io.github.springwolf.core.schemas.SwaggerSchemaUtil;
+import io.github.springwolf.core.schemas.example.DefaultExampleXmlValueSerializer;
+import io.github.springwolf.core.schemas.example.DefaultExampleYamlValueSerializer;
+import io.github.springwolf.core.schemas.example.DefaultSchemaWalker;
+import io.github.springwolf.core.schemas.example.ExampleJsonValueGenerator;
+import io.github.springwolf.core.schemas.example.ExampleXmlValueGenerator;
+import io.github.springwolf.core.schemas.example.ExampleXmlValueSerializer;
+import io.github.springwolf.core.schemas.example.ExampleYamlValueGenerator;
+import io.github.springwolf.core.schemas.example.ExampleYamlValueSerializer;
+import io.github.springwolf.core.schemas.example.SchemaWalker;
+import io.github.springwolf.core.schemas.example.SchemaWalkerProvider;
+import io.github.springwolf.core.schemas.postprocessor.AvroSchemaPostProcessor;
+import io.github.springwolf.core.schemas.postprocessor.ExampleGeneratorPostProcessor;
+import io.github.springwolf.core.schemas.postprocessor.SchemasPostProcessor;
import io.swagger.v3.core.converter.ModelConverter;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfScannerConfiguration.java b/springwolf-core/src/main/java/io/github/springwolf/core/SpringwolfScannerConfiguration.java
similarity index 77%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfScannerConfiguration.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/SpringwolfScannerConfiguration.java
index 64035ebb6..4ddfe9ace 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfScannerConfiguration.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/SpringwolfScannerConfiguration.java
@@ -1,24 +1,24 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.beans.BeanMethodsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.beans.DefaultBeanMethodsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.MessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.OperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelPriority;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.AsyncAnnotationChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.AsyncAnnotationOperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.AsyncAnnotationScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ComponentClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ConfigurationClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+package io.github.springwolf.core;
+
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.core.asyncapi.scanners.beans.BeanMethodsScanner;
+import io.github.springwolf.core.asyncapi.scanners.beans.DefaultBeanMethodsScanner;
+import io.github.springwolf.core.asyncapi.scanners.bindings.MessageBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.OperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.channels.ChannelPriority;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.AsyncAnnotationChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.AsyncAnnotationOperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.AsyncAnnotationScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.ComponentClassScanner;
+import io.github.springwolf.core.asyncapi.scanners.classes.ConfigurationClassScanner;
+import io.github.springwolf.core.asyncapi.scanners.classes.SpringwolfClassScanner;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.schemas.ComponentsService;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
@@ -28,8 +28,8 @@
import java.util.List;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_SCANNER_ASYNC_LISTENER_ENABLED;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_SCANNER_ASYNC_PUBLISHER_ENABLED;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_SCANNER_ASYNC_LISTENER_ENABLED;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_SCANNER_ASYNC_PUBLISHER_ENABLED;
/**
* Spring configuration defining the core scanner beans.
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfWebConfiguration.java b/springwolf-core/src/main/java/io/github/springwolf/core/SpringwolfWebConfiguration.java
similarity index 70%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfWebConfiguration.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/SpringwolfWebConfiguration.java
index 6f6031e17..89b4c55e4 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/SpringwolfWebConfiguration.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/SpringwolfWebConfiguration.java
@@ -1,20 +1,20 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf;
+package io.github.springwolf.core;
import com.fasterxml.jackson.databind.ObjectMapper;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
-import io.github.stavshamir.springwolf.asyncapi.controller.ActuatorAsyncApiController;
-import io.github.stavshamir.springwolf.asyncapi.controller.AsyncApiController;
-import io.github.stavshamir.springwolf.asyncapi.controller.PublishingPayloadCreator;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.AsyncApiSerializerService;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.asyncapi.v3.jackson.AsyncApiSerializerService;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
+import io.github.springwolf.core.asyncapi.controller.ActuatorAsyncApiController;
+import io.github.springwolf.core.asyncapi.controller.AsyncApiController;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.core.schemas.ComponentsService;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_ENDPOINT_ACTUATOR_ENABLED;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_ENDPOINT_ACTUATOR_ENABLED;
/**
* Spring-Configuration defining the web controller beans.
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/AsyncApiCustomizer.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/AsyncApiCustomizer.java
similarity index 87%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/AsyncApiCustomizer.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/AsyncApiCustomizer.java
index 83db79f56..f418ac2e5 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/AsyncApiCustomizer.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/AsyncApiCustomizer.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
+package io.github.springwolf.core.asyncapi;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
/**
* Allows to modify the final AsyncApi document after it has been generated.
diff --git a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/AsyncApiService.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/AsyncApiService.java
new file mode 100644
index 000000000..e2c0d88bf
--- /dev/null
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/AsyncApiService.java
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: Apache-2.0
+package io.github.springwolf.core.asyncapi;
+
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+
+public interface AsyncApiService {
+
+ AsyncAPI getAsyncAPI();
+}
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/ChannelsService.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/ChannelsService.java
similarity index 75%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/ChannelsService.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/ChannelsService.java
index fe2ce0020..df18a2d2e 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/ChannelsService.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/ChannelsService.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
+package io.github.springwolf.core.asyncapi;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
import java.util.Map;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiService.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/DefaultAsyncApiService.java
similarity index 86%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiService.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/DefaultAsyncApiService.java
index 1881b47af..8fbfd8423 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiService.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/DefaultAsyncApiService.java
@@ -1,13 +1,13 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
-
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.components.Components;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+package io.github.springwolf.core.asyncapi;
+
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.components.Components;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.core.configuration.AsyncApiDocket;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsService.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/DefaultChannelsService.java
similarity index 80%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsService.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/DefaultChannelsService.java
index 5b25ef5e5..ce5654c3e 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsService.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/DefaultChannelsService.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
+package io.github.springwolf.core.asyncapi;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelMerger;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.core.asyncapi.scanners.channels.ChannelMerger;
+import io.github.springwolf.core.asyncapi.scanners.channels.ChannelsScanner;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultOperationsService.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/DefaultOperationsService.java
similarity index 80%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultOperationsService.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/DefaultOperationsService.java
index 22194e085..1df27d1e8 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/DefaultOperationsService.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/DefaultOperationsService.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
+package io.github.springwolf.core.asyncapi;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.OperationMerger;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.OperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.core.asyncapi.scanners.channels.OperationMerger;
+import io.github.springwolf.core.asyncapi.scanners.channels.OperationsScanner;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/MessageHelper.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/MessageHelper.java
similarity index 88%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/MessageHelper.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/MessageHelper.java
index 7ab9c72f5..69569eb23 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/MessageHelper.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/MessageHelper.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
+package io.github.springwolf.core.asyncapi;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/OperationsService.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/OperationsService.java
similarity index 75%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/OperationsService.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/OperationsService.java
index 059af34fb..7cef2c708 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/OperationsService.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/OperationsService.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
+package io.github.springwolf.core.asyncapi;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
import java.util.Map;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfInitApplicationListener.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/SpringwolfInitApplicationListener.java
similarity index 82%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfInitApplicationListener.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/SpringwolfInitApplicationListener.java
index f9554925a..a7779b657 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/SpringwolfInitApplicationListener.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/SpringwolfInitApplicationListener.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
+package io.github.springwolf.core.asyncapi;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties.InitMode;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties.InitMode;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.context.event.ApplicationReadyEvent;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/ActuatorAsyncApiController.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/ActuatorAsyncApiController.java
similarity index 80%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/ActuatorAsyncApiController.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/ActuatorAsyncApiController.java
index 5e8d92efd..1d0625429 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/ActuatorAsyncApiController.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/ActuatorAsyncApiController.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.controller;
+package io.github.springwolf.core.asyncapi.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.AsyncApiSerializerService;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.jackson.AsyncApiSerializerService;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.actuate.endpoint.web.annotation.RestControllerEndpoint;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/AsyncApiController.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/AsyncApiController.java
similarity index 85%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/AsyncApiController.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/AsyncApiController.java
index fb50ba3fe..422e13988 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/AsyncApiController.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/AsyncApiController.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.controller;
+package io.github.springwolf.core.asyncapi.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.AsyncApiSerializerService;
+import io.github.springwolf.asyncapi.v3.jackson.AsyncApiSerializerService;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/PublishingBaseController.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/PublishingBaseController.java
similarity index 93%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/PublishingBaseController.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/PublishingBaseController.java
index 5f717bc23..794ded651 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/PublishingBaseController.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/PublishingBaseController.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.controller;
+package io.github.springwolf.core.asyncapi.controller;
-import io.github.stavshamir.springwolf.asyncapi.controller.dtos.MessageDto;
+import io.github.springwolf.core.asyncapi.controller.dtos.MessageDto;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.InitializingBean;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/PublishingPayloadCreator.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/PublishingPayloadCreator.java
similarity index 91%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/PublishingPayloadCreator.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/PublishingPayloadCreator.java
index 59c934c00..2a67767b8 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/PublishingPayloadCreator.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/PublishingPayloadCreator.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.controller;
+package io.github.springwolf.core.asyncapi.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import io.github.stavshamir.springwolf.asyncapi.controller.dtos.MessageDto;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.core.asyncapi.controller.dtos.MessageDto;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/dtos/MessageDto.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/dtos/MessageDto.java
similarity index 87%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/dtos/MessageDto.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/dtos/MessageDto.java
index 18c373097..3c040be3f 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/dtos/MessageDto.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/controller/dtos/MessageDto.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.controller.dtos;
+package io.github.springwolf.core.asyncapi.controller.dtos;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/BeanMethodsScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/beans/BeanMethodsScanner.java
similarity index 82%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/BeanMethodsScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/beans/BeanMethodsScanner.java
index b5219c2b4..ea964391e 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/BeanMethodsScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/beans/BeanMethodsScanner.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.beans;
+package io.github.springwolf.core.asyncapi.scanners.beans;
import java.lang.reflect.Method;
import java.util.Set;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/DefaultBeanMethodsScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/beans/DefaultBeanMethodsScanner.java
similarity index 76%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/DefaultBeanMethodsScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/beans/DefaultBeanMethodsScanner.java
index 27873829c..dc8efc350 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/DefaultBeanMethodsScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/beans/DefaultBeanMethodsScanner.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.beans;
+package io.github.springwolf.core.asyncapi.scanners.beans;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.AnnotationUtil;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ConfigurationClassScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.AnnotationUtil;
+import io.github.springwolf.core.asyncapi.scanners.classes.ConfigurationClassScanner;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/BindingFactory.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/BindingFactory.java
similarity index 54%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/BindingFactory.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/BindingFactory.java
index 281f7fb68..a2e0cc5e0 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/BindingFactory.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/BindingFactory.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings;
+package io.github.springwolf.core.asyncapi.scanners.bindings;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import java.util.Map;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/BindingProcessorPriority.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/BindingProcessorPriority.java
similarity index 85%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/BindingProcessorPriority.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/BindingProcessorPriority.java
index 59e67c260..1879736be 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/BindingProcessorPriority.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/BindingProcessorPriority.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings;
+package io.github.springwolf.core.asyncapi.scanners.bindings;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
+import io.github.springwolf.core.configuration.AsyncApiDocket;
/**
* Order of binding processors
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/MessageBindingProcessor.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/MessageBindingProcessor.java
similarity index 63%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/MessageBindingProcessor.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/MessageBindingProcessor.java
index 4df365895..deb29f49b 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/MessageBindingProcessor.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/MessageBindingProcessor.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings;
+package io.github.springwolf.core.asyncapi.scanners.bindings;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
import java.lang.reflect.Method;
import java.util.Optional;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/OperationBindingProcessor.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/OperationBindingProcessor.java
similarity index 64%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/OperationBindingProcessor.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/OperationBindingProcessor.java
index a781ed275..843af187b 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/OperationBindingProcessor.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/OperationBindingProcessor.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings;
+package io.github.springwolf.core.asyncapi.scanners.bindings;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
import java.lang.reflect.Method;
import java.util.Optional;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/ProcessedMessageBinding.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/ProcessedMessageBinding.java
similarity index 55%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/ProcessedMessageBinding.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/ProcessedMessageBinding.java
index 7bf1c6b47..bbe3542bb 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/ProcessedMessageBinding.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/ProcessedMessageBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings;
+package io.github.springwolf.core.asyncapi.scanners.bindings;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
import lombok.Data;
@Data
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/ProcessedOperationBinding.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/ProcessedOperationBinding.java
similarity index 55%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/ProcessedOperationBinding.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/ProcessedOperationBinding.java
index 2e08d226a..97c77aeec 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/ProcessedOperationBinding.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/ProcessedOperationBinding.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings;
+package io.github.springwolf.core.asyncapi.scanners.bindings;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
import lombok.Data;
@Data
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AbstractOperationBindingProcessor.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/processor/AbstractOperationBindingProcessor.java
similarity index 85%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AbstractOperationBindingProcessor.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/processor/AbstractOperationBindingProcessor.java
index c4e3546e7..2ede53a34 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AbstractOperationBindingProcessor.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/bindings/processor/AbstractOperationBindingProcessor.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.core.asyncapi.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.OperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.OperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.EmbeddedValueResolverAware;
import org.springframework.util.StringUtils;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/ChannelMerger.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/ChannelMerger.java
similarity index 86%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/ChannelMerger.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/ChannelMerger.java
index b82da5f66..4b5e602d2 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/ChannelMerger.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/ChannelMerger.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels;
+package io.github.springwolf.core.asyncapi.scanners.channels;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.Channel;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.Message;
+import io.github.springwolf.asyncapi.v3.model.channel.Channel;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.Message;
import java.util.HashMap;
import java.util.List;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/ChannelPriority.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/ChannelPriority.java
similarity index 65%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/ChannelPriority.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/ChannelPriority.java
index e09e606dd..d880584d0 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/ChannelPriority.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/ChannelPriority.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels;
+package io.github.springwolf.core.asyncapi.scanners.channels;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
+import io.github.springwolf.core.configuration.AsyncApiDocket;
public class ChannelPriority {
/**
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/ChannelsScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/ChannelsScanner.java
similarity index 63%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/ChannelsScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/ChannelsScanner.java
index 6528eb439..9518dd771 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/ChannelsScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/ChannelsScanner.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels;
+package io.github.springwolf.core.asyncapi.scanners.channels;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
import java.util.Map;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/OperationMerger.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/OperationMerger.java
similarity index 88%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/OperationMerger.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/OperationMerger.java
index e3e70b20e..fbaef6752 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/OperationMerger.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/OperationMerger.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels;
+package io.github.springwolf.core.asyncapi.scanners.channels;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.Channel;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.channel.Channel;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
import java.util.Collection;
import java.util.HashMap;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/OperationsScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/OperationsScanner.java
similarity index 63%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/OperationsScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/OperationsScanner.java
index 0e8b1c9e2..af1c8783d 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/OperationsScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/OperationsScanner.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels;
+package io.github.springwolf.core.asyncapi.scanners.channels;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
import java.util.Map;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/SimpleChannelsScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/SimpleChannelsScanner.java
similarity index 80%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/SimpleChannelsScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/SimpleChannelsScanner.java
index b5aa8bfdd..520eb8f62 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/SimpleChannelsScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/SimpleChannelsScanner.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels;
+package io.github.springwolf.core.asyncapi.scanners.channels;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.core.asyncapi.scanners.classes.ClassScanner;
import lombok.RequiredArgsConstructor;
import java.util.List;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/SimpleOperationsScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/SimpleOperationsScanner.java
similarity index 80%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/SimpleOperationsScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/SimpleOperationsScanner.java
index b8b986df2..4ae41fa1a 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/SimpleOperationsScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/SimpleOperationsScanner.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels;
+package io.github.springwolf.core.asyncapi.scanners.channels;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.core.asyncapi.scanners.classes.ClassScanner;
import lombok.RequiredArgsConstructor;
import java.util.List;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AnnotationUtil.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AnnotationUtil.java
similarity index 95%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AnnotationUtil.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AnnotationUtil.java
index 03b5b8713..50defd241 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AnnotationUtil.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AnnotationUtil.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
import org.springframework.core.annotation.MergedAnnotation;
import org.springframework.core.annotation.MergedAnnotationCollectors;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationChannelsScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationChannelsScanner.java
similarity index 76%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationChannelsScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationChannelsScanner.java
index f8909a9c3..174773c7b 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationChannelsScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationChannelsScanner.java
@@ -1,21 +1,21 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.MessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.OperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelMerger;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ServerReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ServerReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.core.asyncapi.scanners.bindings.MessageBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.OperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.channels.ChannelMerger;
+import io.github.springwolf.core.asyncapi.scanners.channels.ChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.ClassScanner;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.extern.slf4j.Slf4j;
import java.lang.annotation.Annotation;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationOperationsScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationOperationsScanner.java
similarity index 71%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationOperationsScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationOperationsScanner.java
index 6695a619f..4144d1920 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationOperationsScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationOperationsScanner.java
@@ -1,15 +1,15 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.MessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.OperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.OperationMerger;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.OperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.core.asyncapi.scanners.bindings.MessageBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.OperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.channels.OperationMerger;
+import io.github.springwolf.core.asyncapi.scanners.channels.OperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.ClassScanner;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.extern.slf4j.Slf4j;
import java.lang.annotation.Annotation;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationScanner.java
similarity index 77%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationScanner.java
index 876f90420..bbfe5668d 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationScanner.java
@@ -1,23 +1,23 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.MessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.OperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaReference;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import io.github.springwolf.core.asyncapi.scanners.bindings.MessageBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.OperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.schemas.ComponentsService;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationScannerUtil.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationScannerUtil.java
similarity index 83%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationScannerUtil.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationScannerUtil.java
index 558300852..9f61dd11e 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationScannerUtil.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationScannerUtil.java
@@ -1,17 +1,17 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.MessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.OperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncMessage;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaderSchema;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.core.asyncapi.scanners.bindings.MessageBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.OperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedMessageBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncMessage;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaderSchema;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
import org.springframework.util.StringUtils;
import org.springframework.util.StringValueResolver;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncOperationBinding.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncOperationBinding.java
similarity index 82%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncOperationBinding.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncOperationBinding.java
index cfa089f78..2d8c4939b 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncOperationBinding.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncOperationBinding.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
@@ -14,7 +14,7 @@
* Object documentation. Those implementations are usually available in its own plugin, like {@code springwolf-kafka-plugin}
* or {@code springwolf-amqp-plugin}
*
- * Maintainer note: Move to io.github.stavshamir.springwolf.asyncapi.scanners.bindings
+ * Maintainer note: Move to io.github.springwolf.core.asyncapi.scanners.bindings
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(value = {ElementType.ANNOTATION_TYPE})
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScanner.java
similarity index 79%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScanner.java
index 1c3a4f4f6..0668eb641 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScanner.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.SimpleChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeadersBuilder;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.channels.SimpleChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeadersBuilder;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.extern.slf4j.Slf4j;
import java.lang.annotation.Annotation;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationOperationsScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationOperationsScanner.java
similarity index 77%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationOperationsScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationOperationsScanner.java
index 42a060fe4..bc70b28e0 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationOperationsScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationOperationsScanner.java
@@ -1,16 +1,16 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.SimpleOperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeadersBuilder;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.channels.SimpleOperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeadersBuilder;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.extern.slf4j.Slf4j;
import java.lang.annotation.Annotation;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationScanner.java
similarity index 74%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationScanner.java
index 676eb58ae..7722db906 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationScanner.java
@@ -1,17 +1,17 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeadersBuilder;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaReference;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeadersBuilder;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.annotation.AnnotationUtils;
@@ -22,8 +22,8 @@
import java.util.Map;
import java.util.Set;
-import static io.github.stavshamir.springwolf.asyncapi.MessageHelper.toMessagesMap;
-import static io.github.stavshamir.springwolf.asyncapi.MessageHelper.toOperationsMessagesMap;
+import static io.github.springwolf.core.asyncapi.MessageHelper.toMessagesMap;
+import static io.github.springwolf.core.asyncapi.MessageHelper.toOperationsMessagesMap;
import static java.util.stream.Collectors.toSet;
@Slf4j
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScanner.java
similarity index 79%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScanner.java
index 9068ee332..6a3429bf8 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScanner.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.SimpleChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.channels.SimpleChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.extern.slf4j.Slf4j;
import java.lang.annotation.Annotation;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationOperationsScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationOperationsScanner.java
similarity index 77%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationOperationsScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationOperationsScanner.java
index 6364d93bb..5fb6d7fdc 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationOperationsScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationOperationsScanner.java
@@ -1,16 +1,16 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.SimpleOperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.channels.SimpleOperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.extern.slf4j.Slf4j;
import java.lang.annotation.Annotation;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationScanner.java
similarity index 61%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationScanner.java
index b67fc54be..e6a5d7356 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationScanner.java
@@ -1,16 +1,16 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaReference;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListener.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncListener.java
similarity index 83%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListener.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncListener.java
index 22818a537..25cbadd8f 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListener.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncListener.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation;
-import io.github.stavshamir.springwolf.asyncapi.types.OperationData;
+import io.github.springwolf.core.asyncapi.types.OperationData;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
@@ -16,7 +16,7 @@
* To document producers, use {@link AsyncPublisher}.
*
* The fields channel, description, payload and headers are part of {@link AsyncOperation}
- * and behaves identical to {@link io.github.stavshamir.springwolf.asyncapi.types.ConsumerData}.
+ * and behaves identical to {@link io.github.springwolf.core.asyncapi.types.ConsumerData}.
* If no {@link AsyncOperation#payloadType()} is passed, the payload type is extracted from the signature of the method.
* Add {@link org.springframework.messaging.handler.annotation.Payload} to the payload argument, if the method has more than one argument.
*
@@ -31,7 +31,7 @@
* public void receiveMessage(MonetaryAmount payload) { ... }
*
*
- * Maintainer node: move to io.github.stavshamir.springwolf.asyncapi.annotation
+ * Maintainer node: move to io.github.springwolf.core.asyncapi.annotation
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(value = {ElementType.METHOD, ElementType.ANNOTATION_TYPE})
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListeners.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncListeners.java
similarity index 81%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListeners.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncListeners.java
index 9ec90f1c9..4ce94f891 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncListeners.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncListeners.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncMessage.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncMessage.java
similarity index 83%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncMessage.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncMessage.java
index 1b3bd479a..9a523465d 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncMessage.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncMessage.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncOperation.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncOperation.java
similarity index 84%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncOperation.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncOperation.java
index 64dd5bb56..c466ab2af 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncOperation.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncOperation.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation;
-import io.github.stavshamir.springwolf.asyncapi.types.OperationData;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaderSchema;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.asyncapi.types.OperationData;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaderSchema;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisher.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisher.java
similarity index 86%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisher.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisher.java
index 2c6e8edb8..b7ff49257 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisher.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncPublisher.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation;
-import io.github.stavshamir.springwolf.asyncapi.types.OperationData;
+import io.github.springwolf.core.asyncapi.types.OperationData;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
@@ -16,7 +16,7 @@
* To document listeners, use {@link AsyncListener}.
*
* The fields channel, description, payload and headers are part of {@link AsyncOperation}
- * and behaves identical to {@link io.github.stavshamir.springwolf.asyncapi.types.ProducerData}.
+ * and behaves identical to {@link io.github.springwolf.core.asyncapi.types.ProducerData}.
* If no {@link AsyncOperation#payloadType()} is passed, the payload type is extracted from the signature of the method.
* Add {@link org.springframework.messaging.handler.annotation.Payload} to the payload argument, if the method has more than one argument.
*
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublishers.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncPublishers.java
similarity index 81%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublishers.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncPublishers.java
index 6ded85a28..e76bc7c29 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AsyncPublishers.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/operationdata/annotation/AsyncPublishers.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/payload/AsyncApiPayload.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/payload/AsyncApiPayload.java
similarity index 72%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/payload/AsyncApiPayload.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/payload/AsyncApiPayload.java
index 436d34c7a..dddfe323a 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/payload/AsyncApiPayload.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/payload/AsyncApiPayload.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload;
+package io.github.springwolf.core.asyncapi.scanners.channels.payload;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/payload/PayloadClassExtractor.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/payload/PayloadClassExtractor.java
similarity index 96%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/payload/PayloadClassExtractor.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/payload/PayloadClassExtractor.java
index c5d2d837d..72b0137af 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/payload/PayloadClassExtractor.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/channels/payload/PayloadClassExtractor.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload;
+package io.github.springwolf.core.asyncapi.scanners.channels.payload;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.messaging.handler.annotation.Payload;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/AnnotationClassScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/AnnotationClassScanner.java
similarity index 93%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/AnnotationClassScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/AnnotationClassScanner.java
index a633efa23..cccfb01c8 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/AnnotationClassScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/AnnotationClassScanner.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.classes;
+package io.github.springwolf.core.asyncapi.scanners.classes;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ClassScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/ClassScanner.java
similarity index 72%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ClassScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/ClassScanner.java
index bc1a85f58..65ea316a4 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ClassScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/ClassScanner.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.classes;
+package io.github.springwolf.core.asyncapi.scanners.classes;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
+import io.github.springwolf.core.configuration.AsyncApiDocket;
import java.util.Set;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ComponentClassScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/ComponentClassScanner.java
similarity index 80%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ComponentClassScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/ComponentClassScanner.java
index ab55d350b..ddbfa4981 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ComponentClassScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/ComponentClassScanner.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.classes;
+package io.github.springwolf.core.asyncapi.scanners.classes;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ConfigurationClassScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/ConfigurationClassScanner.java
similarity index 79%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ConfigurationClassScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/ConfigurationClassScanner.java
index 6223a906c..96bcbdeec 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ConfigurationClassScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/ConfigurationClassScanner.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.classes;
+package io.github.springwolf.core.asyncapi.scanners.classes;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.AnnotationUtil;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.AnnotationUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Configuration;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/SpringwolfClassScanner.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/SpringwolfClassScanner.java
similarity index 83%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/SpringwolfClassScanner.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/SpringwolfClassScanner.java
index 0d03ee9f5..fa4ab5fd5 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/SpringwolfClassScanner.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/classes/SpringwolfClassScanner.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.classes;
+package io.github.springwolf.core.asyncapi.scanners.classes;
-import io.github.stavshamir.springwolf.asyncapi.scanners.beans.BeanMethodsScanner;
+import io.github.springwolf.core.asyncapi.scanners.beans.BeanMethodsScanner;
import lombok.RequiredArgsConstructor;
import java.lang.reflect.Method;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/ConsumerData.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/ConsumerData.java
similarity index 78%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/ConsumerData.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/ConsumerData.java
index ef1f57205..2bf0cdbbb 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/ConsumerData.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/ConsumerData.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types;
+package io.github.springwolf.core.asyncapi.types;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ServerReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ServerReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/OperationData.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/OperationData.java
similarity index 68%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/OperationData.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/OperationData.java
index 05eefe813..4cc2c77a2 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/OperationData.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/OperationData.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types;
-
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ServerReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+package io.github.springwolf.core.asyncapi.types;
+
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ServerReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
import org.springframework.lang.Nullable;
import java.util.List;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/ProducerData.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/ProducerData.java
similarity index 78%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/ProducerData.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/ProducerData.java
index 7742e86be..57100a569 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/ProducerData.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/ProducerData.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types;
+package io.github.springwolf.core.asyncapi.types;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ServerReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ServerReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/bindings/EmptyChannelBinding.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/bindings/EmptyChannelBinding.java
new file mode 100644
index 000000000..9f019908c
--- /dev/null
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/bindings/EmptyChannelBinding.java
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+package io.github.springwolf.core.asyncapi.types.channel.bindings;
+
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+
+public class EmptyChannelBinding extends ChannelBinding {}
diff --git a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/bindings/EmptyOperationBinding.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/bindings/EmptyOperationBinding.java
new file mode 100644
index 000000000..b99b3ca5e
--- /dev/null
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/bindings/EmptyOperationBinding.java
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+package io.github.springwolf.core.asyncapi.types.channel.operation.bindings;
+
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+
+public class EmptyOperationBinding extends OperationBinding {}
diff --git a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/bindings/EmptyMessageBinding.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/bindings/EmptyMessageBinding.java
new file mode 100644
index 000000000..7259dba8c
--- /dev/null
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/bindings/EmptyMessageBinding.java
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+package io.github.springwolf.core.asyncapi.types.channel.operation.message.bindings;
+
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+
+public class EmptyMessageBinding extends MessageBinding {}
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeaderSchema.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeaderSchema.java
similarity index 90%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeaderSchema.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeaderSchema.java
index bbac86066..007284016 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeaderSchema.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeaderSchema.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header;
+package io.github.springwolf.core.asyncapi.types.channel.operation.message.header;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.models.media.StringSchema;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeaders.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeaders.java
similarity index 91%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeaders.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeaders.java
index 696e940f5..2c38e87e4 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeaders.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeaders.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header;
+package io.github.springwolf.core.asyncapi.types.channel.operation.message.header;
import io.swagger.v3.oas.models.media.Schema;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersBuilder.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeadersBuilder.java
similarity index 60%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersBuilder.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeadersBuilder.java
index a8edc3f81..85953bdf0 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersBuilder.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeadersBuilder.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header;
+package io.github.springwolf.core.asyncapi.types.channel.operation.message.header;
public interface AsyncHeadersBuilder {
AsyncHeaders buildHeaders(Class> payloadType);
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersCloudEventConstants.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeadersCloudEventConstants.java
similarity index 92%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersCloudEventConstants.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeadersCloudEventConstants.java
index d407f7bf3..476afde04 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersCloudEventConstants.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeadersCloudEventConstants.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header;
+package io.github.springwolf.core.asyncapi.types.channel.operation.message.header;
public class AsyncHeadersCloudEventConstants {
public static final String CONTENT_TYPE = "content-type";
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersNotDocumented.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeadersNotDocumented.java
similarity index 84%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersNotDocumented.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeadersNotDocumented.java
index 1c7020034..36c2ad667 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersNotDocumented.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/types/channel/operation/message/header/AsyncHeadersNotDocumented.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header;
+package io.github.springwolf.core.asyncapi.types.channel.operation.message.header;
public class AsyncHeadersNotDocumented implements AsyncHeadersBuilder {
/**
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/AsyncApiDocket.java b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/AsyncApiDocket.java
similarity index 87%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/AsyncApiDocket.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/configuration/AsyncApiDocket.java
index 2486db330..c95393697 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/AsyncApiDocket.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/AsyncApiDocket.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
+package io.github.springwolf.core.configuration;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.asyncapi.v3.model.info.Info;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
import lombok.Builder;
import lombok.Data;
import lombok.NonNull;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/AsyncApiDocketService.java b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/AsyncApiDocketService.java
similarity index 69%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/AsyncApiDocketService.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/configuration/AsyncApiDocketService.java
index 5a62b2f87..30da7b70d 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/AsyncApiDocketService.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/AsyncApiDocketService.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
+package io.github.springwolf.core.configuration;
public interface AsyncApiDocketService {
AsyncApiDocket getAsyncApiDocket();
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketService.java b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/DefaultAsyncApiDocketService.java
similarity index 90%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketService.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/configuration/DefaultAsyncApiDocketService.java
index 55f8593a4..10cfc49b9 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketService.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/DefaultAsyncApiDocketService.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
+package io.github.springwolf.core.configuration;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.asyncapi.v3.model.info.Info;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.lang.Nullable;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigConstants.java b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/properties/SpringwolfConfigConstants.java
similarity index 95%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigConstants.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/configuration/properties/SpringwolfConfigConstants.java
index 364994cc9..bb6068b77 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigConstants.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/properties/SpringwolfConfigConstants.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration.properties;
+package io.github.springwolf.core.configuration.properties;
public class SpringwolfConfigConstants {
public static final String ENABLED = ".enabled";
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigProperties.java b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/properties/SpringwolfConfigProperties.java
similarity index 88%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigProperties.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/configuration/properties/SpringwolfConfigProperties.java
index 311348787..dc4d72db5 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfConfigProperties.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/properties/SpringwolfConfigProperties.java
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration.properties;
+package io.github.springwolf.core.configuration.properties;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Contact;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.License;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.info.Contact;
+import io.github.springwolf.asyncapi.v3.model.info.License;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.core.configuration.AsyncApiDocket;
import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -114,7 +114,7 @@ public static class Info {
/**
* The title of the application
*
- * @see io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info#getTitle()
+ * @see io.github.springwolf.asyncapi.v3.model.info.Info#getTitle()
*/
@Nullable
private String title;
@@ -122,7 +122,7 @@ public static class Info {
/**
* Required. Provides the version of the application API (not to be confused with the specification version).
*
- * @see io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info#getVersion()
+ * @see io.github.springwolf.asyncapi.v3.model.info.Info#getVersion()
*/
@Nullable
private String version;
@@ -130,14 +130,14 @@ public static class Info {
/**
* A short description of the application. CommonMark syntax can be used for rich text representation.
*
- * @see io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info#getDescription()
+ * @see io.github.springwolf.asyncapi.v3.model.info.Info#getDescription()
*/
@Nullable
private String description;
/**
* A URL to the Terms of Service for the API. MUST be in the format of a URL.
- * {@link io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info#getTermsOfService()}
+ * {@link io.github.springwolf.asyncapi.v3.model.info.Info#getTermsOfService()}
*/
@Nullable
private String termsOfService;
diff --git a/springwolf-core/src/main/java/io/github/springwolf/core/schemas/ComponentsService.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/ComponentsService.java
new file mode 100644
index 000000000..9e60bbf12
--- /dev/null
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/ComponentsService.java
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+package io.github.springwolf.core.schemas;
+
+import io.github.springwolf.asyncapi.v3.model.channel.message.Message;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+
+import java.util.Map;
+
+public interface ComponentsService {
+
+ Map getSchemas();
+
+ String registerSchema(AsyncHeaders headers);
+
+ String registerSchema(Class> type);
+
+ String registerSchema(Class> type, String contentType);
+
+ Map getMessages();
+
+ MessageReference registerMessage(MessageObject message);
+}
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/DefaultComponentsService.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/DefaultComponentsService.java
similarity index 87%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/DefaultComponentsService.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/DefaultComponentsService.java
index 586a39a94..528738b7d 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/DefaultComponentsService.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/DefaultComponentsService.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.AsyncApiPayload;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.Message;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.schemas.postprocessor.SchemasPostProcessor;
+package io.github.springwolf.core.schemas;
+
+import io.github.springwolf.asyncapi.v3.model.channel.message.Message;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.AsyncApiPayload;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.schemas.postprocessor.SchemasPostProcessor;
import io.swagger.v3.core.converter.ModelConverter;
import io.swagger.v3.core.converter.ModelConverters;
import io.swagger.v3.core.jackson.TypeNameResolver;
@@ -29,7 +29,7 @@
import java.util.function.Function;
import java.util.stream.Collectors;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties.ConfigDocket.DEFAULT_CONTENT_TYPE;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties.ConfigDocket.DEFAULT_CONTENT_TYPE;
@Slf4j
public class DefaultComponentsService implements ComponentsService {
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/SwaggerSchemaUtil.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/SwaggerSchemaUtil.java
similarity index 92%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/SwaggerSchemaUtil.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/SwaggerSchemaUtil.java
index d6cfe02bf..f23665ad9 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/SwaggerSchemaUtil.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/SwaggerSchemaUtil.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas;
+package io.github.springwolf.core.schemas;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.ExternalDocumentation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.components.ComponentSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.model.ExternalDocumentation;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.components.ComponentSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
import io.swagger.v3.oas.models.media.Schema;
import lombok.RequiredArgsConstructor;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/DefaultExampleXmlValueSerializer.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/DefaultExampleXmlValueSerializer.java
similarity index 95%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/DefaultExampleXmlValueSerializer.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/DefaultExampleXmlValueSerializer.java
index fafa96587..788c316b8 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/DefaultExampleXmlValueSerializer.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/DefaultExampleXmlValueSerializer.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
import org.w3c.dom.Document;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/DefaultExampleYamlValueSerializer.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/DefaultExampleYamlValueSerializer.java
similarity index 90%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/DefaultExampleYamlValueSerializer.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/DefaultExampleYamlValueSerializer.java
index 9ed3a48b1..649243f00 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/DefaultExampleYamlValueSerializer.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/DefaultExampleYamlValueSerializer.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/DefaultSchemaWalker.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/DefaultSchemaWalker.java
similarity index 98%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/DefaultSchemaWalker.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/DefaultSchemaWalker.java
index fed8da4b1..f53c1504c 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/DefaultSchemaWalker.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/DefaultSchemaWalker.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import lombok.RequiredArgsConstructor;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleJsonValueGenerator.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleJsonValueGenerator.java
similarity index 98%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleJsonValueGenerator.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleJsonValueGenerator.java
index 48e1e30cd..e598b0a23 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleJsonValueGenerator.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleJsonValueGenerator.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleValueGenerator.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleValueGenerator.java
similarity index 97%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleValueGenerator.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleValueGenerator.java
index bd39db470..f44a1a4c0 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleValueGenerator.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleValueGenerator.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
import io.swagger.v3.oas.models.media.Schema;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleXmlValueGenerator.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleXmlValueGenerator.java
similarity index 99%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleXmlValueGenerator.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleXmlValueGenerator.java
index cc3984ac8..21a2b928a 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleXmlValueGenerator.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleXmlValueGenerator.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
import io.swagger.v3.oas.models.media.Schema;
import lombok.extern.slf4j.Slf4j;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleXmlValueSerializer.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleXmlValueSerializer.java
similarity index 81%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleXmlValueSerializer.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleXmlValueSerializer.java
index abd30883a..af23692a9 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleXmlValueSerializer.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleXmlValueSerializer.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
import org.w3c.dom.Document;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleYamlValueGenerator.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleYamlValueGenerator.java
similarity index 98%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleYamlValueGenerator.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleYamlValueGenerator.java
index 25334db4e..96980353f 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleYamlValueGenerator.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleYamlValueGenerator.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleYamlValueSerializer.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleYamlValueSerializer.java
similarity index 83%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleYamlValueSerializer.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleYamlValueSerializer.java
index 666c3d2bd..c0359db8f 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/ExampleYamlValueSerializer.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/ExampleYamlValueSerializer.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/PropertyExample.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/PropertyExample.java
similarity index 62%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/PropertyExample.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/PropertyExample.java
index c3f5f5e6c..3cb3b9c60 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/PropertyExample.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/PropertyExample.java
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
record PropertyExample(String name, T example) {}
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/SchemaWalker.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/SchemaWalker.java
similarity index 94%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/SchemaWalker.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/SchemaWalker.java
index f07877dd2..1162c0195 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/SchemaWalker.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/SchemaWalker.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
import io.swagger.v3.oas.models.media.Schema;
import jakarta.annotation.Nullable;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/SchemaWalkerProvider.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/SchemaWalkerProvider.java
similarity index 90%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/SchemaWalkerProvider.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/SchemaWalkerProvider.java
index c851d4009..b7e377a28 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/example/SchemaWalkerProvider.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/example/SchemaWalkerProvider.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
import lombok.RequiredArgsConstructor;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/postprocessor/AvroSchemaPostProcessor.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/postprocessor/AvroSchemaPostProcessor.java
similarity index 94%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/postprocessor/AvroSchemaPostProcessor.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/postprocessor/AvroSchemaPostProcessor.java
index d602ac1c0..ba7b135c4 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/postprocessor/AvroSchemaPostProcessor.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/postprocessor/AvroSchemaPostProcessor.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.postprocessor;
+package io.github.springwolf.core.schemas.postprocessor;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
import io.swagger.v3.oas.models.media.Schema;
import org.springframework.util.StringUtils;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/postprocessor/ExampleGeneratorPostProcessor.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/postprocessor/ExampleGeneratorPostProcessor.java
similarity index 83%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/postprocessor/ExampleGeneratorPostProcessor.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/postprocessor/ExampleGeneratorPostProcessor.java
index edc4d7dc9..05afa2767 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/postprocessor/ExampleGeneratorPostProcessor.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/postprocessor/ExampleGeneratorPostProcessor.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.postprocessor;
+package io.github.springwolf.core.schemas.postprocessor;
-import io.github.stavshamir.springwolf.schemas.example.SchemaWalker;
-import io.github.stavshamir.springwolf.schemas.example.SchemaWalkerProvider;
+import io.github.springwolf.core.schemas.example.SchemaWalker;
+import io.github.springwolf.core.schemas.example.SchemaWalkerProvider;
import io.swagger.v3.oas.models.media.Schema;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/postprocessor/SchemasPostProcessor.java b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/postprocessor/SchemasPostProcessor.java
similarity index 87%
rename from springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/postprocessor/SchemasPostProcessor.java
rename to springwolf-core/src/main/java/io/github/springwolf/core/schemas/postprocessor/SchemasPostProcessor.java
index e9af88720..ffb10c57c 100644
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/postprocessor/SchemasPostProcessor.java
+++ b/springwolf-core/src/main/java/io/github/springwolf/core/schemas/postprocessor/SchemasPostProcessor.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.postprocessor;
+package io.github.springwolf.core.schemas.postprocessor;
import io.swagger.v3.oas.models.media.Schema;
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/AsyncApiService.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/AsyncApiService.java
deleted file mode 100644
index bb43be065..000000000
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/AsyncApiService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
-
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-
-public interface AsyncApiService {
-
- AsyncAPI getAsyncAPI();
-}
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/bindings/EmptyChannelBinding.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/bindings/EmptyChannelBinding.java
deleted file mode 100644
index ee261b4ca..000000000
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/bindings/EmptyChannelBinding.java
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types.channel.bindings;
-
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-
-public class EmptyChannelBinding extends ChannelBinding {}
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/bindings/EmptyOperationBinding.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/bindings/EmptyOperationBinding.java
deleted file mode 100644
index 9a3446030..000000000
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/bindings/EmptyOperationBinding.java
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types.channel.operation.bindings;
-
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-
-public class EmptyOperationBinding extends OperationBinding {}
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/bindings/EmptyMessageBinding.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/bindings/EmptyMessageBinding.java
deleted file mode 100644
index 3d7233754..000000000
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/bindings/EmptyMessageBinding.java
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.bindings;
-
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-
-public class EmptyMessageBinding extends MessageBinding {}
diff --git a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/ComponentsService.java b/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/ComponentsService.java
deleted file mode 100644
index 6932c3dba..000000000
--- a/springwolf-core/src/main/java/io/github/stavshamir/springwolf/schemas/ComponentsService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas;
-
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.Message;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
-
-import java.util.Map;
-
-public interface ComponentsService {
-
- Map getSchemas();
-
- String registerSchema(AsyncHeaders headers);
-
- String registerSchema(Class> type);
-
- String registerSchema(Class> type, String contentType);
-
- Map getMessages();
-
- MessageReference registerMessage(MessageObject message);
-}
diff --git a/springwolf-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springwolf-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 45a04cce0..ba0b35b5f 100644
--- a/springwolf-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/springwolf-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-io.github.stavshamir.springwolf.SpringwolfAutoConfiguration
+io.github.springwolf.core.SpringwolfAutoConfiguration
diff --git a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/ClasspathUtil.java b/springwolf-core/src/test/java/io/github/springwolf/core/ClasspathUtil.java
similarity index 86%
rename from springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/ClasspathUtil.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/ClasspathUtil.java
index c2b2fee7c..5151c2da0 100644
--- a/springwolf-asyncapi/src/test/java/io/github/stavshamir/springwolf/asyncapi/v3/ClasspathUtil.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/ClasspathUtil.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.v3;
+package io.github.springwolf.core;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
import java.io.IOException;
import java.io.InputStream;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/SpringContextIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/SpringContextIntegrationTest.java
similarity index 82%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/SpringContextIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/SpringContextIntegrationTest.java
index f01a57b66..ded4ef038 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/SpringContextIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/SpringContextIntegrationTest.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf;
+package io.github.springwolf.core;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
-import io.github.stavshamir.springwolf.fixtures.MinimalIntegrationTestContextConfiguration;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
+import io.github.springwolf.core.fixtures.MinimalIntegrationTestContextConfiguration;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +29,6 @@ void testContextWithApplicationProperties() {
assertThat(asyncApiService.getAsyncAPI().getInfo().getTitle())
.isEqualTo("Info title was loaded from spring properties");
assertThat(asyncApiService.getAsyncAPI().getDefaultContentType()).isEqualTo("application/json");
- assertThat(asyncApiService.getAsyncAPI().getId()).isEqualTo("urn:io:github:stavshamir:springwolf:example");
+ assertThat(asyncApiService.getAsyncAPI().getId()).isEqualTo("urn:io:github:springwolf:example");
}
}
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java
similarity index 72%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java
index 3c8cbc023..e179ed0a3 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultAsyncApiSerializerServiceIntegrationTest.java
@@ -1,30 +1,30 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
-
-import io.github.stavshamir.springwolf.ClasspathUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.AsyncApiSerializerService;
-import io.github.stavshamir.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ServerReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.Message;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.components.Components;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Contact;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.License;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaType;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
+package io.github.springwolf.core.asyncapi;
+
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
+import io.github.springwolf.asyncapi.v3.jackson.AsyncApiSerializerService;
+import io.github.springwolf.asyncapi.v3.jackson.DefaultAsyncApiSerializer;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.ServerReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.Message;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.components.Components;
+import io.github.springwolf.asyncapi.v3.model.info.Contact;
+import io.github.springwolf.asyncapi.v3.model.info.Info;
+import io.github.springwolf.asyncapi.v3.model.info.License;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaType;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.core.ClasspathUtil;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -71,7 +71,7 @@ private AsyncAPI getAsyncAPITestObject() {
.build();
MessageObject message = MessageObject.builder()
- .name("io.github.stavshamir.springwolf.ExamplePayload")
+ .name("io.github.springwolf.core.ExamplePayload")
.title("Example Payload")
.payload(MessagePayload.of(MultiFormatSchema.builder()
.schema(MessageReference.toSchema("ExamplePayload"))
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultAsyncApiServiceIntegrationTest.java
similarity index 86%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultAsyncApiServiceIntegrationTest.java
index 8849d828f..d843eadc2 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultAsyncApiServiceIntegrationTest.java
@@ -1,15 +1,15 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
-
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
-import io.github.stavshamir.springwolf.configuration.DefaultAsyncApiDocketService;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+package io.github.springwolf.core.asyncapi;
+
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaChannelBinding;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.info.Info;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.core.configuration.DefaultAsyncApiDocketService;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.schemas.ComponentsService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -44,9 +44,9 @@
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.id=urn:io:github:stavshamir:springwolf:example",
+ "springwolf.docket.id=urn:io:github:springwolf:example",
"springwolf.docket.default-content-type=application/json",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.core.example",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
})
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultAsyncApiServiceTest.java
similarity index 89%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultAsyncApiServiceTest.java
index e6a6c0a18..ed7d48a57 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultAsyncApiServiceTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultAsyncApiServiceTest.java
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
+package io.github.springwolf.core.asyncapi;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
-import io.github.stavshamir.springwolf.fixtures.AsyncApiDocketFixture;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.core.configuration.AsyncApiDocket;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.fixtures.AsyncApiDocketFixture;
+import io.github.springwolf.core.schemas.ComponentsService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsServiceIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultChannelsServiceIntegrationTest.java
similarity index 86%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsServiceIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultChannelsServiceIntegrationTest.java
index c559b5e17..ae993b314 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultChannelsServiceIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultChannelsServiceIntegrationTest.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
+package io.github.springwolf.core.asyncapi;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.core.asyncapi.scanners.channels.ChannelsScanner;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultOperationsServiceIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultOperationsServiceIntegrationTest.java
similarity index 88%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultOperationsServiceIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultOperationsServiceIntegrationTest.java
index b82bb9727..edda98593 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/DefaultOperationsServiceIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/DefaultOperationsServiceIntegrationTest.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
+package io.github.springwolf.core.asyncapi;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.OperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.core.asyncapi.scanners.channels.OperationsScanner;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/MessageHelperTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/MessageHelperTest.java
similarity index 93%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/MessageHelperTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/MessageHelperTest.java
index d09410370..447a10dae 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/MessageHelperTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/MessageHelperTest.java
@@ -1,16 +1,16 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi;
+package io.github.springwolf.core.asyncapi;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
import org.junit.jupiter.api.Test;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
-import static io.github.stavshamir.springwolf.asyncapi.MessageHelper.toMessagesMap;
-import static io.github.stavshamir.springwolf.asyncapi.MessageHelper.toOperationsMessagesMap;
+import static io.github.springwolf.core.asyncapi.MessageHelper.toMessagesMap;
+import static io.github.springwolf.core.asyncapi.MessageHelper.toOperationsMessagesMap;
import static java.util.Map.entry;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringContextControllerIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/controller/SpringContextControllerIntegrationTest.java
similarity index 91%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringContextControllerIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/controller/SpringContextControllerIntegrationTest.java
index 1a4eb587b..baa75e30c 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringContextControllerIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/controller/SpringContextControllerIntegrationTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.controller;
+package io.github.springwolf.core.asyncapi.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
-import io.github.stavshamir.springwolf.SpringwolfWebConfiguration;
-import io.github.stavshamir.springwolf.fixtures.MinimalIntegrationTestContextConfiguration;
+import io.github.springwolf.core.SpringwolfWebConfiguration;
+import io.github.springwolf.core.fixtures.MinimalIntegrationTestContextConfiguration;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/controller/dtos/MessageDtoDeserializationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/controller/dtos/MessageDtoDeserializationTest.java
similarity index 85%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/controller/dtos/MessageDtoDeserializationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/controller/dtos/MessageDtoDeserializationTest.java
index 61cb795da..68f478a19 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/controller/dtos/MessageDtoDeserializationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/controller/dtos/MessageDtoDeserializationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.controller.dtos;
+package io.github.springwolf.core.asyncapi.controller.dtos;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.v3.core.util.Json;
@@ -27,7 +27,6 @@ void testCanBeSerialized() throws IOException, ClassNotFoundException {
assertThat(value.getPayload())
.isEqualTo(
new ObjectMapper().writeValueAsString(singletonMap("some-payload-key", "some-payload-value")));
- assertThat(value.getPayloadType())
- .isEqualTo("io.github.stavshamir.springwolf.asyncapi.controller.dtos.MessageDto");
+ assertThat(value.getPayloadType()).isEqualTo("io.github.springwolf.core.asyncapi.controller.dtos.MessageDto");
}
}
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/DefaultBeanMethodsScannerIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/beans/DefaultBeanMethodsScannerIntegrationTest.java
similarity index 91%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/DefaultBeanMethodsScannerIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/beans/DefaultBeanMethodsScannerIntegrationTest.java
index 418baf975..53d2adce2 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/beans/DefaultBeanMethodsScannerIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/beans/DefaultBeanMethodsScannerIntegrationTest.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.beans;
+package io.github.springwolf.core.asyncapi.scanners.beans;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ConfigurationClassScanner;
+import io.github.springwolf.core.asyncapi.scanners.classes.ConfigurationClassScanner;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/TestAbstractOperationBindingProcessor.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/bindings/processor/TestAbstractOperationBindingProcessor.java
similarity index 77%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/TestAbstractOperationBindingProcessor.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/bindings/processor/TestAbstractOperationBindingProcessor.java
index a96cfbf29..58a2fb541 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/TestAbstractOperationBindingProcessor.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/bindings/processor/TestAbstractOperationBindingProcessor.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.core.asyncapi.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingProcessorPriority;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingProcessorPriority;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
import org.springframework.core.annotation.Order;
import java.lang.annotation.ElementType;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/TestMessageBindingProcessor.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/bindings/processor/TestMessageBindingProcessor.java
similarity index 72%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/TestMessageBindingProcessor.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/bindings/processor/TestMessageBindingProcessor.java
index 8abf21621..0ff95d509 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/TestMessageBindingProcessor.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/bindings/processor/TestMessageBindingProcessor.java
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.core.asyncapi.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingProcessorPriority;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.MessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.bindings.EmptyMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingProcessorPriority;
+import io.github.springwolf.core.asyncapi.scanners.bindings.MessageBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedMessageBinding;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.bindings.EmptyMessageBinding;
import org.springframework.core.annotation.Order;
import java.lang.annotation.ElementType;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/TestOperationBindingProcessor.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/bindings/processor/TestOperationBindingProcessor.java
similarity index 77%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/TestOperationBindingProcessor.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/bindings/processor/TestOperationBindingProcessor.java
index 9c7dc9c8c..a6fc8bebd 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/TestOperationBindingProcessor.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/bindings/processor/TestOperationBindingProcessor.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.core.asyncapi.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingProcessorPriority;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.OperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingProcessorPriority;
+import io.github.springwolf.core.asyncapi.scanners.bindings.OperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
import org.springframework.core.annotation.Order;
import java.lang.annotation.ElementType;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/ChannelMergerTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/ChannelMergerTest.java
similarity index 93%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/ChannelMergerTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/ChannelMergerTest.java
index d5d7e39f9..b96162730 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/ChannelMergerTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/ChannelMergerTest.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels;
+package io.github.springwolf.core.asyncapi.scanners.channels;
-import io.github.stavshamir.springwolf.asyncapi.MessageHelper;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.core.asyncapi.MessageHelper;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/OperationMergerTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/OperationMergerTest.java
similarity index 93%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/OperationMergerTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/OperationMergerTest.java
index 75b8d6a82..cd49204a3 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/OperationMergerTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/OperationMergerTest.java
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels;
+package io.github.springwolf.core.asyncapi.scanners.channels;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/SimpleChannelsScannerTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/SimpleChannelsScannerTest.java
similarity index 91%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/SimpleChannelsScannerTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/SimpleChannelsScannerTest.java
index 9c0e8c365..4680d4bbf 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/SimpleChannelsScannerTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/SimpleChannelsScannerTest.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels;
+package io.github.springwolf.core.asyncapi.scanners.channels;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.core.asyncapi.scanners.classes.ClassScanner;
import org.junit.jupiter.api.Test;
import java.util.Map;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/SimpleOperationsScannerTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/SimpleOperationsScannerTest.java
similarity index 92%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/SimpleOperationsScannerTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/SimpleOperationsScannerTest.java
index 770c92fce..0f02b129c 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/SimpleOperationsScannerTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/SimpleOperationsScannerTest.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels;
+package io.github.springwolf.core.asyncapi.scanners.channels;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.core.asyncapi.scanners.classes.ClassScanner;
import org.junit.jupiter.api.Test;
import java.util.Map;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AnnotationUtilTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AnnotationUtilTest.java
similarity index 98%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AnnotationUtilTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AnnotationUtilTest.java
index db82323ed..e802be925 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AnnotationUtilTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AnnotationUtilTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationChannelsScannerTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationChannelsScannerTest.java
similarity index 89%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationChannelsScannerTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationChannelsScannerTest.java
index bfd2d6131..c689825c7 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationChannelsScannerTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationChannelsScannerTest.java
@@ -1,34 +1,34 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.MessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.OperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.TestOperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncMessage;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ServerReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
-import io.github.stavshamir.springwolf.schemas.DefaultComponentsService;
-import io.github.stavshamir.springwolf.schemas.SwaggerSchemaUtil;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.ServerReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.info.Info;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.core.asyncapi.scanners.bindings.MessageBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.OperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.processor.TestOperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncMessage;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.ClassScanner;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.configuration.AsyncApiDocket;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.core.schemas.DefaultComponentsService;
+import io.github.springwolf.core.schemas.SwaggerSchemaUtil;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationOperationsScannerTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationOperationsScannerTest.java
similarity index 89%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationOperationsScannerTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationOperationsScannerTest.java
index 9c1a0d144..7599012fb 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationOperationsScannerTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationOperationsScannerTest.java
@@ -1,34 +1,34 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.MessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.OperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.TestOperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncMessage;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ServerReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
-import io.github.stavshamir.springwolf.schemas.DefaultComponentsService;
-import io.github.stavshamir.springwolf.schemas.SwaggerSchemaUtil;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.ServerReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.info.Info;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.core.asyncapi.scanners.bindings.MessageBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.OperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.processor.TestOperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncMessage;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.ClassScanner;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.configuration.AsyncApiDocket;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.core.schemas.DefaultComponentsService;
+import io.github.springwolf.core.schemas.SwaggerSchemaUtil;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationScannerUtilTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationScannerUtilTest.java
similarity index 92%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationScannerUtilTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationScannerUtilTest.java
index a9ee06e64..accb9cf0b 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/AsyncAnnotationScannerUtilTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/AsyncAnnotationScannerUtilTest.java
@@ -1,16 +1,16 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.TestAbstractOperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.TestMessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.TestOperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncMessage;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.core.asyncapi.scanners.bindings.processor.TestAbstractOperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.processor.TestMessageBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.processor.TestOperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncMessage;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
import org.assertj.core.util.Maps;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScannerIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScannerIntegrationTest.java
similarity index 84%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScannerIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScannerIntegrationTest.java
index d6942c74e..a29ea7b00 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScannerIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScannerIntegrationTest.java
@@ -1,26 +1,26 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeadersNotDocumented;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaReference;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
-import io.github.stavshamir.springwolf.schemas.DefaultComponentsService;
-import io.github.stavshamir.springwolf.schemas.SwaggerSchemaUtil;
-import io.github.stavshamir.springwolf.schemas.example.DefaultSchemaWalker;
-import io.github.stavshamir.springwolf.schemas.example.ExampleJsonValueGenerator;
-import io.github.stavshamir.springwolf.schemas.example.SchemaWalkerProvider;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeadersNotDocumented;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.core.schemas.DefaultComponentsService;
+import io.github.springwolf.core.schemas.SwaggerSchemaUtil;
+import io.github.springwolf.core.schemas.example.DefaultSchemaWalker;
+import io.github.springwolf.core.schemas.example.ExampleJsonValueGenerator;
+import io.github.springwolf.core.schemas.example.SchemaWalkerProvider;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScannerTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScannerTest.java
similarity index 72%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScannerTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScannerTest.java
index ff0934b82..ea85da9c9 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScannerTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationChannelsScannerTest.java
@@ -1,24 +1,24 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeadersNotDocumented;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaReference;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeadersNotDocumented;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.junit.jupiter.api.BeforeEach;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationOperationsScannerTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationOperationsScannerTest.java
similarity index 71%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationOperationsScannerTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationOperationsScannerTest.java
index a1b748d55..5d4bb57b9 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/ClassLevelAnnotationOperationsScannerTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/ClassLevelAnnotationOperationsScannerTest.java
@@ -1,26 +1,26 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeadersNotDocumented;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaReference;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeadersNotDocumented;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.junit.jupiter.api.BeforeEach;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScannerIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScannerIntegrationTest.java
similarity index 83%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScannerIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScannerIntegrationTest.java
index 2606b1c62..8964a6148 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScannerIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScannerIntegrationTest.java
@@ -1,26 +1,26 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaReference;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
-import io.github.stavshamir.springwolf.schemas.DefaultComponentsService;
-import io.github.stavshamir.springwolf.schemas.SwaggerSchemaUtil;
-import io.github.stavshamir.springwolf.schemas.example.DefaultSchemaWalker;
-import io.github.stavshamir.springwolf.schemas.example.ExampleJsonValueGenerator;
-import io.github.stavshamir.springwolf.schemas.example.SchemaWalkerProvider;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.core.schemas.DefaultComponentsService;
+import io.github.springwolf.core.schemas.SwaggerSchemaUtil;
+import io.github.springwolf.core.schemas.example.DefaultSchemaWalker;
+import io.github.springwolf.core.schemas.example.ExampleJsonValueGenerator;
+import io.github.springwolf.core.schemas.example.SchemaWalkerProvider;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
@@ -40,8 +40,8 @@
import java.util.List;
import java.util.Map;
-import static io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScannerIntegrationTest.TestBindingFactory.defaultChannelBinding;
-import static io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScannerIntegrationTest.TestBindingFactory.defaultMessageBinding;
+import static io.github.springwolf.core.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScannerIntegrationTest.TestBindingFactory.defaultChannelBinding;
+import static io.github.springwolf.core.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScannerIntegrationTest.TestBindingFactory.defaultMessageBinding;
import static org.assertj.core.api.Assertions.assertThat;
@ExtendWith(SpringExtension.class)
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScannerTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScannerTest.java
similarity index 81%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScannerTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScannerTest.java
index cd87b669a..f27cbfb25 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScannerTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/annotation/MethodLevelAnnotationChannelsScannerTest.java
@@ -1,24 +1,24 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeadersNotDocumented;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaReference;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+package io.github.springwolf.core.asyncapi.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeadersNotDocumented;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.junit.jupiter.api.BeforeEach;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/payload/PayloadClassExtractorTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/payload/PayloadClassExtractorTest.java
similarity index 96%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/payload/PayloadClassExtractorTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/payload/PayloadClassExtractorTest.java
index 6b41e953f..d4864faca 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/payload/PayloadClassExtractorTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/channels/payload/PayloadClassExtractorTest.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload;
+package io.github.springwolf.core.asyncapi.scanners.channels.payload;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
import org.junit.jupiter.api.Test;
import org.springframework.messaging.Message;
import org.springframework.messaging.handler.annotation.Payload;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ComponentClassScannerIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/ComponentClassScannerIntegrationTest.java
similarity index 91%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ComponentClassScannerIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/ComponentClassScannerIntegrationTest.java
index 95f00e38d..a27a49673 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ComponentClassScannerIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/ComponentClassScannerIntegrationTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.classes;
+package io.github.springwolf.core.asyncapi.scanners.classes;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
+import io.github.springwolf.asyncapi.v3.model.info.Info;
+import io.github.springwolf.core.configuration.AsyncApiDocket;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ConfigurationClassScannerIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/ConfigurationClassScannerIntegrationTest.java
similarity index 84%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ConfigurationClassScannerIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/ConfigurationClassScannerIntegrationTest.java
index bb745ae4c..29545ae13 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/ConfigurationClassScannerIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/ConfigurationClassScannerIntegrationTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.classes;
+package io.github.springwolf.core.asyncapi.scanners.classes;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
+import io.github.springwolf.asyncapi.v3.model.info.Info;
+import io.github.springwolf.core.configuration.AsyncApiDocket;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/SpringwolfClassScannerIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/SpringwolfClassScannerIntegrationTest.java
similarity index 88%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/SpringwolfClassScannerIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/SpringwolfClassScannerIntegrationTest.java
index e97e6ca52..6be3897cb 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/SpringwolfClassScannerIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/SpringwolfClassScannerIntegrationTest.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.classes;
+package io.github.springwolf.core.asyncapi.scanners.classes;
-import io.github.stavshamir.springwolf.asyncapi.scanners.beans.DefaultBeanMethodsScanner;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
+import io.github.springwolf.asyncapi.v3.model.info.Info;
+import io.github.springwolf.core.asyncapi.scanners.beans.DefaultBeanMethodsScanner;
+import io.github.springwolf.core.configuration.AsyncApiDocket;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/TestBeanConfiguration.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/TestBeanConfiguration.java
similarity index 85%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/TestBeanConfiguration.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/TestBeanConfiguration.java
index 18c25b1b0..829fba9dd 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/TestBeanConfiguration.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/TestBeanConfiguration.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.classes;
+package io.github.springwolf.core.asyncapi.scanners.classes;
import lombok.Value;
import org.springframework.context.annotation.Bean;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/TestComponent.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/TestComponent.java
similarity index 66%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/TestComponent.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/TestComponent.java
index dfaacc64c..34dd93fa0 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/TestComponent.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/TestComponent.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.classes;
+package io.github.springwolf.core.asyncapi.scanners.classes;
import org.springframework.stereotype.Component;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/TestConditionalComponent.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/TestConditionalComponent.java
similarity index 84%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/TestConditionalComponent.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/TestConditionalComponent.java
index 0d01ca9ae..168ad2f0b 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/TestConditionalComponent.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/TestConditionalComponent.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.classes;
+package io.github.springwolf.core.asyncapi.scanners.classes;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/TestOtherConditionalComponent.java b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/TestOtherConditionalComponent.java
similarity index 75%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/TestOtherConditionalComponent.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/TestOtherConditionalComponent.java
index e44a4f01f..b3a8a69d7 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/classes/TestOtherConditionalComponent.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/TestOtherConditionalComponent.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.classes;
+package io.github.springwolf.core.asyncapi.scanners.classes;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketServiceIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/configuration/DefaultAsyncApiDocketServiceIntegrationTest.java
similarity index 88%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketServiceIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/configuration/DefaultAsyncApiDocketServiceIntegrationTest.java
index 2b866e1b2..3d72a6b54 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketServiceIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/configuration/DefaultAsyncApiDocketServiceIntegrationTest.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
+package io.github.springwolf.core.configuration;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -26,7 +26,7 @@
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
"springwolf.docket.info.extension-fields.x-api-name=api-name",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.core.example",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234"
})
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketServiceTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/configuration/DefaultAsyncApiDocketServiceTest.java
similarity index 84%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketServiceTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/configuration/DefaultAsyncApiDocketServiceTest.java
index 747ae50f9..3cf73d4a2 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/DefaultAsyncApiDocketServiceTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/configuration/DefaultAsyncApiDocketServiceTest.java
@@ -1,12 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
-
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Contact;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.License;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties.ConfigDocket;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties.ConfigDocket.Info;
+package io.github.springwolf.core.configuration;
+
+import io.github.springwolf.asyncapi.v3.model.info.Contact;
+import io.github.springwolf.asyncapi.v3.model.info.License;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties.ConfigDocket;
import org.junit.jupiter.api.Test;
import java.util.Map;
@@ -28,7 +27,7 @@ void testServiceShouldMapAllPropertiesToTheDocket() {
Server.builder().protocol("some-protocol").host("some-url").build();
configDocket.setServers(newHashMap("some-protocol", server));
- Info info = new Info();
+ ConfigDocket.Info info = new ConfigDocket.Info();
info.setTitle("some-title");
info.setVersion("some-version");
info.setDescription("some-description");
@@ -67,7 +66,7 @@ void docketServiceShouldDeliverCachedDocket() {
configDocket.setBasePackage("test-base-package");
configDocket.setDefaultContentType("application/json");
- Info info = new Info();
+ ConfigDocket.Info info = new ConfigDocket.Info();
info.setTitle("some-title");
info.setVersion("some-version");
configDocket.setInfo(info);
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfConfigPropertiesIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/configuration/SpringwolfConfigPropertiesIntegrationTest.java
similarity index 91%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfConfigPropertiesIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/configuration/SpringwolfConfigPropertiesIntegrationTest.java
index 864ef570a..d3446322f 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfConfigPropertiesIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/configuration/SpringwolfConfigPropertiesIntegrationTest.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
+package io.github.springwolf.core.configuration;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -26,7 +26,7 @@ public class SpringwolfConfigPropertiesIntegrationTest {
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
"springwolf.docket.info.extension-fields.x-api-name=api-name",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.core.example",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
})
@@ -51,7 +51,7 @@ void docketInfoTest() {
@Test
void docketBasePackageTest() {
- assertThat(properties.getDocket().getBasePackage()).isEqualTo("io.github.stavshamir.springwolf.example");
+ assertThat(properties.getDocket().getBasePackage()).isEqualTo("io.github.springwolf.core.example");
}
@Test
@@ -75,7 +75,7 @@ void docketServersTest() {
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
"springwolf.docket.info.extension-fields.x-api-name=api-name",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.core.example",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
})
@@ -107,7 +107,7 @@ void payloadTest() {
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
"springwolf.docket.info.extension-fields.x-api-name=api-name",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.core.example",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
"springwolf.payload.extractable-classes.my.custom.class=1"
@@ -143,7 +143,7 @@ void payloadCustomizedTest() {
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
"springwolf.docket.info.extension-fields.x-api-name=api-name",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.core.example",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
"springwolf.payload.extractable-classes.java.util.List=-1"
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/fixtures/AsyncApiDocketFixture.java b/springwolf-core/src/test/java/io/github/springwolf/core/fixtures/AsyncApiDocketFixture.java
similarity index 60%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/fixtures/AsyncApiDocketFixture.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/fixtures/AsyncApiDocketFixture.java
index d21eb9756..42d652ebb 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/fixtures/AsyncApiDocketFixture.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/fixtures/AsyncApiDocketFixture.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.fixtures;
+package io.github.springwolf.core.fixtures;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
+import io.github.springwolf.asyncapi.v3.model.info.Info;
+import io.github.springwolf.core.configuration.AsyncApiDocket;
public class AsyncApiDocketFixture {
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/fixtures/MinimalIntegrationTestContextConfiguration.java b/springwolf-core/src/test/java/io/github/springwolf/core/fixtures/MinimalIntegrationTestContextConfiguration.java
similarity index 76%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/fixtures/MinimalIntegrationTestContextConfiguration.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/fixtures/MinimalIntegrationTestContextConfiguration.java
index 9ef438c97..9d6f2f0de 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/fixtures/MinimalIntegrationTestContextConfiguration.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/fixtures/MinimalIntegrationTestContextConfiguration.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.fixtures;
+package io.github.springwolf.core.fixtures;
-import io.github.stavshamir.springwolf.SpringwolfAutoConfiguration;
+import io.github.springwolf.core.SpringwolfAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
@@ -18,9 +18,9 @@
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.id=urn:io:github:stavshamir:springwolf:example",
+ "springwolf.docket.id=urn:io:github:springwolf:example",
"springwolf.docket.default-content-type=application/json",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.integrationtests.application.basic",
+ "springwolf.docket.base-package=io.github.springwolf.core.integrationtests.application.basic",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
})
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/fixtures/ObjectMapperTestConfiguration.java b/springwolf-core/src/test/java/io/github/springwolf/core/fixtures/ObjectMapperTestConfiguration.java
similarity index 90%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/fixtures/ObjectMapperTestConfiguration.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/fixtures/ObjectMapperTestConfiguration.java
index dd5f87a13..d6080b6be 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/fixtures/ObjectMapperTestConfiguration.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/fixtures/ObjectMapperTestConfiguration.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.fixtures;
+package io.github.springwolf.core.fixtures;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/AsyncApiDocumentIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/AsyncApiDocumentIntegrationTest.java
similarity index 59%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/AsyncApiDocumentIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/AsyncApiDocumentIntegrationTest.java
index 47096c642..3e3bd0a58 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/AsyncApiDocumentIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/AsyncApiDocumentIntegrationTest.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.integrationtests;
+package io.github.springwolf.core.integrationtests;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.Message;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
-import io.github.stavshamir.springwolf.fixtures.MinimalIntegrationTestContextConfiguration;
-import io.github.stavshamir.springwolf.integrationtests.application.listener.ListenerApplication;
-import io.github.stavshamir.springwolf.integrationtests.application.polymorphic.PolymorphicPayloadApplication;
-import io.github.stavshamir.springwolf.integrationtests.application.publisher.PublisherApplication;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.channel.message.Message;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
+import io.github.springwolf.core.fixtures.MinimalIntegrationTestContextConfiguration;
+import io.github.springwolf.core.integrationtests.application.listener.ListenerApplication;
+import io.github.springwolf.core.integrationtests.application.polymorphic.PolymorphicPayloadApplication;
+import io.github.springwolf.core.integrationtests.application.publisher.PublisherApplication;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +26,7 @@ public class AsyncApiDocumentIntegrationTest {
@MinimalIntegrationTestContextConfiguration
@TestPropertySource(
properties = {
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.integrationtests.application.listener",
+ "springwolf.docket.base-package=io.github.springwolf.core.integrationtests.application.listener",
})
class ListenerAnnotationTest {
@Autowired
@@ -49,7 +49,7 @@ void asyncListenerAnnotationIsFound() {
@MinimalIntegrationTestContextConfiguration
@TestPropertySource(
properties = {
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.integrationtests.application.publisher",
+ "springwolf.docket.base-package=io.github.springwolf.core.integrationtests.application.publisher",
})
class PublisherAnnotationTest {
@Autowired
@@ -72,7 +72,7 @@ void asyncPublisherAnnotationIsFound() {
@MinimalIntegrationTestContextConfiguration
@TestPropertySource(
properties = {
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.integrationtests.application.polymorphic",
+ "springwolf.docket.base-package=io.github.springwolf.core.integrationtests.application.polymorphic",
})
class PolymorphicPayloadTest {
@Autowired
@@ -87,45 +87,45 @@ void polymorphicDiscriminatorFieldIsHandled() {
Map messages = asyncAPI.getComponents().getMessages();
assertThat(messages)
.containsOnlyKeys(
- "io.github.stavshamir.springwolf.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Payload");
+ "io.github.springwolf.core.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Payload");
Map schemas = asyncAPI.getComponents().getSchemas();
assertThat(schemas)
.containsOnlyKeys(
"HeadersNotDocumented",
- "io.github.stavshamir.springwolf.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Payload",
- "io.github.stavshamir.springwolf.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Pet",
- "io.github.stavshamir.springwolf.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Cat",
- "io.github.stavshamir.springwolf.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Dog");
+ "io.github.springwolf.core.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Payload",
+ "io.github.springwolf.core.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Pet",
+ "io.github.springwolf.core.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Cat",
+ "io.github.springwolf.core.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Dog");
assertThat(schemas.get(
- "io.github.stavshamir.springwolf.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Pet")
+ "io.github.springwolf.core.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Pet")
.getDiscriminator())
.isEqualTo("type");
assertThat(schemas.get(
- "io.github.stavshamir.springwolf.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Cat")
+ "io.github.springwolf.core.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Cat")
.getAllOf()
.get(0)
.getReference()
.getRef())
.isEqualTo(
- "#/components/schemas/io.github.stavshamir.springwolf.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Pet");
+ "#/components/schemas/io.github.springwolf.core.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Pet");
assertThat(schemas.get(
- "io.github.stavshamir.springwolf.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Cat")
+ "io.github.springwolf.core.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Cat")
.getAllOf()
.get(1)
.getSchema()
.getProperties())
.containsOnlyKeys("catSpecificField");
assertThat(schemas.get(
- "io.github.stavshamir.springwolf.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Dog")
+ "io.github.springwolf.core.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Dog")
.getAllOf()
.get(0)
.getReference()
.getRef())
.isEqualTo(
- "#/components/schemas/io.github.stavshamir.springwolf.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Pet");
+ "#/components/schemas/io.github.springwolf.core.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Pet");
assertThat(schemas.get(
- "io.github.stavshamir.springwolf.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Dog")
+ "io.github.springwolf.core.integrationtests.application.polymorphic.PolymorphicPayloadApplication$Dog")
.getAllOf()
.get(1)
.getSchema()
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/AutoConfigurationIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/AutoConfigurationIntegrationTest.java
similarity index 81%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/AutoConfigurationIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/AutoConfigurationIntegrationTest.java
index 994aa125c..d0fe2232b 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/AutoConfigurationIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/AutoConfigurationIntegrationTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.integrationtests;
+package io.github.springwolf.core.integrationtests;
-import io.github.stavshamir.springwolf.asyncapi.controller.AsyncApiController;
-import io.github.stavshamir.springwolf.fixtures.MinimalIntegrationTestContextConfiguration;
-import io.github.stavshamir.springwolf.integrationtests.application.basic.TestApplication;
+import io.github.springwolf.core.asyncapi.controller.AsyncApiController;
+import io.github.springwolf.core.fixtures.MinimalIntegrationTestContextConfiguration;
+import io.github.springwolf.core.integrationtests.application.basic.TestApplication;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.ObjectProvider;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/InitModeIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/InitModeIntegrationTest.java
similarity index 88%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/InitModeIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/InitModeIntegrationTest.java
index 52d4b5e86..022f64d27 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/InitModeIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/InitModeIntegrationTest.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.integrationtests;
+package io.github.springwolf.core.integrationtests;
-import io.github.stavshamir.springwolf.asyncapi.DefaultAsyncApiService;
-import io.github.stavshamir.springwolf.asyncapi.controller.AsyncApiController;
-import io.github.stavshamir.springwolf.fixtures.MinimalIntegrationTestContextConfiguration;
-import io.github.stavshamir.springwolf.integrationtests.application.basic.TestApplication;
+import io.github.springwolf.core.asyncapi.DefaultAsyncApiService;
+import io.github.springwolf.core.asyncapi.controller.AsyncApiController;
+import io.github.springwolf.core.fixtures.MinimalIntegrationTestContextConfiguration;
+import io.github.springwolf.core.integrationtests.application.basic.TestApplication;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/application/basic/TestApplication.java b/springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/application/basic/TestApplication.java
similarity index 68%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/application/basic/TestApplication.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/application/basic/TestApplication.java
index 97830a040..64e69849e 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/application/basic/TestApplication.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/application/basic/TestApplication.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.integrationtests.application.basic;
+package io.github.springwolf.core.integrationtests.application.basic;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/application/listener/ListenerApplication.java b/springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/application/listener/ListenerApplication.java
similarity index 61%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/application/listener/ListenerApplication.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/application/listener/ListenerApplication.java
index fa2e78a46..a77ee74bb 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/application/listener/ListenerApplication.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/application/listener/ListenerApplication.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.integrationtests.application.listener;
+package io.github.springwolf.core.integrationtests.application.listener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/application/polymorphic/PolymorphicPayloadApplication.java b/springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/application/polymorphic/PolymorphicPayloadApplication.java
similarity index 82%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/application/polymorphic/PolymorphicPayloadApplication.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/application/polymorphic/PolymorphicPayloadApplication.java
index 663c5f0e9..768c9afa6 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/application/polymorphic/PolymorphicPayloadApplication.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/application/polymorphic/PolymorphicPayloadApplication.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.integrationtests.application.polymorphic;
+package io.github.springwolf.core.integrationtests.application.polymorphic;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/application/publisher/PublisherApplication.java b/springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/application/publisher/PublisherApplication.java
similarity index 61%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/application/publisher/PublisherApplication.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/application/publisher/PublisherApplication.java
index a78c1ba73..8f3732762 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/integrationtests/application/publisher/PublisherApplication.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/integrationtests/application/publisher/PublisherApplication.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.integrationtests.application.publisher;
+package io.github.springwolf.core.integrationtests.application.publisher;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultComponentsServiceTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/DefaultComponentsServiceTest.java
similarity index 94%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultComponentsServiceTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/schemas/DefaultComponentsServiceTest.java
index 0d47a9c66..fa5f178df 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultComponentsServiceTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/DefaultComponentsServiceTest.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas;
+package io.github.springwolf.core.schemas;
import com.fasterxml.jackson.core.PrettyPrinter;
import com.fasterxml.jackson.core.util.DefaultIndenter;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.schemas.postprocessor.SchemasPostProcessor;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.schemas.postprocessor.SchemasPostProcessor;
import io.swagger.v3.core.util.Json;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultJsonComponentsServiceTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/DefaultJsonComponentsServiceTest.java
similarity index 94%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultJsonComponentsServiceTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/schemas/DefaultJsonComponentsServiceTest.java
index 88d774e40..8a73a6b95 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultJsonComponentsServiceTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/DefaultJsonComponentsServiceTest.java
@@ -1,17 +1,17 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas;
+package io.github.springwolf.core.schemas;
import com.fasterxml.jackson.core.PrettyPrinter;
import com.fasterxml.jackson.core.util.DefaultIndenter;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.AsyncApiPayload;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.schemas.example.DefaultSchemaWalker;
-import io.github.stavshamir.springwolf.schemas.example.ExampleJsonValueGenerator;
-import io.github.stavshamir.springwolf.schemas.example.SchemaWalkerProvider;
-import io.github.stavshamir.springwolf.schemas.postprocessor.ExampleGeneratorPostProcessor;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.AsyncApiPayload;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.schemas.example.DefaultSchemaWalker;
+import io.github.springwolf.core.schemas.example.ExampleJsonValueGenerator;
+import io.github.springwolf.core.schemas.example.SchemaWalkerProvider;
+import io.github.springwolf.core.schemas.postprocessor.ExampleGeneratorPostProcessor;
import io.swagger.v3.core.util.Json;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.annotation.Nullable;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultXmlComponentsServiceTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/DefaultXmlComponentsServiceTest.java
similarity index 94%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultXmlComponentsServiceTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/schemas/DefaultXmlComponentsServiceTest.java
index cb723a732..899c6d5dc 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultXmlComponentsServiceTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/DefaultXmlComponentsServiceTest.java
@@ -1,18 +1,18 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas;
+package io.github.springwolf.core.schemas;
import com.fasterxml.jackson.core.PrettyPrinter;
import com.fasterxml.jackson.core.util.DefaultIndenter;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.AsyncApiPayload;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.schemas.example.DefaultExampleXmlValueSerializer;
-import io.github.stavshamir.springwolf.schemas.example.DefaultSchemaWalker;
-import io.github.stavshamir.springwolf.schemas.example.ExampleXmlValueGenerator;
-import io.github.stavshamir.springwolf.schemas.example.SchemaWalkerProvider;
-import io.github.stavshamir.springwolf.schemas.postprocessor.ExampleGeneratorPostProcessor;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.AsyncApiPayload;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.schemas.example.DefaultExampleXmlValueSerializer;
+import io.github.springwolf.core.schemas.example.DefaultSchemaWalker;
+import io.github.springwolf.core.schemas.example.ExampleXmlValueGenerator;
+import io.github.springwolf.core.schemas.example.SchemaWalkerProvider;
+import io.github.springwolf.core.schemas.postprocessor.ExampleGeneratorPostProcessor;
import io.swagger.v3.core.util.Json;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.annotation.Nullable;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultYamlComponentsServiceTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/DefaultYamlComponentsServiceTest.java
similarity index 93%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultYamlComponentsServiceTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/schemas/DefaultYamlComponentsServiceTest.java
index 2e3a784bb..8cf8a0bb8 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/DefaultYamlComponentsServiceTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/DefaultYamlComponentsServiceTest.java
@@ -1,19 +1,19 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas;
+package io.github.springwolf.core.schemas;
import com.fasterxml.jackson.core.PrettyPrinter;
import com.fasterxml.jackson.core.util.DefaultIndenter;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.AsyncApiPayload;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.schemas.example.DefaultExampleYamlValueSerializer;
-import io.github.stavshamir.springwolf.schemas.example.DefaultSchemaWalker;
-import io.github.stavshamir.springwolf.schemas.example.ExampleJsonValueGenerator;
-import io.github.stavshamir.springwolf.schemas.example.ExampleYamlValueGenerator;
-import io.github.stavshamir.springwolf.schemas.example.SchemaWalkerProvider;
-import io.github.stavshamir.springwolf.schemas.postprocessor.ExampleGeneratorPostProcessor;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.AsyncApiPayload;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.schemas.example.DefaultExampleYamlValueSerializer;
+import io.github.springwolf.core.schemas.example.DefaultSchemaWalker;
+import io.github.springwolf.core.schemas.example.ExampleJsonValueGenerator;
+import io.github.springwolf.core.schemas.example.ExampleYamlValueGenerator;
+import io.github.springwolf.core.schemas.example.SchemaWalkerProvider;
+import io.github.springwolf.core.schemas.postprocessor.ExampleGeneratorPostProcessor;
import io.swagger.v3.core.util.Json;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.annotation.Nullable;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/SwaggerSchemaUtilTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/SwaggerSchemaUtilTest.java
similarity index 98%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/SwaggerSchemaUtilTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/schemas/SwaggerSchemaUtilTest.java
index 4515bc73e..06d6f4b07 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/SwaggerSchemaUtilTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/SwaggerSchemaUtilTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas;
+package io.github.springwolf.core.schemas;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.components.ComponentSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.components.ComponentSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
import io.swagger.v3.oas.models.ExternalDocumentation;
import io.swagger.v3.oas.models.media.Discriminator;
import io.swagger.v3.oas.models.media.ObjectSchema;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/example/DefaultSchemaWalkerJsonIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/example/DefaultSchemaWalkerJsonIntegrationTest.java
similarity index 99%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/example/DefaultSchemaWalkerJsonIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/schemas/example/DefaultSchemaWalkerJsonIntegrationTest.java
index 82ed55f5b..bf9e029ad 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/example/DefaultSchemaWalkerJsonIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/example/DefaultSchemaWalkerJsonIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/example/DefaultSchemaWalkerXmlIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/example/DefaultSchemaWalkerXmlIntegrationTest.java
similarity index 99%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/example/DefaultSchemaWalkerXmlIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/schemas/example/DefaultSchemaWalkerXmlIntegrationTest.java
index fd7cdd374..0211d353b 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/example/DefaultSchemaWalkerXmlIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/example/DefaultSchemaWalkerXmlIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.BinarySchema;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/example/DefaultSchemaWalkerYamlIntegrationTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/example/DefaultSchemaWalkerYamlIntegrationTest.java
similarity index 99%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/example/DefaultSchemaWalkerYamlIntegrationTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/schemas/example/DefaultSchemaWalkerYamlIntegrationTest.java
index 95920261e..768c6da76 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/example/DefaultSchemaWalkerYamlIntegrationTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/example/DefaultSchemaWalkerYamlIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
import com.fasterxml.jackson.databind.JsonNode;
import io.swagger.v3.oas.models.media.ArraySchema;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/example/SchemaWalkerProviderTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/example/SchemaWalkerProviderTest.java
similarity index 96%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/example/SchemaWalkerProviderTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/schemas/example/SchemaWalkerProviderTest.java
index aff52dc22..580470c70 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/example/SchemaWalkerProviderTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/example/SchemaWalkerProviderTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.example;
+package io.github.springwolf.core.schemas.example;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/postprocessor/AvroSchemaPostProcessorTest.java b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/postprocessor/AvroSchemaPostProcessorTest.java
similarity index 98%
rename from springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/postprocessor/AvroSchemaPostProcessorTest.java
rename to springwolf-core/src/test/java/io/github/springwolf/core/schemas/postprocessor/AvroSchemaPostProcessorTest.java
index 75bae2108..9d9d8c635 100644
--- a/springwolf-core/src/test/java/io/github/stavshamir/springwolf/schemas/postprocessor/AvroSchemaPostProcessorTest.java
+++ b/springwolf-core/src/test/java/io/github/springwolf/core/schemas/postprocessor/AvroSchemaPostProcessorTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.schemas.postprocessor;
+package io.github.springwolf.core.schemas.postprocessor;
import io.swagger.v3.oas.models.media.StringSchema;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-core/src/test/resources/application.properties b/springwolf-core/src/test/resources/application.properties
index be7ceb5b3..ff4adf3e9 100644
--- a/springwolf-core/src/test/resources/application.properties
+++ b/springwolf-core/src/test/resources/application.properties
@@ -1,6 +1,6 @@
spring.application.name=Springwolf-core
springwolf.enabled=true
-springwolf.docket.base-package=io.github.stavshamir.springwolf
+springwolf.docket.base-package=io.github.springwolf.core
springwolf.docket.info.title=${spring.application.name}
springwolf.docket.info.version=1.0.0
springwolf.docket.info.description=Springwolf example project to demonstrate springwolfs abilities
diff --git a/springwolf-core/src/test/resources/asyncapi/asyncapi.json b/springwolf-core/src/test/resources/asyncapi/asyncapi.json
index 15f85d3fb..d6d820738 100644
--- a/springwolf-core/src/test/resources/asyncapi/asyncapi.json
+++ b/springwolf-core/src/test/resources/asyncapi/asyncapi.json
@@ -28,8 +28,8 @@
"new-user": {
"address": "new-user",
"messages": {
- "io.github.stavshamir.springwolf.ExamplePayload": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.ExamplePayload"
+ "io.github.springwolf.core.ExamplePayload": {
+ "$ref": "#/components/messages/io.github.springwolf.core.ExamplePayload"
}
},
"description": "This channel is used to exchange messages about users signing up",
@@ -52,14 +52,14 @@
}
},
"messages": {
- "io.github.stavshamir.springwolf.ExamplePayload": {
+ "io.github.springwolf.core.ExamplePayload": {
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
"$ref": "#/components/schemas/ExamplePayload"
}
},
- "name": "io.github.stavshamir.springwolf.ExamplePayload",
+ "name": "io.github.springwolf.core.ExamplePayload",
"title": "Example Payload",
"bindings": {
"kafka": {
@@ -91,7 +91,7 @@
},
"messages": [
{
- "$ref": "#/channels/new-user/messages/io.github.stavshamir.springwolf.ExamplePayload"
+ "$ref": "#/channels/new-user/messages/io.github.springwolf.core.ExamplePayload"
}
]
}
diff --git a/springwolf-core/src/test/resources/asyncapi/asyncapi.yaml b/springwolf-core/src/test/resources/asyncapi/asyncapi.yaml
index 0a98129f9..98c6b6cb8 100644
--- a/springwolf-core/src/test/resources/asyncapi/asyncapi.yaml
+++ b/springwolf-core/src/test/resources/asyncapi/asyncapi.yaml
@@ -22,8 +22,8 @@ channels:
new-user:
address: new-user
messages:
- io.github.stavshamir.springwolf.ExamplePayload:
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.ExamplePayload"
+ io.github.springwolf.core.ExamplePayload:
+ "$ref": "#/components/messages/io.github.springwolf.core.ExamplePayload"
description: This channel is used to exchange messages about users signing up
servers:
- "$ref": "#/servers/production"
@@ -35,12 +35,12 @@ components:
s:
type: string
messages:
- io.github.stavshamir.springwolf.ExamplePayload:
+ io.github.springwolf.core.ExamplePayload:
payload:
schemaFormat: application/vnd.aai.asyncapi+json;version=3.0.0
schema:
"$ref": "#/components/schemas/ExamplePayload"
- name: io.github.stavshamir.springwolf.ExamplePayload
+ name: io.github.springwolf.core.ExamplePayload
title: Example Payload
bindings:
kafka:
@@ -60,4 +60,4 @@ operations:
- myGroupId
bindingVersion: 0.4.0
messages:
- - "$ref": "#/channels/new-user/messages/io.github.stavshamir.springwolf.ExamplePayload"
+ - "$ref": "#/channels/new-user/messages/io.github.springwolf.core.ExamplePayload"
diff --git a/springwolf-core/src/test/resources/schemas/annotation-definitions.json b/springwolf-core/src/test/resources/schemas/annotation-definitions.json
index a731d43a2..ea9cbd0a7 100644
--- a/springwolf-core/src/test/resources/schemas/annotation-definitions.json
+++ b/springwolf-core/src/test/resources/schemas/annotation-definitions.json
@@ -1,5 +1,5 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$AllOf" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$AllOf" : {
"type" : "object",
"examples" : [ {
"firstOne" : "string",
@@ -8,24 +8,24 @@
"secondTwo" : true
} ],
"allOf" : [ {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
}, {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$AnyOf" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$AnyOf" : {
"type" : "object",
"examples" : [ {
"firstOne" : "string",
"secondOne" : "string"
} ],
"anyOf" : [ {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
}, {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationOne" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationOne" : {
"type" : "object",
"properties" : {
"firstOne" : {
@@ -40,7 +40,7 @@
"secondOne" : "string"
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationTwo" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationTwo" : {
"type" : "object",
"properties" : {
"firstTwo" : {
@@ -56,32 +56,32 @@
"secondTwo" : true
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$OneOf" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$OneOf" : {
"type" : "object",
"examples" : [ {
"firstOne" : "string",
"secondOne" : "string"
} ],
"oneOf" : [ {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
}, {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$SchemaAnnotationFoo" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$SchemaAnnotationFoo" : {
"type" : "object",
"properties" : {
"allOf" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$AllOf"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$AllOf"
},
"anyOf" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$AnyOf"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$AnyOf"
},
"field" : {
"type" : "string"
},
"oneOf" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$OneOf"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SchemaWithOneOf$OneOf"
}
},
"examples" : [ {
diff --git a/springwolf-core/src/test/resources/schemas/api-payload.json b/springwolf-core/src/test/resources/schemas/api-payload.json
index 001e673ed..1349b2577 100644
--- a/springwolf-core/src/test/resources/schemas/api-payload.json
+++ b/springwolf-core/src/test/resources/schemas/api-payload.json
@@ -1,5 +1,5 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$AsyncApiPayloadTest$StringEnvelop" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$AsyncApiPayloadTest$StringEnvelop" : {
"type" : "string",
"description" : "The payload in the envelop",
"maxLength" : 10,
diff --git a/springwolf-core/src/test/resources/schemas/array-definitions.json b/springwolf-core/src/test/resources/schemas/array-definitions.json
index 1eff41d3b..d2eb0e476 100644
--- a/springwolf-core/src/test/resources/schemas/array-definitions.json
+++ b/springwolf-core/src/test/resources/schemas/array-definitions.json
@@ -1,11 +1,11 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$ArrayFoo" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$ArrayFoo" : {
"type" : "object",
"properties" : {
"flist" : {
"type" : "array",
"items" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SimpleFoo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SimpleFoo"
}
}
},
@@ -16,7 +16,7 @@
} ]
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SimpleFoo" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SimpleFoo" : {
"type" : "object",
"properties" : {
"b" : {
diff --git a/springwolf-core/src/test/resources/schemas/complex-definitions.json b/springwolf-core/src/test/resources/schemas/complex-definitions.json
index 3eb874ab0..df181e64c 100644
--- a/springwolf-core/src/test/resources/schemas/complex-definitions.json
+++ b/springwolf-core/src/test/resources/schemas/complex-definitions.json
@@ -1,5 +1,5 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$ComplexFoo" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$ComplexFoo" : {
"type" : "object",
"properties" : {
"b" : {
@@ -22,7 +22,7 @@
"format" : "int32"
},
"n" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested"
},
"s" : {
"type" : "string"
@@ -50,7 +50,7 @@
"s" : "string"
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested" : {
"type" : "object",
"properties" : {
"nba" : {
@@ -61,7 +61,7 @@
}
},
"nc" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested$Cyclic"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested$Cyclic"
},
"nli" : {
"type" : "array",
@@ -73,7 +73,7 @@
"nmfm" : {
"type" : "object",
"additionalProperties" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested$MyClass"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested$MyClass"
}
},
"ns" : {
@@ -82,7 +82,7 @@
"nsm" : {
"type" : "array",
"items" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested$MyClass"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested$MyClass"
},
"uniqueItems" : true
},
@@ -105,18 +105,18 @@
"nu" : "3fa85f64-5717-4562-b3fc-2c963f66afa6"
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested$Cyclic" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested$Cyclic" : {
"type" : "object",
"properties" : {
"cyclic" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested$Cyclic"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested$Cyclic"
}
},
"examples" : [ {
"cyclic" : { }
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested$MyClass" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$ComplexFoo$Nested$MyClass" : {
"type" : "object",
"properties" : {
"s" : {
diff --git a/springwolf-core/src/test/resources/schemas/definitions.json b/springwolf-core/src/test/resources/schemas/definitions.json
index 4cb049152..54ff18e94 100644
--- a/springwolf-core/src/test/resources/schemas/definitions.json
+++ b/springwolf-core/src/test/resources/schemas/definitions.json
@@ -1,9 +1,9 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$CompositeFoo" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$CompositeFoo" : {
"type" : "object",
"properties" : {
"f" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SimpleFoo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SimpleFoo"
},
"s" : {
"type" : "string"
@@ -17,7 +17,7 @@
"s" : "string"
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$FooWithEnum" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$FooWithEnum" : {
"type" : "object",
"properties" : {
"b" : {
@@ -33,7 +33,7 @@
"s" : "string"
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SimpleFoo" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SimpleFoo" : {
"type" : "object",
"properties" : {
"b" : {
diff --git a/springwolf-core/src/test/resources/schemas/documented-definitions.json b/springwolf-core/src/test/resources/schemas/documented-definitions.json
index 1ea343ed4..21ee56d67 100644
--- a/springwolf-core/src/test/resources/schemas/documented-definitions.json
+++ b/springwolf-core/src/test/resources/schemas/documented-definitions.json
@@ -1,5 +1,5 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$DocumentedSimpleFoo" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$DocumentedSimpleFoo" : {
"type" : "object",
"properties" : {
"bi" : {
@@ -11,7 +11,7 @@
"examples" : [ "2000-01-01T02:00:00+02:00" ]
},
"f" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SimpleFoo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SimpleFoo"
},
"ls_plain" : {
"type" : "array",
@@ -64,7 +64,7 @@
} ],
"required" : [ "dt", "f", "s" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$SimpleFoo" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$SimpleFoo" : {
"type" : "object",
"properties" : {
"b" : {
diff --git a/springwolf-core/src/test/resources/schemas/generics-wrapper-definitions.json b/springwolf-core/src/test/resources/schemas/generics-wrapper-definitions.json
index 9106a57ec..f91536a65 100644
--- a/springwolf-core/src/test/resources/schemas/generics-wrapper-definitions.json
+++ b/springwolf-core/src/test/resources/schemas/generics-wrapper-definitions.json
@@ -1,5 +1,5 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultJsonComponentsServiceTest$ListWrapper" : {
+ "io.github.springwolf.core.schemas.DefaultJsonComponentsServiceTest$ListWrapper" : {
"type" : "array",
"properties" : {
"empty" : {
diff --git a/springwolf-core/src/test/resources/schemas/xml/annotation-definitions-xml.json b/springwolf-core/src/test/resources/schemas/xml/annotation-definitions-xml.json
index b7685beb7..e872e32ba 100644
--- a/springwolf-core/src/test/resources/schemas/xml/annotation-definitions-xml.json
+++ b/springwolf-core/src/test/resources/schemas/xml/annotation-definitions-xml.json
@@ -1,23 +1,23 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$AllOf" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$AllOf" : {
"type" : "object",
"examples" : [ "string0stringtrue" ],
"allOf" : [ {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
}, {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$AnyOf" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$AnyOf" : {
"type" : "object",
"examples" : [ "stringstring" ],
"anyOf" : [ {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
}, {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationOne" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationOne" : {
"type" : "object",
"properties" : {
"firstOne" : {
@@ -29,7 +29,7 @@
},
"examples" : [ "stringstring" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo" : {
"type" : "object",
"properties" : {
"firstTwo" : {
@@ -42,29 +42,29 @@
},
"examples" : [ "0true" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$OneOf" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$OneOf" : {
"type" : "object",
"examples" : [ "stringstring" ],
"oneOf" : [ {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
}, {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$SchemaAnnotationFoo" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$SchemaAnnotationFoo" : {
"type" : "object",
"properties" : {
"allOf" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$AllOf"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$AllOf"
},
"anyOf" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$AnyOf"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$AnyOf"
},
"field" : {
"type" : "string"
},
"oneOf" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$OneOf"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SchemaWithOneOf$OneOf"
}
},
"examples" : [ "string0stringtruestringstringstringstringstring" ]
diff --git a/springwolf-core/src/test/resources/schemas/xml/api-payload-xml.json b/springwolf-core/src/test/resources/schemas/xml/api-payload-xml.json
index 7c5a7da66..94eba03fd 100644
--- a/springwolf-core/src/test/resources/schemas/xml/api-payload-xml.json
+++ b/springwolf-core/src/test/resources/schemas/xml/api-payload-xml.json
@@ -1,5 +1,5 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$AsyncApiPayloadTest$StringEnvelop" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$AsyncApiPayloadTest$StringEnvelop" : {
"type" : "string",
"description" : "The payload in the envelop",
"maxLength" : 10,
diff --git a/springwolf-core/src/test/resources/schemas/xml/array-definitions-xml.json b/springwolf-core/src/test/resources/schemas/xml/array-definitions-xml.json
index ed752b1f4..37f34694a 100644
--- a/springwolf-core/src/test/resources/schemas/xml/array-definitions-xml.json
+++ b/springwolf-core/src/test/resources/schemas/xml/array-definitions-xml.json
@@ -1,17 +1,17 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$ArrayFoo" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$ArrayFoo" : {
"type" : "object",
"properties" : {
"flist" : {
"type" : "array",
"items" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SimpleFoo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SimpleFoo"
}
}
},
"examples" : [ "truestring" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SimpleFoo" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SimpleFoo" : {
"type" : "object",
"properties" : {
"b" : {
diff --git a/springwolf-core/src/test/resources/schemas/xml/complex-definitions-xml.json b/springwolf-core/src/test/resources/schemas/xml/complex-definitions-xml.json
index e3265b445..1d8e73d78 100644
--- a/springwolf-core/src/test/resources/schemas/xml/complex-definitions-xml.json
+++ b/springwolf-core/src/test/resources/schemas/xml/complex-definitions-xml.json
@@ -1,5 +1,5 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$ComplexFoo" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$ComplexFoo" : {
"type" : "object",
"properties" : {
"b" : {
@@ -22,7 +22,7 @@
"format" : "int32"
},
"n" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested"
},
"s" : {
"type" : "string"
@@ -30,7 +30,7 @@
},
"examples" : [ "true1.12015-07-20T15:49:04-07:001.10YmFzZTY0LWV4YW1wbGU=0stringstring3fa85f64-5717-4562-b3fc-2c963f66afa6string" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested" : {
"type" : "object",
"properties" : {
"nba" : {
@@ -41,7 +41,7 @@
}
},
"nc" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested$Cyclic"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested$Cyclic"
},
"nli" : {
"type" : "array",
@@ -53,7 +53,7 @@
"nmfm" : {
"type" : "object",
"additionalProperties" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested$MyClass"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested$MyClass"
}
},
"ns" : {
@@ -62,7 +62,7 @@
"nsm" : {
"type" : "array",
"items" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested$MyClass"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested$MyClass"
},
"uniqueItems" : true
},
@@ -73,16 +73,16 @@
},
"examples" : [ "YmFzZTY0LWV4YW1wbGU=0stringstring3fa85f64-5717-4562-b3fc-2c963f66afa6" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested$Cyclic" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested$Cyclic" : {
"type" : "object",
"properties" : {
"cyclic" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested$Cyclic"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested$Cyclic"
}
},
"examples" : [ "" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested$MyClass" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$ComplexFoo$Nested$MyClass" : {
"type" : "object",
"properties" : {
"s" : {
diff --git a/springwolf-core/src/test/resources/schemas/xml/definitions-xml.json b/springwolf-core/src/test/resources/schemas/xml/definitions-xml.json
index 127130c3d..2b5b1a427 100644
--- a/springwolf-core/src/test/resources/schemas/xml/definitions-xml.json
+++ b/springwolf-core/src/test/resources/schemas/xml/definitions-xml.json
@@ -1,9 +1,9 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$CompositeFoo" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$CompositeFoo" : {
"type" : "object",
"properties" : {
"f" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SimpleFoo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SimpleFoo"
},
"s" : {
"type" : "string"
@@ -11,7 +11,7 @@
},
"examples" : [ "truestringstring" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$FooWithEnum" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$FooWithEnum" : {
"type" : "object",
"properties" : {
"b" : {
@@ -24,7 +24,7 @@
},
"examples" : [ "BAR1string" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SimpleFoo" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SimpleFoo" : {
"type" : "object",
"properties" : {
"b" : {
diff --git a/springwolf-core/src/test/resources/schemas/xml/documented-definitions-xml.json b/springwolf-core/src/test/resources/schemas/xml/documented-definitions-xml.json
index f95226b9e..086cb645f 100644
--- a/springwolf-core/src/test/resources/schemas/xml/documented-definitions-xml.json
+++ b/springwolf-core/src/test/resources/schemas/xml/documented-definitions-xml.json
@@ -1,5 +1,5 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$DocumentedSimpleFoo" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$DocumentedSimpleFoo" : {
"type" : "object",
"properties" : {
"bi" : {
@@ -11,7 +11,7 @@
"examples" : [ "2000-01-01T02:00:00+02:00" ]
},
"f" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SimpleFoo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SimpleFoo"
},
"ls_plain" : {
"type" : "array",
@@ -49,7 +49,7 @@
"examples" : [ "02000-01-01T02:00+02:00truestringstrings value" ],
"required" : [ "dt", "f", "s" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$SimpleFoo" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$SimpleFoo" : {
"type" : "object",
"properties" : {
"b" : {
diff --git a/springwolf-core/src/test/resources/schemas/xml/generics-wrapper-definitions-xml.json b/springwolf-core/src/test/resources/schemas/xml/generics-wrapper-definitions-xml.json
index a2cb59d39..4ab82c20b 100644
--- a/springwolf-core/src/test/resources/schemas/xml/generics-wrapper-definitions-xml.json
+++ b/springwolf-core/src/test/resources/schemas/xml/generics-wrapper-definitions-xml.json
@@ -1,5 +1,5 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultXmlComponentsServiceTest$ListWrapper" : {
+ "io.github.springwolf.core.schemas.DefaultXmlComponentsServiceTest$ListWrapper" : {
"type" : "array",
"properties" : {
"empty" : {
diff --git a/springwolf-core/src/test/resources/schemas/yaml/annotation-definitions-yaml.json b/springwolf-core/src/test/resources/schemas/yaml/annotation-definitions-yaml.json
index 667d0f1f5..6893e9858 100644
--- a/springwolf-core/src/test/resources/schemas/yaml/annotation-definitions-yaml.json
+++ b/springwolf-core/src/test/resources/schemas/yaml/annotation-definitions-yaml.json
@@ -1,23 +1,23 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$AllOf" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$AllOf" : {
"type" : "object",
"examples" : [ "firstOne: string\nfirstTwo: 0\nsecondOne: string\nsecondTwo: true\n" ],
"allOf" : [ {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
}, {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$AnyOf" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$AnyOf" : {
"type" : "object",
"examples" : [ "firstOne: string\nsecondOne: string\n" ],
"anyOf" : [ {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
}, {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationOne" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationOne" : {
"type" : "object",
"properties" : {
"firstOne" : {
@@ -29,7 +29,7 @@
},
"examples" : [ "firstOne: string\nsecondOne: string\n" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo" : {
"type" : "object",
"properties" : {
"firstTwo" : {
@@ -42,29 +42,29 @@
},
"examples" : [ "firstTwo: 0\nsecondTwo: true\n" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$OneOf" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$OneOf" : {
"type" : "object",
"examples" : [ "|\n firstOne: string\n secondOne: string\n" ],
"oneOf" : [ {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationOne"
}, {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$ImplementationTwo"
} ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$SchemaAnnotationFoo" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$SchemaAnnotationFoo" : {
"type" : "object",
"properties" : {
"allOf" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$AllOf"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$AllOf"
},
"anyOf" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$AnyOf"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$AnyOf"
},
"field" : {
"type" : "string"
},
"oneOf" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$OneOf"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SchemaWithOneOf$OneOf"
}
},
"examples" : [ "allOf: |\n firstOne: string\n firstTwo: 0\n secondOne: string\n secondTwo: true\nanyOf: |\n firstOne: string\n secondOne: string\nfield: string\noneOf: |\n |\n firstOne: string\n secondOne: string\n" ]
diff --git a/springwolf-core/src/test/resources/schemas/yaml/api-payload-yaml.json b/springwolf-core/src/test/resources/schemas/yaml/api-payload-yaml.json
index 25cc4fdd2..550d08c98 100644
--- a/springwolf-core/src/test/resources/schemas/yaml/api-payload-yaml.json
+++ b/springwolf-core/src/test/resources/schemas/yaml/api-payload-yaml.json
@@ -1,5 +1,5 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$AsyncApiPayloadTest$StringEnvelop" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$AsyncApiPayloadTest$StringEnvelop" : {
"type" : "string",
"description" : "The payload in the envelop",
"maxLength" : 10,
diff --git a/springwolf-core/src/test/resources/schemas/yaml/array-definitions-yaml.json b/springwolf-core/src/test/resources/schemas/yaml/array-definitions-yaml.json
index b30d6bcb5..25327bda4 100644
--- a/springwolf-core/src/test/resources/schemas/yaml/array-definitions-yaml.json
+++ b/springwolf-core/src/test/resources/schemas/yaml/array-definitions-yaml.json
@@ -1,17 +1,17 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$ArrayFoo" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$ArrayFoo" : {
"type" : "object",
"properties" : {
"flist" : {
"type" : "array",
"items" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SimpleFoo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SimpleFoo"
}
}
},
"examples" : [ "flist:\n- b: true\n s: string\n" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SimpleFoo" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SimpleFoo" : {
"type" : "object",
"properties" : {
"b" : {
diff --git a/springwolf-core/src/test/resources/schemas/yaml/complex-definitions-yaml.json b/springwolf-core/src/test/resources/schemas/yaml/complex-definitions-yaml.json
index 4b76c427d..f70a41247 100644
--- a/springwolf-core/src/test/resources/schemas/yaml/complex-definitions-yaml.json
+++ b/springwolf-core/src/test/resources/schemas/yaml/complex-definitions-yaml.json
@@ -1,5 +1,5 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$ComplexFoo" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$ComplexFoo" : {
"type" : "object",
"properties" : {
"b" : {
@@ -22,7 +22,7 @@
"format" : "int32"
},
"n" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested"
},
"s" : {
"type" : "string"
@@ -30,7 +30,7 @@
},
"examples" : [ "b: true\nd: 1.1\ndt: 2015-07-20T15:49:04-07:00\nf: 1.1\ni: 0\n\"n\":\n nba:\n - YmFzZTY0LWV4YW1wbGU=\n nc:\n cyclic: {}\n nli:\n - 0\n nmfm: {}\n ns: string\n nsm:\n - s: string\n nu: 3fa85f64-5717-4562-b3fc-2c963f66afa6\ns: string\n" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested" : {
"type" : "object",
"properties" : {
"nba" : {
@@ -41,7 +41,7 @@
}
},
"nc" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested$Cyclic"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested$Cyclic"
},
"nli" : {
"type" : "array",
@@ -53,7 +53,7 @@
"nmfm" : {
"type" : "object",
"additionalProperties" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested$MyClass"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested$MyClass"
}
},
"ns" : {
@@ -62,7 +62,7 @@
"nsm" : {
"type" : "array",
"items" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested$MyClass"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested$MyClass"
},
"uniqueItems" : true
},
@@ -73,16 +73,16 @@
},
"examples" : [ "nba:\n- YmFzZTY0LWV4YW1wbGU=\nnc:\n cyclic: {}\nnli:\n- 0\nnmfm: {}\nns: string\nnsm:\n- s: string\nnu: 3fa85f64-5717-4562-b3fc-2c963f66afa6\n" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested$Cyclic" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested$Cyclic" : {
"type" : "object",
"properties" : {
"cyclic" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested$Cyclic"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested$Cyclic"
}
},
"examples" : [ "cyclic: {}\n" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested$MyClass" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$ComplexFoo$Nested$MyClass" : {
"type" : "object",
"properties" : {
"s" : {
diff --git a/springwolf-core/src/test/resources/schemas/yaml/definitions-yaml.json b/springwolf-core/src/test/resources/schemas/yaml/definitions-yaml.json
index 103f35c7e..7419349fd 100644
--- a/springwolf-core/src/test/resources/schemas/yaml/definitions-yaml.json
+++ b/springwolf-core/src/test/resources/schemas/yaml/definitions-yaml.json
@@ -1,9 +1,9 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$CompositeFoo" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$CompositeFoo" : {
"type" : "object",
"properties" : {
"f" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SimpleFoo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SimpleFoo"
},
"s" : {
"type" : "string"
@@ -11,7 +11,7 @@
},
"examples" : [ "f:\n b: true\n s: string\ns: string\n" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$FooWithEnum" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$FooWithEnum" : {
"type" : "object",
"properties" : {
"b" : {
@@ -24,7 +24,7 @@
},
"examples" : [ "b: BAR1\ns: string\n" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SimpleFoo" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SimpleFoo" : {
"type" : "object",
"properties" : {
"b" : {
diff --git a/springwolf-core/src/test/resources/schemas/yaml/documented-definitions-yaml.json b/springwolf-core/src/test/resources/schemas/yaml/documented-definitions-yaml.json
index 394200bb5..dab42fec2 100644
--- a/springwolf-core/src/test/resources/schemas/yaml/documented-definitions-yaml.json
+++ b/springwolf-core/src/test/resources/schemas/yaml/documented-definitions-yaml.json
@@ -1,5 +1,5 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$DocumentedSimpleFoo" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$DocumentedSimpleFoo" : {
"type" : "object",
"properties" : {
"bi" : {
@@ -11,7 +11,7 @@
"examples" : [ "2000-01-01T02:00:00+02:00" ]
},
"f" : {
- "$ref" : "#/components/schemas/io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SimpleFoo"
+ "$ref" : "#/components/schemas/io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SimpleFoo"
},
"ls_plain" : {
"type" : "array",
@@ -51,7 +51,7 @@
"examples" : [ "bi: 0\ndt: 2000-01-01T02:00+02:00\nf:\n b: true\n s: string\nls_plain:\n- string\nmss:\n key1: value1\nmss_plain: {}\ns: s value\n" ],
"required" : [ "dt", "f", "s" ]
},
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$SimpleFoo" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$SimpleFoo" : {
"type" : "object",
"properties" : {
"b" : {
diff --git a/springwolf-core/src/test/resources/schemas/yaml/generics-wrapper-definitions-yaml.json b/springwolf-core/src/test/resources/schemas/yaml/generics-wrapper-definitions-yaml.json
index 7df632e7e..fb6d6e3c8 100644
--- a/springwolf-core/src/test/resources/schemas/yaml/generics-wrapper-definitions-yaml.json
+++ b/springwolf-core/src/test/resources/schemas/yaml/generics-wrapper-definitions-yaml.json
@@ -1,5 +1,5 @@
{
- "io.github.stavshamir.springwolf.schemas.DefaultYamlComponentsServiceTest$ListWrapper" : {
+ "io.github.springwolf.core.schemas.DefaultYamlComponentsServiceTest$ListWrapper" : {
"type" : "array",
"properties" : {
"empty" : {
diff --git a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/SpringwolfAmqpExampleApplication.java b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/SpringwolfAmqpExampleApplication.java
similarity index 87%
rename from springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/SpringwolfAmqpExampleApplication.java
rename to springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/SpringwolfAmqpExampleApplication.java
index 3620a093e..41543bd61 100644
--- a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/SpringwolfAmqpExampleApplication.java
+++ b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/SpringwolfAmqpExampleApplication.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.amqp;
+package io.github.springwolf.examples.amqp;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/configuration/RabbitConfiguration.java b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/configuration/RabbitConfiguration.java
similarity index 96%
rename from springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/configuration/RabbitConfiguration.java
rename to springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/configuration/RabbitConfiguration.java
index 4418a7031..4d3be59bc 100644
--- a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/configuration/RabbitConfiguration.java
+++ b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/configuration/RabbitConfiguration.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.amqp.configuration;
+package io.github.springwolf.examples.amqp.configuration;
import org.springframework.amqp.core.Binding;
import org.springframework.amqp.core.BindingBuilder;
diff --git a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/consumers/ExampleConsumer.java b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/consumers/ExampleConsumer.java
similarity index 89%
rename from springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/consumers/ExampleConsumer.java
rename to springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/consumers/ExampleConsumer.java
index 47317804a..e764d2289 100644
--- a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/consumers/ExampleConsumer.java
+++ b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/consumers/ExampleConsumer.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.amqp.consumers;
+package io.github.springwolf.examples.amqp.consumers;
-import io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto;
-import io.github.stavshamir.springwolf.example.amqp.dtos.ExamplePayloadDto;
-import io.github.stavshamir.springwolf.example.amqp.producers.AnotherProducer;
+import io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto;
+import io.github.springwolf.examples.amqp.dtos.ExamplePayloadDto;
+import io.github.springwolf.examples.amqp.producers.AnotherProducer;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.ExchangeTypes;
diff --git a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/dtos/AnotherPayloadDto.java b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/dtos/AnotherPayloadDto.java
similarity index 92%
rename from springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/dtos/AnotherPayloadDto.java
rename to springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/dtos/AnotherPayloadDto.java
index bc3b2f18b..9e21a9f03 100644
--- a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/dtos/AnotherPayloadDto.java
+++ b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/dtos/AnotherPayloadDto.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sqs.dtos;
+package io.github.springwolf.examples.amqp.dtos;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
diff --git a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/dtos/ExamplePayloadDto.java b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/dtos/ExamplePayloadDto.java
similarity index 93%
rename from springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/dtos/ExamplePayloadDto.java
rename to springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/dtos/ExamplePayloadDto.java
index 70966ca38..d8a045b05 100644
--- a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/dtos/ExamplePayloadDto.java
+++ b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/dtos/ExamplePayloadDto.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.jms.dtos;
+package io.github.springwolf.examples.amqp.dtos;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
diff --git a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/producers/AnotherProducer.java b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/producers/AnotherProducer.java
similarity index 62%
rename from springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/producers/AnotherProducer.java
rename to springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/producers/AnotherProducer.java
index a3868c8f7..234579c3f 100644
--- a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/producers/AnotherProducer.java
+++ b/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/springwolf/examples/amqp/producers/AnotherProducer.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.amqp.producers;
+package io.github.springwolf.examples.amqp.producers;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
-import io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
+import io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto;
+import io.github.springwolf.plugins.amqp.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
import lombok.RequiredArgsConstructor;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;
diff --git a/springwolf-examples/springwolf-amqp-example/src/main/resources/application.properties b/springwolf-examples/springwolf-amqp-example/src/main/resources/application.properties
index e38976949..c68c443f1 100644
--- a/springwolf-examples/springwolf-amqp-example/src/main/resources/application.properties
+++ b/springwolf-examples/springwolf-amqp-example/src/main/resources/application.properties
@@ -14,7 +14,7 @@ spring.rabbitmq.password=guest
#########
# Springwolf configuration
springwolf.enabled=true
-springwolf.docket.base-package=io.github.stavshamir.springwolf.example.amqp
+springwolf.docket.base-package=io.github.springwolf.examples.amqp
springwolf.docket.info.title=${spring.application.name}
springwolf.docket.info.version=1.0.0
springwolf.docket.info.description=Springwolf example project to demonstrate springwolfs abilities
@@ -34,4 +34,4 @@ springwolf.plugin.amqp.publishing.enabled=true
# For debugging purposes
-logging.level.io.github.stavshamir.springwolf=DEBUG
+logging.level.io.github.springwolf=DEBUG
diff --git a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ApiIntegrationTest.java b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/ApiIntegrationTest.java
similarity index 95%
rename from springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ApiIntegrationTest.java
rename to springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/ApiIntegrationTest.java
index 41539310b..37fba0302 100644
--- a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ApiIntegrationTest.java
+++ b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/ApiIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.amqp;
+package io.github.springwolf.examples.amqp;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ApiSystemTest.java b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/ApiSystemTest.java
similarity index 97%
rename from springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ApiSystemTest.java
rename to springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/ApiSystemTest.java
index 3f56c8afb..8ba00c4ac 100644
--- a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ApiSystemTest.java
+++ b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/ApiSystemTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.amqp;
+package io.github.springwolf.examples.amqp;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ProducerSystemTest.java b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/ProducerSystemTest.java
similarity index 88%
rename from springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ProducerSystemTest.java
rename to springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/ProducerSystemTest.java
index 0b108e92a..d0b6cde9d 100644
--- a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/ProducerSystemTest.java
+++ b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/ProducerSystemTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.amqp;
+package io.github.springwolf.examples.amqp;
-import io.github.stavshamir.springwolf.example.amqp.consumers.ExampleConsumer;
-import io.github.stavshamir.springwolf.example.amqp.dtos.ExamplePayloadDto;
-import io.github.stavshamir.springwolf.producer.SpringwolfAmqpProducer;
+import io.github.springwolf.examples.amqp.consumers.ExampleConsumer;
+import io.github.springwolf.examples.amqp.dtos.ExamplePayloadDto;
+import io.github.springwolf.plugins.amqp.producer.SpringwolfAmqpProducer;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -22,7 +22,7 @@
import java.io.File;
-import static io.github.stavshamir.springwolf.example.amqp.dtos.ExamplePayloadDto.ExampleEnum.FOO1;
+import static io.github.springwolf.examples.amqp.dtos.ExamplePayloadDto.ExampleEnum.FOO1;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
diff --git a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringContextIntegrationTest.java b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/SpringContextIntegrationTest.java
similarity index 91%
rename from springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringContextIntegrationTest.java
rename to springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/SpringContextIntegrationTest.java
index a76b53f04..bb73de5de 100644
--- a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringContextIntegrationTest.java
+++ b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/SpringContextIntegrationTest.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.amqp;
+package io.github.springwolf.examples.amqp;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +21,7 @@ public class SpringContextIntegrationTest {
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.examples",
"springwolf.docket.servers.test-protocol.protocol=amqp",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
})
diff --git a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringwolfAmqpExampleApplicationIntegrationTest.java b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/SpringwolfAmqpExampleApplicationIntegrationTest.java
similarity index 90%
rename from springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringwolfAmqpExampleApplicationIntegrationTest.java
rename to springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/SpringwolfAmqpExampleApplicationIntegrationTest.java
index 4365a42c0..e8a6da493 100644
--- a/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/stavshamir/springwolf/example/amqp/SpringwolfAmqpExampleApplicationIntegrationTest.java
+++ b/springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/SpringwolfAmqpExampleApplicationIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.amqp;
+package io.github.springwolf.examples.amqp;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json
index aebc31d0b..8f0d5758e 100644
--- a/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-amqp-example/src/test/resources/asyncapi.json
@@ -27,8 +27,8 @@
"channels": {
"another-queue": {
"messages": {
- "io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto"
+ "io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto"
}
},
"bindings": {
@@ -47,15 +47,15 @@
},
"example-producer-channel-publisher": {
"messages": {
- "io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto"
+ "io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto"
}
}
},
"example-queue": {
"messages": {
- "io.github.stavshamir.springwolf.example.amqp.dtos.ExamplePayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.amqp.dtos.ExamplePayloadDto"
+ "io.github.springwolf.examples.amqp.dtos.ExamplePayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.amqp.dtos.ExamplePayloadDto"
}
},
"bindings": {
@@ -74,8 +74,8 @@
},
"example-topic-routing-key": {
"messages": {
- "io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto"
+ "io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto"
}
},
"bindings": {
@@ -94,11 +94,11 @@
},
"multi-payload-queue": {
"messages": {
- "io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto"
+ "io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto"
},
- "io.github.stavshamir.springwolf.example.amqp.dtos.ExamplePayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.amqp.dtos.ExamplePayloadDto"
+ "io.github.springwolf.examples.amqp.dtos.ExamplePayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.amqp.dtos.ExamplePayloadDto"
}
},
"bindings": {
@@ -125,11 +125,11 @@
{ }
]
},
- "io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto": {
+ "io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto": {
"type": "object",
"properties": {
"example": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.amqp.dtos.ExamplePayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.amqp.dtos.ExamplePayloadDto"
},
"foo": {
"type": "string",
@@ -154,7 +154,7 @@
"example"
]
},
- "io.github.stavshamir.springwolf.example.amqp.dtos.ExamplePayloadDto": {
+ "io.github.springwolf.examples.amqp.dtos.ExamplePayloadDto": {
"type": "object",
"properties": {
"someEnum": {
@@ -200,17 +200,17 @@
}
},
"messages": {
- "io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto": {
+ "io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto"
}
},
- "name": "io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto",
+ "name": "io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto",
"title": "AnotherPayloadDto",
"description": "Another payload model",
"bindings": {
@@ -219,17 +219,17 @@
}
}
},
- "io.github.stavshamir.springwolf.example.amqp.dtos.ExamplePayloadDto": {
+ "io.github.springwolf.examples.amqp.dtos.ExamplePayloadDto": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.amqp.dtos.ExamplePayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.amqp.dtos.ExamplePayloadDto"
}
},
- "name": "io.github.stavshamir.springwolf.example.amqp.dtos.ExamplePayloadDto",
+ "name": "io.github.springwolf.examples.amqp.dtos.ExamplePayloadDto",
"title": "ExamplePayloadDto",
"bindings": {
"amqp": {
@@ -256,7 +256,7 @@
},
"messages": [
{
- "$ref": "#/channels/another-queue/messages/io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto"
+ "$ref": "#/channels/another-queue/messages/io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto"
}
]
},
@@ -281,7 +281,7 @@
},
"messages": [
{
- "$ref": "#/channels/example-producer-channel-publisher/messages/io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto"
+ "$ref": "#/channels/example-producer-channel-publisher/messages/io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto"
}
]
},
@@ -301,7 +301,7 @@
},
"messages": [
{
- "$ref": "#/channels/example-queue/messages/io.github.stavshamir.springwolf.example.amqp.dtos.ExamplePayloadDto"
+ "$ref": "#/channels/example-queue/messages/io.github.springwolf.examples.amqp.dtos.ExamplePayloadDto"
}
]
},
@@ -321,7 +321,7 @@
},
"messages": [
{
- "$ref": "#/channels/example-topic-routing-key/messages/io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto"
+ "$ref": "#/channels/example-topic-routing-key/messages/io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto"
}
]
},
@@ -341,12 +341,12 @@
},
"messages": [
{
- "$ref": "#/channels/multi-payload-queue/messages/io.github.stavshamir.springwolf.example.amqp.dtos.ExamplePayloadDto"
+ "$ref": "#/channels/multi-payload-queue/messages/io.github.springwolf.examples.amqp.dtos.ExamplePayloadDto"
},
{
- "$ref": "#/channels/multi-payload-queue/messages/io.github.stavshamir.springwolf.example.amqp.dtos.AnotherPayloadDto"
+ "$ref": "#/channels/multi-payload-queue/messages/io.github.springwolf.examples.amqp.dtos.AnotherPayloadDto"
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/stavshamir/springwolf/example/cloudstream/SpringwolfCloudstreamExampleApplication.java b/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/SpringwolfCloudstreamExampleApplication.java
similarity index 86%
rename from springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/stavshamir/springwolf/example/cloudstream/SpringwolfCloudstreamExampleApplication.java
rename to springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/SpringwolfCloudstreamExampleApplication.java
index 50c98eb12..71bb839a0 100644
--- a/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/stavshamir/springwolf/example/cloudstream/SpringwolfCloudstreamExampleApplication.java
+++ b/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/SpringwolfCloudstreamExampleApplication.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.cloudstream;
+package io.github.springwolf.examples.cloudstream;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/stavshamir/springwolf/example/cloudstream/configuration/CloudstreamConfiguration.java b/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/configuration/CloudstreamConfiguration.java
similarity index 78%
rename from springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/stavshamir/springwolf/example/cloudstream/configuration/CloudstreamConfiguration.java
rename to springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/configuration/CloudstreamConfiguration.java
index 80fcf85f9..bd4225402 100644
--- a/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/stavshamir/springwolf/example/cloudstream/configuration/CloudstreamConfiguration.java
+++ b/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/configuration/CloudstreamConfiguration.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.cloudstream.configuration;
+package io.github.springwolf.examples.cloudstream.configuration;
-import io.github.stavshamir.springwolf.example.cloudstream.dtos.AnotherPayloadDto;
-import io.github.stavshamir.springwolf.example.cloudstream.dtos.ExamplePayloadDto;
+import io.github.springwolf.examples.cloudstream.dtos.AnotherPayloadDto;
+import io.github.springwolf.examples.cloudstream.dtos.ExamplePayloadDto;
import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.streams.kstream.KStream;
import org.springframework.context.annotation.Bean;
diff --git a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/dtos/AnotherPayloadDto.java b/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/dtos/AnotherPayloadDto.java
similarity index 92%
rename from springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/dtos/AnotherPayloadDto.java
rename to springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/dtos/AnotherPayloadDto.java
index 102eed06f..f173b887c 100644
--- a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/dtos/AnotherPayloadDto.java
+++ b/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/dtos/AnotherPayloadDto.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.jms.dtos;
+package io.github.springwolf.examples.cloudstream.dtos;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
diff --git a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/dtos/ExamplePayloadDto.java b/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/dtos/ExamplePayloadDto.java
similarity index 93%
rename from springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/dtos/ExamplePayloadDto.java
rename to springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/dtos/ExamplePayloadDto.java
index 838c71c7b..31fd40aaf 100644
--- a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/dtos/ExamplePayloadDto.java
+++ b/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/springwolf/examples/cloudstream/dtos/ExamplePayloadDto.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sqs.dtos;
+package io.github.springwolf.examples.cloudstream.dtos;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/stavshamir/springwolf/example/cloudstream/dtos/AnotherPayloadDto.java b/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/stavshamir/springwolf/example/cloudstream/dtos/AnotherPayloadDto.java
deleted file mode 100644
index 624e2156e..000000000
--- a/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/stavshamir/springwolf/example/cloudstream/dtos/AnotherPayloadDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.cloudstream.dtos;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED;
-import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
-
-@Schema(description = "Another payload model")
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class AnotherPayloadDto {
-
- @Schema(description = "Foo field", example = "bar", requiredMode = NOT_REQUIRED)
- private String foo;
-
- @Schema(description = "Example field", requiredMode = REQUIRED)
- private ExamplePayloadDto example;
-}
diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/stavshamir/springwolf/example/cloudstream/dtos/ExamplePayloadDto.java b/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/stavshamir/springwolf/example/cloudstream/dtos/ExamplePayloadDto.java
deleted file mode 100644
index 82e7e65db..000000000
--- a/springwolf-examples/springwolf-cloud-stream-example/src/main/java/io/github/stavshamir/springwolf/example/cloudstream/dtos/ExamplePayloadDto.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.cloudstream.dtos;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
-
-@Schema(description = "Example payload model")
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ExamplePayloadDto {
- @Schema(description = "Some string field", example = "some string value", requiredMode = REQUIRED)
- private String someString;
-
- @Schema(description = "Some long field", example = "5")
- private long someLong;
-
- @Schema(description = "Some enum field", example = "FOO2", requiredMode = REQUIRED)
- private ExampleEnum someEnum;
-
- public enum ExampleEnum {
- FOO1,
- FOO2,
- FOO3
- }
-}
diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/main/resources/application.properties b/springwolf-examples/springwolf-cloud-stream-example/src/main/resources/application.properties
index 5b092c33f..4b150d9ea 100644
--- a/springwolf-examples/springwolf-cloud-stream-example/src/main/resources/application.properties
+++ b/springwolf-examples/springwolf-cloud-stream-example/src/main/resources/application.properties
@@ -15,7 +15,7 @@ spring.cloud.stream.bindings.consumerMethod-in-0.destination=another-topic
#########
# Springwolf configuration
springwolf.enabled=true
-springwolf.docket.base-package=io.github.stavshamir.springwolf.example.cloudstream
+springwolf.docket.base-package=io.github.springwolf.examples.cloudstream
springwolf.docket.info.title=Springwolf example project - Cloud Stream
springwolf.docket.info.version=1.0.0
springwolf.docket.info.description=Springwolf example project to demonstrate springwolfs abilities
@@ -30,4 +30,4 @@ springwolf.use-fqn=false
# For debugging purposes
-logging.level.io.github.stavshamir.springwolf=DEBUG
+logging.level.io.github.springwolf=DEBUG
diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/ApiIntegrationTest.java b/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/ApiIntegrationTest.java
similarity index 96%
rename from springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/ApiIntegrationTest.java
rename to springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/ApiIntegrationTest.java
index 43c82b741..b3e383023 100644
--- a/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/ApiIntegrationTest.java
+++ b/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/ApiIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.cloudstream;
+package io.github.springwolf.examples.cloudstream;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiSystemTest.java b/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/ApiSystemTest.java
similarity index 97%
rename from springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiSystemTest.java
rename to springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/ApiSystemTest.java
index 1c5f04107..e3f9c1517 100644
--- a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiSystemTest.java
+++ b/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/ApiSystemTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka;
+package io.github.springwolf.examples.cloudstream;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringContextIntegrationTest.java b/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/SpringContextIntegrationTest.java
similarity index 88%
rename from springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringContextIntegrationTest.java
rename to springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/SpringContextIntegrationTest.java
index 1d505eddb..5b3d64f28 100644
--- a/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringContextIntegrationTest.java
+++ b/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/SpringContextIntegrationTest.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.cloudstream;
+package io.github.springwolf.examples.cloudstream;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +27,7 @@ public class SpringContextIntegrationTest {
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.examples",
"springwolf.docket.servers.test-protocol.protocol=kafka",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
})
diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringwolfCloudstreamExampleApplicationIntegrationTest.java b/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/SpringwolfCloudstreamExampleApplicationIntegrationTest.java
similarity index 93%
rename from springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringwolfCloudstreamExampleApplicationIntegrationTest.java
rename to springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/SpringwolfCloudstreamExampleApplicationIntegrationTest.java
index 4be7b053e..5e1bab745 100644
--- a/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/SpringwolfCloudstreamExampleApplicationIntegrationTest.java
+++ b/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/SpringwolfCloudstreamExampleApplicationIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.cloudstream;
+package io.github.springwolf.examples.cloudstream;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-cloud-stream-example/src/test/resources/asyncapi.json
index 81250fe20..c81b34014 100644
--- a/springwolf-examples/springwolf-cloud-stream-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-cloud-stream-example/src/test/resources/asyncapi.json
@@ -24,8 +24,8 @@
"channels": {
"another-topic": {
"messages": {
- "io.github.stavshamir.springwolf.example.cloudstream.dtos.AnotherPayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.cloudstream.dtos.AnotherPayloadDto"
+ "io.github.springwolf.examples.cloudstream.dtos.AnotherPayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.cloudstream.dtos.AnotherPayloadDto"
}
},
"bindings": {
@@ -34,8 +34,8 @@
},
"example-topic": {
"messages": {
- "io.github.stavshamir.springwolf.example.cloudstream.dtos.ExamplePayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.cloudstream.dtos.ExamplePayloadDto"
+ "io.github.springwolf.examples.cloudstream.dtos.ExamplePayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.cloudstream.dtos.ExamplePayloadDto"
}
},
"bindings": {
@@ -127,7 +127,7 @@
}
},
"messages": {
- "io.github.stavshamir.springwolf.example.cloudstream.dtos.AnotherPayloadDto": {
+ "io.github.springwolf.examples.cloudstream.dtos.AnotherPayloadDto": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
@@ -137,13 +137,13 @@
"$ref": "#/components/schemas/AnotherPayloadDto"
}
},
- "name": "io.github.stavshamir.springwolf.example.cloudstream.dtos.AnotherPayloadDto",
+ "name": "io.github.springwolf.examples.cloudstream.dtos.AnotherPayloadDto",
"title": "AnotherPayloadDto",
"bindings": {
"kafka": { }
}
},
- "io.github.stavshamir.springwolf.example.cloudstream.dtos.ExamplePayloadDto": {
+ "io.github.springwolf.examples.cloudstream.dtos.ExamplePayloadDto": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
@@ -153,7 +153,7 @@
"$ref": "#/components/schemas/ExamplePayloadDto"
}
},
- "name": "io.github.stavshamir.springwolf.example.cloudstream.dtos.ExamplePayloadDto",
+ "name": "io.github.springwolf.examples.cloudstream.dtos.ExamplePayloadDto",
"title": "ExamplePayloadDto",
"bindings": {
"kafka": { }
@@ -173,7 +173,7 @@
},
"messages": [
{
- "$ref": "#/channels/another-topic/messages/io.github.stavshamir.springwolf.example.cloudstream.dtos.AnotherPayloadDto"
+ "$ref": "#/channels/another-topic/messages/io.github.springwolf.examples.cloudstream.dtos.AnotherPayloadDto"
}
]
},
@@ -188,7 +188,7 @@
},
"messages": [
{
- "$ref": "#/channels/another-topic/messages/io.github.stavshamir.springwolf.example.cloudstream.dtos.AnotherPayloadDto"
+ "$ref": "#/channels/another-topic/messages/io.github.springwolf.examples.cloudstream.dtos.AnotherPayloadDto"
}
]
},
@@ -203,7 +203,7 @@
},
"messages": [
{
- "$ref": "#/channels/example-topic/messages/io.github.stavshamir.springwolf.example.cloudstream.dtos.ExamplePayloadDto"
+ "$ref": "#/channels/example-topic/messages/io.github.springwolf.examples.cloudstream.dtos.ExamplePayloadDto"
}
]
}
diff --git a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/SpringwolfJmsExampleApplication.java b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/SpringwolfJmsExampleApplication.java
similarity index 87%
rename from springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/SpringwolfJmsExampleApplication.java
rename to springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/SpringwolfJmsExampleApplication.java
index 68ba0328a..9b6dcc5b4 100644
--- a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/SpringwolfJmsExampleApplication.java
+++ b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/SpringwolfJmsExampleApplication.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.jms;
+package io.github.springwolf.examples.jms;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/config/ConverterConfig.java b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/config/ConverterConfig.java
similarity index 92%
rename from springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/config/ConverterConfig.java
rename to springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/config/ConverterConfig.java
index 6b830d929..e8e875b12 100644
--- a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/config/ConverterConfig.java
+++ b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/config/ConverterConfig.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.jms.config;
+package io.github.springwolf.examples.jms.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/consumers/ExampleConsumer.java b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/consumers/ExampleConsumer.java
similarity index 76%
rename from springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/consumers/ExampleConsumer.java
rename to springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/consumers/ExampleConsumer.java
index 175455a6c..7e728e59d 100644
--- a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/consumers/ExampleConsumer.java
+++ b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/consumers/ExampleConsumer.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.jms.consumers;
+package io.github.springwolf.examples.jms.consumers;
-import io.github.stavshamir.springwolf.example.jms.dtos.AnotherPayloadDto;
-import io.github.stavshamir.springwolf.example.jms.dtos.ExamplePayloadDto;
-import io.github.stavshamir.springwolf.example.jms.producers.AnotherProducer;
+import io.github.springwolf.examples.jms.dtos.AnotherPayloadDto;
+import io.github.springwolf.examples.jms.dtos.ExamplePayloadDto;
+import io.github.springwolf.examples.jms.producers.AnotherProducer;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.jms.annotation.JmsListener;
diff --git a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/dtos/AnotherPayloadDto.java b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/dtos/AnotherPayloadDto.java
similarity index 92%
rename from springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/dtos/AnotherPayloadDto.java
rename to springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/dtos/AnotherPayloadDto.java
index 3a88a2ea1..f69abba91 100644
--- a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/dtos/AnotherPayloadDto.java
+++ b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/dtos/AnotherPayloadDto.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sns.dtos;
+package io.github.springwolf.examples.jms.dtos;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
diff --git a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/dtos/ExamplePayloadDto.java b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/dtos/ExamplePayloadDto.java
similarity index 93%
rename from springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/dtos/ExamplePayloadDto.java
rename to springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/dtos/ExamplePayloadDto.java
index 8a1e8bf92..8dccd67f4 100644
--- a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/dtos/ExamplePayloadDto.java
+++ b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/dtos/ExamplePayloadDto.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sns.dtos;
+package io.github.springwolf.examples.jms.dtos;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
diff --git a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/producers/AnotherProducer.java b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/producers/AnotherProducer.java
similarity index 60%
rename from springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/producers/AnotherProducer.java
rename to springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/producers/AnotherProducer.java
index 8c5a12aa5..f77c2cadb 100644
--- a/springwolf-examples/springwolf-jms-example/src/main/java/io/github/stavshamir/springwolf/example/jms/producers/AnotherProducer.java
+++ b/springwolf-examples/springwolf-jms-example/src/main/java/io/github/springwolf/examples/jms/producers/AnotherProducer.java
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.jms.producers;
+package io.github.springwolf.examples.jms.producers;
-import io.github.stavshamir.springwolf.addons.generic_binding.annotation.AsyncGenericOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.example.jms.dtos.AnotherPayloadDto;
+import io.github.springwolf.addons.generic_binding.annotation.AsyncGenericOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
+import io.github.springwolf.examples.jms.dtos.AnotherPayloadDto;
+import io.github.springwolf.plugins.jms.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding;
import lombok.RequiredArgsConstructor;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.stereotype.Component;
diff --git a/springwolf-examples/springwolf-jms-example/src/main/resources/application.properties b/springwolf-examples/springwolf-jms-example/src/main/resources/application.properties
index 4308d27ff..f9c2f84ab 100644
--- a/springwolf-examples/springwolf-jms-example/src/main/resources/application.properties
+++ b/springwolf-examples/springwolf-jms-example/src/main/resources/application.properties
@@ -13,7 +13,7 @@ spring.artemis.password=artemis
#########
# Springwolf configuration
springwolf.enabled=true
-springwolf.docket.base-package=io.github.stavshamir.springwolf.example.jms
+springwolf.docket.base-package=io.github.springwolf.examples.jms
springwolf.docket.info.title=${spring.application.name}
springwolf.docket.info.version=1.0.0
springwolf.docket.info.description=Springwolf example project to demonstrate springwolfs abilities
@@ -29,4 +29,4 @@ springwolf.plugin.jms.publishing.enabled=true
# For debugging purposes
-logging.level.io.github.stavshamir.springwolf=DEBUG
+logging.level.io.github.springwolf=DEBUG
diff --git a/springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/ApiIntegrationTest.java b/springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/ApiIntegrationTest.java
similarity index 96%
rename from springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/ApiIntegrationTest.java
rename to springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/ApiIntegrationTest.java
index 7b16a61b1..ec5d94976 100644
--- a/springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/ApiIntegrationTest.java
+++ b/springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/ApiIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.jms;
+package io.github.springwolf.examples.jms;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/ApiSystemTest.java b/springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/ApiSystemTest.java
similarity index 97%
rename from springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/ApiSystemTest.java
rename to springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/ApiSystemTest.java
index ea73a51c3..ec4b796ab 100644
--- a/springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/ApiSystemTest.java
+++ b/springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/ApiSystemTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.jms;
+package io.github.springwolf.examples.jms;
import org.junit.jupiter.api.Test;
import org.springframework.web.client.RestTemplate;
diff --git a/springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/JmsTestContainerExtension.java b/springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/JmsTestContainerExtension.java
similarity index 96%
rename from springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/JmsTestContainerExtension.java
rename to springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/JmsTestContainerExtension.java
index fffba6c81..aef3139d4 100644
--- a/springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/JmsTestContainerExtension.java
+++ b/springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/JmsTestContainerExtension.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.jms;
+package io.github.springwolf.examples.jms;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
diff --git a/springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/ProducerSystemTest.java b/springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/ProducerSystemTest.java
similarity index 85%
rename from springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/ProducerSystemTest.java
rename to springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/ProducerSystemTest.java
index 42f9dfe92..82d15ea93 100644
--- a/springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/ProducerSystemTest.java
+++ b/springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/ProducerSystemTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.jms;
+package io.github.springwolf.examples.jms;
-import io.github.stavshamir.springwolf.example.jms.consumers.ExampleConsumer;
-import io.github.stavshamir.springwolf.example.jms.dtos.ExamplePayloadDto;
-import io.github.stavshamir.springwolf.producer.SpringwolfJmsProducer;
+import io.github.springwolf.examples.jms.consumers.ExampleConsumer;
+import io.github.springwolf.examples.jms.dtos.ExamplePayloadDto;
+import io.github.springwolf.plugins.jms.producer.SpringwolfJmsProducer;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -20,7 +20,7 @@
import java.io.File;
import java.util.Map;
-import static io.github.stavshamir.springwolf.example.jms.dtos.ExamplePayloadDto.ExampleEnum.FOO1;
+import static io.github.springwolf.examples.jms.dtos.ExamplePayloadDto.ExampleEnum.FOO1;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
diff --git a/springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/SpringwolfJmsExampleApplicationIntegrationTest.java b/springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/SpringwolfJmsExampleApplicationIntegrationTest.java
similarity index 92%
rename from springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/SpringwolfJmsExampleApplicationIntegrationTest.java
rename to springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/SpringwolfJmsExampleApplicationIntegrationTest.java
index 5590987fd..31e15ba52 100644
--- a/springwolf-examples/springwolf-jms-example/src/test/java/io/github/stavshamir/springwolf/example/jms/SpringwolfJmsExampleApplicationIntegrationTest.java
+++ b/springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/SpringwolfJmsExampleApplicationIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.jms;
+package io.github.springwolf.examples.jms;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/springwolf-examples/springwolf-jms-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-jms-example/src/test/resources/asyncapi.json
index 949a527c6..b79948964 100644
--- a/springwolf-examples/springwolf-jms-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-jms-example/src/test/resources/asyncapi.json
@@ -24,15 +24,15 @@
"channels": {
"another-queue": {
"messages": {
- "io.github.stavshamir.springwolf.example.jms.dtos.AnotherPayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.jms.dtos.AnotherPayloadDto"
+ "io.github.springwolf.examples.jms.dtos.AnotherPayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.jms.dtos.AnotherPayloadDto"
}
}
},
"example-queue": {
"messages": {
- "io.github.stavshamir.springwolf.example.jms.dtos.ExamplePayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.jms.dtos.ExamplePayloadDto"
+ "io.github.springwolf.examples.jms.dtos.ExamplePayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.jms.dtos.ExamplePayloadDto"
}
},
"bindings": {
@@ -51,11 +51,11 @@
{ }
]
},
- "io.github.stavshamir.springwolf.example.jms.dtos.AnotherPayloadDto": {
+ "io.github.springwolf.examples.jms.dtos.AnotherPayloadDto": {
"type": "object",
"properties": {
"example": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.jms.dtos.ExamplePayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.jms.dtos.ExamplePayloadDto"
},
"foo": {
"type": "string",
@@ -80,7 +80,7 @@
"example"
]
},
- "io.github.stavshamir.springwolf.example.jms.dtos.ExamplePayloadDto": {
+ "io.github.springwolf.examples.jms.dtos.ExamplePayloadDto": {
"type": "object",
"properties": {
"someEnum": {
@@ -126,17 +126,17 @@
}
},
"messages": {
- "io.github.stavshamir.springwolf.example.jms.dtos.AnotherPayloadDto": {
+ "io.github.springwolf.examples.jms.dtos.AnotherPayloadDto": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.jms.dtos.AnotherPayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.jms.dtos.AnotherPayloadDto"
}
},
- "name": "io.github.stavshamir.springwolf.example.jms.dtos.AnotherPayloadDto",
+ "name": "io.github.springwolf.examples.jms.dtos.AnotherPayloadDto",
"title": "AnotherPayloadDto",
"description": "Another payload model",
"bindings": {
@@ -145,17 +145,17 @@
}
}
},
- "io.github.stavshamir.springwolf.example.jms.dtos.ExamplePayloadDto": {
+ "io.github.springwolf.examples.jms.dtos.ExamplePayloadDto": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.jms.dtos.ExamplePayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.jms.dtos.ExamplePayloadDto"
}
},
- "name": "io.github.stavshamir.springwolf.example.jms.dtos.ExamplePayloadDto",
+ "name": "io.github.springwolf.examples.jms.dtos.ExamplePayloadDto",
"title": "ExamplePayloadDto",
"bindings": {
"jms": {
@@ -176,7 +176,7 @@
},
"messages": [
{
- "$ref": "#/channels/another-queue/messages/io.github.stavshamir.springwolf.example.jms.dtos.AnotherPayloadDto"
+ "$ref": "#/channels/another-queue/messages/io.github.springwolf.examples.jms.dtos.AnotherPayloadDto"
}
]
},
@@ -197,7 +197,7 @@
},
"messages": [
{
- "$ref": "#/channels/another-queue/messages/io.github.stavshamir.springwolf.example.jms.dtos.AnotherPayloadDto"
+ "$ref": "#/channels/another-queue/messages/io.github.springwolf.examples.jms.dtos.AnotherPayloadDto"
}
]
},
@@ -211,9 +211,9 @@
},
"messages": [
{
- "$ref": "#/channels/example-queue/messages/io.github.stavshamir.springwolf.example.jms.dtos.ExamplePayloadDto"
+ "$ref": "#/channels/example-queue/messages/io.github.springwolf.examples.jms.dtos.ExamplePayloadDto"
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/avro/ExamplePayloadAvroDto.avsc b/springwolf-examples/springwolf-kafka-example/src/main/avro/ExamplePayloadAvroDto.avsc
index d212dcac8..8019fca6a 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/avro/ExamplePayloadAvroDto.avsc
+++ b/springwolf-examples/springwolf-kafka-example/src/main/avro/ExamplePayloadAvroDto.avsc
@@ -1,5 +1,5 @@
{
- "namespace": "io.github.stavshamir.springwolf.example.kafka.dto.avro",
+ "namespace": "io.github.springwolf.examples.kafka.dto.avro",
"type": "record",
"name": "AnotherPayloadAvroDto",
"fields": [
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/SpringwolfKafkaExampleApplication.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/SpringwolfKafkaExampleApplication.java
similarity index 86%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/SpringwolfKafkaExampleApplication.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/SpringwolfKafkaExampleApplication.java
index 04b9d118a..2ce019115 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/SpringwolfKafkaExampleApplication.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/SpringwolfKafkaExampleApplication.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka;
+package io.github.springwolf.examples.kafka;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/CustomSpringwolfKafkaProducer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/CustomSpringwolfKafkaProducer.java
similarity index 93%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/CustomSpringwolfKafkaProducer.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/CustomSpringwolfKafkaProducer.java
index 622b08a79..78323b219 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/CustomSpringwolfKafkaProducer.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/CustomSpringwolfKafkaProducer.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.configuration;
+package io.github.springwolf.examples.kafka.configuration;
-import io.github.stavshamir.springwolf.producer.SpringwolfKafkaTemplateFromProperties;
-import io.github.stavshamir.springwolf.producer.SpringwolfKafkaTemplateProvider;
+import io.github.springwolf.plugins.kafka.producer.SpringwolfKafkaTemplateFromProperties;
+import io.github.springwolf.plugins.kafka.producer.SpringwolfKafkaTemplateProvider;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Primary;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/CustomWebSecurityConfigurerAdapter.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/CustomWebSecurityConfigurerAdapter.java
similarity index 96%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/CustomWebSecurityConfigurerAdapter.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/CustomWebSecurityConfigurerAdapter.java
index 1fc38dc49..46aa7b216 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/CustomWebSecurityConfigurerAdapter.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/CustomWebSecurityConfigurerAdapter.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.configuration;
+package io.github.springwolf.examples.kafka.configuration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/KafkaConfiguration.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/KafkaConfiguration.java
similarity index 84%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/KafkaConfiguration.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/KafkaConfiguration.java
index 0102c6a4a..395d9c905 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/KafkaConfiguration.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/KafkaConfiguration.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.configuration;
+package io.github.springwolf.examples.kafka.configuration;
import org.springframework.context.annotation.Configuration;
import org.springframework.kafka.annotation.EnableKafka;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/NestedProducerBeanConfiguration.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/NestedProducerBeanConfiguration.java
similarity index 74%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/NestedProducerBeanConfiguration.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/NestedProducerBeanConfiguration.java
index e01894782..3d001525a 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/NestedProducerBeanConfiguration.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/NestedProducerBeanConfiguration.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.configuration;
+package io.github.springwolf.examples.kafka.configuration;
-import io.github.stavshamir.springwolf.example.kafka.producers.NestedProducer;
+import io.github.springwolf.examples.kafka.producers.NestedProducer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/ObjectMapperConfiguration.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/ObjectMapperConfiguration.java
similarity index 94%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/ObjectMapperConfiguration.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/ObjectMapperConfiguration.java
index 3a71c4cde..d34a59c54 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/ObjectMapperConfiguration.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/ObjectMapperConfiguration.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.configuration;
+package io.github.springwolf.examples.kafka.configuration;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.hubspot.jackson.datatype.protobuf.ProtobufJacksonConfig;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/ProtobufPropertiesModule.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/ProtobufPropertiesModule.java
similarity index 99%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/ProtobufPropertiesModule.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/ProtobufPropertiesModule.java
index fb637c3b0..0a6bc6294 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/configuration/ProtobufPropertiesModule.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/configuration/ProtobufPropertiesModule.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.configuration;
+package io.github.springwolf.examples.kafka.configuration;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/AvroConsumer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/AvroConsumer.java
similarity index 75%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/AvroConsumer.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/AvroConsumer.java
index b036bbff3..71b0c6c38 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/AvroConsumer.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/AvroConsumer.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.consumers;
+package io.github.springwolf.examples.kafka.consumers;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
-import io.github.stavshamir.springwolf.example.kafka.dto.avro.AnotherPayloadAvroDto;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.examples.kafka.dto.avro.AnotherPayloadAvroDto;
+import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.kafka.annotation.KafkaListener;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/ExampleClassLevelKafkaListener.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/ExampleClassLevelKafkaListener.java
similarity index 79%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/ExampleClassLevelKafkaListener.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/ExampleClassLevelKafkaListener.java
index 4ea45a22c..aacacac06 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/ExampleClassLevelKafkaListener.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/ExampleClassLevelKafkaListener.java
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.consumers;
+package io.github.springwolf.examples.kafka.consumers;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
-import io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto;
-import io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto;
+import io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto;
+import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
import lombok.extern.slf4j.Slf4j;
import org.springframework.kafka.annotation.KafkaHandler;
import org.springframework.kafka.annotation.KafkaListener;
@@ -13,7 +13,7 @@
import javax.money.MonetaryAmount;
-import static io.github.stavshamir.springwolf.example.kafka.consumers.ExampleClassLevelKafkaListener.TOPIC;
+import static io.github.springwolf.examples.kafka.consumers.ExampleClassLevelKafkaListener.TOPIC;
import static org.springframework.kafka.support.mapping.AbstractJavaTypeMapper.DEFAULT_CLASSID_FIELD_NAME;
@Component
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/ExampleConsumer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/ExampleConsumer.java
similarity index 77%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/ExampleConsumer.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/ExampleConsumer.java
index 784f6b5eb..4d2760445 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/ExampleConsumer.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/ExampleConsumer.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.consumers;
+package io.github.springwolf.examples.kafka.consumers;
-import io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto;
-import io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto;
-import io.github.stavshamir.springwolf.example.kafka.producers.AnotherProducer;
+import io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto;
+import io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto;
+import io.github.springwolf.examples.kafka.producers.AnotherProducer;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.kafka.annotation.KafkaListener;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/ProtobufConsumer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/ProtobufConsumer.java
similarity index 88%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/ProtobufConsumer.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/ProtobufConsumer.java
index 6c7b5b55d..1c20150e3 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/ProtobufConsumer.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/ProtobufConsumer.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.consumers;
+package io.github.springwolf.examples.kafka.consumers;
-import io.github.stavshamir.springwolf.example.kafka.dto.proto.ExamplePayloadProtobufDto;
+import io.github.springwolf.examples.kafka.dto.proto.ExamplePayloadProtobufDto;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.kafka.annotation.KafkaListener;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/StringConsumer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/StringConsumer.java
similarity index 72%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/StringConsumer.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/StringConsumer.java
index 1b93446e3..4c701e8bd 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/StringConsumer.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/StringConsumer.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.consumers;
+package io.github.springwolf.examples.kafka.consumers;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.AsyncApiPayload;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.AsyncApiPayload;
+import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.RequiredArgsConstructor;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/XmlConsumer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/XmlConsumer.java
similarity index 58%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/XmlConsumer.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/XmlConsumer.java
index 6bb6b9080..de168812f 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/XmlConsumer.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/XmlConsumer.java
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.consumers;
+package io.github.springwolf.examples.kafka.consumers;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncMessage;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
-import io.github.stavshamir.springwolf.example.kafka.dtos.XmlPayloadDto;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncMessage;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.examples.kafka.dtos.XmlPayloadDto;
+import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.kafka.annotation.KafkaListener;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/YamlConsumer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/YamlConsumer.java
similarity index 58%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/YamlConsumer.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/YamlConsumer.java
index 367a57714..87d1e7d4c 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/consumers/YamlConsumer.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/consumers/YamlConsumer.java
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.consumers;
+package io.github.springwolf.examples.kafka.consumers;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncMessage;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
-import io.github.stavshamir.springwolf.example.kafka.dtos.YamlPayloadDto;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncMessage;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.examples.kafka.dtos.YamlPayloadDto;
+import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.kafka.annotation.KafkaListener;
diff --git a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/dtos/AnotherPayloadDto.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/AnotherPayloadDto.java
similarity index 92%
rename from springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/dtos/AnotherPayloadDto.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/AnotherPayloadDto.java
index 3c35cb08f..e1d135f70 100644
--- a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/dtos/AnotherPayloadDto.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/AnotherPayloadDto.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.amqp.dtos;
+package io.github.springwolf.examples.kafka.dtos;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/ExamplePayloadDto.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/ExamplePayloadDto.java
similarity index 96%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/ExamplePayloadDto.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/ExamplePayloadDto.java
index 1ff824ecf..e6c8abae8 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/ExamplePayloadDto.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/ExamplePayloadDto.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.dtos;
+package io.github.springwolf.examples.kafka.dtos;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/NestedPayloadDto.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/NestedPayloadDto.java
similarity index 91%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/NestedPayloadDto.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/NestedPayloadDto.java
index 857aaf6b2..3bb813031 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/NestedPayloadDto.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/NestedPayloadDto.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.dtos;
+package io.github.springwolf.examples.kafka.dtos;
import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/XmlPayloadDto.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/XmlPayloadDto.java
similarity index 86%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/XmlPayloadDto.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/XmlPayloadDto.java
index 63fbec20c..d130b5bb2 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/XmlPayloadDto.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/XmlPayloadDto.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.dtos;
+package io.github.springwolf.examples.kafka.dtos;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/YamlPayloadDto.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/YamlPayloadDto.java
similarity index 86%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/YamlPayloadDto.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/YamlPayloadDto.java
index a0f28a86b..8fc2843a2 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/YamlPayloadDto.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/dtos/YamlPayloadDto.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.dtos;
+package io.github.springwolf.examples.kafka.dtos;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/producers/AnotherProducer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/producers/AnotherProducer.java
similarity index 66%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/producers/AnotherProducer.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/producers/AnotherProducer.java
index 958d3310a..a19e26cdf 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/producers/AnotherProducer.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/producers/AnotherProducer.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.producers;
+package io.github.springwolf.examples.kafka.producers;
-import io.github.stavshamir.springwolf.example.kafka.configuration.KafkaConfiguration;
-import io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto;
+import io.github.springwolf.examples.kafka.configuration.KafkaConfiguration;
+import io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.stereotype.Component;
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/producers/NestedProducer.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/producers/NestedProducer.java
similarity index 81%
rename from springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/producers/NestedProducer.java
rename to springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/producers/NestedProducer.java
index c2c95fa3a..cce33a91a 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/producers/NestedProducer.java
+++ b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/springwolf/examples/kafka/producers/NestedProducer.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.producers;
+package io.github.springwolf.examples.kafka.producers;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding.KafkaAsyncKey;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding.KafkaAsyncMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeadersCloudEventConstants;
-import io.github.stavshamir.springwolf.example.kafka.configuration.KafkaConfiguration;
-import io.github.stavshamir.springwolf.example.kafka.dtos.NestedPayloadDto;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeadersCloudEventConstants;
+import io.github.springwolf.examples.kafka.configuration.KafkaConfiguration;
+import io.github.springwolf.examples.kafka.dtos.NestedPayloadDto;
+import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
+import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding.KafkaAsyncKey;
+import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding.KafkaAsyncMessageBinding;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.kafka.core.KafkaTemplate;
@@ -33,7 +33,7 @@ public class NestedProducer {
name = DEFAULT_CLASSID_FIELD_NAME,
description = "Spring Type Id Header",
value =
- "io.github.stavshamir.springwolf.example.kafka.dtos.NestedPayloadDto"),
+ "io.github.springwolf.examples.kafka.dtos.NestedPayloadDto"),
@AsyncOperation.Headers.Header(
name = AsyncHeadersCloudEventConstants.CONTENT_TYPE,
description = AsyncHeadersCloudEventConstants.CONTENT_TYPE_DESC,
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/AnotherPayloadDto.java b/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/AnotherPayloadDto.java
deleted file mode 100644
index 2681b6580..000000000
--- a/springwolf-examples/springwolf-kafka-example/src/main/java/io/github/stavshamir/springwolf/example/kafka/dtos/AnotherPayloadDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka.dtos;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED;
-import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
-
-@Schema(description = "Another payload model")
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class AnotherPayloadDto {
-
- @Schema(description = "Foo field", example = "bar", requiredMode = NOT_REQUIRED)
- private String foo;
-
- @Schema(description = "Example field", requiredMode = REQUIRED)
- private ExamplePayloadDto example;
-}
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/proto/ExamplePayloadProtobufDto.proto b/springwolf-examples/springwolf-kafka-example/src/main/proto/ExamplePayloadProtobufDto.proto
index c684931ff..dd0f9911a 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/proto/ExamplePayloadProtobufDto.proto
+++ b/springwolf-examples/springwolf-kafka-example/src/main/proto/ExamplePayloadProtobufDto.proto
@@ -1,6 +1,6 @@
syntax = "proto3";
-option java_package = "io.github.stavshamir.springwolf.example.kafka.dto.proto";
+option java_package = "io.github.springwolf.examples.kafka.dto.proto";
option java_outer_classname = "ExamplePayloadProtobufDto";
enum ExampleEnum
diff --git a/springwolf-examples/springwolf-kafka-example/src/main/resources/application.properties b/springwolf-examples/springwolf-kafka-example/src/main/resources/application.properties
index 18efb1420..da50ea0ba 100644
--- a/springwolf-examples/springwolf-kafka-example/src/main/resources/application.properties
+++ b/springwolf-examples/springwolf-kafka-example/src/main/resources/application.properties
@@ -16,7 +16,7 @@ spring.kafka.consumer.auto-commit-interval=100ms
spring.kafka.consumer.group-id=example-group-id
spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer
-spring.kafka.consumer.properties.spring.json.trusted.packages=io.github.stavshamir.springwolf.*
+spring.kafka.consumer.properties.spring.json.trusted.packages=io.github.springwolf.*
# if needed, authentication can be enabled as well:
#spring.kafka.consumer.security.protocol=SASL_PLAINTEXT
#spring.kafka.consumer.properties.sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule required username="broker" password="broker-secret";
@@ -27,7 +27,7 @@ spring.kafka.consumer.properties.spring.json.trusted.packages=io.github.stavsham
#########
# Springwolf configuration
springwolf.enabled=true
-springwolf.docket.base-package=io.github.stavshamir.springwolf.example.kafka
+springwolf.docket.base-package=io.github.springwolf.examples.kafka
springwolf.docket.info.title=${spring.application.name}
springwolf.docket.info.version=1.0.0
springwolf.docket.info.description=Springwolf example project to demonstrate springwolfs abilities, including **markdown** support for descriptions.
@@ -52,4 +52,4 @@ springwolf.plugin.kafka.publishing.producer.properties.sasl.jaas.config=org.apac
springwolf.plugin.kafka.publishing.producer.properties.sasl.mechanism=PLAIN
# For debugging purposes
-logging.level.io.github.stavshamir.springwolf=DEBUG
+logging.level.io.github.springwolf=DEBUG
diff --git a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiIntegrationTest.java b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ApiIntegrationTest.java
similarity index 96%
rename from springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiIntegrationTest.java
rename to springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ApiIntegrationTest.java
index bb717ee6e..fc303cde2 100644
--- a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiIntegrationTest.java
+++ b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ApiIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka;
+package io.github.springwolf.examples.kafka;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiIntegrationWithActuatorIntegrationTest.java b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ApiIntegrationWithActuatorIntegrationTest.java
similarity index 97%
rename from springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiIntegrationWithActuatorIntegrationTest.java
rename to springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ApiIntegrationWithActuatorIntegrationTest.java
index 1c4c77dc9..7aa4f748e 100644
--- a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ApiIntegrationWithActuatorIntegrationTest.java
+++ b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ApiIntegrationWithActuatorIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka;
+package io.github.springwolf.examples.kafka;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/ApiSystemTest.java b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ApiSystemTest.java
similarity index 97%
rename from springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/ApiSystemTest.java
rename to springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ApiSystemTest.java
index 7e0dfab43..51486bc91 100644
--- a/springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/stavshamir/springwolf/example/cloudstream/ApiSystemTest.java
+++ b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ApiSystemTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.cloudstream;
+package io.github.springwolf.examples.kafka;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/OpenApiGeneratorSystemTest.java b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/OpenApiGeneratorSystemTest.java
similarity index 97%
rename from springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/OpenApiGeneratorSystemTest.java
rename to springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/OpenApiGeneratorSystemTest.java
index 30c644b05..d7afa092f 100644
--- a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/OpenApiGeneratorSystemTest.java
+++ b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/OpenApiGeneratorSystemTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka;
+package io.github.springwolf.examples.kafka;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
diff --git a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ProducerSystemTest.java b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ProducerSystemTest.java
similarity index 84%
rename from springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ProducerSystemTest.java
rename to springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ProducerSystemTest.java
index 4c10198bf..62b71bc6a 100644
--- a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/ProducerSystemTest.java
+++ b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ProducerSystemTest.java
@@ -1,16 +1,16 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka;
-
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigProperties;
-import io.github.stavshamir.springwolf.example.kafka.consumers.AvroConsumer;
-import io.github.stavshamir.springwolf.example.kafka.consumers.ExampleConsumer;
-import io.github.stavshamir.springwolf.example.kafka.consumers.ProtobufConsumer;
-import io.github.stavshamir.springwolf.example.kafka.dto.avro.AnotherPayloadAvroDto;
-import io.github.stavshamir.springwolf.example.kafka.dto.avro.ExampleEnum;
-import io.github.stavshamir.springwolf.example.kafka.dto.avro.ExamplePayloadAvroDto;
-import io.github.stavshamir.springwolf.example.kafka.dto.proto.ExamplePayloadProtobufDto;
-import io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto;
-import io.github.stavshamir.springwolf.producer.SpringwolfKafkaProducer;
+package io.github.springwolf.examples.kafka;
+
+import io.github.springwolf.examples.kafka.consumers.AvroConsumer;
+import io.github.springwolf.examples.kafka.consumers.ExampleConsumer;
+import io.github.springwolf.examples.kafka.consumers.ProtobufConsumer;
+import io.github.springwolf.examples.kafka.dto.avro.AnotherPayloadAvroDto;
+import io.github.springwolf.examples.kafka.dto.avro.ExampleEnum;
+import io.github.springwolf.examples.kafka.dto.avro.ExamplePayloadAvroDto;
+import io.github.springwolf.examples.kafka.dto.proto.ExamplePayloadProtobufDto;
+import io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto;
+import io.github.springwolf.plugins.kafka.producer.SpringwolfKafkaProducer;
+import io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigProperties;
import org.apache.kafka.clients.admin.AdminClient;
import org.apache.kafka.clients.admin.KafkaAdminClient;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
@@ -31,7 +31,7 @@
import java.util.HashMap;
import java.util.Map;
-import static io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto.ExampleEnum.FOO1;
+import static io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto.ExampleEnum.FOO1;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
diff --git a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringContextIntegrationTest.java b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/SpringContextIntegrationTest.java
similarity index 92%
rename from springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringContextIntegrationTest.java
rename to springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/SpringContextIntegrationTest.java
index cc6056249..bf09fc62f 100644
--- a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringContextIntegrationTest.java
+++ b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/SpringContextIntegrationTest.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka;
+package io.github.springwolf.examples.kafka;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +27,7 @@ public class SpringContextIntegrationTest {
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.examples",
"springwolf.docket.servers.test-protocol.protocol=kafka",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
})
diff --git a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringwolfKafkaExampleApplicationIntegrationTest.java b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/SpringwolfKafkaExampleApplicationIntegrationTest.java
similarity index 94%
rename from springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringwolfKafkaExampleApplicationIntegrationTest.java
rename to springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/SpringwolfKafkaExampleApplicationIntegrationTest.java
index 681f92371..632c8b17e 100644
--- a/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/stavshamir/springwolf/example/kafka/SpringwolfKafkaExampleApplicationIntegrationTest.java
+++ b/springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/SpringwolfKafkaExampleApplicationIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.kafka;
+package io.github.springwolf.examples.kafka;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json
index 20c89e911..ca9b5523d 100644
--- a/springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-kafka-example/src/test/resources/asyncapi.json
@@ -24,8 +24,8 @@
"channels": {
"another-topic": {
"messages": {
- "io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto"
}
},
"bindings": {
@@ -36,15 +36,15 @@
},
"avro-topic": {
"messages": {
- "io.github.stavshamir.springwolf.example.kafka.dto.avro.AnotherPayloadAvroDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.kafka.dto.avro.AnotherPayloadAvroDto"
+ "io.github.springwolf.examples.kafka.dto.avro.AnotherPayloadAvroDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.kafka.dto.avro.AnotherPayloadAvroDto"
}
}
},
"example-topic": {
"messages": {
- "io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto"
}
},
"bindings": {
@@ -55,11 +55,11 @@
},
"multi-payload-topic": {
"messages": {
- "io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto"
},
- "io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto"
},
"javax.money.MonetaryAmount": {
"$ref": "#/components/messages/javax.money.MonetaryAmount"
@@ -68,8 +68,8 @@
},
"protobuf-topic": {
"messages": {
- "io.github.stavshamir.springwolf.example.kafka.dto.proto.ExamplePayloadProtobufDto$Message": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.kafka.dto.proto.ExamplePayloadProtobufDto$Message"
+ "io.github.springwolf.examples.kafka.dto.proto.ExamplePayloadProtobufDto$Message": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.kafka.dto.proto.ExamplePayloadProtobufDto$Message"
}
},
"bindings": {
@@ -80,8 +80,8 @@
},
"string-topic": {
"messages": {
- "io.github.stavshamir.springwolf.example.kafka.consumers.StringConsumer$StringEnvelope": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.kafka.consumers.StringConsumer$StringEnvelope"
+ "io.github.springwolf.examples.kafka.consumers.StringConsumer$StringEnvelope": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.kafka.consumers.StringConsumer$StringEnvelope"
},
"java.lang.String": {
"$ref": "#/components/messages/java.lang.String"
@@ -90,22 +90,22 @@
},
"topic-defined-via-asyncPublisher-annotation": {
"messages": {
- "io.github.stavshamir.springwolf.example.kafka.dtos.NestedPayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.kafka.dtos.NestedPayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.NestedPayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.kafka.dtos.NestedPayloadDto"
}
}
},
"xml-topic": {
"messages": {
- "io.github.stavshamir.springwolf.example.kafka.dtos.XmlPayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.kafka.dtos.XmlPayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.XmlPayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.kafka.dtos.XmlPayloadDto"
}
}
},
"yaml-topic": {
"messages": {
- "io.github.stavshamir.springwolf.example.kafka.dtos.YamlPayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.kafka.dtos.YamlPayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.YamlPayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.kafka.dtos.YamlPayloadDto"
}
}
}
@@ -130,10 +130,10 @@
"type": "string",
"description": "Spring Type Id Header",
"enum": [
- "io.github.stavshamir.springwolf.example.kafka.dtos.NestedPayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.NestedPayloadDto"
],
"examples": [
- "io.github.stavshamir.springwolf.example.kafka.dtos.NestedPayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.NestedPayloadDto"
]
},
"ce_id": {
@@ -209,7 +209,7 @@
},
"examples": [
{
- "__TypeId__": "io.github.stavshamir.springwolf.example.kafka.dtos.NestedPayloadDto",
+ "__TypeId__": "io.github.springwolf.examples.kafka.dtos.NestedPayloadDto",
"ce_id": "2c60089e-6f39-459d-8ced-2d6df7e4c03a",
"ce_source": "http://localhost",
"ce_specversion": "1.0",
@@ -225,7 +225,7 @@
"__TypeId__": {
"description": "Spring Type Id Header",
"enum": [
- "io.github.stavshamir.springwolf.example.kafka.dtos.NestedPayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.NestedPayloadDto"
],
"type": "string"
},
@@ -289,16 +289,16 @@
"type": "string",
"description": "Spring Type Id Header",
"enum": [
- "io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto"
],
"examples": [
- "io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto"
]
}
},
"examples": [
{
- "__TypeId__": "io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto"
+ "__TypeId__": "io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto"
}
],
"x-json-schema": {
@@ -307,7 +307,7 @@
"__TypeId__": {
"description": "Spring Type Id Header",
"enum": [
- "io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto"
],
"type": "string"
}
@@ -322,16 +322,16 @@
"type": "string",
"description": "Spring Type Id Header",
"enum": [
- "io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto"
],
"examples": [
- "io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto"
]
}
},
"examples": [
{
- "__TypeId__": "io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto"
+ "__TypeId__": "io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto"
}
],
"x-json-schema": {
@@ -340,7 +340,7 @@
"__TypeId__": {
"description": "Spring Type Id Header",
"enum": [
- "io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto"
+ "io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto"
],
"type": "string"
}
@@ -391,7 +391,7 @@
"type": "string"
}
},
- "io.github.stavshamir.springwolf.addons.common_model_converters.converters.monetaryamount.MonetaryAmount": {
+ "io.github.springwolf.addons.common_model_converters.converters.monetaryamount.MonetaryAmount": {
"type": "object",
"properties": {
"amount": {
@@ -428,7 +428,7 @@
"type": "object"
}
},
- "io.github.stavshamir.springwolf.example.kafka.consumers.StringConsumer$StringEnvelope": {
+ "io.github.springwolf.examples.kafka.consumers.StringConsumer$StringEnvelope": {
"type": "string",
"description": "Payload description using @Schema annotation and @AsyncApiPayload within envelope class",
"maxLength": 100,
@@ -442,11 +442,11 @@
"type": "string"
}
},
- "io.github.stavshamir.springwolf.example.kafka.dto.avro.AnotherPayloadAvroDto": {
+ "io.github.springwolf.examples.kafka.dto.avro.AnotherPayloadAvroDto": {
"type": "object",
"properties": {
"examplePayloadAvroDto": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.kafka.dto.avro.ExamplePayloadAvroDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.kafka.dto.avro.ExamplePayloadAvroDto"
},
"someEnum": {
"type": "string",
@@ -493,7 +493,7 @@
"type": "object"
}
},
- "io.github.stavshamir.springwolf.example.kafka.dto.avro.ExamplePayloadAvroDto": {
+ "io.github.springwolf.examples.kafka.dto.avro.ExamplePayloadAvroDto": {
"type": "object",
"properties": {
"someLong": {
@@ -524,7 +524,7 @@
"type": "object"
}
},
- "io.github.stavshamir.springwolf.example.kafka.dto.proto.ExamplePayloadProtobufDto$Message": {
+ "io.github.springwolf.examples.kafka.dto.proto.ExamplePayloadProtobufDto$Message": {
"type": "object",
"properties": {
"someEnum": {
@@ -574,11 +574,11 @@
"type": "object"
}
},
- "io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto": {
+ "io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto": {
"type": "object",
"properties": {
"example": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto"
},
"foo": {
"type": "string",
@@ -645,7 +645,7 @@
"type": "object"
}
},
- "io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto": {
+ "io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto": {
"type": "object",
"properties": {
"someEnum": {
@@ -718,13 +718,13 @@
"type": "object"
}
},
- "io.github.stavshamir.springwolf.example.kafka.dtos.NestedPayloadDto": {
+ "io.github.springwolf.examples.kafka.dtos.NestedPayloadDto": {
"type": "object",
"properties": {
"examplePayloads": {
"type": "array",
"items": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto"
}
},
"someStrings": {
@@ -801,7 +801,7 @@
"type": "object"
}
},
- "io.github.stavshamir.springwolf.example.kafka.dtos.XmlPayloadDto": {
+ "io.github.springwolf.examples.kafka.dtos.XmlPayloadDto": {
"type": "object",
"properties": {
"someEnum": {
@@ -821,7 +821,7 @@
}
},
"examples": [
- "FOO10string"
+ "FOO10string"
],
"x-json-schema": {
"$schema": "https://json-schema.org/draft-04/schema#",
@@ -845,7 +845,7 @@
"type": "object"
}
},
- "io.github.stavshamir.springwolf.example.kafka.dtos.YamlPayloadDto": {
+ "io.github.springwolf.examples.kafka.dtos.YamlPayloadDto": {
"type": "object",
"properties": {
"someEnum": {
@@ -891,17 +891,17 @@
}
},
"messages": {
- "io.github.stavshamir.springwolf.example.kafka.consumers.StringConsumer$StringEnvelope": {
+ "io.github.springwolf.examples.kafka.consumers.StringConsumer$StringEnvelope": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.kafka.consumers.StringConsumer$StringEnvelope"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.kafka.consumers.StringConsumer$StringEnvelope"
}
},
- "name": "io.github.stavshamir.springwolf.example.kafka.consumers.StringConsumer$StringEnvelope",
+ "name": "io.github.springwolf.examples.kafka.consumers.StringConsumer$StringEnvelope",
"title": "StringEnvelope",
"bindings": {
"kafka": {
@@ -909,17 +909,17 @@
}
}
},
- "io.github.stavshamir.springwolf.example.kafka.dto.avro.AnotherPayloadAvroDto": {
+ "io.github.springwolf.examples.kafka.dto.avro.AnotherPayloadAvroDto": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.kafka.dto.avro.AnotherPayloadAvroDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.kafka.dto.avro.AnotherPayloadAvroDto"
}
},
- "name": "io.github.stavshamir.springwolf.example.kafka.dto.avro.AnotherPayloadAvroDto",
+ "name": "io.github.springwolf.examples.kafka.dto.avro.AnotherPayloadAvroDto",
"title": "AnotherPayloadAvroDto",
"bindings": {
"kafka": {
@@ -927,17 +927,17 @@
}
}
},
- "io.github.stavshamir.springwolf.example.kafka.dto.proto.ExamplePayloadProtobufDto$Message": {
+ "io.github.springwolf.examples.kafka.dto.proto.ExamplePayloadProtobufDto$Message": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.kafka.dto.proto.ExamplePayloadProtobufDto$Message"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.kafka.dto.proto.ExamplePayloadProtobufDto$Message"
}
},
- "name": "io.github.stavshamir.springwolf.example.kafka.dto.proto.ExamplePayloadProtobufDto$Message",
+ "name": "io.github.springwolf.examples.kafka.dto.proto.ExamplePayloadProtobufDto$Message",
"title": "Message",
"bindings": {
"kafka": {
@@ -945,17 +945,17 @@
}
}
},
- "io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto": {
+ "io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto": {
"headers": {
"$ref": "#/components/schemas/SpringKafkaDefaultHeaders-AnotherPayloadDto"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto"
}
},
- "name": "io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto",
+ "name": "io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto",
"title": "AnotherPayloadDto",
"bindings": {
"kafka": {
@@ -963,17 +963,17 @@
}
}
},
- "io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto": {
+ "io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto": {
"headers": {
"$ref": "#/components/schemas/SpringKafkaDefaultHeaders-ExamplePayloadDto"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto"
}
},
- "name": "io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto",
+ "name": "io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto",
"title": "ExamplePayloadDto",
"bindings": {
"kafka": {
@@ -981,17 +981,17 @@
}
}
},
- "io.github.stavshamir.springwolf.example.kafka.dtos.NestedPayloadDto": {
+ "io.github.springwolf.examples.kafka.dtos.NestedPayloadDto": {
"headers": {
"$ref": "#/components/schemas/SpringDefaultHeaderAndCloudEvent"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.kafka.dtos.NestedPayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.kafka.dtos.NestedPayloadDto"
}
},
- "name": "io.github.stavshamir.springwolf.example.kafka.dtos.NestedPayloadDto",
+ "name": "io.github.springwolf.examples.kafka.dtos.NestedPayloadDto",
"title": "NestedPayloadDto",
"description": "Payload model with nested complex types",
"bindings": {
@@ -1007,18 +1007,18 @@
}
}
},
- "io.github.stavshamir.springwolf.example.kafka.dtos.XmlPayloadDto": {
+ "io.github.springwolf.examples.kafka.dtos.XmlPayloadDto": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.kafka.dtos.XmlPayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.kafka.dtos.XmlPayloadDto"
}
},
"contentType": "text/xml",
- "name": "io.github.stavshamir.springwolf.example.kafka.dtos.XmlPayloadDto",
+ "name": "io.github.springwolf.examples.kafka.dtos.XmlPayloadDto",
"title": "XmlPayloadDto",
"bindings": {
"kafka": {
@@ -1026,18 +1026,18 @@
}
}
},
- "io.github.stavshamir.springwolf.example.kafka.dtos.YamlPayloadDto": {
+ "io.github.springwolf.examples.kafka.dtos.YamlPayloadDto": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.kafka.dtos.YamlPayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.kafka.dtos.YamlPayloadDto"
}
},
"contentType": "application/yaml",
- "name": "io.github.stavshamir.springwolf.example.kafka.dtos.YamlPayloadDto",
+ "name": "io.github.springwolf.examples.kafka.dtos.YamlPayloadDto",
"title": "YamlPayloadDto",
"bindings": {
"kafka": {
@@ -1070,7 +1070,7 @@
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.addons.common_model_converters.converters.monetaryamount.MonetaryAmount"
+ "$ref": "#/components/schemas/io.github.springwolf.addons.common_model_converters.converters.monetaryamount.MonetaryAmount"
}
},
"name": "javax.money.MonetaryAmount",
@@ -1109,7 +1109,7 @@
},
"messages": [
{
- "$ref": "#/channels/another-topic/messages/io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto"
+ "$ref": "#/channels/another-topic/messages/io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto"
}
]
},
@@ -1127,7 +1127,7 @@
},
"messages": [
{
- "$ref": "#/channels/avro-topic/messages/io.github.stavshamir.springwolf.example.kafka.dto.avro.AnotherPayloadAvroDto"
+ "$ref": "#/channels/avro-topic/messages/io.github.springwolf.examples.kafka.dto.avro.AnotherPayloadAvroDto"
}
]
},
@@ -1143,7 +1143,7 @@
},
"messages": [
{
- "$ref": "#/channels/example-topic/messages/io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto"
+ "$ref": "#/channels/example-topic/messages/io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto"
}
]
},
@@ -1159,10 +1159,10 @@
},
"messages": [
{
- "$ref": "#/channels/multi-payload-topic/messages/io.github.stavshamir.springwolf.example.kafka.dtos.AnotherPayloadDto"
+ "$ref": "#/channels/multi-payload-topic/messages/io.github.springwolf.examples.kafka.dtos.ExamplePayloadDto"
},
{
- "$ref": "#/channels/multi-payload-topic/messages/io.github.stavshamir.springwolf.example.kafka.dtos.ExamplePayloadDto"
+ "$ref": "#/channels/multi-payload-topic/messages/io.github.springwolf.examples.kafka.dtos.AnotherPayloadDto"
},
{
"$ref": "#/channels/multi-payload-topic/messages/javax.money.MonetaryAmount"
@@ -1211,7 +1211,7 @@
},
"messages": [
{
- "$ref": "#/channels/protobuf-topic/messages/io.github.stavshamir.springwolf.example.kafka.dto.proto.ExamplePayloadProtobufDto$Message"
+ "$ref": "#/channels/protobuf-topic/messages/io.github.springwolf.examples.kafka.dto.proto.ExamplePayloadProtobufDto$Message"
}
]
},
@@ -1229,7 +1229,7 @@
},
"messages": [
{
- "$ref": "#/channels/string-topic/messages/io.github.stavshamir.springwolf.example.kafka.consumers.StringConsumer$StringEnvelope"
+ "$ref": "#/channels/string-topic/messages/io.github.springwolf.examples.kafka.consumers.StringConsumer$StringEnvelope"
},
{
"$ref": "#/channels/string-topic/messages/java.lang.String"
@@ -1256,7 +1256,7 @@
},
"messages": [
{
- "$ref": "#/channels/topic-defined-via-asyncPublisher-annotation/messages/io.github.stavshamir.springwolf.example.kafka.dtos.NestedPayloadDto"
+ "$ref": "#/channels/topic-defined-via-asyncPublisher-annotation/messages/io.github.springwolf.examples.kafka.dtos.NestedPayloadDto"
}
]
},
@@ -1274,7 +1274,7 @@
},
"messages": [
{
- "$ref": "#/channels/xml-topic/messages/io.github.stavshamir.springwolf.example.kafka.dtos.XmlPayloadDto"
+ "$ref": "#/channels/xml-topic/messages/io.github.springwolf.examples.kafka.dtos.XmlPayloadDto"
}
]
},
@@ -1292,9 +1292,9 @@
},
"messages": [
{
- "$ref": "#/channels/yaml-topic/messages/io.github.stavshamir.springwolf.example.kafka.dtos.YamlPayloadDto"
+ "$ref": "#/channels/yaml-topic/messages/io.github.springwolf.examples.kafka.dtos.YamlPayloadDto"
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/SpringwolfSnsExampleApplication.java b/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/SpringwolfSnsExampleApplication.java
similarity index 87%
rename from springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/SpringwolfSnsExampleApplication.java
rename to springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/SpringwolfSnsExampleApplication.java
index 0acdbd03a..8fce0ac21 100644
--- a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/SpringwolfSnsExampleApplication.java
+++ b/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/SpringwolfSnsExampleApplication.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sns;
+package io.github.springwolf.examples.sns;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/consumers/ExampleConsumer.java b/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/consumers/ExampleConsumer.java
similarity index 60%
rename from springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/consumers/ExampleConsumer.java
rename to springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/consumers/ExampleConsumer.java
index 0635ecfd7..9ff7a2d4f 100644
--- a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/consumers/ExampleConsumer.java
+++ b/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/consumers/ExampleConsumer.java
@@ -1,13 +1,13 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sns.consumers;
+package io.github.springwolf.examples.sns.consumers;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SnsAsyncOperationBindingIdentifier;
-import io.github.stavshamir.springwolf.example.sns.dtos.AnotherPayloadDto;
-import io.github.stavshamir.springwolf.example.sns.dtos.ExamplePayloadDto;
-import io.github.stavshamir.springwolf.example.sns.producers.AnotherProducer;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.examples.sns.dtos.AnotherPayloadDto;
+import io.github.springwolf.examples.sns.dtos.ExamplePayloadDto;
+import io.github.springwolf.examples.sns.producers.AnotherProducer;
+import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding;
+import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBindingIdentifier;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
diff --git a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/dtos/AnotherPayloadDto.java b/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/dtos/AnotherPayloadDto.java
new file mode 100644
index 000000000..1d6e5144f
--- /dev/null
+++ b/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/dtos/AnotherPayloadDto.java
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+package io.github.springwolf.examples.sns.dtos;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED;
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
+@Schema(description = "Another payload model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AnotherPayloadDto {
+
+ @Schema(description = "Foo field", example = "bar", requiredMode = NOT_REQUIRED)
+ private String foo;
+
+ @Schema(description = "Example field", requiredMode = REQUIRED)
+ private ExamplePayloadDto example;
+}
diff --git a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/dtos/ExamplePayloadDto.java b/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/dtos/ExamplePayloadDto.java
similarity index 93%
rename from springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/dtos/ExamplePayloadDto.java
rename to springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/dtos/ExamplePayloadDto.java
index 2c3d8f3ff..bac1416c3 100644
--- a/springwolf-examples/springwolf-amqp-example/src/main/java/io/github/stavshamir/springwolf/example/amqp/dtos/ExamplePayloadDto.java
+++ b/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/dtos/ExamplePayloadDto.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.amqp.dtos;
+package io.github.springwolf.examples.sns.dtos;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
diff --git a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/producers/AnotherProducer.java b/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/producers/AnotherProducer.java
similarity index 59%
rename from springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/producers/AnotherProducer.java
rename to springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/producers/AnotherProducer.java
index a6b3e03c6..5d36cbade 100644
--- a/springwolf-examples/springwolf-sns-example/src/main/java/io/github/stavshamir/springwolf/example/sns/producers/AnotherProducer.java
+++ b/springwolf-examples/springwolf-sns-example/src/main/java/io/github/springwolf/examples/sns/producers/AnotherProducer.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sns.producers;
+package io.github.springwolf.examples.sns.producers;
import io.awspring.cloud.sns.core.SnsTemplate;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SnsAsyncOperationBindingIdentifier;
-import io.github.stavshamir.springwolf.example.sns.dtos.AnotherPayloadDto;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
+import io.github.springwolf.examples.sns.dtos.AnotherPayloadDto;
+import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding;
+import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBindingIdentifier;
import lombok.RequiredArgsConstructor;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.stereotype.Component;
diff --git a/springwolf-examples/springwolf-sns-example/src/main/resources/application.properties b/springwolf-examples/springwolf-sns-example/src/main/resources/application.properties
index d8db0fc36..598db5b28 100644
--- a/springwolf-examples/springwolf-sns-example/src/main/resources/application.properties
+++ b/springwolf-examples/springwolf-sns-example/src/main/resources/application.properties
@@ -16,7 +16,7 @@ spring.cloud.aws.credentials.accessKey=XYZ
#########
# Springwolf configuration
springwolf.enabled=true
-springwolf.docket.base-package=io.github.stavshamir.springwolf.example.sns
+springwolf.docket.base-package=io.github.springwolf.examples.sns
springwolf.docket.info.title=${spring.application.name}
springwolf.docket.info.version=1.0.0
springwolf.docket.info.description=Springwolf example project to demonstrate springwolfs abilities
@@ -32,4 +32,4 @@ springwolf.plugin.sns.publishing.enabled=true
# For debugging purposes
-logging.level.io.github.stavshamir.springwolf=DEBUG
+logging.level.io.github.springwolf=DEBUG
diff --git a/springwolf-examples/springwolf-sns-example/src/test/java/io/github/stavshamir/springwolf/example/sns/ApiIntegrationTest.java b/springwolf-examples/springwolf-sns-example/src/test/java/io/github/springwolf/examples/sns/ApiIntegrationTest.java
similarity index 97%
rename from springwolf-examples/springwolf-sns-example/src/test/java/io/github/stavshamir/springwolf/example/sns/ApiIntegrationTest.java
rename to springwolf-examples/springwolf-sns-example/src/test/java/io/github/springwolf/examples/sns/ApiIntegrationTest.java
index ea109831b..6841650c6 100644
--- a/springwolf-examples/springwolf-sns-example/src/test/java/io/github/stavshamir/springwolf/example/sns/ApiIntegrationTest.java
+++ b/springwolf-examples/springwolf-sns-example/src/test/java/io/github/springwolf/examples/sns/ApiIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sns;
+package io.github.springwolf.examples.sns;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/springwolf-examples/springwolf-sns-example/src/test/java/io/github/stavshamir/springwolf/example/sns/ApiSystemTest.java b/springwolf-examples/springwolf-sns-example/src/test/java/io/github/springwolf/examples/sns/ApiSystemTest.java
similarity index 97%
rename from springwolf-examples/springwolf-sns-example/src/test/java/io/github/stavshamir/springwolf/example/sns/ApiSystemTest.java
rename to springwolf-examples/springwolf-sns-example/src/test/java/io/github/springwolf/examples/sns/ApiSystemTest.java
index 906b1be98..81c3c5d19 100644
--- a/springwolf-examples/springwolf-sns-example/src/test/java/io/github/stavshamir/springwolf/example/sns/ApiSystemTest.java
+++ b/springwolf-examples/springwolf-sns-example/src/test/java/io/github/springwolf/examples/sns/ApiSystemTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sns;
+package io.github.springwolf.examples.sns;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-examples/springwolf-sns-example/src/test/java/io/github/stavshamir/springwolf/example/sns/SnsTestContainerExtension.java b/springwolf-examples/springwolf-sns-example/src/test/java/io/github/springwolf/examples/sns/SnsTestContainerExtension.java
similarity index 97%
rename from springwolf-examples/springwolf-sns-example/src/test/java/io/github/stavshamir/springwolf/example/sns/SnsTestContainerExtension.java
rename to springwolf-examples/springwolf-sns-example/src/test/java/io/github/springwolf/examples/sns/SnsTestContainerExtension.java
index f4234bb01..c94ffd369 100644
--- a/springwolf-examples/springwolf-sns-example/src/test/java/io/github/stavshamir/springwolf/example/sns/SnsTestContainerExtension.java
+++ b/springwolf-examples/springwolf-sns-example/src/test/java/io/github/springwolf/examples/sns/SnsTestContainerExtension.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sns;
+package io.github.springwolf.examples.sns;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
diff --git a/springwolf-examples/springwolf-sns-example/src/test/java/io/github/stavshamir/springwolf/example/sns/SpringwolfSnsExampleApplicationIntegrationTest.java b/springwolf-examples/springwolf-sns-example/src/test/java/io/github/springwolf/examples/sns/SpringwolfSnsExampleApplicationIntegrationTest.java
similarity index 94%
rename from springwolf-examples/springwolf-sns-example/src/test/java/io/github/stavshamir/springwolf/example/sns/SpringwolfSnsExampleApplicationIntegrationTest.java
rename to springwolf-examples/springwolf-sns-example/src/test/java/io/github/springwolf/examples/sns/SpringwolfSnsExampleApplicationIntegrationTest.java
index 6f538d599..7b5ae1c94 100644
--- a/springwolf-examples/springwolf-sns-example/src/test/java/io/github/stavshamir/springwolf/example/sns/SpringwolfSnsExampleApplicationIntegrationTest.java
+++ b/springwolf-examples/springwolf-sns-example/src/test/java/io/github/springwolf/examples/sns/SpringwolfSnsExampleApplicationIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sns;
+package io.github.springwolf.examples.sns;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/springwolf-examples/springwolf-sns-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-sns-example/src/test/resources/asyncapi.json
index 9f94f6927..77056a44a 100644
--- a/springwolf-examples/springwolf-sns-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-sns-example/src/test/resources/asyncapi.json
@@ -24,15 +24,15 @@
"channels": {
"another-topic": {
"messages": {
- "io.github.stavshamir.springwolf.example.sns.dtos.AnotherPayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.sns.dtos.AnotherPayloadDto"
+ "io.github.springwolf.examples.sns.dtos.AnotherPayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.sns.dtos.AnotherPayloadDto"
}
}
},
"example-topic": {
"messages": {
- "io.github.stavshamir.springwolf.example.sns.dtos.ExamplePayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.sns.dtos.ExamplePayloadDto"
+ "io.github.springwolf.examples.sns.dtos.ExamplePayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.sns.dtos.ExamplePayloadDto"
}
}
}
@@ -50,11 +50,11 @@
"type": "object"
}
},
- "io.github.stavshamir.springwolf.example.sns.dtos.AnotherPayloadDto": {
+ "io.github.springwolf.examples.sns.dtos.AnotherPayloadDto": {
"type": "object",
"properties": {
"example": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.sns.dtos.ExamplePayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.sns.dtos.ExamplePayloadDto"
},
"foo": {
"type": "string",
@@ -121,7 +121,7 @@
"type": "object"
}
},
- "io.github.stavshamir.springwolf.example.sns.dtos.ExamplePayloadDto": {
+ "io.github.springwolf.examples.sns.dtos.ExamplePayloadDto": {
"type": "object",
"properties": {
"someEnum": {
@@ -196,34 +196,34 @@
}
},
"messages": {
- "io.github.stavshamir.springwolf.example.sns.dtos.AnotherPayloadDto": {
+ "io.github.springwolf.examples.sns.dtos.AnotherPayloadDto": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.sns.dtos.AnotherPayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.sns.dtos.AnotherPayloadDto"
}
},
- "name": "io.github.stavshamir.springwolf.example.sns.dtos.AnotherPayloadDto",
+ "name": "io.github.springwolf.examples.sns.dtos.AnotherPayloadDto",
"title": "AnotherPayloadDto",
"description": "Another payload model",
"bindings": {
"sns": { }
}
},
- "io.github.stavshamir.springwolf.example.sns.dtos.ExamplePayloadDto": {
+ "io.github.springwolf.examples.sns.dtos.ExamplePayloadDto": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.sns.dtos.ExamplePayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.sns.dtos.ExamplePayloadDto"
}
},
- "name": "io.github.stavshamir.springwolf.example.sns.dtos.ExamplePayloadDto",
+ "name": "io.github.springwolf.examples.sns.dtos.ExamplePayloadDto",
"title": "ExamplePayloadDto",
"description": "Example payload model",
"bindings": {
@@ -255,7 +255,7 @@
},
"messages": [
{
- "$ref": "#/channels/another-topic/messages/io.github.stavshamir.springwolf.example.sns.dtos.AnotherPayloadDto"
+ "$ref": "#/channels/another-topic/messages/io.github.springwolf.examples.sns.dtos.AnotherPayloadDto"
}
]
},
@@ -281,7 +281,7 @@
},
"messages": [
{
- "$ref": "#/channels/another-topic/messages/io.github.stavshamir.springwolf.example.sns.dtos.AnotherPayloadDto"
+ "$ref": "#/channels/another-topic/messages/io.github.springwolf.examples.sns.dtos.AnotherPayloadDto"
}
]
},
@@ -307,7 +307,7 @@
},
"messages": [
{
- "$ref": "#/channels/example-topic/messages/io.github.stavshamir.springwolf.example.sns.dtos.ExamplePayloadDto"
+ "$ref": "#/channels/example-topic/messages/io.github.springwolf.examples.sns.dtos.ExamplePayloadDto"
}
]
}
diff --git a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/SpringwolfSqsExampleApplication.java b/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/SpringwolfSqsExampleApplication.java
similarity index 87%
rename from springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/SpringwolfSqsExampleApplication.java
rename to springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/SpringwolfSqsExampleApplication.java
index 82e5a4c2b..26f4369b3 100644
--- a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/SpringwolfSqsExampleApplication.java
+++ b/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/SpringwolfSqsExampleApplication.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sqs;
+package io.github.springwolf.examples.sqs;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/consumers/ExampleConsumer.java b/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/consumers/ExampleConsumer.java
similarity index 75%
rename from springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/consumers/ExampleConsumer.java
rename to springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/consumers/ExampleConsumer.java
index 118cbcab5..f7010ce32 100644
--- a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/consumers/ExampleConsumer.java
+++ b/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/consumers/ExampleConsumer.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sqs.consumers;
+package io.github.springwolf.examples.sqs.consumers;
import io.awspring.cloud.sqs.annotation.SqsListener;
-import io.github.stavshamir.springwolf.example.sqs.dtos.AnotherPayloadDto;
-import io.github.stavshamir.springwolf.example.sqs.dtos.ExamplePayloadDto;
-import io.github.stavshamir.springwolf.example.sqs.producers.AnotherProducer;
+import io.github.springwolf.examples.sqs.dtos.AnotherPayloadDto;
+import io.github.springwolf.examples.sqs.dtos.ExamplePayloadDto;
+import io.github.springwolf.examples.sqs.producers.AnotherProducer;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
diff --git a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/dtos/AnotherPayloadDto.java b/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/dtos/AnotherPayloadDto.java
new file mode 100644
index 000000000..547921f28
--- /dev/null
+++ b/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/dtos/AnotherPayloadDto.java
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+package io.github.springwolf.examples.sqs.dtos;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED;
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
+@Schema(description = "Another payload model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AnotherPayloadDto {
+
+ @Schema(description = "Foo field", example = "bar", requiredMode = NOT_REQUIRED)
+ private String foo;
+
+ @Schema(description = "Example field", requiredMode = REQUIRED)
+ private ExamplePayloadDto example;
+}
diff --git a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/dtos/ExamplePayloadDto.java b/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/dtos/ExamplePayloadDto.java
new file mode 100644
index 000000000..811c9300b
--- /dev/null
+++ b/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/dtos/ExamplePayloadDto.java
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+package io.github.springwolf.examples.sqs.dtos;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
+@Schema(description = "Example payload model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ExamplePayloadDto {
+ @Schema(description = "Some string field", example = "some string value", requiredMode = REQUIRED)
+ private String someString;
+
+ @Schema(description = "Some long field", example = "5")
+ private long someLong;
+
+ @Schema(description = "Some enum field", example = "FOO2", requiredMode = REQUIRED)
+ private ExampleEnum someEnum;
+
+ public enum ExampleEnum {
+ FOO1,
+ FOO2,
+ FOO3
+ }
+}
diff --git a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/producers/AnotherProducer.java b/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/producers/AnotherProducer.java
similarity index 57%
rename from springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/producers/AnotherProducer.java
rename to springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/producers/AnotherProducer.java
index 4ab8f1309..308567796 100644
--- a/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/stavshamir/springwolf/example/sqs/producers/AnotherProducer.java
+++ b/springwolf-examples/springwolf-sqs-example/src/main/java/io/github/springwolf/examples/sqs/producers/AnotherProducer.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sqs.producers;
+package io.github.springwolf.examples.sqs.producers;
import io.awspring.cloud.sqs.operations.SqsTemplate;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SqsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SqsAsyncQueueBinding;
-import io.github.stavshamir.springwolf.example.sqs.dtos.AnotherPayloadDto;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncOperation;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
+import io.github.springwolf.examples.sqs.dtos.AnotherPayloadDto;
+import io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation.SqsAsyncOperationBinding;
+import io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation.SqsAsyncQueueBinding;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
diff --git a/springwolf-examples/springwolf-sqs-example/src/main/resources/application.properties b/springwolf-examples/springwolf-sqs-example/src/main/resources/application.properties
index 67afa0a87..c8a677942 100644
--- a/springwolf-examples/springwolf-sqs-example/src/main/resources/application.properties
+++ b/springwolf-examples/springwolf-sqs-example/src/main/resources/application.properties
@@ -16,7 +16,7 @@ spring.cloud.aws.credentials.accessKey=XYZ
#########
# Springwolf configuration
springwolf.enabled=true
-springwolf.docket.base-package=io.github.stavshamir.springwolf.example.sqs
+springwolf.docket.base-package=io.github.springwolf.examples.sqs
springwolf.docket.info.title=${spring.application.name}
springwolf.docket.info.version=1.0.0
springwolf.docket.info.description=Springwolf example project to demonstrate springwolfs abilities
@@ -32,4 +32,4 @@ springwolf.plugin.sqs.publishing.enabled=true
# For debugging purposes
-logging.level.io.github.stavshamir.springwolf=DEBUG
+logging.level.io.github.springwolf=DEBUG
diff --git a/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/ApiIntegrationTest.java b/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/ApiIntegrationTest.java
similarity index 96%
rename from springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/ApiIntegrationTest.java
rename to springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/ApiIntegrationTest.java
index e00b0a545..58b52354d 100644
--- a/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/ApiIntegrationTest.java
+++ b/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/ApiIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sqs;
+package io.github.springwolf.examples.sqs;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/ApiSystemTest.java b/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/ApiSystemTest.java
similarity index 97%
rename from springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/ApiSystemTest.java
rename to springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/ApiSystemTest.java
index 652ae495f..ef9576f4f 100644
--- a/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/ApiSystemTest.java
+++ b/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/ApiSystemTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sqs;
+package io.github.springwolf.examples.sqs;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/ProducerSystemTest.java b/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/ProducerSystemTest.java
similarity index 84%
rename from springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/ProducerSystemTest.java
rename to springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/ProducerSystemTest.java
index 8fa34ae04..76f8cd0f5 100644
--- a/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/ProducerSystemTest.java
+++ b/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/ProducerSystemTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sqs;
+package io.github.springwolf.examples.sqs;
-import io.github.stavshamir.springwolf.example.sqs.consumers.ExampleConsumer;
-import io.github.stavshamir.springwolf.example.sqs.dtos.ExamplePayloadDto;
-import io.github.stavshamir.springwolf.producer.SpringwolfSqsProducer;
+import io.github.springwolf.examples.sqs.consumers.ExampleConsumer;
+import io.github.springwolf.examples.sqs.dtos.ExamplePayloadDto;
+import io.github.springwolf.plugins.sqs.producer.SpringwolfSqsProducer;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -18,7 +18,7 @@
import java.io.File;
-import static io.github.stavshamir.springwolf.example.sqs.dtos.ExamplePayloadDto.ExampleEnum.FOO1;
+import static io.github.springwolf.examples.sqs.dtos.ExamplePayloadDto.ExampleEnum.FOO1;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
diff --git a/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/SpringwolfSqsExampleApplicationIntegrationTest.java b/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/SpringwolfSqsExampleApplicationIntegrationTest.java
similarity index 94%
rename from springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/SpringwolfSqsExampleApplicationIntegrationTest.java
rename to springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/SpringwolfSqsExampleApplicationIntegrationTest.java
index ed520020b..3aa1b2fc6 100644
--- a/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/SpringwolfSqsExampleApplicationIntegrationTest.java
+++ b/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/SpringwolfSqsExampleApplicationIntegrationTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sqs;
+package io.github.springwolf.examples.sqs;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/SqsTestContainerExtension.java b/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/SqsTestContainerExtension.java
similarity index 97%
rename from springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/SqsTestContainerExtension.java
rename to springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/SqsTestContainerExtension.java
index 7984dfba7..b0bfd79d4 100644
--- a/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/stavshamir/springwolf/example/sqs/SqsTestContainerExtension.java
+++ b/springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/SqsTestContainerExtension.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.example.sqs;
+package io.github.springwolf.examples.sqs;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
diff --git a/springwolf-examples/springwolf-sqs-example/src/test/resources/asyncapi.json b/springwolf-examples/springwolf-sqs-example/src/test/resources/asyncapi.json
index c3d80dfef..860bf0be1 100644
--- a/springwolf-examples/springwolf-sqs-example/src/test/resources/asyncapi.json
+++ b/springwolf-examples/springwolf-sqs-example/src/test/resources/asyncapi.json
@@ -24,15 +24,15 @@
"channels": {
"another-queue": {
"messages": {
- "io.github.stavshamir.springwolf.example.sqs.dtos.AnotherPayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.sqs.dtos.AnotherPayloadDto"
+ "io.github.springwolf.examples.sqs.dtos.AnotherPayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.sqs.dtos.AnotherPayloadDto"
}
}
},
"example-queue": {
"messages": {
- "io.github.stavshamir.springwolf.example.sqs.dtos.ExamplePayloadDto": {
- "$ref": "#/components/messages/io.github.stavshamir.springwolf.example.sqs.dtos.ExamplePayloadDto"
+ "io.github.springwolf.examples.sqs.dtos.ExamplePayloadDto": {
+ "$ref": "#/components/messages/io.github.springwolf.examples.sqs.dtos.ExamplePayloadDto"
}
},
"bindings": {
@@ -59,11 +59,11 @@
{ }
]
},
- "io.github.stavshamir.springwolf.example.sqs.dtos.AnotherPayloadDto": {
+ "io.github.springwolf.examples.sqs.dtos.AnotherPayloadDto": {
"type": "object",
"properties": {
"example": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.sqs.dtos.ExamplePayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.sqs.dtos.ExamplePayloadDto"
},
"foo": {
"type": "string",
@@ -88,7 +88,7 @@
"example"
]
},
- "io.github.stavshamir.springwolf.example.sqs.dtos.ExamplePayloadDto": {
+ "io.github.springwolf.examples.sqs.dtos.ExamplePayloadDto": {
"type": "object",
"properties": {
"someEnum": {
@@ -134,34 +134,34 @@
}
},
"messages": {
- "io.github.stavshamir.springwolf.example.sqs.dtos.AnotherPayloadDto": {
+ "io.github.springwolf.examples.sqs.dtos.AnotherPayloadDto": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.sqs.dtos.AnotherPayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.sqs.dtos.AnotherPayloadDto"
}
},
- "name": "io.github.stavshamir.springwolf.example.sqs.dtos.AnotherPayloadDto",
+ "name": "io.github.springwolf.examples.sqs.dtos.AnotherPayloadDto",
"title": "AnotherPayloadDto",
"description": "Another payload model",
"bindings": {
"sqs": { }
}
},
- "io.github.stavshamir.springwolf.example.sqs.dtos.ExamplePayloadDto": {
+ "io.github.springwolf.examples.sqs.dtos.ExamplePayloadDto": {
"headers": {
"$ref": "#/components/schemas/HeadersNotDocumented"
},
"payload": {
"schemaFormat": "application/vnd.aai.asyncapi+json;version=3.0.0",
"schema": {
- "$ref": "#/components/schemas/io.github.stavshamir.springwolf.example.sqs.dtos.ExamplePayloadDto"
+ "$ref": "#/components/schemas/io.github.springwolf.examples.sqs.dtos.ExamplePayloadDto"
}
},
- "name": "io.github.stavshamir.springwolf.example.sqs.dtos.ExamplePayloadDto",
+ "name": "io.github.springwolf.examples.sqs.dtos.ExamplePayloadDto",
"title": "ExamplePayloadDto",
"bindings": {
"sqs": { }
@@ -192,7 +192,7 @@
},
"messages": [
{
- "$ref": "#/channels/another-queue/messages/io.github.stavshamir.springwolf.example.sqs.dtos.AnotherPayloadDto"
+ "$ref": "#/channels/another-queue/messages/io.github.springwolf.examples.sqs.dtos.AnotherPayloadDto"
}
]
},
@@ -220,7 +220,7 @@
},
"messages": [
{
- "$ref": "#/channels/another-queue/messages/io.github.stavshamir.springwolf.example.sqs.dtos.AnotherPayloadDto"
+ "$ref": "#/channels/another-queue/messages/io.github.springwolf.examples.sqs.dtos.AnotherPayloadDto"
}
]
},
@@ -246,9 +246,9 @@
},
"messages": [
{
- "$ref": "#/channels/example-queue/messages/io.github.stavshamir.springwolf.example.sqs.dtos.ExamplePayloadDto"
+ "$ref": "#/channels/example-queue/messages/io.github.springwolf.examples.sqs.dtos.ExamplePayloadDto"
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/springwolf-plugins/springwolf-amqp-plugin/README.md b/springwolf-plugins/springwolf-amqp-plugin/README.md
index eb56d1438..c38774bd5 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/README.md
+++ b/springwolf-plugins/springwolf-amqp-plugin/README.md
@@ -36,7 +36,7 @@ dependencies {
Add a `application.properties` file:
```properties
-springwolf.docket.base-package=io.github.stavshamir.springwolf.example.consumers
+springwolf.docket.base-package=io.github.springwolf.examples
springwolf.docket.info.title=${spring.application.name}
springwolf.docket.info.version=1.0.0
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/amqp/SpringwolfAmqpAutoConfiguration.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpAutoConfiguration.java
similarity index 76%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/amqp/SpringwolfAmqpAutoConfiguration.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpAutoConfiguration.java
index e2300e3e4..7c70274b6 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/amqp/SpringwolfAmqpAutoConfiguration.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpAutoConfiguration.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.amqp;
+package io.github.springwolf.plugins.amqp.configuration;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfAmqpConfigProperties;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants;
+import io.github.springwolf.plugins.amqp.properties.SpringwolfAmqpConfigProperties;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/amqp/SpringwolfAmqpProducerConfiguration.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpProducerConfiguration.java
similarity index 68%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/amqp/SpringwolfAmqpProducerConfiguration.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpProducerConfiguration.java
index f8f077375..fb22302a0 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/amqp/SpringwolfAmqpProducerConfiguration.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpProducerConfiguration.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.amqp;
+package io.github.springwolf.plugins.amqp.configuration;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
-import io.github.stavshamir.springwolf.asyncapi.controller.PublishingPayloadCreator;
-import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfAmqpController;
-import io.github.stavshamir.springwolf.producer.SpringwolfAmqpProducer;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.plugins.amqp.controller.SpringwolfAmqpController;
+import io.github.springwolf.plugins.amqp.producer.SpringwolfAmqpProducer;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -15,8 +15,8 @@
import java.util.List;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_AMQP_CONFIG_PREFIX;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_AMQP_PLUGIN_PUBLISHING_ENABLED;
+import static io.github.springwolf.plugins.amqp.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_AMQP_CONFIG_PREFIX;
+import static io.github.springwolf.plugins.amqp.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_AMQP_PLUGIN_PUBLISHING_ENABLED;
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/amqp/SpringwolfAmqpScannerConfiguration.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpScannerConfiguration.java
similarity index 77%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/amqp/SpringwolfAmqpScannerConfiguration.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpScannerConfiguration.java
index fe1aa414a..71c28767c 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/amqp/SpringwolfAmqpScannerConfiguration.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpScannerConfiguration.java
@@ -1,21 +1,21 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.amqp;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.AmqpBindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingProcessorPriority;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.AmqpMessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.AmqpOperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelPriority;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.SimpleChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.SimpleOperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.ClassLevelAnnotationChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.ClassLevelAnnotationOperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.MethodLevelAnnotationOperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeadersForAmqpBuilder;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+package io.github.springwolf.plugins.amqp.configuration;
+
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingProcessorPriority;
+import io.github.springwolf.core.asyncapi.scanners.channels.ChannelPriority;
+import io.github.springwolf.core.asyncapi.scanners.channels.SimpleChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.SimpleOperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.ClassLevelAnnotationChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.ClassLevelAnnotationOperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.MethodLevelAnnotationOperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.SpringwolfClassScanner;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.plugins.amqp.scanners.bindings.AmqpBindingFactory;
+import io.github.springwolf.plugins.amqp.scanners.bindings.processor.AmqpMessageBindingProcessor;
+import io.github.springwolf.plugins.amqp.scanners.bindings.processor.AmqpOperationBindingProcessor;
+import io.github.springwolf.plugins.amqp.types.channel.operation.message.header.AsyncHeadersForAmqpBuilder;
import org.springframework.amqp.core.Binding;
import org.springframework.amqp.core.Exchange;
import org.springframework.amqp.core.Queue;
@@ -29,7 +29,7 @@
import java.util.List;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_SCANNER_RABBIT_LISTENER_ENABLED;
+import static io.github.springwolf.plugins.amqp.properties.SpringwolfAmqpConfigConstants.SPRINGWOLF_SCANNER_RABBIT_LISTENER_ENABLED;
/**
* Spring configuration defining the scanner beans for this amqp plugin.
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfAmqpController.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/controller/SpringwolfAmqpController.java
similarity index 72%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfAmqpController.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/controller/SpringwolfAmqpController.java
index 540c80c5b..cf8d19034 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfAmqpController.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/controller/SpringwolfAmqpController.java
@@ -1,8 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.controller;
+package io.github.springwolf.plugins.amqp.controller;
-import io.github.stavshamir.springwolf.asyncapi.controller.dtos.MessageDto;
-import io.github.stavshamir.springwolf.producer.SpringwolfAmqpProducer;
+import io.github.springwolf.core.asyncapi.controller.PublishingBaseController;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.core.asyncapi.controller.dtos.MessageDto;
+import io.github.springwolf.plugins.amqp.producer.SpringwolfAmqpProducer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducer.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/producer/SpringwolfAmqpProducer.java
similarity index 83%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducer.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/producer/SpringwolfAmqpProducer.java
index afe398887..8435c2697 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducer.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/producer/SpringwolfAmqpProducer.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.producer;
+package io.github.springwolf.plugins.amqp.producer;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.util.CollectionUtils;
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfAmqpConfigConstants.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/properties/SpringwolfAmqpConfigConstants.java
similarity index 52%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfAmqpConfigConstants.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/properties/SpringwolfAmqpConfigConstants.java
index 98cce60ec..3fe560001 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfAmqpConfigConstants.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/properties/SpringwolfAmqpConfigConstants.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration.properties;
+package io.github.springwolf.plugins.amqp.properties;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.ENABLED;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SCANNER;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.ENABLED;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.SCANNER;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX;
public class SpringwolfAmqpConfigConstants {
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfAmqpConfigProperties.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/properties/SpringwolfAmqpConfigProperties.java
similarity index 95%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfAmqpConfigProperties.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/properties/SpringwolfAmqpConfigProperties.java
index 2b19164b6..b1bd05230 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfAmqpConfigProperties.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/properties/SpringwolfAmqpConfigProperties.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration.properties;
+package io.github.springwolf.plugins.amqp.properties;
import lombok.Getter;
import lombok.Setter;
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/AmqpBindingFactory.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/AmqpBindingFactory.java
similarity index 80%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/AmqpBindingFactory.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/AmqpBindingFactory.java
index f81b61e8b..87e92dfca 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/AmqpBindingFactory.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/AmqpBindingFactory.java
@@ -1,10 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings;
+package io.github.springwolf.plugins.amqp.scanners.bindings;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.RabbitListenerUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.plugins.amqp.scanners.channels.annotation.RabbitListenerUtil;
import org.springframework.amqp.core.Binding;
import org.springframework.amqp.core.Exchange;
import org.springframework.amqp.core.Queue;
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AmqpMessageBindingProcessor.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpMessageBindingProcessor.java
similarity index 71%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AmqpMessageBindingProcessor.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpMessageBindingProcessor.java
index 43d064d34..8d7f21525 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AmqpMessageBindingProcessor.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpMessageBindingProcessor.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.amqp.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.MessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.MessageBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedMessageBinding;
+import io.github.springwolf.plugins.amqp.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
import org.springframework.context.EmbeddedValueResolverAware;
import org.springframework.util.StringValueResolver;
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AmqpOperationBindingProcessor.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpOperationBindingProcessor.java
similarity index 68%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AmqpOperationBindingProcessor.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpOperationBindingProcessor.java
index d3140c220..3013f2931 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AmqpOperationBindingProcessor.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpOperationBindingProcessor.java
@@ -1,9 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.amqp.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.processor.AbstractOperationBindingProcessor;
+import io.github.springwolf.plugins.amqp.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
import java.util.Arrays;
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/RabbitListenerUtil.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/channels/annotation/RabbitListenerUtil.java
similarity index 92%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/RabbitListenerUtil.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/channels/annotation/RabbitListenerUtil.java
index b6e833f68..5d049a138 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/RabbitListenerUtil.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/channels/annotation/RabbitListenerUtil.java
@@ -1,16 +1,16 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelExchangeProperties;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelExchangeType;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelQueueProperties;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelType;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+package io.github.springwolf.plugins.amqp.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelExchangeProperties;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelExchangeType;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelQueueProperties;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelType;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.Binding;
import org.springframework.amqp.core.Exchange;
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AmqpAsyncOperationBinding.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/channels/operationdata/annotation/AmqpAsyncOperationBinding.java
similarity index 70%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AmqpAsyncOperationBinding.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/channels/operationdata/annotation/AmqpAsyncOperationBinding.java
index c3b4ba09d..acdff54e8 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/AmqpAsyncOperationBinding.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/scanners/channels/operationdata/annotation/AmqpAsyncOperationBinding.java
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation;
+package io.github.springwolf.plugins.amqp.scanners.channels.operationdata.annotation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/AmqpConsumerData.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/types/AmqpConsumerData.java
similarity index 69%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/AmqpConsumerData.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/types/AmqpConsumerData.java
index 4cbc35797..6785ac130 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/AmqpConsumerData.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/types/AmqpConsumerData.java
@@ -1,12 +1,13 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types;
-
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelExchangeProperties;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelType;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+package io.github.springwolf.plugins.amqp.types;
+
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelExchangeProperties;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelType;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+import io.github.springwolf.core.asyncapi.types.ConsumerData;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
import lombok.Builder;
import java.util.Collections;
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/AmqpProducerData.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/types/AmqpProducerData.java
similarity index 69%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/AmqpProducerData.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/types/AmqpProducerData.java
index e11054c99..b7b951410 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/AmqpProducerData.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/types/AmqpProducerData.java
@@ -1,12 +1,13 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types;
-
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelExchangeProperties;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelType;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+package io.github.springwolf.plugins.amqp.types;
+
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelExchangeProperties;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelType;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+import io.github.springwolf.core.asyncapi.types.ProducerData;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
import lombok.Builder;
import java.util.Collections;
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersForAmqpBuilder.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/types/channel/operation/message/header/AsyncHeadersForAmqpBuilder.java
similarity index 53%
rename from springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersForAmqpBuilder.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/types/channel/operation/message/header/AsyncHeadersForAmqpBuilder.java
index cc3451bd1..8b97004b5 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersForAmqpBuilder.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/types/channel/operation/message/header/AsyncHeadersForAmqpBuilder.java
@@ -1,5 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header;
+package io.github.springwolf.plugins.amqp.types.channel.operation.message.header;
+
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeadersBuilder;
public class AsyncHeadersForAmqpBuilder implements AsyncHeadersBuilder {
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springwolf-plugins/springwolf-amqp-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 270935ea5..d14b06a42 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-io.github.stavshamir.springwolf.asyncapi.amqp.SpringwolfAmqpAutoConfiguration
+io.github.springwolf.plugins.amqp.configuration.SpringwolfAmqpAutoConfiguration
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/configuration/ObjectMapperTestConfiguration.java b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/configuration/ObjectMapperTestConfiguration.java
new file mode 100644
index 000000000..b47c8051c
--- /dev/null
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/configuration/ObjectMapperTestConfiguration.java
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+package io.github.springwolf.plugins.amqp.configuration;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+
+@TestConfiguration
+public class ObjectMapperTestConfiguration {
+
+ @ConditionalOnMissingBean
+ @Bean
+ public ObjectMapper objectMapper() {
+ return new ObjectMapper();
+ }
+}
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfAmqpProducerConfigurationIntegrationTest.java b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpProducerConfigurationIntegrationTest.java
similarity index 81%
rename from springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfAmqpProducerConfigurationIntegrationTest.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpProducerConfigurationIntegrationTest.java
index 44fb015f3..de688d59b 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfAmqpProducerConfigurationIntegrationTest.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/configuration/SpringwolfAmqpProducerConfigurationIntegrationTest.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
+package io.github.springwolf.plugins.amqp.configuration;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
-import io.github.stavshamir.springwolf.asyncapi.amqp.SpringwolfAmqpAutoConfiguration;
-import io.github.stavshamir.springwolf.asyncapi.controller.PublishingPayloadCreator;
-import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfAmqpController;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
-import io.github.stavshamir.springwolf.producer.SpringwolfAmqpProducer;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.SpringwolfClassScanner;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.plugins.amqp.controller.SpringwolfAmqpController;
+import io.github.springwolf.plugins.amqp.producer.SpringwolfAmqpProducer;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -38,7 +38,7 @@ public class SpringwolfAmqpProducerConfigurationIntegrationTest {
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.examples",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
"springwolf.plugin.amqp.publishing.enabled=true"
@@ -79,7 +79,7 @@ void springwolfAmqpProducerShouldBePresentInSpringContext() {
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.examples",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
"springwolf.plugin.amqp.publishing.enabled=false"
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducerTest.java b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/producer/SpringwolfAmqpProducerTest.java
similarity index 83%
rename from springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducerTest.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/producer/SpringwolfAmqpProducerTest.java
index 3dbb49bce..e5c95569e 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfAmqpProducerTest.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/producer/SpringwolfAmqpProducerTest.java
@@ -1,16 +1,16 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.producer;
-
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelExchangeProperties;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.AsyncAPI;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.info.Info;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
+package io.github.springwolf.plugins.amqp.producer;
+
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelExchangeProperties;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.info.Info;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AmqpMessageBindingProcessorTest.java b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpMessageBindingProcessorTest.java
similarity index 75%
rename from springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AmqpMessageBindingProcessorTest.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpMessageBindingProcessorTest.java
index b0e62f3f3..985334256 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AmqpMessageBindingProcessorTest.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpMessageBindingProcessorTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.amqp.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedMessageBinding;
+import io.github.springwolf.plugins.amqp.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
import org.junit.jupiter.api.Test;
import java.lang.reflect.Method;
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AmqpOperationBindingProcessorTest.java b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpOperationBindingProcessorTest.java
similarity index 75%
rename from springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AmqpOperationBindingProcessorTest.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpOperationBindingProcessorTest.java
index a678cfa96..9c9ef38e5 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/AmqpOperationBindingProcessorTest.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/bindings/processor/AmqpOperationBindingProcessorTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.amqp.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.plugins.amqp.scanners.channels.operationdata.annotation.AmqpAsyncOperationBinding;
import org.junit.jupiter.api.Test;
import java.util.List;
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/RabbitListenerUtilTest.java b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/channels/annotation/RabbitListenerUtilTest.java
similarity index 95%
rename from springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/RabbitListenerUtilTest.java
rename to springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/channels/annotation/RabbitListenerUtilTest.java
index 35e2e54e6..d0810c496 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/RabbitListenerUtilTest.java
+++ b/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/springwolf/plugins/amqp/scanners/channels/annotation/RabbitListenerUtilTest.java
@@ -1,16 +1,16 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelExchangeProperties;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelExchangeType;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelQueueProperties;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelType;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
+package io.github.springwolf.plugins.amqp.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelExchangeProperties;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelExchangeType;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelQueueProperties;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPChannelType;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.amqp.AMQPOperationBinding;
import org.assertj.core.util.Sets;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/cloudstream/SpringwolfCloudStreamAutoConfiguration.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/configuration/SpringwolfCloudStreamAutoConfiguration.java
similarity index 72%
rename from springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/cloudstream/SpringwolfCloudStreamAutoConfiguration.java
rename to springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/configuration/SpringwolfCloudStreamAutoConfiguration.java
index 78d708525..361308d08 100644
--- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/cloudstream/SpringwolfCloudStreamAutoConfiguration.java
+++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/configuration/SpringwolfCloudStreamAutoConfiguration.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.cloudstream;
+package io.github.springwolf.plugins.cloudstream.configuration;
-import io.github.stavshamir.springwolf.asyncapi.scanners.beans.BeanMethodsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.cloudstream.CloudStreamFunctionChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.cloudstream.CloudStreamFunctionOperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.cloudstream.FunctionalChannelBeanBuilder;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.core.asyncapi.scanners.beans.BeanMethodsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.plugins.cloudstream.scanners.channels.CloudStreamFunctionChannelsScanner;
+import io.github.springwolf.plugins.cloudstream.scanners.channels.CloudStreamFunctionOperationsScanner;
+import io.github.springwolf.plugins.cloudstream.scanners.channels.FunctionalChannelBeanBuilder;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.stream.config.BindingServiceProperties;
diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionChannelsScanner.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionChannelsScanner.java
similarity index 69%
rename from springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionChannelsScanner.java
rename to springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionChannelsScanner.java
index d90bc59db..850abb3eb 100644
--- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionChannelsScanner.java
+++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionChannelsScanner.java
@@ -1,25 +1,25 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.cloudstream;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.beans.BeanMethodsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelMerger;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.bindings.EmptyChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.bindings.EmptyMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+package io.github.springwolf.plugins.cloudstream.scanners.channels;
+
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.core.asyncapi.scanners.beans.BeanMethodsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.ChannelMerger;
+import io.github.springwolf.core.asyncapi.scanners.channels.ChannelsScanner;
+import io.github.springwolf.core.asyncapi.types.channel.bindings.EmptyChannelBinding;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.bindings.EmptyMessageBinding;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.configuration.AsyncApiDocket;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.stream.config.BindingServiceProperties;
diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionOperationsScanner.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionOperationsScanner.java
similarity index 72%
rename from springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionOperationsScanner.java
rename to springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionOperationsScanner.java
index 0f0d6f7b8..04f367c63 100644
--- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionOperationsScanner.java
+++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionOperationsScanner.java
@@ -1,25 +1,25 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.cloudstream;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.beans.BeanMethodsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.OperationMerger;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.OperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.bindings.EmptyOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.bindings.EmptyMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.server.Server;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocket;
-import io.github.stavshamir.springwolf.configuration.AsyncApiDocketService;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+package io.github.springwolf.plugins.cloudstream.scanners.channels;
+
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.asyncapi.v3.model.server.Server;
+import io.github.springwolf.core.asyncapi.scanners.beans.BeanMethodsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.OperationMerger;
+import io.github.springwolf.core.asyncapi.scanners.channels.OperationsScanner;
+import io.github.springwolf.core.asyncapi.types.channel.operation.bindings.EmptyOperationBinding;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.bindings.EmptyMessageBinding;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.configuration.AsyncApiDocket;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.schemas.ComponentsService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.stream.config.BindingServiceProperties;
diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanBuilder.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanBuilder.java
similarity index 92%
rename from springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanBuilder.java
rename to springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanBuilder.java
index 3281bc875..78d33d895 100644
--- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanBuilder.java
+++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanBuilder.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.cloudstream;
+package io.github.springwolf.plugins.cloudstream.scanners.channels;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
import lombok.RequiredArgsConstructor;
import java.lang.reflect.Method;
diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanData.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanData.java
similarity index 73%
rename from springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanData.java
rename to springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanData.java
index 0992af715..ac1db3093 100644
--- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanData.java
+++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanData.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.cloudstream;
+package io.github.springwolf.plugins.cloudstream.scanners.channels;
record FunctionalChannelBeanData(String beanName, Class> payloadType, BeanType beanType, String cloudStreamBinding) {
diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index b892d0eca..424b9ad4e 100644
--- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-io.github.stavshamir.springwolf.asyncapi.cloudstream.SpringwolfCloudStreamAutoConfiguration
+io.github.springwolf.plugins.cloudstream.configuration.SpringwolfCloudStreamAutoConfiguration
diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionChannelsScannerIntegrationTest.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionChannelsScannerIntegrationTest.java
similarity index 89%
rename from springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionChannelsScannerIntegrationTest.java
rename to springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionChannelsScannerIntegrationTest.java
index 0161d9632..5da22f9a5 100644
--- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/CloudStreamFunctionChannelsScannerIntegrationTest.java
+++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/scanners/channels/CloudStreamFunctionChannelsScannerIntegrationTest.java
@@ -1,34 +1,34 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.cloudstream;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.beans.DefaultBeanMethodsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ComponentClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.ConfigurationClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.bindings.EmptyChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.bindings.EmptyOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.bindings.EmptyMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.ChannelReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.channel.message.MessageReference;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.Operation;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.operation.OperationAction;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaReference;
-import io.github.stavshamir.springwolf.configuration.DefaultAsyncApiDocketService;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
-import io.github.stavshamir.springwolf.schemas.DefaultComponentsService;
-import io.github.stavshamir.springwolf.schemas.SwaggerSchemaUtil;
-import io.github.stavshamir.springwolf.schemas.example.DefaultSchemaWalker;
-import io.github.stavshamir.springwolf.schemas.example.ExampleJsonValueGenerator;
-import io.github.stavshamir.springwolf.schemas.example.SchemaWalkerProvider;
+package io.github.springwolf.plugins.cloudstream.scanners.channels;
+
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelObject;
+import io.github.springwolf.asyncapi.v3.model.channel.ChannelReference;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageHeaders;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageObject;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessagePayload;
+import io.github.springwolf.asyncapi.v3.model.channel.message.MessageReference;
+import io.github.springwolf.asyncapi.v3.model.operation.Operation;
+import io.github.springwolf.asyncapi.v3.model.operation.OperationAction;
+import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaReference;
+import io.github.springwolf.core.asyncapi.scanners.beans.DefaultBeanMethodsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.ComponentClassScanner;
+import io.github.springwolf.core.asyncapi.scanners.classes.ConfigurationClassScanner;
+import io.github.springwolf.core.asyncapi.types.channel.bindings.EmptyChannelBinding;
+import io.github.springwolf.core.asyncapi.types.channel.operation.bindings.EmptyOperationBinding;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.bindings.EmptyMessageBinding;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.configuration.DefaultAsyncApiDocketService;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.core.schemas.DefaultComponentsService;
+import io.github.springwolf.core.schemas.SwaggerSchemaUtil;
+import io.github.springwolf.core.schemas.example.DefaultSchemaWalker;
+import io.github.springwolf.core.schemas.example.ExampleJsonValueGenerator;
+import io.github.springwolf.core.schemas.example.SchemaWalkerProvider;
import org.apache.kafka.streams.kstream.KStream;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -77,7 +77,7 @@
"springwolf.enabled=true",
"springwolf.docket.info.title=Test",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.asyncapi.scanners.channels.cloudstream",
+ "springwolf.docket.base-package=io.github.springwolf.plugins.cloudstream.scanners.channels",
"springwolf.docket.servers.kafka.protocol=kafka",
"springwolf.docket.servers.kafka.host=kafka:9092",
})
diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanBuilderTest.java b/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanBuilderTest.java
similarity index 85%
rename from springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanBuilderTest.java
rename to springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanBuilderTest.java
index bdcbdd873..32af4b7ac 100644
--- a/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/cloudstream/FunctionalChannelBeanBuilderTest.java
+++ b/springwolf-plugins/springwolf-cloud-stream-plugin/src/test/java/io/github/springwolf/plugins/cloudstream/scanners/channels/FunctionalChannelBeanBuilderTest.java
@@ -1,9 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.cloudstream;
+package io.github.springwolf.plugins.cloudstream.scanners.channels;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
import org.apache.kafka.streams.kstream.KStream;
+import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Bean;
@@ -15,9 +16,8 @@
import java.util.function.Function;
import java.util.function.Supplier;
-import static io.github.stavshamir.springwolf.asyncapi.scanners.channels.cloudstream.FunctionalChannelBeanData.BeanType.CONSUMER;
-import static io.github.stavshamir.springwolf.asyncapi.scanners.channels.cloudstream.FunctionalChannelBeanData.BeanType.SUPPLIER;
-import static org.assertj.core.api.Assertions.assertThat;
+import static io.github.springwolf.plugins.cloudstream.scanners.channels.FunctionalChannelBeanData.BeanType.CONSUMER;
+import static io.github.springwolf.plugins.cloudstream.scanners.channels.FunctionalChannelBeanData.BeanType.SUPPLIER;
class FunctionalChannelBeanBuilderTest {
private final SpringwolfConfigProperties properties = new SpringwolfConfigProperties();
@@ -32,7 +32,7 @@ void testNotAFunctionalChannelBean() throws NoSuchMethodException {
Set data = functionalChannelBeanBuilder.fromMethodBean(method);
- assertThat(data).isEmpty();
+ Assertions.assertThat(data).isEmpty();
}
@Bean
@@ -49,7 +49,7 @@ void testConsumerBean() throws NoSuchMethodException {
Set data = functionalChannelBeanBuilder.fromMethodBean(method);
- assertThat(data)
+ Assertions.assertThat(data)
.containsExactly(
new FunctionalChannelBeanData("consumerBean", String.class, CONSUMER, "consumerBean-in-0"));
}
@@ -68,7 +68,7 @@ void testSupplierBean() throws NoSuchMethodException {
Set data = functionalChannelBeanBuilder.fromMethodBean(method);
- assertThat(data)
+ Assertions.assertThat(data)
.containsExactly(new FunctionalChannelBeanData(
"supplierBean", String.class, SUPPLIER, "supplierBean-out-0"));
}
@@ -87,7 +87,7 @@ void testFunctionBean() throws NoSuchMethodException {
Set data = functionalChannelBeanBuilder.fromMethodBean(method);
- assertThat(data)
+ Assertions.assertThat(data)
.containsExactlyInAnyOrder(
new FunctionalChannelBeanData("functionBean", String.class, CONSUMER, "functionBean-in-0"),
new FunctionalChannelBeanData(
@@ -110,7 +110,7 @@ void testConsumerBeanWithGenericPayload() throws NoSuchMethodException {
Set data = functionalChannelBeanBuilder.fromMethodBean(method);
- assertThat(data)
+ Assertions.assertThat(data)
.containsExactly(
new FunctionalChannelBeanData(methodName, String.class, CONSUMER, methodName + "-in-0"));
}
@@ -131,7 +131,7 @@ void testKafkaStreamsConsumerBean() throws NoSuchMethodException {
Set data = functionalChannelBeanBuilder.fromMethodBean(method);
- assertThat(data)
+ Assertions.assertThat(data)
.containsExactly(
new FunctionalChannelBeanData(methodName, String.class, CONSUMER, methodName + "-in-0"));
}
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/jms/SpringwolfJmsAutoConfiguration.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsAutoConfiguration.java
similarity index 76%
rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/jms/SpringwolfJmsAutoConfiguration.java
rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsAutoConfiguration.java
index 2c1733b6c..df95b35a0 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/jms/SpringwolfJmsAutoConfiguration.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsAutoConfiguration.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.jms;
+package io.github.springwolf.plugins.jms.configuration;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfJmsConfigProperties;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants;
+import io.github.springwolf.plugins.jms.properties.SpringwolfJmsConfigProperties;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/jms/SpringwolfJmsProducerConfiguration.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsProducerConfiguration.java
similarity index 66%
rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/jms/SpringwolfJmsProducerConfiguration.java
rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsProducerConfiguration.java
index 87646bc79..928b2080b 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/jms/SpringwolfJmsProducerConfiguration.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsProducerConfiguration.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.jms;
+package io.github.springwolf.plugins.jms.configuration;
-import io.github.stavshamir.springwolf.asyncapi.controller.PublishingPayloadCreator;
-import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfJmsController;
-import io.github.stavshamir.springwolf.producer.SpringwolfJmsProducer;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.plugins.jms.controller.SpringwolfJmsController;
+import io.github.springwolf.plugins.jms.producer.SpringwolfJmsProducer;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
@@ -12,8 +12,8 @@
import java.util.List;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfJmsConfigConstants.SPRINGWOLF_JMS_CONFIG_PREFIX;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfJmsConfigConstants.SPRINGWOLF_JMS_PLUGIN_PUBLISHING_ENABLED;
+import static io.github.springwolf.plugins.jms.properties.SpringwolfJmsConfigConstants.SPRINGWOLF_JMS_CONFIG_PREFIX;
+import static io.github.springwolf.plugins.jms.properties.SpringwolfJmsConfigConstants.SPRINGWOLF_JMS_PLUGIN_PUBLISHING_ENABLED;
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/jms/SpringwolfJmsScannerConfiguration.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsScannerConfiguration.java
similarity index 67%
rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/jms/SpringwolfJmsScannerConfiguration.java
rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsScannerConfiguration.java
index fb17bc8a5..d33acad5e 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/jms/SpringwolfJmsScannerConfiguration.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsScannerConfiguration.java
@@ -1,18 +1,18 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.jms;
+package io.github.springwolf.plugins.jms.configuration;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingProcessorPriority;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.JmsBindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.JmsMessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.JmsOperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelPriority;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.SimpleChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.SimpleOperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.MethodLevelAnnotationOperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingProcessorPriority;
+import io.github.springwolf.core.asyncapi.scanners.channels.ChannelPriority;
+import io.github.springwolf.core.asyncapi.scanners.channels.SimpleChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.SimpleOperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.MethodLevelAnnotationOperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.SpringwolfClassScanner;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.plugins.jms.scanners.bindings.JmsBindingFactory;
+import io.github.springwolf.plugins.jms.scanners.bindings.processor.JmsMessageBindingProcessor;
+import io.github.springwolf.plugins.jms.scanners.bindings.processor.JmsOperationBindingProcessor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
@@ -20,7 +20,7 @@
import org.springframework.core.annotation.Order;
import org.springframework.jms.annotation.JmsListener;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfJmsConfigConstants.SPRINGWOLF_SCANNER_JMS_LISTENER_ENABLED;
+import static io.github.springwolf.plugins.jms.properties.SpringwolfJmsConfigConstants.SPRINGWOLF_SCANNER_JMS_LISTENER_ENABLED;
/**
* spring configuration defining the scanner beans for the jms plugin
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfJmsController.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/controller/SpringwolfJmsController.java
similarity index 72%
rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfJmsController.java
rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/controller/SpringwolfJmsController.java
index be56a8d2d..e045b19a2 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfJmsController.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/controller/SpringwolfJmsController.java
@@ -1,8 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.controller;
+package io.github.springwolf.plugins.jms.controller;
-import io.github.stavshamir.springwolf.asyncapi.controller.dtos.MessageDto;
-import io.github.stavshamir.springwolf.producer.SpringwolfJmsProducer;
+import io.github.springwolf.core.asyncapi.controller.PublishingBaseController;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.core.asyncapi.controller.dtos.MessageDto;
+import io.github.springwolf.plugins.jms.producer.SpringwolfJmsProducer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfJmsProducer.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/producer/SpringwolfJmsProducer.java
similarity index 96%
rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfJmsProducer.java
rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/producer/SpringwolfJmsProducer.java
index 41acc5c92..848484744 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfJmsProducer.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/producer/SpringwolfJmsProducer.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.producer;
+package io.github.springwolf.plugins.jms.producer;
import jakarta.jms.JMSException;
import lombok.extern.slf4j.Slf4j;
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfJmsConfigConstants.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/properties/SpringwolfJmsConfigConstants.java
similarity index 52%
rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfJmsConfigConstants.java
rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/properties/SpringwolfJmsConfigConstants.java
index 1dae7aa5c..f30b554f5 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfJmsConfigConstants.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/properties/SpringwolfJmsConfigConstants.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration.properties;
+package io.github.springwolf.plugins.jms.properties;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.ENABLED;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SCANNER;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.ENABLED;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.SCANNER;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX;
public class SpringwolfJmsConfigConstants {
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfJmsConfigProperties.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/properties/SpringwolfJmsConfigProperties.java
similarity index 95%
rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfJmsConfigProperties.java
rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/properties/SpringwolfJmsConfigProperties.java
index 861d4bd2a..77e8b936d 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfJmsConfigProperties.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/properties/SpringwolfJmsConfigProperties.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration.properties;
+package io.github.springwolf.plugins.jms.properties;
import lombok.Getter;
import lombok.Setter;
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/JmsBindingFactory.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/JmsBindingFactory.java
similarity index 75%
rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/JmsBindingFactory.java
rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/JmsBindingFactory.java
index 7712edab5..0e7521586 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/JmsBindingFactory.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/JmsBindingFactory.java
@@ -1,10 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings;
+package io.github.springwolf.plugins.jms.scanners.bindings;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.JmsListenerUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.plugins.jms.scanners.channels.annotation.JmsListenerUtil;
import lombok.NoArgsConstructor;
import org.springframework.context.EmbeddedValueResolverAware;
import org.springframework.jms.annotation.JmsListener;
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/JmsMessageBindingProcessor.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsMessageBindingProcessor.java
similarity index 71%
rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/JmsMessageBindingProcessor.java
rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsMessageBindingProcessor.java
index e1eefd2d0..0dcae568f 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/JmsMessageBindingProcessor.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsMessageBindingProcessor.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.jms.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.MessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms.JMSMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.jms.JMSMessageBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.MessageBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedMessageBinding;
+import io.github.springwolf.plugins.jms.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding;
import org.springframework.context.EmbeddedValueResolverAware;
import org.springframework.util.StringValueResolver;
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsOperationBindingProcessor.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsOperationBindingProcessor.java
new file mode 100644
index 000000000..cb6bc43bb
--- /dev/null
+++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsOperationBindingProcessor.java
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+package io.github.springwolf.plugins.jms.scanners.bindings.processor;
+
+import io.github.springwolf.asyncapi.v3.bindings.jms.JMSOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.processor.AbstractOperationBindingProcessor;
+import io.github.springwolf.plugins.jms.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding;
+
+public class JmsOperationBindingProcessor extends AbstractOperationBindingProcessor {
+
+ @Override
+ protected ProcessedOperationBinding mapToOperationBinding(JmsAsyncOperationBinding bindingAnnotation) {
+ return new ProcessedOperationBinding(bindingAnnotation.type(), new JMSOperationBinding());
+ }
+}
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/JmsListenerUtil.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/channels/annotation/JmsListenerUtil.java
similarity index 62%
rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/JmsListenerUtil.java
rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/channels/annotation/JmsListenerUtil.java
index 2c9d50f7b..bbc01405d 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/JmsListenerUtil.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/channels/annotation/JmsListenerUtil.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
+package io.github.springwolf.plugins.jms.scanners.channels.annotation;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms.JMSChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms.JMSMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms.JMSOperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.jms.JMSChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.jms.JMSMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.jms.JMSOperationBinding;
import lombok.extern.slf4j.Slf4j;
import org.springframework.jms.annotation.JmsListener;
import org.springframework.util.StringValueResolver;
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/JmsAsyncOperationBinding.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/channels/operationdata/annotation/JmsAsyncOperationBinding.java
similarity index 61%
rename from springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/JmsAsyncOperationBinding.java
rename to springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/channels/operationdata/annotation/JmsAsyncOperationBinding.java
index 4bae15a91..40a868635 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/JmsAsyncOperationBinding.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/scanners/channels/operationdata/annotation/JmsAsyncOperationBinding.java
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation;
+package io.github.springwolf.plugins.jms.scanners.channels.operationdata.annotation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/JmsOperationBindingProcessor.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/JmsOperationBindingProcessor.java
deleted file mode 100644
index adc759f5f..000000000
--- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/JmsOperationBindingProcessor.java
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms.JMSOperationBinding;
-
-public class JmsOperationBindingProcessor extends AbstractOperationBindingProcessor {
-
- @Override
- protected ProcessedOperationBinding mapToOperationBinding(JmsAsyncOperationBinding bindingAnnotation) {
- return new ProcessedOperationBinding(bindingAnnotation.type(), new JMSOperationBinding());
- }
-}
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springwolf-plugins/springwolf-jms-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index c380b3330..2983e0707 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/springwolf-plugins/springwolf-jms-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-io.github.stavshamir.springwolf.asyncapi.jms.SpringwolfJmsAutoConfiguration
+io.github.springwolf.plugins.jms.configuration.SpringwolfJmsAutoConfiguration
diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/configuration/ObjectMapperTestConfiguration.java
similarity index 89%
rename from springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java
rename to springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/configuration/ObjectMapperTestConfiguration.java
index 6e87c75f9..126046d1f 100644
--- a/springwolf-plugins/springwolf-amqp-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/configuration/ObjectMapperTestConfiguration.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
+package io.github.springwolf.plugins.jms.configuration;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfJmsProducerConfigurationIntegrationTest.java b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsProducerConfigurationIntegrationTest.java
similarity index 80%
rename from springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfJmsProducerConfigurationIntegrationTest.java
rename to springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsProducerConfigurationIntegrationTest.java
index 335382dc1..b2d971a5e 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfJmsProducerConfigurationIntegrationTest.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/configuration/SpringwolfJmsProducerConfigurationIntegrationTest.java
@@ -1,15 +1,15 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
+package io.github.springwolf.plugins.jms.configuration;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
-import io.github.stavshamir.springwolf.asyncapi.ChannelsService;
-import io.github.stavshamir.springwolf.asyncapi.controller.PublishingPayloadCreator;
-import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfJmsController;
-import io.github.stavshamir.springwolf.asyncapi.jms.SpringwolfJmsAutoConfiguration;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
-import io.github.stavshamir.springwolf.producer.SpringwolfJmsProducer;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
+import io.github.springwolf.core.asyncapi.ChannelsService;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.SpringwolfClassScanner;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.plugins.jms.controller.SpringwolfJmsController;
+import io.github.springwolf.plugins.jms.producer.SpringwolfJmsProducer;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -39,7 +39,7 @@ public class SpringwolfJmsProducerConfigurationIntegrationTest {
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.plugins.jms",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
"springwolf.plugin.jms.publishing.enabled=true"
@@ -80,7 +80,7 @@ void springwolfJmsProducerShouldBePresentInSpringContext() {
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.plugins.jms",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
"springwolf.plugin.jms.publishing.enabled=false"
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfJmsControllerIntegrationTest.java b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/controller/SpringwolfJmsControllerIntegrationTest.java
similarity index 85%
rename from springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfJmsControllerIntegrationTest.java
rename to springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/controller/SpringwolfJmsControllerIntegrationTest.java
index 6690ad36b..f5675760e 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfJmsControllerIntegrationTest.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/controller/SpringwolfJmsControllerIntegrationTest.java
@@ -1,16 +1,17 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.controller;
+package io.github.springwolf.plugins.jms.controller;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.producer.SpringwolfJmsProducer;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
-import io.github.stavshamir.springwolf.schemas.DefaultComponentsService;
-import io.github.stavshamir.springwolf.schemas.SwaggerSchemaUtil;
-import io.github.stavshamir.springwolf.schemas.example.DefaultSchemaWalker;
-import io.github.stavshamir.springwolf.schemas.example.ExampleJsonValueGenerator;
-import io.github.stavshamir.springwolf.schemas.example.SchemaWalkerProvider;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.core.schemas.DefaultComponentsService;
+import io.github.springwolf.core.schemas.SwaggerSchemaUtil;
+import io.github.springwolf.core.schemas.example.DefaultSchemaWalker;
+import io.github.springwolf.core.schemas.example.ExampleJsonValueGenerator;
+import io.github.springwolf.core.schemas.example.SchemaWalkerProvider;
+import io.github.springwolf.plugins.jms.producer.SpringwolfJmsProducer;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -55,7 +56,7 @@
})
@TestPropertySource(
properties = {
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.asyncapi",
+ "springwolf.docket.base-package=io.github.springwolf.plugins.jms",
"springwolf.docket.info.title=Title",
"springwolf.docket.info.version=1.0",
"springwolf.docket.servers.jms.protocol=jms",
@@ -151,7 +152,7 @@ void testControllerShouldCallJmsProducerIfOnlyPayloadIsSend() throws Exception {
"bindings": null,
"headers": null,
"payload": "{ \\"some-payload-key\\" : \\"some-payload-value\\" }",
- "payloadType": "io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfJmsControllerIntegrationTest$PayloadDto"
+ "payloadType": "io.github.springwolf.plugins.jms.controller.SpringwolfJmsControllerIntegrationTest$PayloadDto"
}""";
mvc.perform(post("/springwolf/jms/publish")
@@ -177,7 +178,7 @@ void testControllerShouldCallJmsProducerIfPayloadAndHeadersAreSend() throws Exce
"some-header-key": "some-header-value"
},
"payload": "{ \\"some-payload-key\\" : \\"some-payload-value\\" }",
- "payloadType": "io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfJmsControllerIntegrationTest$PayloadDto"
+ "payloadType": "io.github.springwolf.plugins.jms.controller.SpringwolfJmsControllerIntegrationTest$PayloadDto"
}
""";
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfJmsProducerTest.java b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/producer/SpringwolfJmsProducerTest.java
similarity index 95%
rename from springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfJmsProducerTest.java
rename to springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/producer/SpringwolfJmsProducerTest.java
index 493323d65..054b460e4 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfJmsProducerTest.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/producer/SpringwolfJmsProducerTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.producer;
+package io.github.springwolf.plugins.jms.producer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/JmsMessageBindingProcessorTest.java b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsMessageBindingProcessorTest.java
similarity index 75%
rename from springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/JmsMessageBindingProcessorTest.java
rename to springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsMessageBindingProcessorTest.java
index 82cf43bac..8aadc18b7 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/JmsMessageBindingProcessorTest.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsMessageBindingProcessorTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.jms.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms.JMSMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.jms.JMSMessageBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedMessageBinding;
+import io.github.springwolf.plugins.jms.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding;
import org.junit.jupiter.api.Test;
import java.lang.reflect.Method;
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/JmsOperationBindingProcessorTest.java b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsOperationBindingProcessorTest.java
similarity index 69%
rename from springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/JmsOperationBindingProcessorTest.java
rename to springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsOperationBindingProcessorTest.java
index e3d3d6ba5..ee7bfbd14 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/JmsOperationBindingProcessorTest.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/bindings/processor/JmsOperationBindingProcessorTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.jms.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms.JMSOperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.jms.JMSOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.plugins.jms.scanners.channels.operationdata.annotation.JmsAsyncOperationBinding;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/JmsListenerUtilTest.java b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/channels/annotation/JmsListenerUtilTest.java
similarity index 84%
rename from springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/JmsListenerUtilTest.java
rename to springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/channels/annotation/JmsListenerUtilTest.java
index 893c072e0..9b2d3bdfa 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/JmsListenerUtilTest.java
+++ b/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/springwolf/plugins/jms/scanners/channels/annotation/JmsListenerUtilTest.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms.JMSChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms.JMSMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.jms.JMSOperationBinding;
+package io.github.springwolf.plugins.jms.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.jms.JMSChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.jms.JMSMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.jms.JMSOperationBinding;
import org.assertj.core.util.Sets;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/README.md b/springwolf-plugins/springwolf-kafka-plugin/README.md
index d3e3d984f..1f96bbcca 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/README.md
+++ b/springwolf-plugins/springwolf-kafka-plugin/README.md
@@ -38,7 +38,7 @@ dependencies {
Add a `application.properties` file:
```properties
-springwolf.docket.base-package=io.github.stavshamir.springwolf.example.consumers
+springwolf.docket.base-package=io.github.springwolf.examples
springwolf.docket.info.title=${spring.application.name}
springwolf.docket.info.version=1.0.0
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/kafka/SpringwolfKafkaAutoConfiguration.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaAutoConfiguration.java
similarity index 76%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/kafka/SpringwolfKafkaAutoConfiguration.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaAutoConfiguration.java
index 355f75bfa..d0533a0a2 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/kafka/SpringwolfKafkaAutoConfiguration.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaAutoConfiguration.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.kafka;
+package io.github.springwolf.plugins.kafka.configuration;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigProperties;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants;
+import io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigProperties;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/kafka/SpringwolfKafkaProducerConfiguration.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaProducerConfiguration.java
similarity index 63%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/kafka/SpringwolfKafkaProducerConfiguration.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaProducerConfiguration.java
index f45dc1f91..c8a91c2e5 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/kafka/SpringwolfKafkaProducerConfiguration.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaProducerConfiguration.java
@@ -1,19 +1,19 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.kafka;
+package io.github.springwolf.plugins.kafka.configuration;
-import io.github.stavshamir.springwolf.asyncapi.controller.PublishingPayloadCreator;
-import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfKafkaController;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigProperties;
-import io.github.stavshamir.springwolf.producer.SpringwolfKafkaProducer;
-import io.github.stavshamir.springwolf.producer.SpringwolfKafkaTemplateFromProperties;
-import io.github.stavshamir.springwolf.producer.SpringwolfKafkaTemplateProvider;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.plugins.kafka.controller.SpringwolfKafkaController;
+import io.github.springwolf.plugins.kafka.producer.SpringwolfKafkaProducer;
+import io.github.springwolf.plugins.kafka.producer.SpringwolfKafkaTemplateFromProperties;
+import io.github.springwolf.plugins.kafka.producer.SpringwolfKafkaTemplateProvider;
+import io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigProperties;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_CONFIG_PREFIX;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_PLUGIN_PUBLISHING_ENABLED;
+import static io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_CONFIG_PREFIX;
+import static io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_PLUGIN_PUBLISHING_ENABLED;
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/kafka/SpringwolfKafkaScannerConfiguration.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaScannerConfiguration.java
similarity index 76%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/kafka/SpringwolfKafkaScannerConfiguration.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaScannerConfiguration.java
index e05eb5c29..c83d50877 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/kafka/SpringwolfKafkaScannerConfiguration.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaScannerConfiguration.java
@@ -1,21 +1,21 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.kafka;
+package io.github.springwolf.plugins.kafka.configuration;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingProcessorPriority;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.KafkaBindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.KafkaMessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.KafkaOperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelPriority;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.SimpleChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.SimpleOperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.ClassLevelAnnotationChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.ClassLevelAnnotationOperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.MethodLevelAnnotationOperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeadersForKafkaBuilder;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingProcessorPriority;
+import io.github.springwolf.core.asyncapi.scanners.channels.ChannelPriority;
+import io.github.springwolf.core.asyncapi.scanners.channels.SimpleChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.SimpleOperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.ClassLevelAnnotationChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.ClassLevelAnnotationOperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.MethodLevelAnnotationOperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.SpringwolfClassScanner;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.plugins.kafka.scanners.bindings.KafkaBindingFactory;
+import io.github.springwolf.plugins.kafka.scanners.bindings.processor.KafkaMessageBindingProcessor;
+import io.github.springwolf.plugins.kafka.scanners.bindings.processor.KafkaOperationBindingProcessor;
+import io.github.springwolf.plugins.kafka.types.channel.operation.message.header.AsyncHeadersForKafkaBuilder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
@@ -24,7 +24,7 @@
import org.springframework.kafka.annotation.KafkaHandler;
import org.springframework.kafka.annotation.KafkaListener;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED;
+import static io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_SCANNER_KAFKA_LISTENER_ENABLED;
/**
* spring configuration defining the scanner beans for the kafka plugin
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfKafkaController.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/controller/SpringwolfKafkaController.java
similarity index 74%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfKafkaController.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/controller/SpringwolfKafkaController.java
index 52aa2658d..09a2f4ec8 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfKafkaController.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/controller/SpringwolfKafkaController.java
@@ -1,8 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.controller;
+package io.github.springwolf.plugins.kafka.controller;
-import io.github.stavshamir.springwolf.asyncapi.controller.dtos.MessageDto;
-import io.github.stavshamir.springwolf.producer.SpringwolfKafkaProducer;
+import io.github.springwolf.core.asyncapi.controller.PublishingBaseController;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.core.asyncapi.controller.dtos.MessageDto;
+import io.github.springwolf.plugins.kafka.producer.SpringwolfKafkaProducer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaProducer.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaProducer.java
similarity index 97%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaProducer.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaProducer.java
index db7323505..682c9b367 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaProducer.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaProducer.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.producer;
+package io.github.springwolf.plugins.kafka.producer;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaTemplateFromProperties.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateFromProperties.java
similarity index 87%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaTemplateFromProperties.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateFromProperties.java
index e02e9a1fe..85909e012 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaTemplateFromProperties.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateFromProperties.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.producer;
+package io.github.springwolf.plugins.kafka.producer;
-import io.github.stavshamir.springwolf.asyncapi.kafka.SpringwolfKafkaProducerConfiguration;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigProperties;
+import io.github.springwolf.plugins.kafka.configuration.SpringwolfKafkaProducerConfiguration;
+import io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigProperties;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.ssl.DefaultSslBundleRegistry;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaTemplateProvider.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateProvider.java
similarity index 90%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaTemplateProvider.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateProvider.java
index a6dbf624a..d91a59fbc 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaTemplateProvider.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateProvider.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.producer;
+package io.github.springwolf.plugins.kafka.producer;
import org.springframework.kafka.core.KafkaTemplate;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfKafkaConfigConstants.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/properties/SpringwolfKafkaConfigConstants.java
similarity index 52%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfKafkaConfigConstants.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/properties/SpringwolfKafkaConfigConstants.java
index da63136e3..fae388d07 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfKafkaConfigConstants.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/properties/SpringwolfKafkaConfigConstants.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration.properties;
+package io.github.springwolf.plugins.kafka.properties;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.ENABLED;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SCANNER;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.ENABLED;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.SCANNER;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX;
public class SpringwolfKafkaConfigConstants {
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfKafkaConfigProperties.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/properties/SpringwolfKafkaConfigProperties.java
similarity index 84%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfKafkaConfigProperties.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/properties/SpringwolfKafkaConfigProperties.java
index 2f9648559..5b899ebd1 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfKafkaConfigProperties.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/properties/SpringwolfKafkaConfigProperties.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration.properties;
+package io.github.springwolf.plugins.kafka.properties;
import lombok.Getter;
import lombok.Setter;
@@ -8,13 +8,11 @@
import org.springframework.boot.context.properties.NestedConfigurationProperty;
import org.springframework.lang.Nullable;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_CONFIG_PREFIX;
-
/**
* This class is used to create metadata for auto-completion in spring configuration properties/yaml by using
* the spring-boot-configuration-processor.
*/
-@ConfigurationProperties(prefix = SPRINGWOLF_KAFKA_CONFIG_PREFIX)
+@ConfigurationProperties(prefix = SpringwolfKafkaConfigConstants.SPRINGWOLF_KAFKA_CONFIG_PREFIX)
@Getter
@Setter
public class SpringwolfKafkaConfigProperties {
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/KafkaBindingFactory.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/KafkaBindingFactory.java
similarity index 75%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/KafkaBindingFactory.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/KafkaBindingFactory.java
index 360ef3923..68abbf322 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/KafkaBindingFactory.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/KafkaBindingFactory.java
@@ -1,10 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings;
+package io.github.springwolf.plugins.kafka.scanners.bindings;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.KafkaListenerUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.plugins.kafka.scanners.channels.annotation.KafkaListenerUtil;
import lombok.NoArgsConstructor;
import org.springframework.context.EmbeddedValueResolverAware;
import org.springframework.kafka.annotation.KafkaListener;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/KafkaMessageBindingProcessor.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaMessageBindingProcessor.java
similarity index 71%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/KafkaMessageBindingProcessor.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaMessageBindingProcessor.java
index 1aadfef14..49c838ee0 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/KafkaMessageBindingProcessor.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaMessageBindingProcessor.java
@@ -1,13 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.kafka.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.MessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding.KafkaAsyncMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.Schema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding;
+import io.github.springwolf.asyncapi.v3.model.schema.Schema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.core.asyncapi.scanners.bindings.MessageBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedMessageBinding;
+import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
import org.springframework.context.EmbeddedValueResolverAware;
import org.springframework.util.StringUtils;
import org.springframework.util.StringValueResolver;
@@ -35,7 +34,7 @@ public Optional process(Method method) {
}
private ProcessedMessageBinding mapToMessageBinding(KafkaAsyncOperationBinding bindingAnnotation) {
- KafkaAsyncMessageBinding messageBinding = bindingAnnotation.messageBinding();
+ KafkaAsyncOperationBinding.KafkaAsyncMessageBinding messageBinding = bindingAnnotation.messageBinding();
KafkaMessageBinding.KafkaMessageBindingBuilder kafkaMessageBindingBuilder = KafkaMessageBinding.builder();
@@ -53,7 +52,7 @@ private String resolveOrNull(String stringValue) {
return StringUtils.hasText(stringValue) ? resolver.resolveStringValue(stringValue) : null;
}
- private Schema resolveSchemaOrNull(KafkaAsyncMessageBinding messageBinding) {
+ private Schema resolveSchemaOrNull(KafkaAsyncOperationBinding.KafkaAsyncMessageBinding messageBinding) {
Schema schemaDefinition = null;
switch (messageBinding.key().type()) {
case UNDEFINED_KEY:
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/KafkaOperationBindingProcessor.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaOperationBindingProcessor.java
similarity index 66%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/KafkaOperationBindingProcessor.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaOperationBindingProcessor.java
index 315583896..faf7db616 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/KafkaOperationBindingProcessor.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaOperationBindingProcessor.java
@@ -1,11 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.kafka.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.KafkaListenerUtil;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.processor.AbstractOperationBindingProcessor;
+import io.github.springwolf.plugins.kafka.scanners.channels.annotation.KafkaListenerUtil;
+import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
import org.springframework.util.StringUtils;
public class KafkaOperationBindingProcessor extends AbstractOperationBindingProcessor {
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/KafkaListenerUtil.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/channels/annotation/KafkaListenerUtil.java
similarity index 77%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/KafkaListenerUtil.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/channels/annotation/KafkaListenerUtil.java
index 60e17698b..a635d18f0 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/KafkaListenerUtil.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/channels/annotation/KafkaListenerUtil.java
@@ -1,15 +1,15 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.Schema;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaObject;
-import io.github.stavshamir.springwolf.asyncapi.v3.model.schema.SchemaType;
+package io.github.springwolf.plugins.kafka.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
+import io.github.springwolf.asyncapi.v3.model.schema.Schema;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
+import io.github.springwolf.asyncapi.v3.model.schema.SchemaType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.kafka.annotation.KafkaListener;
import org.springframework.lang.Nullable;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/KafkaAsyncOperationBinding.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/channels/operationdata/annotation/KafkaAsyncOperationBinding.java
similarity index 79%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/KafkaAsyncOperationBinding.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/channels/operationdata/annotation/KafkaAsyncOperationBinding.java
index 839ee461d..59de67bcf 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/KafkaAsyncOperationBinding.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/scanners/channels/operationdata/annotation/KafkaAsyncOperationBinding.java
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation;
+package io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/KafkaConsumerData.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/KafkaConsumerData.java
similarity index 63%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/KafkaConsumerData.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/KafkaConsumerData.java
index 90df87a94..fd21cc5ac 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/KafkaConsumerData.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/KafkaConsumerData.java
@@ -1,10 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types;
+package io.github.springwolf.plugins.kafka.types;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
+import io.github.springwolf.core.asyncapi.types.ConsumerData;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
import lombok.Builder;
import java.util.Map;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/KafkaProducerData.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/KafkaProducerData.java
similarity index 63%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/KafkaProducerData.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/KafkaProducerData.java
index 4f7ae264e..ae4dbd348 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/KafkaProducerData.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/KafkaProducerData.java
@@ -1,10 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types;
+package io.github.springwolf.plugins.kafka.types;
-import io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header.AsyncHeaders;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
+import io.github.springwolf.core.asyncapi.types.ProducerData;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
import lombok.Builder;
import java.util.Map;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersForKafkaBuilder.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/channel/operation/message/header/AsyncHeadersForKafkaBuilder.java
similarity index 58%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersForKafkaBuilder.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/channel/operation/message/header/AsyncHeadersForKafkaBuilder.java
index d863576f2..185b2a4b9 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersForKafkaBuilder.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/channel/operation/message/header/AsyncHeadersForKafkaBuilder.java
@@ -1,5 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header;
+package io.github.springwolf.plugins.kafka.types.channel.operation.message.header;
+
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeadersBuilder;
public class AsyncHeadersForKafkaBuilder implements AsyncHeadersBuilder {
@Override
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersForSpringKafkaBuilder.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/channel/operation/message/header/AsyncHeadersForSpringKafkaBuilder.java
similarity index 84%
rename from springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersForSpringKafkaBuilder.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/channel/operation/message/header/AsyncHeadersForSpringKafkaBuilder.java
index 7bb495feb..1950f4c3c 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/types/channel/operation/message/header/AsyncHeadersForSpringKafkaBuilder.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/types/channel/operation/message/header/AsyncHeadersForSpringKafkaBuilder.java
@@ -1,6 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.types.channel.operation.message.header;
+package io.github.springwolf.plugins.kafka.types.channel.operation.message.header;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaderSchema;
+import io.github.springwolf.core.asyncapi.types.channel.operation.message.header.AsyncHeaders;
import org.springframework.kafka.support.mapping.AbstractJavaTypeMapper;
import java.util.List;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springwolf-plugins/springwolf-kafka-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 41ec4e3da..316fdd556 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-io.github.stavshamir.springwolf.asyncapi.kafka.SpringwolfKafkaAutoConfiguration
+io.github.springwolf.plugins.kafka.configuration.SpringwolfKafkaAutoConfiguration
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/configuration/ObjectMapperTestConfiguration.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/configuration/ObjectMapperTestConfiguration.java
new file mode 100644
index 000000000..9f5c8820b
--- /dev/null
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/configuration/ObjectMapperTestConfiguration.java
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+package io.github.springwolf.plugins.kafka.configuration;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+
+@TestConfiguration
+public class ObjectMapperTestConfiguration {
+
+ @ConditionalOnMissingBean
+ @Bean
+ public ObjectMapper objectMapper() {
+ return new ObjectMapper();
+ }
+}
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaProducerConfigurationIntegrationTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaProducerConfigurationIntegrationTest.java
similarity index 81%
rename from springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaProducerConfigurationIntegrationTest.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaProducerConfigurationIntegrationTest.java
index c4fc69f9b..0f08b5463 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfKafkaProducerConfigurationIntegrationTest.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/configuration/SpringwolfKafkaProducerConfigurationIntegrationTest.java
@@ -1,13 +1,13 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
+package io.github.springwolf.plugins.kafka.configuration;
-import io.github.stavshamir.springwolf.asyncapi.controller.PublishingPayloadCreator;
-import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfKafkaController;
-import io.github.stavshamir.springwolf.asyncapi.kafka.SpringwolfKafkaAutoConfiguration;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
-import io.github.stavshamir.springwolf.producer.SpringwolfKafkaProducer;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.SpringwolfClassScanner;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.plugins.kafka.controller.SpringwolfKafkaController;
+import io.github.springwolf.plugins.kafka.producer.SpringwolfKafkaProducer;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -37,7 +37,7 @@ public class SpringwolfKafkaProducerConfigurationIntegrationTest {
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.plugins.kafka",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
"springwolf.plugin.kafka.publishing.enabled=true"
@@ -76,7 +76,7 @@ void springwolfKafkaTemplateShouldBePresentInSpringContext() {
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.plugins.kafka",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
"springwolf.plugin.kafka.publishing.enabled=false"
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfKafkaControllerIntegrationTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/controller/SpringwolfKafkaControllerIntegrationTest.java
similarity index 86%
rename from springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfKafkaControllerIntegrationTest.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/controller/SpringwolfKafkaControllerIntegrationTest.java
index 63c3c4974..1d3bd0b3b 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfKafkaControllerIntegrationTest.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/controller/SpringwolfKafkaControllerIntegrationTest.java
@@ -1,16 +1,17 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.controller;
+package io.github.springwolf.plugins.kafka.controller;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigProperties;
-import io.github.stavshamir.springwolf.producer.SpringwolfKafkaProducer;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
-import io.github.stavshamir.springwolf.schemas.DefaultComponentsService;
-import io.github.stavshamir.springwolf.schemas.SwaggerSchemaUtil;
-import io.github.stavshamir.springwolf.schemas.example.DefaultSchemaWalker;
-import io.github.stavshamir.springwolf.schemas.example.ExampleJsonValueGenerator;
-import io.github.stavshamir.springwolf.schemas.example.SchemaWalkerProvider;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.core.schemas.DefaultComponentsService;
+import io.github.springwolf.core.schemas.SwaggerSchemaUtil;
+import io.github.springwolf.core.schemas.example.DefaultSchemaWalker;
+import io.github.springwolf.core.schemas.example.ExampleJsonValueGenerator;
+import io.github.springwolf.core.schemas.example.SchemaWalkerProvider;
+import io.github.springwolf.plugins.kafka.producer.SpringwolfKafkaProducer;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -55,7 +56,7 @@
})
@TestPropertySource(
properties = {
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.asyncapi",
+ "springwolf.docket.base-package=io.github.springwolf.plugins.kafka",
"springwolf.docket.info.title=Title",
"springwolf.docket.info.version=1.0",
"springwolf.docket.servers.kafka.protocol=kafka",
@@ -151,7 +152,7 @@ void testControllerShouldCallKafkaProducerIfOnlyPayloadIsSend() throws Exception
"bindings": null,
"headers": null,
"payload": "{ \\"some-payload-key\\" : \\"some-payload-value\\" }",
- "payloadType": "io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfKafkaControllerIntegrationTest$PayloadDto"
+ "payloadType": "io.github.springwolf.plugins.kafka.controller.SpringwolfKafkaControllerIntegrationTest$PayloadDto"
}""";
mvc.perform(post("/springwolf/kafka/publish")
@@ -177,7 +178,7 @@ void testControllerShouldCallKafkaProducerIfPayloadAndHeadersAreSend() throws Ex
"some-header-key": "some-header-value"
},
"payload": "{ \\"some-payload-key\\" : \\"some-payload-value\\" }",
- "payloadType": "io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfKafkaControllerIntegrationTest$PayloadDto"
+ "payloadType": "io.github.springwolf.plugins.kafka.controller.SpringwolfKafkaControllerIntegrationTest$PayloadDto"
}
""";
@@ -207,7 +208,7 @@ void testControllerShouldCallKafkaProducerIfPayloadAndHeadersAndBindingsAreSend(
"some-header-key": "some-header-value"
},
"payload": "{ \\"some-payload-key\\" : \\"some-payload-value\\" }",
- "payloadType": "io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfKafkaControllerIntegrationTest$PayloadDto"
+ "payloadType": "io.github.springwolf.plugins.kafka.controller.SpringwolfKafkaControllerIntegrationTest$PayloadDto"
}""";
mvc.perform(post("/springwolf/kafka/publish?topic=test-topic")
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaProducerTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaProducerTest.java
similarity index 98%
rename from springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaProducerTest.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaProducerTest.java
index 97f60f7c8..72aeff4e2 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaProducerTest.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaProducerTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.producer;
+package io.github.springwolf.plugins.kafka.producer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.header.Header;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaTemplateFromPropertiesTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateFromPropertiesTest.java
similarity index 94%
rename from springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaTemplateFromPropertiesTest.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateFromPropertiesTest.java
index 47678c009..c69164231 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfKafkaTemplateFromPropertiesTest.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/producer/SpringwolfKafkaTemplateFromPropertiesTest.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.producer;
+package io.github.springwolf.plugins.kafka.producer;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfKafkaConfigProperties;
+import io.github.springwolf.plugins.kafka.properties.SpringwolfKafkaConfigProperties;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
import org.springframework.boot.ssl.DefaultSslBundleRegistry;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/KafkaMessageBindingProcessorTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaMessageBindingProcessorTest.java
similarity index 75%
rename from springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/KafkaMessageBindingProcessorTest.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaMessageBindingProcessorTest.java
index ac5297d34..97e43acd7 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/KafkaMessageBindingProcessorTest.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaMessageBindingProcessorTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.kafka.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedMessageBinding;
+import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
import org.junit.jupiter.api.Test;
import java.lang.reflect.Method;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/KafkaOperationBindingProcessorTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaOperationBindingProcessorTest.java
similarity index 69%
rename from springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/KafkaOperationBindingProcessorTest.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaOperationBindingProcessorTest.java
index 54a5bf154..fc6d13d5e 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/KafkaOperationBindingProcessorTest.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/bindings/processor/KafkaOperationBindingProcessorTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.kafka.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.plugins.kafka.scanners.channels.operationdata.annotation.KafkaAsyncOperationBinding;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/KafkaListenerUtilTest.java b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/channels/annotation/KafkaListenerUtilTest.java
similarity index 83%
rename from springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/KafkaListenerUtilTest.java
rename to springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/channels/annotation/KafkaListenerUtilTest.java
index ac3b9a8bb..45406fc58 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/KafkaListenerUtilTest.java
+++ b/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/springwolf/plugins/kafka/scanners/channels/annotation/KafkaListenerUtilTest.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
-
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
+package io.github.springwolf.plugins.kafka.scanners.channels.annotation;
+
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.kafka.KafkaOperationBinding;
import org.assertj.core.util.Arrays;
import org.assertj.core.util.Sets;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sns/SpringwolfSnsAutoConfiguration.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsAutoConfiguration.java
similarity index 76%
rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sns/SpringwolfSnsAutoConfiguration.java
rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsAutoConfiguration.java
index c5e823d93..fce173610 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sns/SpringwolfSnsAutoConfiguration.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsAutoConfiguration.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.sns;
+package io.github.springwolf.plugins.sns.configuration;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfSnsConfigProperties;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants;
+import io.github.springwolf.plugins.sns.properties.SpringwolfSnsConfigProperties;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sns/SpringwolfSnsProducerConfiguration.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfiguration.java
similarity index 66%
rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sns/SpringwolfSnsProducerConfiguration.java
rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfiguration.java
index 9d01cdd00..0efc881df 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sns/SpringwolfSnsProducerConfiguration.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfiguration.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.sns;
+package io.github.springwolf.plugins.sns.configuration;
import io.awspring.cloud.sns.core.SnsTemplate;
-import io.github.stavshamir.springwolf.asyncapi.controller.PublishingPayloadCreator;
-import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfSnsController;
-import io.github.stavshamir.springwolf.producer.SpringwolfSnsProducer;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.plugins.sns.controller.SpringwolfSnsController;
+import io.github.springwolf.plugins.sns.producer.SpringwolfSnsProducer;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
@@ -12,8 +12,8 @@
import java.util.List;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfSnsConfigConstants.SPRINGWOLF_SNS_CONFIG_PREFIX;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfSnsConfigConstants.SPRINGWOLF_SNS_PLUGIN_PUBLISHING_ENABLED;
+import static io.github.springwolf.plugins.sns.properties.SpringwolfSnsConfigConstants.SPRINGWOLF_SNS_CONFIG_PREFIX;
+import static io.github.springwolf.plugins.sns.properties.SpringwolfSnsConfigConstants.SPRINGWOLF_SNS_PLUGIN_PUBLISHING_ENABLED;
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sns/SpringwolfSnsScannerConfiguration.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsScannerConfiguration.java
similarity index 71%
rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sns/SpringwolfSnsScannerConfiguration.java
rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsScannerConfiguration.java
index 34d0f7baa..fc3481036 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sns/SpringwolfSnsScannerConfiguration.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsScannerConfiguration.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.sns;
+package io.github.springwolf.plugins.sns.configuration;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingProcessorPriority;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.SnsMessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.SnsOperationBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingProcessorPriority;
+import io.github.springwolf.plugins.sns.scanners.channels.operationdata.SnsMessageBindingProcessor;
+import io.github.springwolf.plugins.sns.scanners.channels.operationdata.SnsOperationBindingProcessor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfSnsController.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/controller/SpringwolfSnsController.java
similarity index 73%
rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfSnsController.java
rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/controller/SpringwolfSnsController.java
index da564d990..33fcd5bdf 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfSnsController.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/controller/SpringwolfSnsController.java
@@ -1,8 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.controller;
+package io.github.springwolf.plugins.sns.controller;
-import io.github.stavshamir.springwolf.asyncapi.controller.dtos.MessageDto;
-import io.github.stavshamir.springwolf.producer.SpringwolfSnsProducer;
+import io.github.springwolf.core.asyncapi.controller.PublishingBaseController;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.core.asyncapi.controller.dtos.MessageDto;
+import io.github.springwolf.plugins.sns.producer.SpringwolfSnsProducer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfSnsProducer.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/producer/SpringwolfSnsProducer.java
similarity index 94%
rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfSnsProducer.java
rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/producer/SpringwolfSnsProducer.java
index ecb927208..58052b194 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfSnsProducer.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/producer/SpringwolfSnsProducer.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.producer;
+package io.github.springwolf.plugins.sns.producer;
import io.awspring.cloud.sns.core.SnsTemplate;
import lombok.extern.slf4j.Slf4j;
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfSnsConfigConstants.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/properties/SpringwolfSnsConfigConstants.java
similarity index 59%
rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfSnsConfigConstants.java
rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/properties/SpringwolfSnsConfigConstants.java
index a913de685..4e913be4d 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfSnsConfigConstants.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/properties/SpringwolfSnsConfigConstants.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration.properties;
+package io.github.springwolf.plugins.sns.properties;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX;
public class SpringwolfSnsConfigConstants {
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfSnsConfigProperties.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/properties/SpringwolfSnsConfigProperties.java
similarity index 95%
rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfSnsConfigProperties.java
rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/properties/SpringwolfSnsConfigProperties.java
index 5997c338a..4d6de2a82 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfSnsConfigProperties.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/properties/SpringwolfSnsConfigProperties.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration.properties;
+package io.github.springwolf.plugins.sns.properties;
import lombok.Getter;
import lombok.Setter;
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/SnsMessageBindingProcessor.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsMessageBindingProcessor.java
similarity index 69%
rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/SnsMessageBindingProcessor.java
rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsMessageBindingProcessor.java
index 74274e933..e1834f48d 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/SnsMessageBindingProcessor.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsMessageBindingProcessor.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata;
+package io.github.springwolf.plugins.sns.scanners.channels.operationdata;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.MessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns.SNSMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.sns.SNSMessageBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.MessageBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedMessageBinding;
+import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding;
import org.springframework.context.EmbeddedValueResolverAware;
import org.springframework.util.StringValueResolver;
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/SnsOperationBindingProcessor.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsOperationBindingProcessor.java
similarity index 68%
rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/SnsOperationBindingProcessor.java
rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsOperationBindingProcessor.java
index 8f0ae4904..b9fd21579 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/SnsOperationBindingProcessor.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsOperationBindingProcessor.java
@@ -1,13 +1,13 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.AbstractOperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SnsAsyncOperationBindingIdentifier;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns.SNSOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingConsumer;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingIdentifier;
+package io.github.springwolf.plugins.sns.scanners.channels.operationdata;
+
+import io.github.springwolf.asyncapi.v3.bindings.sns.SNSOperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingConsumer;
+import io.github.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingIdentifier;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.processor.AbstractOperationBindingProcessor;
+import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding;
+import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBindingIdentifier;
import java.util.List;
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/SnsAsyncOperationBinding.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/annotation/SnsAsyncOperationBinding.java
similarity index 67%
rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/SnsAsyncOperationBinding.java
rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/annotation/SnsAsyncOperationBinding.java
index 18b7a6570..cbdafb56c 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/SnsAsyncOperationBinding.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/annotation/SnsAsyncOperationBinding.java
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation;
+package io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/SnsAsyncOperationBindingIdentifier.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/annotation/SnsAsyncOperationBindingIdentifier.java
similarity index 87%
rename from springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/SnsAsyncOperationBindingIdentifier.java
rename to springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/annotation/SnsAsyncOperationBindingIdentifier.java
index 10f58c692..4f3224582 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/SnsAsyncOperationBindingIdentifier.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/annotation/SnsAsyncOperationBindingIdentifier.java
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation;
+package io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingIdentifier;
+import io.github.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingIdentifier;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springwolf-plugins/springwolf-sns-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 27cdeb7d7..7d5da23cc 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/springwolf-plugins/springwolf-sns-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-io.github.stavshamir.springwolf.asyncapi.sns.SpringwolfSnsAutoConfiguration
+io.github.springwolf.plugins.sns.configuration.SpringwolfSnsAutoConfiguration
diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/configuration/ObjectMapperTestConfiguration.java
similarity index 89%
rename from springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java
rename to springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/configuration/ObjectMapperTestConfiguration.java
index 6e87c75f9..5736cf1c5 100644
--- a/springwolf-plugins/springwolf-kafka-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/configuration/ObjectMapperTestConfiguration.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
+package io.github.springwolf.plugins.sns.configuration;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfSnsProducerConfigurationIntegrationTest.java b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfigurationIntegrationTest.java
similarity index 80%
rename from springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfSnsProducerConfigurationIntegrationTest.java
rename to springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfigurationIntegrationTest.java
index 9af9f69af..d60c73a66 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfSnsProducerConfigurationIntegrationTest.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/configuration/SpringwolfSnsProducerConfigurationIntegrationTest.java
@@ -1,16 +1,16 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
+package io.github.springwolf.plugins.sns.configuration;
import io.awspring.cloud.sns.core.SnsTemplate;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
-import io.github.stavshamir.springwolf.asyncapi.ChannelsService;
-import io.github.stavshamir.springwolf.asyncapi.controller.PublishingPayloadCreator;
-import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfSnsController;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.sns.SpringwolfSnsAutoConfiguration;
-import io.github.stavshamir.springwolf.producer.SpringwolfSnsProducer;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
+import io.github.springwolf.core.asyncapi.ChannelsService;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.SpringwolfClassScanner;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.plugins.sns.controller.SpringwolfSnsController;
+import io.github.springwolf.plugins.sns.producer.SpringwolfSnsProducer;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -39,7 +39,7 @@ public class SpringwolfSnsProducerConfigurationIntegrationTest {
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.examples",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
"springwolf.plugin.sns.publishing.enabled=true"
@@ -80,7 +80,7 @@ void springwolfSqsProducerShouldBePresentInSpringContext() {
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.examples",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
"springwolf.plugin.sns.publishing.enabled=false"
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfSnsProducerTest.java b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/producer/SpringwolfSnsProducerTest.java
similarity index 95%
rename from springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfSnsProducerTest.java
rename to springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/producer/SpringwolfSnsProducerTest.java
index b6b3bef21..e56a03f3a 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfSnsProducerTest.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/producer/SpringwolfSnsProducerTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.producer;
+package io.github.springwolf.plugins.sns.producer;
import io.awspring.cloud.sns.core.SnsTemplate;
import org.junit.jupiter.api.BeforeEach;
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/SnsMessageBindingProcessorTest.java b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsMessageBindingProcessorTest.java
similarity index 70%
rename from springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/SnsMessageBindingProcessorTest.java
rename to springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsMessageBindingProcessorTest.java
index a948af451..3c3412494 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/SnsMessageBindingProcessorTest.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsMessageBindingProcessorTest.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata;
+package io.github.springwolf.plugins.sns.scanners.channels.operationdata;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SnsAsyncOperationBindingIdentifier;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns.SNSMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.sns.SNSMessageBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedMessageBinding;
+import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding;
+import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBindingIdentifier;
import org.junit.jupiter.api.Test;
import java.lang.reflect.Method;
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/SnsOperationBindingProcessorTest.java b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsOperationBindingProcessorTest.java
similarity index 66%
rename from springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/SnsOperationBindingProcessorTest.java
rename to springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsOperationBindingProcessorTest.java
index 62c4b1bd8..8286772f2 100644
--- a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/SnsOperationBindingProcessorTest.java
+++ b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/springwolf/plugins/sns/scanners/channels/operationdata/SnsOperationBindingProcessorTest.java
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata;
-
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SnsAsyncOperationBindingIdentifier;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns.SNSOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingConsumer;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingIdentifier;
+package io.github.springwolf.plugins.sns.scanners.channels.operationdata;
+
+import io.github.springwolf.asyncapi.v3.bindings.sns.SNSOperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingConsumer;
+import io.github.springwolf.asyncapi.v3.bindings.sns.SNSOperationBindingIdentifier;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBinding;
+import io.github.springwolf.plugins.sns.scanners.channels.operationdata.annotation.SnsAsyncOperationBindingIdentifier;
import org.junit.jupiter.api.Test;
import java.util.List;
diff --git a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java b/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java
deleted file mode 100644
index 6e87c75f9..000000000
--- a/springwolf-plugins/springwolf-sns-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.context.annotation.Bean;
-
-@TestConfiguration
-public class ObjectMapperTestConfiguration {
-
- @ConditionalOnMissingBean
- @Bean
- public ObjectMapper objectMapper() {
- return new ObjectMapper();
- }
-}
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sqs/SpringwolfSqsAutoConfiguration.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsAutoConfiguration.java
similarity index 76%
rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sqs/SpringwolfSqsAutoConfiguration.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsAutoConfiguration.java
index e5b0707ab..7ad8945db 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sqs/SpringwolfSqsAutoConfiguration.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsAutoConfiguration.java
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.sqs;
+package io.github.springwolf.plugins.sqs.configuration;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants;
-import io.github.stavshamir.springwolf.configuration.properties.SpringwolfSqsConfigProperties;
+import io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants;
+import io.github.springwolf.plugins.sqs.properties.SpringwolfSqsConfigProperties;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sqs/SpringwolfSqsProducerConfiguration.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsProducerConfiguration.java
similarity index 66%
rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sqs/SpringwolfSqsProducerConfiguration.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsProducerConfiguration.java
index 3bc8ef672..b294ce740 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sqs/SpringwolfSqsProducerConfiguration.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsProducerConfiguration.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.sqs;
+package io.github.springwolf.plugins.sqs.configuration;
import io.awspring.cloud.sqs.operations.SqsTemplate;
-import io.github.stavshamir.springwolf.asyncapi.controller.PublishingPayloadCreator;
-import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfSqsController;
-import io.github.stavshamir.springwolf.producer.SpringwolfSqsProducer;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.plugins.sqs.controller.SpringwolfSqsController;
+import io.github.springwolf.plugins.sqs.producer.SpringwolfSqsProducer;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
@@ -12,8 +12,8 @@
import java.util.List;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfSqsConfigConstants.SPRINGWOLF_SQS_CONFIG_PREFIX;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfSqsConfigConstants.SPRINGWOLF_SQS_PLUGIN_PUBLISHING_ENABLED;
+import static io.github.springwolf.plugins.sqs.properties.SpringwolfSqsConfigConstants.SPRINGWOLF_SQS_CONFIG_PREFIX;
+import static io.github.springwolf.plugins.sqs.properties.SpringwolfSqsConfigConstants.SPRINGWOLF_SQS_PLUGIN_PUBLISHING_ENABLED;
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sqs/SpringwolfSqsScannerConfiguration.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsScannerConfiguration.java
similarity index 67%
rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sqs/SpringwolfSqsScannerConfiguration.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsScannerConfiguration.java
index 3d4bd728b..8318c39fb 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/sqs/SpringwolfSqsScannerConfiguration.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsScannerConfiguration.java
@@ -1,26 +1,26 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.sqs;
+package io.github.springwolf.plugins.sqs.configuration;
import io.awspring.cloud.sqs.annotation.SqsListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.BindingProcessorPriority;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.SqsBindingFactory;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.SqsMessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor.SqsOperationBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.ChannelPriority;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.SimpleChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.SimpleOperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.MethodLevelAnnotationOperationsScanner;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingProcessorPriority;
+import io.github.springwolf.core.asyncapi.scanners.channels.ChannelPriority;
+import io.github.springwolf.core.asyncapi.scanners.channels.SimpleChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.SimpleOperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.MethodLevelAnnotationChannelsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.MethodLevelAnnotationOperationsScanner;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.SpringwolfClassScanner;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.plugins.sqs.scanners.bindings.SqsBindingFactory;
+import io.github.springwolf.plugins.sqs.scanners.bindings.processor.SqsMessageBindingProcessor;
+import io.github.springwolf.plugins.sqs.scanners.bindings.processor.SqsOperationBindingProcessor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfSqsConfigConstants.SPRINGWOLF_SCANNER_SQS_LISTENER_ENABLED;
+import static io.github.springwolf.plugins.sqs.properties.SpringwolfSqsConfigConstants.SPRINGWOLF_SCANNER_SQS_LISTENER_ENABLED;
/**
* spring configuration defining the scanner beans for the kafka plugin
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfSqsController.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/controller/SpringwolfSqsController.java
similarity index 71%
rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfSqsController.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/controller/SpringwolfSqsController.java
index 6cf61890c..ef0679a97 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/controller/SpringwolfSqsController.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/controller/SpringwolfSqsController.java
@@ -1,8 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.controller;
+package io.github.springwolf.plugins.sqs.controller;
-import io.github.stavshamir.springwolf.asyncapi.controller.dtos.MessageDto;
-import io.github.stavshamir.springwolf.producer.SpringwolfSqsProducer;
+import io.github.springwolf.core.asyncapi.controller.PublishingBaseController;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.core.asyncapi.controller.dtos.MessageDto;
+import io.github.springwolf.plugins.sqs.producer.SpringwolfSqsProducer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfSqsProducer.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/producer/SpringwolfSqsProducer.java
similarity index 93%
rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfSqsProducer.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/producer/SpringwolfSqsProducer.java
index 5d70ce31e..f91ecfb52 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/producer/SpringwolfSqsProducer.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/producer/SpringwolfSqsProducer.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.producer;
+package io.github.springwolf.plugins.sqs.producer;
import io.awspring.cloud.sqs.operations.SqsTemplate;
import lombok.extern.slf4j.Slf4j;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfSqsConfigConstants.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/properties/SpringwolfSqsConfigConstants.java
similarity index 52%
rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfSqsConfigConstants.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/properties/SpringwolfSqsConfigConstants.java
index 1abf1d679..f73bdbb7a 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfSqsConfigConstants.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/properties/SpringwolfSqsConfigConstants.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration.properties;
+package io.github.springwolf.plugins.sqs.properties;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.ENABLED;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SCANNER;
-import static io.github.stavshamir.springwolf.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.ENABLED;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.SCANNER;
+import static io.github.springwolf.core.configuration.properties.SpringwolfConfigConstants.SPRINGWOLF_PLUGIN_CONFIG_PREFIX;
public class SpringwolfSqsConfigConstants {
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfSqsConfigProperties.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/properties/SpringwolfSqsConfigProperties.java
similarity index 95%
rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfSqsConfigProperties.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/properties/SpringwolfSqsConfigProperties.java
index b7ec8e706..ae2a7c824 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/configuration/properties/SpringwolfSqsConfigProperties.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/properties/SpringwolfSqsConfigProperties.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration.properties;
+package io.github.springwolf.plugins.sqs.properties;
import lombok.Getter;
import lombok.Setter;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/SqsBindingFactory.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/SqsBindingFactory.java
similarity index 75%
rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/SqsBindingFactory.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/SqsBindingFactory.java
index 1e3261a3f..080000a20 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/SqsBindingFactory.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/SqsBindingFactory.java
@@ -1,11 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings;
+package io.github.springwolf.plugins.sqs.scanners.bindings;
import io.awspring.cloud.sqs.annotation.SqsListener;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.SqsListenerUtil;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.BindingFactory;
+import io.github.springwolf.plugins.sqs.scanners.channels.annotation.SqsListenerUtil;
import lombok.NoArgsConstructor;
import org.springframework.context.EmbeddedValueResolverAware;
import org.springframework.util.StringValueResolver;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsMessageBindingProcessor.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsMessageBindingProcessor.java
similarity index 71%
rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsMessageBindingProcessor.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsMessageBindingProcessor.java
index 0d3366056..f203f4153 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsMessageBindingProcessor.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsMessageBindingProcessor.java
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.sqs.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.MessageBindingProcessor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SqsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs.SQSMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSMessageBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.MessageBindingProcessor;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedMessageBinding;
+import io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation.SqsAsyncOperationBinding;
import org.springframework.context.EmbeddedValueResolverAware;
import org.springframework.util.StringValueResolver;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsOperationBindingProcessor.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsOperationBindingProcessor.java
similarity index 57%
rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsOperationBindingProcessor.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsOperationBindingProcessor.java
index 76b1b4d1d..8f81692fe 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsOperationBindingProcessor.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsOperationBindingProcessor.java
@@ -1,11 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.sqs.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SqsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SqsAsyncQueueBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs.SQSChannelBindingQueue;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs.SQSOperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSChannelBindingQueue;
+import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.processor.AbstractOperationBindingProcessor;
+import io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation.SqsAsyncOperationBinding;
+import io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation.SqsAsyncQueueBinding;
import java.util.ArrayList;
import java.util.List;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/SqsListenerUtil.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/annotation/SqsListenerUtil.java
similarity index 78%
rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/SqsListenerUtil.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/annotation/SqsListenerUtil.java
index 9c43b2bae..0aee49ea5 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/SqsListenerUtil.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/annotation/SqsListenerUtil.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
+package io.github.springwolf.plugins.sqs.scanners.channels.annotation;
import io.awspring.cloud.sqs.annotation.SqsListener;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs.SQSChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs.SQSChannelBindingQueue;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs.SQSMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs.SQSOperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSChannelBindingQueue;
+import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSOperationBinding;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringValueResolver;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/SqsAsyncOperationBinding.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/operationdata/annotation/SqsAsyncOperationBinding.java
similarity index 65%
rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/SqsAsyncOperationBinding.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/operationdata/annotation/SqsAsyncOperationBinding.java
index 69d1fed04..059508f84 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/SqsAsyncOperationBinding.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/operationdata/annotation/SqsAsyncOperationBinding.java
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation;
+package io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.annotation.AsyncOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncListener;
+import io.github.springwolf.core.asyncapi.scanners.channels.operationdata.annotation.AsyncPublisher;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/SqsAsyncQueueBinding.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/operationdata/annotation/SqsAsyncQueueBinding.java
similarity index 83%
rename from springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/SqsAsyncQueueBinding.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/operationdata/annotation/SqsAsyncQueueBinding.java
index 5e34b2548..1d50008ab 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/operationdata/annotation/SqsAsyncQueueBinding.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/scanners/channels/operationdata/annotation/SqsAsyncQueueBinding.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation;
+package io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springwolf-plugins/springwolf-sqs-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 8c1900109..8f58a2ab1 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-io.github.stavshamir.springwolf.asyncapi.sqs.SpringwolfSqsAutoConfiguration
+io.github.springwolf.plugins.sqs.configuration.SpringwolfSqsAutoConfiguration
diff --git a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/configuration/ObjectMapperTestConfiguration.java
similarity index 89%
rename from springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/configuration/ObjectMapperTestConfiguration.java
index 6e87c75f9..323948866 100644
--- a/springwolf-plugins/springwolf-jms-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/configuration/ObjectMapperTestConfiguration.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
+package io.github.springwolf.plugins.sqs.configuration;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfSqsProducerConfigurationIntegrationTest.java b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsProducerConfigurationIntegrationTest.java
similarity index 80%
rename from springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfSqsProducerConfigurationIntegrationTest.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsProducerConfigurationIntegrationTest.java
index 41e7f841c..3413763cc 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/SpringwolfSqsProducerConfigurationIntegrationTest.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsProducerConfigurationIntegrationTest.java
@@ -1,16 +1,16 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
+package io.github.springwolf.plugins.sqs.configuration;
import io.awspring.cloud.sqs.operations.SqsTemplate;
-import io.github.stavshamir.springwolf.asyncapi.AsyncApiService;
-import io.github.stavshamir.springwolf.asyncapi.ChannelsService;
-import io.github.stavshamir.springwolf.asyncapi.controller.PublishingPayloadCreator;
-import io.github.stavshamir.springwolf.asyncapi.controller.SpringwolfSqsController;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.payload.PayloadClassExtractor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.classes.SpringwolfClassScanner;
-import io.github.stavshamir.springwolf.asyncapi.sqs.SpringwolfSqsAutoConfiguration;
-import io.github.stavshamir.springwolf.producer.SpringwolfSqsProducer;
-import io.github.stavshamir.springwolf.schemas.ComponentsService;
+import io.github.springwolf.core.asyncapi.AsyncApiService;
+import io.github.springwolf.core.asyncapi.ChannelsService;
+import io.github.springwolf.core.asyncapi.controller.PublishingPayloadCreator;
+import io.github.springwolf.core.asyncapi.scanners.channels.payload.PayloadClassExtractor;
+import io.github.springwolf.core.asyncapi.scanners.classes.SpringwolfClassScanner;
+import io.github.springwolf.core.configuration.AsyncApiDocketService;
+import io.github.springwolf.core.schemas.ComponentsService;
+import io.github.springwolf.plugins.sqs.controller.SpringwolfSqsController;
+import io.github.springwolf.plugins.sqs.producer.SpringwolfSqsProducer;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -39,7 +39,7 @@ public class SpringwolfSqsProducerConfigurationIntegrationTest {
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.examples",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
"springwolf.plugin.sqs.publishing.enabled=true"
@@ -80,7 +80,7 @@ void springwolfSqsProducerShouldBePresentInSpringContext() {
"springwolf.enabled=true",
"springwolf.docket.info.title=Info title was loaded from spring properties",
"springwolf.docket.info.version=1.0.0",
- "springwolf.docket.base-package=io.github.stavshamir.springwolf.example",
+ "springwolf.docket.base-package=io.github.springwolf.examples",
"springwolf.docket.servers.test-protocol.protocol=test",
"springwolf.docket.servers.test-protocol.host=some-server:1234",
"springwolf.plugin.sqs.publishing.enabled=false"
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfSqsProducerTest.java b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/producer/SpringwolfSqsProducerTest.java
similarity index 95%
rename from springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfSqsProducerTest.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/producer/SpringwolfSqsProducerTest.java
index b04db641c..ec49d5317 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/producer/SpringwolfSqsProducerTest.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/producer/SpringwolfSqsProducerTest.java
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.producer;
+package io.github.springwolf.plugins.sqs.producer;
import io.awspring.cloud.sqs.operations.SqsTemplate;
import org.junit.jupiter.api.BeforeEach;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsMessageBindingProcessorTest.java b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsMessageBindingProcessorTest.java
similarity index 75%
rename from springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsMessageBindingProcessorTest.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsMessageBindingProcessorTest.java
index 3f1d4a36a..e190f10e7 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsMessageBindingProcessorTest.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsMessageBindingProcessorTest.java
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.sqs.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SqsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs.SQSMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSMessageBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedMessageBinding;
+import io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation.SqsAsyncOperationBinding;
import org.junit.jupiter.api.Test;
import java.lang.reflect.Method;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsOperationBindingProcessorTest.java b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsOperationBindingProcessorTest.java
similarity index 67%
rename from springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsOperationBindingProcessorTest.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsOperationBindingProcessorTest.java
index 1fd83fa88..087f6d168 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/bindings/processor/SqsOperationBindingProcessorTest.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/bindings/processor/SqsOperationBindingProcessorTest.java
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.bindings.processor;
+package io.github.springwolf.plugins.sqs.scanners.bindings.processor;
-import io.github.stavshamir.springwolf.asyncapi.scanners.bindings.ProcessedOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SqsAsyncOperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.scanners.channels.operationdata.annotation.SqsAsyncQueueBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs.SQSChannelBindingQueue;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs.SQSOperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSChannelBindingQueue;
+import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSOperationBinding;
+import io.github.springwolf.core.asyncapi.scanners.bindings.ProcessedOperationBinding;
+import io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation.SqsAsyncOperationBinding;
+import io.github.springwolf.plugins.sqs.scanners.channels.operationdata.annotation.SqsAsyncQueueBinding;
import org.junit.jupiter.api.Test;
import java.util.List;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/SqsListenerUtilTest.java b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/channels/annotation/SqsListenerUtilTest.java
similarity index 84%
rename from springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/SqsListenerUtilTest.java
rename to springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/channels/annotation/SqsListenerUtilTest.java
index cdffa7130..46610aae5 100644
--- a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/asyncapi/scanners/channels/annotation/SqsListenerUtilTest.java
+++ b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/scanners/channels/annotation/SqsListenerUtilTest.java
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.asyncapi.scanners.channels.annotation;
+package io.github.springwolf.plugins.sqs.scanners.channels.annotation;
import io.awspring.cloud.sqs.annotation.SqsListener;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.ChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.MessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.OperationBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs.SQSChannelBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs.SQSChannelBindingQueue;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs.SQSMessageBinding;
-import io.github.stavshamir.springwolf.asyncapi.v3.bindings.sqs.SQSOperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.ChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.MessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.OperationBinding;
+import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSChannelBinding;
+import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSChannelBindingQueue;
+import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSMessageBinding;
+import io.github.springwolf.asyncapi.v3.bindings.sqs.SQSOperationBinding;
import org.assertj.core.util.Sets;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java b/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java
deleted file mode 100644
index 6e87c75f9..000000000
--- a/springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/stavshamir/springwolf/configuration/ObjectMapperTestConfiguration.java
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-package io.github.stavshamir.springwolf.configuration;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.context.annotation.Bean;
-
-@TestConfiguration
-public class ObjectMapperTestConfiguration {
-
- @ConditionalOnMissingBean
- @Bean
- public ObjectMapper objectMapper() {
- return new ObjectMapper();
- }
-}