Skip to content

Commit 0faf3ee

Browse files
authored
Merge pull request #14839 from panos-kakos/JAVA-25490
[JAVA-25490] Package renaming
2 parents c3bcd6e + a4aa3a6 commit 0faf3ee

12 files changed

Lines changed: 17 additions & 18 deletions

spring-core/src/main/java/com/baeldung/config/scope/AppConfigFunctionBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.springframework.context.annotation.Scope;
88

99
import com.baeldung.scope.prototype.PrototypeBean;
10-
import com.baeldung.scope.singletone.SingletonFunctionBean;
10+
import com.baeldung.scope.singleton.SingletonFunctionBean;
1111

1212
@Configuration
1313
public class AppConfigFunctionBean {

spring-core/src/main/java/com/baeldung/scope/AppConfig.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.baeldung.scope;
22

33
import com.baeldung.scope.prototype.PrototypeBean;
4-
import com.baeldung.scope.singletone.SingletonAppContextBean;
5-
import com.baeldung.scope.singletone.SingletonBean;
6-
import com.baeldung.scope.singletone.SingletonObjectFactoryBean;
7-
import com.baeldung.scope.singletone.SingletonProviderBean;
4+
import com.baeldung.scope.singleton.SingletonAppContextBean;
5+
import com.baeldung.scope.singleton.SingletonBean;
6+
import com.baeldung.scope.singleton.SingletonObjectFactoryBean;
7+
import com.baeldung.scope.singleton.SingletonProviderBean;
88
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
99
import org.springframework.context.annotation.Bean;
1010
import org.springframework.context.annotation.ComponentScan;

spring-core/src/main/java/com/baeldung/scope/AppProxyScopeConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.baeldung.scope;
22

33
import com.baeldung.scope.prototype.PrototypeBean;
4-
import com.baeldung.scope.singletone.SingletonBean;
4+
import com.baeldung.scope.singleton.SingletonBean;
55

66
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
77
import org.springframework.context.annotation.*;

spring-core/src/main/java/com/baeldung/scope/BeanInjectionStarter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.baeldung.scope;
22

33
import com.baeldung.scope.prototype.PrototypeBean;
4-
import com.baeldung.scope.singletone.SingletonBean;
4+
import com.baeldung.scope.singleton.SingletonBean;
55
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
66
import org.springframework.util.Assert;
77

spring-core/src/main/java/com/baeldung/scope/singletone/SingletonAppContextBean.java renamed to spring-core/src/main/java/com/baeldung/scope/singleton/SingletonAppContextBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.scope.singletone;
1+
package com.baeldung.scope.singleton;
22

33
import com.baeldung.scope.prototype.PrototypeBean;
44
import org.springframework.beans.BeansException;

spring-core/src/main/java/com/baeldung/scope/singletone/SingletonBean.java renamed to spring-core/src/main/java/com/baeldung/scope/singleton/SingletonBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.scope.singletone;
1+
package com.baeldung.scope.singleton;
22

33
import com.baeldung.scope.prototype.PrototypeBean;
44
import org.apache.log4j.Logger;

spring-core/src/main/java/com/baeldung/scope/singletone/SingletonFunctionBean.java renamed to spring-core/src/main/java/com/baeldung/scope/singleton/SingletonFunctionBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.scope.singletone;
1+
package com.baeldung.scope.singleton;
22

33
import java.util.function.Function;
44

spring-core/src/main/java/com/baeldung/scope/singletone/SingletonLookupBean.java renamed to spring-core/src/main/java/com/baeldung/scope/singleton/SingletonLookupBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.scope.singletone;
1+
package com.baeldung.scope.singleton;
22

33
import com.baeldung.scope.prototype.PrototypeBean;
44
import org.springframework.beans.factory.annotation.Lookup;

spring-core/src/main/java/com/baeldung/scope/singletone/SingletonObjectFactoryBean.java renamed to spring-core/src/main/java/com/baeldung/scope/singleton/SingletonObjectFactoryBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.scope.singletone;
1+
package com.baeldung.scope.singleton;
22

33
import com.baeldung.scope.prototype.PrototypeBean;
44
import org.springframework.beans.factory.ObjectFactory;

spring-core/src/main/java/com/baeldung/scope/singletone/SingletonProviderBean.java renamed to spring-core/src/main/java/com/baeldung/scope/singleton/SingletonProviderBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.scope.singletone;
1+
package com.baeldung.scope.singleton;
22

33
import com.baeldung.scope.prototype.PrototypeBean;
44
import org.springframework.beans.factory.annotation.Autowired;

0 commit comments

Comments
 (0)