refinement: Re-Organize, Format and Cleanup source

Change-Id: I71e686df3d68f22622f492a8dc0c168b4adc5c4d

7 files changed, 15 insertions, 20 deletions

diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/AbstractAuthenticationProvider.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/AbstractAuthenticationProvider.java
index 49437183b6f..50cd62e815d 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/AbstractAuthenticationProvider.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/AbstractAuthenticationProvider.java
@@ -52,15 +52,13 @@ public abstract class AbstractAuthenticationProvider implements IAuthenticationP
       IUserToken toReturn = null;
       try {
          QueryFactory queryFactory = orcsApi.getQueryFactory();
-         QueryBuilder query =
-            queryFactory.fromBranch(CoreBranches.COMMON).andIsOfType(CoreArtifactTypes.User).and(
-               CoreAttributeTypes.UserId, userId);
+         QueryBuilder query = queryFactory.fromBranch(CoreBranches.COMMON).andIsOfType(CoreArtifactTypes.User).and(
+            CoreAttributeTypes.UserId, userId);
 
          ArtifactReadable artifact = query.getResults().getOneOrNull();
          if (artifact != null) {
-            toReturn =
-               TokenFactory.createUserToken(artifact.getUuid(), artifact.getGuid(), artifact.getName(),
-                  artifact.getSoleAttributeAsString(CoreAttributeTypes.Email, ""), userId, true, false, false);
+            toReturn = TokenFactory.createUserToken(artifact.getUuid(), artifact.getGuid(), artifact.getName(),
+               artifact.getSoleAttributeAsString(CoreAttributeTypes.Email, ""), userId, true, false, false);
          } else {
             getLogger().info("Unable to find userId:[%s] on [%s]", userId, CoreBranches.COMMON);
          }
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/DatabaseSessionAccessor.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/DatabaseSessionAccessor.java
index a4449ce53ef..8bd6f06ee6c 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/DatabaseSessionAccessor.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/DatabaseSessionAccessor.java
@@ -79,9 +79,8 @@ public final class DatabaseSessionAccessor implements CacheDataLoader<String, Se
 
          @Override
          public void collect(String guid, String userId, Date creationDate, String clientVersion, String clientMachineName, String clientAddress, int clientPort) {
-            Session session =
-               getFactory().createLoadedSession(guid, userId, creationDate, clientVersion, clientMachineName,
-                  clientAddress, clientPort);
+            Session session = getFactory().createLoadedSession(guid, userId, creationDate, clientVersion,
+               clientMachineName, clientAddress, clientPort);
             sessions.put(guid, session);
          }
       };
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/DefaultSessionCollector.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/DefaultSessionCollector.java
index 55abcf27fb7..078d04da058 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/DefaultSessionCollector.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/DefaultSessionCollector.java
@@ -28,9 +28,8 @@ public final class DefaultSessionCollector implements ISessionCollector {
 
    @Override
    public void collect(String guid, String userId, Date creationDate, String clientVersion, String clientMachineName, String clientAddress, int clientPort) {
-      Session session =
-         factory.createLoadedSession(guid, userId, creationDate, clientVersion, clientMachineName, clientAddress,
-            clientPort);
+      Session session = factory.createLoadedSession(guid, userId, creationDate, clientVersion, clientMachineName,
+         clientAddress, clientPort);
       sessions.add(session);
    }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/Session.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/Session.java
index 9adad047a00..12ac0067e13 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/Session.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/Session.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.framework.jdk.core.type.BaseIdentity;
 /**
  * @author Roberto E. Escobar
  */
-public class Session extends BaseIdentity<String> implements ISession {
+public class Session extends BaseIdentity<String>implements ISession {
 
    private final String userId;
    private final Date creationDate;
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerImpl.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerImpl.java
index 46b5e34a547..7a415666f9c 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerImpl.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerImpl.java
@@ -63,10 +63,9 @@ public final class SessionManagerImpl implements ISessionManager {
             public Session call() throws Exception {
 
                Date creationDate = GlobalTime.GreenwichMeanTimestamp();
-               Session session =
-                  sessionFactory.createNewSession(newSessionId, userToken.getUserId(), creationDate,
-                     credential.getVersion(), credential.getClientMachineName(), credential.getClientAddress(),
-                     credential.getPort());
+               Session session = sessionFactory.createNewSession(newSessionId, userToken.getUserId(), creationDate,
+                  credential.getVersion(), credential.getClientMachineName(), credential.getClientAddress(),
+                  credential.getPort());
 
                // if the user is BootStrap we do not want to insert into database since tables may not exist
                if (!SystemUser.BootStrap.equals(userToken)) {
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/util/CharJoinQuery.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/util/CharJoinQuery.java
index d54bc54cc4a..2a09625491d 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/util/CharJoinQuery.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/util/CharJoinQuery.java
@@ -59,7 +59,7 @@ public final class CharJoinQuery extends AbstractJoinQuery {
          final int prime = 31;
          int result = 1;
          result = prime * result + getOuterType().hashCode();
-         result = prime * result + ((value == null) ? 0 : value.hashCode());
+         result = prime * result + (value == null ? 0 : value.hashCode());
          return result;
       }
 
diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/util/DatabaseJoinAccessor.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/util/DatabaseJoinAccessor.java
index fc2caa6ac0e..d995349c0e6 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/util/DatabaseJoinAccessor.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/util/DatabaseJoinAccessor.java
@@ -78,8 +78,8 @@ public class DatabaseJoinAccessor implements IJoinAccessor {
 
    @Override
    public void store(JdbcConnection connection, JoinItem joinItem, int queryId, List<Object[]> dataList, Long issuedAt, Long expiresIn) throws OseeCoreException {
-      jdbcClient.runPreparedUpdate(connection, INSERT_INTO_JOIN_CLEANUP, queryId, joinItem.getJoinTableName(),
-         issuedAt, expiresIn);
+      jdbcClient.runPreparedUpdate(connection, INSERT_INTO_JOIN_CLEANUP, queryId, joinItem.getJoinTableName(), issuedAt,
+         expiresIn);
       jdbcClient.runBatchUpdate(connection, joinItem.getInsertSql(), dataList);
    }