Juan Hernandez has uploaded a new change for review. Change subject: codegen: Move Python specific code to its own package ......................................................................
codegen: Move Python specific code to its own package This patch creates a new "python" package and moves all the classes that are specific to the Python code generation into it. Change-Id: Ie8c433255f861905998ac3bbd74009642583ffc6 Signed-off-by: Juan Hernandez <[email protected]> --- M generator/pom.xml R generator/src/main/java/org/ovirt/engine/sdk/generator/BrokerRules.java R generator/src/main/java/org/ovirt/engine/sdk/generator/Location.java R generator/src/main/java/org/ovirt/engine/sdk/generator/LocationRules.java R generator/src/main/java/org/ovirt/engine/sdk/generator/RsdlData.java R generator/src/main/java/org/ovirt/engine/sdk/generator/SchemaRules.java R generator/src/main/java/org/ovirt/engine/sdk/generator/XsdData.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/Action.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/CodeHolder.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/Collection.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/CollectionExceptions.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/Documentation.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/EntryPoint.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/Import.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/Main.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/Resource.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/RsdlCodegen.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/SubCollection.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/SubResource.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/XsdCodegen.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/BrokersImportsTemplate C generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/BrokersImportsTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionAddTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionAddTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetCapabilitiesTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetCapabilitiesTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetDisksTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetDisksTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetNotSearchableTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetNotSearchableTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetSearchableTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetSearchableTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListCapabilitiesTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListCapabilitiesTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListNotSearchableTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListNotSearchableTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListSearchableTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListSearchableTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CopyrightTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CopyrightTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointDynamicMethodTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointDynamicMethodTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointHeadTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointHeadTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointMethodsTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointMethodsTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointStaticMethodTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointStaticMethodTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/FindRootClassTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/FindRootClassTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ParamsImportsTemplate C generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ParamsImportsTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceActionTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceActionTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithBodyAndParamsTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithBodyAndParamsTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithBodyTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithBodyTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithParamsTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithParamsTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceUpdateTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceUpdateTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionAddTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionAddTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionGetTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionGetTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionListTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionListTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionListWithParamsTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionListWithParamsTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithBodyTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithBodyTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithUrlParamsAndBodyTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithUrlParamsAndBodyTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithUrlParamsTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithUrlParamsTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceUpdateTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceUpdateTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SuperAttributesTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SuperAttributesTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/HeaderUtils.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/ParamUtils.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/ParamsContainer.java R generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/UrlUtils.java D generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ImportsTemplate.java D generator/src/main/java/org/ovirt/engine/sdk/generator/utils/CollectionsUtils.java D generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/ImportsTemplate.java 101 files changed, 176 insertions(+), 239 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk refs/changes/27/38227/1 diff --git a/generator/pom.xml b/generator/pom.xml index 865e4f0..fd46c97 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -164,7 +164,7 @@ <goal>java</goal> </goals> <configuration> - <mainClass>org.ovirt.engine.sdk.generator.Main</mainClass> + <mainClass>org.ovirt.engine.sdk.generator.python.Main</mainClass> <arguments> <argument>--xsd</argument> <argument>${basedir}/src/main/resources/api.xsd</argument> diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/BrokerRules.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/BrokerRules.java similarity index 99% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/BrokerRules.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/BrokerRules.java index 886e732..e0306a3 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/BrokerRules.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/BrokerRules.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator; import org.ovirt.engine.sdk.generator.utils.Tree; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Location.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/Location.java similarity index 97% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Location.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/Location.java index 6d222a2..7ca1b4e 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Location.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/Location.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator; import org.ovirt.engine.sdk.entities.DetailedLink; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/LocationRules.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/LocationRules.java similarity index 98% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/LocationRules.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/LocationRules.java index f0ed62b..88d2fb6 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/LocationRules.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/LocationRules.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator; import org.ovirt.engine.sdk.generator.utils.Tree; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/RsdlData.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/RsdlData.java similarity index 98% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/RsdlData.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/RsdlData.java index a5e1c6c..4c9036f 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/RsdlData.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/RsdlData.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.entities.RSDL; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/SchemaRules.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/SchemaRules.java similarity index 96% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/SchemaRules.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/SchemaRules.java index 887d414..5550bfd 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/SchemaRules.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/SchemaRules.java @@ -14,11 +14,10 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.generator.utils.Tree; -import org.ovirt.engine.sdk.generator.xsd.XsdData; /** * This class contains methods that implement various rules and calculations associated with the XML schema. diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/XsdData.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/XsdData.java similarity index 99% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/XsdData.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/XsdData.java index 0f8da22..49fb1f3 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/XsdData.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/XsdData.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.xsd; +package org.ovirt.engine.sdk.generator; import java.io.File; import java.io.IOException; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Action.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Action.java similarity index 86% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Action.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/Action.java index dd6e83f..b97acad 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Action.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Action.java @@ -14,14 +14,15 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator.python; import org.ovirt.engine.sdk.entities.DetailedLink; -import org.ovirt.engine.sdk.generator.rsdl.templates.ResourceActionTemplate; +import org.ovirt.engine.sdk.generator.Location; +import org.ovirt.engine.sdk.generator.python.templates.ResourceActionTemplate; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; -import org.ovirt.engine.sdk.generator.utils.HeaderUtils; +import org.ovirt.engine.sdk.generator.python.utils.HeaderUtils; import org.ovirt.engine.sdk.generator.utils.Tree; -import org.ovirt.engine.sdk.generator.utils.UrlUtils; +import org.ovirt.engine.sdk.generator.python.utils.UrlUtils; public class Action { public static String action(Tree<Location> destinationTree, DetailedLink link, String entityName, String actionName) { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/CodeHolder.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/CodeHolder.java similarity index 97% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/CodeHolder.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/CodeHolder.java index 539318a..bcfa63d 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/CodeHolder.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/CodeHolder.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator.python; import java.util.LinkedHashMap; import java.util.Map; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Collection.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Collection.java similarity index 88% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Collection.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/Collection.java index 9a4b19e..67e982e 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Collection.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Collection.java @@ -14,21 +14,25 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator.python; import java.util.LinkedHashMap; import java.util.Map; -import org.ovirt.engine.sdk.generator.rsdl.templates.CollectionAddTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.CollectionGetNotSearchableTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.CollectionGetSearchableTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.CollectionListNotSearchableTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.CollectionListSearchableTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.CollectionTemplate; +import org.ovirt.engine.sdk.generator.BrokerRules; +import org.ovirt.engine.sdk.generator.Location; +import org.ovirt.engine.sdk.generator.LocationRules; +import org.ovirt.engine.sdk.generator.SchemaRules; +import org.ovirt.engine.sdk.generator.python.templates.CollectionAddTemplate; +import org.ovirt.engine.sdk.generator.python.templates.CollectionGetNotSearchableTemplate; +import org.ovirt.engine.sdk.generator.python.templates.CollectionGetSearchableTemplate; +import org.ovirt.engine.sdk.generator.python.templates.CollectionListNotSearchableTemplate; +import org.ovirt.engine.sdk.generator.python.templates.CollectionListSearchableTemplate; +import org.ovirt.engine.sdk.generator.python.templates.CollectionTemplate; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; -import org.ovirt.engine.sdk.generator.utils.HeaderUtils; -import org.ovirt.engine.sdk.generator.utils.ParamUtils; -import org.ovirt.engine.sdk.generator.utils.ParamsContainer; +import org.ovirt.engine.sdk.generator.python.utils.HeaderUtils; +import org.ovirt.engine.sdk.generator.python.utils.ParamUtils; +import org.ovirt.engine.sdk.generator.python.utils.ParamsContainer; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.generator.utils.Tree; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/CollectionExceptions.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/CollectionExceptions.java similarity index 88% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/CollectionExceptions.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/CollectionExceptions.java index d7f522b..4dd7a5a 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/CollectionExceptions.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/CollectionExceptions.java @@ -14,14 +14,14 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator.python; import java.util.LinkedHashMap; import java.util.Map; -import org.ovirt.engine.sdk.generator.rsdl.templates.CollectionGetCapabilitiesTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.CollectionGetDisksTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.CollectionListCapabilitiesTemplate; +import org.ovirt.engine.sdk.generator.python.templates.CollectionGetCapabilitiesTemplate; +import org.ovirt.engine.sdk.generator.python.templates.CollectionGetDisksTemplate; +import org.ovirt.engine.sdk.generator.python.templates.CollectionListCapabilitiesTemplate; import org.ovirt.engine.sdk.entities.DetailedLink; public class CollectionExceptions { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Documentation.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Documentation.java similarity index 98% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Documentation.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/Documentation.java index 1669595..22cd222 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Documentation.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Documentation.java @@ -14,10 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator.python; -import static org.ovirt.engine.sdk.generator.utils.CollectionsUtils.setOf; - +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; @@ -31,10 +30,12 @@ private static final String DOC_OFFSET = " "; private static final String OVERLOAD_TEMPLATE = "Overload"; - private static final Set<String> HEADERS_EXCLUDE = setOf( - "Content-Type", - "Filter" - ); + private static final Set<String> HEADERS_EXCLUDE = new HashSet<>(); + + static { + HEADERS_EXCLUDE.add("Content-Type"); + HEADERS_EXCLUDE.add("Filter"); + } public static String document(DetailedLink link) { return document(link, new LinkedHashMap<>(), new LinkedHashMap<>()); diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/EntryPoint.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/EntryPoint.java similarity index 89% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/EntryPoint.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/EntryPoint.java index 3bceeca..22c665d 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/EntryPoint.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/EntryPoint.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator.python; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -23,11 +23,11 @@ import java.util.List; import java.util.Set; -import org.ovirt.engine.sdk.generator.rsdl.templates.EntryPointDynamicMethodTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.EntryPointHeadTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.EntryPointMethodsTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.EntryPointStaticMethodTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.EntryPointTemplate; +import org.ovirt.engine.sdk.generator.python.templates.EntryPointDynamicMethodTemplate; +import org.ovirt.engine.sdk.generator.python.templates.EntryPointHeadTemplate; +import org.ovirt.engine.sdk.generator.python.templates.EntryPointMethodsTemplate; +import org.ovirt.engine.sdk.generator.python.templates.EntryPointStaticMethodTemplate; +import org.ovirt.engine.sdk.generator.python.templates.EntryPointTemplate; public class EntryPoint { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Import.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Import.java similarity index 79% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Import.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/Import.java index 3c8c50e..5a9ce36 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Import.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Import.java @@ -14,18 +14,18 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator.python; + +import org.ovirt.engine.sdk.generator.python.templates.CopyrightTemplate; +import org.ovirt.engine.sdk.generator.python.templates.ParamsImportsTemplate; import java.text.SimpleDateFormat; import java.util.Date; -import org.ovirt.engine.sdk.generator.rsdl.templates.CopyrightTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.ImportsTemplate; - public class Import { public static String getImports() { String copyrightText = new CopyrightTemplate().evaluate(); - String importsText = new ImportsTemplate().evaluate(); + String importsText = new ParamsImportsTemplate().evaluate(); return copyrightText + "'''Generated at: " + diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/Main.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Main.java similarity index 87% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/Main.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/Main.java index b1ac289..74baa70 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/Main.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Main.java @@ -14,12 +14,10 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator; +package org.ovirt.engine.sdk.generator.python; -import org.ovirt.engine.sdk.generator.rsdl.RsdlCodegen; -import org.ovirt.engine.sdk.generator.rsdl.RsdlData; -import org.ovirt.engine.sdk.generator.xsd.XsdData; -import org.ovirt.engine.sdk.generator.xsd.XsdCodegen; +import org.ovirt.engine.sdk.generator.RsdlData; +import org.ovirt.engine.sdk.generator.XsdData; import java.io.File; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Resource.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Resource.java similarity index 86% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Resource.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/Resource.java index 40fd341..f4335c2 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/Resource.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/Resource.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator.python; import java.util.ArrayList; import java.util.Collections; @@ -22,15 +22,19 @@ import java.util.List; import java.util.Map; -import org.ovirt.engine.sdk.generator.rsdl.templates.ResourceDeleteTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.ResourceDeleteWithBodyAndParamsTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.ResourceDeleteWithBodyTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.ResourceDeleteWithParamsTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.ResourceTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.ResourceUpdateTemplate; +import org.ovirt.engine.sdk.generator.BrokerRules; +import org.ovirt.engine.sdk.generator.Location; +import org.ovirt.engine.sdk.generator.LocationRules; +import org.ovirt.engine.sdk.generator.SchemaRules; +import org.ovirt.engine.sdk.generator.python.templates.ResourceDeleteTemplate; +import org.ovirt.engine.sdk.generator.python.templates.ResourceDeleteWithBodyAndParamsTemplate; +import org.ovirt.engine.sdk.generator.python.templates.ResourceDeleteWithBodyTemplate; +import org.ovirt.engine.sdk.generator.python.templates.ResourceDeleteWithParamsTemplate; +import org.ovirt.engine.sdk.generator.python.templates.ResourceTemplate; +import org.ovirt.engine.sdk.generator.python.templates.ResourceUpdateTemplate; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; -import org.ovirt.engine.sdk.generator.utils.HeaderUtils; -import org.ovirt.engine.sdk.generator.utils.ParamUtils; +import org.ovirt.engine.sdk.generator.python.utils.HeaderUtils; +import org.ovirt.engine.sdk.generator.python.utils.ParamUtils; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.generator.utils.Tree; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/RsdlCodegen.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/RsdlCodegen.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/RsdlCodegen.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/RsdlCodegen.java index 076ebd4..8835fde 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/RsdlCodegen.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/RsdlCodegen.java @@ -14,19 +14,19 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator.python; -import static org.ovirt.engine.sdk.generator.rsdl.LocationRules.isAction; -import static org.ovirt.engine.sdk.generator.rsdl.LocationRules.isCollection; -import static org.ovirt.engine.sdk.generator.rsdl.LocationRules.isEntity; -import static org.ovirt.engine.sdk.generator.rsdl.LocationRules.isSubCollection; -import static org.ovirt.engine.sdk.generator.rsdl.LocationRules.isSubEntity; -import static org.ovirt.engine.sdk.generator.utils.CollectionsUtils.setOf; +import static org.ovirt.engine.sdk.generator.LocationRules.isAction; +import static org.ovirt.engine.sdk.generator.LocationRules.isCollection; +import static org.ovirt.engine.sdk.generator.LocationRules.isEntity; +import static org.ovirt.engine.sdk.generator.LocationRules.isSubCollection; +import static org.ovirt.engine.sdk.generator.LocationRules.isSubEntity; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -34,6 +34,11 @@ import org.apache.commons.io.FileUtils; import org.ovirt.engine.sdk.entities.DetailedLink; +import org.ovirt.engine.sdk.generator.BrokerRules; +import org.ovirt.engine.sdk.generator.Location; +import org.ovirt.engine.sdk.generator.LocationRules; +import org.ovirt.engine.sdk.generator.RsdlData; +import org.ovirt.engine.sdk.generator.SchemaRules; import org.ovirt.engine.sdk.generator.utils.Tree; /** @@ -46,10 +51,12 @@ private static final String SUB_COLLECTIONS_FIXME = " #SUB_COLLECTIONS"; // names that should not be used as method/s names - private static final Set<String> PRESERVED_NAMES = setOf( - "import", - "from" - ); + private static final Set<String> PRESERVED_NAMES = new HashSet<>(); + + static { + PRESERVED_NAMES.add("import"); + PRESERVED_NAMES.add("from"); + } /** * The keys of this map are the names of the broker types, and the content is the generated code. diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/SubCollection.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/SubCollection.java similarity index 89% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/SubCollection.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/SubCollection.java index a1978a2..896e7f8 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/SubCollection.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/SubCollection.java @@ -14,21 +14,25 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator.python; import java.util.LinkedHashMap; import java.util.Map; -import org.ovirt.engine.sdk.generator.rsdl.templates.SubCollectionAddTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.SubCollectionGetTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.SubCollectionListTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.SubCollectionListWithParamsTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.SubCollectionTemplate; +import org.ovirt.engine.sdk.generator.BrokerRules; +import org.ovirt.engine.sdk.generator.Location; +import org.ovirt.engine.sdk.generator.LocationRules; +import org.ovirt.engine.sdk.generator.SchemaRules; +import org.ovirt.engine.sdk.generator.python.templates.SubCollectionAddTemplate; +import org.ovirt.engine.sdk.generator.python.templates.SubCollectionGetTemplate; +import org.ovirt.engine.sdk.generator.python.templates.SubCollectionListTemplate; +import org.ovirt.engine.sdk.generator.python.templates.SubCollectionListWithParamsTemplate; +import org.ovirt.engine.sdk.generator.python.templates.SubCollectionTemplate; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; -import org.ovirt.engine.sdk.generator.utils.HeaderUtils; -import org.ovirt.engine.sdk.generator.utils.ParamUtils; +import org.ovirt.engine.sdk.generator.python.utils.HeaderUtils; +import org.ovirt.engine.sdk.generator.python.utils.ParamUtils; import org.ovirt.engine.sdk.generator.utils.Tree; -import org.ovirt.engine.sdk.generator.utils.UrlUtils; +import org.ovirt.engine.sdk.generator.python.utils.UrlUtils; import org.ovirt.engine.sdk.entities.DetailedLink; public class SubCollection { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/SubResource.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/SubResource.java similarity index 88% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/SubResource.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/SubResource.java index 4360718..c381e7d 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/SubResource.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/SubResource.java @@ -14,22 +14,25 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl; +package org.ovirt.engine.sdk.generator.python; import java.util.LinkedHashMap; import java.util.Map; -import org.ovirt.engine.sdk.generator.rsdl.templates.SubResourceDeleteTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.SubResourceDeleteWithBodyTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.SubResourceDeleteWithUrlParamsAndBodyTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.SubResourceDeleteWithUrlParamsTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.SubResourceTemplate; -import org.ovirt.engine.sdk.generator.rsdl.templates.SubResourceUpdateTemplate; +import org.ovirt.engine.sdk.generator.BrokerRules; +import org.ovirt.engine.sdk.generator.Location; +import org.ovirt.engine.sdk.generator.SchemaRules; +import org.ovirt.engine.sdk.generator.python.templates.SubResourceDeleteTemplate; +import org.ovirt.engine.sdk.generator.python.templates.SubResourceDeleteWithBodyTemplate; +import org.ovirt.engine.sdk.generator.python.templates.SubResourceDeleteWithUrlParamsAndBodyTemplate; +import org.ovirt.engine.sdk.generator.python.templates.SubResourceDeleteWithUrlParamsTemplate; +import org.ovirt.engine.sdk.generator.python.templates.SubResourceTemplate; +import org.ovirt.engine.sdk.generator.python.templates.SubResourceUpdateTemplate; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; -import org.ovirt.engine.sdk.generator.utils.HeaderUtils; -import org.ovirt.engine.sdk.generator.utils.ParamUtils; +import org.ovirt.engine.sdk.generator.python.utils.HeaderUtils; +import org.ovirt.engine.sdk.generator.python.utils.ParamUtils; import org.ovirt.engine.sdk.generator.utils.Tree; -import org.ovirt.engine.sdk.generator.utils.UrlUtils; +import org.ovirt.engine.sdk.generator.python.utils.UrlUtils; import org.ovirt.engine.sdk.entities.DetailedLink; public class SubResource { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/XsdCodegen.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/XsdCodegen.java similarity index 96% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/XsdCodegen.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/XsdCodegen.java index 15098aa..d7c1e33 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/XsdCodegen.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/XsdCodegen.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.xsd; +package org.ovirt.engine.sdk.generator.python; import java.io.BufferedReader; import java.io.File; @@ -29,10 +29,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.ovirt.engine.sdk.generator.XsdData; +import org.ovirt.engine.sdk.generator.python.templates.BrokersImportsTemplate; +import org.ovirt.engine.sdk.generator.python.templates.FindRootClassTemplate; +import org.ovirt.engine.sdk.generator.python.templates.SuperAttributesTemplate; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; -import org.ovirt.engine.sdk.generator.xsd.templates.FindRootClassTemplate; -import org.ovirt.engine.sdk.generator.xsd.templates.ImportsTemplate; -import org.ovirt.engine.sdk.generator.xsd.templates.SuperAttributesTemplate; public class XsdCodegen { private static final String XSD_PARAMS_FILE = "../src/ovirtsdk/xml/params.py"; @@ -117,7 +118,7 @@ } // Add the new imports: - String text = new ImportsTemplate().evaluate(); + String text = new BrokersImportsTemplate().evaluate(); String[] lines = text.split("\n"); addLines(index + 1, 0, lines); } diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/ImportsTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/BrokersImportsTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/ImportsTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/BrokersImportsTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/BrokersImportsTemplate.java similarity index 84% copy from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionTemplate.java copy to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/BrokersImportsTemplate.java index e71b66e..fdbab0b 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/BrokersImportsTemplate.java @@ -14,9 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; -public class SubCollectionTemplate extends AbstractTemplate { +public class BrokersImportsTemplate extends AbstractTemplate { } diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionAddTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionAddTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionAddTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionAddTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionAddTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionAddTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionAddTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionAddTemplate.java index 7794651..d145b18 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionAddTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionAddTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetCapabilitiesTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetCapabilitiesTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetCapabilitiesTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetCapabilitiesTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetCapabilitiesTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetCapabilitiesTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetCapabilitiesTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetCapabilitiesTemplate.java index d69056f..47e6594 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetCapabilitiesTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetCapabilitiesTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetDisksTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetDisksTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetDisksTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetDisksTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetDisksTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetDisksTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetDisksTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetDisksTemplate.java index 771ded8..9080805 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetDisksTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetDisksTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetNotSearchableTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetNotSearchableTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetNotSearchableTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetNotSearchableTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetNotSearchableTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetNotSearchableTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetNotSearchableTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetNotSearchableTemplate.java index bd097ae..75e287b 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetNotSearchableTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetNotSearchableTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetSearchableTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetSearchableTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetSearchableTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetSearchableTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetSearchableTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetSearchableTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetSearchableTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetSearchableTemplate.java index fddf21f..d7bdb16 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionGetSearchableTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionGetSearchableTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListCapabilitiesTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListCapabilitiesTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListCapabilitiesTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListCapabilitiesTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListCapabilitiesTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListCapabilitiesTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListCapabilitiesTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListCapabilitiesTemplate.java index e512f6f..a9f2609 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListCapabilitiesTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListCapabilitiesTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListNotSearchableTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListNotSearchableTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListNotSearchableTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListNotSearchableTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListNotSearchableTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListNotSearchableTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListNotSearchableTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListNotSearchableTemplate.java index 52c3909..84b1457 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListNotSearchableTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListNotSearchableTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListSearchableTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListSearchableTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListSearchableTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListSearchableTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListSearchableTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListSearchableTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListSearchableTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListSearchableTemplate.java index 028cddd..ee79e07 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionListSearchableTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionListSearchableTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionTemplate.java index 11a73e8..3ffdafb 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CollectionTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CollectionTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CopyrightTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CopyrightTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CopyrightTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CopyrightTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CopyrightTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CopyrightTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CopyrightTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CopyrightTemplate.java index 4597257..63da115 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/CopyrightTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/CopyrightTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointDynamicMethodTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointDynamicMethodTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointDynamicMethodTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointDynamicMethodTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointDynamicMethodTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointDynamicMethodTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointDynamicMethodTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointDynamicMethodTemplate.java index 9fe8f8e..fb79a7b 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointDynamicMethodTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointDynamicMethodTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointHeadTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointHeadTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointHeadTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointHeadTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointHeadTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointHeadTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointHeadTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointHeadTemplate.java index 18a925c..c27a5b7 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointHeadTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointHeadTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointMethodsTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointMethodsTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointMethodsTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointMethodsTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointMethodsTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointMethodsTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointMethodsTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointMethodsTemplate.java index 760f8a3..6d88b17 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointMethodsTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointMethodsTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointStaticMethodTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointStaticMethodTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointStaticMethodTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointStaticMethodTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointStaticMethodTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointStaticMethodTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointStaticMethodTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointStaticMethodTemplate.java index 7f55016..c55fa0a 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointStaticMethodTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointStaticMethodTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointTemplate.java index 9723300..12fc0b1 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/EntryPointTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/EntryPointTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/FindRootClassTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/FindRootClassTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/FindRootClassTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/FindRootClassTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/FindRootClassTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/FindRootClassTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/FindRootClassTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/FindRootClassTemplate.java index af71ba4..6555a6d 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/FindRootClassTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/FindRootClassTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.xsd.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ImportsTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ParamsImportsTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ImportsTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ParamsImportsTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ParamsImportsTemplate.java similarity index 84% copy from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionTemplate.java copy to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ParamsImportsTemplate.java index e71b66e..7ed7cd5 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ParamsImportsTemplate.java @@ -14,9 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; -public class SubCollectionTemplate extends AbstractTemplate { +public class ParamsImportsTemplate extends AbstractTemplate { } diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceActionTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceActionTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceActionTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceActionTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceActionTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceActionTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceActionTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceActionTemplate.java index 8c7d322..e76a66d 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceActionTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceActionTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteTemplate.java index c6e2630..15963ff 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithBodyAndParamsTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithBodyAndParamsTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithBodyAndParamsTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithBodyAndParamsTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithBodyAndParamsTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithBodyAndParamsTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithBodyAndParamsTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithBodyAndParamsTemplate.java index dc6b7df..e892911 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithBodyAndParamsTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithBodyAndParamsTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithBodyTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithBodyTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithBodyTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithBodyTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithBodyTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithBodyTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithBodyTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithBodyTemplate.java index f6eb7cf..6566e7d 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithBodyTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithBodyTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithParamsTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithParamsTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithParamsTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithParamsTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithParamsTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithParamsTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithParamsTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithParamsTemplate.java index 28a4c4c..de598c9 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceDeleteWithParamsTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceDeleteWithParamsTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceTemplate.java index 040ba6f..388b004 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceUpdateTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceUpdateTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceUpdateTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceUpdateTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceUpdateTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceUpdateTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceUpdateTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceUpdateTemplate.java index 2330048..ec129b6 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ResourceUpdateTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/ResourceUpdateTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionAddTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionAddTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionAddTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionAddTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionAddTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionAddTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionAddTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionAddTemplate.java index cfbfce0..01a96de 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionAddTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionAddTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionGetTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionGetTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionGetTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionGetTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionGetTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionGetTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionGetTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionGetTemplate.java index f6dd150..7a12c94 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionGetTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionGetTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionListTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionListTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionListTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionListTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionListTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionListTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionListTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionListTemplate.java index b06bb56..6336548 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionListTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionListTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionListWithParamsTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionListWithParamsTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionListWithParamsTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionListWithParamsTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionListWithParamsTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionListWithParamsTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionListWithParamsTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionListWithParamsTemplate.java index 948fa36..e1ffa54 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionListWithParamsTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionListWithParamsTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionTemplate.java index e71b66e..e597922 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubCollectionTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubCollectionTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteTemplate.java index d5a2cf3..5000eed 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithBodyTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithBodyTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithBodyTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithBodyTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithBodyTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithBodyTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithBodyTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithBodyTemplate.java index 37387f6..1d90125 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithBodyTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithBodyTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithUrlParamsAndBodyTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithUrlParamsAndBodyTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithUrlParamsAndBodyTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithUrlParamsAndBodyTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithUrlParamsAndBodyTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithUrlParamsAndBodyTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithUrlParamsAndBodyTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithUrlParamsAndBodyTemplate.java index ad42466..0816b53 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithUrlParamsAndBodyTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithUrlParamsAndBodyTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithUrlParamsTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithUrlParamsTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithUrlParamsTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithUrlParamsTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithUrlParamsTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithUrlParamsTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithUrlParamsTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithUrlParamsTemplate.java index 53a09dc..020da88 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceDeleteWithUrlParamsTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceDeleteWithUrlParamsTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceTemplate.java index be7d95c..682bb90 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceUpdateTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceUpdateTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceUpdateTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceUpdateTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceUpdateTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceUpdateTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceUpdateTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceUpdateTemplate.java index 347ab45..fc2c9e0 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/SubResourceUpdateTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SubResourceUpdateTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.rsdl.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/SuperAttributesTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SuperAttributesTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/SuperAttributesTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SuperAttributesTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/SuperAttributesTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SuperAttributesTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/SuperAttributesTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SuperAttributesTemplate.java index 282dcee..66f2913 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/SuperAttributesTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/templates/SuperAttributesTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.xsd.templates; +package org.ovirt.engine.sdk.generator.python.templates; import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/HeaderUtils.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/HeaderUtils.java similarity index 88% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/utils/HeaderUtils.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/HeaderUtils.java index f7f3f89..c30bb98 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/HeaderUtils.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/HeaderUtils.java @@ -14,20 +14,21 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.utils; +package org.ovirt.engine.sdk.generator.python.utils; -import static org.ovirt.engine.sdk.generator.utils.CollectionsUtils.setOf; - +import java.util.HashSet; import java.util.Set; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.entities.Header; public class HeaderUtils { - private static final Set<String> HEADERS_EXCLUDE = setOf( - "Content-Type", - "Filter" - ); + private static final Set<String> HEADERS_EXCLUDE = new HashSet<>(); + + static { + HEADERS_EXCLUDE.add("Content-Type"); + HEADERS_EXCLUDE.add("Filter"); + } public static String[] generateMethodParams(DetailedLink link) { String paramsStr = ""; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/ParamUtils.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/ParamUtils.java similarity index 94% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/utils/ParamUtils.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/ParamUtils.java index e3fba84..368fc03 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/ParamUtils.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/ParamUtils.java @@ -14,10 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.utils; +package org.ovirt.engine.sdk.generator.python.utils; -import static org.ovirt.engine.sdk.generator.utils.CollectionsUtils.setOf; - +import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Set; @@ -27,10 +26,12 @@ import org.ovirt.engine.sdk.entities.ParametersSet; public class ParamUtils { - private static final Set<String> PRESERVED_NAMES = setOf( - "import", - "from" - ); + private static final Set<String> PRESERVED_NAMES = new HashSet<>(); + + static { + PRESERVED_NAMES.add("import"); + PRESERVED_NAMES.add("from"); + } public static Object[] getMethodParamsByUrlParamsMeta(DetailedLink link) { String methodParameters = ""; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/ParamsContainer.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/ParamsContainer.java similarity index 88% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/utils/ParamsContainer.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/ParamsContainer.java index 4ffdf92..4459179 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/ParamsContainer.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/ParamsContainer.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.sdk.generator.utils; +package org.ovirt.engine.sdk.generator.python.utils; public class ParamsContainer { public static final String NAME_SEARCH_PARAM = "name: string (the name of the entity)"; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/UrlUtils.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/UrlUtils.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/generator/utils/UrlUtils.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/UrlUtils.java index 55213a9..56fb501 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/UrlUtils.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/python/utils/UrlUtils.java @@ -14,14 +14,15 @@ // limitations under the License. // -package org.ovirt.engine.sdk.generator.utils; +package org.ovirt.engine.sdk.generator.python.utils; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.ovirt.engine.sdk.generator.rsdl.Location; -import org.ovirt.engine.sdk.generator.rsdl.LocationRules; +import org.ovirt.engine.sdk.generator.Location; +import org.ovirt.engine.sdk.generator.LocationRules; +import org.ovirt.engine.sdk.generator.utils.Tree; import static java.util.stream.Collectors.toList; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ImportsTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ImportsTemplate.java deleted file mode 100644 index e9b0555..0000000 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/templates/ImportsTemplate.java +++ /dev/null @@ -1,22 +0,0 @@ -// -// Copyright (c) 2014 Red Hat, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -package org.ovirt.engine.sdk.generator.rsdl.templates; - -import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; - -public class ImportsTemplate extends AbstractTemplate { -} diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/CollectionsUtils.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/CollectionsUtils.java deleted file mode 100644 index d7814af..0000000 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/CollectionsUtils.java +++ /dev/null @@ -1,44 +0,0 @@ -// -// Copyright (c) 2014 Red Hat, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -package org.ovirt.engine.sdk.generator.utils; - -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; - -public class CollectionsUtils { - public static <T> Set<T> setOf(T... values) { - Set<T> set = new HashSet<>(); - for (T value : values) { - set.add(value); - } - return set; - } - - public static Map<String, String> mapOf(String... values) { - Map<String, String> map = new LinkedHashMap<>(); - for (int i = 0; i < values.length / 2; i++) { - int j = 2 * i; - String k = values[j]; - j++; - String v = j < values.length? values[j]: null; - map.put(k, v); - } - return map; - } -} diff --git a/generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/ImportsTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/ImportsTemplate.java deleted file mode 100644 index b910eb9..0000000 --- a/generator/src/main/java/org/ovirt/engine/sdk/generator/xsd/templates/ImportsTemplate.java +++ /dev/null @@ -1,22 +0,0 @@ -// -// Copyright (c) 2014 Red Hat, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -package org.ovirt.engine.sdk.generator.xsd.templates; - -import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; - -public class ImportsTemplate extends AbstractTemplate { -} -- To view, visit https://gerrit.ovirt.org/38227 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8c433255f861905998ac3bbd74009642583ffc6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
