JAVA-39224-Moving-some-article-links-on-spring-core (#17615)

* JAVA-39224-Moving-some-article-links-on-spring-core

* JAVA-39224-Moving-some-article-links-on-spring-core

* JAVA-39224-Moving-some-article-links-on-spring-core

* JAVA-39224-Moving-some-article-links-on-spring-core

* JAVA-39224-Moving-some-article-links-on-spring-core

---------

Co-authored-by: tienvn <[email protected]>

Author: vunamtien

spring-core-2/README.md

@@ -113,6 +113,11 @@
             <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -145,6 +150,7 @@
         <javassist.version>3.22.0-GA</javassist.version>
         <spring-retry.version>2.0.5</spring-retry.version>
         <spring-boot.version>2.2.2.RELEASE</spring-boot.version>
+        <commons-io.version>2.16.1</commons-io.version>
     </properties>
 
 </project>

spring-core-2/pom.xml

@@ -1,13 +1,12 @@
 package com.baeldung.applicationcontext;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import jakarta.annotation.PostConstruct;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.List;
+
 public class Teacher {
 
     @Autowired

spring-core/src/main/java/com/baeldung/applicationcontext/Course.java spring-core-2/src/main/java/com/baeldung/applicationcontext/Course.java

@@ -1,13 +1,13 @@
 package com.baeldung.streamutils;
 
+import org.apache.commons.io.IOUtils;
+import org.springframework.util.StreamUtils;
+
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
 
-import org.apache.commons.io.IOUtils;
-import org.springframework.util.StreamUtils;
-
 public class CopyStream {
     public static String getStringFromInputStream(InputStream input) throws IOException {
         StringWriter writer = new StringWriter();

spring-core/src/main/java/com/baeldung/applicationcontext/Dialog.java spring-core-2/src/main/java/com/baeldung/applicationcontext/Dialog.java

@@ -1,9 +1,9 @@
 package com.baeldung.streamutils;
 
-import java.io.InputStream;
-
 import org.springframework.util.StreamUtils;
 
+import java.io.InputStream;
+
 public class DrainStream {
     public InputStream getInputStream() {
         return StreamUtils.emptyInput();

spring-core/src/main/java/com/baeldung/applicationcontext/Student.java spring-core-2/src/main/java/com/baeldung/applicationcontext/Student.java

@@ -1,20 +1,14 @@
 package com.baeldung.streamutils;
 
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-
-import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 import org.springframework.util.StreamUtils;
 
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+
 import static com.baeldung.streamutils.CopyStream.getStringFromInputStream;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class CopyStreamIntegrationTest {
 

spring-core/src/main/java/com/baeldung/applicationcontext/Teacher.java spring-core-2/src/main/java/com/baeldung/applicationcontext/Teacher.java

@@ -59,6 +59,28 @@
             <artifactId>jakarta.annotation-api</artifactId>
             <version>${jakarta.annotation-api}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-websocket</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.1.0</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

spring-core/src/main/java/com/baeldung/aware/AwareExample.java spring-core-2/src/main/java/com/baeldung/aware/AwareExample.java

@@ -1,4 +1,4 @@
-package com.baeldung.scopes;
+package com.baeldung.beanscopes;
 
 public class HelloMessageGenerator {
 

spring-core/src/main/java/com/baeldung/aware/Config.java spring-core-2/src/main/java/com/baeldung/aware/Config.java

@@ -1,4 +1,4 @@
-package com.baeldung.scopes;
+package com.baeldung.beanscopes;
 
 public class Person {
     private String name;

spring-core/src/main/java/com/baeldung/aware/MyBeanFactory.java spring-core-2/src/main/java/com/baeldung/aware/MyBeanFactory.java

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

spring-core/src/main/java/com/baeldung/aware/MyBeanName.java spring-core-2/src/main/java/com/baeldung/aware/MyBeanName.java

@@ -1,14 +1,13 @@
-package com.baeldung.scopes;
-
-import javax.annotation.Resource;
+package com.baeldung.beanscopes;
 
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+
 @Controller
 public class ScopesController {
     public static final Logger LOG = LoggerFactory.getLogger(ScopesController.class);

spring-core/src/main/java/com/baeldung/event/listener/ContextEventListener.java spring-core-2/src/main/java/com/baeldung/event/listener/ContextEventListener.java

@@ -1,4 +1,4 @@
-package com.baeldung.applicationcontext;
+package com.baeldung.currentapplicationcontext;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;

spring-core/src/main/java/com/baeldung/event/listener/EventConfig.java spring-core-2/src/main/java/com/baeldung/event/listener/EventConfig.java

@@ -1,4 +1,4 @@
-package com.baeldung.applicationcontext;
+package com.baeldung.currentapplicationcontext;
 
 import org.springframework.stereotype.Service;
 

spring-core/src/main/java/com/baeldung/event/listener/SpringRunner.java spring-core-2/src/main/java/com/baeldung/event/listener/SpringRunner.java

@@ -1,4 +1,4 @@
-package com.baeldung.applicationcontext;
+package com.baeldung.currentapplicationcontext;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;

spring-core/src/main/java/com/baeldung/streamutils/CopyStream.java spring-core-2/src/main/java/com/baeldung/streamutils/CopyStream.java

@@ -1,9 +1,9 @@
 package com.baeldung.spring.patterns.singleton;
 
-import java.util.Optional;
-
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+
 @Repository
 public class BookRepository {
 

spring-core/src/main/java/com/baeldung/streamutils/DrainStream.java spring-core-2/src/main/java/com/baeldung/streamutils/DrainStream.java

@@ -1,10 +1,10 @@
 package com.baeldung.spring.patterns.template;
 
+import org.springframework.jdbc.core.RowMapper;
+
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.springframework.jdbc.core.RowMapper;
-
 public class BookRowMapper implements RowMapper<Book> {
 
     @Override

spring-core/src/main/resources/classpathxmlapplicationcontext-example.xml spring-core-2/src/main/resources/classpathxmlapplicationcontext-example.xml

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

spring-core/src/main/resources/classpathxmlapplicationcontext-internationalization.xml spring-core-2/src/main/resources/classpathxmlapplicationcontext-internationalization.xml

@@ -0,0 +1,5 @@
+package com.baeldung.springapplicationcontext;
+
+public class AccountRepository {
+
+}

spring-core/src/main/resources/dialog/dialog_en.properties spring-core-2/src/main/resources/dialog/dialog_en.properties

@@ -1,10 +1,10 @@
-package com.baeldung.applicationcontext;
-
-import java.util.Locale;
+package com.baeldung.springapplicationcontext;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 
+import java.util.Locale;
+
 public class AccountService {
 
     @Autowired

spring-core/src/main/resources/dialog/dialog_zh_CN.properties spring-core-2/src/main/resources/dialog/dialog_zh_CN.properties

@@ -1,9 +1,8 @@
-package com.baeldung.applicationcontext;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
+package com.baeldung.springapplicationcontext;
 
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;

spring-core/src/test/java/com/baeldung/applicationcontext/ClasspathXmlApplicationContextIntegrationTest.java spring-core-2/src/test/java/com/baeldung/applicationcontext/ClasspathXmlApplicationContextIntegrationTest.java

@@ -1,13 +1,13 @@
-package com.baeldung.applicationcontext;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
+package com.baeldung.springapplicationcontext;
 
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.support.XmlWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
 
+
 public class MyXmlWebApplicationInitializer implements WebApplicationInitializer {
 
     public void onStartup(ServletContext container) throws ServletException {

spring-core/src/test/java/com/baeldung/streamutils/CopyStreamIntegrationTest.java spring-core-2/src/test/java/com/baeldung/streamutils/CopyStreamIntegrationTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.applicationcontext;
+package com.baeldung.springapplicationcontext;
 
 import org.springframework.stereotype.Component;
 

spring-core/src/test/resources/input.txt spring-core-2/src/test/resources/input.txt

@@ -20,7 +20,7 @@ public void handleContextStart(final ContextStartedEvent cse) {
         hitContextStartedHandler = true;
     }
 
-    @EventListener(condition = "#event.success")
+    @EventListener(condition = "#root.args[0].success")
     public void handleSuccessful(final GenericSpringEvent<String> event) {
         System.out.println("Handling generic event (conditional): " + event.getWhat());
         hitSuccessfulEventHandler = true;

spring-core/src/test/resources/output.txt spring-core-2/src/test/resources/output.txt

@@ -3,8 +3,8 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="personSingleton" class="com.baeldung.scopes.Person" scope="singleton"/>
+    <bean id="personSingleton" class="com.baeldung.beanscopes.Person" scope="singleton"/>
 
-    <bean id="personPrototype" class="com.baeldung.scopes.Person" scope="prototype"/>
+    <bean id="personPrototype" class="com.baeldung.beanscopes.Person" scope="prototype"/>
 
 </beans>

spring-core-3/README.md

@@ -1,4 +1,4 @@
-package com.baeldung.scopes;
+package com.baeldung.beanscopes;
 
 import org.junit.Assert;
 import org.junit.Test;

spring-core-3/src/main/java/com/baeldung/applicationcontext/AccountRepository.java

@@ -1,4 +1,4 @@
-package com.baeldung.applicationcontext;
+package com.baeldung.currentapplicationcontext;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

spring-core/README.md

@@ -1,4 +1,4 @@
-package com.baeldung.applicationcontext;
+package com.baeldung.currentapplicationcontext;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

spring-core/pom.xml

@@ -1,10 +1,10 @@
-package com.baeldung.applicationcontext;
+package com.baeldung.currentapplicationcontext;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan("com.baeldung.applicationcontext")
+@ComponentScan("com.baeldung.currentapplicationcontext")
 public class TestContextConfig {