Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2015-04-20 15:17:13 +0000
committerjmisinco2015-04-20 15:17:13 +0000
commit5725e4121090d07e98881038405bc68472337407 (patch)
tree29bd719ba760a4029446d775b63fe10e54ddad35 /plugins/org.eclipse.osee.framework.manager.servlet
parent5b40b18d9710859077b59d73be69a138b41a4da7 (diff)
downloadorg.eclipse.osee-5725e4121090d07e98881038405bc68472337407.tar.gz
org.eclipse.osee-5725e4121090d07e98881038405bc68472337407.tar.xz
org.eclipse.osee-5725e4121090d07e98881038405bc68472337407.zip
feature[ats_ATS194184]: Remove ApplicationContext parameter from OrcsApi
Diffstat (limited to 'plugins/org.eclipse.osee.framework.manager.servlet')
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java4
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java2
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ApplicationContextFactory.java30
3 files changed, 3 insertions, 33 deletions
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java
index 7a24984d0a4..1b44bf520d7 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java
@@ -76,7 +76,7 @@ public class ArtifactFileServlet extends UnsecuredOseeHttpServlet {
}
String uri = null;
- BranchQuery query = orcs.getQueryFactory(null).branchQuery();
+ BranchQuery query = orcs.getQueryFactory().branchQuery();
if (branchName != null) {
query.andNameEquals(branchName);
} else if (branchUuid != null) {
@@ -100,7 +100,7 @@ public class ArtifactFileServlet extends UnsecuredOseeHttpServlet {
private Long extractBranchUuid(String branchGuid) {
Long branchUuid = null;
ArtifactReadable mapArtifact =
- orcs.getQueryFactory(null).fromBranch(CoreBranches.COMMON).andGuid(MAPPING_ART).getResults().getExactlyOne();
+ orcs.getQueryFactory().fromBranch(CoreBranches.COMMON).andGuid(MAPPING_ART).getResults().getExactlyOne();
String map = mapArtifact.getSoleAttributeAsString(CoreAttributeTypes.GeneralStringData);
int start = map.indexOf(branchGuid);
if (start > 0) {
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java
index a1394644808..ce235de0d55 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java
@@ -66,7 +66,7 @@ public class DataServlet extends UnsecuredOseeHttpServlet {
parser.parse(urlRequest);
Long branchUuid = Long.valueOf(parser.getAttribute("branch"));
String artifactGuid = parser.getAttribute("artifact");
- BranchQuery query = orcsApi.getQueryFactory(null).branchQuery();
+ BranchQuery query = orcsApi.getQueryFactory().branchQuery();
BranchReadable branch = query.andUuids(branchUuid).getResults().getExactlyOne();
String uri = ArtifactUtil.getUri(jdbcClient, artifactGuid, branch);
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ApplicationContextFactory.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ApplicationContextFactory.java
deleted file mode 100644
index 9634552551a..00000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ApplicationContextFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 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.framework.manager.servlet.internal;
-
-import org.eclipse.osee.orcs.ApplicationContext;
-
-public class ApplicationContextFactory {
-
- private ApplicationContextFactory() {
- // TODO Improve session management
- }
-
- public static ApplicationContext createContext(final String sessionId) {
- return new ApplicationContext() {
-
- @Override
- public String getSessionId() {
- return sessionId;
- }
- };
- }
-}

Back to the top