Reorganizing modules

Spring Boot autoconfiguration module
Samples module

build.gradle

@@ -240,11 +240,6 @@ project ('spring-pulsar') {
 	description = 'Spring Pulsar Support'
 
 	dependencies {
-		api "org.springframework.boot:spring-boot:$springBootVersion"
-		api "org.springframework.boot:spring-boot-autoconfigure:$springBootVersion"
-		api "org.springframework.boot:spring-boot-starter:$springBootVersion"
-		api "org.springframework.boot:spring-boot-starter-logging:$springBootVersion"
-		api "org.springframework.boot:spring-boot-starter-validation:$springBootVersion"
 		api 'org.springframework:spring-context'
 		api 'org.springframework:spring-messaging'
 		api 'org.springframework:spring-tx'
@@ -272,5 +267,30 @@ project ('spring-pulsar') {
 		testImplementation 'io.projectreactor:reactor-test'
 		testImplementation "org.mockito:mockito-junit-jupiter:$mockitoVersion"
 		testImplementation "org.hibernate.validator:hibernate-validator:$hibernateValidationVersion"
+
+		testImplementation project (':spring-pulsar-boot-autoconfigure')
 	}
 }
+
+project ('spring-pulsar-boot-autoconfigure') {
+	description = 'Spring Boot Pulsar Autoconfiguration'
+
+	dependencies {
+		api "org.springframework.boot:spring-boot:$springBootVersion"
+		api "org.springframework.boot:spring-boot-autoconfigure:$springBootVersion"
+		api "org.springframework.boot:spring-boot-starter:$springBootVersion"
+		api "org.springframework.boot:spring-boot-starter-logging:$springBootVersion"
+		api "org.springframework.boot:spring-boot-starter-validation:$springBootVersion"
+
+		api project (':spring-pulsar')
+	}
+}
+
+project ('spring-pulsar-sample-apps') {
+	description = 'Spring Pulsar Sample Applications'
+
+	dependencies {
+		api project (':spring-pulsar-boot-autoconfigure')
+	}
+}
+

settings.gradle

@@ -19,3 +19,5 @@ gradleEnterprise {
 rootProject.name = 'spring-pulsar-dist'
 
 include 'spring-pulsar'
+include 'spring-pulsar-boot-autoconfigure'
+include 'spring-pulsar-sample-apps'

spring-pulsar-boot-autoconfigure/src/main/java/org/springframework/pulsar/autoconfigure/PulsarAnnotationDrivenConfiguration.java

@@ -14,14 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.pulsar.autoconfig;
-
-import org.apache.pulsar.client.api.Schema;
+package org.springframework.pulsar.autoconfigure;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.PropertyMapper;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.pulsar.annotation.EnablePulsar;

spring-pulsar-boot-autoconfigure/src/main/java/org/springframework/pulsar/autoconfigure/PulsarAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.pulsar.autoconfig;
+package org.springframework.pulsar.autoconfigure;
 
 import org.apache.pulsar.client.api.PulsarClient;
 

spring-pulsar-boot-autoconfigure/src/main/java/org/springframework/pulsar/autoconfigure/PulsarProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.pulsar.autoconfig;
+package org.springframework.pulsar.autoconfigure;
 
 import java.util.HashMap;
 import java.util.Map;

spring-pulsar-sample-apps/src/main/java/app1/PulsarBootApp.java

@@ -1,4 +1,4 @@
-package apps.one;
+package app1;
 
 import org.apache.pulsar.common.schema.SchemaType;
 

spring-pulsar-sample-apps/src/main/java/app2/ProducerApp.java

@@ -1,4 +1,4 @@
-package experiments.basic.producer;
+package app2;
 
 import java.io.Serial;
 import java.util.Random;

spring-pulsar-sample-apps/src/main/java/app3/PulsarAppTry.java

@@ -1,4 +1,4 @@
-package experiments.basic;
+package app3;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-pulsar-sample-apps/src/main/java/app4/FailoverConsumerApp.java

@@ -1,4 +1,4 @@
-package apps.four;
+package app4;
 
 import java.io.Serial;
 

spring-pulsar-sample-apps/src/main/java/app5/FailoverConsumer.java

@@ -1,4 +1,4 @@
-package apps.five;
+package app5;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-pulsar-sample-apps/src/main/java/app6/Sender.java

@@ -1,4 +1,4 @@
-package apps.non.boot;
+package app6;
 
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;

spring-pulsar-sample-apps/src/main/java/app6/SenderString.java

@@ -1,4 +1,4 @@
-package apps.non.boot;
+package app6;
 
 import java.util.HashMap;
 import java.util.Map;

spring-pulsar/src/main/java/org/springframework/pulsar/core/PulsarTemplate.java

@@ -21,7 +21,6 @@ import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 
-import apps.non.boot.SchemaUtils;
 import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.MessageRouter;
 import org.apache.pulsar.client.api.Producer;

spring-pulsar/src/main/java/org/springframework/pulsar/core/SchemaUtils.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package apps.non.boot;
+package org.springframework.pulsar.core;
 
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.client.impl.schema.JSONSchema;

spring-pulsar/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration:\
-org.springframework.pulsar.autoconfig.PulsarAutoConfiguration
+org.springframework.pulsar.autoconfigure.PulsarAutoConfiguration