password-service api cleanup

Change-Id: I89949d2d40605b40286c770e950a33b2ce6320f6
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>

diff --git a/aaa-password-service/api/pom.xml b/aaa-password-service/api/pom.xml
index 4f9c2d95609d990e57694d4fbd2673d62813e697..55e34d78453b6398d8d3a071a08d453d1aed6245 100644 (file)
--- a/aaa-password-service/api/pom.xml
+++ b/aaa-password-service/api/pom.xml
@@ -23,6 +23,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: aaa :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
+  <dependencies>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>
@@ -32,7 +39,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <configuration>
           <instructions>
             <Export-Package>
-              org.opendaylight.aaa.api.password.service
+              org.opendaylight.aaa.api.password.service,
+              org.opendaylight.yang.gen.v1.urn.opendaylight.aaa.password.service.config.rev170619
             </Export-Package>
           </instructions>
         </configuration>

diff --git a/aaa-password-service/api/src/main/java/org/opendaylight/aaa/api/password/service/PasswordHash.java b/aaa-password-service/api/src/main/java/org/opendaylight/aaa/api/password/service/PasswordHash.java
index afe67fc61508c904062d41d1daaf5222bf1f861c..8e855ba0f9fd55a753fbd6fcf2d04d21650217b3 100644 (file)
--- a/aaa-password-service/api/src/main/java/org/opendaylight/aaa/api/password/service/PasswordHash.java
+++ b/aaa-password-service/api/src/main/java/org/opendaylight/aaa/api/password/service/PasswordHash.java
@@ -7,9 +7,12 @@
  */
 package org.opendaylight.aaa.api.password.service;
 
+import com.google.common.annotations.Beta;
+
 /**
  * Four-tuple representing a <code>PasswordHash</code>.
  */
+@Beta
 public interface PasswordHash {
 
     /**

diff --git a/aaa-password-service/api/src/main/java/org/opendaylight/aaa/api/password/service/PasswordHashService.java b/aaa-password-service/api/src/main/java/org/opendaylight/aaa/api/password/service/PasswordHashService.java
index 1b3da928070c57ebb78b382352639bfc207b64e8..40b2ab46071dbd3050a96d2e70f101b4c24fabb5 100644 (file)
--- a/aaa-password-service/api/src/main/java/org/opendaylight/aaa/api/password/service/PasswordHashService.java
+++ b/aaa-password-service/api/src/main/java/org/opendaylight/aaa/api/password/service/PasswordHashService.java
@@ -7,9 +7,12 @@
  */
 package org.opendaylight.aaa.api.password.service;
 
+import com.google.common.annotations.Beta;
+
 /**
  * Service responsible for generating salts and comparing passwords.  This service is designed for one-way hashing only.
  */
+@Beta
 public interface PasswordHashService {
 
     /**
@@ -18,7 +21,7 @@ public interface PasswordHashService {
      * @param password a plaintext password
      * @return the result of hashing the password
      */
-    PasswordHash getHashedPassword(String password);
+    PasswordHash getPasswordHash(String password);
 
     /**
      * Extract a hashed password using an input salt.
@@ -27,7 +30,7 @@ public interface PasswordHashService {
      * @param salt the hash for <code>password</code>
      * @return the result of hashing the password
      */
-    PasswordHash getHashedPassword(String password, String salt);
+    PasswordHash getPasswordHash(String password, String salt);
 
     /**
      * Password comparison.