refinement: Re-Organize, Format and Cleanup source

Change-Id: I71e686df3d68f22622f492a8dc0c168b4adc5c4d

2 files changed, 50 insertions, 56 deletions

diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/AccountClientTest.java b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/AccountClientTest.java
index f26fe988238..d63c8d3c90f 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/AccountClientTest.java
+++ b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/AccountClientTest.java
@@ -19,12 +19,12 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.commons.lang.math.RandomUtils;
 import org.eclipse.osee.account.rest.client.AccountClient;
-import org.eclipse.osee.account.rest.model.AccountSessionDetailsData;
 import org.eclipse.osee.account.rest.model.AccountDetailsData;
 import org.eclipse.osee.account.rest.model.AccountInfoData;
 import org.eclipse.osee.account.rest.model.AccountInput;
 import org.eclipse.osee.account.rest.model.AccountPreferencesData;
 import org.eclipse.osee.account.rest.model.AccountSessionData;
+import org.eclipse.osee.account.rest.model.AccountSessionDetailsData;
 import org.eclipse.osee.framework.jdk.core.type.ResultSet;
 import org.eclipse.osee.x.server.integration.tests.util.IntegrationUtil;
 import org.junit.Before;
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java
index 3c10569476d..8a80d8dc5f6 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java
+++ b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java
@@ -29,7 +29,6 @@ import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.core.enums.QueryOption;
 import org.eclipse.osee.framework.core.enums.SystemUser;
-import org.eclipse.osee.framework.jdk.core.type.Identity;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.orcs.rest.client.OseeClient;
 import org.eclipse.osee.orcs.rest.model.IdeClientEndpoint;
@@ -55,8 +54,6 @@ public class OseeClientQueryTest {
          return 3L;
       }
 
-      
-
       @Override
       public String getName() {
          return "SAW_Bld_1";
@@ -138,10 +135,9 @@ public class OseeClientQueryTest {
    @Test
    public void searchForArtifactWithActionInName() throws OseeCoreException {
       final int EXPECTED_RESULTS = 43;
-      SearchResult results =
-         createClient.createQueryBuilder(COMMON).and(CoreAttributeTypes.Name, "SAW", QueryOption.CASE__IGNORE,
-            QueryOption.TOKEN_MATCH_ORDER__MATCH, QueryOption.TOKEN_DELIMITER__ANY, QueryOption.TOKEN_COUNT__IGNORE).getSearchResult(
-            RequestType.IDS);
+      SearchResult results = createClient.createQueryBuilder(COMMON).and(CoreAttributeTypes.Name, "SAW",
+         QueryOption.CASE__IGNORE, QueryOption.TOKEN_MATCH_ORDER__MATCH, QueryOption.TOKEN_DELIMITER__ANY,
+         QueryOption.TOKEN_COUNT__IGNORE).getSearchResult(RequestType.IDS);
       assertEquals(EXPECTED_RESULTS, results.getTotal());
    }
 
@@ -156,9 +152,8 @@ public class OseeClientQueryTest {
    @Test
    public void searchForArtifactTypes() throws OseeCoreException {
       final int EXPECTED_RESULTS = 24;
-      SearchResult results =
-         createClient.createQueryBuilder(SAW_1).andTypeEquals(GeneralData, GeneralDocument, SoftwareRequirement).getSearchResult(
-            RequestType.IDS);
+      SearchResult results = createClient.createQueryBuilder(SAW_1).andTypeEquals(GeneralData, GeneralDocument,
+         SoftwareRequirement).getSearchResult(RequestType.IDS);
       assertEquals(EXPECTED_RESULTS, results.getTotal());
    }
 
@@ -209,51 +204,50 @@ public class OseeClientQueryTest {
    public void orcsScript() {
       String script =
          "start from branch 570 find artifacts where art-type = 'Folder' collect artifacts {id, attributes { value } };";
-      String expected =
-         "{\n" + //
-         "  'parameters' : {\n" + //
-         "    'output.debug' : 'false'\n" + //
-         "  },\n" + //
-         "  'script' : 'start from branch 570 find artifacts where art-type = 'Folder' collect artifacts {id, attributes { value } };',\n" + //
-         "  'results' : [ {\n" + //
-         "    'artifacts' : [ {\n" + //
-         "      'id' : 8,\n" + //
-         "      'attributes' : {\n" + //
-         "        'Name' : {\n" + //
-         "          'value' : 'User Groups'\n" + //
-         "        }\n" + //
-         "      }\n" + //
-         "    }, {\n" + //
-         "      'id' : 26,\n" + //
-         "      'attributes' : {\n" + //
-         "        'Name' : {\n" + //
-         "          'value' : 'Document Templates'\n" + //
-         "        }\n" + //
-         "      }\n" + //
-         "    }, {\n" + //
-         "      'id' : 31,\n" + //
-         "      'attributes' : {\n" + //
-         "        'Name' : {\n" + //
-         "          'value' : 'Action Tracking System'\n" + //
-         "        }\n" + //
-         "      }\n" + //
-         "    }, {\n" + //
-         "      'id' : 34,\n" + //
-         "      'attributes' : {\n" + //
-         "        'Name' : {\n" + //
-         "          'value' : 'Config'\n" + //
-         "        }\n" + //
-         "      }\n" + //
-         "    }, {\n" + //
-         "      'id' : 35,\n" + //
-         "      'attributes' : {\n" + //
-         "        'Name' : {\n" + //
-         "          'value' : 'Work Definitions'\n" + //
-         "        }\n" + //
-         "      }\n" + //
-         "    } ]\n" + //
-         "  } ]\n" + //
-         "}";
+      String expected = "{\n" + //
+      "  'parameters' : {\n" + //
+      "    'output.debug' : 'false'\n" + //
+      "  },\n" + //
+      "  'script' : 'start from branch 570 find artifacts where art-type = 'Folder' collect artifacts {id, attributes { value } };',\n" + //
+      "  'results' : [ {\n" + //
+      "    'artifacts' : [ {\n" + //
+      "      'id' : 8,\n" + //
+      "      'attributes' : {\n" + //
+      "        'Name' : {\n" + //
+      "          'value' : 'User Groups'\n" + //
+      "        }\n" + //
+      "      }\n" + //
+      "    }, {\n" + //
+      "      'id' : 26,\n" + //
+      "      'attributes' : {\n" + //
+      "        'Name' : {\n" + //
+      "          'value' : 'Document Templates'\n" + //
+      "        }\n" + //
+      "      }\n" + //
+      "    }, {\n" + //
+      "      'id' : 31,\n" + //
+      "      'attributes' : {\n" + //
+      "        'Name' : {\n" + //
+      "          'value' : 'Action Tracking System'\n" + //
+      "        }\n" + //
+      "      }\n" + //
+      "    }, {\n" + //
+      "      'id' : 34,\n" + //
+      "      'attributes' : {\n" + //
+      "        'Name' : {\n" + //
+      "          'value' : 'Config'\n" + //
+      "        }\n" + //
+      "      }\n" + //
+      "    }, {\n" + //
+      "      'id' : 35,\n" + //
+      "      'attributes' : {\n" + //
+      "        'Name' : {\n" + //
+      "          'value' : 'Work Definitions'\n" + //
+      "        }\n" + //
+      "      }\n" + //
+      "    } ]\n" + //
+      "  } ]\n" + //
+      "}";
 
       StringWriter writer = new StringWriter();
       Properties properties = new Properties();