diff options
3 files changed, 5 insertions, 19 deletions
diff --git a/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/AccountClient.java b/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/AccountClient.java index 07afaf1e01b..6857bd9f670 100644 --- a/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/AccountClient.java +++ b/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/AccountClient.java @@ -72,8 +72,6 @@ public interface AccountClient { AccountWebPreferences getAccountWebPreferencesByUniqueField(ArtifactId accountId); - boolean isLocalHost(); - String getBaseUri(); -} +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/internal/AccountClientImpl.java b/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/internal/AccountClientImpl.java index 099e15998bd..0de17e0471c 100644 --- a/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/internal/AccountClientImpl.java +++ b/plugins/org.eclipse.osee.account.rest.client/src/org/eclipse/osee/account/rest/client/internal/AccountClientImpl.java @@ -21,7 +21,6 @@ import static org.eclipse.osee.account.rest.model.AccountContexts.ACCOUNT_LOGOUT import static org.eclipse.osee.account.rest.model.AccountContexts.ACCOUNT_PREFERENCES; import static org.eclipse.osee.account.rest.model.AccountContexts.ACCOUNT_SESSSIONS; import static org.eclipse.osee.account.rest.model.AccountContexts.ACCOUNT_USERNAME_TEMPLATE; -import static org.eclipse.osee.framework.core.data.OseeClient.OSEE_APPLICATION_SERVER; import java.net.URI; import java.util.ArrayList; import java.util.Collection; @@ -70,10 +69,7 @@ public class AccountClientImpl implements AccountClient { public void update(Map<String, Object> properties) { client = JaxRsClient.newBuilder().properties(properties).build(); - String address = properties != null ? (String) properties.get(OSEE_APPLICATION_SERVER) : null; - if (address == null) { - address = OseeClient.getOseeApplicationServer(); - } + String address = OseeClient.getOseeApplicationServer(); baseUri = UriBuilder.fromUri(address).build(); } @@ -294,12 +290,7 @@ public class AccountClientImpl implements AccountClient { } @Override - public boolean isLocalHost() { - return baseUri.toString().contains("localhost"); - } - - @Override public String getBaseUri() { return baseUri.toString(); } -} +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/OseeClientImpl.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/OseeClientImpl.java index 23d7382af9d..9d391fc2ed3 100644 --- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/OseeClientImpl.java +++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/OseeClientImpl.java @@ -85,11 +85,8 @@ public class OseeClientImpl implements OseeClient, QueryExecutor { public void update(Map<String, Object> properties) { client = JaxRsClient.newBuilder().properties(properties).build(); - String address = properties != null ? (String) properties.get( - org.eclipse.osee.framework.core.data.OseeClient.OSEE_APPLICATION_SERVER) : null; - if (address == null) { - address = org.eclipse.osee.framework.core.data.OseeClient.getOseeApplicationServer(); - } + String address = org.eclipse.osee.framework.core.data.OseeClient.getOseeApplicationServer(); + if (Strings.isValid(address)) { orcsUri = UriBuilder.fromUri(address).path("orcs").build(); searchUriBuilder = UriBuilder.fromUri(address).path("orcs/branch/{branch-uuid}/artifact/search/v1"); |