Merge f5c2880 into 7f27c70

pom.xml

@@ -11,34 +11,29 @@
   <url>http://maven.apache.org</url>
 
   <parent>
-    <groupId>me.javaroad</groupId>
+    <groupId>me.javaroad.mcloud</groupId>
     <artifactId>mcloud-parent</artifactId>
-    <version>1.0.4.RELEASE</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
 
-	<properties>
-		<!-- automatically run annotation processors within the incremental compilation -->
-		<m2e.apt.activation>jdt_apt</m2e.apt.activation>
-	</properties>
-
   <dependencies>
 
     <dependency>
       <groupId>me.javaroad</groupId>
-      <artifactId>mcloud-common</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <artifactId>javaroad-common</artifactId>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>me.javaroad</groupId>
-      <artifactId>mcloud-data</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <artifactId>javaroad-data</artifactId>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>me.javaroad</groupId>
+      <groupId>me.javaroad.mcloud</groupId>
       <artifactId>mcloud-web</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -72,16 +67,27 @@
 
     <dependency>
       <groupId>org.mapstruct</groupId>
-      <artifactId>mapstruct-jdk8</artifactId>
-      <version>${org.mapstruct.version}</version>
+      <artifactId>mapstruct</artifactId>
     </dependency>
     <dependency>
       <groupId>org.mapstruct</groupId>
       <artifactId>mapstruct-processor</artifactId>
-      <version>${org.mapstruct.version}</version>
       <scope>provided</scope>
     </dependency>
 
+    <!--test-->
+    <dependency>
+      <groupId>me.javaroad</groupId>
+      <artifactId>javaroad-test</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.flywaydb.flyway-test-extensions</groupId>
+      <artifactId>flyway-spring-test</artifactId>
+      <version>${flyway.version}</version>
+      <scope>test</scope>
+    </dependency>
 
     <!--webjars-->
     <dependency>
@@ -211,7 +217,7 @@
       <plugin>
         <groupId>com.mysema.maven</groupId>
         <artifactId>apt-maven-plugin</artifactId>
-        <version>${apt-maven-plugin.version}</version>
+        <version>${apt-maven.version}</version>
         <executions>
           <execution>
             <goals>
@@ -235,7 +241,7 @@
       <plugin>
         <groupId>org.flywaydb</groupId>
         <artifactId>flyway-maven-plugin</artifactId>
-        <version>${flyway-maven-plugin.version}</version>
+        <version>${flyway.version}</version>
         <configuration>
           <user>root</user>
           <password>root</password>

src/main/java/me/javaroad/oauth/OAuthServer.java → src/main/java/me/javaroad/mcloud/oauth/OAuthServer.java

@@ -1,4 +1,4 @@
-package me.javaroad.oauth;
+package me.javaroad.mcloud.oauth;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/me/javaroad/oauth/config/AppConfig.java → src/main/java/me/javaroad/mcloud/oauth/config/AppConfig.java

@@ -1,8 +1,8 @@
-package me.javaroad.oauth.config;
+package me.javaroad.mcloud.oauth.config;
 
 import me.javaroad.data.config.JpaAuditingConfig;
-import me.javaroad.web.config.SimpleSwaggerConfig;
-import me.javaroad.web.exception.SimpleExceptionHandler;
+import me.javaroad.mcloud.web.config.SimpleSwaggerConfig;
+import me.javaroad.mcloud.web.exception.SimpleExceptionHandler;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 

src/main/java/me/javaroad/oauth/config/AppWebConfig.java → src/main/java/me/javaroad/mcloud/oauth/config/AppWebConfig.java

@@ -1,6 +1,6 @@
-package me.javaroad.oauth.config;
+package me.javaroad.mcloud.oauth.config;
 
-import me.javaroad.web.config.SimpleWebConfig;
+import me.javaroad.mcloud.web.config.SimpleWebConfig;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;

src/main/java/me/javaroad/oauth/config/AuthorizationServerConfig.java → src/main/java/me/javaroad/mcloud/oauth/config/AuthorizationServerConfig.java

@@ -1,7 +1,7 @@
-package me.javaroad.oauth.config;
+package me.javaroad.mcloud.oauth.config;
 
-import me.javaroad.oauth.core.CustomClientDetailsService;
-import me.javaroad.oauth.core.CustomUserApprovalHandler;
+import me.javaroad.mcloud.oauth.core.CustomClientDetailsService;
+import me.javaroad.mcloud.oauth.core.CustomUserApprovalHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;

src/main/java/me/javaroad/oauth/config/MethodSecurityConfig.java → src/main/java/me/javaroad/mcloud/oauth/config/MethodSecurityConfig.java

@@ -1,4 +1,4 @@
-package me.javaroad.oauth.config;
+package me.javaroad.mcloud.oauth.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;

src/main/java/me/javaroad/oauth/config/PasswordEncoderConfig.java → src/main/java/me/javaroad/mcloud/oauth/config/PasswordEncoderConfig.java

@@ -1,4 +1,4 @@
-package me.javaroad.oauth.config;
+package me.javaroad.mcloud.oauth.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/me/javaroad/oauth/config/ResourceServerConfig.java → src/main/java/me/javaroad/mcloud/oauth/config/ResourceServerConfig.java

@@ -1,4 +1,4 @@
-package me.javaroad.oauth.config;
+package me.javaroad.mcloud.oauth.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;

src/main/java/me/javaroad/oauth/config/SecurityConfig.java → src/main/java/me/javaroad/mcloud/oauth/config/SecurityConfig.java

@@ -1,6 +1,6 @@
-package me.javaroad.oauth.config;
+package me.javaroad.mcloud.oauth.config;
 
-import me.javaroad.oauth.core.CustomUserDetailsService;
+import me.javaroad.mcloud.oauth.core.CustomUserDetailsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/me/javaroad/oauth/config/SuccessHandler.java → src/main/java/me/javaroad/mcloud/oauth/config/SuccessHandler.java

@@ -1,14 +1,12 @@
-package me.javaroad.oauth.config;
-
-import static me.javaroad.oauth.controller.OAuthConstants.Default.DEFAULT_ADMIN_AUTHORITY;
-import static me.javaroad.oauth.controller.OAuthConstants.Default.DEFAULT_DEVELOPER_AUTHORITY;
+package me.javaroad.mcloud.oauth.config;
 
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Objects;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import me.javaroad.mcloud.oauth.controller.OAuthConstants.Default;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
@@ -22,9 +20,9 @@ public class SuccessHandler extends SavedRequestAwareAuthenticationSuccessHandle
     @Override
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
         Authentication authentication) throws IOException, ServletException {
-        if (hasRole(authentication.getAuthorities(), DEFAULT_ADMIN_AUTHORITY)) {
+        if (hasRole(authentication.getAuthorities(), Default.DEFAULT_ADMIN_AUTHORITY)) {
             setDefaultTargetUrl("/admin/dashboard");
-        } else if (hasRole(authentication.getAuthorities(), DEFAULT_DEVELOPER_AUTHORITY)) {
+        } else if (hasRole(authentication.getAuthorities(), Default.DEFAULT_DEVELOPER_AUTHORITY)) {
             setDefaultTargetUrl("/console/dashboard");
         }
         super.onAuthenticationSuccess(request, response, authentication);

src/main/java/me/javaroad/oauth/controller/OAuthConstants.java → src/main/java/me/javaroad/mcloud/oauth/controller/OAuthConstants.java

@@ -1,4 +1,4 @@
-package me.javaroad.oauth.controller;
+package me.javaroad.mcloud.oauth.controller;
 
 /**
  * @author heyx

src/main/java/me/javaroad/oauth/controller/admin/AdminDashboardController.java → src/main/java/me/javaroad/mcloud/oauth/controller/admin/AdminDashboardController.java

@@ -1,8 +1,7 @@
-package me.javaroad.oauth.controller.admin;
+package me.javaroad.mcloud.oauth.controller.admin;
 
-import static me.javaroad.oauth.controller.OAuthConstants.ADMIN_PREFIX;
-
-import me.javaroad.web.controller.BaseController;
+import me.javaroad.mcloud.oauth.controller.OAuthConstants;
+import me.javaroad.mcloud.web.controller.BaseController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,7 +10,7 @@
  * @author heyx
  */
 @Controller
-@RequestMapping(ADMIN_PREFIX)
+@RequestMapping(OAuthConstants.ADMIN_PREFIX)
 public class AdminDashboardController extends BaseController {
 
     @GetMapping(value = {"/dashboard", "/", ""})

src/main/java/me/javaroad/oauth/controller/admin/AdminDeveloperInfoController.java → src/main/java/me/javaroad/mcloud/oauth/controller/admin/AdminDeveloperInfoController.java

@@ -1,8 +1,7 @@
-package me.javaroad.oauth.controller.admin;
+package me.javaroad.mcloud.oauth.controller.admin;
 
-import static me.javaroad.oauth.controller.OAuthConstants.ADMIN_PREFIX;
-
-import me.javaroad.web.controller.BaseController;
+import me.javaroad.mcloud.oauth.controller.OAuthConstants;
+import me.javaroad.mcloud.web.controller.BaseController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,7 +10,7 @@
  * @author heyx
  */
 @Controller
-@RequestMapping(ADMIN_PREFIX + "/dev")
+@RequestMapping(OAuthConstants.ADMIN_PREFIX + "/dev")
 public class AdminDeveloperInfoController extends BaseController {
 
     @GetMapping("index")

src/main/java/me/javaroad/oauth/controller/admin/AdminOAuth2Controller.java → src/main/java/me/javaroad/mcloud/oauth/controller/admin/AdminOAuth2Controller.java

@@ -1,8 +1,7 @@
-package me.javaroad.oauth.controller.admin;
+package me.javaroad.mcloud.oauth.controller.admin;
 
-import static me.javaroad.oauth.controller.OAuthConstants.ADMIN_PREFIX;
-
-import me.javaroad.web.controller.BaseController;
+import me.javaroad.mcloud.oauth.controller.OAuthConstants;
+import me.javaroad.mcloud.web.controller.BaseController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,7 +10,7 @@
  * @author heyx
  */
 @Controller
-@RequestMapping(ADMIN_PREFIX + "/oauth2")
+@RequestMapping(OAuthConstants.ADMIN_PREFIX + "/oauth2")
 public class AdminOAuth2Controller extends BaseController {
 
     @GetMapping("resource")

src/main/java/me/javaroad/oauth/controller/admin/AdminUserController.java → src/main/java/me/javaroad/mcloud/oauth/controller/admin/AdminUserController.java

@@ -1,8 +1,7 @@
-package me.javaroad.oauth.controller.admin;
+package me.javaroad.mcloud.oauth.controller.admin;
 
-import static me.javaroad.oauth.controller.OAuthConstants.ADMIN_PREFIX;
-
-import me.javaroad.web.controller.BaseController;
+import me.javaroad.mcloud.oauth.controller.OAuthConstants;
+import me.javaroad.mcloud.web.controller.BaseController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,7 +10,7 @@
  * @author heyx
  */
 @Controller
-@RequestMapping(ADMIN_PREFIX + "/user")
+@RequestMapping(OAuthConstants.ADMIN_PREFIX + "/user")
 public class AdminUserController extends BaseController {
 
     @GetMapping("index")

src/main/java/me/javaroad/oauth/controller/adminapi/AdminApprovalApi.java → src/main/java/me/javaroad/mcloud/oauth/controller/adminapi/AdminApprovalApi.java

@@ -1,13 +1,12 @@
-package me.javaroad.oauth.controller.adminapi;
-
-import static me.javaroad.oauth.controller.OAuthConstants.ADMIN_API_PREFIX;
+package me.javaroad.mcloud.oauth.controller.adminapi;
 
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import javax.validation.Valid;
-import me.javaroad.oauth.dto.request.ApprovalRequest;
-import me.javaroad.oauth.dto.response.ApprovalResponse;
-import me.javaroad.oauth.service.ApprovalService;
+import me.javaroad.mcloud.oauth.controller.OAuthConstants;
+import me.javaroad.mcloud.oauth.dto.request.ApprovalRequest;
+import me.javaroad.mcloud.oauth.dto.response.ApprovalResponse;
+import me.javaroad.mcloud.oauth.service.ApprovalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -23,7 +22,7 @@
  * @author heyx
  */
 @RestController
-@RequestMapping(ADMIN_API_PREFIX + "/approvals")
+@RequestMapping(OAuthConstants.ADMIN_API_PREFIX + "/approvals")
 public class AdminApprovalApi {
 
     private final ApprovalService approvalService;

src/main/java/me/javaroad/oauth/controller/adminapi/AdminAuthorityApi.java → src/main/java/me/javaroad/mcloud/oauth/controller/adminapi/AdminAuthorityApi.java

@@ -1,12 +1,11 @@
-package me.javaroad.oauth.controller.adminapi;
-
-import static me.javaroad.oauth.controller.OAuthConstants.ADMIN_API_PREFIX;
+package me.javaroad.mcloud.oauth.controller.adminapi;
 
 import io.swagger.annotations.ApiOperation;
 import javax.validation.Valid;
-import me.javaroad.oauth.dto.request.AuthorityRequest;
-import me.javaroad.oauth.dto.response.AuthorityResponse;
-import me.javaroad.oauth.service.AuthorityService;
+import me.javaroad.mcloud.oauth.controller.OAuthConstants;
+import me.javaroad.mcloud.oauth.service.AuthorityService;
+import me.javaroad.mcloud.oauth.dto.request.AuthorityRequest;
+import me.javaroad.mcloud.oauth.dto.response.AuthorityResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -25,7 +24,7 @@
  * @author heyx
  */
 @RestController
-@RequestMapping(ADMIN_API_PREFIX + "/authorities")
+@RequestMapping(OAuthConstants.ADMIN_API_PREFIX + "/authorities")
 public class AdminAuthorityApi {
 
     private final AuthorityService authorityService;

src/main/java/me/javaroad/oauth/controller/adminapi/AdminClientApi.java → src/main/java/me/javaroad/mcloud/oauth/controller/adminapi/AdminClientApi.java

@@ -1,10 +1,9 @@
-package me.javaroad.oauth.controller.adminapi;
-
-import static me.javaroad.oauth.controller.OAuthConstants.ADMIN_API_PREFIX;
+package me.javaroad.mcloud.oauth.controller.adminapi;
 
 import io.swagger.annotations.ApiOperation;
-import me.javaroad.oauth.dto.response.ClientResponse;
-import me.javaroad.oauth.service.ClientService;
+import me.javaroad.mcloud.oauth.controller.OAuthConstants;
+import me.javaroad.mcloud.oauth.dto.response.ClientResponse;
+import me.javaroad.mcloud.oauth.service.ClientService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -21,7 +20,7 @@
  * @author heyx
  */
 @RestController
-@RequestMapping(ADMIN_API_PREFIX + "/clients")
+@RequestMapping(OAuthConstants.ADMIN_API_PREFIX + "/clients")
 public class AdminClientApi {
 
     private final ClientService clientService;

src/main/java/me/javaroad/oauth/controller/adminapi/AdminDeveloperInfoApi.java → src/main/java/me/javaroad/mcloud/oauth/controller/adminapi/AdminDeveloperInfoApi.java

@@ -1,12 +1,11 @@
-package me.javaroad.oauth.controller.adminapi;
-
-import static me.javaroad.oauth.controller.OAuthConstants.ADMIN_API_PREFIX;
+package me.javaroad.mcloud.oauth.controller.adminapi;
 
 import io.swagger.annotations.ApiOperation;
-import me.javaroad.oauth.dto.request.DeveloperInfoSearchRequest;
-import me.javaroad.oauth.dto.response.DeveloperInfoResponse;
-import me.javaroad.oauth.entity.Status;
-import me.javaroad.oauth.service.DeveloperInfoService;
+import me.javaroad.mcloud.oauth.controller.OAuthConstants;
+import me.javaroad.mcloud.oauth.dto.request.DeveloperInfoSearchRequest;
+import me.javaroad.mcloud.oauth.dto.response.DeveloperInfoResponse;
+import me.javaroad.mcloud.oauth.entity.Status;
+import me.javaroad.mcloud.oauth.service.DeveloperInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -21,7 +20,7 @@
  * @author heyx
  */
 @RestController
-@RequestMapping(ADMIN_API_PREFIX + "/developer-infos")
+@RequestMapping(OAuthConstants.ADMIN_API_PREFIX + "/developer-infos")
 public class AdminDeveloperInfoApi {
 
     private final DeveloperInfoService developerInfoService;