Java-633 Standardize packages in spring-mvc-*

Author: mikr

lombok-custom/pom.xml

@@ -36,12 +36,12 @@
 
     <profiles>
         <profile>
-            <id>default-tools.jar</id>
+            <id>default-profile</id>
             <activation>
-                <property>
-                    <name>java.vendor</name>
-                    <value>Oracle Corporation</value>
-                </property>
+                <activeByDefault>true</activeByDefault>
+                <file>
+                    <exists>${java.home}/../lib/tools.jar</exists>
+                </file>
             </activation>
             <dependencies>
                 <dependency>
@@ -53,6 +53,24 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>mac-profile</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <file>
+                    <exists>${java.home}/../Classes/classes.jar</exists>
+                </file>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.sun</groupId>
+                    <artifactId>tools</artifactId>
+                    <version>${java.version}</version>
+                    <scope>system</scope>
+                    <systemPath>${java.home}/../Classes/classes.jar</systemPath>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 
     <properties>

spring-mvc-basics-3/pom.xml

@@ -138,7 +138,7 @@
 
     <properties>
         <!-- The main class to start by executing java -jar -->
-        <start-class>org.baeldung.boot.Application</start-class>
+        <start-class>com.baeldung.boot.Application</start-class>
         <jquery.version>3.1.1</jquery.version>
         <bootstrap.version>3.3.7-1</bootstrap.version>
         <jpa.version>2.2</jpa.version>

spring-mvc-basics-3/src/main/java/com/baeldung/boot/Application.java

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

spring-mvc-basics-3/src/main/java/com/baeldung/boot/config/WebConfig.java

@@ -1,12 +1,12 @@
-package org.baeldung.boot.config;
+package com.baeldung.boot.config;
 
 import java.util.List;
 
-import org.baeldung.boot.converter.GenericBigDecimalConverter;
-import org.baeldung.boot.converter.StringToAbstractEntityConverterFactory;
-import org.baeldung.boot.converter.StringToEmployeeConverter;
-import org.baeldung.boot.converter.StringToEnumConverter;
-import org.baeldung.boot.web.resolver.HeaderVersionArgumentResolver;
+import com.baeldung.boot.converter.GenericBigDecimalConverter;
+import com.baeldung.boot.converter.StringToAbstractEntityConverterFactory;
+import com.baeldung.boot.converter.StringToEmployeeConverter;
+import com.baeldung.boot.converter.StringToEnumConverter;
+import com.baeldung.boot.web.resolver.HeaderVersionArgumentResolver;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;

spring-mvc-basics-3/src/main/java/com/baeldung/boot/controller/GenericEntityController.java

@@ -1,8 +1,8 @@
-package org.baeldung.boot.controller;
+package com.baeldung.boot.controller;
 
-import org.baeldung.boot.domain.GenericEntity;
-import org.baeldung.boot.domain.Modes;
-import org.baeldung.boot.web.resolver.Version;
+import com.baeldung.boot.domain.GenericEntity;
+import com.baeldung.boot.domain.Modes;
+import com.baeldung.boot.web.resolver.Version;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;

spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/GenericBigDecimalConverter.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.converter;
+package com.baeldung.boot.converter;
 
 import com.google.common.collect.ImmutableSet;
 import org.springframework.core.convert.TypeDescriptor;

spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/StringToAbstractEntityConverterFactory.java

@@ -1,8 +1,8 @@
-package org.baeldung.boot.converter;
+package com.baeldung.boot.converter;
 
-import org.baeldung.boot.domain.AbstractEntity;
-import org.baeldung.boot.domain.Bar;
-import org.baeldung.boot.domain.Foo;
+import com.baeldung.boot.domain.AbstractEntity;
+import com.baeldung.boot.domain.Bar;
+import com.baeldung.boot.domain.Foo;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.ConverterFactory;
 

spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/StringToEmployeeConverter.java

@@ -1,6 +1,6 @@
-package org.baeldung.boot.converter;
+package com.baeldung.boot.converter;
 
-import org.baeldung.boot.domain.Employee;
+import com.baeldung.boot.domain.Employee;
 import org.springframework.core.convert.converter.Converter;
 
 public class StringToEmployeeConverter implements Converter<String, Employee> {

spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/StringToEnumConverter.java

@@ -1,6 +1,6 @@
-package org.baeldung.boot.converter;
+package com.baeldung.boot.converter;
 
-import org.baeldung.boot.domain.Modes;
+import com.baeldung.boot.domain.Modes;
 import org.springframework.core.convert.converter.Converter;
 
 public class StringToEnumConverter implements Converter<String, Modes> {

spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/StringToLocalDateTimeConverter.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.converter;
+package com.baeldung.boot.converter;
 
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Component;

spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/controller/AbstractEntityController.java

@@ -1,8 +1,8 @@
-package org.baeldung.boot.converter.controller;
+package com.baeldung.boot.converter.controller;
 
-import org.baeldung.boot.domain.Bar;
-import org.baeldung.boot.domain.Foo;
-import org.baeldung.boot.domain.Modes;
+import com.baeldung.boot.domain.Bar;
+import com.baeldung.boot.domain.Foo;
+import com.baeldung.boot.domain.Modes;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

spring-mvc-basics-3/src/main/java/com/baeldung/boot/converter/controller/StringToEmployeeConverterController.java

@@ -1,6 +1,6 @@
-package org.baeldung.boot.converter.controller;
+package com.baeldung.boot.converter.controller;
 
-import org.baeldung.boot.domain.Employee;
+import com.baeldung.boot.domain.Employee;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/AbstractEntity.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.domain;
+package com.baeldung.boot.domain;
 
 public abstract class AbstractEntity {
 

spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/Bar.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.domain;
+package com.baeldung.boot.domain;
 
 public class Bar extends AbstractEntity {
 

spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/Employee.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.domain;
+package com.baeldung.boot.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;

spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/Foo.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.domain;
+package com.baeldung.boot.domain;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
 public class Foo extends AbstractEntity {

spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/GenericEntity.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.domain;
+package com.baeldung.boot.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

spring-mvc-basics-3/src/main/java/com/baeldung/boot/domain/Modes.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.domain;
+package com.baeldung.boot.domain;
 
 public enum Modes {
 

spring-mvc-basics-3/src/main/java/com/baeldung/boot/repository/GenericEntityRepository.java

@@ -1,6 +1,6 @@
-package org.baeldung.boot.repository;
+package com.baeldung.boot.repository;
 
-import org.baeldung.boot.domain.GenericEntity;
+import com.baeldung.boot.domain.GenericEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface GenericEntityRepository extends JpaRepository<GenericEntity, Long> {

spring-mvc-basics-3/src/main/java/com/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.web.resolver;
+package com.baeldung.boot.web.resolver;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.stereotype.Component;

spring-mvc-basics-3/src/main/java/com/baeldung/boot/web/resolver/Version.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.web.resolver;
+package com.baeldung.boot.web.resolver;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/CachedBodyHttpServletRequest.java

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

spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/CachedBodyServletInputStream.java

@@ -1,4 +1,4 @@
-package org.baeldung.cachedrequest;
+package com.baeldung.cachedrequest;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/ContentCachingFilter.java

@@ -1,4 +1,4 @@
-package org.baeldung.cachedrequest;
+package com.baeldung.cachedrequest;
 
 import java.io.IOException;
 

spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/HttpRequestDemoConfig.java

@@ -1,17 +1,17 @@
-package org.baeldung.cachedrequest;
+package com.baeldung.cachedrequest;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 /**
  * To initialize the WebApplication, Please see
- * {@link org.baeldung.spring.config.MainWebAppInitializer}
+ * {@link com.baeldung.spring.config.MainWebAppInitializer}
  */
 
 @EnableWebMvc
 @Configuration
-@ComponentScan(basePackages = "org.baeldung.cachedrequest")
+@ComponentScan(basePackages = "com.baeldung.cachedrequest")
 public class HttpRequestDemoConfig implements WebMvcConfigurer {
 
 }

spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/Person.java

@@ -1,4 +1,4 @@
-package org.baeldung.cachedrequest;
+package com.baeldung.cachedrequest;
 
 public class Person {
     private String firstName;

spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/PersonController.java

@@ -1,4 +1,4 @@
-package org.baeldung.cachedrequest;
+package com.baeldung.cachedrequest;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;

spring-mvc-basics-3/src/main/java/com/baeldung/cachedrequest/PrintRequestContentFilter.java

@@ -1,4 +1,4 @@
-package org.baeldung.cachedrequest;
+package com.baeldung.cachedrequest;
 
 
 import java.io.IOException;

spring-mvc-basics-3/src/test/java/com/baeldung/SpringBootApplicationIntegrationTest.java

@@ -1,7 +1,7 @@
 package com.baeldung;
 
-import org.baeldung.boot.Application;
-import org.baeldung.boot.domain.Modes;
+import com.baeldung.boot.Application;
+import com.baeldung.boot.domain.Modes;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

spring-mvc-basics-3/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java

@@ -1,8 +1,8 @@
 package com.baeldung;
 
-import org.baeldung.boot.Application;
-import org.baeldung.boot.domain.GenericEntity;
-import org.baeldung.boot.repository.GenericEntityRepository;
+import com.baeldung.boot.Application;
+import com.baeldung.boot.domain.GenericEntity;
+import com.baeldung.boot.repository.GenericEntityRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

spring-mvc-basics-3/src/test/java/com/baeldung/SpringBootMailIntegrationTest.java

@@ -1,6 +1,6 @@
 package com.baeldung;
 
-import org.baeldung.boot.Application;
+import com.baeldung.boot.Application;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/CachedBodyHttpServletRequestUnitTest.java

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

spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/CachedBodyServletInputStreamUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.cachedrequest;
+package com.baeldung.cachedrequest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/ContentCachingFilterUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.cachedrequest;
+package com.baeldung.cachedrequest;
 
 import java.io.IOException;
 

spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/PersonControllerIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.cachedrequest;
+package com.baeldung.cachedrequest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Before;

spring-mvc-basics-3/src/test/java/com/baeldung/cachedrequest/PrintRequestContentFilterUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.cachedrequest;
+package com.baeldung.cachedrequest;
 
 import java.io.IOException;
 

spring-mvc-basics-4/src/main/java/com/baeldung/controller/config/StudentControllerConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.controller.config;
+package com.baeldung.controller.config;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;

spring-mvc-basics-4/src/main/java/com/baeldung/controller/config/WebConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.controller.config;
+package com.baeldung.controller.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -11,7 +11,7 @@
 
 @Configuration
 @EnableWebMvc
-@ComponentScan(basePackages = { "org.baeldung.controller.controller", "com.baeldung.controller", "org.baeldung.controller.config" })
+@ComponentScan(basePackages = { "com.baeldung.controller.controller", "com.baeldung.controller", "com.baeldung.controller.config" })
 public class WebConfig implements WebMvcConfigurer {
     @Override
     public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {

spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/PassParametersController.java

@@ -1,4 +1,4 @@
-package org.baeldung.controller.controller;
+package com.baeldung.controller.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/RestAnnotatedController.java

@@ -1,6 +1,6 @@
-package org.baeldung.controller.controller;
+package com.baeldung.controller.controller;
 
-import org.baeldung.controller.student.Student;
+import com.baeldung.controller.student.Student;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;

spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/RestController.java

@@ -1,6 +1,6 @@
-package org.baeldung.controller.controller;
+package com.baeldung.controller.controller;
 
-import org.baeldung.controller.student.Student;
+import com.baeldung.controller.student.Student;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

spring-mvc-basics-4/src/main/java/com/baeldung/controller/controller/TestController.java

@@ -2,7 +2,7 @@
 /**
  * @author Prashant Dutta
  */
-package org.baeldung.controller.controller;
+package com.baeldung.controller.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

spring-mvc-basics-4/src/main/java/com/baeldung/controller/student/Student.java

@@ -1,4 +1,4 @@
-package org.baeldung.controller.student;
+package com.baeldung.controller.student;
 
 public class Student {
     private String name;

spring-mvc-basics-4/src/main/resources/test-mvc.xml

@@ -10,7 +10,7 @@
         http://www.springframework.org/schema/context/spring-context-4.0.xsd
         http://www.springframework.org/schema/mvc
         http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
-    <context:component-scan base-package="org.baeldung.controller.controller"/>
+    <context:component-scan base-package="com.baeldung.controller.controller"/>
     <mvc:annotation-driven/>
 
     <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">