diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/impl/Ripple.java b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/impl/Ripple.java index b0a2c429..718b7df0 100644 --- a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/impl/Ripple.java +++ b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/impl/Ripple.java @@ -8,7 +8,6 @@ import com.google.code.kaptcha.NoiseProducer; import com.google.code.kaptcha.util.Configurable; import com.jhlabs.image.RippleFilter; import com.jhlabs.image.TransformFilter; -import com.jhlabs.image.WaterFilter; /** * {@link WaterRipple} adds water ripple effect to an image. diff --git a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java index 37ffaf07..6ce893f3 100644 --- a/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java @@ -56,7 +56,6 @@ public class KaptchaAutoConfiguration implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub } } diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryAuthenticationRealm.java index e391b502..915a57b9 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryAuthenticationRealm.java @@ -25,11 +25,9 @@ import javax.validation.constraints.Size; import org.maxkey.authn.realm.AbstractAuthenticationRealm; import org.maxkey.authn.realm.IAuthenticationServer; import org.maxkey.entity.UserInfo; -import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.security.authentication.BadCredentialsException; public class ActiveDirectoryAuthenticationRealm extends AbstractAuthenticationRealm{ diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java index a35cde81..fe9600d5 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java @@ -25,11 +25,9 @@ import javax.validation.constraints.Size; import org.maxkey.authn.realm.AbstractAuthenticationRealm; import org.maxkey.authn.realm.IAuthenticationServer; import org.maxkey.entity.UserInfo; -import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.security.authentication.BadCredentialsException; public class LdapAuthenticationRealm extends AbstractAuthenticationRealm{ private final static Logger _logger = LoggerFactory.getLogger(LdapAuthenticationRealm.class); diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/AuthenticationAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/AuthenticationAutoConfiguration.java index 2a4467be..ce7b66bc 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/AuthenticationAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/AuthenticationAutoConfiguration.java @@ -118,7 +118,6 @@ public class AuthenticationAutoConfiguration implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub } } diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java index f748365a..346bfae1 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java @@ -89,7 +89,6 @@ public class JwtAuthnAutoConfiguration implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub } } diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java index fcb99f03..48701b03 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java @@ -40,13 +40,11 @@ public class CapOtpAuthn extends AbstractOtpAuthn { @Override public boolean produce(UserInfo userInfo) { - // TODO Auto-generated method stub return false; } @Override public boolean validate(UserInfo userInfo, String token) { - // TODO Auto-generated method stub return false; } diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java index 46fecdfa..d95a6ffb 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java @@ -30,13 +30,11 @@ public class MobileOtpAuthn extends AbstractOtpAuthn { @Override public boolean produce(UserInfo userInfo) { - // TODO Auto-generated method stub return false; } @Override public boolean validate(UserInfo userInfo, String token) { - // TODO Auto-generated method stub return false; } diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java index 4d33edd3..bba74773 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java @@ -40,13 +40,11 @@ public class RsaOtpAuthn extends AbstractOtpAuthn { @Override public boolean produce(UserInfo userInfo) { - // TODO Auto-generated method stub return false; } @Override public boolean validate(UserInfo userInfo, String token) { - // TODO Auto-generated method stub return false; } diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/SmsOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/SmsOtpAuthn.java index 241eeb46..d8303d5d 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/SmsOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/SmsOtpAuthn.java @@ -34,7 +34,7 @@ public class SmsOtpAuthn extends AbstractOtpAuthn { @Override public boolean produce(UserInfo userInfo) { String token = this.genToken(userInfo); - // TODO:You must add send sms code here + // You must add send sms code here logger.debug("send sms code" + token); return true; } diff --git a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java index 88694bf0..9728d051 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/HmacOTPTest.java @@ -37,10 +37,8 @@ public class HmacOTPTest { try { System.out.println(HOTP.generateOTP(byteseed, 3, 6, false, -1)); } catch (InvalidKeyException e) { - // TODO Auto-generated catch block e.printStackTrace(); } catch (NoSuchAlgorithmException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } diff --git a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java index 0855ebc3..7682a9d5 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/test/java/org/maxkey/otp/algorithm/TimeBasedOTPTest.java @@ -55,7 +55,6 @@ public class TimeBasedOTPTest { try { curr=df.parse(utcTime); } catch (ParseException e) { - // TODO Auto-generated catch block e.printStackTrace(); } long currentTimeSeconds = curr.getTime() / 1000; diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java index 6b6f0f75..6d1f0073 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java @@ -59,7 +59,6 @@ public class SocialSignOnAutoConfiguration implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub } } diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/KeyPairUtil.java b/maxkey-common/src/main/java/org/maxkey/crypto/KeyPairUtil.java index c6ee0fd6..bb5d02e6 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/KeyPairUtil.java +++ b/maxkey-common/src/main/java/org/maxkey/crypto/KeyPairUtil.java @@ -206,7 +206,7 @@ public final class KeyPairUtil } else if (pubKey instanceof ECKey) { - // TODO: how to get key size from these? + // how to get key size from these? return UNKNOWN_KEY_SIZE; } @@ -236,7 +236,7 @@ public final class KeyPairUtil } else if (keyParams instanceof ECKeyParameters) { - // TODO: how to get key length from these? + // how to get key length from these? return UNKNOWN_KEY_SIZE; } diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/ReciprocalUtils.java b/maxkey-common/src/main/java/org/maxkey/crypto/ReciprocalUtils.java index b85646b5..e08e4e01 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/ReciprocalUtils.java +++ b/maxkey-common/src/main/java/org/maxkey/crypto/ReciprocalUtils.java @@ -162,7 +162,6 @@ public final class ReciprocalUtils { try { simple = new String(byteFinal, "UTF-8"); } catch (UnsupportedEncodingException e) { - // TODO Auto-generated catch block e.printStackTrace(); } return simple; diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/cert/NetUtil.java b/maxkey-common/src/main/java/org/maxkey/crypto/cert/NetUtil.java index 092312c6..9960a0af 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/cert/NetUtil.java +++ b/maxkey-common/src/main/java/org/maxkey/crypto/cert/NetUtil.java @@ -45,10 +45,10 @@ public final class NetUtil /** Logger */ private static final Logger _logger = LoggerFactory.getLogger(NetUtil.class); - // TODO: make this configurable + // make this configurable private static final int CONNECT_TIMEOUT = 10000; - // TODO: make this configurable + // make this configurable private static final int READ_TIMEOUT = 20000; /** @@ -74,7 +74,7 @@ public final class NetUtil conn.setConnectTimeout(CONNECT_TIMEOUT); conn.setReadTimeout(READ_TIMEOUT); - // TODO: User-Agent? + // User-Agent? return conn.getInputStream(); } @@ -97,7 +97,7 @@ public final class NetUtil conn.setConnectTimeout(CONNECT_TIMEOUT); conn.setReadTimeout(READ_TIMEOUT); - // TODO: User-Agent? + // User-Agent? if (contentType != null) { diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java b/maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java index 04597016..61100f9d 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java +++ b/maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/JwtEncryptionAndDecryptionService.java @@ -64,7 +64,7 @@ public interface JwtEncryptionAndDecryptionService { public Collection getAllEncryptionEncsSupported(); /** - * TODO add functionality for encrypting and decrypting using a specified key id. + * add functionality for encrypting and decrypting using a specified key id. * Example: public void encryptJwt(EncryptedJWT jwt, String kid); */ } diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java b/maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java index 18266f4a..0f707b96 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java +++ b/maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java @@ -230,7 +230,7 @@ public class DefaultJwtEncryptionAndDecryptionService implements JwtEncryptionAn logger.warn("No private key for key #" + jwk.getKeyID()); } - // TODO: add support for EC keys + // add support for EC keys } else if (jwk instanceof OctetSequenceKey) { // build symmetric encrypters and decrypters diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java b/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java index 32790ac4..45293485 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java +++ b/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/JwtSigningAndValidationService.java @@ -77,6 +77,6 @@ public interface JwtSigningAndValidationService { public String getDefaultSignerKeyId(); /** - * TODO: method to sign a jwt using a specified algorithm and a key id + * method to sign a jwt using a specified algorithm and a key id */ } diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java b/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java index 2c0b2d86..f77b0b67 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java +++ b/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java @@ -99,7 +99,7 @@ public class DefaultJwtSigningAndValidationService implements JwtSigningAndValid for (JWK key : keyStore.getKeys()) { if (!Strings.isNullOrEmpty(key.getKeyID())) { // use the key ID that's built into the key itself - // TODO (#641): deal with JWK thumbprints + // (#641): deal with JWK thumbprints this.keys.put(key.getKeyID(), key); } else { // create a random key id @@ -173,7 +173,7 @@ public class DefaultJwtSigningAndValidationService implements JwtSigningAndValid } else if (jwk instanceof ECKey) { // build EC signers & verifiers - // TODO: add support for EC keys + // add support for EC keys logger.warn("EC Keys are not yet supported."); } else if (jwk instanceof OctetSequenceKey) { diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java b/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java index 3f02ca65..05d22a62 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java +++ b/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricCacheService.java @@ -93,7 +93,7 @@ public class SymmetricCacheService { try { String id = "SYMMETRIC-KEY"; - //TODO: + JWK jwk =null; //JWK jwk = new OctetSequenceKey(Base64URL.encode(key), KeyUse.SIGNATURE, null, null, id, null, null, null); Map keys = ImmutableMap.of(id, jwk); diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java b/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java index db6e38d0..db47ebb0 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java +++ b/maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java @@ -56,7 +56,6 @@ public class SymmetricSigningAndValidationServiceBuilder { /** * Builder Symmetric Signing And Validation Service */ - //TODO: JWK jwk = null; //JWK jwk = new OctetSequenceKey(Base64URL.encode(sharedSecret), KeyUse.SIGNATURE, null, null, SYMMETRIC_KEY, null, null, null); Map keys = ImmutableMap.of(SYMMETRIC_KEY, jwk); diff --git a/maxkey-common/src/main/java/org/maxkey/crypto/keystore/KeyStoreUtil.java b/maxkey-common/src/main/java/org/maxkey/crypto/keystore/KeyStoreUtil.java index 178552fc..9b53b23a 100644 --- a/maxkey-common/src/main/java/org/maxkey/crypto/keystore/KeyStoreUtil.java +++ b/maxkey-common/src/main/java/org/maxkey/crypto/keystore/KeyStoreUtil.java @@ -234,7 +234,7 @@ public final class KeyStoreUtil { * @return available keystore types */ public static KeyStoreType[] getAvailableTypes() { - // TODO: populate only once + // populate only once KeyStoreType[] known = KeyStoreType.values(); ArrayList available = new ArrayList(); for (KeyStoreType type : known) { diff --git a/maxkey-common/src/test/java/org/maxkey/Copyright4RZ.java b/maxkey-common/src/test/java/org/maxkey/Copyright4RZ.java index 79a19e0f..3bd6378c 100644 --- a/maxkey-common/src/test/java/org/maxkey/Copyright4RZ.java +++ b/maxkey-common/src/test/java/org/maxkey/Copyright4RZ.java @@ -51,10 +51,8 @@ public class Copyright4RZ { try { writer = new OutputStreamWriter(new FileOutputStream("D:/MaxKey/code.txt"), encode); } catch (UnsupportedEncodingException e) { - // TODO Auto-generated catch block e.printStackTrace(); } catch (FileNotFoundException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } diff --git a/maxkey-common/src/test/java/org/maxkey/Integer2LongTest.java b/maxkey-common/src/test/java/org/maxkey/Integer2LongTest.java index 1b92db8c..980825f4 100644 --- a/maxkey-common/src/test/java/org/maxkey/Integer2LongTest.java +++ b/maxkey-common/src/test/java/org/maxkey/Integer2LongTest.java @@ -3,7 +3,6 @@ package org.maxkey; public class Integer2LongTest { public static void main(String[] args) { - // TODO Auto-generated method stub Integer intValue =20000; Long v=Integer.toUnsignedLong(intValue); System.out.println(v); diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/Base64UtilsTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/Base64UtilsTest.java index a339e0c2..e2b329ad 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/Base64UtilsTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/Base64UtilsTest.java @@ -26,7 +26,6 @@ public class Base64UtilsTest { */ @Test public void test() { - // TODO Auto-generated method stub String encode=Base64Utils.encoder("base64ToFile".getBytes()); System.out.println(encode); String decode=Base64Utils.decode(encode); diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/Md5SumTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/Md5SumTest.java index c4095849..a00e7d00 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/Md5SumTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/Md5SumTest.java @@ -23,11 +23,9 @@ import java.io.FileNotFoundException; public class Md5SumTest { public Md5SumTest() { - // TODO Auto-generated constructor stub } public static void main(String[] args) throws FileNotFoundException { - // TODO Auto-generated method stub //String md5value=Md5Sum.produce(new File("E:/transwarp-4.3.4-Final-el6/transwarp-4.3.4-Final-26854-zh.el6.x86_64.tar.gz")); File f=new File("E:/Soft/Xmanager4_setup.1410342608.exe"); String md5value=Md5Sum.produce(f); diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/PasswordGenTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/PasswordGenTest.java index 4809a32b..88394527 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/PasswordGenTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/PasswordGenTest.java @@ -22,11 +22,9 @@ import org.maxkey.crypto.password.PasswordGen; public class PasswordGenTest { public PasswordGenTest() { - // TODO Auto-generated constructor stub } public static void main(String[] args) { - // TODO Auto-generated method stub PasswordGen gen=new PasswordGen(); System.out.println(gen.gen(2,2,2,1)); for(int i=1;i<100;i++){ diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java index 42f2bdd7..a099ea38 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/SCryptPasswordEncoderTest.java @@ -22,11 +22,9 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; public class SCryptPasswordEncoderTest { public SCryptPasswordEncoderTest() { - // TODO Auto-generated constructor stub } public static void main(String[] args) { - // TODO Auto-generated method stub BCryptPasswordEncoder pe=new BCryptPasswordEncoder(); //String c="$e0801$7Holo9EgzBeg5xf/WLZu3/5IQwOyEPDLJPgMXkF9jnekBrbQUMt4CF9O2trkz3zBCnCLpUMR437q/AjQ5TTToA==$oYB8KRSxAsxkKkt5r79W6r6P0wTUcKwGye1ivXRN0Ts=" //; diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java index ce456de3..3b935a33 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/password/PasswordReciprocalTest.java @@ -22,11 +22,10 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; public class PasswordReciprocalTest { public PasswordReciprocalTest() { - // TODO Auto-generated constructor stub + } public static void main(String[] args) { - // TODO Auto-generated method stub BCryptPasswordEncoder spe= new BCryptPasswordEncoder(); String pass=PasswordReciprocal.getInstance().rawPassword("admin", "admin"); String epass=spe.encode(pass); diff --git a/maxkey-common/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java b/maxkey-common/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java index 631f2720..5178e1ba 100644 --- a/maxkey-common/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java +++ b/maxkey-common/src/test/java/org/maxkey/crypto/password/SM3PasswordEncoderTest.java @@ -20,7 +20,6 @@ package org.maxkey.crypto.password; public class SM3PasswordEncoderTest { public static void main(String[] args) { - // TODO Auto-generated method stub SM3PasswordEncoder sm3 = new SM3PasswordEncoder(); System.out.println(sm3.encode("maxkeypassword")); diff --git a/maxkey-common/src/test/java/org/maxkey/util/IdSequenceTest.java b/maxkey-common/src/test/java/org/maxkey/util/IdSequenceTest.java index 6124136d..a7d1ce1c 100644 --- a/maxkey-common/src/test/java/org/maxkey/util/IdSequenceTest.java +++ b/maxkey-common/src/test/java/org/maxkey/util/IdSequenceTest.java @@ -20,7 +20,6 @@ package org.maxkey.util; public class IdSequenceTest { public static void main(String[] args) { - // TODO Auto-generated method stub long s =System.currentTimeMillis(); int k; for(int i=1;i<=10010;i++){ diff --git a/maxkey-common/src/test/java/org/maxkey/util/MacAddressTest.java b/maxkey-common/src/test/java/org/maxkey/util/MacAddressTest.java index 21f7176f..0aed441c 100644 --- a/maxkey-common/src/test/java/org/maxkey/util/MacAddressTest.java +++ b/maxkey-common/src/test/java/org/maxkey/util/MacAddressTest.java @@ -20,7 +20,6 @@ package org.maxkey.util; public class MacAddressTest { public static void main(String[] args) { - // TODO Auto-generated method stub System.out.println(MacAddress.getAllHostMacAddress()); } diff --git a/maxkey-common/src/test/java/org/maxkey/util/ObjectTransformerTest.java b/maxkey-common/src/test/java/org/maxkey/util/ObjectTransformerTest.java index eb216881..c6816aad 100644 --- a/maxkey-common/src/test/java/org/maxkey/util/ObjectTransformerTest.java +++ b/maxkey-common/src/test/java/org/maxkey/util/ObjectTransformerTest.java @@ -25,7 +25,6 @@ public class ObjectTransformerTest { * @param args */ public static void main(String[] args) { - // TODO Auto-generated method stub HashMap ut=new HashMap(); ut.put("username","shimingxy"); diff --git a/maxkey-common/src/test/java/org/maxkey/word/CharacterCase.java b/maxkey-common/src/test/java/org/maxkey/word/CharacterCase.java index 89629da5..2462c938 100644 --- a/maxkey-common/src/test/java/org/maxkey/word/CharacterCase.java +++ b/maxkey-common/src/test/java/org/maxkey/word/CharacterCase.java @@ -23,7 +23,6 @@ public class CharacterCase { * @param args */ public static void main(String[] args) { - // TODO Auto-generated method stub String word="partner "; System.out.println(word.toUpperCase()); diff --git a/maxkey-common/src/test/java/org/maxkey/word/SubStr.java b/maxkey-common/src/test/java/org/maxkey/word/SubStr.java index 9b542722..8cfb9e14 100644 --- a/maxkey-common/src/test/java/org/maxkey/word/SubStr.java +++ b/maxkey-common/src/test/java/org/maxkey/word/SubStr.java @@ -23,7 +23,6 @@ public class SubStr { * @param args */ public static void main(String[] args) { - // TODO Auto-generated method stub String browser="Chrome/44.0.2369.0"; System.out.println(browser.indexOf('.')); } diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java index c07bc6f1..8a903c5e 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java @@ -163,7 +163,6 @@ public class ApplicationAutoConfiguration implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub } } diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java index 1ba704b3..2b5367b8 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java @@ -291,7 +291,6 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer @Override public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub } diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java index e5748c1f..ad279120 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java @@ -80,7 +80,6 @@ public class RedisAutoConfiguration implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub } } diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/SessionRedisAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/SessionRedisAutoConfiguration.java index 6327e0a1..71ad6538 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/SessionRedisAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/SessionRedisAutoConfiguration.java @@ -56,7 +56,6 @@ public class SessionRedisAutoConfiguration implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub } } diff --git a/maxkey-core/src/main/java/org/maxkey/configuration/LoginConfig.java b/maxkey-core/src/main/java/org/maxkey/configuration/LoginConfig.java index de1acba3..3a645938 100644 --- a/maxkey-core/src/main/java/org/maxkey/configuration/LoginConfig.java +++ b/maxkey-core/src/main/java/org/maxkey/configuration/LoginConfig.java @@ -51,7 +51,6 @@ public class LoginConfig { * . */ public LoginConfig() { - // TODO Auto-generated constructor stub } public boolean isCaptcha() { diff --git a/maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java b/maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java index 37d0f3ec..1e39f323 100644 --- a/maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java +++ b/maxkey-core/src/main/java/org/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java @@ -145,7 +145,7 @@ public class OIDCProviderMetadataDetails implements OIDCProviderMetadata { return builder.toString(); } - // TODO: Complete remaining properties from + // Complete remaining properties from // http://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata } diff --git a/maxkey-core/src/main/java/org/maxkey/entity/AccountsStrategy.java b/maxkey-core/src/main/java/org/maxkey/entity/AccountsStrategy.java index 8b08acc0..1379570c 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/AccountsStrategy.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/AccountsStrategy.java @@ -67,7 +67,6 @@ public class AccountsStrategy extends JpaBaseEntity implements Serializable { public AccountsStrategy() { super(); - // TODO Auto-generated constructor stub } public String getId() { diff --git a/maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java b/maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java index 7320497e..7871aa23 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java @@ -62,7 +62,6 @@ public class HistoryLoginApps extends JpaBaseEntity { */ public HistoryLoginApps() { super(); - // TODO Auto-generated constructor stub } diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Resources.java b/maxkey-core/src/main/java/org/maxkey/entity/Resources.java index 1159a6b2..bb55e1c2 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Resources.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Resources.java @@ -70,7 +70,6 @@ public class Resources extends JpaBaseEntity implements Serializable { public Resources() { super(); - // TODO Auto-generated constructor stub } public String getId() { diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Roles.java b/maxkey-core/src/main/java/org/maxkey/entity/Roles.java index 5fb8befb..3361a029 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Roles.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Roles.java @@ -60,7 +60,6 @@ public class Roles extends JpaBaseEntity implements Serializable { public Roles() { super(); - // TODO Auto-generated constructor stub } public String getId() { diff --git a/maxkey-core/src/main/java/org/maxkey/entity/UserInfoAdjoint.java b/maxkey-core/src/main/java/org/maxkey/entity/UserInfoAdjoint.java index 40ac589e..3cf243d0 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/UserInfoAdjoint.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/UserInfoAdjoint.java @@ -92,7 +92,6 @@ public class UserInfoAdjoint extends JpaBaseEntity { protected String quitDate; public UserInfoAdjoint() { super(); - // TODO Auto-generated constructor stub } public String getId() { return id; diff --git a/maxkey-core/src/main/java/org/maxkey/entity/xml/UserInfoXML.java b/maxkey-core/src/main/java/org/maxkey/entity/xml/UserInfoXML.java index ce0a6469..2530b5ef 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/xml/UserInfoXML.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/xml/UserInfoXML.java @@ -39,7 +39,6 @@ public class UserInfoXML extends JpaBaseEntity { */ public UserInfoXML() { super(); - // TODO Auto-generated constructor stub } diff --git a/maxkey-core/src/main/java/org/maxkey/web/WebContext.java b/maxkey-core/src/main/java/org/maxkey/web/WebContext.java index 4afac1ed..c2d0a88f 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/WebContext.java +++ b/maxkey-core/src/main/java/org/maxkey/web/WebContext.java @@ -481,7 +481,6 @@ public final class WebContext { return true; } - //TODO: /** * getI18nValue. * @param code String @@ -521,7 +520,6 @@ public final class WebContext { return message; } - //TODO: /** * getRequestLocale. * @return diff --git a/maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java b/maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java index 78d7115f..3d154cc3 100644 --- a/maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java +++ b/maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java @@ -44,7 +44,6 @@ public class DerbyTest { * @throws SQLException */ public static void main(String[] args) throws SQLException { - // TODO Auto-generated method stub String nsURL="jdbc:derby://localhost:1527/seconddb1"; java.util.Properties props = new java.util.Properties(); props.setProperty("user","tquist"); diff --git a/maxkey-core/src/test/java/org/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java b/maxkey-core/src/test/java/org/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java index d2eb91f6..a0a99ac7 100644 --- a/maxkey-core/src/test/java/org/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java +++ b/maxkey-core/src/test/java/org/maxkey/persistence/ldap/ActiveDirectoryUtilsTest.java @@ -35,7 +35,6 @@ public class ActiveDirectoryUtilsTest { try { dirContext.close(); } catch (NamingException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java index e7c1ca86..d97a5f19 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java +++ b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java @@ -27,7 +27,6 @@ public class ScimEnterpriseUserJsonTest { public static void main(String[] args) { - // TODO Auto-generated method stub EnterpriseUser u = new EnterpriseUser(); u.setUserName("UserName"); u.setExternalId("UserName"); diff --git a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java index e4487b5d..ffdd72f1 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java +++ b/maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java @@ -26,7 +26,6 @@ import org.maxkey.util.JsonUtils; public class ScimUserJsonTest { public static void main(String[] args) { - // TODO Auto-generated method stub User u = new User(); u.setUserName("UserName"); u.setExternalId("UserName"); diff --git a/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingAccessTokenService.java b/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingAccessTokenService.java index 6508bd35..275661f7 100644 --- a/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingAccessTokenService.java +++ b/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingAccessTokenService.java @@ -80,7 +80,6 @@ public class DingdingAccessTokenService { public static void main(String[] args) { - // TODO Auto-generated method stub } diff --git a/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingOrganizationService.java b/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingOrganizationService.java index 2e4d8f97..6fef4bdd 100644 --- a/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingOrganizationService.java +++ b/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingOrganizationService.java @@ -105,7 +105,6 @@ public class DingdingOrganizationService implements ISynchronizerService{ @Override public void setSynchronizer(Synchronizers Synchronizer) { - // TODO Auto-generated method stub } diff --git a/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingUsersService.java b/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingUsersService.java index bdba7ae8..2aa4882d 100644 --- a/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingUsersService.java +++ b/maxkey-identitys/maxkey-synchronizers-dingding/src/main/java/org/maxkey/synchronizer/dingding/DingdingUsersService.java @@ -127,7 +127,6 @@ public class DingdingUsersService implements ISynchronizerService{ @Override public void setSynchronizer(Synchronizers Synchronizer) { - // TODO Auto-generated method stub } diff --git a/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java b/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java index 8a20e1a5..e4117790 100644 --- a/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java +++ b/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinAccessTokenService.java @@ -79,7 +79,6 @@ public class WorkweixinAccessTokenService { public static void main(String[] args) { - // TODO Auto-generated method stub } diff --git a/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java b/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java index a54a6263..4a3e149f 100644 --- a/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java +++ b/maxkey-identitys/maxkey-synchronizers-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java @@ -114,7 +114,6 @@ public class WorkweixinUsersService implements ISynchronizerService{ @Override public void setSynchronizer(Synchronizers Synchronizer) { - // TODO Auto-generated method stub } diff --git a/maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/autoconfigure/SynchronizerAutoConfiguration.java b/maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/autoconfigure/SynchronizerAutoConfiguration.java index f0266c86..a4e2c071 100644 --- a/maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/autoconfigure/SynchronizerAutoConfiguration.java +++ b/maxkey-identitys/maxkey-synchronizers/src/main/java/org/maxkey/synchronizer/autoconfigure/SynchronizerAutoConfiguration.java @@ -126,7 +126,6 @@ public class SynchronizerAutoConfiguration implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub } } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java index e8aa76ea..8c84dbf6 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java @@ -58,7 +58,6 @@ public class AccountsService extends JpaBaseService{ */ @Override public AccountsMapper getMapper() { - // TODO Auto-generated method stub return (AccountsMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsStrategyService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsStrategyService.java index 99948e23..f59f6663 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsStrategyService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsStrategyService.java @@ -18,24 +18,16 @@ package org.maxkey.persistence.service; import java.io.Serializable; -import java.time.LocalDateTime; -import java.time.LocalTime; import java.util.List; import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.maxkey.entity.AccountsStrategy; import org.maxkey.entity.Groups; import org.maxkey.persistence.mapper.AccountsStrategyMapper; -import org.maxkey.persistence.mapper.GroupsMapper; -import org.maxkey.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; -import com.fasterxml.jackson.annotation.JsonIgnore; - @Repository public class AccountsStrategyService extends JpaBaseService implements Serializable { /** @@ -59,7 +51,6 @@ public class AccountsStrategyService extends JpaBaseService i */ @Override public AccountsStrategyMapper getMapper() { - // TODO Auto-generated method stub return (AccountsStrategyMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsAdaptersService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsAdaptersService.java index 9adf5a9b..50d176ca 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsAdaptersService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsAdaptersService.java @@ -34,7 +34,6 @@ public class AppsAdaptersService extends JpaBaseService{ */ @Override public AppsAdaptersMapper getMapper() { - // TODO Auto-generated method stub return (AppsAdaptersMapper)super.getMapper(); } } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java index 975de1f3..0f2c200b 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java @@ -34,7 +34,6 @@ public class AppsCasDetailsService extends JpaBaseService{ */ @Override public AppsCasDetailsMapper getMapper() { - // TODO Auto-generated method stub return (AppsCasDetailsMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java index 622ae9ca..96d172e8 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java @@ -34,7 +34,6 @@ public class AppsJwtDetailsService extends JpaBaseService{ */ @Override public AppsJwtDetailsMapper getMapper() { - // TODO Auto-generated method stub return (AppsJwtDetailsMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java index 1f2572d0..d29bcb85 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsSaml20DetailsService.java @@ -34,7 +34,6 @@ public class AppsSaml20DetailsService extends JpaBaseService */ @Override public AppsSaml20DetailsMapper getMapper() { - // TODO Auto-generated method stub return (AppsSaml20DetailsMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java index 02484669..78f5921d 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsTokenBasedDetailsService.java @@ -34,7 +34,6 @@ public class AppsTokenBasedDetailsService extends JpaBaseService{ */ @Override public GroupMemberMapper getMapper() { - // TODO Auto-generated method stub return (GroupMemberMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java index 65078333..e02aae8f 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupPrivilegesService.java @@ -36,7 +36,6 @@ public class GroupPrivilegesService extends JpaBaseService{ */ @Override public GroupPrivilegesMapper getMapper() { - // TODO Auto-generated method stub return (GroupPrivilegesMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java index 6a3ca10e..704b0fd1 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java @@ -57,7 +57,6 @@ public class GroupsService extends JpaBaseService implements Serializab */ @Override public GroupsMapper getMapper() { - // TODO Auto-generated method stub return (GroupsMapper)super.getMapper(); } @@ -73,7 +72,7 @@ public class GroupsService extends JpaBaseService implements Serializab } public void refreshDynamicGroups(Groups dynamicGroup){ - if(dynamicGroup.getDynamic().equals(ConstantsStatus.ACTIVE)) { + if(dynamicGroup.getDynamic().equals(ConstantsStatus.ACTIVE+"")) { boolean isDynamicTimeSupport = false; boolean isBetweenEffectiveTime = false; if(StringUtils.isNotBlank(dynamicGroup.getResumeTime()) diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryConnectorService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryConnectorService.java index 60b8e8e4..ad0eafbb 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryConnectorService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryConnectorService.java @@ -34,7 +34,6 @@ public class HistoryConnectorService extends JpaBaseService{ */ @Override public HistoryConnectorMapper getMapper() { - // TODO Auto-generated method stub return (HistoryConnectorMapper)super.getMapper(); } } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java index 501200e0..05831306 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginAppsService.java @@ -35,7 +35,6 @@ public class HistoryLoginAppsService extends JpaBaseService{ */ @Override public HistoryLoginAppsMapper getMapper() { - // TODO Auto-generated method stub return (HistoryLoginAppsMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java index 9dd5aa77..47372d6d 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistoryLoginService.java @@ -35,7 +35,6 @@ public class HistoryLoginService extends JpaBaseService{ */ @Override public HistoryLoginMapper getMapper() { - // TODO Auto-generated method stub return (HistoryLoginMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySynchronizerService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySynchronizerService.java index 5c445dfb..90ec7b59 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySynchronizerService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/HistorySynchronizerService.java @@ -34,7 +34,6 @@ public class HistorySynchronizerService extends JpaBaseService{ */ @Override public HistorySystemLogsMapper getMapper() { - // TODO Auto-generated method stub return (HistorySystemLogsMapper)super.getMapper(); } } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/NoticesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/NoticesService.java index ad0af8f7..52e5153b 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/NoticesService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/NoticesService.java @@ -34,7 +34,6 @@ public class NoticesService extends JpaBaseService{ */ @Override public NoticesMapper getMapper() { - // TODO Auto-generated method stub return (NoticesMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsCastService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsCastService.java index 8345da68..24210857 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsCastService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsCastService.java @@ -40,7 +40,6 @@ public class OrganizationsCastService extends JpaBaseService */ @Override public OrganizationsCastMapper getMapper() { - // TODO Auto-generated method stub return (OrganizationsCastMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java index 16161dfc..cca167dc 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java @@ -61,7 +61,6 @@ public class OrganizationsService extends JpaBaseService{ */ @Override public OrganizationsMapper getMapper() { - // TODO Auto-generated method stub return (OrganizationsMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java index 2468542e..1c852dd4 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/PasswordPolicyService.java @@ -34,7 +34,6 @@ public class PasswordPolicyService extends JpaBaseService{ */ @Override public PasswordPolicyMapper getMapper() { - // TODO Auto-generated method stub return (PasswordPolicyMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java index e3667f65..dfb823ff 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RegistrationService.java @@ -37,7 +37,6 @@ public class RegistrationService extends JpaBaseService{ */ @Override public RegistrationMapper getMapper() { - // TODO Auto-generated method stub return (RegistrationMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ReportService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ReportService.java index 86086d2e..6f181865 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ReportService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ReportService.java @@ -73,7 +73,6 @@ public class ReportService extends JpaBaseService{ */ @Override public ReportMapper getMapper() { - // TODO Auto-generated method stub return (ReportMapper)super.getMapper(); } } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java index 657b1637..22d0d4c6 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/ResourcesService.java @@ -36,7 +36,6 @@ public class ResourcesService extends JpaBaseService{ */ @Override public ResourcesMapper getMapper() { - // TODO Auto-generated method stub return (ResourcesMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java index cfca5246..2181ae70 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/RoleMemberService.java @@ -35,7 +35,6 @@ public class RoleMemberService extends JpaBaseService{ */ @Override public RoleMemberMapper getMapper() { - // TODO Auto-generated method stub return (RoleMemberMapper)super.getMapper(); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/SynchronizersService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/SynchronizersService.java index cbaec267..abd8d48b 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/SynchronizersService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/SynchronizersService.java @@ -37,7 +37,6 @@ public class SynchronizersService extends JpaBaseService{ */ @Override public SynchronizersMapper getMapper() { - // TODO Auto-generated method stub return (SynchronizersMapper)super.getMapper(); } diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java index dcdd7b84..9bfade6a 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/adapter/AbstractAuthorizeAdapter.java @@ -55,7 +55,6 @@ public abstract class AbstractAuthorizeAdapter { } catch (UnsupportedEncodingException e) { e.printStackTrace(); } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); } _logger.debug("Token : "+data); diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java index a5eddbcf..aa44a90a 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java @@ -101,8 +101,6 @@ renew [OPTIONAL] - if this parameter is set, ticket validation will only succeed try { storedTicket = ticketServices.consumeTicket(ticket); } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); _logger.error("consume Ticket error " , e); } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java index e87ea1ce..8b64c71c 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java @@ -195,7 +195,6 @@ For all error codes, it is RECOMMENDED that CAS provide a more detailed message try { storedTicket = ticketServices.consumeTicket(ticket); } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); } } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java index acf87b06..4793b475 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java @@ -78,7 +78,6 @@ public class Cas30AuthorizeEndpoint extends CasBaseAuthorizeEndpoint{ try { storedTicket = ticketServices.consumeTicket(ticket); } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); } } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java index 7d7c61bb..ad931ef9 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java @@ -128,7 +128,6 @@ public class CasRestV1Endpoint extends CasBaseAuthorizeEndpoint{ return new ResponseEntity<>(ticket, HttpStatus.OK); } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); } return new ResponseEntity<>("", HttpStatus.BAD_REQUEST); @@ -147,7 +146,6 @@ public class CasRestV1Endpoint extends CasBaseAuthorizeEndpoint{ return new ResponseEntity<>("", HttpStatus.OK); } } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); } return new ResponseEntity<>("", HttpStatus.NOT_FOUND); @@ -167,7 +165,6 @@ public class CasRestV1Endpoint extends CasBaseAuthorizeEndpoint{ return new ResponseEntity<>("", HttpStatus.OK); } } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); } return new ResponseEntity<>("", HttpStatus.NOT_FOUND); diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java index b42219d4..1fe64c2a 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java @@ -149,13 +149,11 @@ public abstract class AbstractTicket implements Ticket { @Override public AppsCasDetails getCasDetails() { - // TODO Auto-generated method stub return this.casDetails; } @Override public Authentication getAuthentication() { - // TODO Auto-generated method stub return this.authentication; } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java index c80870b3..7085ac90 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java @@ -115,20 +115,17 @@ public class ServiceTicketImpl extends AbstractTicket implements ServiceTicket{ @Override public Service getService() { - // TODO Auto-generated method stub return null; } @Override public boolean isFromNewLogin() { - // TODO Auto-generated method stub return false; } @Override public ProxyGrantingTicket grantProxyGrantingTicket(String id, Authentication authentication, ExpirationPolicy expirationPolicy) throws Exception { - // TODO Auto-generated method stub return null; } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java index d54f4c42..4e20ea50 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java @@ -166,37 +166,31 @@ public class TicketGrantingTicketImpl extends AbstractTicket implements TicketGr @Override public Map getServices() { - // TODO Auto-generated method stub return null; } @Override public Map getProxyGrantingTickets() { - // TODO Auto-generated method stub return null; } @Override public Service getProxiedBy() { - // TODO Auto-generated method stub return null; } @Override public boolean isRoot() { - // TODO Auto-generated method stub return false; } @Override public TicketGrantingTicket getRoot() { - // TODO Auto-generated method stub return null; } @Override public List getChainedAuthentications() { - // TODO Auto-generated method stub return null; } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java index ad486b01..2c630183 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/pgt/InMemoryProxyGrantingTicketServices.java @@ -48,7 +48,6 @@ public class InMemoryProxyGrantingTicketServices extends RandomServiceTicketServ @Override public Ticket get(String ticket) { - // TODO Auto-generated method stub return casTicketStore.getIfPresent(ticket); } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java index 026836cb..bcb2710e 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/st/InMemoryTicketServices.java @@ -48,8 +48,7 @@ public class InMemoryTicketServices extends RandomServiceTicketServices { @Override public Ticket get(String ticket) { - // TODO Auto-generated method stub - return null; + return casTicketStore.getIfPresent(ticket); } } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java index 4df86ea9..186ef616 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java @@ -83,7 +83,6 @@ public class CasAutoConfiguration implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub } } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/DefaultUniqueTicketIdGeneratorTest.java b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/DefaultUniqueTicketIdGeneratorTest.java index 6a628e9f..24e175fe 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/DefaultUniqueTicketIdGeneratorTest.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/DefaultUniqueTicketIdGeneratorTest.java @@ -21,7 +21,6 @@ import org.maxkey.authz.cas.endpoint.ticket.generator.DefaultUniqueTicketIdGener public class DefaultUniqueTicketIdGeneratorTest { public static void main(String[] args) { - // TODO Auto-generated method stub DefaultUniqueTicketIdGenerator t=new DefaultUniqueTicketIdGenerator(); System.out.println(t.getNewTicketId("ST")); } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/InetAddressUtilsTest.java b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/InetAddressUtilsTest.java index 8547241b..19dcbb8a 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/InetAddressUtilsTest.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/cas/ticket/generator/InetAddressUtilsTest.java @@ -22,11 +22,9 @@ import org.maxkey.authz.cas.endpoint.ticket.generator.InetAddressUtils; public class InetAddressUtilsTest { public InetAddressUtilsTest() { - // TODO Auto-generated constructor stub } public static void main(String[] args) { - // TODO Auto-generated method stub System.out.println(InetAddressUtils.getCasServerHostName()); } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/response/ServiceResponseBuilderTest.java b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/response/ServiceResponseBuilderTest.java index 503c13b7..fc573e46 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/response/ServiceResponseBuilderTest.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/response/ServiceResponseBuilderTest.java @@ -26,11 +26,9 @@ import org.maxkey.pretty.impl.XmlPretty; public class ServiceResponseBuilderTest { public ServiceResponseBuilderTest() { - // TODO Auto-generated constructor stub } public static void main(String[] args) throws Exception { - // TODO Auto-generated method stub ServiceResponseBuilder srbJson=new ServiceResponseBuilder(); srbJson.success() .setUser("shi") diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java index 4262786c..ad0d685a 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedDefaultAdapter.java @@ -36,7 +36,6 @@ public class FormBasedDefaultAdapter extends AbstractAuthorizeAdapter { @Override public String encrypt(String data, String algorithmKey, String algorithm) { - // TODO Auto-generated method stub return null; } diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java index 5f0b9a78..f6660c1c 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNetease163EmailAdapter.java @@ -33,7 +33,6 @@ public class FormBasedNetease163EmailAdapter extends AbstractAuthorizeAdapter { @Override public String encrypt(String data, String algorithmKey, String algorithm) { - // TODO Auto-generated method stub return null; } diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java index 6212edd4..0f05a8a3 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java @@ -35,7 +35,6 @@ public class FormBasedNeteaseNoteYoudaoAdapter extends AbstractAuthorizeAdapter @Override public String encrypt(String data, String algorithmKey, String algorithm) { - // TODO Auto-generated method stub return null; } diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java index 63d22491..7507172a 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/maxkey/authz/formbased/endpoint/adapter/FormBasedRedirectAdapter.java @@ -37,7 +37,6 @@ public class FormBasedRedirectAdapter extends AbstractAuthorizeAdapter { @Override public String encrypt(String data, String algorithmKey, String algorithm) { - // TODO Auto-generated method stub return null; } diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Deserializer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Deserializer.java index 6eea7a90..c64b77c9 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Deserializer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2AccessTokenJackson2Deserializer.java @@ -60,7 +60,7 @@ public final class OAuth2AccessTokenJackson2Deserializer extends StdDeserializer Set scope = null; Map additionalInformation = new LinkedHashMap(); - // TODO What should occur if a parameter exists twice + // What should occur if a parameter exists twice while (jp.nextToken() != JsonToken.END_OBJECT) { String name = jp.getCurrentName(); jp.nextToken(); @@ -88,7 +88,7 @@ public final class OAuth2AccessTokenJackson2Deserializer extends StdDeserializer } } - // TODO What should occur if a required parameter (tokenValue or tokenType) is missing? + // What should occur if a required parameter (tokenValue or tokenType) is missing? DefaultOAuth2AccessToken accessToken = new DefaultOAuth2AccessToken(tokenValue); accessToken.setTokenType(tokenType); diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/JwtHelper.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/JwtHelper.java index 345cba9c..bcef27f8 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/JwtHelper.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/jwt/JwtHelper.java @@ -50,7 +50,7 @@ public class JwtHelper { throw new IllegalArgumentException("JWT must have 3 tokens"); } CharBuffer buffer = CharBuffer.wrap(token, 0, firstPeriod); - // TODO: Use a Reader which supports CharBuffer + // Use a Reader which supports CharBuffer JwtHeader header = JwtHeaderHelper.create(buffer.toString()); buffer.limit(lastPeriod).position(firstPeriod + 1); diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2RequestFactory.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2RequestFactory.java index b5a97c40..31de7635 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2RequestFactory.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/OAuth2RequestFactory.java @@ -54,7 +54,7 @@ public interface OAuth2RequestFactory { /** * Create a new {@link OAuth2Request} by extracting the needed information from the current {@link TokenRequest} * object. - * @param client TODO + * @param client * @param tokenRequest the request to be converted * * @return am immutable object for storage diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java index 6e6158fc..6cdee807 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java @@ -126,7 +126,7 @@ public class JdbcClientDetailsService implements ClientDetailsService, ClientReg } public ClientDetails loadClientByClientId(String clientId) { - //TODO: cache in memory + // cache in memory ClientDetails details = clientDetailsCache.getIfPresent(clientId); if(details == null) { try { diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java index 91bdd3f2..d7e6ec4a 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java @@ -188,7 +188,7 @@ public class AuthorizationEndpoint extends AbstractEndpoint { // such logic here, and set the approved flag on the authorization request accordingly. authorizationRequest = userApprovalHandler.checkForPreApproval(authorizationRequest, (Authentication) principal); - // TODO: is this call necessary? + // is this call necessary? boolean approved = userApprovalHandler.isApproved(authorizationRequest, (Authentication) principal); authorizationRequest.setApproved(approved); @@ -331,7 +331,7 @@ public class AuthorizationEndpoint extends AbstractEndpoint { return accessToken; } - //TODO: Authorization Code Response + // Authorization Code Response private View getAuthorizationCodeResponse(AuthorizationRequest authorizationRequest, Authentication authUser) { try { return new RedirectView(getSuccessfulRedirect(authorizationRequest, @@ -419,7 +419,7 @@ public class AuthorizationEndpoint extends AbstractEndpoint { } } - //TODO: Successful Redirect + // Successful Redirect private String getSuccessfulRedirect(AuthorizationRequest authorizationRequest, String authorizationCode) { if (authorizationCode == null) { diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java index 91d86dc0..303e86a1 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/userinfo/endpoint/OAuthDefaultUserInfoAdapter.java @@ -56,13 +56,12 @@ public class OAuthDefaultUserInfoAdapter extends AbstractAuthorizeAdapter { @Override public String encrypt(String data, String algorithmKey, String algorithm) { - // TODO Auto-generated method stub return null; } @Override public ModelAndView authorize(UserInfo userInfo, Object app, String data,ModelAndView modelAndView) { - // TODO Auto-generated method stub + return null; } diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java index 2835149b..cdb929ea 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oidc/idtoken/OIDCIdTokenEnhancer.java @@ -125,7 +125,7 @@ public class OIDCIdTokenEnhancer implements TokenEnhancer { // if the auth time claim was explicitly requested OR if the client always wants the auth time, put it in if (request.getExtensions().containsKey("max_age") - || (request.getExtensions().containsKey("idtoken")) // TODO: parse the ID Token claims (#473) -- for now assume it could be in there + || (request.getExtensions().containsKey("idtoken")) // parse the ID Token claims (#473) -- for now assume it could be in there ) { DateTime loginDate=DateTime.parse(WebContext.getUserInfo().getLastLoginTime(), DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss")); builder.claim("auth_time", loginDate.getMillis()/ 1000); diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java index 3c422839..a0b50a8e 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java @@ -339,7 +339,6 @@ public class Oauth20AutoConfiguration implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub } } diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/SignatureSecurityPolicyRule.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/SignatureSecurityPolicyRule.java index 89d123b0..1c6a2c56 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/SignatureSecurityPolicyRule.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml/common/SignatureSecurityPolicyRule.java @@ -86,7 +86,7 @@ public class SignatureSecurityPolicyRule implements InitializingBean, SecurityP } SignableSAMLObject samlMessage = (SignableSAMLObject) messageContext.getInboundMessage(); - //TODO:POST NEED Signed,but some is not + //POST NEED Signed,but some is not if( !samlMessage.isSigned()) { logger.debug("evaluating signature POST NEED Signed,but some is not."); throw new SecurityPolicyException("InboundMessage was not signed."); diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java index e182be5c..cd421650 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java @@ -139,7 +139,6 @@ public class ExtractPostBindingAdapter implements ExtractBindingAdapter, Initial @Override public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub } diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java index fef0ac2c..3ea8fa07 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java @@ -227,7 +227,6 @@ public class ConsumerEndpoint { // 1. 获取 sp keyStore AppsSAML20Details saml20Details = saml20DetailsService.get(spId); if (saml20Details == null) { - // TODO logger.error("spid[" + spId + "] not exists"); throw new Exception(); } diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java index af12afc6..986a0250 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java @@ -334,7 +334,6 @@ public class Saml20AutoConfiguration implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub } } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java index 930f2a2c..bb61a3a3 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java @@ -310,7 +310,6 @@ public class MaxKeyConfig implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - // TODO Auto-generated method stub } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegistrationController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegistrationController.java index d6714271..d28628f9 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegistrationController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/RegistrationController.java @@ -124,7 +124,6 @@ public class RegistrationController { // send the email email.send(); } catch (EmailException e) { - // TODO Auto-generated catch block e.printStackTrace(); } modelAndView.addObject("registered", 0); diff --git a/maxkey-webs/maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java b/maxkey-webs/maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java index bf4931a0..3f21a9be 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java +++ b/maxkey-webs/maxkey-web-maxkey/src/test/java/org/maxkey/web/authentication/kerberos/KerberosPrincipal.java @@ -39,14 +39,12 @@ public class KerberosPrincipal { * */ public KerberosPrincipal() { - // TODO Auto-generated constructor stub } /** * @param args */ public static void main(String[] args) { - // TODO Auto-generated method stub String kerberosPrincipal="Administrator@CONNSEC.COM"; kerberosPrincipal=kerberosPrincipal.substring(0, kerberosPrincipal.indexOf("@")); System.out.println(kerberosPrincipal); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java index 85414969..4bd2e296 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java @@ -36,11 +36,12 @@ import org.springframework.context.annotation.ComponentScan; @ComponentScan(basePackages = { "org.maxkey.MaxKeyMgtConfig", "org.maxkey.MaxKeyMgtMvcConfig", + "org.maxkey.MaxKeyMgtJobs", "org.maxkey.web.interceptor", "org.maxkey.configuration", - "org.maxkey.domain", - "org.maxkey.domain.apps", - "org.maxkey.domain.userinfo", + "org.maxkey.entity", + "org.maxkey.entity.apps", + "org.maxkey.entity.userinfo", "org.maxkey.web.endpoint", "org.maxkey.web.contorller", "org.maxkey.web.apps.contorller", @@ -70,8 +71,7 @@ public class MaxKeyMgtApplication extends SpringBootServletInitializer { try { initWebContext.init(null); } catch (ServletException e) { - e.printStackTrace(); - _logger.error("",e); + _logger.error("Exception ",e); } _logger.info("MaxKeyMgt at "+new DateTime()); _logger.info("MaxKeyMgt Server Port "+applicationContext.getBean(ApplicationConfig.class).getPort()); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtConfig.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtConfig.java index 56f1e8b1..d03e2293 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtConfig.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtConfig.java @@ -23,27 +23,13 @@ import org.maxkey.authz.oauth2.provider.token.DefaultTokenServices; import org.maxkey.authz.oauth2.provider.token.TokenStore; import org.maxkey.authz.oauth2.provider.token.store.InMemoryTokenStore; import org.maxkey.authz.oauth2.provider.token.store.RedisTokenStore; -import org.maxkey.jobs.DynamicGroupsJob; import org.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn; import org.maxkey.persistence.db.LoginHistoryService; import org.maxkey.persistence.db.LoginService; import org.maxkey.persistence.db.PasswordPolicyValidator; import org.maxkey.persistence.redis.RedisConnectionFactory; -import org.maxkey.persistence.service.GroupsService; import org.maxkey.persistence.service.UserInfoService; -import org.opensaml.xml.ConfigurationException; -import org.quartz.CronScheduleBuilder; -import org.quartz.CronTrigger; -import org.quartz.Job; -import org.quartz.JobBuilder; -import org.quartz.JobDataMap; -import org.quartz.JobDetail; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.TriggerBuilder; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.slf4j.Logger; @@ -53,7 +39,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.scheduling.quartz.SchedulerFactoryBean; import org.springframework.security.crypto.password.PasswordEncoder; @Configuration @@ -108,7 +93,7 @@ public class MaxKeyMgtConfig implements InitializingBean { } - //浠ヤ笅鍐呭鍙互娉ㄩ噴鎺夊悗鍐峹ml涓厤缃�,xml寮曞叆鍦∕axKeyMgtApplication涓� + //authenticationRealm for MaxKeyMgtApplication @Bean(name = "authenticationRealm") public JdbcAuthenticationRealm authenticationRealm( PasswordEncoder passwordEncoder, @@ -138,48 +123,7 @@ public class MaxKeyMgtConfig implements InitializingBean { _logger.debug("TimeBasedOtpAuthn inited."); return tfaOtpAuthn; } - - /** - * schedulerJobsInit. - * @return schedulerJobsInit - * @throws ConfigurationException - * @throws SchedulerException - */ - @Bean(name = "schedulerJobs") - public String schedulerJobs( - SchedulerFactoryBean schedulerFactoryBean, - GroupsService groupsService, - @Value("${maxkey.job.cron.dynamicgroups}") String cronSchedule - ) throws SchedulerException { - - Scheduler scheduler = schedulerFactoryBean.getScheduler(); - //dynamicGroupsJob("DynamicGroups",DynamicGroupsJob.class,scheduler,groupsService,cronSchedule); - - return "schedulerJobs"; - } - - - public void dynamicGroupsJob(String jobName, - Class cls, - Scheduler scheduler, - JpaBaseService service, - String cronSchedule) throws SchedulerException { - JobDetail jobDetail = - JobBuilder.newJob(cls) - .withIdentity(jobName + "Job", jobName) - .build(); - JobDataMap jobDataMap = new JobDataMap(); - jobDataMap.put("service", service); - CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(cronSchedule); - CronTrigger cronTrigger = - TriggerBuilder.newTrigger() - .withIdentity("trigger" + jobName, jobName) - .usingJobData(jobDataMap) - .withSchedule(scheduleBuilder) - .build(); - scheduler.scheduleJob(jobDetail,cronTrigger); - } - + @Override public void afterPropertiesSet() throws Exception { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtJobs.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtJobs.java new file mode 100644 index 00000000..49b7da6d --- /dev/null +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtJobs.java @@ -0,0 +1,142 @@ +/* + * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.maxkey; + +import org.maxkey.jobs.AccountsStrategyJob; +import org.maxkey.jobs.DynamicGroupsJob; +import org.maxkey.persistence.service.AccountsService; +import org.maxkey.persistence.service.GroupsService; +import org.opensaml.xml.ConfigurationException; +import org.quartz.CronScheduleBuilder; +import org.quartz.CronTrigger; +import org.quartz.Job; +import org.quartz.JobBuilder; +import org.quartz.JobDataMap; +import org.quartz.JobDetail; +import org.quartz.Scheduler; +import org.quartz.SchedulerException; +import org.quartz.TriggerBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.quartz.SchedulerFactoryBean; + +@Configuration +public class MaxKeyMgtJobs implements InitializingBean { + private static final Logger _logger = LoggerFactory.getLogger(MaxKeyMgtJobs.class); + + /** + * schedulerJobsInit. + * @return schedulerJobsInit + * @throws ConfigurationException + * @throws SchedulerException + */ + @Bean(name = "schedulerJobs") + public String schedulerJobs( + SchedulerFactoryBean schedulerFactoryBean, + GroupsService groupsService, + AccountsService accountsService, + @Value("${maxkey.job.cron.schedule}") String cronSchedule + ) throws SchedulerException { + _logger.debug("cron schedule : " + cronSchedule); + + Scheduler scheduler = schedulerFactoryBean.getScheduler(); + + addDynamicGroupsJob( + DynamicGroupsJob.class, + scheduler, + groupsService, + cronSchedule, + "DynamicGroups" + ); + + addAccountsStrategyJob( + AccountsStrategyJob.class, + scheduler, + accountsService, + cronSchedule, + "AccountsStrategy" + ); + + return "schedulerJobs"; + } + + + private void addDynamicGroupsJob( Class jobClass, + Scheduler scheduler , + GroupsService groupsService, + String cronSchedule, + String identity + ) throws SchedulerException { + + _logger.debug("add DynamicGroups Job"); + JobDetail jobDetail = + JobBuilder.newJob(jobClass) + .withIdentity(identity + "Job", identity + "Group") + .build(); + + JobDataMap jobDataMap = new JobDataMap(); + jobDataMap.put("groupsService", groupsService); + CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(cronSchedule); + + CronTrigger cronTrigger = + TriggerBuilder.newTrigger() + .withIdentity("trigger" + identity, identity + "TriggerGroup") + .usingJobData(jobDataMap) + .withSchedule(scheduleBuilder) + .build(); + + scheduler.scheduleJob(jobDetail,cronTrigger); + } + + private void addAccountsStrategyJob(Class jobClass, + Scheduler scheduler , + AccountsService accountsService, + String cronSchedule, + String identity + ) throws SchedulerException { + + _logger.debug("add Accounts Strategy Job"); + JobDetail jobDetail = + JobBuilder.newJob(jobClass) + .withIdentity(identity + "Job", identity + "Group") + .build(); + + JobDataMap jobDataMap = new JobDataMap(); + jobDataMap.put("accountsService", accountsService); + + CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(cronSchedule); + CronTrigger cronTrigger = + TriggerBuilder.newTrigger() + .withIdentity("trigger" + identity, identity + "TriggerGroup") + .usingJobData(jobDataMap) + .withSchedule(scheduleBuilder) + .build(); + + scheduler.scheduleJob(jobDetail,cronTrigger); + } + + @Override + public void afterPropertiesSet() throws Exception { + + } + +} diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties index c86ca884..dff76be5 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/application-http.properties @@ -214,8 +214,8 @@ maxkey.oidc.metadata.userinfoEndpoint =${maxkey.server.authz.uri}/api/ ############################################################################# #Job Scheduler # ############################################################################# -#one hour for refresh dynamic groups -maxkey.job.cron.dynamicgroups =0 0 0/1 * * ? +#one hour for refresh Schedule +maxkey.job.cron.schedule =0 0 0/1 * * ? maxkey.job.cron.enable =true ############################################################################