Asaf Shakarchi has uploaded a new change for review. Change subject: engine: Removal of a deprecated Public API moudle. ......................................................................
engine: Removal of a deprecated Public API moudle. This patch removes a deprecated Public API module, It also removes the module from its parent pom. Change-Id: Ie64282709aad5854586e8dfb928076cb584f6711 Signed-off-by: Asaf Shakarchi <[email protected]> --- D frontend/api/genericapi/pom.xml D frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/GenericApi.gwt.xml D frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/GenericApiService.java D frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/UICommandsFactory.java D frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/parameters/UIQueryParametersBase.java D frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/returnvalues/UIQueryReturnValue.java D frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/Get64bitOsTypesUIQuery.java D frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/GetLinuxOsTypesUIQuery.java D frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/GetUserActionGroupsUIQuery.java D frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/GetWindowsOsTypesUIQuery.java D frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/UIQueryBase.java D frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/UIQueryType.java M frontend/pom.xml 13 files changed, 0 insertions(+), 477 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/10244/1 diff --git a/frontend/api/genericapi/pom.xml b/frontend/api/genericapi/pom.xml deleted file mode 100644 index a55c906..0000000 --- a/frontend/api/genericapi/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.ovirt.engine.ui</groupId> - <artifactId>api</artifactId> - <version>3.2.0</version> - </parent> - - <artifactId>genericapi</artifactId> - <packaging>ejb</packaging> - - <name>oVirt generic API</name> - - <dependencies> - <dependency> - <groupId>org.ovirt.engine.core</groupId> - <artifactId>bll</artifactId> - <version>${engine.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-ext-api</artifactId> - </dependency> - <dependency> - <groupId>org.ovirt.engine.core</groupId> - <artifactId>common</artifactId> - <version>${engine.version}</version> - </dependency> - - <dependency> - <groupId>org.ovirt.engine.core</groupId> - <artifactId>utils</artifactId> - <version>${engine.version}</version> - </dependency> - - <!-- external dependencies --> - <dependency> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/java</directory> - <includes> - <include>**/*.java</include> - <include>**/*.gwt.xml</include> - </includes> - </resource> - </resources> - - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>gwt-maven-plugin</artifactId> - <version>${gwt.plugin.version}</version> - <configuration> - <logLevel>INFO</logLevel> - <extraJvmArgs>-Xms1024M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=256M</extraJvmArgs> - <localWorkers>2</localWorkers> - </configuration> - <executions> - <execution> - <goals> - <goal>resources</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <additionalClasspathElements> - <additionalClasspathElement>${basedir}/src/test/java</additionalClasspathElement> - </additionalClasspathElements> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/GenericApi.gwt.xml b/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/GenericApi.gwt.xml deleted file mode 100644 index efb722a..0000000 --- a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/GenericApi.gwt.xml +++ /dev/null @@ -1,9 +0,0 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.6//EN" - "http://google-web-toolkit.googlecode.com/svn/releases/1.6/distro-source/core/src/gwt-module.dtd";> -<module> - <source path=""> - <include name="genericapi/uiqueries/*.java"/> - <include name="genericapi/returnvalues/*.java"/> - <include name="genericapi/parameters/*.java"/> - </source> -</module> \ No newline at end of file diff --git a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/GenericApiService.java b/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/GenericApiService.java deleted file mode 100644 index ebbab22..0000000 --- a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/GenericApiService.java +++ /dev/null @@ -1,117 +0,0 @@ -package org.ovirt.engine.ui.genericapi; - -import java.util.ArrayList; - -import org.ovirt.engine.core.common.action.LoginUserParameters; -import org.ovirt.engine.core.common.action.LogoutUserParameters; -import org.ovirt.engine.core.common.action.VdcActionParametersBase; -import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.action.VdcReturnValueBase; -import org.ovirt.engine.core.common.interfaces.BackendLocal; -import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; -import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; -import org.ovirt.engine.core.common.queries.VdcQueryType; -import org.ovirt.engine.core.compat.StringHelper; -import org.ovirt.engine.core.utils.ThreadLocalParamsContainer; -import org.ovirt.engine.ui.genericapi.parameters.UIQueryParametersBase; -import org.ovirt.engine.ui.genericapi.returnvalues.UIQueryReturnValue; -import org.ovirt.engine.ui.genericapi.uiqueries.UIQueryBase; -import org.ovirt.engine.ui.genericapi.uiqueries.UIQueryType; - -public class GenericApiService { - - private BackendLocal backend; - - public VdcReturnValueBase EndAction(VdcActionType actionType, VdcActionParametersBase parameters) { - VdcReturnValueBase returnValue = backend.EndAction(actionType, parameters); - return returnValue; - } - - public VdcReturnValueBase RunAction(VdcActionType actionType, VdcActionParametersBase parameters) { - VdcReturnValueBase returnValue = backend.RunAction(actionType, parameters); - return returnValue; - } - - public ArrayList<VdcReturnValueBase> RunMultipleActions(VdcActionType actionType, - ArrayList<VdcActionParametersBase> parameters, boolean isRunOnlyIfAllCanDoPass) { - java.util.ArrayList<VdcReturnValueBase> returnValue = backend.RunMultipleActions( - actionType, parameters, isRunOnlyIfAllCanDoPass); - return returnValue; - } - - public VdcQueryReturnValue RunQuery(VdcQueryType actionType, VdcQueryParametersBase parameters) { - VdcQueryReturnValue returnValue = backend.RunQuery(actionType, parameters); - return returnValue; - } - - public VdcReturnValueBase Login(LoginUserParameters parameters) { - VdcReturnValueBase returnValue = backend.Login(parameters); - return returnValue; - } - - public VdcReturnValueBase Logoff(LogoutUserParameters parameters) { - VdcReturnValueBase returnValue = backend.Logoff(parameters); - return returnValue; - } - - public VdcQueryReturnValue RunPublicQuery(VdcQueryType actionType, - VdcQueryParametersBase parameters) { - VdcQueryReturnValue returnValue = backend.RunPublicQuery(actionType, parameters); - return returnValue; - } - - public VdcReturnValueBase RunAutoAction(VdcActionType actionType, - VdcActionParametersBase parameters) { - VdcReturnValueBase returnValue = backend.RunAutoAction(actionType, parameters); - return returnValue; - } - - public VdcQueryReturnValue RunAutoQuery(VdcQueryType actionType, - VdcQueryParametersBase parameters) { - VdcQueryReturnValue returnValue = backend.RunAutoQuery(actionType, parameters); - return returnValue; - } - - public UIQueryReturnValue RunUIQuery(UIQueryType actionType, UIQueryParametersBase parameters) { - UIQueryBase query = UICommandsFactory.CreateQueryCommand(actionType, parameters); - query.executeQuery(); - return query.getReturnValue(); - } - - public ArrayList<VdcQueryReturnValue> RunMultipleQueries(ArrayList<VdcQueryType> queryTypeList, - ArrayList<VdcQueryParametersBase> queryParamsList) { - ArrayList<VdcQueryReturnValue> ret = new ArrayList<VdcQueryReturnValue>(); - - if (queryTypeList == null || queryParamsList == null) { - // TODO: LOG: "queryTypeList and/or queryParamsList is null." - } - - else if (queryTypeList.size() != queryParamsList.size()) { - // TODO: LOG: "queryTypeList and queryParamsList don't have the same amount of items." - } - - else if (queryTypeList.size() == 0) { - // TODO: LOG: no queries to execute. - } - - else { - // TODO: next section is a temporary hack for setting the session ID - // for all queries to be the correct one. - VdcQueryParametersBase firstParams = queryParamsList.get(0); - if (StringHelper.isNullOrEmpty(firstParams.getHttpSessionId()) - && StringHelper.isNullOrEmpty(firstParams.getSessionId())) { - String sessionID = ThreadLocalParamsContainer.getHttpSessionId(); - for (VdcQueryParametersBase queryParams : queryParamsList) { - queryParams.setSessionId(sessionID); - queryParams.setHttpSessionId(sessionID); - } - } - - for (int i = 0; i < queryTypeList.size(); i++) { - ret.add(RunQuery(queryTypeList.get(i), queryParamsList.get(i))); - } - } - - return ret; - } -} diff --git a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/UICommandsFactory.java b/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/UICommandsFactory.java deleted file mode 100644 index 0c47c30..0000000 --- a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/UICommandsFactory.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.ovirt.engine.ui.genericapi; - -import java.lang.reflect.Constructor; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.ui.genericapi.parameters.UIQueryParametersBase; -import org.ovirt.engine.ui.genericapi.uiqueries.UIQueryBase; -import org.ovirt.engine.ui.genericapi.uiqueries.UIQueryType; - -public class UICommandsFactory { - - private static final String QUERY_SUFFIX = "UIQuery"; - private static final String UI_QUERY_PACKAGE = "org.ovirt.engine.ui.genericapi.uiqueries"; - - private static Map<String, Class<? extends UIQueryBase>> queryCache = new ConcurrentHashMap<String, Class<? extends UIQueryBase>>( - VdcActionType.values().length); - - public static UIQueryBase CreateQueryCommand(UIQueryType query, UIQueryParametersBase parameters) { - Class<? extends UIQueryBase> type = null; - try { - type = getQueryClass(query.name(), QUERY_SUFFIX); - @SuppressWarnings("rawtypes") - Class[] types = new Class[1]; - types[0] = parameters.getClass(); - - Constructor<? extends UIQueryBase> info = findQueryConstructor(type); - Object[] UIQueryParametersBase = new Object[1]; - UIQueryParametersBase[0] = parameters; - Object tempVar = info.newInstance(parameters); - return (UIQueryBase) ((tempVar instanceof UIQueryBase) ? tempVar : null); - } catch (Exception e) { - //TODO add log msg - //log.errorFormat("ADD ERROR MSG", type, e); - throw new RuntimeException(e); - } - } - - - private static Class<? extends UIQueryBase> getQueryClass(String name, String suffix) { - // try the cache first - if (queryCache.get(name + suffix) != null) - return queryCache.get(name + suffix); - - String className = String.format("%1$s.%2$s%3$s", UI_QUERY_PACKAGE, name, suffix); - @SuppressWarnings("unchecked") - Class<? extends UIQueryBase> type = loadClass(className); - if (type != null) { - queryCache.put(name + suffix, type); // update cache - return type; - } - - //TODO add logger for generic api - // nothing found - //log.warn("Unable to find class for action: " + name + suffix); - return null; - } - - - @SuppressWarnings("unchecked") - //assuming only one constructor. - //If need to support more this code should change - private static Constructor<? extends UIQueryBase> findQueryConstructor(Class<? extends UIQueryBase> type) { - Constructor<?>[] constructors = type.getDeclaredConstructors(); - return (Constructor<? extends UIQueryBase>)constructors[0]; - } - - - - @SuppressWarnings("rawtypes") - private static Class loadClass(String className) { - try { - return Class.forName(className); - } catch (ClassNotFoundException e) { - return null; - } - } -} diff --git a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/parameters/UIQueryParametersBase.java b/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/parameters/UIQueryParametersBase.java deleted file mode 100644 index 8a011c6..0000000 --- a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/parameters/UIQueryParametersBase.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.ovirt.engine.ui.genericapi.parameters; - -import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; - -public class UIQueryParametersBase extends VdcQueryParametersBase{ - -} diff --git a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/returnvalues/UIQueryReturnValue.java b/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/returnvalues/UIQueryReturnValue.java deleted file mode 100644 index aaac8ae..0000000 --- a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/returnvalues/UIQueryReturnValue.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ovirt.engine.ui.genericapi.returnvalues; - -import org.ovirt.engine.core.common.queries.ValueObject; - -public class UIQueryReturnValue { - - private Object returnValue; - private boolean succeeded; - - public ValueObject getSerializaedReturnValue() { - return ValueObject.createValueObject(returnValue); - } - - public Object getReturnValue() { - return returnValue; - } - - public void setReturnValue(Object returnValue) { - this.returnValue = returnValue; - } - - public boolean getSucceeded() { - return succeeded; - } - - public void setSucceeded(boolean value) { - succeeded = value; - } -} diff --git a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/Get64bitOsTypesUIQuery.java b/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/Get64bitOsTypesUIQuery.java deleted file mode 100644 index 86d5d87..0000000 --- a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/Get64bitOsTypesUIQuery.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.ovirt.engine.ui.genericapi.uiqueries; - -import java.util.ArrayList; - -import org.ovirt.engine.core.common.businessentities.VmOsType; -import org.ovirt.engine.ui.genericapi.parameters.UIQueryParametersBase; - -public class Get64bitOsTypesUIQuery extends UIQueryBase { - - public Get64bitOsTypesUIQuery(UIQueryParametersBase parameters) { - super(parameters); - } - - @Override - public void runQuery() { - - ArrayList<VmOsType> x64OsTypes = new ArrayList<VmOsType>(); - for (VmOsType osType : VmOsType.values()) { - if(osType.getIs64Bit()) { - x64OsTypes.add(osType); - } - } - - returnValue.setReturnValue(x64OsTypes); - } - -} diff --git a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/GetLinuxOsTypesUIQuery.java b/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/GetLinuxOsTypesUIQuery.java deleted file mode 100644 index 01ee142..0000000 --- a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/GetLinuxOsTypesUIQuery.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.ovirt.engine.ui.genericapi.uiqueries; - -import java.util.ArrayList; - -import org.ovirt.engine.core.common.businessentities.VmOsType; -import org.ovirt.engine.ui.genericapi.parameters.UIQueryParametersBase; - -public class GetLinuxOsTypesUIQuery extends UIQueryBase { - - public GetLinuxOsTypesUIQuery(UIQueryParametersBase parameters) { - super(parameters); - } - - @Override - public void runQuery() { - - ArrayList<VmOsType> linuxOsTypes = new ArrayList<VmOsType>(); - for (VmOsType osType : VmOsType.values()) { - if(osType.isLinux()) { - linuxOsTypes.add(osType); - } - } - - returnValue.setReturnValue(linuxOsTypes); - } - -} diff --git a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/GetUserActionGroupsUIQuery.java b/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/GetUserActionGroupsUIQuery.java deleted file mode 100644 index f298eeb..0000000 --- a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/GetUserActionGroupsUIQuery.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.ovirt.engine.ui.genericapi.uiqueries; - -import org.ovirt.engine.core.common.businessentities.ActionGroup; -import org.ovirt.engine.ui.genericapi.parameters.UIQueryParametersBase; - -public class GetUserActionGroupsUIQuery extends UIQueryBase{ - - public GetUserActionGroupsUIQuery(UIQueryParametersBase parameters) { - super(parameters); - } - - @Override - public void runQuery() { - returnValue.setReturnValue(ActionGroup.getAllUserActionGroups()); - } - -} diff --git a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/GetWindowsOsTypesUIQuery.java b/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/GetWindowsOsTypesUIQuery.java deleted file mode 100644 index 0bdce59..0000000 --- a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/GetWindowsOsTypesUIQuery.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.ovirt.engine.ui.genericapi.uiqueries; - -import java.util.ArrayList; - -import org.ovirt.engine.core.common.businessentities.VmOsType; -import org.ovirt.engine.ui.genericapi.parameters.UIQueryParametersBase; - -public class GetWindowsOsTypesUIQuery extends UIQueryBase { - - public GetWindowsOsTypesUIQuery(UIQueryParametersBase parameters) { - super(parameters); - } - - @Override - public void runQuery() { - - ArrayList<VmOsType> windowsOsTypes = new ArrayList<VmOsType>(); - for (VmOsType osType : VmOsType.values()) { - if(osType.isWindows()) { - windowsOsTypes.add(osType); - } - } - - returnValue.setReturnValue(windowsOsTypes); - } - -} diff --git a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/UIQueryBase.java b/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/UIQueryBase.java deleted file mode 100644 index 347bf00..0000000 --- a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/UIQueryBase.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.ovirt.engine.ui.genericapi.uiqueries; - -import org.ovirt.engine.ui.genericapi.parameters.UIQueryParametersBase; -import org.ovirt.engine.ui.genericapi.returnvalues.UIQueryReturnValue; - -public abstract class UIQueryBase { - - protected UIQueryParametersBase parameters; - protected UIQueryReturnValue returnValue; - - public UIQueryBase(UIQueryParametersBase parameters) { - this.parameters = parameters; - returnValue = new UIQueryReturnValue(); - } - - public void executeQuery() { - try { - runQuery(); - returnValue.setSucceeded(true); - } catch (RuntimeException ex) { - // TODO: Log ex.getMessage() - } - } - - public abstract void runQuery(); - - public UIQueryParametersBase getParameters() { - return parameters; - } - - public void setParameters(UIQueryParametersBase parameters) { - this.parameters = parameters; - } - - public UIQueryReturnValue getReturnValue() { - return returnValue; - } - - public void setReturnValue(UIQueryReturnValue returnValue) { - this.returnValue = returnValue; - } -} diff --git a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/UIQueryType.java b/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/UIQueryType.java deleted file mode 100644 index 42573b7..0000000 --- a/frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/uiqueries/UIQueryType.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.ovirt.engine.ui.genericapi.uiqueries; - -public enum UIQueryType { - - GetUserActionGroups, - Get64bitOsTypes, - GetLinuxOsTypes, - GetWindowsOsTypes; -} diff --git a/frontend/pom.xml b/frontend/pom.xml index 54b3845..065affd 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -13,7 +13,6 @@ <description>parent POM for all oVirt modules</description> <modules> <module>webadmin</module> - <module>api</module> <module>wars</module> </modules> <properties> -- To view, visit http://gerrit.ovirt.org/10244 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie64282709aad5854586e8dfb928076cb584f6711 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Asaf Shakarchi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
