diff --git a/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/security/WebFluxSecurityConfiguration.java b/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/security/configuration/WebFluxSecurityConfiguration.java similarity index 98% rename from api-gateway/src/main/java/com/jmsoftware/maf/apigateway/security/WebFluxSecurityConfiguration.java rename to api-gateway/src/main/java/com/jmsoftware/maf/apigateway/security/configuration/WebFluxSecurityConfiguration.java index 1c566b8b..7ea9147d 100644 --- a/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/security/WebFluxSecurityConfiguration.java +++ b/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/security/configuration/WebFluxSecurityConfiguration.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.apigateway.security; +package com.jmsoftware.maf.apigateway.security.configuration; import com.jmsoftware.maf.apigateway.security.impl.*; import com.jmsoftware.maf.reactivespringbootstarter.configuration.MafConfiguration; diff --git a/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/universal/configuration/Constants.java b/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/universal/configuration/Constants.java deleted file mode 100644 index 214a4a76..00000000 --- a/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/universal/configuration/Constants.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jmsoftware.maf.apigateway.universal.configuration; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - *
- * Change description here. - * - * @author Johnny Miller (ιΊδΏ), email: johnnysviva@outlook.com - * @date 5/2/20 11:41 PM - **/ -@Slf4j -@Component -public class Constants { - public Constants(ProjectProperty projectProperty) { - REDIS_JWT_KEY_PREFIX = String.format("%s:jwt:", projectProperty.getProjectParentArtifactId()); - log.info("Initiated 'REDIS_JWT_KEY_PREFIX': {}", REDIS_JWT_KEY_PREFIX); - } - - /** - * Key prefix of JWT stored in Redis. - */ - public static String REDIS_JWT_KEY_PREFIX; - /** - * Token key of request header. - */ - public static final String REQUEST_TOKEN_KEY = "Authorization"; - /** - * Prefix of JWT. - */ - public static final String JWT_PREFIX = "Bearer "; - /** - * Star sign - */ - public static final String ASTERISK = "*"; - /** - * At sign - */ - public static final String AT_SIGN = "@"; -} diff --git a/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/universal/configuration/ProjectProperty.java b/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/universal/configuration/ProjectProperty.java index c20b032c..1dccd83a 100644 --- a/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/universal/configuration/ProjectProperty.java +++ b/api-gateway/src/main/java/com/jmsoftware/maf/apigateway/universal/configuration/ProjectProperty.java @@ -3,6 +3,7 @@ import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; /** *
- * Change description here.
- *
- * @author Johnny Miller (ιΊδΏ), email: johnnysviva@outlook.com
- * @date 2019-04-18 13:01
- **/
-@Data
-@Component
-@ConfigurationProperties(prefix = "project.property")
-public class ProjectProperty {
- private String basePackage;
- private String contextPath;
- private String groupId;
- private String projectParentArtifactId;
- private String projectArtifactId;
- private String version;
- private String description;
- private String jdkVersion;
- private String environment;
- private String url;
- private String inceptionYear;
- private String organizationName;
- private String organizationUrl;
- private String issueManagementSystem;
- private String issueManagementUrl;
- private String developerName;
- private String developerEmail;
- private String developerUrl;
-}
diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/universal/configuration/Swagger2Configuration.java b/auth-center/src/main/java/com/jmsoftware/maf/authcenter/universal/configuration/Swagger2Configuration.java
index 46cd83f6..9f68c6c4 100644
--- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/universal/configuration/Swagger2Configuration.java
+++ b/auth-center/src/main/java/com/jmsoftware/maf/authcenter/universal/configuration/Swagger2Configuration.java
@@ -1,5 +1,6 @@
package com.jmsoftware.maf.authcenter.universal.configuration;
+import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import lombok.RequiredArgsConstructor;
import lombok.val;
import org.springframework.context.annotation.Bean;
@@ -26,31 +27,31 @@
@EnableSwagger2
@RequiredArgsConstructor
public class Swagger2Configuration {
- private final ProjectProperty projectProperty;
+ private final MafProjectProperty mafProjectProperty;
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
- .apis(RequestHandlerSelectors.basePackage(projectProperty.getBasePackage()))
+ .apis(RequestHandlerSelectors.basePackage(mafProjectProperty.getBasePackage()))
.paths(PathSelectors.any())
.build();
}
private ApiInfo apiInfo() {
- val projectArtifactId = projectProperty.getProjectArtifactId();
- val version = projectProperty.getVersion();
- val developerEmail = projectProperty.getDeveloperEmail();
- val developerUrl = projectProperty.getDeveloperUrl();
+ val projectArtifactId = mafProjectProperty.getProjectArtifactId();
+ val version = mafProjectProperty.getVersion();
+ val developerEmail = mafProjectProperty.getDeveloperEmail();
+ val developerUrl = mafProjectProperty.getDeveloperUrl();
return new ApiInfoBuilder()
.title(String.format("API for %s@%s", projectArtifactId, version))
.description(String.format("%s Artifact ID: %s Environment: %s",
- projectProperty.getDescription(),
+ mafProjectProperty.getDescription(),
projectArtifactId,
- projectProperty.getEnvironment()))
+ mafProjectProperty.getEnvironment()))
.contact(new Contact(String.format("%s, email: %s Home page: %s",
- projectProperty.getDeveloperName(),
+ mafProjectProperty.getDeveloperName(),
developerEmail,
developerUrl),
developerUrl, developerEmail))
diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/universal/service/impl/CommonServiceImpl.java b/auth-center/src/main/java/com/jmsoftware/maf/authcenter/universal/service/impl/CommonServiceImpl.java
index 4524b22c..98db6dc9 100644
--- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/universal/service/impl/CommonServiceImpl.java
+++ b/auth-center/src/main/java/com/jmsoftware/maf/authcenter/universal/service/impl/CommonServiceImpl.java
@@ -1,8 +1,8 @@
package com.jmsoftware.maf.authcenter.universal.service.impl;
-import com.jmsoftware.maf.authcenter.universal.configuration.ProjectProperty;
import com.jmsoftware.maf.authcenter.universal.service.CommonService;
import com.jmsoftware.maf.common.domain.ValidationTestPayload;
+import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -27,12 +27,12 @@
@Service
@RequiredArgsConstructor
public class CommonServiceImpl implements CommonService {
- private final ProjectProperty projectProperty;
+ private final MafProjectProperty mafProjectProperty;
@Override
public Map
- * Change description here.
- *
- * @author Johnny Miller (ιΊδΏ), email: johnnysviva@outlook.com
- * @date 2019-04-18 13:01
- **/
-@Slf4j
-@Data
-@Component
-@ConfigurationProperties(prefix = "project.property")
-public class ProjectProperty {
- private String basePackage;
- private String contextPath;
- private String groupId;
- private String projectParentArtifactId;
- private String projectArtifactId;
- private String version;
- private String description;
- private String jdkVersion;
- private String environment;
- private String url;
- private String inceptionYear;
- private String organizationName;
- private String organizationUrl;
- private String issueManagementSystem;
- private String issueManagementUrl;
- private String developerName;
- private String developerEmail;
- private String developerUrl;
-}
diff --git a/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/universal/configuration/Swagger2Configuration.java b/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/universal/configuration/Swagger2Configuration.java
index d35337db..7f6f7bf5 100644
--- a/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/universal/configuration/Swagger2Configuration.java
+++ b/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/universal/configuration/Swagger2Configuration.java
@@ -1,5 +1,6 @@
package com.jmsoftware.maf.exercisemis.universal.configuration;
+import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import lombok.RequiredArgsConstructor;
import lombok.val;
import org.springframework.context.annotation.Bean;
@@ -26,31 +27,31 @@
@EnableSwagger2
@RequiredArgsConstructor
public class Swagger2Configuration {
- private final ProjectProperty projectProperty;
+ private final MafProjectProperty mafProjectProperty;
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
- .apis(RequestHandlerSelectors.basePackage(projectProperty.getBasePackage()))
+ .apis(RequestHandlerSelectors.basePackage(mafProjectProperty.getBasePackage()))
.paths(PathSelectors.any())
.build();
}
private ApiInfo apiInfo() {
- val projectArtifactId = projectProperty.getProjectArtifactId();
- val version = projectProperty.getVersion();
- val developerEmail = projectProperty.getDeveloperEmail();
- val developerUrl = projectProperty.getDeveloperUrl();
+ val projectArtifactId = mafProjectProperty.getProjectArtifactId();
+ val version = mafProjectProperty.getVersion();
+ val developerEmail = mafProjectProperty.getDeveloperEmail();
+ val developerUrl = mafProjectProperty.getDeveloperUrl();
return new ApiInfoBuilder()
.title(String.format("API for %s@%s", projectArtifactId, version))
.description(String.format("%s Artifact ID: %s Environment: %s",
- projectProperty.getDescription(),
+ mafProjectProperty.getDescription(),
projectArtifactId,
- projectProperty.getEnvironment()))
+ mafProjectProperty.getEnvironment()))
.contact(new Contact(String.format("%s, email: %s Home page: %s",
- projectProperty.getDeveloperName(),
+ mafProjectProperty.getDeveloperName(),
developerEmail,
developerUrl),
developerUrl, developerEmail))
diff --git a/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/universal/service/impl/CommonServiceImpl.java b/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/universal/service/impl/CommonServiceImpl.java
index ba6890e5..6f896ec5 100644
--- a/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/universal/service/impl/CommonServiceImpl.java
+++ b/exercise-mis/src/main/java/com/jmsoftware/maf/exercisemis/universal/service/impl/CommonServiceImpl.java
@@ -1,8 +1,8 @@
package com.jmsoftware.maf.exercisemis.universal.service.impl;
import com.jmsoftware.maf.common.domain.ValidationTestPayload;
-import com.jmsoftware.maf.exercisemis.universal.configuration.ProjectProperty;
import com.jmsoftware.maf.exercisemis.universal.service.CommonService;
+import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -27,12 +27,12 @@
@Service
@RequiredArgsConstructor
public class CommonServiceImpl implements CommonService {
- private final ProjectProperty projectProperty;
+ private final MafProjectProperty mafProjectProperty;
@Override
public Map
- * Change description here.
- *
- * @author Johnny Miller (ιΊδΏ), email: johnnysviva@outlook.com
- * @date 2019-04-18 13:01
- **/
-@Data
-@Component
-@ConfigurationProperties(prefix = "project.property")
-public class ProjectProperty {
- private String basePackage;
- private String contextPath;
- private String groupId;
- private String projectParentArtifactId;
- private String projectArtifactId;
- private String version;
- private String description;
- private String jdkVersion;
- private String environment;
- private String url;
- private String inceptionYear;
- private String organizationName;
- private String organizationUrl;
- private String issueManagementSystem;
- private String issueManagementUrl;
- private String developerName;
- private String developerEmail;
- private String developerUrl;
-}
diff --git a/muscle-mis/src/main/java/com/jmsoftware/maf/musclemis/universal/configuration/Swagger2Configuration.java b/muscle-mis/src/main/java/com/jmsoftware/maf/musclemis/universal/configuration/Swagger2Configuration.java
index fa848d0f..fc724022 100644
--- a/muscle-mis/src/main/java/com/jmsoftware/maf/musclemis/universal/configuration/Swagger2Configuration.java
+++ b/muscle-mis/src/main/java/com/jmsoftware/maf/musclemis/universal/configuration/Swagger2Configuration.java
@@ -1,5 +1,6 @@
package com.jmsoftware.maf.musclemis.universal.configuration;
+import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import lombok.RequiredArgsConstructor;
import lombok.val;
import org.springframework.context.annotation.Bean;
@@ -26,31 +27,31 @@
@EnableSwagger2
@RequiredArgsConstructor
public class Swagger2Configuration {
- private final ProjectProperty projectProperty;
+ private final MafProjectProperty mafProjectProperty;
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
- .apis(RequestHandlerSelectors.basePackage(projectProperty.getBasePackage()))
+ .apis(RequestHandlerSelectors.basePackage(mafProjectProperty.getBasePackage()))
.paths(PathSelectors.any())
.build();
}
private ApiInfo apiInfo() {
- val projectArtifactId = projectProperty.getProjectArtifactId();
- val version = projectProperty.getVersion();
- val developerEmail = projectProperty.getDeveloperEmail();
- val developerUrl = projectProperty.getDeveloperUrl();
+ val projectArtifactId = mafProjectProperty.getProjectArtifactId();
+ val version = mafProjectProperty.getVersion();
+ val developerEmail = mafProjectProperty.getDeveloperEmail();
+ val developerUrl = mafProjectProperty.getDeveloperUrl();
return new ApiInfoBuilder()
.title(String.format("API for %s@%s", projectArtifactId, version))
.description(String.format("%s Artifact ID: %s Environment: %s",
- projectProperty.getDescription(),
+ mafProjectProperty.getDescription(),
projectArtifactId,
- projectProperty.getEnvironment()))
+ mafProjectProperty.getEnvironment()))
.contact(new Contact(String.format("%s, email: %s Home page: %s",
- projectProperty.getDeveloperName(),
+ mafProjectProperty.getDeveloperName(),
developerEmail,
developerUrl),
developerUrl, developerEmail))
diff --git a/muscle-mis/src/main/java/com/jmsoftware/maf/musclemis/universal/service/impl/CommonServiceImpl.java b/muscle-mis/src/main/java/com/jmsoftware/maf/musclemis/universal/service/impl/CommonServiceImpl.java
index 2df0daa1..ce2b807b 100644
--- a/muscle-mis/src/main/java/com/jmsoftware/maf/musclemis/universal/service/impl/CommonServiceImpl.java
+++ b/muscle-mis/src/main/java/com/jmsoftware/maf/musclemis/universal/service/impl/CommonServiceImpl.java
@@ -1,8 +1,8 @@
package com.jmsoftware.maf.musclemis.universal.service.impl;
import com.jmsoftware.maf.common.domain.ValidationTestPayload;
-import com.jmsoftware.maf.musclemis.universal.configuration.ProjectProperty;
import com.jmsoftware.maf.musclemis.universal.service.CommonService;
+import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -27,12 +27,12 @@
@Service
@RequiredArgsConstructor
public class CommonServiceImpl implements CommonService {
- private final ProjectProperty projectProperty;
+ private final MafProjectProperty mafProjectProperty;
@Override
public Map
- * Change description here.
- *
- * @author Johnny Miller (ιΊδΏ), email: johnnysviva@outlook.com
- * @date 2019-04-18 13:01
- **/
-@Data
-@Component
-@ConfigurationProperties(prefix = "project.property")
-public class ProjectProperty {
- private String basePackage;
- private String contextPath;
- private String groupId;
- private String projectParentArtifactId;
- private String projectArtifactId;
- private String version;
- private String description;
- private String jdkVersion;
- private String environment;
- private String url;
- private String inceptionYear;
- private String organizationName;
- private String organizationUrl;
- private String issueManagementSystem;
- private String issueManagementUrl;
- private String developerName;
- private String developerEmail;
- private String developerUrl;
-}
diff --git a/service-registry/src/main/java/com/jmsoftware/maf/serviceregistry/universal/configuration/Swagger2Configuration.java b/service-registry/src/main/java/com/jmsoftware/maf/serviceregistry/universal/configuration/Swagger2Configuration.java
index 1efbbcac..d2ab5726 100644
--- a/service-registry/src/main/java/com/jmsoftware/maf/serviceregistry/universal/configuration/Swagger2Configuration.java
+++ b/service-registry/src/main/java/com/jmsoftware/maf/serviceregistry/universal/configuration/Swagger2Configuration.java
@@ -1,5 +1,6 @@
package com.jmsoftware.maf.serviceregistry.universal.configuration;
+import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import lombok.RequiredArgsConstructor;
import lombok.val;
import org.springframework.context.annotation.Bean;
@@ -26,31 +27,31 @@
@EnableSwagger2
@RequiredArgsConstructor
public class Swagger2Configuration {
- private final ProjectProperty projectProperty;
+ private final MafProjectProperty mafProjectProperty;
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
- .apis(RequestHandlerSelectors.basePackage(projectProperty.getBasePackage()))
+ .apis(RequestHandlerSelectors.basePackage(mafProjectProperty.getBasePackage()))
.paths(PathSelectors.any())
.build();
}
private ApiInfo apiInfo() {
- val projectArtifactId = projectProperty.getProjectArtifactId();
- val version = projectProperty.getVersion();
- val developerEmail = projectProperty.getDeveloperEmail();
- val developerUrl = projectProperty.getDeveloperUrl();
+ val projectArtifactId = mafProjectProperty.getProjectArtifactId();
+ val version = mafProjectProperty.getVersion();
+ val developerEmail = mafProjectProperty.getDeveloperEmail();
+ val developerUrl = mafProjectProperty.getDeveloperUrl();
return new ApiInfoBuilder()
.title(String.format("API for %s@%s", projectArtifactId, version))
.description(String.format("%s Artifact ID: %s Environment: %s",
- projectProperty.getDescription(),
+ mafProjectProperty.getDescription(),
projectArtifactId,
- projectProperty.getEnvironment()))
+ mafProjectProperty.getEnvironment()))
.contact(new Contact(String.format("%s, email: %s Home page: %s",
- projectProperty.getDeveloperName(),
+ mafProjectProperty.getDeveloperName(),
developerEmail,
developerUrl),
developerUrl, developerEmail))
diff --git a/service-registry/src/main/java/com/jmsoftware/maf/serviceregistry/universal/service/impl/CommonServiceImpl.java b/service-registry/src/main/java/com/jmsoftware/maf/serviceregistry/universal/service/impl/CommonServiceImpl.java
index 129f6fb6..20e0f714 100644
--- a/service-registry/src/main/java/com/jmsoftware/maf/serviceregistry/universal/service/impl/CommonServiceImpl.java
+++ b/service-registry/src/main/java/com/jmsoftware/maf/serviceregistry/universal/service/impl/CommonServiceImpl.java
@@ -1,8 +1,8 @@
package com.jmsoftware.maf.serviceregistry.universal.service.impl;
import com.jmsoftware.maf.common.domain.ValidationTestPayload;
-import com.jmsoftware.maf.serviceregistry.universal.configuration.ProjectProperty;
import com.jmsoftware.maf.serviceregistry.universal.service.CommonService;
+import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -27,12 +27,12 @@
@Service
@RequiredArgsConstructor
public class CommonServiceImpl implements CommonService {
- private final ProjectProperty projectProperty;
+ private final MafProjectProperty mafProjectProperty;
@Override
public Map
- * Change description here.
- *
- * @author Johnny Miller (ιΊδΏ), email: johnnysviva@outlook.com
- * @date 2019-04-18 13:01
- **/
-@Data
-@Component
-@ConfigurationProperties(prefix = "project.property")
-public class ProjectProperty {
- private String basePackage;
- private String contextPath;
- private String groupId;
- private String projectParentArtifactId;
- private String projectArtifactId;
- private String version;
- private String description;
- private String jdkVersion;
- private String environment;
- private String url;
- private String inceptionYear;
- private String organizationName;
- private String organizationUrl;
- private String issueManagementSystem;
- private String issueManagementUrl;
- private String developerName;
- private String developerEmail;
- private String developerUrl;
-}
diff --git a/spring-boot-admin/src/main/java/com/jmsoftware/maf/springbootadmin/universal/configuration/Swagger2Configuration.java b/spring-boot-admin/src/main/java/com/jmsoftware/maf/springbootadmin/universal/configuration/Swagger2Configuration.java
index 0c639e80..29c2c425 100644
--- a/spring-boot-admin/src/main/java/com/jmsoftware/maf/springbootadmin/universal/configuration/Swagger2Configuration.java
+++ b/spring-boot-admin/src/main/java/com/jmsoftware/maf/springbootadmin/universal/configuration/Swagger2Configuration.java
@@ -1,5 +1,6 @@
package com.jmsoftware.maf.springbootadmin.universal.configuration;
+import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import lombok.RequiredArgsConstructor;
import lombok.val;
import org.springframework.context.annotation.Bean;
@@ -26,31 +27,31 @@
@EnableSwagger2
@RequiredArgsConstructor
public class Swagger2Configuration {
- private final ProjectProperty projectProperty;
+ private final MafProjectProperty mafProjectProperty;
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
- .apis(RequestHandlerSelectors.basePackage(projectProperty.getBasePackage()))
+ .apis(RequestHandlerSelectors.basePackage(mafProjectProperty.getBasePackage()))
.paths(PathSelectors.any())
.build();
}
private ApiInfo apiInfo() {
- val projectArtifactId = projectProperty.getProjectArtifactId();
- val version = projectProperty.getVersion();
- val developerEmail = projectProperty.getDeveloperEmail();
- val developerUrl = projectProperty.getDeveloperUrl();
+ val projectArtifactId = mafProjectProperty.getProjectArtifactId();
+ val version = mafProjectProperty.getVersion();
+ val developerEmail = mafProjectProperty.getDeveloperEmail();
+ val developerUrl = mafProjectProperty.getDeveloperUrl();
return new ApiInfoBuilder()
.title(String.format("API for %s@%s", projectArtifactId, version))
.description(String.format("%s Artifact ID: %s Environment: %s",
- projectProperty.getDescription(),
+ mafProjectProperty.getDescription(),
projectArtifactId,
- projectProperty.getEnvironment()))
+ mafProjectProperty.getEnvironment()))
.contact(new Contact(String.format("%s, email: %s Home page: %s",
- projectProperty.getDeveloperName(),
+ mafProjectProperty.getDeveloperName(),
developerEmail,
developerUrl),
developerUrl, developerEmail))
diff --git a/spring-boot-admin/src/main/java/com/jmsoftware/maf/springbootadmin/universal/service/impl/CommonServiceImpl.java b/spring-boot-admin/src/main/java/com/jmsoftware/maf/springbootadmin/universal/service/impl/CommonServiceImpl.java
index 7e6064f0..18fabaf6 100644
--- a/spring-boot-admin/src/main/java/com/jmsoftware/maf/springbootadmin/universal/service/impl/CommonServiceImpl.java
+++ b/spring-boot-admin/src/main/java/com/jmsoftware/maf/springbootadmin/universal/service/impl/CommonServiceImpl.java
@@ -1,8 +1,8 @@
package com.jmsoftware.maf.springbootadmin.universal.service.impl;
import com.jmsoftware.maf.common.domain.ValidationTestPayload;
-import com.jmsoftware.maf.springbootadmin.universal.configuration.ProjectProperty;
import com.jmsoftware.maf.springbootadmin.universal.service.CommonService;
+import com.jmsoftware.maf.springbootstarter.configuration.MafProjectProperty;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -27,12 +27,12 @@
@Service
@RequiredArgsConstructor
public class CommonServiceImpl implements CommonService {
- private final ProjectProperty projectProperty;
+ private final MafProjectProperty mafProjectProperty;
@Override
public Map
+ * M&F project property, containing the basic constants of the project.
+ *
+ * @author Johnny Miller (ιΊδΏ), email: johnnysviva@outlook.com, date: 12/29/2020 12:57 PM
+ */
+@Data
+@Validated
+@Component
+@SuppressWarnings("jol")
+@ConfigurationProperties(prefix = "maf.project-property")
+public class MafProjectProperty {
+ /**
+ * The Base package.
+ */
+ @NotBlank
+ private String basePackage;
+ /**
+ * The Context path.
+ */
+ private String contextPath;
+ /**
+ * The Group id.
+ */
+ @NotBlank
+ private String groupId;
+ /**
+ * The Project parent artifact id.
+ */
+ @NotBlank
+ private String projectParentArtifactId;
+ /**
+ * The Project artifact id.
+ */
+ @NotBlank
+ private String projectArtifactId;
+ /**
+ * The Version.
+ */
+ @NotBlank
+ private String version;
+ /**
+ * The Description.
+ */
+ @NotBlank
+ private String description;
+ /**
+ * The Jdk version.
+ */
+ @NotBlank
+ private String jdkVersion;
+ /**
+ * The Environment.
+ */
+ @NotBlank
+ private String environment;
+ /**
+ * The Url.
+ */
+ private String url;
+ /**
+ * The Inception year.
+ */
+ private String inceptionYear;
+ /**
+ * The Organization name.
+ */
+ private String organizationName;
+ /**
+ * The Organization url.
+ */
+ private String organizationUrl;
+ /**
+ * The Issue management system.
+ */
+ private String issueManagementSystem;
+ /**
+ * The Issue management url.
+ */
+ private String issueManagementUrl;
+ /**
+ * The Developer name.
+ */
+ private String developerName;
+ /**
+ * The Developer email.
+ */
+ private String developerEmail;
+ /**
+ * The Developer url.
+ */
+ private String developerUrl;
+}
ProjectProperty
- * ProjectProperty
- * ProjectProperty
- * ProjectProperty
- * MafProjectProperty
+ *