Juan Hernandez has uploaded a new change for review. Change subject: codegen: Rename "codegen" package to "generator" ......................................................................
codegen: Rename "codegen" package to "generator" This is so that the Python SDK and the Java SDK generators use the same package name. Change-Id: Ie873234b128fcc5632e9192f252a4979df81d4ac 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/java/ApiCodegen.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/Main.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/RsdlCodegen.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/XsdCodegen.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/documentation/DocsGen.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/AbstractOverloadableTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ApiTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ApiTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionActionMethodTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionActionMethodTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionAddMethodTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionAddMethodTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionGetterTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionGetterTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionListMethodTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionListMethodTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CopyrightTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CopyrightTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/DeleteMethodTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/DeleteMethodTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/DeleteMethodWithBodyTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/DeleteMethodWithBodyTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/HeaderBuilderParameterTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/HeaderBuilderParameterTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ListMethodTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/MethodParameterTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/MethodParameterTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ResourceActionMethodTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ResourceActionMethodTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ResourceTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ResourceTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/RootResourceDynamicTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/RootResourceDynamicTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/RootResourceStaticTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/RootResourceStaticTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionAddMethodTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionAddMethodTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionGetterTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionGetterTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionListMethodTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionListMethodTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubResourceTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubResourceTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/UpdateMethodTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/UpdateMethodTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/UrlBuilderParameterTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/UrlBuilderParameterTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/VariableTemplate R generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/VariableTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/ClassUtils.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/FormatUtils.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/LinkUtils.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/StringUtils.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/TypeUtils.java R generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/UrlUtils.java R generator/src/main/java/org/ovirt/engine/sdk/generator/templates/AbstractTemplate.java R generator/src/main/java/org/ovirt/engine/sdk/generator/utils/Tree.java 68 files changed, 184 insertions(+), 186 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk-java refs/changes/26/38226/1 diff --git a/generator/pom.xml b/generator/pom.xml index ee0db0a..3b5d6df 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -178,7 +178,7 @@ <goal>java</goal> </goals> <configuration> - <mainClass>org.ovirt.engine.sdk.codegen.java.Main</mainClass> + <mainClass>org.ovirt.engine.sdk.generator.java.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/codegen/BrokerRules.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/BrokerRules.java similarity index 98% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/BrokerRules.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/BrokerRules.java index 51bf47a..0417552 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/BrokerRules.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/BrokerRules.java @@ -14,9 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen; +package org.ovirt.engine.sdk.generator; -import org.ovirt.engine.sdk.codegen.utils.Tree; +import org.ovirt.engine.sdk.generator.utils.Tree; import java.util.HashMap; import java.util.HashSet; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/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/codegen/Location.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/Location.java index 7daa2ff..7ca1b4e 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/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.codegen; +package org.ovirt.engine.sdk.generator; import org.ovirt.engine.sdk.entities.DetailedLink; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/LocationRules.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/LocationRules.java similarity index 97% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/LocationRules.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/LocationRules.java index 7be3b5b..88d2fb6 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/LocationRules.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/LocationRules.java @@ -14,9 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen; +package org.ovirt.engine.sdk.generator; -import org.ovirt.engine.sdk.codegen.utils.Tree; +import org.ovirt.engine.sdk.generator.utils.Tree; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/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/codegen/RsdlData.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/RsdlData.java index 3ba6a79..a59fd68 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/RsdlData.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/RsdlData.java @@ -14,9 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen; +package org.ovirt.engine.sdk.generator; -import org.ovirt.engine.sdk.codegen.utils.Tree; +import org.ovirt.engine.sdk.generator.utils.Tree; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.entities.RSDL; import org.ovirt.engine.sdk.entities.Response; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/SchemaRules.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/SchemaRules.java similarity index 95% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/SchemaRules.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/SchemaRules.java index 4a32b5d..444dea8 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/SchemaRules.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/SchemaRules.java @@ -14,9 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen; +package org.ovirt.engine.sdk.generator; -import org.ovirt.engine.sdk.codegen.utils.Tree; +import org.ovirt.engine.sdk.generator.utils.Tree; import org.ovirt.engine.sdk.entities.DetailedLink; /** diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/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/codegen/XsdData.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/XsdData.java index 6b4aee0..9ea5f17 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/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.codegen; +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/codegen/java/ApiCodegen.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/ApiCodegen.java similarity index 82% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/ApiCodegen.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/ApiCodegen.java index 1406611..ab9e1d4 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/ApiCodegen.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/ApiCodegen.java @@ -14,14 +14,14 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java; +package org.ovirt.engine.sdk.generator.java; import java.io.IOException; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.java.templates.ApiTemplate; -import org.ovirt.engine.sdk.codegen.java.utils.ClassUtils; -import org.ovirt.engine.sdk.codegen.utils.Tree; +import org.ovirt.engine.sdk.generator.Location; +import org.ovirt.engine.sdk.generator.java.templates.ApiTemplate; +import org.ovirt.engine.sdk.generator.java.utils.ClassUtils; +import org.ovirt.engine.sdk.generator.utils.Tree; /** * Provides SDK entry point codegen capabilities diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/Main.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/Main.java similarity index 94% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/Main.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/Main.java index b93e81a..f73d8d5 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/Main.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/Main.java @@ -14,15 +14,15 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java; +package org.ovirt.engine.sdk.generator.java; import java.io.File; import java.io.IOException; import javax.xml.bind.JAXBException; -import org.ovirt.engine.sdk.codegen.RsdlData; -import org.ovirt.engine.sdk.codegen.XsdData; +import org.ovirt.engine.sdk.generator.RsdlData; +import org.ovirt.engine.sdk.generator.XsdData; public class Main { private static final String DIST_PATH = "../sdk/src/main/java"; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/RsdlCodegen.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/RsdlCodegen.java similarity index 82% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/RsdlCodegen.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/RsdlCodegen.java index 23cc0cf..8fe4fbf 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/RsdlCodegen.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/RsdlCodegen.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java; +package org.ovirt.engine.sdk.generator.java; import java.io.IOException; import java.util.ArrayList; @@ -22,23 +22,23 @@ import java.util.List; import java.util.Map; -import org.ovirt.engine.sdk.codegen.BrokerRules; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.LocationRules; -import org.ovirt.engine.sdk.codegen.RsdlData; -import org.ovirt.engine.sdk.codegen.SchemaRules; -import org.ovirt.engine.sdk.codegen.java.templates.CollectionTemplate; -import org.ovirt.engine.sdk.codegen.java.templates.ResourceTemplate; -import org.ovirt.engine.sdk.codegen.java.templates.SubCollectionTemplate; -import org.ovirt.engine.sdk.codegen.java.templates.SubResourceTemplate; -import org.ovirt.engine.sdk.codegen.java.utils.ClassUtils; -import org.ovirt.engine.sdk.codegen.utils.Tree; +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.java.templates.CollectionTemplate; +import org.ovirt.engine.sdk.generator.java.templates.ResourceTemplate; +import org.ovirt.engine.sdk.generator.java.templates.SubCollectionTemplate; +import org.ovirt.engine.sdk.generator.java.templates.SubResourceTemplate; +import org.ovirt.engine.sdk.generator.java.utils.ClassUtils; +import org.ovirt.engine.sdk.generator.utils.Tree; import static java.util.stream.Collectors.toList; -import static org.ovirt.engine.sdk.codegen.LocationRules.isCollection; -import static org.ovirt.engine.sdk.codegen.LocationRules.isEntity; -import static org.ovirt.engine.sdk.codegen.LocationRules.isSubCollection; -import static org.ovirt.engine.sdk.codegen.LocationRules.isSubEntity; +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; /** * Provides RSDL related generator capabilities. diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/XsdCodegen.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/XsdCodegen.java similarity index 96% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/XsdCodegen.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/XsdCodegen.java index 953459b..354315c 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/XsdCodegen.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/XsdCodegen.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java; +package org.ovirt.engine.sdk.generator.java; import java.io.File; import java.io.IOException; @@ -24,8 +24,8 @@ import java.util.Map; import org.apache.commons.io.FileUtils; -import org.ovirt.engine.sdk.codegen.java.templates.CopyrightTemplate; -import org.ovirt.engine.sdk.codegen.java.utils.StringUtils; +import org.ovirt.engine.sdk.generator.java.templates.CopyrightTemplate; +import org.ovirt.engine.sdk.generator.java.utils.StringUtils; /** * Provides XSD schema related services diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/documentation/DocsGen.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/documentation/DocsGen.java similarity index 97% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/documentation/DocsGen.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/documentation/DocsGen.java index 40e5026..e29ec0c 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/documentation/DocsGen.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/documentation/DocsGen.java @@ -14,13 +14,13 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.documentation; +package org.ovirt.engine.sdk.generator.java.documentation; import java.util.List; -import org.ovirt.engine.sdk.codegen.java.utils.FormatUtils; -import org.ovirt.engine.sdk.codegen.java.utils.StringUtils; -import org.ovirt.engine.sdk.codegen.java.utils.UrlUtils; +import org.ovirt.engine.sdk.generator.java.utils.FormatUtils; +import org.ovirt.engine.sdk.generator.java.utils.StringUtils; +import org.ovirt.engine.sdk.generator.java.utils.UrlUtils; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.entities.Header; import org.ovirt.engine.sdk.entities.Parameter; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/AbstractOverloadableTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/AbstractOverloadableTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/AbstractOverloadableTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/AbstractOverloadableTemplate.java index a58a17b..7ec8701 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/AbstractOverloadableTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/AbstractOverloadableTemplate.java @@ -14,15 +14,15 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; import java.util.ArrayList; import java.util.List; -import org.ovirt.engine.sdk.codegen.java.utils.FormatUtils; -import org.ovirt.engine.sdk.codegen.java.utils.TypeUtils; -import org.ovirt.engine.sdk.codegen.java.utils.UrlUtils; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.java.utils.FormatUtils; +import org.ovirt.engine.sdk.generator.java.utils.TypeUtils; +import org.ovirt.engine.sdk.generator.java.utils.UrlUtils; +import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; import org.ovirt.engine.sdk.entities.Header; import org.ovirt.engine.sdk.entities.Parameter; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ApiTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ApiTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ApiTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ApiTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ApiTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ApiTemplate.java similarity index 91% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ApiTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ApiTemplate.java index 017e8bf..94bc615 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ApiTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ApiTemplate.java @@ -14,13 +14,13 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; -import org.ovirt.engine.sdk.codegen.BrokerRules; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.LocationRules; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; -import org.ovirt.engine.sdk.codegen.utils.Tree; +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.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.utils.Tree; import org.ovirt.engine.sdk.entities.API; import java.lang.reflect.Method; @@ -30,7 +30,7 @@ import java.util.Map; import java.util.Set; -import static org.ovirt.engine.sdk.codegen.java.utils.StringUtils.concatenateValues; +import static org.ovirt.engine.sdk.generator.java.utils.StringUtils.concatenateValues; public class ApiTemplate extends AbstractTemplate { public String evaluate(Tree<Location> root) { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionActionMethodTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionActionMethodTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionActionMethodTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionActionMethodTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionActionMethodTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionActionMethodTemplate.java similarity index 90% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionActionMethodTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionActionMethodTemplate.java index f08f499..c0fc972 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionActionMethodTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionActionMethodTemplate.java @@ -14,18 +14,18 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; import java.util.ArrayList; import java.util.List; -import org.ovirt.engine.sdk.codegen.java.documentation.DocsGen; -import org.ovirt.engine.sdk.codegen.BrokerRules; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.LocationRules; -import org.ovirt.engine.sdk.codegen.java.utils.LinkUtils; -import org.ovirt.engine.sdk.codegen.java.utils.StringUtils; -import org.ovirt.engine.sdk.codegen.utils.Tree; +import org.ovirt.engine.sdk.generator.java.documentation.DocsGen; +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.java.utils.LinkUtils; +import org.ovirt.engine.sdk.generator.java.utils.StringUtils; +import org.ovirt.engine.sdk.generator.utils.Tree; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.entities.Header; import org.ovirt.engine.sdk.entities.Parameter; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionAddMethodTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionAddMethodTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionAddMethodTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionAddMethodTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionAddMethodTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionAddMethodTemplate.java similarity index 89% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionAddMethodTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionAddMethodTemplate.java index 5e0b1c9..92e4990 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionAddMethodTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionAddMethodTemplate.java @@ -14,19 +14,19 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; import java.util.ArrayList; import java.util.List; -import org.ovirt.engine.sdk.codegen.java.documentation.DocsGen; -import org.ovirt.engine.sdk.codegen.BrokerRules; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.LocationRules; -import org.ovirt.engine.sdk.codegen.SchemaRules; -import org.ovirt.engine.sdk.codegen.java.utils.LinkUtils; -import org.ovirt.engine.sdk.codegen.java.utils.StringUtils; -import org.ovirt.engine.sdk.codegen.utils.Tree; +import org.ovirt.engine.sdk.generator.java.documentation.DocsGen; +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.java.utils.LinkUtils; +import org.ovirt.engine.sdk.generator.java.utils.StringUtils; +import org.ovirt.engine.sdk.generator.utils.Tree; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.entities.Header; import org.ovirt.engine.sdk.entities.Parameter; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionGetterTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionGetterTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionGetterTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionGetterTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionGetterTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionGetterTemplate.java similarity index 78% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionGetterTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionGetterTemplate.java index 2006786..150c904 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionGetterTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionGetterTemplate.java @@ -14,13 +14,13 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; -import org.ovirt.engine.sdk.codegen.BrokerRules; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.SchemaRules; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; -import org.ovirt.engine.sdk.codegen.utils.Tree; +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.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.utils.Tree; public class CollectionGetterTemplate extends AbstractTemplate { public String evaluate(Tree<Location> collectionTree) { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionListMethodTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionListMethodTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionListMethodTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionListMethodTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionListMethodTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionListMethodTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionListMethodTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionListMethodTemplate.java index 36d635f..26c63ac 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionListMethodTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionListMethodTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; public class CollectionListMethodTemplate extends ListMethodTemplate { } diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionTemplate.java similarity index 84% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionTemplate.java index 8664577..cf37739 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CollectionTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CollectionTemplate.java @@ -14,20 +14,20 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; -import org.ovirt.engine.sdk.codegen.BrokerRules; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.LocationRules; -import org.ovirt.engine.sdk.codegen.SchemaRules; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; -import org.ovirt.engine.sdk.codegen.utils.Tree; +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.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.utils.Tree; import org.ovirt.engine.sdk.entities.DetailedLink; import java.util.HashMap; import java.util.Map; -import static org.ovirt.engine.sdk.codegen.java.utils.StringUtils.concatenateValues; +import static org.ovirt.engine.sdk.generator.java.utils.StringUtils.concatenateValues; public class CollectionTemplate extends AbstractTemplate { public String evaluate(Tree<Location> collectionTree) { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CopyrightTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CopyrightTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CopyrightTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CopyrightTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CopyrightTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CopyrightTemplate.java similarity index 84% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CopyrightTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CopyrightTemplate.java index 52e449f..06873ac 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/CopyrightTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/CopyrightTemplate.java @@ -14,9 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; public class CopyrightTemplate extends AbstractTemplate { } diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/DeleteMethodTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/DeleteMethodTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/DeleteMethodTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/DeleteMethodTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/DeleteMethodTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/DeleteMethodTemplate.java similarity index 93% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/DeleteMethodTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/DeleteMethodTemplate.java index f9b7944..91ab547 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/DeleteMethodTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/DeleteMethodTemplate.java @@ -14,16 +14,16 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; import java.util.ArrayList; import java.util.List; -import org.ovirt.engine.sdk.codegen.java.documentation.DocsGen; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.java.utils.LinkUtils; -import org.ovirt.engine.sdk.codegen.java.utils.StringUtils; -import org.ovirt.engine.sdk.codegen.utils.Tree; +import org.ovirt.engine.sdk.generator.java.documentation.DocsGen; +import org.ovirt.engine.sdk.generator.Location; +import org.ovirt.engine.sdk.generator.java.utils.LinkUtils; +import org.ovirt.engine.sdk.generator.java.utils.StringUtils; +import org.ovirt.engine.sdk.generator.utils.Tree; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.entities.Header; import org.ovirt.engine.sdk.entities.Parameter; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/DeleteMethodWithBodyTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/DeleteMethodWithBodyTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/DeleteMethodWithBodyTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/DeleteMethodWithBodyTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/DeleteMethodWithBodyTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/DeleteMethodWithBodyTemplate.java similarity index 93% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/DeleteMethodWithBodyTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/DeleteMethodWithBodyTemplate.java index 1c7833b..f15643a 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/DeleteMethodWithBodyTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/DeleteMethodWithBodyTemplate.java @@ -14,14 +14,14 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; import java.util.ArrayList; import java.util.List; -import org.ovirt.engine.sdk.codegen.java.documentation.DocsGen; -import org.ovirt.engine.sdk.codegen.java.utils.LinkUtils; -import org.ovirt.engine.sdk.codegen.java.utils.StringUtils; +import org.ovirt.engine.sdk.generator.java.documentation.DocsGen; +import org.ovirt.engine.sdk.generator.java.utils.LinkUtils; +import org.ovirt.engine.sdk.generator.java.utils.StringUtils; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.entities.Header; import org.ovirt.engine.sdk.entities.Parameter; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/HeaderBuilderParameterTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/HeaderBuilderParameterTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/HeaderBuilderParameterTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/HeaderBuilderParameterTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/HeaderBuilderParameterTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/HeaderBuilderParameterTemplate.java similarity index 87% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/HeaderBuilderParameterTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/HeaderBuilderParameterTemplate.java index 900e105..f4e0885 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/HeaderBuilderParameterTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/HeaderBuilderParameterTemplate.java @@ -14,9 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; public class HeaderBuilderParameterTemplate extends AbstractTemplate { public String evaluate(String realUrlParamName, String headerParamName) { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ListMethodTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ListMethodTemplate.java similarity index 88% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ListMethodTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ListMethodTemplate.java index c2f15b1..7754a15 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ListMethodTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ListMethodTemplate.java @@ -14,19 +14,19 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; import java.util.ArrayList; import java.util.List; -import org.ovirt.engine.sdk.codegen.java.documentation.DocsGen; -import org.ovirt.engine.sdk.codegen.BrokerRules; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.LocationRules; -import org.ovirt.engine.sdk.codegen.SchemaRules; -import org.ovirt.engine.sdk.codegen.java.utils.LinkUtils; -import org.ovirt.engine.sdk.codegen.java.utils.StringUtils; -import org.ovirt.engine.sdk.codegen.utils.Tree; +import org.ovirt.engine.sdk.generator.java.documentation.DocsGen; +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.java.utils.LinkUtils; +import org.ovirt.engine.sdk.generator.java.utils.StringUtils; +import org.ovirt.engine.sdk.generator.utils.Tree; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.entities.Header; import org.ovirt.engine.sdk.entities.Parameter; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/MethodParameterTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/MethodParameterTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/MethodParameterTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/MethodParameterTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/MethodParameterTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/MethodParameterTemplate.java similarity index 88% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/MethodParameterTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/MethodParameterTemplate.java index efbf18d..e51eba9 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/MethodParameterTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/MethodParameterTemplate.java @@ -14,9 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; /** * Template to generate the declaration of a method parameter given its type and its name. diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ResourceActionMethodTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ResourceActionMethodTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ResourceActionMethodTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ResourceActionMethodTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ResourceActionMethodTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ResourceActionMethodTemplate.java similarity index 90% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ResourceActionMethodTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ResourceActionMethodTemplate.java index 959c58f..ffe19c5 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ResourceActionMethodTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ResourceActionMethodTemplate.java @@ -14,18 +14,18 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; import java.util.ArrayList; import java.util.List; -import org.ovirt.engine.sdk.codegen.java.documentation.DocsGen; -import org.ovirt.engine.sdk.codegen.BrokerRules; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.LocationRules; -import org.ovirt.engine.sdk.codegen.java.utils.LinkUtils; -import org.ovirt.engine.sdk.codegen.java.utils.StringUtils; -import org.ovirt.engine.sdk.codegen.utils.Tree; +import org.ovirt.engine.sdk.generator.java.documentation.DocsGen; +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.java.utils.LinkUtils; +import org.ovirt.engine.sdk.generator.java.utils.StringUtils; +import org.ovirt.engine.sdk.generator.utils.Tree; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.entities.Header; import org.ovirt.engine.sdk.entities.Parameter; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ResourceTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ResourceTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ResourceTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ResourceTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ResourceTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ResourceTemplate.java similarity index 88% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ResourceTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ResourceTemplate.java index a94f883..748512c 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/ResourceTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/ResourceTemplate.java @@ -14,21 +14,21 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; -import org.ovirt.engine.sdk.codegen.BrokerRules; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.LocationRules; -import org.ovirt.engine.sdk.codegen.SchemaRules; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; -import org.ovirt.engine.sdk.codegen.utils.Tree; +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.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.utils.Tree; import org.ovirt.engine.sdk.entities.DetailedLink; import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.ovirt.engine.sdk.codegen.java.utils.StringUtils.concatenateValues; +import static org.ovirt.engine.sdk.generator.java.utils.StringUtils.concatenateValues; public class ResourceTemplate extends AbstractTemplate { public String evaluate(Tree<Location> entityTree) { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/RootResourceDynamicTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/RootResourceDynamicTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/RootResourceDynamicTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/RootResourceDynamicTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/RootResourceDynamicTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/RootResourceDynamicTemplate.java similarity index 88% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/RootResourceDynamicTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/RootResourceDynamicTemplate.java index 710a6e1..2cb70b3 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/RootResourceDynamicTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/RootResourceDynamicTemplate.java @@ -14,9 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; import java.lang.reflect.Method; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/RootResourceStaticTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/RootResourceStaticTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/RootResourceStaticTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/RootResourceStaticTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/RootResourceStaticTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/RootResourceStaticTemplate.java similarity index 88% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/RootResourceStaticTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/RootResourceStaticTemplate.java index 614feb0..dbd4fa1 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/RootResourceStaticTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/RootResourceStaticTemplate.java @@ -14,9 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; import java.lang.reflect.Method; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionAddMethodTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionAddMethodTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionAddMethodTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionAddMethodTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionAddMethodTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionAddMethodTemplate.java similarity index 89% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionAddMethodTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionAddMethodTemplate.java index b8e37c9..73c8412 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionAddMethodTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionAddMethodTemplate.java @@ -14,19 +14,19 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; import java.util.ArrayList; import java.util.List; -import org.ovirt.engine.sdk.codegen.java.documentation.DocsGen; -import org.ovirt.engine.sdk.codegen.BrokerRules; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.LocationRules; -import org.ovirt.engine.sdk.codegen.SchemaRules; -import org.ovirt.engine.sdk.codegen.java.utils.LinkUtils; -import org.ovirt.engine.sdk.codegen.java.utils.StringUtils; -import org.ovirt.engine.sdk.codegen.utils.Tree; +import org.ovirt.engine.sdk.generator.java.documentation.DocsGen; +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.java.utils.LinkUtils; +import org.ovirt.engine.sdk.generator.java.utils.StringUtils; +import org.ovirt.engine.sdk.generator.utils.Tree; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.entities.Header; import org.ovirt.engine.sdk.entities.Parameter; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionGetterTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionGetterTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionGetterTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionGetterTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionGetterTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionGetterTemplate.java similarity index 78% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionGetterTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionGetterTemplate.java index 57a2925..fa9db10 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionGetterTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionGetterTemplate.java @@ -14,13 +14,13 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; -import org.ovirt.engine.sdk.codegen.BrokerRules; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.SchemaRules; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; -import org.ovirt.engine.sdk.codegen.utils.Tree; +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.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.utils.Tree; public class SubCollectionGetterTemplate extends AbstractTemplate { public String evaluate(Tree<Location> collectionTree) { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionListMethodTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionListMethodTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionListMethodTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionListMethodTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionListMethodTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionListMethodTemplate.java similarity index 92% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionListMethodTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionListMethodTemplate.java index 89b41dd..b10f8d7 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionListMethodTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionListMethodTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; public class SubCollectionListMethodTemplate extends ListMethodTemplate { } diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionTemplate.java similarity index 87% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionTemplate.java index d80f01e..2dae1a4 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubCollectionTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubCollectionTemplate.java @@ -14,20 +14,20 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; -import org.ovirt.engine.sdk.codegen.BrokerRules; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.LocationRules; -import org.ovirt.engine.sdk.codegen.SchemaRules; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; -import org.ovirt.engine.sdk.codegen.utils.Tree; +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.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.utils.Tree; import org.ovirt.engine.sdk.entities.DetailedLink; import java.util.HashMap; import java.util.Map; -import static org.ovirt.engine.sdk.codegen.java.utils.StringUtils.concatenateValues; +import static org.ovirt.engine.sdk.generator.java.utils.StringUtils.concatenateValues; public class SubCollectionTemplate extends AbstractTemplate { public String evaluate(Tree<Location> collectionTree) { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubResourceTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubResourceTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubResourceTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubResourceTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubResourceTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubResourceTemplate.java similarity index 88% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubResourceTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubResourceTemplate.java index 235f81c..ed0be99 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/SubResourceTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/SubResourceTemplate.java @@ -14,21 +14,21 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; -import org.ovirt.engine.sdk.codegen.BrokerRules; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.LocationRules; -import org.ovirt.engine.sdk.codegen.SchemaRules; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; -import org.ovirt.engine.sdk.codegen.utils.Tree; +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.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.utils.Tree; import org.ovirt.engine.sdk.entities.DetailedLink; import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.ovirt.engine.sdk.codegen.java.utils.StringUtils.concatenateValues; +import static org.ovirt.engine.sdk.generator.java.utils.StringUtils.concatenateValues; public class SubResourceTemplate extends AbstractTemplate { public String evaluate(Tree<Location> entityTree) { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/UpdateMethodTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/UpdateMethodTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/UpdateMethodTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/UpdateMethodTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/UpdateMethodTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/UpdateMethodTemplate.java similarity index 90% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/UpdateMethodTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/UpdateMethodTemplate.java index dd760b7..7746687 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/UpdateMethodTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/UpdateMethodTemplate.java @@ -14,18 +14,18 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; import java.util.ArrayList; import java.util.List; -import org.ovirt.engine.sdk.codegen.java.documentation.DocsGen; -import org.ovirt.engine.sdk.codegen.BrokerRules; -import org.ovirt.engine.sdk.codegen.Location; -import org.ovirt.engine.sdk.codegen.SchemaRules; -import org.ovirt.engine.sdk.codegen.java.utils.LinkUtils; -import org.ovirt.engine.sdk.codegen.java.utils.StringUtils; -import org.ovirt.engine.sdk.codegen.utils.Tree; +import org.ovirt.engine.sdk.generator.java.documentation.DocsGen; +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.java.utils.LinkUtils; +import org.ovirt.engine.sdk.generator.java.utils.StringUtils; +import org.ovirt.engine.sdk.generator.utils.Tree; import org.ovirt.engine.sdk.entities.DetailedLink; import org.ovirt.engine.sdk.entities.Header; import org.ovirt.engine.sdk.entities.Parameter; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/UrlBuilderParameterTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/UrlBuilderParameterTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/UrlBuilderParameterTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/UrlBuilderParameterTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/UrlBuilderParameterTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/UrlBuilderParameterTemplate.java similarity index 88% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/UrlBuilderParameterTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/UrlBuilderParameterTemplate.java index 5ecd8f5..ef92fa0 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/UrlBuilderParameterTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/UrlBuilderParameterTemplate.java @@ -14,9 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; public class UrlBuilderParameterTemplate extends AbstractTemplate { public String evaluate(String realUrlParamName, String urlParamName, String urlParamType) { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/VariableTemplate b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/VariableTemplate similarity index 100% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/VariableTemplate rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/VariableTemplate diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/VariableTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/VariableTemplate.java similarity index 86% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/VariableTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/VariableTemplate.java index e6a33da..8172122 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/templates/VariableTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/templates/VariableTemplate.java @@ -14,9 +14,9 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.templates; +package org.ovirt.engine.sdk.generator.java.templates; -import org.ovirt.engine.sdk.codegen.templates.AbstractTemplate; +import org.ovirt.engine.sdk.generator.templates.AbstractTemplate; public class VariableTemplate extends AbstractTemplate { public String evaluate(String type, String name) { diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/ClassUtils.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/ClassUtils.java similarity index 93% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/ClassUtils.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/ClassUtils.java index df151e1..b8aca62 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/ClassUtils.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/ClassUtils.java @@ -14,10 +14,10 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.utils; +package org.ovirt.engine.sdk.generator.java.utils; import org.apache.commons.io.FileUtils; -import org.ovirt.engine.sdk.codegen.java.templates.CopyrightTemplate; +import org.ovirt.engine.sdk.generator.java.templates.CopyrightTemplate; import java.io.File; import java.io.IOException; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/FormatUtils.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/FormatUtils.java similarity index 97% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/FormatUtils.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/FormatUtils.java index 11f0efd..92dc0da 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/FormatUtils.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/FormatUtils.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.utils; +package org.ovirt.engine.sdk.generator.java.utils; /** * Provides format related services diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/LinkUtils.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/LinkUtils.java similarity index 97% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/LinkUtils.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/LinkUtils.java index 6680aff..5c8ce96 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/LinkUtils.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/LinkUtils.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.utils; +package org.ovirt.engine.sdk.generator.java.utils; import java.util.ArrayList; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/StringUtils.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/StringUtils.java similarity index 98% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/StringUtils.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/StringUtils.java index a29b454..cb37256 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/StringUtils.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/StringUtils.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.utils; +package org.ovirt.engine.sdk.generator.java.utils; import java.util.ArrayList; import java.util.Collection; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/TypeUtils.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/TypeUtils.java similarity index 96% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/TypeUtils.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/TypeUtils.java index 05930f5..a243716 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/TypeUtils.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/TypeUtils.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.utils; +package org.ovirt.engine.sdk.generator.java.utils; /** * Provides type related services diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/UrlUtils.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/UrlUtils.java similarity index 93% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/UrlUtils.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/UrlUtils.java index 062d1e9..29f8899 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/java/utils/UrlUtils.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/java/utils/UrlUtils.java @@ -14,9 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.java.utils; - -import org.ovirt.engine.sdk.codegen.java.utils.FormatUtils; +package org.ovirt.engine.sdk.generator.java.utils; /** * Provides URL related services diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/templates/AbstractTemplate.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/templates/AbstractTemplate.java similarity index 98% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/templates/AbstractTemplate.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/templates/AbstractTemplate.java index 36ca3f1..c93c651 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/templates/AbstractTemplate.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/templates/AbstractTemplate.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.templates; +package org.ovirt.engine.sdk.generator.templates; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/generator/src/main/java/org/ovirt/engine/sdk/codegen/utils/Tree.java b/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/Tree.java similarity index 99% rename from generator/src/main/java/org/ovirt/engine/sdk/codegen/utils/Tree.java rename to generator/src/main/java/org/ovirt/engine/sdk/generator/utils/Tree.java index 00b32bc..fbaee79 100644 --- a/generator/src/main/java/org/ovirt/engine/sdk/codegen/utils/Tree.java +++ b/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/Tree.java @@ -14,7 +14,7 @@ // limitations under the License. // -package org.ovirt.engine.sdk.codegen.utils; +package org.ovirt.engine.sdk.generator.utils; import java.util.ArrayList; import java.util.LinkedList; -- To view, visit https://gerrit.ovirt.org/38226 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie873234b128fcc5632e9192f252a4979df81d4ac Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk-java Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
