diff --git a/src/main/java/org/edgegallery/user/auth/MainServer.java b/src/main/java/org/edgegallery/user/auth/MainServer.java index e26335b5718554ad86f0b85d4e39960683c2acf6..d17f90d23419055c3e99e582f07d62a390d793c1 100644 --- a/src/main/java/org/edgegallery/user/auth/MainServer.java +++ b/src/main/java/org/edgegallery/user/auth/MainServer.java @@ -48,14 +48,15 @@ public class MainServer { // do not check host name TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() { + @Override public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; } - + @Override public void checkClientTrusted(X509Certificate[] certs, String authType) { LOGGER.info("checks client trusted"); } - + @Override public void checkServerTrusted(X509Certificate[] certs, String authType) { LOGGER.info("checks server trusted"); } diff --git a/src/main/java/org/edgegallery/user/auth/config/security/AuthServerConfig.java b/src/main/java/org/edgegallery/user/auth/config/security/AuthServerConfig.java index 64e909d7cc240e5a7f2adc86180523c9bfeedb93..0c1517a9985a715badac5d97c1bc3424039642b1 100644 --- a/src/main/java/org/edgegallery/user/auth/config/security/AuthServerConfig.java +++ b/src/main/java/org/edgegallery/user/auth/config/security/AuthServerConfig.java @@ -207,7 +207,7 @@ public class AuthServerConfig extends AuthorizationServerConfigurerAdapter { public TokenGranter tokenGranter(AuthorizationServerEndpointsConfigurer endpoints) { return new TokenGranter() { private CompositeTokenGranter delegate; - + @Override public OAuth2AccessToken grant(String grantType, TokenRequest tokenRequest) { if (this.delegate == null) { this.delegate = new CompositeTokenGranter(loadDefaultTokenGranters(endpoints)); diff --git a/src/main/java/org/edgegallery/user/auth/config/validate/AbstractCheckParamsGenericUtils.java b/src/main/java/org/edgegallery/user/auth/config/validate/AbstractCheckParamsGenericUtils.java index c8b2ff2321cbd2434da326cf2595f30637063c7a..6f89f5586a35e1b75278047274afa15946eeeb8c 100644 --- a/src/main/java/org/edgegallery/user/auth/config/validate/AbstractCheckParamsGenericUtils.java +++ b/src/main/java/org/edgegallery/user/auth/config/validate/AbstractCheckParamsGenericUtils.java @@ -24,6 +24,7 @@ public abstract class AbstractCheckParamsGenericUtils implements ICheckParams { /** * check data. */ + @Override public Either checkData() { Either format = checkDataFormat(); if (format.isRight()) { diff --git a/src/main/java/org/edgegallery/user/auth/controller/dto/request/BaseTenantBasicReqDto.java b/src/main/java/org/edgegallery/user/auth/controller/dto/request/BaseTenantBasicReqDto.java index 657f2667739df3efbaf050db450dc64149c09e89..e0627562e3826b364ac8235452c3d265999d3a39 100644 --- a/src/main/java/org/edgegallery/user/auth/controller/dto/request/BaseTenantBasicReqDto.java +++ b/src/main/java/org/edgegallery/user/auth/controller/dto/request/BaseTenantBasicReqDto.java @@ -50,6 +50,7 @@ public abstract class BaseTenantBasicReqDto extends AbstractCheckParamsGenericUt /** * check basic data by trim. */ + @Override public void stringTrim() { this.username = StringUtils.trimWhitespace(this.username); this.company = StringUtils.trimWhitespace(this.company); diff --git a/src/main/java/org/edgegallery/user/auth/controller/dto/request/ModifyPasswordReqDto.java b/src/main/java/org/edgegallery/user/auth/controller/dto/request/ModifyPasswordReqDto.java index 6f2d4d00893fb9f5054e67283a0d65b0c0452db4..1d38f157de318fa3d48c8287b8b95418d6caecf1 100644 --- a/src/main/java/org/edgegallery/user/auth/controller/dto/request/ModifyPasswordReqDto.java +++ b/src/main/java/org/edgegallery/user/auth/controller/dto/request/ModifyPasswordReqDto.java @@ -70,6 +70,7 @@ public class ModifyPasswordReqDto extends AbstractCheckParamsGenericUtils implem /** * check basic data by trim. */ + @Override public void stringTrim() { this.newPassword = StringUtils.trimWhitespace(this.newPassword); diff --git a/src/main/java/org/edgegallery/user/auth/controller/dto/request/QueryUserCtrlDto.java b/src/main/java/org/edgegallery/user/auth/controller/dto/request/QueryUserCtrlDto.java index 8ef61625f85b0323ec350786a46dee1d84a0b50b..dc0d5472f8c0073dd3f2000cd8be59d7911fa1bc 100644 --- a/src/main/java/org/edgegallery/user/auth/controller/dto/request/QueryUserCtrlDto.java +++ b/src/main/java/org/edgegallery/user/auth/controller/dto/request/QueryUserCtrlDto.java @@ -51,6 +51,7 @@ public class QueryUserCtrlDto extends AbstractCheckParamsGenericUtils implements /** * check basic data by trim. */ + @Override public void stringTrim() { this.sortBy = StringUtils.trimWhitespace(this.sortBy); if (StringUtils.isEmpty(this.sortBy)) { diff --git a/src/main/java/org/edgegallery/user/auth/controller/dto/request/QueryUserReqDto.java b/src/main/java/org/edgegallery/user/auth/controller/dto/request/QueryUserReqDto.java index c0d0563a8f0fbf8f5eb903b32b861510355893d7..bfe67bc70c5014acc45123b64f8b60e152b31d81 100644 --- a/src/main/java/org/edgegallery/user/auth/controller/dto/request/QueryUserReqDto.java +++ b/src/main/java/org/edgegallery/user/auth/controller/dto/request/QueryUserReqDto.java @@ -65,6 +65,7 @@ public class QueryUserReqDto extends AbstractCheckParamsGenericUtils implements /** * check basic data by trim. */ + @Override public void stringTrim() { this.username = StringUtils.trimWhitespace(this.username); this.mailAddress = StringUtils.trimWhitespace(this.mailAddress); diff --git a/src/main/java/org/edgegallery/user/auth/controller/dto/request/TenantRegisterReqDto.java b/src/main/java/org/edgegallery/user/auth/controller/dto/request/TenantRegisterReqDto.java index 77938dc14cb99b174ea3bddb0b3c1d15ce36ebf6..d8992e48c065c2ddb4d80b3f8887a0f96be40bc6 100644 --- a/src/main/java/org/edgegallery/user/auth/controller/dto/request/TenantRegisterReqDto.java +++ b/src/main/java/org/edgegallery/user/auth/controller/dto/request/TenantRegisterReqDto.java @@ -37,6 +37,7 @@ public class TenantRegisterReqDto extends BaseTenantBasicReqDto implements IStri /** * check basic data by trim. */ + @Override public void stringTrim() { super.stringTrim(); this.password = StringUtils.trimWhitespace(this.password); diff --git a/src/main/java/org/edgegallery/user/auth/db/entity/RolePo.java b/src/main/java/org/edgegallery/user/auth/db/entity/RolePo.java index 7c1c68888a328519d322ce6a2351ebd5208a86fc..f4312ae8b693ba3be8941abe638a184e14250f6a 100644 --- a/src/main/java/org/edgegallery/user/auth/db/entity/RolePo.java +++ b/src/main/java/org/edgegallery/user/auth/db/entity/RolePo.java @@ -52,6 +52,7 @@ public class RolePo { this.role = role; } + @Override public String toString() { return platform + "_" + role; }