From 39e8b630ff5174fbac57149069468666c3448a95 Mon Sep 17 00:00:00 2001 From: Martin Ciglan Date: Thu, 19 Jan 2017 10:59:54 +0100 Subject: [PATCH] Bug 1459-3 #2 - Re-organize mdsal-binding2-generator-api - refactor package name in mdsal-binding2-generator-api module - with changes at places of use Change-Id: I5df404eb91fad8291811cf6324b3aea361b338a1 Signed-off-by: Martin Ciglan --- .../generator/api/BindingGenerator.java | 6 ++--- .../generator/api/ClassLoadingStrategy.java | 6 ++--- .../generator/api/ModuleInfoRegistry.java | 4 +-- .../javav2}/generator/spi/TypeProvider.java | 8 +++--- .../javav2}/model/api/AccessModifier.java | 4 +-- .../javav2}/model/api/AnnotationType.java | 4 +-- .../model/api/BaseTypeWithRestrictions.java | 4 +-- .../javav2}/model/api/CodeGenerator.java | 4 +-- .../javav2}/model/api/ConcreteType.java | 4 +-- .../javav2}/model/api/Constant.java | 4 +-- .../javav2}/model/api/DocumentedType.java | 4 +-- .../javav2}/model/api/Enumeration.java | 4 +-- .../javav2}/model/api/GeneratedProperty.java | 4 +-- .../model/api/GeneratedTransferObject.java | 4 +-- .../javav2}/model/api/GeneratedType.java | 4 +-- .../javav2}/model/api/MethodSignature.java | 4 +-- .../javav2}/model/api/ParameterizedType.java | 4 +-- .../javav2}/model/api/Restrictions.java | 4 +-- .../javav2}/model/api/Type.java | 4 +-- .../javav2}/model/api/TypeMember.java | 4 +-- .../javav2}/model/api/UnitName.java | 4 +-- .../javav2}/model/api/WildcardType.java | 4 +-- .../type/builder/AnnotationTypeBuilder.java | 8 +++--- .../model/api/type/builder/EnumBuilder.java | 8 +++--- .../builder/GeneratedPropertyBuilder.java | 8 +++--- .../api/type/builder/GeneratedTOBuilder.java | 8 +++--- .../type/builder/GeneratedTypeBuilder.java | 6 ++--- .../builder/GeneratedTypeBuilderBase.java | 8 +++--- .../type/builder/MethodSignatureBuilder.java | 8 +++--- .../api/type/builder/TypeMemberBuilder.java | 8 +++--- .../generator/impl/AugmentToGenType.java | 4 +-- .../generator/impl/BindingGeneratorImpl.java | 8 +++--- .../generator/impl/GenHelperUtil.java | 10 +++---- .../impl/GeneratedClassLoadingStrategy.java | 4 +-- .../generator/impl/ModuleContext.java | 8 +++--- .../generator/impl/ModuleToGenType.java | 6 ++--- .../generator/impl/util/YangTextTemplate.java | 8 +++--- .../yang/types/TypeProviderImpl.java | 6 ++--- .../generator/util/AbstractBaseType.java | 2 +- .../binding2/generator/util/BindingTypes.java | 6 ++--- .../mdsal/binding2/generator/util/Types.java | 24 ++++++++--------- .../type/builder/AbstractGeneratedType.java | 26 +++++++++---------- .../builder/AbstractGeneratedTypeBuilder.java | 20 +++++++------- .../type/builder/AbstractTypeMember.java | 8 +++--- .../builder/AbstractTypeMemberBuilder.java | 10 +++---- .../builder/AnnotationTypeBuilderImpl.java | 4 +-- .../generated/type/builder/ConstantImpl.java | 4 +-- .../type/builder/EnumerationBuilderImpl.java | 20 +++++++------- .../builder/GeneratedPropertyBuilderImpl.java | 8 +++--- .../type/builder/GeneratedPropertyImpl.java | 8 +++--- .../type/builder/GeneratedTOBuilderImpl.java | 16 ++++++------ .../builder/GeneratedTypeBuilderImpl.java | 4 +-- .../type/builder/MethodParameterImpl.java | 4 +-- .../builder/MethodSignatureBuilderImpl.java | 8 +++--- .../type/builder/MethodSignatureImpl.java | 8 +++--- .../java/api/generator/BuilderGenerator.java | 10 +++---- .../java/api/generator/EnumGenerator.java | 8 +++--- .../java/api/generator/GeneratorJavaFile.java | 4 +-- .../api/generator/InterfaceGenerator.java | 12 ++++----- .../java/api/generator/TOGenerator.java | 8 +++--- .../AbstractRangeGenerator.java | 4 +-- .../rangeGenerators/LengthGenerator.java | 2 +- .../generator/rangeGenerators/TypeUtils.java | 8 +++--- .../api/generator/renderers/BaseRenderer.java | 16 ++++++------ .../generator/renderers/BuilderRenderer.java | 12 ++++----- .../generator/renderers/ClassRenderer.java | 14 +++++----- .../api/generator/renderers/EnumRenderer.java | 2 +- .../renderers/InterfaceRenderer.java | 14 +++++----- .../renderers/UnionBuilderRenderer.java | 4 +-- .../generator/renderers/UnionRenderer.java | 8 +++--- .../YangModuleInfoTemplateRenderer.java | 6 ++--- .../AlphabeticallyTypeMemberComparator.java | 2 +- .../api/generator/util/TextTemplateUtil.java | 18 ++++++------- ...builderConstructorHelperTemplate.scala.txt | 2 +- .../mdsal/binding2/builderTemplate.scala.txt | 10 +++---- .../mdsal/binding2/classTemplate.scala.txt | 6 ++--- .../classTemplateConstructors.scala.txt | 4 +-- .../classTemplateRestrictions.scala.txt | 2 +- .../classTemplateUnionConstr.scala.txt | 4 +-- .../mdsal/binding2/enumTemplate.scala.txt | 4 +-- .../binding2/interfaceTemplate.scala.txt | 4 +-- .../binding2/unionBuilderTemplate.scala.txt | 2 +- .../mdsal/binding2/unionTemplate.scala.txt | 4 +-- 83 files changed, 293 insertions(+), 293 deletions(-) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/api/BindingGenerator.java (89%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/api/ClassLoadingStrategy.java (83%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/api/ModuleInfoRegistry.java (85%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/spi/TypeProvider.java (90%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/AccessModifier.java (92%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/AnnotationType.java (97%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/BaseTypeWithRestrictions.java (83%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/CodeGenerator.java (91%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/ConcreteType.java (79%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/Constant.java (95%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/DocumentedType.java (93%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/Enumeration.java (94%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/GeneratedProperty.java (90%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/GeneratedTransferObject.java (96%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/GeneratedType.java (96%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/MethodSignature.java (95%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/ParameterizedType.java (91%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/Restrictions.java (86%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/Type.java (92%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/TypeMember.java (93%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/UnitName.java (82%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/WildcardType.java (78%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/type/builder/AnnotationTypeBuilder.java (93%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/type/builder/EnumBuilder.java (90%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/type/builder/GeneratedPropertyBuilder.java (85%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/type/builder/GeneratedTOBuilder.java (92%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/type/builder/GeneratedTypeBuilder.java (78%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/type/builder/GeneratedTypeBuilderBase.java (96%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/type/builder/MethodSignatureBuilder.java (91%) rename binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/model/api/type/builder/TypeMemberBuilder.java (90%) diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/generator/api/BindingGenerator.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/api/BindingGenerator.java similarity index 89% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/generator/api/BindingGenerator.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/api/BindingGenerator.java index 077a4d98a3..aa97a8c451 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/generator/api/BindingGenerator.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/api/BindingGenerator.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.generator.api; +package org.opendaylight.mdsal.binding.javav2.generator.api; import com.google.common.annotations.Beta; import java.util.List; import java.util.Set; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/generator/api/ClassLoadingStrategy.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/api/ClassLoadingStrategy.java similarity index 83% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/generator/api/ClassLoadingStrategy.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/api/ClassLoadingStrategy.java index edcbd0862f..1c53dd4ea8 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/generator/api/ClassLoadingStrategy.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/api/ClassLoadingStrategy.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.generator.api; +package org.opendaylight.mdsal.binding.javav2.generator.api; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; /** * diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/generator/api/ModuleInfoRegistry.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/api/ModuleInfoRegistry.java similarity index 85% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/generator/api/ModuleInfoRegistry.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/api/ModuleInfoRegistry.java index b0dcaed80f..089285e025 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/generator/api/ModuleInfoRegistry.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/api/ModuleInfoRegistry.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.generator.api; +package org.opendaylight.mdsal.binding.javav2.generator.api; import com.google.common.annotations.Beta; import org.opendaylight.mdsal.binding.javav2.spec.runtime.YangModuleInfo; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/generator/spi/TypeProvider.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/spi/TypeProvider.java similarity index 90% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/generator/spi/TypeProvider.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/spi/TypeProvider.java index 546b4a699c..e33d63f4c4 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/generator/spi/TypeProvider.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/spi/TypeProvider.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.generator.spi; +package org.opendaylight.mdsal.binding.javav2.generator.spi; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding2.model.api.Restrictions; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.Restrictions; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/AccessModifier.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/AccessModifier.java similarity index 92% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/AccessModifier.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/AccessModifier.java index c44af8f3dd..4851f31f1e 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/AccessModifier.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/AccessModifier.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; import java.lang.reflect.Member; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/AnnotationType.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/AnnotationType.java similarity index 97% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/AnnotationType.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/AnnotationType.java index 481fcf1e3d..caa5a2ad5e 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/AnnotationType.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/AnnotationType.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/BaseTypeWithRestrictions.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/BaseTypeWithRestrictions.java similarity index 83% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/BaseTypeWithRestrictions.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/BaseTypeWithRestrictions.java index d678614a1f..9d72a9f55b 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/BaseTypeWithRestrictions.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/BaseTypeWithRestrictions.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/CodeGenerator.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/CodeGenerator.java similarity index 91% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/CodeGenerator.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/CodeGenerator.java index b852c5ba45..f2b462cb9c 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/CodeGenerator.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/CodeGenerator.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; import org.opendaylight.yangtools.concepts.Identifier; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/ConcreteType.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/ConcreteType.java similarity index 79% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/ConcreteType.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/ConcreteType.java index 0b157ea3c6..9b3dbcdf49 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/ConcreteType.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/ConcreteType.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/Constant.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/Constant.java similarity index 95% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/Constant.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/Constant.java index 4a5817168a..b830474391 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/Constant.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/Constant.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/DocumentedType.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/DocumentedType.java similarity index 93% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/DocumentedType.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/DocumentedType.java index 27f54d986a..d518ce7d2c 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/DocumentedType.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/DocumentedType.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; import com.google.common.base.Optional; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/Enumeration.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/Enumeration.java similarity index 94% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/Enumeration.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/Enumeration.java index a46d7d6d2c..10a3176b09 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/Enumeration.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/Enumeration.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; import java.util.List; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/GeneratedProperty.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/GeneratedProperty.java similarity index 90% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/GeneratedProperty.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/GeneratedProperty.java index fe3348d3ff..97b7671562 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/GeneratedProperty.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/GeneratedProperty.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/GeneratedTransferObject.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/GeneratedTransferObject.java similarity index 96% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/GeneratedTransferObject.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/GeneratedTransferObject.java index 052f4f9f54..053ff46041 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/GeneratedTransferObject.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/GeneratedTransferObject.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; import java.util.List; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/GeneratedType.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/GeneratedType.java similarity index 96% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/GeneratedType.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/GeneratedType.java index d3ae31fc6d..7645ecc560 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/GeneratedType.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/GeneratedType.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; import java.util.List; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/MethodSignature.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/MethodSignature.java similarity index 95% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/MethodSignature.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/MethodSignature.java index 0686566b47..73358af43f 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/MethodSignature.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/MethodSignature.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; import java.util.List; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/ParameterizedType.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/ParameterizedType.java similarity index 91% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/ParameterizedType.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/ParameterizedType.java index 5f320040be..0b3dbd405f 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/ParameterizedType.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/ParameterizedType.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/Restrictions.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/Restrictions.java similarity index 86% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/Restrictions.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/Restrictions.java index 19e4fc9798..c63a8b54f9 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/Restrictions.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/Restrictions.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; import java.util.List; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/Type.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/Type.java similarity index 92% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/Type.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/Type.java index 61836581d4..a206820d2c 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/Type.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/Type.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/TypeMember.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/TypeMember.java similarity index 93% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/TypeMember.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/TypeMember.java index fbf9da74a9..ff9f4b7d36 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/TypeMember.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/TypeMember.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; import java.util.List; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/UnitName.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/UnitName.java similarity index 82% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/UnitName.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/UnitName.java index 586fb2432f..e0d9bf0534 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/UnitName.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/UnitName.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; import org.opendaylight.yangtools.util.AbstractStringIdentifier; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/WildcardType.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/WildcardType.java similarity index 78% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/WildcardType.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/WildcardType.java index e79b793c67..5e5b786e99 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/WildcardType.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/WildcardType.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.model.api; +package org.opendaylight.mdsal.binding.javav2.model.api; import com.google.common.annotations.Beta; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/AnnotationTypeBuilder.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/AnnotationTypeBuilder.java similarity index 93% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/AnnotationTypeBuilder.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/AnnotationTypeBuilder.java index b5bd9eb3df..1e1bda9760 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/AnnotationTypeBuilder.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/AnnotationTypeBuilder.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.model.api.type.builder; +package org.opendaylight.mdsal.binding.javav2.model.api.type.builder; import com.google.common.annotations.Beta; import java.util.List; -import org.opendaylight.mdsal.binding2.model.api.AnnotationType; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; /** * Annotation Type Builder Interface serves for creation and instantiation of diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/EnumBuilder.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/EnumBuilder.java similarity index 90% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/EnumBuilder.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/EnumBuilder.java index 20f6481aa3..09fd5bccf4 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/EnumBuilder.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/EnumBuilder.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.model.api.type.builder; +package org.opendaylight.mdsal.binding.javav2.model.api.type.builder; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding2.model.api.Enumeration; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.Enumeration; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/GeneratedPropertyBuilder.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/GeneratedPropertyBuilder.java similarity index 85% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/GeneratedPropertyBuilder.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/GeneratedPropertyBuilder.java index ce6b187b94..136e4cddbd 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/GeneratedPropertyBuilder.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/GeneratedPropertyBuilder.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.model.api.type.builder; +package org.opendaylight.mdsal.binding.javav2.model.api.type.builder; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; /** * Generated Property Builder is interface that contains methods to build and diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/GeneratedTOBuilder.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/GeneratedTOBuilder.java similarity index 92% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/GeneratedTOBuilder.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/GeneratedTOBuilder.java index ecfa7a9909..359b3855d4 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/GeneratedTOBuilder.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/GeneratedTOBuilder.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.model.api.type.builder; +package org.opendaylight.mdsal.binding.javav2.model.api.type.builder; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding2.model.api.Restrictions; +import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject; +import org.opendaylight.mdsal.binding.javav2.model.api.Restrictions; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; /** diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/GeneratedTypeBuilder.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/GeneratedTypeBuilder.java similarity index 78% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/GeneratedTypeBuilder.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/GeneratedTypeBuilder.java index 7f523c414e..96b2161597 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/GeneratedTypeBuilder.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/GeneratedTypeBuilder.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.model.api.type.builder; +package org.opendaylight.mdsal.binding.javav2.model.api.type.builder; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding2.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType; /** * Generated Type Builder interface is helper interface for building and diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/GeneratedTypeBuilderBase.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/GeneratedTypeBuilderBase.java similarity index 96% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/GeneratedTypeBuilderBase.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/GeneratedTypeBuilderBase.java index b6e32600d0..592d2332a7 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/GeneratedTypeBuilderBase.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/GeneratedTypeBuilderBase.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.model.api.type.builder; +package org.opendaylight.mdsal.binding.javav2.model.api.type.builder; import com.google.common.annotations.Beta; import java.util.List; -import org.opendaylight.mdsal.binding2.model.api.Constant; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.Constant; import org.opendaylight.yangtools.yang.common.QName; @Beta diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/MethodSignatureBuilder.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/MethodSignatureBuilder.java similarity index 91% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/MethodSignatureBuilder.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/MethodSignatureBuilder.java index 2dc408aa6c..d75114007a 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/MethodSignatureBuilder.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/MethodSignatureBuilder.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.model.api.type.builder; +package org.opendaylight.mdsal.binding.javav2.model.api.type.builder; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding2.model.api.MethodSignature; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.MethodSignature; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; /** * Method Signature Builder serves solely for building Method Signature and diff --git a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/TypeMemberBuilder.java b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/TypeMemberBuilder.java similarity index 90% rename from binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/TypeMemberBuilder.java rename to binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/TypeMemberBuilder.java index 0a556c21e3..80367bca27 100644 --- a/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding2/model/api/type/builder/TypeMemberBuilder.java +++ b/binding2/mdsal-binding2-generator-api/src/main/java/org/opendaylight/mdsal/binding/javav2/model/api/type/builder/TypeMemberBuilder.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.model.api.type.builder; +package org.opendaylight.mdsal.binding.javav2.model.api.type.builder; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding2.model.api.AccessModifier; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.AccessModifier; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; /** * diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/AugmentToGenType.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/AugmentToGenType.java index d82057ddb3..8952389219 100644 --- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/AugmentToGenType.java +++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/AugmentToGenType.java @@ -20,8 +20,8 @@ import java.util.Map; import java.util.Set; import org.opendaylight.mdsal.binding2.generator.util.BindingGeneratorUtil; import org.opendaylight.mdsal.binding2.generator.util.ReferencedTypeImpl; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding2.util.BindingMapping; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/BindingGeneratorImpl.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/BindingGeneratorImpl.java index 73159c1645..8e8779d75d 100644 --- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/BindingGeneratorImpl.java +++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/BindingGeneratorImpl.java @@ -14,11 +14,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import org.opendaylight.mdsal.binding2.generator.api.BindingGenerator; -import org.opendaylight.mdsal.binding2.generator.spi.TypeProvider; +import org.opendaylight.mdsal.binding.javav2.generator.api.BindingGenerator; +import org.opendaylight.mdsal.binding.javav2.generator.spi.TypeProvider; import org.opendaylight.mdsal.binding2.generator.yang.types.TypeProviderImpl; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.util.ModuleDependencySort; diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/GenHelperUtil.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/GenHelperUtil.java index 58f277d4e7..a139c3cf13 100644 --- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/GenHelperUtil.java +++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/GenHelperUtil.java @@ -23,11 +23,11 @@ import org.opendaylight.mdsal.binding2.generator.util.BindingGeneratorUtil; import org.opendaylight.mdsal.binding2.generator.util.BindingTypes; import org.opendaylight.mdsal.binding2.generator.util.Types; import org.opendaylight.mdsal.binding2.generator.util.generated.type.builder.GeneratedTypeBuilderImpl; -import org.opendaylight.mdsal.binding2.model.api.Constant; -import org.opendaylight.mdsal.binding2.model.api.GeneratedType; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTypeBuilderBase; +import org.opendaylight.mdsal.binding.javav2.model.api.Constant; +import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilderBase; import org.opendaylight.mdsal.binding.javav2.spec.base.TreeNode; import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentable; import org.opendaylight.mdsal.binding2.txt.yangTemplateForModule; diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/GeneratedClassLoadingStrategy.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/GeneratedClassLoadingStrategy.java index ca32561736..d6f9cec94c 100644 --- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/GeneratedClassLoadingStrategy.java +++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/GeneratedClassLoadingStrategy.java @@ -9,8 +9,8 @@ package org.opendaylight.mdsal.binding2.generator.impl; import com.google.common.annotations.Beta; -import org.opendaylight.mdsal.binding2.generator.api.ClassLoadingStrategy; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.generator.api.ClassLoadingStrategy; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; @Beta public abstract class GeneratedClassLoadingStrategy implements ClassLoadingStrategy { diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/ModuleContext.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/ModuleContext.java index f16296847a..e82727ed44 100644 --- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/ModuleContext.java +++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/ModuleContext.java @@ -23,10 +23,10 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.type.builder.EnumBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.EnumBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/ModuleToGenType.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/ModuleToGenType.java index 1fb386603a..5e4a8e35b1 100644 --- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/ModuleToGenType.java +++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/ModuleToGenType.java @@ -13,10 +13,10 @@ import com.google.common.base.Preconditions; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opendaylight.mdsal.binding2.generator.spi.TypeProvider; +import org.opendaylight.mdsal.binding.javav2.generator.spi.TypeProvider; import org.opendaylight.mdsal.binding2.generator.yang.types.TypeProviderImpl; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.mdsal.binding2.util.BindingMapping; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/util/YangTextTemplate.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/util/YangTextTemplate.java index 1baf96066e..12940236c6 100644 --- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/util/YangTextTemplate.java +++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/impl/util/YangTextTemplate.java @@ -16,10 +16,10 @@ import com.google.common.collect.Iterables; import java.util.Map; import java.util.StringTokenizer; import org.opendaylight.mdsal.binding2.generator.util.Types; -import org.opendaylight.mdsal.binding2.model.api.GeneratedType; -import org.opendaylight.mdsal.binding2.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.WildcardType; +import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType; +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.yangtools.yang.common.QName; /** diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/yang/types/TypeProviderImpl.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/yang/types/TypeProviderImpl.java index fbb26e0898..b1e89d73f4 100644 --- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/yang/types/TypeProviderImpl.java +++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding2/generator/yang/types/TypeProviderImpl.java @@ -14,9 +14,9 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.opendaylight.mdsal.binding2.generator.spi.TypeProvider; -import org.opendaylight.mdsal.binding2.model.api.Restrictions; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.generator.spi.TypeProvider; +import org.opendaylight.mdsal.binding.javav2.model.api.Restrictions; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/AbstractBaseType.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/AbstractBaseType.java index 00d5d9336c..2b5cf6279d 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/AbstractBaseType.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/AbstractBaseType.java @@ -11,7 +11,7 @@ package org.opendaylight.mdsal.binding2.generator.util; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; import java.util.Objects; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; /** * This class represents ancestor for other Types diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/BindingTypes.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/BindingTypes.java index f5fb7b710d..9338a8f680 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/BindingTypes.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/BindingTypes.java @@ -9,9 +9,9 @@ package org.opendaylight.mdsal.binding2.generator.util; import javax.management.NotificationListener; -import org.opendaylight.mdsal.binding2.model.api.ConcreteType; -import org.opendaylight.mdsal.binding2.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.ConcreteType; +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.structural.Augmentation; import org.opendaylight.mdsal.binding.javav2.spec.base.IdentifiableItem; diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Types.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Types.java index 7b52a352c0..6d9e6c309b 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Types.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Types.java @@ -23,12 +23,12 @@ import java.util.List; import java.util.Map; import java.util.Set; import javax.annotation.Nullable; -import org.opendaylight.mdsal.binding2.model.api.BaseTypeWithRestrictions; -import org.opendaylight.mdsal.binding2.model.api.ConcreteType; -import org.opendaylight.mdsal.binding2.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding2.model.api.Restrictions; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.WildcardType; +import org.opendaylight.mdsal.binding.javav2.model.api.BaseTypeWithRestrictions; +import org.opendaylight.mdsal.binding.javav2.model.api.ConcreteType; +import org.opendaylight.mdsal.binding.javav2.model.api.ParameterizedType; +import org.opendaylight.mdsal.binding.javav2.model.api.Restrictions; +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.structural.Augmentable; import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentation; import org.opendaylight.mdsal.binding.javav2.spec.base.RpcCallback; @@ -69,7 +69,7 @@ public final class Types { /** * Creates the instance of type - * {@link org.opendaylight.mdsal.binding2.model.api.ConcreteType + * {@link ConcreteType * ConcreteType} which represents JAVA void type. * * @return ConcreteType instance which represents JAVA @@ -81,7 +81,7 @@ public final class Types { /** * Creates the instance of type - * {@link org.opendaylight.mdsal.binding2.model.api.ConcreteType + * {@link ConcreteType * ConcreteType} which represents primitive JAVA type for which package * doesn't exist. * @@ -159,7 +159,7 @@ public final class Types { /** * Creates instance of type - * {@link org.opendaylight.mdsal.binding2.model.api.ParameterizedType + * {@link ParameterizedType * ParameterizedType} * * @param type @@ -175,7 +175,7 @@ public final class Types { /** * Creates instance of type - * {@link org.opendaylight.mdsal.binding2.model.api.WildcardType + * {@link WildcardType * WildcardType} * * @param packageName @@ -191,7 +191,7 @@ public final class Types { /** * Creates instance of - * {@link org.opendaylight.mdsal.binding2.model.api.ParameterizedType + * {@link ParameterizedType * ParameterizedType} where raw type is * {@link Augmentable} and actual * parameter is valueType. @@ -209,7 +209,7 @@ public final class Types { /** * Creates instance of - * {@link org.opendaylight.mdsal.binding2.model.api.ParameterizedType + * {@link ParameterizedType * ParameterizedType} where raw type is * {@link Augmentation} and actual * parameter is valueType. diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractGeneratedType.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractGeneratedType.java index 08b786a1e2..2a82163b4f 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractGeneratedType.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractGeneratedType.java @@ -15,19 +15,19 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; import org.opendaylight.mdsal.binding2.generator.util.AbstractBaseType; -import org.opendaylight.mdsal.binding2.model.api.AnnotationType; -import org.opendaylight.mdsal.binding2.model.api.Constant; -import org.opendaylight.mdsal.binding2.model.api.Enumeration; -import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding2.model.api.GeneratedType; -import org.opendaylight.mdsal.binding2.model.api.MethodSignature; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.EnumBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.MethodSignatureBuilder; +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; +import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty; +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.binding.javav2.model.api.type.builder.AnnotationTypeBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.EnumBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.MethodSignatureBuilder; @Beta abstract class AbstractGeneratedType extends AbstractBaseType implements GeneratedType { diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java index e7e08b3ecd..9fcced3062 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java @@ -14,16 +14,16 @@ import com.google.common.collect.ImmutableList; import java.util.List; import java.util.Objects; import org.opendaylight.mdsal.binding2.generator.util.AbstractBaseType; -import org.opendaylight.mdsal.binding2.model.api.AccessModifier; -import org.opendaylight.mdsal.binding2.model.api.Constant; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.EnumBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTypeBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTypeBuilderBase; -import org.opendaylight.mdsal.binding2.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.AccessModifier; +import org.opendaylight.mdsal.binding.javav2.model.api.Constant; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.AnnotationTypeBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.EnumBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilderBase; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.util.LazyCollections; @Beta diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractTypeMember.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractTypeMember.java index c5ba844c8f..f3ad027728 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractTypeMember.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractTypeMember.java @@ -10,10 +10,10 @@ package org.opendaylight.mdsal.binding2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import java.util.List; import java.util.Objects; -import org.opendaylight.mdsal.binding2.model.api.AccessModifier; -import org.opendaylight.mdsal.binding2.model.api.AnnotationType; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.TypeMember; +import org.opendaylight.mdsal.binding.javav2.model.api.AccessModifier; +import org.opendaylight.mdsal.binding.javav2.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.TypeMember; @Beta abstract class AbstractTypeMember implements TypeMember { diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java index 4491fe641a..7dbf76cfd1 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java @@ -14,11 +14,11 @@ import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.opendaylight.mdsal.binding2.model.api.AccessModifier; -import org.opendaylight.mdsal.binding2.model.api.AnnotationType; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.TypeMemberBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.AccessModifier; +import org.opendaylight.mdsal.binding.javav2.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.AnnotationTypeBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.TypeMemberBuilder; import org.opendaylight.yangtools.util.LazyCollections; @Beta diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java index 6962a5e8d4..41c4301daa 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java @@ -16,8 +16,8 @@ import java.util.Collections; import java.util.List; import java.util.Objects; import org.opendaylight.mdsal.binding2.generator.util.AbstractBaseType; -import org.opendaylight.mdsal.binding2.model.api.AnnotationType; -import org.opendaylight.mdsal.binding2.model.api.type.builder.AnnotationTypeBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.AnnotationTypeBuilder; import org.opendaylight.yangtools.util.LazyCollections; @Beta diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/ConstantImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/ConstantImpl.java index f331db8778..5992c7c643 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/ConstantImpl.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/ConstantImpl.java @@ -10,8 +10,8 @@ package org.opendaylight.mdsal.binding2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import java.util.Objects; -import org.opendaylight.mdsal.binding2.model.api.Constant; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.Constant; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; @Beta final class ConstantImpl implements Constant { diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/EnumerationBuilderImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/EnumerationBuilderImpl.java index f27785c3e9..f65ef2da1a 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/EnumerationBuilderImpl.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/EnumerationBuilderImpl.java @@ -17,16 +17,16 @@ import java.util.stream.Collectors; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.mdsal.binding2.generator.util.AbstractBaseType; -import org.opendaylight.mdsal.binding2.model.api.AnnotationType; -import org.opendaylight.mdsal.binding2.model.api.Constant; -import org.opendaylight.mdsal.binding2.model.api.Enumeration; -import org.opendaylight.mdsal.binding2.model.api.Enumeration.Pair; -import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding2.model.api.GeneratedType; -import org.opendaylight.mdsal.binding2.model.api.MethodSignature; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.type.builder.AnnotationTypeBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.EnumBuilder; +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; +import org.opendaylight.mdsal.binding.javav2.model.api.Enumeration.Pair; +import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty; +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.binding.javav2.model.api.type.builder.AnnotationTypeBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.EnumBuilder; import org.opendaylight.mdsal.binding2.util.BindingMapping; import org.opendaylight.yangtools.util.LazyCollections; import org.opendaylight.yangtools.yang.common.QName; diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java index eb298a7617..17d27725c5 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java @@ -10,10 +10,10 @@ package org.opendaylight.mdsal.binding2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import java.util.List; -import org.opendaylight.mdsal.binding2.model.api.AnnotationType; -import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedPropertyBuilder; @Beta public final class GeneratedPropertyBuilderImpl extends AbstractTypeMemberBuilder implements diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedPropertyImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedPropertyImpl.java index 9a760df2b2..0d4715f7b3 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedPropertyImpl.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedPropertyImpl.java @@ -10,10 +10,10 @@ package org.opendaylight.mdsal.binding2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import java.util.List; -import org.opendaylight.mdsal.binding2.model.api.AccessModifier; -import org.opendaylight.mdsal.binding2.model.api.AnnotationType; -import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.AccessModifier; +import org.opendaylight.mdsal.binding.javav2.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; @Beta final class GeneratedPropertyImpl extends AbstractTypeMember implements GeneratedProperty { diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java index 259aed7e8f..4762bac05d 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java @@ -13,14 +13,14 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import java.util.List; -import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding2.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding2.model.api.Restrictions; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedPropertyBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTOBuilder; -import org.opendaylight.mdsal.binding2.model.api.type.builder.MethodSignatureBuilder; +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.ParameterizedType; +import org.opendaylight.mdsal.binding.javav2.model.api.Restrictions; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedPropertyBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTOBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.util.LazyCollections; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java index 2d09fe18cc..2c617055bc 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java @@ -11,8 +11,8 @@ package org.opendaylight.mdsal.binding2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import com.google.common.base.Optional; import java.util.List; -import org.opendaylight.mdsal.binding2.model.api.GeneratedType; -import org.opendaylight.mdsal.binding2.model.api.type.builder.GeneratedTypeBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTypeBuilder; import org.opendaylight.yangtools.yang.common.QName; @Beta diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodParameterImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodParameterImpl.java index 7e52a57519..6e632b000e 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodParameterImpl.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodParameterImpl.java @@ -10,8 +10,8 @@ package org.opendaylight.mdsal.binding2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import java.util.Objects; -import org.opendaylight.mdsal.binding2.model.api.MethodSignature.Parameter; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.MethodSignature.Parameter; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; @Beta final class MethodParameterImpl implements Parameter { diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java index ffc4d64060..d131e84046 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java @@ -12,10 +12,10 @@ import com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; import java.util.Objects; -import org.opendaylight.mdsal.binding2.model.api.AnnotationType; -import org.opendaylight.mdsal.binding2.model.api.MethodSignature; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.type.builder.MethodSignatureBuilder; +import org.opendaylight.mdsal.binding.javav2.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.javav2.model.api.MethodSignature; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.MethodSignatureBuilder; import org.opendaylight.yangtools.util.LazyCollections; @Beta diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodSignatureImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodSignatureImpl.java index 13afe6a84f..67466cb3d8 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodSignatureImpl.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodSignatureImpl.java @@ -10,10 +10,10 @@ package org.opendaylight.mdsal.binding2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import java.util.List; import java.util.Objects; -import org.opendaylight.mdsal.binding2.model.api.AccessModifier; -import org.opendaylight.mdsal.binding2.model.api.AnnotationType; -import org.opendaylight.mdsal.binding2.model.api.MethodSignature; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.AccessModifier; +import org.opendaylight.mdsal.binding.javav2.model.api.AnnotationType; +import org.opendaylight.mdsal.binding.javav2.model.api.MethodSignature; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; @Beta class MethodSignatureImpl extends AbstractTypeMember implements MethodSignature { 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/binding2/java/api/generator/BuilderGenerator.java index 0498bbb759..b70d9bcd40 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/binding2/java/api/generator/BuilderGenerator.java @@ -10,11 +10,11 @@ package org.opendaylight.mdsal.binding2.java.api.generator; import com.google.common.annotations.Beta; import org.opendaylight.mdsal.binding2.java.api.generator.renderers.BuilderRenderer; -import org.opendaylight.mdsal.binding2.model.api.CodeGenerator; -import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding2.model.api.GeneratedType; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.UnitName; +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; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.UnitName; import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentable; import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentation; import org.opendaylight.yangtools.concepts.Identifier; 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/binding2/java/api/generator/EnumGenerator.java index f9b2e71fc8..406d787193 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/binding2/java/api/generator/EnumGenerator.java @@ -10,10 +10,10 @@ package org.opendaylight.mdsal.binding2.java.api.generator; import com.google.common.annotations.Beta; import org.opendaylight.mdsal.binding2.java.api.generator.renderers.EnumRenderer; -import org.opendaylight.mdsal.binding2.model.api.CodeGenerator; -import org.opendaylight.mdsal.binding2.model.api.Enumeration; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.UnitName; +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; +import org.opendaylight.mdsal.binding.javav2.model.api.UnitName; import org.opendaylight.yangtools.concepts.Identifier; /** 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/binding2/java/api/generator/GeneratorJavaFile.java index 8945545cae..33f99cc6bb 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/binding2/java/api/generator/GeneratorJavaFile.java @@ -13,8 +13,8 @@ import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.opendaylight.mdsal.binding2.model.api.CodeGenerator; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.CodeGenerator; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonatype.plexus.build.incremental.BuildContext; 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/binding2/java/api/generator/InterfaceGenerator.java index 1ae9872d7b..00b85d9b7f 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/binding2/java/api/generator/InterfaceGenerator.java @@ -10,12 +10,12 @@ package org.opendaylight.mdsal.binding2.java.api.generator; import com.google.common.annotations.Beta; import org.opendaylight.mdsal.binding2.java.api.generator.renderers.InterfaceRenderer; -import org.opendaylight.mdsal.binding2.model.api.CodeGenerator; -import org.opendaylight.mdsal.binding2.model.api.Enumeration; -import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding2.model.api.GeneratedType; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.UnitName; +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; +import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.UnitName; import org.opendaylight.yangtools.concepts.Identifier; /** 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/binding2/java/api/generator/TOGenerator.java index 066c2f1867..5a6fe0d4de 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/binding2/java/api/generator/TOGenerator.java @@ -12,10 +12,10 @@ 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.binding2.model.api.CodeGenerator; -import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.UnitName; +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; +import org.opendaylight.mdsal.binding.javav2.model.api.UnitName; import org.opendaylight.yangtools.concepts.Identifier; /** 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/binding2/java/api/generator/rangeGenerators/AbstractRangeGenerator.java index 7efd24587d..57aadd36fd 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/binding2/java/api/generator/rangeGenerators/AbstractRangeGenerator.java @@ -13,8 +13,8 @@ import com.google.common.collect.ImmutableMap.Builder; import java.util.Collection; import java.util.Map; import javax.annotation.Nonnull; -import org.opendaylight.mdsal.binding2.model.api.ConcreteType; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.ConcreteType; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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/binding2/java/api/generator/rangeGenerators/LengthGenerator.java index cbecbafb85..66ef9e7ddd 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/binding2/java/api/generator/rangeGenerators/LengthGenerator.java @@ -14,7 +14,7 @@ import java.util.Collection; import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; public final class LengthGenerator { 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/binding2/java/api/generator/rangeGenerators/TypeUtils.java index 79483da0b4..36a665cbb3 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/binding2/java/api/generator/rangeGenerators/TypeUtils.java @@ -9,10 +9,10 @@ package org.opendaylight.mdsal.binding2.java.api.generator.rangeGenerators; import com.google.common.base.Preconditions; import javax.annotation.Nonnull; -import org.opendaylight.mdsal.binding2.model.api.ConcreteType; -import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.ConcreteType; +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; /** * Random utility methods for dealing with {@link Type} objects. 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/binding2/java/api/generator/renderers/BaseRenderer.java index 4917369d9f..1ff7cd94d4 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/binding2/java/api/generator/renderers/BaseRenderer.java @@ -21,14 +21,14 @@ import java.util.List; import java.util.Map; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.binding2.generator.util.Types; -import org.opendaylight.mdsal.binding2.model.api.Constant; -import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding2.model.api.GeneratedType; -import org.opendaylight.mdsal.binding2.model.api.MethodSignature; -import org.opendaylight.mdsal.binding2.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.WildcardType; +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; +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.model.api.WildcardType; import org.opendaylight.yangtools.yang.common.QName; public abstract class BaseRenderer { 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/binding2/java/api/generator/renderers/BuilderRenderer.java index 1c2d8c6dd4..64ecc2270a 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/binding2/java/api/generator/renderers/BuilderRenderer.java @@ -33,12 +33,12 @@ import org.opendaylight.mdsal.binding2.generator.util.ReferencedTypeImpl; import org.opendaylight.mdsal.binding2.generator.util.Types; import org.opendaylight.mdsal.binding2.generator.util.generated.type.builder.GeneratedTOBuilderImpl; import org.opendaylight.mdsal.binding2.java.api.generator.util.AlphabeticallyTypeMemberComparator; -import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding2.model.api.GeneratedType; -import org.opendaylight.mdsal.binding2.model.api.MethodSignature; -import org.opendaylight.mdsal.binding2.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding2.model.api.Type; +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; 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/binding2/java/api/generator/renderers/ClassRenderer.java index b7eb058187..b5b0bc5153 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/binding2/java/api/generator/renderers/ClassRenderer.java @@ -32,13 +32,13 @@ 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.binding2.model.api.Constant; -import org.opendaylight.mdsal.binding2.model.api.Enumeration; -import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding2.model.api.GeneratedType; -import org.opendaylight.mdsal.binding2.model.api.Restrictions; -import org.opendaylight.mdsal.binding2.model.api.Type; +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; +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; 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/binding2/java/api/generator/renderers/EnumRenderer.java index 633a2dd6d2..b7e6579401 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/binding2/java/api/generator/renderers/EnumRenderer.java @@ -13,7 +13,7 @@ import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTempla import java.util.LinkedList; import java.util.List; -import org.opendaylight.mdsal.binding2.model.api.Enumeration; +import org.opendaylight.mdsal.binding.javav2.model.api.Enumeration; import org.opendaylight.mdsal.binding2.txt.enumTemplate; public class EnumRenderer extends BaseRenderer { 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/binding2/java/api/generator/renderers/InterfaceRenderer.java index 6234b61fda..8b66676f6b 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/binding2/java/api/generator/renderers/InterfaceRenderer.java @@ -14,13 +14,13 @@ import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTempla import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.List; -import org.opendaylight.mdsal.binding2.model.api.AnnotationType; -import org.opendaylight.mdsal.binding2.model.api.Constant; -import org.opendaylight.mdsal.binding2.model.api.Enumeration; -import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding2.model.api.GeneratedType; -import org.opendaylight.mdsal.binding2.model.api.MethodSignature; -import org.opendaylight.mdsal.binding2.model.api.Type; +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; +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; 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/binding2/java/api/generator/renderers/UnionBuilderRenderer.java index af6c61ac35..18025f4ad6 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/binding2/java/api/generator/renderers/UnionBuilderRenderer.java @@ -10,8 +10,8 @@ package org.opendaylight.mdsal.binding2.java.api.generator.renderers; import java.util.HashMap; import java.util.Map; -import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding2.model.api.MethodSignature; +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/binding2/java/api/generator/renderers/UnionRenderer.java index 1d76c86a8f..21b97c38e4 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/binding2/java/api/generator/renderers/UnionRenderer.java @@ -19,10 +19,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opendaylight.mdsal.binding2.model.api.Enumeration; -import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding2.model.api.Type; +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 { 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/binding2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java index 929f72f0fa..407cc17c66 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/binding2/java/api/generator/renderers/YangModuleInfoTemplateRenderer.java @@ -23,9 +23,9 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import org.opendaylight.mdsal.binding2.generator.util.Types; -import org.opendaylight.mdsal.binding2.model.api.ParameterizedType; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.WildcardType; +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; 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/binding2/java/api/generator/util/AlphabeticallyTypeMemberComparator.java index 6fee31a1de..e1da0e7655 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/binding2/java/api/generator/util/AlphabeticallyTypeMemberComparator.java @@ -9,7 +9,7 @@ package org.opendaylight.mdsal.binding2.java.api.generator.util; import java.util.Comparator; -import org.opendaylight.mdsal.binding2.model.api.TypeMember; +import org.opendaylight.mdsal.binding.javav2.model.api.TypeMember; /** * Alphabetically type member {@link Comparator} which provides sorting by name for type members 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/binding2/java/api/generator/util/TextTemplateUtil.java index 9e00a4691e..627944c9af 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/binding2/java/api/generator/util/TextTemplateUtil.java @@ -18,15 +18,15 @@ import java.util.LinkedList; import java.util.List; import java.util.StringTokenizer; import org.opendaylight.mdsal.binding2.generator.util.Types; -import org.opendaylight.mdsal.binding2.model.api.AccessModifier; -import org.opendaylight.mdsal.binding2.model.api.ConcreteType; -import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty; -import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject; -import org.opendaylight.mdsal.binding2.model.api.GeneratedType; -import org.opendaylight.mdsal.binding2.model.api.MethodSignature; -import org.opendaylight.mdsal.binding2.model.api.Restrictions; -import org.opendaylight.mdsal.binding2.model.api.Type; -import org.opendaylight.mdsal.binding2.model.api.TypeMember; +import org.opendaylight.mdsal.binding.javav2.model.api.AccessModifier; +import org.opendaylight.mdsal.binding.javav2.model.api.ConcreteType; +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.Restrictions; +import org.opendaylight.mdsal.binding.javav2.model.api.Type; +import org.opendaylight.mdsal.binding.javav2.model.api.TypeMember; import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.model.api.Module; 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/binding2/builderConstructorHelperTemplate.scala.txt index edbd4ea66b..fa87acbc52 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/binding2/builderConstructorHelperTemplate.scala.txt @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html *@ -@import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty +@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 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/binding2/builderTemplate.scala.txt index 5c1bb9e906..ba22c355d6 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/binding2/builderTemplate.scala.txt @@ -7,11 +7,11 @@ *@ @import java.util.List -@import org.opendaylight.mdsal.binding2.model.api.ConcreteType -@import org.opendaylight.mdsal.binding2.model.api.GeneratedType -@import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject -@import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty -@import org.opendaylight.mdsal.binding2.model.api.Type +@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 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/binding2/classTemplate.scala.txt index 43d46eae58..9f2238edc8 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/binding2/classTemplate.scala.txt @@ -12,9 +12,9 @@ @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.binding2.model.api.GeneratedTransferObject -@import org.opendaylight.mdsal.binding2.model.api.GeneratedType -@import org.opendaylight.mdsal.binding2.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.GeneratedProperty @import org.opendaylight.yangtools.yang.model.api.`type`.BitsTypeDefinition @(genType: GeneratedType, genTo: GeneratedTransferObject, importedNames: Map[String, String], implementsList: String, 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/binding2/classTemplateConstructors.scala.txt index 6d5d7e3308..94823fa973 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/binding2/classTemplateConstructors.scala.txt @@ -8,8 +8,8 @@ @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.binding2.model.api.GeneratedTransferObject -@import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty +@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 @(genTo: GeneratedTransferObject, allProperties: List[GeneratedProperty], properties: List[GeneratedProperty], 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/binding2/classTemplateRestrictions.scala.txt index 1c9af5dbe0..db21673d86 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/binding2/classTemplateRestrictions.scala.txt @@ -10,7 +10,7 @@ @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.binding2.model.api.Type +@import org.opendaylight.mdsal.binding.javav2.model.api.Type @(currentType: Type, paramName: String, returnType: Type, rangeGenerator: AbstractRangeGenerator[_]) @if(getRestrictions(currentType) != null) { 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/binding2/classTemplateUnionConstr.scala.txt index 3e801c788b..92d0bb7d5d 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/binding2/classTemplateUnionConstr.scala.txt @@ -8,8 +8,8 @@ @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.binding2.model.api.GeneratedProperty -@import org.opendaylight.mdsal.binding2.model.api.GeneratedType +@import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty +@import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType @(genType: GeneratedType, parentProperties: List[GeneratedProperty], allProperty: GeneratedProperty, other: List[GeneratedProperty], importedName: String, genRestrictions: String) 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/binding2/enumTemplate.scala.txt index 7966a32c03..695f688ff5 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/binding2/enumTemplate.scala.txt @@ -9,8 +9,8 @@ @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.binding2.model.api.Enumeration -@import org.opendaylight.mdsal.binding2.model.api.GeneratedType +@import org.opendaylight.mdsal.binding.javav2.model.api.Enumeration +@import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedType @(genType: GeneratedType, importedName: String) @if(genType != null) { 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/binding2/interfaceTemplate.scala.txt index e67cb1c5ba..ad480e979f 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/binding2/interfaceTemplate.scala.txt @@ -6,8 +6,8 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html *@ -@import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject -@import org.opendaylight.mdsal.binding2.model.api.GeneratedType +@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 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/binding2/unionBuilderTemplate.scala.txt index 8415e00aeb..0f8aed2fd4 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/binding2/unionBuilderTemplate.scala.txt @@ -7,7 +7,7 @@ *@ @import java.util.List -@import org.opendaylight.mdsal.binding2.model.api.GeneratedTransferObject +@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 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/binding2/unionTemplate.scala.txt index 9bd3caabf1..b0ba383075 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/binding2/unionTemplate.scala.txt @@ -6,8 +6,8 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html *@ -@import org.opendaylight.mdsal.binding2.model.api.GeneratedType -@import org.opendaylight.mdsal.binding2.model.api.GeneratedProperty +@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.binding2.generator.util.Types.getOuterClassName -- 2.36.6