forked from eugenp/tutorials
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request eugenp#8861 from kwoyke/JAVA-959
JAVA-959: Standardize packages in spring-katharsis and other modules
- Loading branch information
Showing
32 changed files
with
87 additions
and
88 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
.../java/org/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung; | ||
package com.baeldung; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
2 changes: 1 addition & 1 deletion
2
.../java/org/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung; | ||
package com.baeldung; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
2 changes: 1 addition & 1 deletion
2
...in/java/org/baeldung/store/AppConfig.java → ...in/java/com/baeldung/store/AppConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung.store; | ||
package com.baeldung.store; | ||
|
||
import org.springframework.context.annotation.Bean; | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
...rc/main/java/org/baeldung/store/Item.java → ...rc/main/java/com/baeldung/store/Item.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung.store; | ||
package com.baeldung.store; | ||
|
||
public interface Item { | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
...in/java/org/baeldung/store/ItemImpl1.java → ...in/java/com/baeldung/store/ItemImpl1.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung.store; | ||
package com.baeldung.store; | ||
|
||
public class ItemImpl1 implements Item { | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
...c/main/java/org/baeldung/store/Store.java → ...c/main/java/com/baeldung/store/Store.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 35 additions & 35 deletions
70
...org/baeldung/store/AppConfigUnitTest.java → ...com/baeldung/store/AppConfigUnitTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,35 @@ | ||
package org.baeldung.store; | ||
|
||
import static org.junit.Assert.assertNotNull; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.beans.factory.annotation.Qualifier; | ||
import org.springframework.test.context.ContextConfiguration; | ||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; | ||
|
||
@RunWith(SpringJUnit4ClassRunner.class) | ||
@ContextConfiguration(classes = AppConfig.class) | ||
public class AppConfigUnitTest { | ||
|
||
@Autowired | ||
@Qualifier("storeThroughConstructorInjection") | ||
private Store storeByConstructorInjection; | ||
|
||
@Autowired | ||
@Qualifier("storeThroughSetterInjection") | ||
private Store storeBySetterInjection; | ||
|
||
@Test | ||
public void givenValidXmlConfig_WhenInjectStoreByConstructorInjection_ThenBeanIsNotNull() { | ||
assertNotNull(storeByConstructorInjection); | ||
assertNotNull(storeByConstructorInjection.getItem()); | ||
} | ||
|
||
@Test | ||
public void givenValidXmlConfig_WhenInjectStoreBySetterInjection_ThenBeanIsNotNull() { | ||
assertNotNull(storeBySetterInjection); | ||
assertNotNull(storeByConstructorInjection.getItem()); | ||
} | ||
} | ||
package com.baeldung.store; | ||
|
||
import static org.junit.Assert.assertNotNull; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.beans.factory.annotation.Qualifier; | ||
import org.springframework.test.context.ContextConfiguration; | ||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; | ||
|
||
@RunWith(SpringJUnit4ClassRunner.class) | ||
@ContextConfiguration(classes = AppConfig.class) | ||
public class AppConfigUnitTest { | ||
|
||
@Autowired | ||
@Qualifier("storeThroughConstructorInjection") | ||
private Store storeByConstructorInjection; | ||
|
||
@Autowired | ||
@Qualifier("storeThroughSetterInjection") | ||
private Store storeBySetterInjection; | ||
|
||
@Test | ||
public void givenValidXmlConfig_WhenInjectStoreByConstructorInjection_ThenBeanIsNotNull() { | ||
assertNotNull(storeByConstructorInjection); | ||
assertNotNull(storeByConstructorInjection.getItem()); | ||
} | ||
|
||
@Test | ||
public void givenValidXmlConfig_WhenInjectStoreBySetterInjection_ThenBeanIsNotNull() { | ||
assertNotNull(storeBySetterInjection); | ||
assertNotNull(storeByConstructorInjection.getItem()); | ||
} | ||
} |
2 changes: 1 addition & 1 deletion
2
...ung/store/XmlAppConfigByTypeUnitTest.java → ...ung/store/XmlAppConfigByTypeUnitTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung.store; | ||
package com.baeldung.store; | ||
|
||
import static org.junit.Assert.assertNotNull; | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
.../baeldung/store/XmlAppConfigUnitTest.java → .../baeldung/store/XmlAppConfigUnitTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung.store; | ||
package com.baeldung.store; | ||
|
||
import static org.junit.Assert.assertNotNull; | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
.../java/org/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung; | ||
package com.baeldung; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
2 changes: 1 addition & 1 deletion
2
.../java/org/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung; | ||
package com.baeldung; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
2 changes: 1 addition & 1 deletion
2
.../java/org/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung; | ||
package com.baeldung; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
2 changes: 1 addition & 1 deletion
2
.../java/org/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung; | ||
package com.baeldung; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
2 changes: 1 addition & 1 deletion
2
.../java/org/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung; | ||
package com.baeldung; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
2 changes: 1 addition & 1 deletion
2
.../java/org/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung; | ||
package com.baeldung; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
2 changes: 1 addition & 1 deletion
2
.../java/org/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung; | ||
package com.baeldung; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
2 changes: 1 addition & 1 deletion
2
.../java/org/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung; | ||
package com.baeldung; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
2 changes: 1 addition & 1 deletion
2
...a/org/baeldung/SpringContextLiveTest.java → ...a/com/baeldung/SpringContextLiveTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung; | ||
package com.baeldung; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
2 changes: 1 addition & 1 deletion
2
...org/baeldung/SpringContextManualTest.java → ...com/baeldung/SpringContextManualTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung; | ||
package com.baeldung; | ||
|
||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
|
2 changes: 1 addition & 1 deletion
2
...c/main/java/org/baeldung/Application.java → ...c/main/java/com/baeldung/Application.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung; | ||
package com.baeldung; | ||
|
||
import io.katharsis.spring.boot.v3.KatharsisConfigV3; | ||
|
||
|
10 changes: 5 additions & 5 deletions
10
...sis/src/main/java/org/baeldung/Setup.java → ...sis/src/main/java/com/baeldung/Setup.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...ldung/persistence/dao/RoleRepository.java → ...ldung/persistence/dao/RoleRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...ldung/persistence/dao/UserRepository.java → ...ldung/persistence/dao/UserRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...nce/katharsis/RoleResourceRepository.java → ...nce/katharsis/RoleResourceRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...nce/katharsis/UserResourceRepository.java → ...nce/katharsis/UserResourceRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
...sis/UserToRoleRelationshipRepository.java → ...sis/UserToRoleRelationshipRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../org/baeldung/persistence/model/Role.java → .../com/baeldung/persistence/model/Role.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../org/baeldung/persistence/model/User.java → .../com/baeldung/persistence/model/User.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 1 addition & 2 deletions
3
.../java/org/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...va/org/baeldung/test/JsonApiLiveTest.java → ...va/com/baeldung/test/JsonApiLiveTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package org.baeldung.test; | ||
package com.baeldung.test; | ||
|
||
import static org.junit.Assert.assertEquals; | ||
|
||
|