Skip to content

Commit

Permalink
refactor($Starter): rename spring-boot to spring-cloud
Browse files Browse the repository at this point in the history
Old module name:
spring-boot-starter
New module
name:
spring-cloud-starter
New package name:
package
com.jmsoftware.maf.springcloudstarter;

BREAKING CHANGE: rename `spring-boot` to `spring-cloud`

[skip ci]
  • Loading branch information
johnnymillergh committed Feb 7, 2021
1 parent ee99dd0 commit 2529e45
Show file tree
Hide file tree
Showing 53 changed files with 103 additions and 103 deletions.
2 changes: 1 addition & 1 deletion auth-center/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<dependencies>
<dependency>
<groupId>com.jmsoftware.maf</groupId>
<artifactId>spring-boot-starter</artifactId>
<artifactId>spring-cloud-starter</artifactId>
</dependency>

<!-- https://github.com/jwtk/jjwt -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.jmsoftware.maf.authcenter;

import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import com.jmsoftware.maf.springbootstarter.helper.IpHelper;
import com.jmsoftware.maf.springcloudstarter.configuration.MafProjectProperty;
import com.jmsoftware.maf.springcloudstarter.helper.IpHelper;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.springframework.boot.SpringApplication;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import com.jmsoftware.maf.common.domain.authcenter.permission.PermissionType;
import com.jmsoftware.maf.common.domain.springbootstarter.HttpApiResourcesResponse;
import com.jmsoftware.maf.common.exception.BusinessException;
import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import com.jmsoftware.maf.springcloudstarter.configuration.MafProjectProperty;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.jmsoftware.maf.authcenter.role.mapper.RoleMapper;
import com.jmsoftware.maf.authcenter.role.service.RoleService;
import com.jmsoftware.maf.common.domain.authcenter.role.GetRoleListByUserIdResponse;
import com.jmsoftware.maf.springbootstarter.configuration.MafConfiguration;
import com.jmsoftware.maf.springcloudstarter.configuration.MafConfiguration;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.jmsoftware.maf.authcenter.security.service.JwtService;
import com.jmsoftware.maf.common.domain.authcenter.security.UserPrincipal;
import com.jmsoftware.maf.common.exception.SecurityException;
import com.jmsoftware.maf.springbootstarter.configuration.JwtConfiguration;
import com.jmsoftware.maf.springcloudstarter.configuration.JwtConfiguration;
import io.jsonwebtoken.*;
import io.jsonwebtoken.security.Keys;
import lombok.RequiredArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion exercise-mis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<dependencies>
<dependency>
<groupId>com.jmsoftware.maf</groupId>
<artifactId>spring-boot-starter</artifactId>
<artifactId>spring-cloud-starter</artifactId>
</dependency>

<!-- Test -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.jmsoftware.maf.exercisemis;

import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import com.jmsoftware.maf.springbootstarter.helper.IpHelper;
import com.jmsoftware.maf.springcloudstarter.configuration.MafProjectProperty;
import com.jmsoftware.maf.springcloudstarter.helper.IpHelper;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.springframework.boot.SpringApplication;
Expand Down
2 changes: 1 addition & 1 deletion muscle-mis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<dependencies>
<dependency>
<groupId>com.jmsoftware.maf</groupId>
<artifactId>spring-boot-starter</artifactId>
<artifactId>spring-cloud-starter</artifactId>
</dependency>

<!-- Test -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.jmsoftware.maf.musclemis;

import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import com.jmsoftware.maf.springbootstarter.helper.IpHelper;
import com.jmsoftware.maf.springcloudstarter.configuration.MafProjectProperty;
import com.jmsoftware.maf.springcloudstarter.helper.IpHelper;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.springframework.boot.SpringApplication;
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<modules>
<module>common</module>
<module>universal-ui</module>
<module>spring-boot-starter</module>
<module>spring-cloud-starter</module>
<module>reactive-spring-cloud-starter</module>
<module>spring-boot-admin</module>
<module>api-gateway</module>
Expand Down Expand Up @@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>com.jmsoftware.maf</groupId>
<artifactId>spring-boot-starter</artifactId>
<artifactId>spring-cloud-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-admin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<dependencies>
<dependency>
<groupId>com.jmsoftware.maf</groupId>
<artifactId>spring-boot-starter</artifactId>
<artifactId>spring-cloud-starter</artifactId>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.jmsoftware.maf.springbootadmin;

import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import com.jmsoftware.maf.springbootstarter.helper.IpHelper;
import com.jmsoftware.maf.springcloudstarter.configuration.MafProjectProperty;
import com.jmsoftware.maf.springcloudstarter.helper.IpHelper;
import de.codecentric.boot.admin.server.config.EnableAdminServer;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
Expand Down

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>

<!-- Sub-module Basics -->
<artifactId>spring-boot-starter</artifactId>
<artifactId>spring-cloud-starter</artifactId>
<name>Muscle and Fitness Server :: Spring Boot Starter</name>
<description>Muscle and Fitness Server Spring Boot Starter</description>
<parent>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
package com.jmsoftware.maf.springbootstarter;

import com.jmsoftware.maf.springbootstarter.aspect.ExceptionControllerAdvice;
import com.jmsoftware.maf.springbootstarter.aspect.WebRequestLogAspect;
import com.jmsoftware.maf.springbootstarter.configuration.*;
import com.jmsoftware.maf.springbootstarter.controller.CommonController;
import com.jmsoftware.maf.springbootstarter.controller.GlobalErrorController;
import com.jmsoftware.maf.springbootstarter.controller.HttpApiResourceRemoteApiController;
import com.jmsoftware.maf.springbootstarter.controller.RedirectController;
import com.jmsoftware.maf.springbootstarter.database.MyBatisPlusConfiguration;
import com.jmsoftware.maf.springbootstarter.filter.AccessLogFilter;
import com.jmsoftware.maf.springbootstarter.helper.HttpApiScanHelper;
import com.jmsoftware.maf.springbootstarter.helper.IpHelper;
import com.jmsoftware.maf.springbootstarter.redis.RedisConfiguration;
import com.jmsoftware.maf.springbootstarter.service.CommonService;
import com.jmsoftware.maf.springbootstarter.service.impl.CommonServiceImpl;
import com.jmsoftware.maf.springbootstarter.sftp.SftpConfiguration;
package com.jmsoftware.maf.springcloudstarter;

import com.jmsoftware.maf.springcloudstarter.aspect.ExceptionControllerAdvice;
import com.jmsoftware.maf.springcloudstarter.aspect.WebRequestLogAspect;
import com.jmsoftware.maf.springcloudstarter.configuration.*;
import com.jmsoftware.maf.springcloudstarter.controller.CommonController;
import com.jmsoftware.maf.springcloudstarter.controller.GlobalErrorController;
import com.jmsoftware.maf.springcloudstarter.controller.HttpApiResourceRemoteApiController;
import com.jmsoftware.maf.springcloudstarter.controller.RedirectController;
import com.jmsoftware.maf.springcloudstarter.database.MyBatisPlusConfiguration;
import com.jmsoftware.maf.springcloudstarter.filter.AccessLogFilter;
import com.jmsoftware.maf.springcloudstarter.helper.HttpApiScanHelper;
import com.jmsoftware.maf.springcloudstarter.helper.IpHelper;
import com.jmsoftware.maf.springcloudstarter.redis.RedisConfiguration;
import com.jmsoftware.maf.springcloudstarter.service.CommonService;
import com.jmsoftware.maf.springcloudstarter.service.impl.CommonServiceImpl;
import com.jmsoftware.maf.springcloudstarter.sftp.SftpConfiguration;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.jmsoftware.maf.springbootstarter.aspect;
package com.jmsoftware.maf.springcloudstarter.aspect;

import cn.hutool.core.util.StrUtil;
import com.jmsoftware.maf.common.bean.ResponseBodyBean;
import com.jmsoftware.maf.common.exception.BaseException;
import com.jmsoftware.maf.springbootstarter.util.RequestUtil;
import com.jmsoftware.maf.springcloudstarter.util.RequestUtil;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.springframework.context.support.DefaultMessageSourceResolvable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.jmsoftware.maf.springbootstarter.aspect;
package com.jmsoftware.maf.springcloudstarter.aspect;

import cn.hutool.json.JSONUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.jmsoftware.maf.springbootstarter.util.RequestUtil;
import com.jmsoftware.maf.springcloudstarter.util.RequestUtil;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.aspectj.lang.JoinPoint;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.maf.springbootstarter.configuration;
package com.jmsoftware.maf.springcloudstarter.configuration;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.maf.springbootstarter.configuration;
package com.jmsoftware.maf.springcloudstarter.configuration;

import com.google.common.collect.Lists;
import lombok.Data;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.jmsoftware.maf.springbootstarter.configuration;
package com.jmsoftware.maf.springcloudstarter.configuration;

import lombok.AccessLevel;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.context.properties.ConfigurationProperties;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.maf.springbootstarter.configuration;
package com.jmsoftware.maf.springcloudstarter.configuration;

import cn.hutool.core.util.ObjectUtil;
import lombok.Data;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.maf.springbootstarter.configuration;
package com.jmsoftware.maf.springcloudstarter.configuration;

import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.maf.springbootstarter.configuration;
package com.jmsoftware.maf.springcloudstarter.configuration;

import lombok.extern.slf4j.Slf4j;
import lombok.val;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.maf.springbootstarter.configuration;
package com.jmsoftware.maf.springcloudstarter.configuration;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.maf.springbootstarter.configuration;
package com.jmsoftware.maf.springcloudstarter.configuration;

import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Configuration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.maf.springbootstarter.configuration;
package com.jmsoftware.maf.springcloudstarter.configuration;

import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Bean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.jmsoftware.maf.springbootstarter.controller;
package com.jmsoftware.maf.springcloudstarter.controller;

import cn.hutool.json.JSON;
import com.jmsoftware.maf.common.bean.ResponseBodyBean;
import com.jmsoftware.maf.common.domain.ValidationTestPayload;
import com.jmsoftware.maf.springbootstarter.service.CommonService;
import com.jmsoftware.maf.springcloudstarter.service.CommonService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.maf.springbootstarter.controller;
package com.jmsoftware.maf.springcloudstarter.controller;

import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
package com.jmsoftware.maf.springbootstarter.controller;
package com.jmsoftware.maf.springcloudstarter.controller;

import cn.hutool.core.collection.CollUtil;
import com.jmsoftware.maf.common.bean.ResponseBodyBean;
import com.jmsoftware.maf.common.domain.springbootstarter.HttpApiResourcesResponse;
import com.jmsoftware.maf.springbootstarter.configuration.MafConfiguration;
import com.jmsoftware.maf.springbootstarter.helper.HttpApiScanHelper;
import com.jmsoftware.maf.springcloudstarter.configuration.MafConfiguration;
import com.jmsoftware.maf.springcloudstarter.helper.HttpApiScanHelper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.val;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.LinkedList;
import java.util.Optional;
import java.util.*;

/**
* Description: HttpApiResourceRemoteApiController, change description here.
Expand All @@ -38,8 +37,12 @@ public ResponseBodyBean<HttpApiResourcesResponse> getHttpApiResource() {
.orElseThrow(() -> new RuntimeException("Request method mustn't be null!"));
val httpApiResource = new HttpApiResourcesResponse.HttpApiResource();
httpApiResource.setMethod(requestMethod);
httpApiResource.setUrlPattern(
new LinkedList<>(requestMappingInfo.getPatternsCondition().getPatterns()).get(0));
val patterns = Objects.requireNonNull(requestMappingInfo.getPatternsCondition()).getPatterns();
if (CollUtil.isNotEmpty(patterns)) {
httpApiResource.setUrlPattern(new LinkedList<>(patterns).get(0));
} else {
httpApiResource.setUrlPattern("/url-pattern-not-found");
}
response.getList().add(httpApiResource);
});
return ResponseBodyBean.ofSuccess(response);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.maf.springbootstarter.controller;
package com.jmsoftware.maf.springcloudstarter.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.maf.springbootstarter.database;
package com.jmsoftware.maf.springcloudstarter.database;

import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
package com.jmsoftware.maf.springbootstarter.database;
package com.jmsoftware.maf.springcloudstarter.database;

import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.jmsoftware.maf.common.domain.DeleteFlag;
import com.jmsoftware.maf.springbootstarter.configuration.MafConfiguration;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.EnableTransactionManagement;

import java.util.Date;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.jmsoftware.maf.springbootstarter.filter;
package com.jmsoftware.maf.springcloudstarter.filter;

import com.jmsoftware.maf.springbootstarter.configuration.MafConfiguration;
import com.jmsoftware.maf.springbootstarter.util.RequestUtil;
import com.jmsoftware.maf.springcloudstarter.configuration.MafConfiguration;
import com.jmsoftware.maf.springcloudstarter.util.RequestUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.maf.springbootstarter.helper;
package com.jmsoftware.maf.springcloudstarter.helper;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand All @@ -24,7 +24,17 @@
@RequiredArgsConstructor
public class HttpApiScanHelper {
private final RequestMappingHandlerMapping requestMappingHandlerMapping;
private static final String EXCLUDED_PACKAGE = "com.jmsoftware.maf.springbootstarter";
private static final String EXCLUDED_PACKAGE;

static {
val splitPackage = HttpApiScanHelper.class.getPackage().getName().split("\\.");
var jointPackage = new StringBuilder();
for (var index = 0; index < splitPackage.length - 1; index++) {
jointPackage.append(splitPackage[index]).append(".");
}
EXCLUDED_PACKAGE = jointPackage.toString();
log.warn("EXCLUDED_PACKAGE was generated dynamically. EXCLUDED_PACKAGE = {}", EXCLUDED_PACKAGE);
}

/**
* Scan map.
Expand All @@ -38,13 +48,14 @@ public Map<RequestMappingInfo, HandlerMethod> scan(@NotBlank String includedPack
log.debug("Scanned request mapping info: {}", handlerMethods);
val filteredHandlerMethods = new LinkedHashMap<RequestMappingInfo, HandlerMethod>();
handlerMethods.forEach((requestMappingInfo, handlerMethod) -> {
// filter the Controller APIs that are defined in `spring-cloud-starter`
if (handlerMethod.toString().contains(includedPackage) &&
!handlerMethod.toString().contains(EXCLUDED_PACKAGE)) {
try {
RequestMethod requestMethod = new ArrayList<>(
requestMappingInfo.getMethodsCondition().getMethods()).get(0);
log.debug("Request: [{}] {}, handler method: {}", requestMethod,
requestMappingInfo.getPatternsCondition(), handlerMethod);
requestMappingInfo.getPatternsCondition(), handlerMethod);
filteredHandlerMethods.put(requestMappingInfo, handlerMethod);
} catch (Exception e) {
log.warn(
Expand Down
Loading

0 comments on commit 2529e45

Please sign in to comment.