Merge pull request #8861 from kwoyke/JAVA-959

JAVA-959: Standardize packages in spring-katharsis and other modules

spring-cucumber/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-data-rest/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-di/src/main/java/com/baeldung/store/AppConfig.java

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

spring-di/src/main/java/com/baeldung/store/Item.java

@@ -1,4 +1,4 @@
-package org.baeldung.store;
+package com.baeldung.store;
 
 public interface Item {
 

spring-di/src/main/java/com/baeldung/store/ItemImpl1.java

@@ -1,4 +1,4 @@
-package org.baeldung.store;
+package com.baeldung.store;
 
 public class ItemImpl1 implements Item {
 

spring-di/src/main/java/com/baeldung/store/Store.java

@@ -1,4 +1,4 @@
-package org.baeldung.store;
+package com.baeldung.store;
 
 import org.springframework.beans.factory.annotation.Autowired;
 

spring-di/src/main/resources/ioc-context-by-type.xml

@@ -6,9 +6,9 @@
     
 	<!-- Autowired injection -->
 
-    <bean id="item" class="org.baeldung.store.ItemImpl1" />
+    <bean id="item" class="com.baeldung.store.ItemImpl1" />
 	
-    <bean id="xml-store-by-autowire-type" class="org.baeldung.store.Store" autowire="byType">
+    <bean id="xml-store-by-autowire-type" class="com.baeldung.store.Store" autowire="byType">
     </bean>
 
 </beans>

spring-di/src/main/resources/ioc-context.xml

@@ -6,28 +6,28 @@
     
     <!-- Constructor injection -->
 
-    <bean id="item1" class="org.baeldung.store.ItemImpl1" />
+    <bean id="item1" class="com.baeldung.store.ItemImpl1" />
-    <bean id="xml-store-by-constructor" class="org.baeldung.store.Store">
+    <bean id="xml-store-by-constructor" class="com.baeldung.store.Store">
         <constructor-arg type="Item" index="0"    name="item" ref="item1" />
     </bean>
     
     <!-- Setter injection -->
 
-    <bean id="xml-store-by-setter" class="org.baeldung.store.Store">
+    <bean id="xml-store-by-setter" class="com.baeldung.store.Store">
         <property name="item" ref="item1" />
     </bean>
     
     <!-- Autowired injection -->
     
-    <bean id="item" class="org.baeldung.store.ItemImpl1" />
+    <bean id="item" class="com.baeldung.store.ItemImpl1" />
 
-    <bean id="xml-store-by-autowire-name" class="org.baeldung.store.Store" autowire="byName">
+    <bean id="xml-store-by-autowire-name" class="com.baeldung.store.Store" autowire="byName">
     </bean>
     
     <!-- Lazy instantiation -->
     
-    <bean id="item1-lazy" class="org.baeldung.store.ItemImpl1" lazy-init="true" />
+    <bean id="item1-lazy" class="com.baeldung.store.ItemImpl1" lazy-init="true" />
-    <bean id="xml-store-by-setter-lazy" class="org.baeldung.store.Store">
+    <bean id="xml-store-by-setter-lazy" class="com.baeldung.store.Store">
         <property name="item" ref="item1-lazy" />
     </bean>
 

spring-di/src/test/java/com/baeldung/store/AppConfigUnitTest.java

@@ -1,35 +1,35 @@
-package org.baeldung.store;
+package com.baeldung.store;
-
+
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
-
+
-import org.junit.Test;
+import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
+
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = AppConfig.class)
+@ContextConfiguration(classes = AppConfig.class)
-public class AppConfigUnitTest {
+public class AppConfigUnitTest {
-
+
-    @Autowired
+    @Autowired
-    @Qualifier("storeThroughConstructorInjection")
+    @Qualifier("storeThroughConstructorInjection")
-    private Store storeByConstructorInjection;
+    private Store storeByConstructorInjection;
-    
+    
-    @Autowired
+    @Autowired
-    @Qualifier("storeThroughSetterInjection")
+    @Qualifier("storeThroughSetterInjection")
-    private Store storeBySetterInjection;
+    private Store storeBySetterInjection;
-
+
-    @Test
+    @Test
-    public void givenValidXmlConfig_WhenInjectStoreByConstructorInjection_ThenBeanIsNotNull() {
+    public void givenValidXmlConfig_WhenInjectStoreByConstructorInjection_ThenBeanIsNotNull() {
-        assertNotNull(storeByConstructorInjection);
+        assertNotNull(storeByConstructorInjection);
-        assertNotNull(storeByConstructorInjection.getItem());
+        assertNotNull(storeByConstructorInjection.getItem());
-    }
+    }
-
+
-    @Test
+    @Test
-    public void givenValidXmlConfig_WhenInjectStoreBySetterInjection_ThenBeanIsNotNull() {
+    public void givenValidXmlConfig_WhenInjectStoreBySetterInjection_ThenBeanIsNotNull() {
-        assertNotNull(storeBySetterInjection);
+        assertNotNull(storeBySetterInjection);
-        assertNotNull(storeByConstructorInjection.getItem());
+        assertNotNull(storeByConstructorInjection.getItem());
-    }
+    }
-}
+}

spring-di/src/test/java/com/baeldung/store/XmlAppConfigByTypeUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.store;
+package com.baeldung.store;
 
 import static org.junit.Assert.assertNotNull;
 

spring-di/src/test/java/com/baeldung/store/XmlAppConfigUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.store;
+package com.baeldung.store;
 
 import static org.junit.Assert.assertNotNull;
 

spring-dispatcher-servlet/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-drools/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-freemarker/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-integration/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-jenkins-pipeline/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-jersey/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-jinq/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-jms/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-kafka/src/test/java/com/baeldung/SpringContextLiveTest.java

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

spring-kafka/src/test/java/com/baeldung/SpringContextManualTest.java

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

spring-katharsis/src/main/java/com/baeldung/Application.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import io.katharsis.spring.boot.v3.KatharsisConfigV3;
 

spring-katharsis/src/main/java/com/baeldung/Setup.java

@@ -1,14 +1,14 @@
-package org.baeldung;
+package com.baeldung;
 
 import java.util.Arrays;
 import java.util.HashSet;
 
 import javax.annotation.PostConstruct;
 
-import org.baeldung.persistence.dao.RoleRepository;
+import com.baeldung.persistence.dao.RoleRepository;
-import org.baeldung.persistence.dao.UserRepository;
+import com.baeldung.persistence.dao.UserRepository;
-import org.baeldung.persistence.model.Role;
+import com.baeldung.persistence.model.Role;
-import org.baeldung.persistence.model.User;
+import com.baeldung.persistence.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

spring-katharsis/src/main/java/com/baeldung/persistence/dao/RoleRepository.java

@@ -1,6 +1,6 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
-import org.baeldung.persistence.model.Role;
+import com.baeldung.persistence.model.Role;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface RoleRepository extends JpaRepository<Role, Long> {

spring-katharsis/src/main/java/com/baeldung/persistence/dao/UserRepository.java

@@ -1,6 +1,6 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
-import org.baeldung.persistence.model.User;
+import com.baeldung.persistence.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserRepository extends JpaRepository<User, Long> {

spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/RoleResourceRepository.java

@@ -1,12 +1,12 @@
-package org.baeldung.persistence.katharsis;
+package com.baeldung.persistence.katharsis;
 
 
+import com.baeldung.persistence.dao.RoleRepository;
 import io.katharsis.queryspec.QuerySpec;
 import io.katharsis.repository.ResourceRepositoryV2;
 import io.katharsis.resource.list.ResourceList;
 
-import org.baeldung.persistence.dao.RoleRepository;
+import com.baeldung.persistence.model.Role;
-import org.baeldung.persistence.model.Role;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserResourceRepository.java

@@ -1,11 +1,11 @@
-package org.baeldung.persistence.katharsis;
+package com.baeldung.persistence.katharsis;
 
+import com.baeldung.persistence.dao.UserRepository;
+import com.baeldung.persistence.model.User;
 import io.katharsis.queryspec.QuerySpec;
 import io.katharsis.repository.ResourceRepositoryV2;
 import io.katharsis.resource.list.ResourceList;
 
-import org.baeldung.persistence.dao.UserRepository;
-import org.baeldung.persistence.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

spring-katharsis/src/main/java/com/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java

@@ -1,5 +1,8 @@
-package org.baeldung.persistence.katharsis;
+package com.baeldung.persistence.katharsis;
 
+import com.baeldung.persistence.dao.RoleRepository;
+import com.baeldung.persistence.dao.UserRepository;
+import com.baeldung.persistence.model.User;
 import io.katharsis.queryspec.QuerySpec;
 import io.katharsis.repository.RelationshipRepositoryV2;
 import io.katharsis.resource.list.ResourceList;
@@ -7,10 +10,7 @@ import io.katharsis.resource.list.ResourceList;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.baeldung.persistence.dao.RoleRepository;
+import com.baeldung.persistence.model.Role;
-import org.baeldung.persistence.dao.UserRepository;
-import org.baeldung.persistence.model.Role;
-import org.baeldung.persistence.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

spring-katharsis/src/main/java/com/baeldung/persistence/model/Role.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import io.katharsis.resource.annotations.JsonApiId;
 import io.katharsis.resource.annotations.JsonApiRelation;

spring-katharsis/src/main/java/com/baeldung/persistence/model/User.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import io.katharsis.resource.annotations.JsonApiId;
 import io.katharsis.resource.annotations.JsonApiRelation;

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

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

spring-katharsis/src/test/java/com/baeldung/test/JsonApiLiveTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.test;
+package com.baeldung.test;
 
 import static org.junit.Assert.assertEquals;