From 907d2705c2c2308ec631c40e5bcc480129a224bc Mon Sep 17 00:00:00 2001 From: Martin Ciglan Date: Thu, 19 Jan 2017 13:43:01 +0100 Subject: [PATCH] Bug 1459-3 #5 - Re-organize mdsal-binding2-java-api-generator - refactor package name in mdsal-binding2-java-api-generator module - with changes at places of use Change-Id: Ibe3a2b1fe7cad4272087d9a6301f37419bbf38fe Signed-off-by: Martin Ciglan --- .../java/api/generator/BuilderGenerator.java | 6 ++-- .../java/api/generator/EnumGenerator.java | 6 ++-- .../java/api/generator/GeneratorJavaFile.java | 4 +-- .../api/generator/InterfaceGenerator.java | 6 ++-- .../java/api/generator/TOGenerator.java | 10 +++--- .../AbstractBigRangeGenerator.java | 4 +-- .../AbstractPrimitiveRangeGenerator.java | 4 +-- .../AbstractRangeGenerator.java | 4 +-- .../AbstractSubIntegerRangeGenerator.java | 4 +-- .../BigDecimalRangeGenerator.java | 4 +-- .../BigIntegerRangeGenerator.java | 4 +-- .../rangeGenerators/ByteRangeGenerator.java | 4 +-- .../IntegerRangeGenerator.java | 4 +-- .../rangeGenerators/LengthGenerator.java | 4 +-- .../rangeGenerators/LongRangeGenerator.java | 4 +-- .../rangeGenerators/ShortRangeGenerator.java | 4 +-- .../generator/rangeGenerators/TypeUtils.java | 4 +-- .../api/generator/renderers/BaseRenderer.java | 13 ++++---- .../generator/renderers/BuilderRenderer.java | 18 +++++------ .../generator/renderers/ClassRenderer.java | 22 ++++++------- .../api/generator/renderers/EnumRenderer.java | 10 +++--- .../renderers/InterfaceRenderer.java | 16 ++++------ .../renderers/UnionBuilderRenderer.java | 6 ++-- .../generator/renderers/UnionRenderer.java | 32 +++++++++---------- .../YangModuleInfoTemplateRenderer.java | 8 ++--- .../AlphabeticallyTypeMemberComparator.java | 4 +-- .../api/generator/util/TextTemplateUtil.java | 4 +-- ...builderConstructorHelperTemplate.scala.txt | 4 +-- .../api/generator}/builderTemplate.scala.txt | 26 +++++++-------- .../api/generator}/classTemplate.scala.txt | 12 +++---- .../classTemplateConstructors.scala.txt | 4 +-- .../classTemplateInitBlock.scala.txt | 0 .../classTemplateRestrictions.scala.txt | 8 ++--- .../classTemplateUnionConstr.scala.txt | 4 +-- .../api/generator}/enumTemplate.scala.txt | 6 ++-- .../generator}/interfaceTemplate.scala.txt | 4 +-- .../modelProviderTemplate.scala.txt | 0 .../generator}/unionBuilderTemplate.scala.txt | 8 ++--- .../api/generator}/unionTemplate.scala.txt | 6 ++-- .../yangModuleInfoTemplate.scala.txt | 6 ++-- 40 files changed, 149 insertions(+), 152 deletions(-) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/BuilderGenerator.java (90%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/EnumGenerator.java (86%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/GeneratorJavaFile.java (94%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/InterfaceGenerator.java (88%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/TOGenerator.java (80%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/rangeGenerators/AbstractBigRangeGenerator.java (95%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/rangeGenerators/AbstractPrimitiveRangeGenerator.java (96%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/rangeGenerators/AbstractRangeGenerator.java (96%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/rangeGenerators/AbstractSubIntegerRangeGenerator.java (84%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/rangeGenerators/BigDecimalRangeGenerator.java (91%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/rangeGenerators/BigIntegerRangeGenerator.java (89%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/rangeGenerators/ByteRangeGenerator.java (78%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/rangeGenerators/IntegerRangeGenerator.java (81%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/rangeGenerators/LengthGenerator.java (96%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/rangeGenerators/LongRangeGenerator.java (81%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/rangeGenerators/ShortRangeGenerator.java (78%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/rangeGenerators/TypeUtils.java (93%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/renderers/BaseRenderer.java (96%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/renderers/BuilderRenderer.java (94%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/renderers/ClassRenderer.java (93%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/renderers/EnumRenderer.java (78%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/renderers/InterfaceRenderer.java (90%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/renderers/UnionBuilderRenderer.java (85%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/renderers/UnionRenderer.java (85%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java (95%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/util/AlphabeticallyTypeMemberComparator.java (84%) rename binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/java/api/generator/util/TextTemplateUtil.java (99%) rename binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/{binding2 => binding/javav2/java/api/generator}/builderConstructorHelperTemplate.scala.txt (83%) rename binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/{binding2 => binding/javav2/java/api/generator}/builderTemplate.scala.txt (92%) rename binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/{binding2 => binding/javav2/java/api/generator}/classTemplate.scala.txt (92%) rename binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/{binding2 => binding/javav2/java/api/generator}/classTemplateConstructors.scala.txt (94%) rename binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/{binding2 => binding/javav2/java/api/generator}/classTemplateInitBlock.scala.txt (100%) rename binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/{binding2 => binding/javav2/java/api/generator}/classTemplateRestrictions.scala.txt (72%) rename binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/{binding2 => binding/javav2/java/api/generator}/classTemplateUnionConstr.scala.txt (82%) rename binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/{binding2 => binding/javav2/java/api/generator}/enumTemplate.scala.txt (85%) rename binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/{binding2 => binding/javav2/java/api/generator}/interfaceTemplate.scala.txt (82%) rename binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/{binding2 => binding/javav2/java/api/generator}/modelProviderTemplate.scala.txt (100%) rename binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/{binding2 => binding/javav2/java/api/generator}/unionBuilderTemplate.scala.txt (71%) rename binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/{binding2 => binding/javav2/java/api/generator}/unionTemplate.scala.txt (94%) rename binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/{binding2 => binding/javav2/java/api/generator}/yangModuleInfoTemplate.scala.txt (94%) diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/BuilderGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/BuilderGenerator.java similarity index 90% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/BuilderGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/BuilderGenerator.java index b70d9bcd40..d31bb59d0f 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/BuilderGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/BuilderGenerator.java @@ -1,15 +1,15 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator; +package org.opendaylight.mdsal.binding.javav2.java.api.generator; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding2.java.api.generator.renderers.BuilderRenderer; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers.BuilderRenderer; import org.opendaylight.mdsal.binding.javav2.model.api.CodeGenerator; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/EnumGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/EnumGenerator.java similarity index 86% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/EnumGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/EnumGenerator.java index 406d787193..87b2604278 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/EnumGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/EnumGenerator.java @@ -1,15 +1,15 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator; +package org.opendaylight.mdsal.binding.javav2.java.api.generator; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding2.java.api.generator.renderers.EnumRenderer; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers.EnumRenderer; import org.opendaylight.mdsal.binding.javav2.model.api.CodeGenerator; import org.opendaylight.mdsal.binding.javav2.model.api.Enumeration; import org.opendaylight.mdsal.binding.javav2.model.api.Type; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/GeneratorJavaFile.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFile.java similarity index 94% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/GeneratorJavaFile.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFile.java index 33f99cc6bb..1cf281b631 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/GeneratorJavaFile.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFile.java @@ -1,12 +1,12 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator; +package org.opendaylight.mdsal.binding.javav2.java.api.generator; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/InterfaceGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/InterfaceGenerator.java similarity index 88% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/InterfaceGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/InterfaceGenerator.java index 00b85d9b7f..12147fe10d 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/InterfaceGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/InterfaceGenerator.java @@ -1,15 +1,15 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator; +package org.opendaylight.mdsal.binding.javav2.java.api.generator; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding2.java.api.generator.renderers.InterfaceRenderer; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers.InterfaceRenderer; import org.opendaylight.mdsal.binding.javav2.model.api.CodeGenerator; import org.opendaylight.mdsal.binding.javav2.model.api.Enumeration; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/TOGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/TOGenerator.java similarity index 80% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/TOGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/TOGenerator.java index 5a6fe0d4de..11e71f1c5e 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/TOGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/TOGenerator.java @@ -1,17 +1,17 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator; +package org.opendaylight.mdsal.binding.javav2.java.api.generator; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding2.java.api.generator.renderers.ClassRenderer; -import org.opendaylight.mdsal.binding2.java.api.generator.renderers.UnionBuilderRenderer; -import org.opendaylight.mdsal.binding2.java.api.generator.renderers.UnionRenderer; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers.ClassRenderer; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers.UnionBuilderRenderer; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers.UnionRenderer; import org.opendaylight.mdsal.binding.javav2.model.api.CodeGenerator; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.javav2.model.api.Type; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/AbstractBigRangeGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractBigRangeGenerator.java similarity index 95% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/AbstractBigRangeGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractBigRangeGenerator.java index 0276bd57de..b091037743 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/AbstractBigRangeGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractBigRangeGenerator.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators; import com.google.common.collect.Range; import java.util.Collection; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/AbstractPrimitiveRangeGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractPrimitiveRangeGenerator.java similarity index 96% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/AbstractPrimitiveRangeGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractPrimitiveRangeGenerator.java index 419322d856..1f5448b0f9 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/AbstractPrimitiveRangeGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractPrimitiveRangeGenerator.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators; import com.google.common.base.Preconditions; import com.google.common.collect.Range; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/AbstractRangeGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractRangeGenerator.java similarity index 96% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/AbstractRangeGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractRangeGenerator.java index 57aadd36fd..586eb89682 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/AbstractRangeGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractRangeGenerator.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/AbstractSubIntegerRangeGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractSubIntegerRangeGenerator.java similarity index 84% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/AbstractSubIntegerRangeGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractSubIntegerRangeGenerator.java index 7455cabd02..8ea9513a69 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/AbstractSubIntegerRangeGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractSubIntegerRangeGenerator.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators; abstract class AbstractSubIntegerRangeGenerator> extends AbstractPrimitiveRangeGenerator { protected AbstractSubIntegerRangeGenerator(final Class typeClass, final String primitiveName, final T minValue, final T maxValue) { diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/BigDecimalRangeGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/BigDecimalRangeGenerator.java similarity index 91% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/BigDecimalRangeGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/BigDecimalRangeGenerator.java index 6906e56ec5..1f61feb24a 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/BigDecimalRangeGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/BigDecimalRangeGenerator.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/BigIntegerRangeGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/BigIntegerRangeGenerator.java similarity index 89% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/BigIntegerRangeGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/BigIntegerRangeGenerator.java index 8c8b238eb8..2935eae263 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/BigIntegerRangeGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/BigIntegerRangeGenerator.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators; import java.math.BigInteger; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/ByteRangeGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/ByteRangeGenerator.java similarity index 78% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/ByteRangeGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/ByteRangeGenerator.java index 26942f89e4..62779a8900 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/ByteRangeGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/ByteRangeGenerator.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators; final class ByteRangeGenerator extends AbstractSubIntegerRangeGenerator { ByteRangeGenerator() { diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/IntegerRangeGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/IntegerRangeGenerator.java similarity index 81% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/IntegerRangeGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/IntegerRangeGenerator.java index 54a50e27b9..c75dda5269 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/IntegerRangeGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/IntegerRangeGenerator.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators; final class IntegerRangeGenerator extends AbstractPrimitiveRangeGenerator { IntegerRangeGenerator() { diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/LengthGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/LengthGenerator.java similarity index 96% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/LengthGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/LengthGenerator.java index 66ef9e7ddd..576c415915 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/LengthGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/LengthGenerator.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators; import com.google.common.collect.Range; import java.math.BigInteger; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/LongRangeGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/LongRangeGenerator.java similarity index 81% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/LongRangeGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/LongRangeGenerator.java index 9c23c1b391..767f94c8e9 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/LongRangeGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/LongRangeGenerator.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators; final class LongRangeGenerator extends AbstractPrimitiveRangeGenerator { diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/ShortRangeGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/ShortRangeGenerator.java similarity index 78% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/ShortRangeGenerator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/ShortRangeGenerator.java index eeff04c08e..f77521dd30 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/ShortRangeGenerator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/ShortRangeGenerator.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators; final class ShortRangeGenerator extends AbstractSubIntegerRangeGenerator { ShortRangeGenerator() { diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/TypeUtils.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/TypeUtils.java similarity index 93% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/TypeUtils.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/TypeUtils.java index 36a665cbb3..9996b8b1b3 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/rangeGenerators/TypeUtils.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/TypeUtils.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators; import com.google.common.base.Preconditions; import javax.annotation.Nonnull; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/BaseRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BaseRenderer.java similarity index 96% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/BaseRenderer.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BaseRenderer.java index 5c6a05943a..434572c354 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/BaseRenderer.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BaseRenderer.java @@ -1,16 +1,14 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.renderers; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers; import static com.google.common.base.Preconditions.checkArgument; -import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.fieldName; -import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.getterMethodName; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; @@ -21,6 +19,7 @@ import java.util.List; import java.util.Map; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding.javav2.generator.util.Types; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil; import org.opendaylight.mdsal.binding.javav2.model.api.Constant; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject; @@ -123,7 +122,7 @@ public abstract class BaseRenderer { final StringBuilder sb = new StringBuilder(); sb.append(importedName(parameter.getReturnType())); sb.append(' '); - sb.append(fieldName(parameter)); + sb.append(TextTemplateUtil.fieldName(parameter)); strings.add(sb); } } @@ -336,12 +335,12 @@ public abstract class BaseRenderer { */ protected String getterMethod(final GeneratedProperty field) { final StringBuilder sb = new StringBuilder(); - final String name = fieldName(field); + final String name = TextTemplateUtil.fieldName(field); final String importedName = Preconditions.checkNotNull(importedName(field.getReturnType())); sb.append("public ") .append(importedName) .append(' ') - .append(getterMethodName(field)) + .append(TextTemplateUtil.getterMethodName(field)) .append("() {") .append("return ") .append(name); diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/BuilderRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BuilderRenderer.java similarity index 94% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/BuilderRenderer.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BuilderRenderer.java index bbb89f14a2..21b82f3c0e 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/BuilderRenderer.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BuilderRenderer.java @@ -1,16 +1,16 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.renderers; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers; -import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.DOT; -import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.getPropertyList; -import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.toFirstLower; +import static org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.DOT; +import static org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.getPropertyList; +import static org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.toFirstLower; import com.google.common.base.Preconditions; import com.google.common.base.Strings; @@ -32,17 +32,17 @@ import java.util.Set; import org.opendaylight.mdsal.binding.javav2.generator.util.ReferencedTypeImpl; import org.opendaylight.mdsal.binding.javav2.generator.util.Types; import org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder.GeneratedTOBuilderImpl; -import org.opendaylight.mdsal.binding2.java.api.generator.util.AlphabeticallyTypeMemberComparator; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.txt.builderConstructorHelperTemplate; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.txt.builderTemplate; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.AlphabeticallyTypeMemberComparator; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType; import org.opendaylight.mdsal.binding.javav2.model.api.MethodSignature; import org.opendaylight.mdsal.binding.javav2.model.api.ParameterizedType; import org.opendaylight.mdsal.binding.javav2.model.api.Type; -import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentable; import org.opendaylight.mdsal.binding.javav2.spec.base.TreeNode; -import org.opendaylight.mdsal.binding2.txt.builderConstructorHelperTemplate; -import org.opendaylight.mdsal.binding2.txt.builderTemplate; +import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentable; import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.concepts.Identifiable; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/ClassRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/ClassRenderer.java similarity index 93% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/ClassRenderer.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/ClassRenderer.java index b5b0bc5153..bc0f28bd2f 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/ClassRenderer.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/ClassRenderer.java @@ -1,15 +1,15 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.renderers; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers; -import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.fieldName; -import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.setterMethod; +import static org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.fieldName; +import static org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.setterMethod; import static org.opendaylight.mdsal.binding2.util.BindingMapping.MEMBER_PATTERN_LIST; import static org.opendaylight.mdsal.binding2.util.BindingMapping.PATTERN_CONSTANT_NAME; @@ -30,8 +30,13 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.regex.Pattern; -import org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators.AbstractRangeGenerator; -import org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators.LengthGenerator; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators.AbstractRangeGenerator; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators.LengthGenerator; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.txt.classTemplate; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.txt.classTemplateConstructors; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.txt.classTemplateInitBlock; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.txt.classTemplateRestrictions; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.txt.classTemplateUnionConstr; import org.opendaylight.mdsal.binding.javav2.model.api.Constant; import org.opendaylight.mdsal.binding.javav2.model.api.Enumeration; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty; @@ -39,11 +44,6 @@ import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType; import org.opendaylight.mdsal.binding.javav2.model.api.Restrictions; import org.opendaylight.mdsal.binding.javav2.model.api.Type; -import org.opendaylight.mdsal.binding2.txt.classTemplate; -import org.opendaylight.mdsal.binding2.txt.classTemplateConstructors; -import org.opendaylight.mdsal.binding2.txt.classTemplateInitBlock; -import org.opendaylight.mdsal.binding2.txt.classTemplateRestrictions; -import org.opendaylight.mdsal.binding2.txt.classTemplateUnionConstr; public class ClassRenderer extends BaseRenderer { protected final GeneratedTransferObject genTO; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/EnumRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/EnumRenderer.java similarity index 78% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/EnumRenderer.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/EnumRenderer.java index b7e6579401..7aa07f46bd 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/EnumRenderer.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/EnumRenderer.java @@ -1,20 +1,20 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.renderers; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers; -import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.asJavadoc; -import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.encodeAngleBrackets; +import static org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.asJavadoc; +import static org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.encodeAngleBrackets; import java.util.LinkedList; import java.util.List; import org.opendaylight.mdsal.binding.javav2.model.api.Enumeration; -import org.opendaylight.mdsal.binding2.txt.enumTemplate; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.txt.enumTemplate; public class EnumRenderer extends BaseRenderer { private final Enumeration enums; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/InterfaceRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/InterfaceRenderer.java similarity index 90% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/InterfaceRenderer.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/InterfaceRenderer.java index 8b66676f6b..4acc227b95 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/InterfaceRenderer.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/InterfaceRenderer.java @@ -1,19 +1,19 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.renderers; - -import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.asJavadoc; -import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.getJavaDocForInterface; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers; import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.List; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.txt.enumTemplate; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.txt.interfaceTemplate; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil; import org.opendaylight.mdsal.binding.javav2.model.api.AnnotationType; import org.opendaylight.mdsal.binding.javav2.model.api.Constant; import org.opendaylight.mdsal.binding.javav2.model.api.Enumeration; @@ -21,8 +21,6 @@ import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType; import org.opendaylight.mdsal.binding.javav2.model.api.MethodSignature; import org.opendaylight.mdsal.binding.javav2.model.api.Type; -import org.opendaylight.mdsal.binding2.txt.enumTemplate; -import org.opendaylight.mdsal.binding2.txt.interfaceTemplate; public class InterfaceRenderer extends BaseRenderer { /** @@ -43,9 +41,9 @@ public class InterfaceRenderer extends BaseRenderer { final StringBuilder sb1 = new StringBuilder(); for (MethodSignature method : getType().getMethodDefinitions()) { if (isAccessor(method)) { - sb1.append(asJavadoc(method.getComment())); + sb1.append(TextTemplateUtil.asJavadoc(method.getComment())); } else { - sb1.append(getJavaDocForInterface(method)); + sb1.append(TextTemplateUtil.getJavaDocForInterface(method)); } sb1.append(generateAnnotations(method.getAnnotations())) .append(importedName(method.getReturnType())) diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/UnionBuilderRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/UnionBuilderRenderer.java similarity index 85% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/UnionBuilderRenderer.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/UnionBuilderRenderer.java index 18025f4ad6..15862632a0 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/UnionBuilderRenderer.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/UnionBuilderRenderer.java @@ -1,18 +1,18 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.renderers; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers; import java.util.HashMap; import java.util.Map; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.txt.unionBuilderTemplate; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.javav2.model.api.MethodSignature; -import org.opendaylight.mdsal.binding2.txt.unionBuilderTemplate; public class UnionBuilderRenderer extends ClassRenderer { diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/UnionRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/UnionRenderer.java similarity index 85% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/UnionRenderer.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/UnionRenderer.java index dce6e76b39..106edd9868 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/UnionRenderer.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/UnionRenderer.java @@ -1,15 +1,14 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.renderers; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers; import static org.opendaylight.mdsal.binding.javav2.generator.util.Types.BOOLEAN; -import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.fieldName; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -19,11 +18,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.txt.unionTemplate; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil; import org.opendaylight.mdsal.binding.javav2.model.api.Enumeration; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject; import org.opendaylight.mdsal.binding.javav2.model.api.Type; -import org.opendaylight.mdsal.binding2.txt.unionTemplate; public class UnionRenderer extends ClassRenderer { public UnionRenderer(final GeneratedTransferObject type) { @@ -81,7 +81,7 @@ public class UnionRenderer extends ClassRenderer { private String generateField(final GeneratedProperty generatedProperty) { final StringBuilder sb = new StringBuilder(); - final String name = fieldName(generatedProperty); + final String name = TextTemplateUtil.fieldName(generatedProperty); sb.append("this.") .append(name) .append(" = source.") @@ -115,33 +115,33 @@ public class UnionRenderer extends ClassRenderer { //string builder for current property final StringBuilder sb = new StringBuilder(); sb.append("if (") - .append(fieldName(property)) + .append(TextTemplateUtil.fieldName(property)) .append(" != null) {") - .append(fieldName(field)) + .append(TextTemplateUtil.fieldName(field)) .append(" = "); // generated type String if ("java.lang.String".equals(propertyReturnType.getFullyQualifiedName())) { - sb.append(fieldName(property)).append(".toCharArray();"); + sb.append(TextTemplateUtil.fieldName(property)).append(".toCharArray();"); // generated type InstanceIdentifier } else if ("org.opendaylight.mdsal.binding2.spec.base.InstanceIdentifier".equals(propertyReturnType .getFullyQualifiedName())) { - sb.append(fieldName(field)) + sb.append(TextTemplateUtil.fieldName(field)) .append(" = ") - .append(fieldName(property)) + .append(TextTemplateUtil.fieldName(property)) .append(".toString().toCharArray();"); //generated type binary } else if ("byte[]".equals(propertyReturnType.getName())) { sb.append("new ") .append(importedName(String.class)) .append('(') - .append(fieldName(property)) + .append(TextTemplateUtil.fieldName(property)) .append(").toCharArray();"); //generated type int*, uint, decimal64 or enumeration* } else if (propertyReturnType.getFullyQualifiedName().startsWith("java.lang") || propertyReturnType instanceof Enumeration || propertyReturnType.getFullyQualifiedName().startsWith("java.math")) { - sb.append(fieldName(property)).append(".toString().toCharArray();"); + sb.append(TextTemplateUtil.fieldName(property)).append(".toString().toCharArray();"); } else if (propertyReturnType instanceof GeneratedTransferObject) { final GeneratedTransferObject propRetTypeCast = (GeneratedTransferObject) propertyReturnType; @@ -149,25 +149,25 @@ public class UnionRenderer extends ClassRenderer { // generated union type if (propRetTypeCast.isUnionType()) { - sb.append(fieldName(property)).append(".getValue();"); + sb.append(TextTemplateUtil.fieldName(property)).append(".getValue();"); // generated boolean typedef } else if (propRetTypeCast.isTypedef() && retTypeCastProperties != null && !retTypeCastProperties.isEmpty() && retTypeCastProperties.size() == 1 && retTypeCastProperties.get(0).getName().equals("value") && BOOLEAN.equals(retTypeCastProperties.get(0).getReturnType())) { - sb.append(fieldName(property)).append(".isValue().toString().toCharArray();"); + sb.append(TextTemplateUtil.fieldName(property)).append(".isValue().toString().toCharArray();"); //generated byte[] typedef } else if (propRetTypeCast.isTypedef() && retTypeCastProperties != null && !retTypeCastProperties.isEmpty() && retTypeCastProperties.size() == 1 && retTypeCastProperties.get(0).getName().equals("value") && "byte[]".equals(retTypeCastProperties.get(0).getReturnType().getName())) { - sb.append("BaseEncoding.base64().encode(").append(fieldName(property)) + sb.append("BaseEncoding.base64().encode(").append(TextTemplateUtil.fieldName(property)) .append(".getValue()).toCharArray();"); } } else { - sb.append(fieldName(property)) + sb.append(TextTemplateUtil.fieldName(property)) .append(".getValue().toString().toCharArray();"); } sb.append("}"); diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java similarity index 95% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java index 9be1efd5ab..6819b91589 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java @@ -1,12 +1,12 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.renderers; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers; import static org.opendaylight.mdsal.binding2.util.BindingMapping.MODEL_BINDING_PROVIDER_CLASS_NAME; import static org.opendaylight.mdsal.binding2.util.BindingMapping.getRootPackageName; @@ -23,13 +23,13 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import org.opendaylight.mdsal.binding.javav2.generator.util.Types; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.txt.modelProviderTemplate; +import org.opendaylight.mdsal.binding.javav2.java.api.generator.txt.yangModuleInfoTemplate; import org.opendaylight.mdsal.binding.javav2.model.api.ParameterizedType; import org.opendaylight.mdsal.binding.javav2.model.api.Type; import org.opendaylight.mdsal.binding.javav2.model.api.WildcardType; import org.opendaylight.mdsal.binding.javav2.spec.runtime.YangModelBindingProvider; import org.opendaylight.mdsal.binding.javav2.spec.runtime.YangModuleInfo; -import org.opendaylight.mdsal.binding2.txt.modelProviderTemplate; -import org.opendaylight.mdsal.binding2.txt.yangModuleInfoTemplate; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/util/AlphabeticallyTypeMemberComparator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/AlphabeticallyTypeMemberComparator.java similarity index 84% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/util/AlphabeticallyTypeMemberComparator.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/AlphabeticallyTypeMemberComparator.java index e1da0e7655..e55eac7d78 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/util/AlphabeticallyTypeMemberComparator.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/AlphabeticallyTypeMemberComparator.java @@ -1,12 +1,12 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.util; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.util; import java.util.Comparator; import org.opendaylight.mdsal.binding.javav2.model.api.TypeMember; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/util/TextTemplateUtil.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java similarity index 99% rename from binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/util/TextTemplateUtil.java rename to binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java index 152cf7ad39..c421b5de37 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/util/TextTemplateUtil.java +++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java @@ -1,12 +1,12 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.java.api.generator.util; +package org.opendaylight.mdsal.binding.javav2.java.api.generator.util; import com.google.common.base.CharMatcher; import com.google.common.base.Preconditions; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/builderConstructorHelperTemplate.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/builderConstructorHelperTemplate.scala.txt similarity index 83% rename from binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/builderConstructorHelperTemplate.scala.txt rename to binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/builderConstructorHelperTemplate.scala.txt index fa87acbc52..6ad54d0bab 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/builderConstructorHelperTemplate.scala.txt +++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/builderConstructorHelperTemplate.scala.txt @@ -6,9 +6,9 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html *@ +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.fieldName +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.getterMethodName @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.fieldName -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.getterMethodName @(allProps: List[GeneratedProperty], keyProps: List[GeneratedProperty], importedNames: Map[String, String], keyPropsList: String) diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/builderTemplate.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/builderTemplate.scala.txt similarity index 92% rename from binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/builderTemplate.scala.txt rename to binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/builderTemplate.scala.txt index ba22c355d6..d4324f22bb 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/builderTemplate.scala.txt +++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/builderTemplate.scala.txt @@ -7,24 +7,24 @@ *@ @import java.util.List +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.fieldName +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.formatDataForJavaDocBuilder +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.getSimpleNameForBuilder +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.getterMethodName +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.getRestrictions +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.propertyNameFromGetter +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.toFirstUpper +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.wrapToDocumentation +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers.BuilderRenderer.getAllIfcs +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers.BuilderRenderer.hasImplementsFromUses +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers.BuilderRenderer.toListOfNames +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators.AbstractRangeGenerator +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators.LengthGenerator @import org.opendaylight.mdsal.binding.javav2.model.api.ConcreteType @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty @import org.opendaylight.mdsal.binding.javav2.model.api.Type -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.fieldName -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.formatDataForJavaDocBuilder -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.getSimpleNameForBuilder -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.getterMethodName -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.getRestrictions -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.propertyNameFromGetter -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.toFirstUpper -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.wrapToDocumentation -@import org.opendaylight.mdsal.binding2.java.api.generator.renderers.BuilderRenderer.getAllIfcs -@import org.opendaylight.mdsal.binding2.java.api.generator.renderers.BuilderRenderer.hasImplementsFromUses -@import org.opendaylight.mdsal.binding2.java.api.generator.renderers.BuilderRenderer.toListOfNames -@import org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators.AbstractRangeGenerator -@import org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators.LengthGenerator @import org.opendaylight.yangtools.concepts.Builder @(genType: GeneratedType, properties: Set[GeneratedProperty], importedNames: Map[String, String], diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/classTemplate.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplate.scala.txt similarity index 92% rename from binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/classTemplate.scala.txt rename to binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplate.scala.txt index 9f2238edc8..846b2f882b 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/classTemplate.scala.txt +++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplate.scala.txt @@ -6,12 +6,12 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html *@ -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.formatDataForJavaDoc -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.fieldName -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.propsAsArgs -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.propsAsList -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.valueForBits -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.wrapToDocumentation +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.formatDataForJavaDoc +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.fieldName +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.propsAsArgs +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.propsAsList +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.valueForBits +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.wrapToDocumentation @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/classTemplateConstructors.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateConstructors.scala.txt similarity index 94% rename from binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/classTemplateConstructors.scala.txt rename to binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateConstructors.scala.txt index 94823fa973..53fad286a2 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/classTemplateConstructors.scala.txt +++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateConstructors.scala.txt @@ -6,8 +6,8 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html *@ -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.asArguments -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.fieldName +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.asArguments +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.fieldName @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty @import org.opendaylight.mdsal.binding2.util.BindingMapping.PATTERN_CONSTANT_NAME diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/classTemplateInitBlock.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateInitBlock.scala.txt similarity index 100% rename from binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/classTemplateInitBlock.scala.txt rename to binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateInitBlock.scala.txt diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/classTemplateRestrictions.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateRestrictions.scala.txt similarity index 72% rename from binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/classTemplateRestrictions.scala.txt rename to binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateRestrictions.scala.txt index db21673d86..07e01edc26 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/classTemplateRestrictions.scala.txt +++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateRestrictions.scala.txt @@ -6,10 +6,10 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html *@ -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.getRestrictions -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.paramValue -@import org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators.AbstractRangeGenerator -@import org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators.LengthGenerator +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.getRestrictions +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.paramValue +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators.AbstractRangeGenerator +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators.LengthGenerator @import org.opendaylight.mdsal.binding.javav2.model.api.Type @(currentType: Type, paramName: String, returnType: Type, rangeGenerator: AbstractRangeGenerator[_]) diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/classTemplateUnionConstr.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateUnionConstr.scala.txt similarity index 82% rename from binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/classTemplateUnionConstr.scala.txt rename to binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateUnionConstr.scala.txt index 92d0bb7d5d..833d0cf328 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/classTemplateUnionConstr.scala.txt +++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateUnionConstr.scala.txt @@ -6,8 +6,8 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html *@ -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.asArguments -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.fieldName +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.asArguments +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.fieldName @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/enumTemplate.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/enumTemplate.scala.txt similarity index 85% rename from binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/enumTemplate.scala.txt rename to binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/enumTemplate.scala.txt index 695f688ff5..7fa0fdf6e4 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/enumTemplate.scala.txt +++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/enumTemplate.scala.txt @@ -6,9 +6,9 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html *@ -@import org.opendaylight.mdsal.binding2.java.api.generator.renderers.EnumRenderer.writeEnumeration -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.formatDataForJavaDoc -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.wrapToDocumentation +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers.EnumRenderer.writeEnumeration +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.formatDataForJavaDoc +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.wrapToDocumentation @import org.opendaylight.mdsal.binding.javav2.model.api.Enumeration @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/interfaceTemplate.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/interfaceTemplate.scala.txt similarity index 82% rename from binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/interfaceTemplate.scala.txt rename to binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/interfaceTemplate.scala.txt index ad480e979f..e0d53a711e 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/interfaceTemplate.scala.txt +++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/interfaceTemplate.scala.txt @@ -8,8 +8,8 @@ @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.formatDataForJavaDoc -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.wrapToDocumentation +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.formatDataForJavaDoc +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.wrapToDocumentation @(genType: GeneratedType, enums: String, annotations: String, generatedMethods: String, generatedImports: String, generatedConstants: String, innerClasses: String) diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/modelProviderTemplate.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/modelProviderTemplate.scala.txt similarity index 100% rename from binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/modelProviderTemplate.scala.txt rename to binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/modelProviderTemplate.scala.txt diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/unionBuilderTemplate.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/unionBuilderTemplate.scala.txt similarity index 71% rename from binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/unionBuilderTemplate.scala.txt rename to binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/unionBuilderTemplate.scala.txt index 0f8aed2fd4..32ebbff36b 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/unionBuilderTemplate.scala.txt +++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/unionBuilderTemplate.scala.txt @@ -8,10 +8,10 @@ @import java.util.List @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.formatDataForJavaDoc -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.wrapToDocumentation -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.getAccessModifier -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.getClarification +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.formatDataForJavaDoc +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.wrapToDocumentation +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.getAccessModifier +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.getClarification @(genType: GeneratedTransferObject, typeName: String, importedNames: Map[String, String], generatedParameters: Map[String, String]) @if(genType != null) { diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/unionTemplate.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/unionTemplate.scala.txt similarity index 94% rename from binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/unionTemplate.scala.txt rename to binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/unionTemplate.scala.txt index 96ceb354db..3b4a2e9a11 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/unionTemplate.scala.txt +++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/unionTemplate.scala.txt @@ -6,11 +6,11 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html *@ +@import org.opendaylight.mdsal.binding.javav2.generator.util.Types.getOuterClassName +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.fieldName +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.asArguments @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.fieldName -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.asArguments -@import org.opendaylight.mdsal.binding.javav2.generator.util.Types.getOuterClassName @(baseType: GeneratedType, importedNames: Map[String, String], finalProperties: List[GeneratedProperty], parentProperties: List[GeneratedProperty], properties: List[GeneratedProperty], propertyList: String) diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/yangModuleInfoTemplate.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/yangModuleInfoTemplate.scala.txt similarity index 94% rename from binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/yangModuleInfoTemplate.scala.txt rename to binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/yangModuleInfoTemplate.scala.txt index 550bf489b8..6ea0ca68ad 100644 --- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding2/yangModuleInfoTemplate.scala.txt +++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/yangModuleInfoTemplate.scala.txt @@ -6,9 +6,9 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html *@ -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.getFormattedRevision -@import org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.getSourcePath -@import org.opendaylight.mdsal.binding2.java.api.generator.renderers.YangModuleInfoTemplateRenderer.getSortedQName +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.getFormattedRevision +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.getSourcePath +@import org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers.YangModuleInfoTemplateRenderer.getSortedQName @import org.opendaylight.mdsal.binding2.util.BindingMapping.getClassName @import org.opendaylight.mdsal.binding2.util.BindingMapping.getRootPackageName @import org.opendaylight.mdsal.binding2.util.BindingMapping.MODULE_INFO_CLASS_NAME -- 2.36.6