diff options
30 files changed, 93 insertions, 434 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/AtsJaxRsApi.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/AtsJaxRsApi.java deleted file mode 100644 index 0867b6dcafe..00000000000 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/AtsJaxRsApi.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.api; - -import javax.ws.rs.Path; -import org.eclipse.osee.ats.api.agile.AgileEndpointApi; -import org.eclipse.osee.ats.api.config.AtsConfigEndpointApi; -import org.eclipse.osee.ats.api.cpa.AtsCpaEndpointApi; -import org.eclipse.osee.ats.api.notify.AtsNotifyEndpointApi; -import org.eclipse.osee.ats.api.workflow.AtsActionEndpointApi; - -/** - * @author Donald G. Dunne - */ -public interface AtsJaxRsApi { - - @Path("notify") - public AtsNotifyEndpointApi getNotify(); - - @Path("config") - public AtsConfigEndpointApi getConfig(); - - @Path("cpa") - public AtsCpaEndpointApi getCpa(); - - @Path("action") - public AtsActionEndpointApi getAction(); - - @Path("agile") - public AgileEndpointApi getAgile(); - -} diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/config/AtsConfigEndpointApi.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/config/AtsConfigEndpointApi.java index 7c6a7d459e2..84b62a653b6 100644 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/config/AtsConfigEndpointApi.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/config/AtsConfigEndpointApi.java @@ -36,14 +36,14 @@ public interface AtsConfigEndpointApi { * @return html5 action entry page * @throws Exception */ - @Path("ui/NewAtsBranchConfig") @GET + @Path("ui/NewAtsBranchConfig") @Produces(MediaType.TEXT_HTML) public ViewModel getNewSource() throws Exception; /** * Create new ATS configuration branch and ATS config object on Common branch - * + * * @param form containing information to configure new ATS branch * @param form.fromBranchUuid of branch to get config artifacts from * @param form.newBranchName of new branch @@ -52,6 +52,7 @@ public interface AtsConfigEndpointApi { * @return json object with new branchUuid */ @POST + @Path("branch") @Consumes("application/x-www-form-urlencoded") @Produces(MediaType.APPLICATION_JSON) public AtsConfiguration createConfig(MultivaluedMap<String, String> form, @Context UriInfo uriInfo); diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/config/AtsConfigurations.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/config/AtsConfigurations.java index ab2c2e8b55b..e035071cbe4 100644 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/config/AtsConfigurations.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/config/AtsConfigurations.java @@ -21,9 +21,9 @@ import org.eclipse.osee.ats.api.util.ColorColumns; @XmlRootElement public class AtsConfigurations { - public final List<AtsConfiguration> configs = new ArrayList<AtsConfiguration>(); - public AtsViews views = new AtsViews(); - public ColorColumns colorColumns = new ColorColumns(); + private final List<AtsConfiguration> configs = new ArrayList<AtsConfiguration>(); + private AtsViews views = new AtsViews(); + private ColorColumns colorColumns = new ColorColumns(); public List<AtsConfiguration> getConfigs() { return configs; diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/internal/AtsClientService.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/internal/AtsClientService.java index dea08e492eb..bf0d770afea 100644 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/internal/AtsClientService.java +++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/internal/AtsClientService.java @@ -45,7 +45,7 @@ public class AtsClientService { if (target == null) { String appServer = OseeClientProperties.getOseeApplicationServer(); String atsUri = String.format("%s/ats", appServer); - JaxRsClient jaxRsClient = JaxRsClient.newBuilder().build(); + JaxRsClient jaxRsClient = JaxRsClient.newBuilder().createThreadSafeProxyClients(true).build(); target = jaxRsClient.target(atsUri); } return target; diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/internal/AtsJaxRsService.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/internal/AtsJaxRsService.java deleted file mode 100644 index d6459400e95..00000000000 --- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/internal/AtsJaxRsService.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.client.demo.internal; - -import org.eclipse.osee.ats.api.AtsJaxRsApi; -import org.eclipse.osee.framework.core.client.OseeClientProperties; -import org.eclipse.osee.jaxrs.client.JaxRsClient; - -/** - * @author Donald G. Dunne - */ -public class AtsJaxRsService { - - private static AtsJaxRsApi atsEndpoint; - - public static AtsJaxRsApi get() { - if (atsEndpoint == null) { - String appServer = OseeClientProperties.getOseeApplicationServer(); - String atsUri = String.format("%s/ats", appServer); - - atsEndpoint = JaxRsClient.newBuilder() // - .createThreadSafeProxyClients(true) // if the client needs to be shared between threads - .build() // - .targetProxy(atsUri, AtsJaxRsApi.class); - } - return atsEndpoint; - } - -} diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/AtsClientService.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/AtsClientService.java index cd759bca8a4..2ee961f3710 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/AtsClientService.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/AtsClientService.java @@ -49,7 +49,7 @@ public class AtsClientService { if (target == null) { String appServer = OseeClientProperties.getOseeApplicationServer(); String atsUri = String.format("%s/ats", appServer); - JaxRsClient jaxRsClient = JaxRsClient.newBuilder().build(); + JaxRsClient jaxRsClient = JaxRsClient.newBuilder().createThreadSafeProxyClients(true).build(); target = jaxRsClient.target(atsUri); } return target; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsJaxRsService.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsJaxRsService.java deleted file mode 100644 index 9db7ffe8ef2..00000000000 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/AtsJaxRsService.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.client.integration.tests.ats.util; - -import org.eclipse.osee.ats.api.AtsJaxRsApi; -import org.eclipse.osee.framework.core.client.OseeClientProperties; -import org.eclipse.osee.jaxrs.client.JaxRsClient; - -/** - * @author Donald G. Dunne - */ -public class AtsJaxRsService { - - private static AtsJaxRsApi atsEndpoint; - - public static AtsJaxRsApi get() { - if (atsEndpoint == null) { - String appServer = OseeClientProperties.getOseeApplicationServer(); - String atsUri = String.format("%s/ats", appServer); - - atsEndpoint = JaxRsClient.newBuilder() // - .createThreadSafeProxyClients(true) // if the client needs to be shared between threads - .build() // - .targetProxy(atsUri, AtsJaxRsApi.class); - } - return atsEndpoint; - } - -} diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientImpl.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientImpl.java index 732dc3e0fb4..abf4d3e32e3 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientImpl.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientImpl.java @@ -589,7 +589,7 @@ public class AtsClientImpl implements IAtsClient { @Override protected IStatus run(IProgressMonitor monitor) { - AtsJaxRsService.get().getNotify().sendNotifications(notifications); + AtsClientService.getNotifyEndpoint().sendNotifications(notifications); return Status.OK_STATUS; } }, false); diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientService.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientService.java index 71cb0e8549f..e39f6835295 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientService.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsClientService.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.client.internal; +import org.eclipse.osee.ats.api.notify.AtsNotifyEndpointApi; import org.eclipse.osee.ats.api.task.AtsTaskEndpointApi; import org.eclipse.osee.ats.core.client.IAtsClient; import org.eclipse.osee.framework.core.client.OseeClientProperties; @@ -24,6 +25,7 @@ public class AtsClientService { private static IAtsClient atsClient; private static JaxRsWebTarget target; private static AtsTaskEndpointApi taskEp; + private static AtsNotifyEndpointApi notifyEp; public void setAtsClient(IAtsClient atsClient) { AtsClientService.atsClient = atsClient; @@ -37,7 +39,7 @@ public class AtsClientService { if (target == null) { String appServer = OseeClientProperties.getOseeApplicationServer(); String atsUri = String.format("%s/ats", appServer); - JaxRsClient jaxRsClient = JaxRsClient.newBuilder().build(); + JaxRsClient jaxRsClient = JaxRsClient.newBuilder().createThreadSafeProxyClients(true).build(); target = jaxRsClient.target(atsUri); } return target; @@ -50,4 +52,11 @@ public class AtsClientService { return taskEp; } + public static AtsNotifyEndpointApi getNotifyEndpoint() { + if (notifyEp == null) { + notifyEp = getTarget().newProxy(AtsNotifyEndpointApi.class); + } + return notifyEp; + } + } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsJaxRsService.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsJaxRsService.java deleted file mode 100644 index 887924028f0..00000000000 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/AtsJaxRsService.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.core.client.internal; - -import org.eclipse.osee.ats.api.AtsJaxRsApi; -import org.eclipse.osee.framework.core.client.OseeClientProperties; -import org.eclipse.osee.jaxrs.client.JaxRsClient; - -/** - * @author Donald G. Dunne - */ -public class AtsJaxRsService { - - private static AtsJaxRsApi atsEndpoint; - - public static AtsJaxRsApi get() { - if (atsEndpoint == null) { - String appServer = OseeClientProperties.getOseeApplicationServer(); - String atsUri = String.format("%s/ats", appServer); - - atsEndpoint = JaxRsClient.newBuilder() // - .createThreadSafeProxyClients(true) // if the client needs to be shared between threads - .build() // - .targetProxy(atsUri, AtsJaxRsApi.class); - } - return atsEndpoint; - } - -} diff --git a/plugins/org.eclipse.osee.ats.rest/OSEE-INF/templates/newConfigBranch.html b/plugins/org.eclipse.osee.ats.rest/OSEE-INF/templates/newConfigBranch.html index 6b2e3216bad..3e588b98ed3 100644 --- a/plugins/org.eclipse.osee.ats.rest/OSEE-INF/templates/newConfigBranch.html +++ b/plugins/org.eclipse.osee.ats.rest/OSEE-INF/templates/newConfigBranch.html @@ -33,7 +33,7 @@ <script src="/ats/lib/atsCore.js"></script> <script> function createConfig() { - post_with_parms("/ats/config", getParams()); + post_with_parms("/ats/config/branch", getParams()); } var button = document.getElementById("createButton"); diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java index 5a5530f869a..e1c8ba37336 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsApplication.java @@ -34,6 +34,7 @@ import org.eclipse.osee.ats.rest.internal.config.UserResource; import org.eclipse.osee.ats.rest.internal.config.VersionResource; import org.eclipse.osee.ats.rest.internal.cpa.CpaResource; import org.eclipse.osee.ats.rest.internal.cpa.CpaServiceRegistry; +import org.eclipse.osee.ats.rest.internal.notify.AtsNotifyEndpointImpl; import org.eclipse.osee.ats.rest.internal.workitem.ActionResource; import org.eclipse.osee.ats.rest.internal.workitem.ActionUiResource; import org.eclipse.osee.ats.rest.internal.workitem.AtsTaskEndpointImpl; @@ -99,13 +100,13 @@ public class AtsApplication extends Application { // Endpoints singletons.add(new AgileEndpointImpl(atsServer, registry)); - singletons.add(new AtsEndpointImpl(atsServer, logger, registry, cpaRegistry)); singletons.add(new CountryEndpointImpl(atsServer)); singletons.add(new ProgramEndpointImpl(atsServer)); singletons.add(new InsertionEndpointImpl(atsServer)); singletons.add(new InsertionActivityEndpointImpl(atsServer)); singletons.add(new AtsConfigEndpointImpl(atsServer, orcsApi, logger)); singletons.add(new AtsTaskEndpointImpl(atsServer)); + singletons.add(new AtsNotifyEndpointImpl(atsServer)); // UIs singletons.add(new ActionUiResource(atsServer, logger)); diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsEndpointImpl.java deleted file mode 100644 index afc5b38ec33..00000000000 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/AtsEndpointImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.rest.internal; - -import org.eclipse.osee.ats.api.AtsJaxRsApi; -import org.eclipse.osee.ats.api.agile.AgileEndpointApi; -import org.eclipse.osee.ats.api.config.AtsConfigEndpointApi; -import org.eclipse.osee.ats.api.cpa.AtsCpaEndpointApi; -import org.eclipse.osee.ats.impl.IAtsServer; -import org.eclipse.osee.ats.rest.internal.agile.AgileEndpointImpl; -import org.eclipse.osee.ats.rest.internal.config.AtsConfigEndpointImpl; -import org.eclipse.osee.ats.rest.internal.cpa.CpaResource; -import org.eclipse.osee.ats.rest.internal.cpa.CpaServiceRegistry; -import org.eclipse.osee.ats.rest.internal.notify.AtsNotifyEndpointImpl; -import org.eclipse.osee.ats.rest.internal.workitem.ActionResource; -import org.eclipse.osee.framework.jdk.core.type.IResourceRegistry; -import org.eclipse.osee.logger.Log; - -/** - * @author Donald G. Dunne - */ -public class AtsEndpointImpl implements AtsJaxRsApi { - - private final IAtsServer atsServer; - private final Log logger; - private final IResourceRegistry registry; - private AtsNotifyEndpointImpl atsNotifyEndpointImpl; - private AtsConfigEndpointImpl atsConfigEndpointImpl; - private AtsCpaEndpointApi atsCpaEndpointApi; - private AgileEndpointApi agileEndpointApi; - private final CpaServiceRegistry cpaRegistry; - private ActionResource atsActionEndpointImpl; - - public AtsEndpointImpl(IAtsServer atsServer, Log logger, IResourceRegistry registry, CpaServiceRegistry cpaRegistry) { - this.atsServer = atsServer; - this.logger = logger; - this.cpaRegistry = cpaRegistry; - this.registry = registry; - } - - @Override - public AtsNotifyEndpointImpl getNotify() { - if (atsNotifyEndpointImpl == null) { - atsNotifyEndpointImpl = new AtsNotifyEndpointImpl(atsServer); - } - return atsNotifyEndpointImpl; - } - - @Override - public AtsConfigEndpointApi getConfig() { - if (atsConfigEndpointImpl == null) { - atsConfigEndpointImpl = new AtsConfigEndpointImpl(atsServer, atsServer.getOrcsApi(), logger); - } - return atsConfigEndpointImpl; - } - - @Override - public AtsCpaEndpointApi getCpa() { - if (atsCpaEndpointApi == null) { - atsCpaEndpointApi = new CpaResource(atsServer.getOrcsApi(), atsServer, cpaRegistry); - } - return atsCpaEndpointApi; - } - - @Override - public ActionResource getAction() { - if (atsActionEndpointImpl == null) { - atsActionEndpointImpl = new ActionResource(atsServer, atsServer.getOrcsApi()); - } - return atsActionEndpointImpl; - } - - @Override - public AgileEndpointApi getAgile() { - if (agileEndpointApi == null) { - agileEndpointApi = new AgileEndpointImpl(atsServer, registry); - } - return agileEndpointApi; - - } - -} diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java index c1e7a32959c..afe7fef7570 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/AtsConfigEndpointImpl.java @@ -11,8 +11,12 @@ package org.eclipse.osee.ats.rest.internal.config; import java.util.concurrent.Callable; +import javax.ws.rs.GET; +import javax.ws.rs.POST; import javax.ws.rs.Path; +import javax.ws.rs.Produces; import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; @@ -59,6 +63,8 @@ public final class AtsConfigEndpointImpl implements AtsConfigEndpointApi { this.logger = logger; } + @GET + @Produces(MediaType.APPLICATION_JSON) @Override public AtsConfigurations get() { ResultSet<ArtifactReadable> artifacts = orcsApi.getQueryFactory().fromBranch(CoreBranches.COMMON).andTypeEquals( @@ -79,13 +85,16 @@ public final class AtsConfigEndpointImpl implements AtsConfigEndpointApi { return configs; } + @GET + @Path("ui/NewAtsBranchConfig") @Override public ViewModel getNewSource() throws Exception { return new ViewModel("templates/newConfigBranch.html"); } + @POST + @Path("branch") @Override - @Path("") public AtsConfiguration createConfig(MultivaluedMap<String, String> form, @Context UriInfo uriInfo) { // get parameters @@ -200,6 +209,7 @@ public final class AtsConfigEndpointImpl implements AtsConfigEndpointApi { return config; } + @POST @Override public Response createUpdateConfig() { XResultData resultData = new XResultData(false); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java index a970863b620..0b0f4bf1309 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java @@ -86,7 +86,7 @@ public class NewActionPage1 extends WizardPage { protected String getWidgetXml() { return "<WorkPage>" + // - "<XWidget displayName=\"" + TITLE + "\" storeName=\"Name\" required=\"true\" xwidgetType=\"XText\" toolTip=\"" + AtsAttributeTypes.Title.getDescription() + "\"/>" + // + "<XWidget displayName=\"" + TITLE + "\" storageName=\"Name\" required=\"true\" xwidgetType=\"XText\" toolTip=\"" + AtsAttributeTypes.Title.getDescription() + "\"/>" + // "</WorkPage>"; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/AgileFeatureGroupColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/AgileFeatureGroupColumn.java index 4afc28c54d2..d3ed84c7623 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/AgileFeatureGroupColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/AgileFeatureGroupColumn.java @@ -35,7 +35,6 @@ import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; -import org.eclipse.osee.ats.internal.AtsJaxRsService; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -125,11 +124,11 @@ public class AgileFeatureGroupColumn extends XViewerAtsColumn implements IXViewe return false; } - AgileEndpointApi agileApi = AtsJaxRsService.get().getAgile(); + AgileEndpointApi agileEp = AtsClientService.getAgileEndpoint(); List<JaxAgileFeatureGroup> activeFeatureGroups = new ArrayList<JaxAgileFeatureGroup>(); long teamUuid = items.getCommonBacklog().getTeamUuid(); try { - for (JaxAgileFeatureGroup feature : agileApi.getFeatureGroups(items.getCommonBacklog().getTeamUuid())) { + for (JaxAgileFeatureGroup feature : agileEp.getFeatureGroups(items.getCommonBacklog().getTeamUuid())) { if (feature.isActive()) { activeFeatureGroups.add(feature); } @@ -139,9 +138,8 @@ public class AgileFeatureGroupColumn extends XViewerAtsColumn implements IXViewe return false; } - FilteredCheckboxTreeDialog dialog = - new FilteredCheckboxTreeDialog("Select Feature Group(s)", "Select Feature Group(s)", - new ArrayTreeContentProvider(), new StringLabelProvider(), new StringNameSorter()); + FilteredCheckboxTreeDialog dialog = new FilteredCheckboxTreeDialog("Select Feature Group(s)", + "Select Feature Group(s)", new ArrayTreeContentProvider(), new StringLabelProvider(), new StringNameSorter()); dialog.setInput(activeFeatureGroups); Collection<IAgileFeatureGroup> selectedFeatureGroups = getSelectedFeatureGroups(awas); if (!selectedFeatureGroups.isEmpty()) { @@ -164,7 +162,7 @@ public class AgileFeatureGroupColumn extends XViewerAtsColumn implements IXViewe } try { - agileApi.updateItem(teamUuid, updateItem); + agileEp.updateItem(teamUuid, updateItem); ArtifactQuery.reloadArtifacts(awas); } catch (Exception ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); @@ -202,9 +200,8 @@ public class AgileFeatureGroupColumn extends XViewerAtsColumn implements IXViewe return Collections.toString(", ", strs); } else { - return Collections.toString( - ", ", - ((Artifact) ((IAtsWorkItem) element)).getRelatedArtifacts(AtsRelationTypes.AgileFeatureToItem_FeatureGroup)); + return Collections.toString(", ", ((Artifact) ((IAtsWorkItem) element)).getRelatedArtifacts( + AtsRelationTypes.AgileFeatureToItem_FeatureGroup)); } } catch (OseeCoreException ex) { return LogUtil.getCellExceptionString(ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigPreferencePage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigPreferencePage.java index c8e2d8e0304..20f153c6da2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigPreferencePage.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigPreferencePage.java @@ -16,6 +16,7 @@ import org.eclipse.jface.preference.PreferencePage; import org.eclipse.osee.ats.api.config.AtsConfiguration; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -62,7 +63,7 @@ public class AtsConfigPreferencePage extends PreferencePage implements IWorkbenc public void widgetSelected(SelectionEvent e) { try { AtsConfigurationDialog dialog = - new AtsConfigurationDialog(AtsConfigurationUtil.getConfigurations().getConfigs()); + new AtsConfigurationDialog(AtsClientService.getConfigEndpoint().get().getConfigs()); if (dialog.open() == 0) { AtsConfiguration config = (AtsConfiguration) dialog.getResult()[0]; @@ -109,7 +110,7 @@ public class AtsConfigPreferencePage extends PreferencePage implements IWorkbenc /** * Creates composite control and sets the default layout data. - * + * * @param parent the parent of the new composite * @param numColumns the number of columns for the new composite * @return the newly-created composite diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigurationUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigurationUtil.java deleted file mode 100644 index e65c0615a6b..00000000000 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigurationUtil.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.config; - -import java.net.URI; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriBuilder; -import org.eclipse.osee.ats.api.config.AtsConfigurations; -import org.eclipse.osee.framework.core.client.OseeClientProperties; -import org.eclipse.osee.jaxrs.client.JaxRsClient; -import org.eclipse.osee.jaxrs.client.JaxRsExceptions; - -/** - * @author Donald G. Dunne - */ -public class AtsConfigurationUtil { - - public static AtsConfigurations getConfigurations() { - String appServer = OseeClientProperties.getOseeApplicationServer(); - URI uri = UriBuilder.fromUri(appServer).path("ats").path("config").build(); - try { - return JaxRsClient.newClient().target(uri).request(MediaType.APPLICATION_JSON).get(AtsConfigurations.class); - } catch (Exception ex) { - throw JaxRsExceptions.asOseeException(ex); - } - } -} diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java index 9c30bd63b84..b8515840ffa 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java @@ -26,7 +26,6 @@ import org.eclipse.osee.ats.core.client.util.AtsChangeSet; import org.eclipse.osee.ats.core.client.util.AtsGroup; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.AtsClientService; -import org.eclipse.osee.ats.internal.AtsJaxRsService; import org.eclipse.osee.ats.workdef.AtsWorkDefinitionSheetProviders; import org.eclipse.osee.framework.core.data.IArtifactToken; import org.eclipse.osee.framework.core.data.IArtifactType; @@ -119,7 +118,7 @@ public class AtsDatabaseConfig implements IDbInitializationTask { transaction.execute(); - Response response = AtsJaxRsService.get().getConfig().createUpdateConfig(); + Response response = AtsClientService.getConfigEndpoint().createUpdateConfig(); try { String message = Lib.inputStreamToString((InputStream) response.getEntity()); if (message.toLowerCase().contains("error")) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsClientService.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsClientService.java index 3843fadd798..a05c0b8441e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsClientService.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsClientService.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.ats.internal; +import org.eclipse.osee.ats.api.agile.AgileEndpointApi; +import org.eclipse.osee.ats.api.config.AtsConfigEndpointApi; import org.eclipse.osee.ats.api.task.AtsTaskEndpointApi; import org.eclipse.osee.ats.core.client.IAtsClient; import org.eclipse.osee.framework.core.client.OseeClientProperties; @@ -24,6 +26,8 @@ public class AtsClientService { private static IAtsClient atsClient; private static JaxRsWebTarget target; private static AtsTaskEndpointApi taskEp; + private static AtsConfigEndpointApi configEp; + private static AgileEndpointApi agileEp; public void setAtsClient(IAtsClient atsClient) { AtsClientService.atsClient = atsClient; @@ -37,7 +41,7 @@ public class AtsClientService { if (target == null) { String appServer = OseeClientProperties.getOseeApplicationServer(); String atsUri = String.format("%s/ats", appServer); - JaxRsClient jaxRsClient = JaxRsClient.newBuilder().build(); + JaxRsClient jaxRsClient = JaxRsClient.newBuilder().createThreadSafeProxyClients(true).build(); target = jaxRsClient.target(atsUri); } return target; @@ -50,4 +54,18 @@ public class AtsClientService { return taskEp; } + public static AtsConfigEndpointApi getConfigEndpoint() { + if (configEp == null) { + configEp = getTarget().newProxy(AtsConfigEndpointApi.class); + } + return configEp; + } + + public static AgileEndpointApi getAgileEndpoint() { + if (agileEp == null) { + agileEp = getTarget().newProxy(AgileEndpointApi.class); + } + return agileEp; + } + } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsJaxRsService.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsJaxRsService.java deleted file mode 100644 index 86a4b493095..00000000000 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsJaxRsService.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.internal; - -import org.eclipse.osee.ats.api.AtsJaxRsApi; -import org.eclipse.osee.framework.core.client.OseeClientProperties; -import org.eclipse.osee.jaxrs.client.JaxRsClient; - -/** - * @author Donald G. Dunne - */ -public class AtsJaxRsService { - - private static AtsJaxRsApi atsEndpoint; - - public static AtsJaxRsApi get() { - if (atsEndpoint == null) { - String appServer = OseeClientProperties.getOseeApplicationServer(); - String atsUri = String.format("%s/ats", appServer); - - atsEndpoint = JaxRsClient.newBuilder() // - .createThreadSafeProxyClients(true) // if the client needs to be shared between threads - .build() // - .targetProxy(atsUri, AtsJaxRsApi.class); - } - return atsEndpoint; - } - -} diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileBacklog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileBacklog.java index 83711a28644..eeae66168d4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileBacklog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileBacklog.java @@ -21,7 +21,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; -import org.eclipse.osee.ats.internal.AtsJaxRsService; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -58,27 +58,25 @@ public class CreateNewAgileBacklog extends XNavigateItemAction { activeTeams.add(agTeam); } } - FilteredTreeArtifactDialog dialog = - new FilteredTreeArtifactDialog(getName(), "Select Agile Team", activeTeams, new ArtifactTreeContentProvider(), - new ArtifactLabelProvider()); + FilteredTreeArtifactDialog dialog = new FilteredTreeArtifactDialog(getName(), "Select Agile Team", activeTeams, + new ArtifactTreeContentProvider(), new ArtifactLabelProvider()); if (dialog.open() == 0) { EntryDialog ed = new EntryDialog(getName(), "Enter new Agile Backlog name"); if (ed.open() == 0) { if (Strings.isValid(ed.getEntry())) { try { - AgileEndpointApi teamApi = AtsJaxRsService.get().getAgile(); + AgileEndpointApi agileEp = AtsClientService.getAgileEndpoint(); JaxNewAgileBacklog newBacklog = new JaxNewAgileBacklog(); newBacklog.setName(ed.getEntry()); int teamUuid = ((Artifact) dialog.getSelectedFirst()).getArtId(); newBacklog.setTeamUuid(teamUuid); - Response response = teamApi.createBacklog(new Long(teamUuid), newBacklog); + Response response = agileEp.createBacklog(new Long(teamUuid), newBacklog); Object entity = response.readEntity(JaxAgileBacklog.class); if (entity != null) { JaxAgileBacklog backlog = (JaxAgileBacklog) entity; - Artifact backlogart = - ArtifactQuery.getArtifactFromId(new Long(backlog.getUuid()).intValue(), - AtsUtilCore.getAtsBranch()); + Artifact backlogart = ArtifactQuery.getArtifactFromId(new Long(backlog.getUuid()).intValue(), + AtsUtilCore.getAtsBranch()); backlogart.getParent().reloadAttributesAndRelations(); AtsUtil.openArtifact(backlog.getUuid(), OseeCmEditor.CmPcrEditor); } else { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileFeatureGroup.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileFeatureGroup.java index b451d7e9229..4c2c765bc19 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileFeatureGroup.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileFeatureGroup.java @@ -21,7 +21,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; -import org.eclipse.osee.ats.internal.AtsJaxRsService; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -58,16 +58,15 @@ public class CreateNewAgileFeatureGroup extends XNavigateItemAction { activeTeams.add(agTeam); } } - FilteredTreeArtifactDialog dialog = - new FilteredTreeArtifactDialog(getName(), "Select Agile Team", activeTeams, new ArtifactTreeContentProvider(), - new ArtifactLabelProvider()); + FilteredTreeArtifactDialog dialog = new FilteredTreeArtifactDialog(getName(), "Select Agile Team", activeTeams, + new ArtifactTreeContentProvider(), new ArtifactLabelProvider()); if (dialog.open() == 0) { EntryDialog ed = new EntryDialog(getName(), "Enter new Agile Feature Group name(s) (comma delimited)"); if (ed.open() == 0) { if (Strings.isValid(ed.getEntry())) { try { - AgileEndpointApi teamApi = AtsJaxRsService.get().getAgile(); + AgileEndpointApi teamApi = AtsClientService.getAgileEndpoint(); JaxNewAgileFeatureGroup newGroup = new JaxNewAgileFeatureGroup(); for (String name : ed.getEntry().split(",")) { newGroup.setName(name); @@ -77,9 +76,8 @@ public class CreateNewAgileFeatureGroup extends XNavigateItemAction { Object entity = response.readEntity(JaxAgileFeatureGroup.class); if (entity != null) { JaxAgileFeatureGroup group = (JaxAgileFeatureGroup) entity; - Artifact groupArt = - ArtifactQuery.getArtifactFromId(new Long(group.getUuid()).intValue(), - AtsUtilCore.getAtsBranch()); + Artifact groupArt = ArtifactQuery.getArtifactFromId(new Long(group.getUuid()).intValue(), + AtsUtilCore.getAtsBranch()); groupArt.getParent().reloadAttributesAndRelations(); AtsUtil.openArtifact(group.getUuid(), OseeCmEditor.CmPcrEditor); } else { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileSprint.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileSprint.java index 2ab8af95571..6c0cfcb0fd5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileSprint.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileSprint.java @@ -21,7 +21,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; -import org.eclipse.osee.ats.internal.AtsJaxRsService; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -58,22 +58,21 @@ public class CreateNewAgileSprint extends XNavigateItemAction { activeTeams.add(agTeam); } } - FilteredTreeArtifactDialog dialog = - new FilteredTreeArtifactDialog(getName(), "Select Agile Team", activeTeams, new ArtifactTreeContentProvider(), - new ArtifactLabelProvider()); + FilteredTreeArtifactDialog dialog = new FilteredTreeArtifactDialog(getName(), "Select Agile Team", activeTeams, + new ArtifactTreeContentProvider(), new ArtifactLabelProvider()); if (dialog.open() == 0) { EntryDialog ed = new EntryDialog(getName(), "Enter new Agile Sprint name(s) (comma delimited)"); if (ed.open() == 0) { if (Strings.isValid(ed.getEntry())) { try { - AgileEndpointApi teamApi = AtsJaxRsService.get().getAgile(); + AgileEndpointApi ageilEp = AtsClientService.getAgileEndpoint(); JaxNewAgileSprint newSprint = new JaxNewAgileSprint(); int teamUuid = ((Artifact) dialog.getSelectedFirst()).getArtId(); for (String name : ed.getEntry().split(",")) { newSprint.setName(name); newSprint.setTeamUuid(teamUuid); - Response response = teamApi.createSprint(new Long(teamUuid), newSprint); + Response response = ageilEp.createSprint(new Long(teamUuid), newSprint); JaxAgileSprint sprint = response.readEntity(JaxAgileSprint.class); if (sprint != null) { long uuid = sprint.getUuid(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileTeam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileTeam.java index ca81e5f817c..e382114938d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileTeam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewAgileTeam.java @@ -17,7 +17,7 @@ import org.eclipse.osee.ats.api.agile.JaxAgileTeam; import org.eclipse.osee.ats.api.agile.JaxNewAgileTeam; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; -import org.eclipse.osee.ats.internal.AtsJaxRsService; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -47,10 +47,10 @@ public class CreateNewAgileTeam extends XNavigateItemAction { if (ed.open() == 0) { if (Strings.isValid(ed.getEntry())) { try { - AgileEndpointApi teamApi = AtsJaxRsService.get().getAgile(); + AgileEndpointApi agileEp = AtsClientService.getAgileEndpoint(); JaxNewAgileTeam newTeam = new JaxNewAgileTeam(); newTeam.setName(ed.getEntry()); - Response response = teamApi.createTeam(newTeam); + Response response = agileEp.createTeam(newTeam); Object entity = response.readEntity(JaxAgileTeam.class); if (entity != null) { JaxAgileTeam team = (JaxAgileTeam) entity; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsColumn.java index 6257f7f40e3..b74a9389a4e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsColumn.java @@ -19,7 +19,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.util.ColorColumn; import org.eclipse.osee.ats.column.IPersistAltLeftClickProvider; -import org.eclipse.osee.ats.config.AtsConfigurationUtil; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.graphics.Color; @@ -163,7 +163,7 @@ public abstract class XViewerAtsColumn extends XViewerColumn { public boolean isColorColumn() { if (hasColorColumn == null) { - colorColumn = AtsConfigurationUtil.getConfigurations().getColorColumns().getColumnById(getId()); + colorColumn = AtsClientService.getConfigEndpoint().get().getColorColumns().getColumnById(getId()); hasColorColumn = colorColumn != null; if (hasColorColumn) { elementToForegroundColor = new HashMap<Object, String>(100); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerUtil.java index f23bd852bec..e6c02a08a6c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerUtil.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerUtil.java @@ -20,8 +20,8 @@ import org.eclipse.osee.ats.api.config.AtsAttributeValueColumn; import org.eclipse.osee.ats.api.config.ColumnAlign; import org.eclipse.osee.ats.column.StateAssigneesColumn; import org.eclipse.osee.ats.column.StateCompletedColumn; -import org.eclipse.osee.ats.config.AtsConfigurationUtil; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; import org.eclipse.osee.ats.workdef.AtsWorkDefinitionSheetProviders; import org.eclipse.osee.framework.core.model.type.AttributeType; @@ -76,15 +76,14 @@ public class WorldXViewerUtil { } public static List<XViewerAtsAttributeValueColumn> getConfigurationColumns() { - List<AtsAttributeValueColumn> columns = AtsConfigurationUtil.getConfigurations().getViews().getAttrColumns(); + List<AtsAttributeValueColumn> columns = AtsClientService.getConfigEndpoint().get().getViews().getAttrColumns(); List<XViewerAtsAttributeValueColumn> configColumns = new ArrayList<XViewerAtsAttributeValueColumn>(); for (AtsAttributeValueColumn column : columns) { try { AttributeType attrType = AttributeTypeManager.getTypeByGuid(column.getAttrTypeId()); - XViewerAtsAttributeValueColumn valueColumn = - new XViewerAtsAttributeValueColumn(attrType, column.getWidth(), getSwtAlign(column.getAlign()), - column.isVisible(), SortDataType.valueOf(column.getSortDataType()), column.isColumnMultiEdit(), - column.getDescription()); + XViewerAtsAttributeValueColumn valueColumn = new XViewerAtsAttributeValueColumn(attrType, column.getWidth(), + getSwtAlign(column.getAlign()), column.isVisible(), SortDataType.valueOf(column.getSortDataType()), + column.isColumnMultiEdit(), column.getDescription()); valueColumn.setBooleanNotSetShow(column.getBooleanNotSetShow()); valueColumn.setBooleanOnFalseShow(column.getBooleanOnFalseShow()); valueColumn.setBooleanOnTrueShow(column.getBooleanOnTrueShow()); diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/ServerIntegrationTestSuite.java b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/ServerIntegrationTestSuite.java index 80ed3c4ed43..7ffe074724b 100644 --- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/ServerIntegrationTestSuite.java +++ b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/ServerIntegrationTestSuite.java @@ -10,14 +10,13 @@ *******************************************************************************/ package org.eclipse.osee.x.server.integration.tests; -import org.eclipse.osee.x.server.integration.tests.ats.AtsActionEndpointTest; import org.eclipse.osee.x.server.integration.tests.performance.AccountClientTest; import org.eclipse.osee.x.server.integration.tests.performance.OseeClientQueryTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({AtsActionEndpointTest.class, OseeClientQueryTest.class, AccountClientTest.class}) +@Suite.SuiteClasses({OseeClientQueryTest.class, AccountClientTest.class}) public class ServerIntegrationTestSuite { // Test Suite } diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/ats/AtsActionEndpointTest.java b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/ats/AtsActionEndpointTest.java deleted file mode 100644 index 56344d7ba43..00000000000 --- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/ats/AtsActionEndpointTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.x.server.integration.tests.ats; - -import org.eclipse.osee.ats.api.workflow.AtsActionEndpointApi; -import org.eclipse.osee.x.server.integration.tests.util.IntegrationUtil; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.MethodRule; -import org.junit.rules.TestName; - -/** - * @author Donald G. Dunne - */ -public class AtsActionEndpointTest { - - @Rule - public MethodRule performanceRule = IntegrationUtil.createPerformanceRule(); - - @Rule - public TestName testName = new TestName(); - - private AtsActionEndpointApi actionEndpoint; - - @Before - public void setUp() { - actionEndpoint = IntegrationUtil.createAtsClient().getAction(); - } - - @Test - public void testEndpointAlive() throws Exception { - Assert.assertTrue(actionEndpoint.get().contains("Action Resource")); - } - -} diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/util/IntegrationUtil.java b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/util/IntegrationUtil.java index cb357675f75..5ebf4adf054 100644 --- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/util/IntegrationUtil.java +++ b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/util/IntegrationUtil.java @@ -19,8 +19,6 @@ import org.databene.contiperf.report.CSVSummaryReportModule; import org.databene.contiperf.report.HtmlReportModule; import org.eclipse.osee.account.rest.client.AccountClient; import org.eclipse.osee.account.rest.client.AccountClientStandaloneSetup; -import org.eclipse.osee.ats.api.AtsJaxRsApi; -import org.eclipse.osee.jaxrs.client.JaxRsClient; import org.eclipse.osee.orcs.rest.client.OseeClient; import org.eclipse.osee.orcs.rest.client.OseeClientStandaloneSetup; import org.junit.rules.MethodRule; @@ -55,14 +53,4 @@ public final class IntegrationUtil { return AccountClientStandaloneSetup.createClient(config); } - public static AtsJaxRsApi createAtsClient() { - String atsUri = String.format("%s/ats", getOseeApplicationServer()); - - AtsJaxRsApi atsEndpoint = JaxRsClient.newBuilder() // - .createThreadSafeProxyClients(true) // if the client needs to be shared between threads - .build() // - .targetProxy(atsUri, AtsJaxRsApi.class); - - return atsEndpoint; - } } |