refinement [ats_W2LZW]: Remove reference to address and port from osee_server_lookup table

Change-Id: I70ea140efe8b07a3169b5de4e6e134e5cd3486d9
Signed-off-by: mpotterc0k <marc.a.potter@boeing.com>

3 files changed, 4 insertions, 15 deletions

diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java
index 1b17325927c..1e77733cc0b 100644
--- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java
+++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java
@@ -144,7 +144,7 @@ public class ApplicationServerDataStore {
    private static final class ServerLookupTx implements IDbTransactionWork {
 
       private static final String INSERT_LOOKUP_TABLE =
-         "INSERT INTO osee_server_lookup (server_id, version_id, server_address, port, server_uri, start_time, accepts_requests) VALUES (?,?,?,?,?,?,?)";
+         "INSERT INTO osee_server_lookup (server_id, version_id, server_uri, start_time, accepts_requests) VALUES (?,?,?,?,?)";
 
       private static final String DELETE_FROM_LOOKUP_TABLE_BY_ID = "DELETE FROM osee_server_lookup WHERE server_id = ?";
 
@@ -186,13 +186,11 @@ public class ApplicationServerDataStore {
             String serverId = data.getServerId();
             URI serverUri = data.getUri();
             String uri = serverUri.toString();
-            String address = serverUri.getHost();
-            int port = serverUri.getPort();
             Timestamp dateStarted = data.getDateStarted();
             int acceptingRequests = data.isAcceptingRequests() ? 1 : 0;
 
             for (String version : data.getVersion()) {
-               insertData.add(new Object[] {serverId, version, address, port, uri, dateStarted, acceptingRequests});
+               insertData.add(new Object[] {serverId, version, uri, dateStarted, acceptingRequests});
             }
          }
          if (!insertData.isEmpty()) {
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OseeServerInfo.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OseeServerInfo.java
index 8b173f8450b..e72790cd93d 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OseeServerInfo.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OseeServerInfo.java
@@ -13,8 +13,8 @@ package org.eclipse.osee.framework.core.data;
 import java.io.InputStream;
 import java.net.URI;
 import java.sql.Timestamp;
+
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
 
 /**
  * @author Roberto E. Escobar
@@ -52,17 +52,10 @@ public class OseeServerInfo extends BaseExchangeData {
     * @return the server uri
     */
 
-   // temporary code to remove after release of uri change
-   private static final String SERVER_ADDRESS = "serverAddress";
-   private static final String PORT = "port";
+
 
    public URI getUri() {
       String serverUri = getString(SERVER_URI);
-      if (!Strings.isValid(serverUri)) {
-         String address = getString(SERVER_ADDRESS);
-         String port = getString(PORT);
-         serverUri = String.format("http://%s:%s", address, port);
-      }
       return URI.create(serverUri);
    }
 
diff --git a/plugins/org.eclipse.osee.orcs.db/schema/SKYNET.VERSIONING.SCHEMA.xml b/plugins/org.eclipse.osee.orcs.db/schema/SKYNET.VERSIONING.SCHEMA.xml
index 7b9b3b710a8..6ad8b3961c0 100644
--- a/plugins/org.eclipse.osee.orcs.db/schema/SKYNET.VERSIONING.SCHEMA.xml
+++ b/plugins/org.eclipse.osee.orcs.db/schema/SKYNET.VERSIONING.SCHEMA.xml
@@ -512,8 +512,6 @@
 	<Table name="OSEE_SERVER_LOOKUP" schema="OSEE" tablespace="osee_data">
 		<Column id="SERVER_URI" defaultValue="not null" type="VARCHAR" limits="255" />
 		<Column id="VERSION_ID" defaultValue="not null" type="VARCHAR" limits="100" />
-		<Column id="SERVER_ADDRESS" defaultValue="not null" type="VARCHAR" limits="255"/>
-		<Column id="PORT" defaultValue="not null" type="INTEGER" />
 		<Column id="ACCEPTS_REQUESTS" defaultValue="not null" type="smallint" />
 		<Column id="START_TIME" defaultValue="not null" type="TIMESTAMP" />
 		<Column id="SERVER_ID" defaultValue="not null" type="VARCHAR" limits="40" />