remove keycloak, refactor packages (#2963)

spring-boot/src/main/java/org/baeldung/boot/Application.java

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

spring-boot/src/main/java/org/baeldung/boot/client/Details.java

@@ -1,4 +1,4 @@
-package org.baeldung.client;
+package org.baeldung.boot.client;
 
 public class Details {
 

spring-boot/src/main/java/org/baeldung/boot/client/DetailsServiceClient.java

@@ -1,4 +1,4 @@
-package org.baeldung.client;
+package org.baeldung.boot.client;
 
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.stereotype.Service;

spring-boot/src/main/java/org/baeldung/boot/config/H2JpaConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package org.baeldung.boot.config;
 
 import java.util.Properties;
 
@@ -18,7 +18,7 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
-@EnableJpaRepositories(basePackages = { "org.baeldung.repository", "org.baeldung.boot.repository", "org.baeldung.boot.boottest" })
+@EnableJpaRepositories(basePackages = { "org.baeldung.boot.repository", "org.baeldung.boot.boottest","org.baeldung.repository" })
 @PropertySource("classpath:persistence-generic-entity.properties")
 @EnableTransactionManagement
 public class H2JpaConfig {
@@ -41,7 +41,7 @@ public class H2JpaConfig {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "org.baeldung.domain", "org.baeldung.boot.model", "org.baeldung.boot.boottest" });
+        em.setPackagesToScan(new String[] { "org.baeldung.boot.domain", "org.baeldung.boot.model", "org.baeldung.boot.boottest", "org.baeldung.model" });
         em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
         em.setJpaProperties(additionalProperties());
         return em;

spring-boot/src/main/java/org/baeldung/boot/config/WebConfig.java

@@ -1,9 +1,9 @@
-package org.baeldung.config;
+package org.baeldung.boot.config;
 
-import org.baeldung.converter.GenericBigDecimalConverter;
-import org.baeldung.converter.StringToEnumConverterFactory;
-import org.baeldung.converter.StringToEmployeeConverter;
-import org.baeldung.web.resolver.HeaderVersionArgumentResolver;
+import org.baeldung.boot.converter.GenericBigDecimalConverter;
+import org.baeldung.boot.converter.StringToEmployeeConverter;
+import org.baeldung.boot.converter.StringToEnumConverterFactory;
+import org.baeldung.boot.web.resolver.HeaderVersionArgumentResolver;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;

spring-boot/src/main/java/org/baeldung/boot/controller/GenericEntityController.java

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

spring-boot/src/main/java/org/baeldung/boot/controller/servlet/HelloWorldServlet.java

@@ -1,43 +1,43 @@
-package org.baeldung.controller.servlet;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Objects;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class HelloWorldServlet extends HttpServlet {
-    private static final long serialVersionUID = 1L;
-
-    public HelloWorldServlet() {
-        super();
-    }
-
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        PrintWriter out = null;
-        try {
-            out = response.getWriter();
-            out.println("HelloWorldServlet: GET METHOD");
-            out.flush();
-        } finally {
-            if (!Objects.isNull(out))
-                out.close();
-        }
-    }
-
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        PrintWriter out = null;
-        try {
-            out = response.getWriter();
-            out.println("HelloWorldServlet: POST METHOD");
-            out.flush();
-        } finally {
-            if (!Objects.isNull(out))
-                out.close();
-        }
-    }
-
-}
+package org.baeldung.boot.controller.servlet;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Objects;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class HelloWorldServlet extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+
+    public HelloWorldServlet() {
+        super();
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        PrintWriter out = null;
+        try {
+            out = response.getWriter();
+            out.println("HelloWorldServlet: GET METHOD");
+            out.flush();
+        } finally {
+            if (!Objects.isNull(out))
+                out.close();
+        }
+    }
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        PrintWriter out = null;
+        try {
+            out = response.getWriter();
+            out.println("HelloWorldServlet: POST METHOD");
+            out.flush();
+        } finally {
+            if (!Objects.isNull(out))
+                out.close();
+        }
+    }
+
+}

spring-boot/src/main/java/org/baeldung/boot/controller/servlet/SpringHelloWorldServlet.java

@@ -1,43 +1,43 @@
-package org.baeldung.controller.servlet;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Objects;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class SpringHelloWorldServlet extends HttpServlet {
-    private static final long serialVersionUID = 1L;
-
-    public SpringHelloWorldServlet() {
-        super();
-    }
-
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        PrintWriter out = null;
-        try {
-            out = response.getWriter();
-            out.println("SpringHelloWorldServlet: GET METHOD");
-            out.flush();
-        } finally {
-            if (!Objects.isNull(out))
-                out.close();
-        }
-    }
-
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        PrintWriter out = null;
-        try {
-            out = response.getWriter();
-            out.println("SpringHelloWorldServlet: POST METHOD");
-            out.flush();
-        } finally {
-            if (!Objects.isNull(out))
-                out.close();
-        }
-    }
-
-}
+package org.baeldung.boot.controller.servlet;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Objects;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class SpringHelloWorldServlet extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+
+    public SpringHelloWorldServlet() {
+        super();
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        PrintWriter out = null;
+        try {
+            out = response.getWriter();
+            out.println("SpringHelloWorldServlet: GET METHOD");
+            out.flush();
+        } finally {
+            if (!Objects.isNull(out))
+                out.close();
+        }
+    }
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        PrintWriter out = null;
+        try {
+            out = response.getWriter();
+            out.println("SpringHelloWorldServlet: POST METHOD");
+            out.flush();
+        } finally {
+            if (!Objects.isNull(out))
+                out.close();
+        }
+    }
+
+}

spring-boot/src/main/java/org/baeldung/boot/converter/GenericBigDecimalConverter.java

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

spring-boot/src/main/java/org/baeldung/boot/converter/StringToEmployeeConverter.java

@@ -1,4 +1,4 @@
-package org.baeldung.converter;
+package org.baeldung.boot.converter;
 
 
 import com.baeldung.toggle.Employee;

spring-boot/src/main/java/org/baeldung/boot/converter/StringToEnumConverterFactory.java

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

spring-boot/src/main/java/org/baeldung/boot/converter/StringToLocalDateTimeConverter.java

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

spring-boot/src/main/java/org/baeldung/boot/converter/controller/StringToEmployeeConverterController.java

@@ -1,4 +1,4 @@
-package org.baeldung.converter.controller;
+package org.baeldung.boot.converter.controller;
 
 import com.baeldung.toggle.Employee;
 import org.springframework.http.MediaType;

spring-boot/src/main/java/org/baeldung/boot/domain/GenericEntity.java

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

spring-boot/src/main/java/org/baeldung/boot/domain/Modes.java

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

spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/User.java

@@ -1,4 +1,4 @@
-package org.baeldung.jsoncomponent;
+package org.baeldung.boot.jsoncomponent;
 
 import javafx.scene.paint.Color;
 

spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/UserCombinedSerializer.java

@@ -1,4 +1,4 @@
-package org.baeldung.jsoncomponent;
+package org.baeldung.boot.jsoncomponent;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;

spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/UserJsonDeserializer.java

@@ -1,4 +1,4 @@
-package org.baeldung.jsoncomponent;
+package org.baeldung.boot.jsoncomponent;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;

spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/UserJsonSerializer.java

@@ -1,4 +1,4 @@
-package org.baeldung.jsoncomponent;
+package org.baeldung.boot.jsoncomponent;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;

spring-boot/src/main/java/org/baeldung/boot/monitor/jmx/MonitoringConfig.java

@@ -1,22 +1,22 @@
-package org.baeldung.monitor.jmx;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.codahale.metrics.JmxReporter;
-import com.codahale.metrics.MetricRegistry;
-
-@Configuration
-public class MonitoringConfig {
-    @Autowired
-    private MetricRegistry registry;
-
-    @Bean
-    public JmxReporter jmxReporter() {
-        JmxReporter reporter = JmxReporter.forRegistry(registry)
-            .build();
-        reporter.start();
-        return reporter;
-    }
-}
+package org.baeldung.boot.monitor.jmx;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.codahale.metrics.JmxReporter;
+import com.codahale.metrics.MetricRegistry;
+
+@Configuration
+public class MonitoringConfig {
+    @Autowired
+    private MetricRegistry registry;
+
+    @Bean
+    public JmxReporter jmxReporter() {
+        JmxReporter reporter = JmxReporter.forRegistry(registry)
+            .build();
+        reporter.start();
+        return reporter;
+    }
+}

spring-boot/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java

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

spring-boot/src/main/java/org/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java

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

spring-boot/src/main/java/org/baeldung/boot/web/resolver/Version.java

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

spring-boot/src/main/java/org/baeldung/demo/DemoApplication.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot;
+package org.baeldung.demo;
 
 import com.baeldung.graphql.GraphqlConfiguration;
 import org.springframework.boot.SpringApplication;

spring-boot/src/main/java/org/baeldung/demo/boottest/Employee.java

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

spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeRepository.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.boottest;
+package org.baeldung.demo.boottest;
 
 import java.util.List;
 

spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeRestController.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.boottest;
+package org.baeldung.demo.boottest;
 
 import java.util.List;
 

spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeService.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.boottest;
+package org.baeldung.demo.boottest;
 
 import java.util.List;
 

spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeServiceImpl.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.boottest;
+package org.baeldung.demo.boottest;
 
 import java.util.List;
 

spring-boot/src/main/java/org/baeldung/demo/components/FooService.java

@@ -1,7 +1,7 @@
-package org.baeldung.boot.components;
+package org.baeldung.demo.components;
 
-import org.baeldung.boot.model.Foo;
-import org.baeldung.boot.repository.FooRepository;
+import org.baeldung.demo.model.Foo;
+import org.baeldung.demo.repository.FooRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

spring-boot/src/main/java/org/baeldung/demo/exceptions/CommonException.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.exceptions;
+package org.baeldung.demo.exceptions;
 
 public class CommonException extends RuntimeException {
 

spring-boot/src/main/java/org/baeldung/demo/exceptions/FooNotFoundException.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.exceptions;
+package org.baeldung.demo.exceptions;
 
 public class FooNotFoundException extends RuntimeException {
 

spring-boot/src/main/java/org/baeldung/demo/model/Foo.java

@@ -1,4 +1,4 @@
-package org.baeldung.boot.model;
+package org.baeldung.demo.model;
 
 import java.io.Serializable;
 

spring-boot/src/main/java/org/baeldung/demo/repository/FooRepository.java

@@ -1,6 +1,6 @@
-package org.baeldung.boot.repository;
+package org.baeldung.demo.repository;
 
-import org.baeldung.boot.model.Foo;
+import org.baeldung.demo.model.Foo;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface FooRepository extends JpaRepository<Foo, Integer> {

spring-boot/src/main/java/org/baeldung/demo/service/FooController.java

@@ -1,7 +1,7 @@
-package org.baeldung.boot.service;
+package org.baeldung.demo.service;
 
-import org.baeldung.boot.components.FooService;
-import org.baeldung.boot.model.Foo;
+import org.baeldung.demo.components.FooService;
+import org.baeldung.demo.model.Foo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

spring-boot/src/main/java/org/baeldung/endpoints/info/TotalUsersInfoContributor.java

@@ -3,7 +3,7 @@ package org.baeldung.endpoints.info;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.baeldung.boot.repository.UserRepository;
+import org.baeldung.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.info.Info;
 import org.springframework.boot.actuate.info.InfoContributor;

spring-boot/src/main/java/org/baeldung/main/SpringBootApplication.java

@@ -1,9 +1,9 @@
 package org.baeldung.main;
 
+import org.baeldung.boot.controller.servlet.HelloWorldServlet;
+import org.baeldung.boot.controller.servlet.SpringHelloWorldServlet;
 import org.baeldung.common.error.SpringHelloServletRegistrationBean;
 import org.baeldung.common.resources.ExecutorServiceExitCodeGenerator;
-import org.baeldung.controller.servlet.HelloWorldServlet;
-import org.baeldung.controller.servlet.SpringHelloWorldServlet;
 import org.baeldung.service.LoginService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
@@ -11,6 +11,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -21,7 +22,7 @@ import java.util.concurrent.Executors;
 
 @RestController
 @EnableAutoConfiguration(exclude = MySQLAutoconfiguration.class)
-@ComponentScan({ "org.baeldung.common.error", "org.baeldung.common.error.controller", "org.baeldung.common.properties", "org.baeldung.common.resources", "org.baeldung.endpoints", "org.baeldung.service", "org.baeldung.monitor.jmx", "org.baeldung.service" })
+@ComponentScan({ "org.baeldung.common.error", "org.baeldung.common.error.controller", "org.baeldung.common.properties", "org.baeldung.common.resources","org.baeldung.endpoints", "org.baeldung.service", "org.baeldung.monitor.jmx", "org.baeldung.boot.config"})
 public class SpringBootApplication {
 
     private static ApplicationContext applicationContext;

spring-boot/src/main/java/org/baeldung/model/User.java

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

spring-boot/src/main/java/org/baeldung/repository/UserRepository.java

@@ -1,6 +1,6 @@
-package org.baeldung.boot.repository;
+package org.baeldung.repository;
 
-import org.baeldung.boot.model.User;
+import org.baeldung.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

spring-boot/src/main/java/org/baeldung/session/exception/Application.java

@@ -1,6 +1,6 @@
 package org.baeldung.session.exception;
 
-import org.baeldung.boot.model.Foo;
+import org.baeldung.demo.model.Foo;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;

spring-boot/src/main/java/org/baeldung/session/exception/repository/FooRepository.java

@@ -1,6 +1,6 @@
 package org.baeldung.session.exception.repository;
 
-import org.baeldung.boot.model.Foo;
+import org.baeldung.demo.model.Foo;
 
 public interface FooRepository {
 

spring-boot/src/main/java/org/baeldung/session/exception/repository/FooRepositoryImpl.java

@@ -1,6 +1,6 @@
 package org.baeldung.session.exception.repository;
 
-import org.baeldung.boot.model.Foo;
+import org.baeldung.demo.model.Foo;
 import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Profile;