Merge pull request #8440 from kwoyke/BAEL-20552

BAEL-20552: Standardize packages for spring-4, spring-vault and spring-webflux-amqp modules

spring-4/src/main/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.attributeannotations;
+package com.baeldung.spring43.attributeannotations;
 
 import org.springframework.web.bind.annotation.*;
 

spring-4/src/main/java/com/baeldung/spring43/attributeannotations/ParamInterceptor.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.attributeannotations;
+package com.baeldung.spring43.attributeannotations;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

spring-4/src/main/java/com/baeldung/spring43/cache/Foo.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.cache;
+package com.baeldung.spring43.cache;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

spring-4/src/main/java/com/baeldung/spring43/cache/FooService.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.cache;
+package com.baeldung.spring43.cache;
 
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;

spring-4/src/main/java/com/baeldung/spring43/composedmapping/Appointment.java

@@ -0,0 +1,5 @@
+package com.baeldung.spring43.composedmapping;
+
+public class Appointment {
+
+}

spring-4/src/main/java/com/baeldung/spring43/composedmapping/AppointmentService.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.composedmapping;
+package com.baeldung.spring43.composedmapping;
 
 import java.util.Map;
 

spring-4/src/main/java/com/baeldung/spring43/composedmapping/AppointmentsController.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.composedmapping;
+package com.baeldung.spring43.composedmapping;
 
 import java.util.Map;
 

spring-4/src/main/java/com/baeldung/spring43/ctor/FooRepository.java

@@ -0,0 +1,5 @@
+package com.baeldung.spring43.ctor;
+
+public class FooRepository {
+
+}

spring-4/src/main/java/com/baeldung/spring43/ctor/FooService.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 public class FooService {
 

spring-4/src/main/java/com/baeldung/spring43/defaultmethods/DateHolder.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import java.time.LocalDate;
 

spring-4/src/main/java/com/baeldung/spring43/defaultmethods/IDateHolder.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;

spring-4/src/main/java/com/baeldung/spring43/depresolution/FooRepository.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.depresolution;
+package com.baeldung.spring43.depresolution;
 
 import org.springframework.stereotype.Repository;
 

spring-4/src/main/java/com/baeldung/spring43/depresolution/FooService.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.depresolution;
+package com.baeldung.spring43.depresolution;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.stereotype.Service;

spring-4/src/main/java/com/baeldung/spring43/scopeannotations/AppPreferences.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.ApplicationScope;

spring-4/src/main/java/com/baeldung/spring43/scopeannotations/InstanceCountingService.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

spring-4/src/main/java/com/baeldung/spring43/scopeannotations/LoginAction.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;

spring-4/src/main/java/com/baeldung/spring43/scopeannotations/ScopeTestController.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

spring-4/src/main/java/com/baeldung/spring43/scopeannotations/UserPreferences.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.SessionScope;

spring-4/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java

@@ -1,5 +0,0 @@
-package org.baeldung.spring43.composedmapping;
-
-public class Appointment {
-
-}

spring-4/src/main/java/org/baeldung/spring43/ctor/FooRepository.java

@@ -1,5 +0,0 @@
-package org.baeldung.spring43.ctor;
-
-public class FooRepository {
-
-}

spring-4/src/main/resources/defaultmethods-context.xml

@@ -3,7 +3,7 @@
        xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="dateHolder" class="org.baeldung.spring43.defaultmethods.DateHolder">
+    <bean id="dateHolder" class="com.baeldung.spring43.defaultmethods.DateHolder">
         <property name="stringDate" value="15.10.1982"/>
     </bean>
 

spring-4/src/main/resources/implicit-ctor-context.xml

@@ -3,8 +3,8 @@
        xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean class="org.baeldung.spring43.ctor.FooRepository"/>
+    <bean class="com.baeldung.spring43.ctor.FooRepository"/>
 
-    <bean class="org.baeldung.spring43.ctor.FooService"/>
+    <bean class="com.baeldung.spring43.ctor.FooService"/>
 
 </beans>

spring-4/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

spring-4/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.attributeannotations;
+package com.baeldung.spring43.attributeannotations;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;

spring-4/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.attributeannotations;
+package com.baeldung.spring43.attributeannotations;
 
 import org.junit.Assert;
 import org.junit.Before;

spring-4/src/test/java/com/baeldung/spring43/cache/CacheRefinementsConfiguration.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.cache;
+package com.baeldung.spring43.cache;
 
 import java.util.Collections;
 

spring-4/src/test/java/com/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.cache;
+package com.baeldung.spring43.cache;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

spring-4/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.composedmapping;
+package com.baeldung.spring43.composedmapping;
 
 import java.util.Collections;
 

spring-4/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.composedmapping;
+package com.baeldung.spring43.composedmapping;
 
 import org.junit.Before;
 import org.junit.Test;

spring-4/src/test/java/com/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;

spring-4/src/test/java/com/baeldung/spring43/ctor/FooRepositoryConfiguration.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-4/src/test/java/com/baeldung/spring43/ctor/FooServiceConfiguration.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-4/src/test/java/com/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.ctor;
+package com.baeldung.spring43.ctor;
 
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;

spring-4/src/test/java/com/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import java.time.LocalDate;
 

spring-4/src/test/java/com/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

spring-4/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import org.junit.Test;
 import org.springframework.test.context.ContextConfiguration;

spring-4/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.defaultmethods;
+package com.baeldung.spring43.defaultmethods;
 
 import javax.sql.DataSource;
 

spring-4/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderConfiguration.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.depresolution;
+package com.baeldung.spring43.depresolution;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;

spring-4/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.depresolution;
+package com.baeldung.spring43.depresolution;
 
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;

spring-4/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;

spring-4/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring43.scopeannotations;
+package com.baeldung.spring43.scopeannotations;
 
 import org.junit.Before;
 import org.junit.Test;

spring-vault/src/main/java/com/baeldung/springvault/Credentials.java

@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 public class Credentials {
 

spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java

@@ -1,16 +1,10 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
-import java.net.URI;
 import java.net.URISyntaxException;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.vault.authentication.TokenAuthentication;
-import org.springframework.vault.client.VaultEndpoint;
 import org.springframework.vault.core.VaultTemplate;
-import org.springframework.vault.core.env.VaultPropertySource;
-import org.springframework.vault.support.VaultResponse;
 import org.springframework.vault.support.VaultResponseSupport;
 
 /**

spring-vault/src/main/java/com/baeldung/springvault/SpringVaultApplication.java

@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-vault/src/main/java/com/baeldung/springvault/VaultConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.vault.authentication.ClientAuthentication;

spring-vault/src/main/java/com/baeldung/springvault/VaultEnvironmentConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

spring-vault/src/test/java/com/baeldung/springvault/SpringContextLiveTest.java

@@ -1,6 +1,6 @@
-package org.baeldung;
+package com.baeldung.springvault;
 
-import org.baeldung.springvault.SpringVaultApplication;
+import com.baeldung.springvault.SpringVaultApplication;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;

spring-vault/src/test/java/com/baeldung/springvault/VaultInitializer.java

@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import java.io.BufferedReader;
 import java.io.Closeable;

spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import org.junit.FixMethodOrder;
 import org.junit.Ignore;

spring-vault/src/test/java/com/baeldung/springvault/VaultTestConfiguration.java

@@ -1,4 +1,4 @@
-package org.baeldung.springvault;
+package com.baeldung.springvault;
 
 import java.net.URI;
 import java.net.URISyntaxException;

spring-webflux-amqp/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.baeldung.spring</groupId>
+    <groupId>com.baeldung.spring</groupId>
     <artifactId>spring-webflux-amqp</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <name>spring-webflux-amqp</name>

spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java

@@ -1,11 +1,9 @@
-package org.baeldung.spring.amqp;
+package com.baeldung.spring.amqp;
 
 import java.time.Duration;
-import java.util.Date;
 
 import javax.annotation.PostConstruct;
 
-import org.baeldung.spring.amqp.DestinationsConfig.DestinationInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.AmqpAdmin;
@@ -29,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
 
 @RestController
 public class AmqpReactiveController {
@@ -105,7 +102,7 @@ public class AmqpReactiveController {
     public Mono<ResponseEntity<?>> sendMessageToQueue(@PathVariable String name, @RequestBody String payload) {
 
         // Lookup exchange details
-        final DestinationInfo d = destinationsConfig.getQueues()
+        final DestinationsConfig.DestinationInfo d = destinationsConfig.getQueues()
             .get(name);
 
         if (d == null) {
@@ -135,7 +132,7 @@ public class AmqpReactiveController {
     @GetMapping(value = "/queue/{name}", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     public Flux<?> receiveMessagesFromQueue(@PathVariable String name) {
 
-        DestinationInfo d = destinationsConfig.getQueues()
+        DestinationsConfig.DestinationInfo d = destinationsConfig.getQueues()
             .get(name);
 
         if (d == null) {
@@ -201,7 +198,7 @@ public class AmqpReactiveController {
     public Mono<ResponseEntity<?>> sendMessageToTopic(@PathVariable String name, @RequestBody String payload) {
 
         // Lookup exchange details
-        final DestinationInfo d = destinationsConfig.getTopics()
+        final DestinationsConfig.DestinationInfo d = destinationsConfig.getTopics()
             .get(name);
         if (d == null) {
             // Destination not found.
@@ -223,7 +220,7 @@ public class AmqpReactiveController {
     @GetMapping(value = "/topic/{name}", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     public Flux<?> receiveMessagesFromTopic(@PathVariable String name) {
 
-        DestinationInfo d = destinationsConfig.getTopics()
+        DestinationsConfig.DestinationInfo d = destinationsConfig.getTopics()
             .get(name);
 
         if (d == null) {
@@ -281,7 +278,7 @@ public class AmqpReactiveController {
 
     }
 
-    private Queue createTopicQueue(DestinationInfo destination) {
+    private Queue createTopicQueue(DestinationsConfig.DestinationInfo destination) {
 
         Exchange ex = ExchangeBuilder.topicExchange(destination.getExchange())
           .durable(true)

spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java

@@ -1,59 +1,59 @@
-package org.baeldung.spring.amqp;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties("destinations")
-public class DestinationsConfig {
-    
-    
-    private Map<String,DestinationInfo> queues = new HashMap<>();
-    
-    private Map<String,DestinationInfo> topics = new HashMap<>();
-    
-    
-
-    public Map<String, DestinationInfo> getQueues() {
-        return queues;
-    }
-
-    public void setQueues(Map<String, DestinationInfo> queues) {
-        this.queues = queues;
-    }
-
-    public Map<String, DestinationInfo> getTopics() {
-        return topics;
-    }
-
-    public void setTopics(Map<String, DestinationInfo> topics) {
-        this.topics = topics;
-    }
-
-    // DestinationInfo stores the Exchange name and routing key used
-    // by our producers when posting messages
-    static class DestinationInfo {
-        
-        private String exchange;
-        private String routingKey;
-        
-        
-        public String getExchange() {
-            return exchange;
-        }
-        public void setExchange(String exchange) {
-            this.exchange = exchange;
-        }
-        public String getRoutingKey() {
-            return routingKey;
-        }
-        public void setRoutingKey(String routingKey) {
-            this.routingKey = routingKey;
-        }
-        
-        
-        
-    }
-    
-}
+package com.baeldung.spring.amqp;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("destinations")
+public class DestinationsConfig {
+    
+    
+    private Map<String,DestinationInfo> queues = new HashMap<>();
+    
+    private Map<String,DestinationInfo> topics = new HashMap<>();
+    
+    
+
+    public Map<String, DestinationInfo> getQueues() {
+        return queues;
+    }
+
+    public void setQueues(Map<String, DestinationInfo> queues) {
+        this.queues = queues;
+    }
+
+    public Map<String, DestinationInfo> getTopics() {
+        return topics;
+    }
+
+    public void setTopics(Map<String, DestinationInfo> topics) {
+        this.topics = topics;
+    }
+
+    // DestinationInfo stores the Exchange name and routing key used
+    // by our producers when posting messages
+    static class DestinationInfo {
+        
+        private String exchange;
+        private String routingKey;
+        
+        
+        public String getExchange() {
+            return exchange;
+        }
+        public void setExchange(String exchange) {
+            this.exchange = exchange;
+        }
+        public String getRoutingKey() {
+            return routingKey;
+        }
+        public void setRoutingKey(String routingKey) {
+            this.routingKey = routingKey;
+        }
+        
+        
+        
+    }
+    
+}

spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.amqp;
+package com.baeldung.spring.amqp;
 
 import org.springframework.amqp.core.AcknowledgeMode;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;

spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.amqp;
+package com.baeldung.spring.amqp;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java

@@ -1,6 +1,6 @@
-package org.baeldung;
+package com.baeldung;
 
-import org.baeldung.spring.amqp.SpringWebfluxAmqpApplication;
+import com.baeldung.spring.amqp.SpringWebfluxAmqpApplication;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;

spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring.amqp;
+package com.baeldung.spring.amqp;
 
 import org.junit.Test;
 import org.springframework.test.web.reactive.server.WebTestClient;