added missing deprecated annotations

This commit is contained in:
Sebastian Sdorra
2013-02-01 11:40:06 +01:00
parent 92e2431078
commit dcaebde6c4
6 changed files with 15 additions and 4 deletions

View File

@@ -41,6 +41,11 @@ package sonia.scm.security;
public class CipherException extends RuntimeException public class CipherException extends RuntimeException
{ {
/** Field description */
private static final long serialVersionUID = -310359939906084281L;
//~--- constructors ---------------------------------------------------------
/** /**
* Constructs ... * Constructs ...
* *

View File

@@ -43,6 +43,7 @@ import org.apache.shiro.crypto.hash.SimpleHash;
* @since 1.13 * @since 1.13
* @deprecated use {@link SimpleHash} instead. * @deprecated use {@link SimpleHash} instead.
*/ */
@Deprecated
public interface HashBuilder public interface HashBuilder
{ {

View File

@@ -43,6 +43,7 @@ import org.apache.shiro.crypto.hash.Md5Hash;
* @since 1.13 * @since 1.13
* @deprecated use {@link Md5Hash} instead. * @deprecated use {@link Md5Hash} instead.
*/ */
@Deprecated
public class MD5HashBuilder extends MessageDigestHashBuilder public class MD5HashBuilder extends MessageDigestHashBuilder
{ {

View File

@@ -30,10 +30,13 @@
*/ */
package sonia.scm.security; package sonia.scm.security;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
import org.apache.shiro.crypto.hash.SimpleHash;
import sonia.scm.util.Util; import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
@@ -46,7 +49,6 @@ import java.security.SecureRandom;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.shiro.crypto.hash.SimpleHash;
/** /**
* *
@@ -54,6 +56,7 @@ import org.apache.shiro.crypto.hash.SimpleHash;
* @since 1.13 * @since 1.13
* @deprecated use {@link SimpleHash} instead. * @deprecated use {@link SimpleHash} instead.
*/ */
@Deprecated
public class MessageDigestHashBuilder implements HashBuilder public class MessageDigestHashBuilder implements HashBuilder
{ {
@@ -83,8 +86,7 @@ public class MessageDigestHashBuilder implements HashBuilder
* @param enableLabel * @param enableLabel
*/ */
public MessageDigestHashBuilder(String digest, String value, byte[] salt, public MessageDigestHashBuilder(String digest, String value, byte[] salt,
int iterations, boolean appendSalt, int iterations, boolean appendSalt, boolean enableLabel)
boolean enableLabel)
{ {
this.digest = digest; this.digest = digest;
this.value = value; this.value = value;
@@ -404,7 +406,7 @@ public class MessageDigestHashBuilder implements HashBuilder
} }
hashBuilder = new MessageDigestHashBuilder(digest, null, salt, 0, hashBuilder = new MessageDigestHashBuilder(digest, null, salt, 0,
salt != null, true); salt != null, true);
} }
} }

View File

@@ -43,6 +43,7 @@ import org.apache.shiro.crypto.hash.Sha1Hash;
* @since 1.13 * @since 1.13
* @deprecated use {@link Sha1Hash} instead. * @deprecated use {@link Sha1Hash} instead.
*/ */
@Deprecated
public class SHA1HashBuilder extends MessageDigestHashBuilder public class SHA1HashBuilder extends MessageDigestHashBuilder
{ {

View File

@@ -43,6 +43,7 @@ import org.apache.shiro.crypto.hash.Sha512Hash;
* @since 1.13 * @since 1.13
* @deprecated use {@link Sha512Hash} instead. * @deprecated use {@link Sha512Hash} instead.
*/ */
@Deprecated
public class SHA512HashBuilder extends MessageDigestHashBuilder public class SHA512HashBuilder extends MessageDigestHashBuilder
{ {