refinement: Re-Organize, Format and Cleanup source

Change-Id: I71e686df3d68f22622f492a8dc0c168b4adc5c4d

15 files changed, 30 insertions, 32 deletions

diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountArtifact.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountArtifact.java
index 33114a9c4d6..b1d2608b723 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountArtifact.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountArtifact.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.orcs.data.ArtifactReadable;
 /**
  * @author Roberto E. Escobar
  */
-public class AccountArtifact extends BaseIdentity<String> implements Account {
+public class AccountArtifact extends BaseIdentity<String>implements Account {
 
    private static final String NOT_AVAILABLE = "N/A";
 
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountPreferencesArtifact.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountPreferencesArtifact.java
index d9197284ce2..65e32bbafff 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountPreferencesArtifact.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountPreferencesArtifact.java
@@ -26,7 +26,7 @@ import org.eclipse.osee.orcs.data.ArtifactReadable;
 /**
  * @author Roberto E. Escobar
  */
-public class AccountPreferencesArtifact extends BaseIdentity<String> implements AccountPreferences {
+public class AccountPreferencesArtifact extends BaseIdentity<String>implements AccountPreferences {
 
    private final ArtifactReadable artifact;
 
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionDatabaseStore.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionDatabaseStore.java
index b33d58d7dd0..ad3834901be 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionDatabaseStore.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionDatabaseStore.java
@@ -96,9 +96,8 @@ public class AccountSessionDatabaseStore implements AccountSessionStorage {
                   Date lastAccessedOn = chStmt.getTimestamp("last_accessed_on");
                   String accessedFrom = chStmt.getString("accessed_from");
                   String accessDetails = chStmt.getString("access_details");
-                  AccountSession session =
-                     factory.newAccountSession(accountId, sessionToken, createdOn, lastAccessedOn, accessedFrom,
-                        accessDetails);
+                  AccountSession session = factory.newAccountSession(accountId, sessionToken, createdOn, lastAccessedOn,
+                     accessedFrom, accessDetails);
                   list.add(session);
                }
             } finally {
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionImpl.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionImpl.java
index 71863bf7bb0..052ee3759c7 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionImpl.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionImpl.java
@@ -83,8 +83,8 @@ public class AccountSessionImpl implements AccountSession {
    public int hashCode() {
       final int prime = 31;
       int result = 1;
-      result = prime * result + ((sessionToken == null) ? 0 : sessionToken.hashCode());
-      result = prime * result + (int) (accountId ^ (accountId >>> 32));
+      result = prime * result + (sessionToken == null ? 0 : sessionToken.hashCode());
+      result = prime * result + (int) (accountId ^ accountId >>> 32);
       return result;
    }
 
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSubscriptionGroupImpl.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSubscriptionGroupImpl.java
index f577a39035d..1f2a0a893d9 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSubscriptionGroupImpl.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSubscriptionGroupImpl.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.orcs.data.ArtifactReadable;
 /**
  * @author Roberto E. Escobar
  */
-public class AccountSubscriptionGroupImpl extends BaseIdentity<String> implements SubscriptionGroup {
+public class AccountSubscriptionGroupImpl extends BaseIdentity<String>implements SubscriptionGroup {
 
    private static final String NOT_AVAILABLE = "N/A";
    private final ArtifactReadable artifact;
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/BootstrapAccount.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/BootstrapAccount.java
index a2499965c29..d0ee1764e41 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/BootstrapAccount.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/BootstrapAccount.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.framework.jdk.core.type.BaseIdentity;
 /**
  * @author Roberto E. Escobar
  */
-public class BootstrapAccount extends BaseIdentity<String> implements Account, AccountPreferences {
+public class BootstrapAccount extends BaseIdentity<String>implements Account, AccountPreferences {
 
    public BootstrapAccount() {
       super(SystemUser.BootStrap.getGuid());
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsAccountStorage.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsAccountStorage.java
index fe86a6cb198..2da43dda035 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsAccountStorage.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsAccountStorage.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.osee.orcs.account.admin.internal;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import java.io.StringWriter;
 import java.util.Collections;
 import java.util.Map;
@@ -36,8 +38,6 @@ import org.eclipse.osee.jdbc.JdbcService;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
 import org.eclipse.osee.orcs.transaction.TransactionBuilder;
 import org.eclipse.osee.orcs.utility.OrcsUtil;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
 
 /**
  * @author Roberto E. Escobar
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsSubscriptionStorage.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsSubscriptionStorage.java
index 8dae80c8e1e..0fe166860e3 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsSubscriptionStorage.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsSubscriptionStorage.java
@@ -58,9 +58,8 @@ public class OrcsSubscriptionStorage extends AbstractOrcsStorage implements Subs
       ArtifactReadable group =
          newQuery().andUuid(intGroupId).andIsOfType(CoreArtifactTypes.SubscriptionGroup).getResults().getExactlyOne();
 
-      String txComment =
-         String.format("%s user [%s] to [%s].", activate ? "Subscribe" : "Unsubscribe", account.getName(),
-            group.getName());
+      String txComment = String.format("%s user [%s] to [%s].", activate ? "Subscribe" : "Unsubscribe",
+         account.getName(), group.getName());
       TransactionBuilder tx = newTransaction(txComment);
       // relate/unrelate (Side_A Art) <- Users -> (Side_B Art)
       if (activate) {
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/SubscriptionUtil.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/SubscriptionUtil.java
index e0df4c30bed..10f4ea06f32 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/SubscriptionUtil.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/SubscriptionUtil.java
@@ -72,7 +72,7 @@ public final class SubscriptionUtil {
       }
    }
 
-   private static class SubscriptionImpl extends NamedIdentity<String> implements Subscription {
+   private static class SubscriptionImpl extends NamedIdentity<String>implements Subscription {
 
       private final long accountId;
       private final String accountDisplayName;
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/AbstractDatabaseStorage.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/AbstractDatabaseStorage.java
index de1105d574a..5a4e9acc15c 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/AbstractDatabaseStorage.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/AbstractDatabaseStorage.java
@@ -196,8 +196,8 @@ public abstract class AbstractDatabaseStorage<T> {
             endTime = System.currentTimeMillis() - startTime;
          }
          if (logger.isTraceEnabled()) {
-            logger.trace("%s [finished] - [%s] [%s] [%s]", getClass().getSimpleName(), Lib.asTimeString(endTime),
-               query, data);
+            logger.trace("%s [finished] - [%s] [%s] [%s]", getClass().getSimpleName(), Lib.asTimeString(endTime), query,
+               data);
          }
          return result;
       }
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientArtifact.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientArtifact.java
index 8f5cfe3f1bc..566030af7c4 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientArtifact.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientArtifact.java
@@ -10,6 +10,10 @@
  *******************************************************************************/
 package org.eclipse.osee.orcs.account.admin.internal.oauth;
 
+import com.google.common.io.InputSupplier;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
 import java.io.InputStream;
 import java.lang.reflect.Type;
 import java.util.Collections;
@@ -20,15 +24,11 @@ import org.eclipse.osee.framework.jdk.core.type.BaseIdentity;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.jaxrs.server.security.OAuthClient;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
-import com.google.common.io.InputSupplier;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
 
 /**
  * @author Roberto E. Escobar
  */
-public class ClientArtifact extends BaseIdentity<String> implements OAuthClient, InputSupplier<InputStream> {
+public class ClientArtifact extends BaseIdentity<String>implements OAuthClient, InputSupplier<InputStream> {
 
    private final GsonBuilder builder;
    private final ArtifactReadable artifact;
@@ -103,7 +103,7 @@ public class ClientArtifact extends BaseIdentity<String> implements OAuthClient,
       if (Strings.isValid(data)) {
          Gson gson = builder.create();
          Type typeOfHashMap = new TypeToken<Map<String, String>>() { //
-            }.getType();
+         }.getType();
          toReturn = gson.fromJson(data, typeOfHashMap);
       }
       return toReturn;
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorage.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorage.java
index 2785ce43542..947abf1584a 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorage.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorage.java
@@ -20,6 +20,9 @@ import static org.eclipse.osee.orcs.account.admin.internal.oauth.OAuthTypes.OAUT
 import static org.eclipse.osee.orcs.account.admin.internal.oauth.OAuthTypes.OAUTH_CLIENT_PROPERTIES;
 import static org.eclipse.osee.orcs.account.admin.internal.oauth.OAuthTypes.OAUTH_CLIENT_WEBSITE_URI;
 import static org.eclipse.osee.orcs.account.admin.internal.oauth.OAuthTypes.OAUTH_TYPES_ARTIFACT;
+import com.google.common.io.InputSupplier;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
@@ -41,9 +44,6 @@ import org.eclipse.osee.orcs.search.QueryFactory;
 import org.eclipse.osee.orcs.transaction.TransactionBuilder;
 import org.eclipse.osee.orcs.transaction.TransactionFactory;
 import org.eclipse.osee.orcs.utility.OrcsUtil;
-import com.google.common.io.InputSupplier;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 
 /**
  * @author Roberto E. Escobar
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorageProvider.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorageProvider.java
index aed9bbe39f6..2aee26f0157 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorageProvider.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/ClientStorageProvider.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.osee.orcs.account.admin.internal.oauth;
 
+import com.google.common.io.InputSupplier;
+import com.google.gson.GsonBuilder;
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -21,8 +23,6 @@ import org.eclipse.osee.framework.core.enums.CoreBranches;
 import org.eclipse.osee.framework.jdk.core.type.LazyObject;
 import org.eclipse.osee.logger.Log;
 import org.eclipse.osee.orcs.OrcsApi;
-import com.google.common.io.InputSupplier;
-import com.google.gson.GsonBuilder;
 
 /**
  * @author Roberto E. Escobar
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/OAuthTypes.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/OAuthTypes.java
index fb84bdf4d9c..33384075171 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/OAuthTypes.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/OAuthTypes.java
@@ -40,7 +40,7 @@ public final class OAuthTypes {
    public static final IAttributeType OAUTH_CLIENT_AUTHORIZED_AUDIENCE = TokenFactory.createAttributeType(0x635EBFA0D4A82E22L, "Authorized Audience");
    // @formatter:on
 
-   public static final ArtifactId OAUTH_TYPES_ARTIFACT = OrcsUtil.newArtifactId(77964317L, "AmgrOMuL6U7uL9hBWCAA",
-      "OAuthTypes");
+   public static final ArtifactId OAUTH_TYPES_ARTIFACT =
+      OrcsUtil.newArtifactId(77964317L, "AmgrOMuL6U7uL9hBWCAA", "OAuthTypes");
 
 }
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/TokenStorage.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/TokenStorage.java
index 68d537b8106..34530e93b3a 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/TokenStorage.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/TokenStorage.java
@@ -26,11 +26,11 @@ public class TokenStorage extends AbstractDatabaseStorage<OAuthToken> {
 
    private static final String SELECT_TOKEN_BY_PARENT_TOKEN = //
       "WITH parent_token (id, refresh_key) AS (SELECT id, token_key FROM osee_oauth_token WHERE token_key = ? AND type_id = ?)" //
-         + "SELECT tk1.*, parent_token.refresh_key FROM osee_oauth_token tk1, parent_token WHERE tk1.parent_token_id = parent_token.id AND tk1.type_id = ?";
+      + "SELECT tk1.*, parent_token.refresh_key FROM osee_oauth_token tk1, parent_token WHERE tk1.parent_token_id = parent_token.id AND tk1.type_id = ?";
 
    private static final String SELECT_TOKEN_BY_CLIENT_ID_SUBJECT_ID_AND_GRANT_TYPE =
       "SELECT t1.*, t2.token_key AS refresh_key FROM osee_oauth_token t1 " //
-         + "LEFT OUTER JOIN osee_oauth_token t2 ON t2.id = t1.parent_token_id WHERE t1.client_id = ? AND t1.subject_id = ? AND t1.grant_type = ?";
+      + "LEFT OUTER JOIN osee_oauth_token t2 ON t2.id = t1.parent_token_id WHERE t1.client_id = ? AND t1.subject_id = ? AND t1.grant_type = ?";
 
    private static final String INSERT_TOKEN =
       "INSERT INTO osee_oauth_token (id, client_id, subject_id, issued_at, expires_in, token_key, token_type, grant_type, audience, parent_token_id, type_id) VALUES (?,?,?,?,?,?,?,?,?,?,?)";