commit bfe3ef97844ee7551ac08d45806b52154122f994
author Khai Do <zaro0508@gmail.com> Fri Jun 24 14:59:05 2016 -0700
committer Khai Do <zaro0508@gmail.com> Sun Jul 10 11:38:15 2016 -0700
tree c003b80ede83934f4652503886168e41e37b8929
parent 0b9ff7e66f2201440c9044d2ca8a864aed01f0da

Remove username parameter

The Storyboard REST api only requires a user's authentication
token to GET and POST.  It does not require the user name so just
remove it.

Change-Id: Ibd835a148e45e777713e5d584377c13bc497f5aa
(cherry picked from commit e628af920f62b056b833e61a9f2ce0b598025715)

src/main/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardClient.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardClient.java b/src/main/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardClient.java
index b117517..69edb1c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardClient.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardClient.java
@@ -39,13 +39,10 @@
   public static final String SYS_INFO_ENDPOINT = "/api/v1/systeminfo";
 
   private final String baseUrl;
-  private final String username;
   private final String password;
 
-  public StoryboardClient(final String baseUrl, final String username,
-      String password) {
+  public StoryboardClient(final String baseUrl, String password) {
     this.baseUrl = baseUrl;
-    this.username = username;
     this.password = password;
   }
 

src/main/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardItsFacade.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardItsFacade.java b/src/main/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardItsFacade.java
index b367609..a5f7202 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardItsFacade.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardItsFacade.java
@@ -30,7 +30,6 @@
 public class StoryboardItsFacade implements ItsFacade {
   private final Logger log = LoggerFactory.getLogger(StoryboardItsFacade.class);
 
-  private static final String GERRIT_CONFIG_USERNAME = "username";
   private static final String GERRIT_CONFIG_PASSWORD = "password";
   private static final String GERRIT_CONFIG_URL = "url";
 
@@ -40,12 +39,10 @@
   public StoryboardItsFacade(@PluginName String pluginName,
       @GerritServerConfig Config cfg) {
     final String url = cfg.getString(pluginName, null, GERRIT_CONFIG_URL);
-    final String username = cfg.getString(pluginName, null,
-            GERRIT_CONFIG_USERNAME);
     final String password = cfg.getString(pluginName, null,
             GERRIT_CONFIG_PASSWORD);
 
-    this.client = new StoryboardClient(url, username, password);
+    this.client = new StoryboardClient(url, password);
   }
 
   @Override

src/main/resources/Documentation/quick-install-guide.md

diff --git a/src/main/resources/Documentation/quick-install-guide.md b/src/main/resources/Documentation/quick-install-guide.md
index b749a0e..c69123a 100644
--- a/src/main/resources/Documentation/quick-install-guide.md
+++ b/src/main/resources/Documentation/quick-install-guide.md
@@ -48,8 +48,7 @@
 ```
 [@PLUGIN@]
   url=https://my_storyboard_instance.com
-  username=USERNAME_TO_CONNECT_TO_STORYBOARD
-  password=AUTH_TOKEN_FOR_ABOVE_USERNAME
+  password=STORYBOARD_USER_AUTH_TOKEN
 ```
 
 [its-associate-change]: #its-associate-change

src/test/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardItsFacadeTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardItsFacadeTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardItsFacadeTest.java
index 43fd787..8d61348 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardItsFacadeTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/storyboard/StoryboardItsFacadeTest.java
@@ -79,8 +79,6 @@
   private void mockUnconnectableStoryboard() {
     expect(serverConfig.getString("its-storyboard",  null, "url"))
     .andReturn("<no-url>").anyTimes();
-    expect(serverConfig.getString("its-storyboard",  null, "username"))
-    .andReturn("none").anyTimes();
     expect(serverConfig.getString("its-storyboard",  null, "password"))
     .andReturn("none").anyTimes();
   }