diff options
author | jmisinco | 2013-11-15 15:52:55 +0000 |
---|---|---|
committer | Roberto E. Escobar | 2013-11-25 23:45:43 +0000 |
commit | efebbddcf4f975753692b27395fe548e9c6fa1bc (patch) | |
tree | 337d842cfc0e56dced33a96059d28afb6102a54b /plugins/org.eclipse.osee.framework.manager.servlet | |
parent | 4d4b9636d9d340373a0437d5f9a437a92c7530c0 (diff) | |
download | org.eclipse.osee-efebbddcf4f975753692b27395fe548e9c6fa1bc.tar.gz org.eclipse.osee-efebbddcf4f975753692b27395fe548e9c6fa1bc.tar.xz org.eclipse.osee-efebbddcf4f975753692b27395fe548e9c6fa1bc.zip |
refactor: Remove 0.9.2 compatibility code
Change-Id: I93675b7cac0f240af8c188c6534cc586daa36e89
Diffstat (limited to 'plugins/org.eclipse.osee.framework.manager.servlet')
4 files changed, 11 insertions, 151 deletions
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ModCompatible.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ModCompatible.java deleted file mode 100644 index 65e9d655acc..00000000000 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ModCompatible.java +++ /dev/null @@ -1,98 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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; - -import org.eclipse.osee.framework.core.enums.StorageState; -import org.eclipse.osee.framework.core.message.ArtifactTypeCacheUpdateResponse; -import org.eclipse.osee.framework.core.message.ArtifactTypeCacheUpdateResponse.ArtifactTypeRow; -import org.eclipse.osee.framework.core.message.AttributeTypeCacheUpdateResponse; -import org.eclipse.osee.framework.core.message.BranchCacheUpdateResponse; -import org.eclipse.osee.framework.core.message.BranchRow; -import org.eclipse.osee.framework.core.message.OseeEnumTypeCacheUpdateResponse; -import org.eclipse.osee.framework.core.message.RelationTypeCacheUpdateResponse; -import org.eclipse.osee.framework.core.message.RelationTypeCacheUpdateResponse.RelationTypeRow; -import org.eclipse.osee.framework.core.model.type.AttributeType; -import org.eclipse.osee.framework.core.server.ISession; -import org.eclipse.osee.framework.core.server.ISessionManager; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.eclipse.osee.framework.jdk.core.util.Strings; - -public final class ModCompatible { - - private ModCompatible() { - // Utility Class - } - - public static boolean is_0_9_2_Compatible(String clientVersion) { - boolean result = false; - if (Strings.isValid(clientVersion)) { - String toCheck = clientVersion.toLowerCase(); - if (!toCheck.startsWith("0.9.0") && !toCheck.startsWith("0.9.1")) { - result = true; - } - } - return result; - } - - public static String getClientVersion(ISessionManager manager, String sessionId) throws OseeCoreException { - String clientVersion = null; - if (Strings.isValid(sessionId)) { - ISession session = manager.getSessionById(sessionId); - if (session != null) { - clientVersion = session.getClientVersion(); - } - } - return clientVersion; - } - - private static StorageState getCompatibleState(StorageState state) { - StorageState toReturn = state; - if (state == StorageState.PURGED) { - toReturn = StorageState.DELETED; - } else if (state == StorageState.LOADED) { - toReturn = StorageState.MODIFIED; - } - return toReturn; - } - - public static void makeSendCompatible(boolean isCompatible, Object response) { - if (!isCompatible) { - if (response instanceof BranchCacheUpdateResponse) { - BranchCacheUpdateResponse data = (BranchCacheUpdateResponse) response; - for (BranchRow row : data.getBranchRows()) { - row.setStorageState(getCompatibleState(row.getStorageState())); - } - } else if (response instanceof ArtifactTypeCacheUpdateResponse) { - ArtifactTypeCacheUpdateResponse data = (ArtifactTypeCacheUpdateResponse) response; - for (ArtifactTypeRow row : data.getArtTypeRows()) { - row.setStorageState(getCompatibleState(row.getStorageState())); - } - - } else if (response instanceof AttributeTypeCacheUpdateResponse) { - AttributeTypeCacheUpdateResponse data = (AttributeTypeCacheUpdateResponse) response; - for (AttributeType row : data.getAttrTypeRows()) { - row.setStorageState(getCompatibleState(row.getStorageState())); - } - } else if (response instanceof RelationTypeCacheUpdateResponse) { - RelationTypeCacheUpdateResponse data = (RelationTypeCacheUpdateResponse) response; - for (RelationTypeRow row : data.getRelationTypeRows()) { - row.setStorageState(getCompatibleState(row.getStorageState())); - } - - } else if (response instanceof OseeEnumTypeCacheUpdateResponse) { - OseeEnumTypeCacheUpdateResponse data = (OseeEnumTypeCacheUpdateResponse) response; - for (String[] types : data.getEnumTypeRows()) { - types[1] = getCompatibleState(StorageState.valueOf(types[1])).name(); - } - } - } - } -} diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java index e3a0c158367..0127e465ae1 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java @@ -47,7 +47,6 @@ import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.core.model.cache.BranchCache; import org.eclipse.osee.framework.core.model.cache.TransactionCache; import org.eclipse.osee.framework.core.model.type.AttributeType; -import org.eclipse.osee.framework.core.server.ISessionManager; import org.eclipse.osee.framework.core.server.UnsecuredOseeHttpServlet; import org.eclipse.osee.framework.core.services.IOseeModelFactoryService; import org.eclipse.osee.framework.core.services.IdentityService; @@ -79,16 +78,14 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet { private static final long serialVersionUID = 6693534844874109524L; private final IDataTranslationService translationService; private final IOseeModelFactoryService factoryService; - private final ISessionManager sessionManager; private final BranchCache branchCache; private final TransactionCache txCache; private final OrcsApi orcsApi; private final IdentityService identityService; private static final StorageState DEFAULT_STORAGE_STATE = StorageState.CREATED; - public OseeCacheServlet(Log logger, ISessionManager sessionManager, IDataTranslationService translationService, TempCachingService cachingService, OrcsApi orcsApi, IOseeModelFactoryService factoryService, IdentityService identityService) { + public OseeCacheServlet(Log logger, IDataTranslationService translationService, TempCachingService cachingService, OrcsApi orcsApi, IOseeModelFactoryService factoryService, IdentityService identityService) { super(logger); - this.sessionManager = sessionManager; this.translationService = translationService; this.branchCache = cachingService.getBranchCache(); this.txCache = cachingService.getTransactionCache(); @@ -108,7 +105,7 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet { IDataTranslationService service = getTranslationService(); ApplicationContext context = createAppContext(req); OrcsTypes orcsTypes = orcsApi.getOrcsTypes(context); - Pair<Object, ITranslatorId> pair = createResponse(true, new CacheUpdateRequest(cacheId), orcsTypes); + Pair<Object, ITranslatorId> pair = createResponse(new CacheUpdateRequest(cacheId), orcsTypes); resp.setStatus(HttpServletResponse.SC_ACCEPTED); resp.setContentType("text/xml"); resp.setCharacterEncoding("UTF-8"); @@ -123,19 +120,15 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet { @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { try { - String sessionId = req.getParameter("sessionId"); - String clientVersion = ModCompatible.getClientVersion(sessionManager, sessionId); - boolean isCompatible = ModCompatible.is_0_9_2_Compatible(clientVersion); - CacheOperation operation = CacheOperation.fromString(req.getParameter("function")); switch (operation) { case UPDATE: ApplicationContext context = createAppContext(req); OrcsTypes orcsTypes = orcsApi.getOrcsTypes(context); - sendUpdates(isCompatible, req, resp, orcsTypes); + sendUpdates(req, resp, orcsTypes); break; case STORE: - storeUpdates(isCompatible, req, resp); + storeUpdates(req, resp); break; default: throw new UnsupportedOperationException(); @@ -159,7 +152,7 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet { resp.getWriter().close(); } - private void storeUpdates(boolean isCompatible, HttpServletRequest req, HttpServletResponse resp) throws OseeCoreException { + private void storeUpdates(HttpServletRequest req, HttpServletResponse resp) throws OseeCoreException { IDataTranslationService service = getTranslationService(); BranchCacheStoreRequest updateRequest = null; @@ -198,7 +191,7 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet { } } - private void sendUpdates(boolean isCompatible, HttpServletRequest req, HttpServletResponse resp, OrcsTypes orcsTypes) throws OseeCoreException { + private void sendUpdates(HttpServletRequest req, HttpServletResponse resp, OrcsTypes orcsTypes) throws OseeCoreException { IDataTranslationService service = getTranslationService(); CacheUpdateRequest updateRequest = null; @@ -214,14 +207,12 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet { OutputStream outputStream = null; try { - Pair<Object, ITranslatorId> pair = createResponse(isCompatible, updateRequest, orcsTypes); + Pair<Object, ITranslatorId> pair = createResponse(updateRequest, orcsTypes); resp.setStatus(HttpServletResponse.SC_ACCEPTED); resp.setContentType("text/xml"); resp.setCharacterEncoding("UTF-8"); - ModCompatible.makeSendCompatible(isCompatible, pair.getFirst()); - inputStream = service.convertToStream(pair.getFirst(), pair.getSecond()); outputStream = resp.getOutputStream(); Lib.inputStreamToOutputStream(inputStream, outputStream); @@ -230,7 +221,7 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet { } } - private Pair<Object, ITranslatorId> createResponse(boolean isCompatible, CacheUpdateRequest updateRequest, OrcsTypes orcsTypes) throws OseeCoreException { + private Pair<Object, ITranslatorId> createResponse(CacheUpdateRequest updateRequest, OrcsTypes orcsTypes) throws OseeCoreException { Object response = null; ITranslatorId transalatorId = null; switch (updateRequest.getCacheId()) { diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServerBranchUpdateOperation.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServerBranchUpdateOperation.java index c29a18f3dc4..039fc893ca0 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServerBranchUpdateOperation.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServerBranchUpdateOperation.java @@ -18,9 +18,7 @@ import org.eclipse.osee.framework.core.data.OseeServerContext; import org.eclipse.osee.framework.core.data.OseeServerInfo; import org.eclipse.osee.framework.core.enums.CacheOperation; import org.eclipse.osee.framework.core.enums.CoreTranslatorId; -import org.eclipse.osee.framework.core.enums.StorageState; import org.eclipse.osee.framework.core.message.BranchCacheStoreRequest; -import org.eclipse.osee.framework.core.message.BranchRow; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.server.IApplicationServerLookup; @@ -29,7 +27,6 @@ import org.eclipse.osee.framework.core.translation.IDataTranslationService; import org.eclipse.osee.framework.core.util.HttpMessage; import org.eclipse.osee.framework.core.util.HttpProcessor.AcquireResult; import org.eclipse.osee.framework.jdk.core.util.HttpUrlBuilder; -import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.logger.Log; /** @@ -56,28 +53,6 @@ public class ServerBranchUpdateOperation extends AbstractOperation { this.branches = branches; } - private boolean is_0_9_2_Compatible(String... versions) { - for (String version : versions) { - if (Strings.isValid(version)) { - String toCheck = version.toLowerCase(); - if (!toCheck.startsWith("0.9.0") && !toCheck.startsWith("0.9.1")) { - return true; - } - } - } - return false; - } - - private StorageState getCompatibleState(StorageState state) { - StorageState toReturn = state; - if (state == StorageState.PURGED) { - toReturn = StorageState.DELETED; - } else if (state == StorageState.LOADED) { - toReturn = StorageState.MODIFIED; - } - return toReturn; - } - @Override protected void doWork(IProgressMonitor monitor) throws Exception { logger.trace("Sending server update event for [%s]", branches); @@ -85,12 +60,6 @@ public class ServerBranchUpdateOperation extends AbstractOperation { BranchCacheStoreRequest request = BranchCacheStoreRequest.fromCache(branches); request.setServerUpdateMessage(true); - BranchCacheStoreRequest request0_9_1 = BranchCacheStoreRequest.fromCache(branches); - request0_9_1.setServerUpdateMessage(true); - for (BranchRow row : request0_9_1.getBranchRows()) { - row.setStorageState(getCompatibleState(row.getStorageState())); - } - Map<String, String> parameters = new HashMap<String, String>(); parameters.put("function", CacheOperation.STORE.name()); @@ -100,10 +69,8 @@ public class ServerBranchUpdateOperation extends AbstractOperation { String urlString = HttpUrlBuilder.createURL(serverInfo.getUri(), OseeServerContext.CACHE_CONTEXT, parameters); - BranchCacheStoreRequest message = is_0_9_2_Compatible(serverInfo.getVersion()) ? request : request0_9_1; - AcquireResult updateResponse = - HttpMessage.send(urlString, translationService, CoreTranslatorId.BRANCH_CACHE_STORE_REQUEST, message, + HttpMessage.send(urlString, translationService, CoreTranslatorId.BRANCH_CACHE_STORE_REQUEST, request, null); if (!updateResponse.wasSuccessful()) { logger.error("Error relaying branch updates to servers"); diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java index a737e09f0a1..5f709580a67 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java @@ -147,8 +147,8 @@ public class ServletRegistrationHandler { register(new SessionManagementServlet(logger, sessionManager, authenticationManager), OseeServerContext.SESSION_CONTEXT); register(new SessionClientLoopbackServlet(logger, sessionManager), OseeServerContext.CLIENT_LOOPBACK_CONTEXT); - register(new OseeCacheServlet(logger, sessionManager, translationService, caching, orcsApi, factoryService, - identityService), OseeServerContext.CACHE_CONTEXT); + register(new OseeCacheServlet(logger, translationService, caching, orcsApi, factoryService, identityService), + OseeServerContext.CACHE_CONTEXT); register(new OseeModelServlet(logger, sessionManager, translationService, orcsApi), OseeServerContext.OSEE_MODEL_CONTEXT); register(new UnsubscribeServlet(logger, context, orcsApi), "osee/unsubscribe"); |