From dcaebde6c4bdcbf6d50b3c8b8d6aacecf798fc8d Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 1 Feb 2013 11:40:06 +0100
Subject: [PATCH] added missing deprecated annotations

---
 .../main/java/sonia/scm/security/CipherException.java  |  5 +++++
 .../src/main/java/sonia/scm/security/HashBuilder.java  |  1 +
 .../main/java/sonia/scm/security/MD5HashBuilder.java   |  1 +
 .../sonia/scm/security/MessageDigestHashBuilder.java   | 10 ++++++----
 .../main/java/sonia/scm/security/SHA1HashBuilder.java  |  1 +
 .../java/sonia/scm/security/SHA512HashBuilder.java     |  1 +
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/security/CipherException.java b/scm-core/src/main/java/sonia/scm/security/CipherException.java
index 21a5d62799..d3f7668df2 100644
--- a/scm-core/src/main/java/sonia/scm/security/CipherException.java
+++ b/scm-core/src/main/java/sonia/scm/security/CipherException.java
@@ -41,6 +41,11 @@ package sonia.scm.security;
 public class CipherException extends RuntimeException
 {
 
+  /** Field description */
+  private static final long serialVersionUID = -310359939906084281L;
+
+  //~--- constructors ---------------------------------------------------------
+
   /**
    * Constructs ...
    *
diff --git a/scm-core/src/main/java/sonia/scm/security/HashBuilder.java b/scm-core/src/main/java/sonia/scm/security/HashBuilder.java
index c1b52cfc20..e0f854d4df 100644
--- a/scm-core/src/main/java/sonia/scm/security/HashBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/security/HashBuilder.java
@@ -43,6 +43,7 @@ import org.apache.shiro.crypto.hash.SimpleHash;
  * @since 1.13
  * @deprecated use {@link SimpleHash} instead.
  */
+@Deprecated
 public interface HashBuilder
 {
 
diff --git a/scm-core/src/main/java/sonia/scm/security/MD5HashBuilder.java b/scm-core/src/main/java/sonia/scm/security/MD5HashBuilder.java
index 4db3f4412b..d1194e779d 100644
--- a/scm-core/src/main/java/sonia/scm/security/MD5HashBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/security/MD5HashBuilder.java
@@ -43,6 +43,7 @@ import org.apache.shiro.crypto.hash.Md5Hash;
  * @since 1.13
  * @deprecated use {@link Md5Hash} instead.
  */
+@Deprecated
 public class MD5HashBuilder extends MessageDigestHashBuilder
 {
 
diff --git a/scm-core/src/main/java/sonia/scm/security/MessageDigestHashBuilder.java b/scm-core/src/main/java/sonia/scm/security/MessageDigestHashBuilder.java
index fbfb5804e1..e1c1e0e939 100644
--- a/scm-core/src/main/java/sonia/scm/security/MessageDigestHashBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/security/MessageDigestHashBuilder.java
@@ -30,10 +30,13 @@
  */
 
 
+
 package sonia.scm.security;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import org.apache.shiro.crypto.hash.SimpleHash;
+
 import sonia.scm.util.Util;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -46,7 +49,6 @@ import java.security.SecureRandom;
 
 import java.util.regex.Matcher;
 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
  * @deprecated use {@link SimpleHash} instead.
  */
+@Deprecated
 public class MessageDigestHashBuilder implements HashBuilder
 {
 
@@ -83,8 +86,7 @@ public class MessageDigestHashBuilder implements HashBuilder
    * @param enableLabel
    */
   public MessageDigestHashBuilder(String digest, String value, byte[] salt,
-                                  int iterations, boolean appendSalt,
-                                  boolean enableLabel)
+    int iterations, boolean appendSalt, boolean enableLabel)
   {
     this.digest = digest;
     this.value = value;
@@ -404,7 +406,7 @@ public class MessageDigestHashBuilder implements HashBuilder
           }
 
           hashBuilder = new MessageDigestHashBuilder(digest, null, salt, 0,
-                  salt != null, true);
+            salt != null, true);
         }
       }
 
diff --git a/scm-core/src/main/java/sonia/scm/security/SHA1HashBuilder.java b/scm-core/src/main/java/sonia/scm/security/SHA1HashBuilder.java
index 428b93a354..975ccd0d3c 100644
--- a/scm-core/src/main/java/sonia/scm/security/SHA1HashBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/security/SHA1HashBuilder.java
@@ -43,6 +43,7 @@ import org.apache.shiro.crypto.hash.Sha1Hash;
  * @since 1.13
  * @deprecated use {@link Sha1Hash} instead.
  */
+@Deprecated
 public class SHA1HashBuilder extends MessageDigestHashBuilder
 {
 
diff --git a/scm-core/src/main/java/sonia/scm/security/SHA512HashBuilder.java b/scm-core/src/main/java/sonia/scm/security/SHA512HashBuilder.java
index d218cad754..298e2e5846 100644
--- a/scm-core/src/main/java/sonia/scm/security/SHA512HashBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/security/SHA512HashBuilder.java
@@ -43,6 +43,7 @@ import org.apache.shiro.crypto.hash.Sha512Hash;
  * @since 1.13
  * @deprecated use {@link Sha512Hash} instead.
  */
+@Deprecated
 public class SHA512HashBuilder extends MessageDigestHashBuilder
 {