Skip to content

Commit

Permalink
refactor($Project): change package name, groupId, DockerHub image rep…
Browse files Browse the repository at this point in the history
…ository

Formally, the `muscle-and-fitness-server` short name is `maf`.

BREAKING CHANGE: changed package name, groupId, DockerHub image repository
  • Loading branch information
johnnymillergh committed May 18, 2020
1 parent e5682ae commit 4f65ad7
Show file tree
Hide file tree
Showing 277 changed files with 2,205 additions and 2,188 deletions.
8 changes: 4 additions & 4 deletions api-portal/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

<!-- Sub-module Basics -->
<artifactId>api-portal</artifactId>
<name>API Portal</name>
<name>Muscle and Fitness Server :: API Portal</name>
<description>API Portal is an entrance for upcoming requests from any external devices. Responsible for aggregating
internal microservices and exposing to external.
</description>
<parent>
<groupId>com.jmsoftware</groupId>
<groupId>com.jmsoftware.maf</groupId>
<artifactId>muscle-and-fitness-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
Expand Down Expand Up @@ -51,7 +51,7 @@
<image>openjdk:11.0.6-slim</image>
</from>
<to>
<image>docker.io/ijohnnymiller/${project.artifactId}-${envAlias}</image>
<image>docker.io/ijohnnymiller/${parent.artifactId}/${project.artifactId}-${envAlias}</image>
<tags>
<tag>${project.version}</tag>
</tags>
Expand Down Expand Up @@ -106,7 +106,7 @@
</dependency>

<dependency>
<groupId>com.jmsoftware</groupId>
<groupId>com.jmsoftware.maf</groupId>
<artifactId>common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.jmsoftware.apiportal;
package com.jmsoftware.maf.apiportal;

import com.jmsoftware.apiportal.universal.configuration.ProjectProperty;
import com.jmsoftware.apiportal.universal.configuration.ServerConfiguration;
import com.jmsoftware.maf.apiportal.universal.configuration.ProjectProperty;
import com.jmsoftware.maf.apiportal.universal.configuration.ServerConfiguration;
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
@@ -1,10 +1,10 @@
package com.jmsoftware.apiportal.auth.controller;
package com.jmsoftware.maf.apiportal.auth.controller;

import com.jmsoftware.apiportal.auth.entity.LoginPayload;
import com.jmsoftware.apiportal.auth.entity.LoginResponse;
import com.jmsoftware.apiportal.auth.entity.RegisterPayload;
import com.jmsoftware.apiportal.auth.service.AuthenticationService;
import com.jmsoftware.common.bean.ResponseBodyBean;
import com.jmsoftware.maf.apiportal.auth.entity.LoginPayload;
import com.jmsoftware.maf.apiportal.auth.entity.LoginResponse;
import com.jmsoftware.maf.apiportal.auth.entity.RegisterPayload;
import com.jmsoftware.maf.apiportal.auth.service.AuthenticationService;
import com.jmsoftware.maf.common.bean.ResponseBodyBean;
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.apiportal.auth.entity;
package com.jmsoftware.maf.apiportal.auth.entity;

import lombok.Data;
import org.hibernate.validator.constraints.Length;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.apiportal.auth.entity;
package com.jmsoftware.maf.apiportal.auth.entity;

import lombok.Data;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.apiportal.auth.entity;
package com.jmsoftware.maf.apiportal.auth.entity;

import lombok.Data;
import org.hibernate.validator.constraints.Length;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.jmsoftware.apiportal.auth.service;
package com.jmsoftware.maf.apiportal.auth.service;

import com.jmsoftware.apiportal.auth.entity.LoginPayload;
import com.jmsoftware.apiportal.auth.entity.LoginResponse;
import com.jmsoftware.apiportal.auth.entity.RegisterPayload;
import com.jmsoftware.maf.apiportal.auth.entity.LoginPayload;
import com.jmsoftware.maf.apiportal.auth.entity.LoginResponse;
import com.jmsoftware.maf.apiportal.auth.entity.RegisterPayload;

/**
* <h1>AuthenticationService</h1>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.jmsoftware.apiportal.auth.service.impl;
package com.jmsoftware.maf.apiportal.auth.service.impl;

import com.jmsoftware.apiportal.auth.entity.LoginPayload;
import com.jmsoftware.apiportal.auth.entity.LoginResponse;
import com.jmsoftware.apiportal.auth.entity.RegisterPayload;
import com.jmsoftware.apiportal.auth.service.AuthenticationService;
import com.jmsoftware.apiportal.remoteapi.AuthCenterRemoteApi;
import com.jmsoftware.apiportal.universal.service.JwtService;
import com.jmsoftware.common.domain.authcenter.user.SaveUserForRegisteringPayload;
import com.jmsoftware.maf.apiportal.auth.entity.LoginPayload;
import com.jmsoftware.maf.apiportal.auth.entity.LoginResponse;
import com.jmsoftware.maf.apiportal.auth.entity.RegisterPayload;
import com.jmsoftware.maf.apiportal.auth.service.AuthenticationService;
import com.jmsoftware.maf.apiportal.remoteapi.AuthCenterRemoteApi;
import com.jmsoftware.maf.apiportal.universal.service.JwtService;
import com.jmsoftware.maf.common.domain.authcenter.user.SaveUserForRegisteringPayload;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.jmsoftware.apiportal.remoteapi;
package com.jmsoftware.maf.apiportal.remoteapi;

import com.jmsoftware.apiportal.universal.aspect.ValidateArgument;
import com.jmsoftware.common.bean.ResponseBodyBean;
import com.jmsoftware.common.domain.authcenter.permission.GetPermissionListByRoleIdListPayload;
import com.jmsoftware.common.domain.authcenter.permission.GetPermissionListByRoleIdListResponse;
import com.jmsoftware.common.domain.authcenter.permission.GetPermissionListByUserIdPayload;
import com.jmsoftware.common.domain.authcenter.permission.GetPermissionListByUserIdResponse;
import com.jmsoftware.common.domain.authcenter.role.GetRoleListByUserIdPayload;
import com.jmsoftware.common.domain.authcenter.role.GetRoleListByUserIdResponse;
import com.jmsoftware.common.domain.authcenter.user.GetUserByLoginTokenPayload;
import com.jmsoftware.common.domain.authcenter.user.GetUserByLoginTokenResponse;
import com.jmsoftware.common.domain.authcenter.user.SaveUserForRegisteringPayload;
import com.jmsoftware.common.domain.authcenter.user.SaveUserForRegisteringResponse;
import com.jmsoftware.maf.apiportal.universal.aspect.ValidateArgument;
import com.jmsoftware.maf.common.bean.ResponseBodyBean;
import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByRoleIdListPayload;
import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByRoleIdListResponse;
import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByUserIdPayload;
import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByUserIdResponse;
import com.jmsoftware.maf.common.domain.authcenter.role.GetRoleListByUserIdPayload;
import com.jmsoftware.maf.common.domain.authcenter.role.GetRoleListByUserIdResponse;
import com.jmsoftware.maf.common.domain.authcenter.user.GetUserByLoginTokenPayload;
import com.jmsoftware.maf.common.domain.authcenter.user.GetUserByLoginTokenResponse;
import com.jmsoftware.maf.common.domain.authcenter.user.SaveUserForRegisteringPayload;
import com.jmsoftware.maf.common.domain.authcenter.user.SaveUserForRegisteringResponse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.jmsoftware.apiportal.universal.aspect;
package com.jmsoftware.maf.apiportal.universal.aspect;

import cn.hutool.core.collection.CollUtil;
import com.jmsoftware.common.bean.ResponseBodyBean;
import com.jmsoftware.common.constant.HttpStatus;
import com.jmsoftware.common.exception.BaseException;
import com.jmsoftware.common.util.RequestUtil;
import com.jmsoftware.maf.common.bean.ResponseBodyBean;
import com.jmsoftware.maf.common.constant.HttpStatus;
import com.jmsoftware.maf.common.exception.BaseException;
import com.jmsoftware.maf.common.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,4 +1,4 @@
package com.jmsoftware.authcenter.universal.aspect;
package com.jmsoftware.maf.apiportal.universal.aspect;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ArrayUtil;
Expand Down Expand Up @@ -54,7 +54,7 @@ public MethodArgumentValidationAspect() {
* More detail at: <a href="https://howtodoinjava.com/spring-aop/aspectj-pointcut-expressions/">Spring aop aspectJ
* pointcut expression examples</a>
*/
@Pointcut("@annotation(com.jmsoftware.authcenter.universal.aspect.ValidateArgument)")
@Pointcut("@annotation(com.jmsoftware.maf.apiportal.universal.aspect.ValidateArgument)")
public void validateMethodArgumentPointcut() {
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.apiportal.universal.aspect;
package com.jmsoftware.maf.apiportal.universal.aspect;

import java.lang.annotation.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.jmsoftware.apiportal.universal.aspect;
package com.jmsoftware.maf.apiportal.universal.aspect;

import cn.hutool.json.JSONUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.jmsoftware.common.util.RequestUtil;
import com.jmsoftware.maf.common.util.RequestUtil;
import lombok.RequiredArgsConstructor;
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.apiportal.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.configuration;

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.apiportal.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.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.exercisemis.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.configuration;

import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.support.http.StatViewServlet;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.apiportal.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.configuration;

import com.google.common.collect.Lists;
import lombok.Data;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.authcenter.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.configuration;

import lombok.Data;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.exercisemis.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.configuration;

import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.gateway.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.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.apiportal.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.configuration;

import lombok.val;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.jmsoftware.apiportal.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.configuration;

import com.jmsoftware.common.constant.HttpStatus;
import com.jmsoftware.common.util.ResponseUtil;
import com.jmsoftware.maf.common.constant.HttpStatus;
import com.jmsoftware.maf.common.util.ResponseUtil;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.springframework.context.annotation.Bean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.gateway.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.configuration;

import lombok.Getter;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.apiportal.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.configuration;

import com.jcraft.jsch.ChannelSftp;
import lombok.Data;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.jmsoftware.authcenter.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.configuration;

import com.jmsoftware.authcenter.universal.domain.SftpSubDirectory;
import com.jmsoftware.maf.apiportal.universal.domain.SftpSubDirectory;
import lombok.RequiredArgsConstructor;
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.apiportal.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.configuration;

import org.springframework.integration.annotation.Gateway;
import org.springframework.integration.annotation.MessagingGateway;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.apiportal.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.configuration;

import lombok.RequiredArgsConstructor;
import lombok.val;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.apiportal.universal.configuration;
package com.jmsoftware.maf.apiportal.universal.configuration;

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

import com.jmsoftware.apiportal.universal.filter.JwtAuthenticationFilter;
import com.jmsoftware.apiportal.universal.service.impl.CustomUserDetailsServiceImpl;
import com.jmsoftware.maf.apiportal.universal.filter.JwtAuthenticationFilter;
import com.jmsoftware.maf.apiportal.universal.service.impl.CustomUserDetailsServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.jmsoftware.apiportal.universal.controller;
package com.jmsoftware.maf.apiportal.universal.controller;

import com.jmsoftware.apiportal.universal.domain.ValidationTestPayload;
import com.jmsoftware.apiportal.universal.service.CommonService;
import com.jmsoftware.common.bean.ResponseBodyBean;
import com.jmsoftware.maf.apiportal.universal.domain.ValidationTestPayload;
import com.jmsoftware.maf.apiportal.universal.service.CommonService;
import com.jmsoftware.maf.common.bean.ResponseBodyBean;
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.authcenter.universal.controller;
package com.jmsoftware.maf.apiportal.universal.controller;

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

import com.jmsoftware.apiportal.universal.configuration.ProjectProperty;
import com.jmsoftware.maf.apiportal.universal.configuration.ProjectProperty;
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.apiportal.universal.domain;
package com.jmsoftware.maf.apiportal.universal.domain;

import lombok.Getter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.authcenter.universal.domain;
package com.jmsoftware.maf.apiportal.universal.domain;

import lombok.Builder;
import lombok.Data;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.jmsoftware.apiportal.universal.domain;
package com.jmsoftware.maf.apiportal.universal.domain;

import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.jmsoftware.common.domain.authcenter.permission.GetPermissionListByRoleIdListResponse;
import com.jmsoftware.common.domain.authcenter.user.GetUserByLoginTokenResponse;
import com.jmsoftware.common.domain.authcenter.user.UserStatus;
import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByRoleIdListResponse;
import com.jmsoftware.maf.common.domain.authcenter.user.GetUserByLoginTokenResponse;
import com.jmsoftware.maf.common.domain.authcenter.user.UserStatus;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jmsoftware.authcenter.universal.domain;
package com.jmsoftware.maf.apiportal.universal.domain;

import lombok.Data;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.jmsoftware.apiportal.universal.filter;
package com.jmsoftware.maf.apiportal.universal.filter;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.jmsoftware.apiportal.universal.configuration.CustomConfiguration;
import com.jmsoftware.apiportal.universal.service.impl.CustomUserDetailsServiceImpl;
import com.jmsoftware.apiportal.universal.service.impl.JwtServiceImpl;
import com.jmsoftware.common.constant.HttpStatus;
import com.jmsoftware.common.exception.SecurityException;
import com.jmsoftware.common.util.RequestUtil;
import com.jmsoftware.common.util.ResponseUtil;
import com.jmsoftware.maf.apiportal.universal.configuration.CustomConfiguration;
import com.jmsoftware.maf.apiportal.universal.service.impl.CustomUserDetailsServiceImpl;
import com.jmsoftware.maf.apiportal.universal.service.impl.JwtServiceImpl;
import com.jmsoftware.maf.common.constant.HttpStatus;
import com.jmsoftware.maf.common.exception.SecurityException;
import com.jmsoftware.maf.common.util.RequestUtil;
import com.jmsoftware.maf.common.util.ResponseUtil;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.jmsoftware.apiportal.universal.service;
package com.jmsoftware.maf.apiportal.universal.service;

import com.jmsoftware.apiportal.universal.domain.ValidationTestPayload;
import com.jmsoftware.maf.apiportal.universal.domain.ValidationTestPayload;

import java.util.Map;

Expand Down
Loading

0 comments on commit 4f65ad7

Please sign in to comment.