From ab986c3d142cced3b69e4ea379e3f24c26524d1b Mon Sep 17 00:00:00 2001 From: Martin Ciglan Date: Thu, 19 Jan 2017 13:08:21 +0100 Subject: [PATCH] Bug 1459-3 #4 - Re-organize mdsal-binding2-generator-util - refactor package name in mdsal-binding2-generator-util module - with changes at places of use Change-Id: I398be506b178d5e4fd38bebf25d65d601ed63514 Signed-off-by: Martin Ciglan --- .../binding/javav2/generator/impl/AugmentToGenType.java | 4 ++-- .../binding/javav2/generator/impl/GenHelperUtil.java | 8 ++++---- .../javav2/generator/impl/util/YangTextTemplate.java | 2 +- .../javav2}/generator/util/AbstractBaseType.java | 4 ++-- .../javav2}/generator/util/BindingGeneratorUtil.java | 4 ++-- .../javav2}/generator/util/BindingTypes.java | 4 ++-- .../javav2}/generator/util/ReferencedTypeImpl.java | 4 ++-- .../javav2}/generator/util/TypeConstants.java | 4 ++-- .../javav2}/generator/util/Types.java | 4 ++-- .../generated/type/builder/AbstractGeneratedType.java | 6 +++--- .../type/builder/AbstractGeneratedTypeBuilder.java | 6 +++--- .../util/generated/type/builder/AbstractTypeMember.java | 4 ++-- .../generated/type/builder/AbstractTypeMemberBuilder.java | 4 ++-- .../generated/type/builder/AnnotationTypeBuilderImpl.java | 6 +++--- .../util/generated/type/builder/ConstantImpl.java | 4 ++-- .../generated/type/builder/EnumerationBuilderImpl.java | 6 +++--- .../type/builder/GeneratedPropertyBuilderImpl.java | 4 ++-- .../generated/type/builder/GeneratedPropertyImpl.java | 4 ++-- .../generated/type/builder/GeneratedTOBuilderImpl.java | 4 ++-- .../generated/type/builder/GeneratedTypeBuilderImpl.java | 4 ++-- .../util/generated/type/builder/MethodParameterImpl.java | 4 ++-- .../type/builder/MethodSignatureBuilderImpl.java | 4 ++-- .../util/generated/type/builder/MethodSignatureImpl.java | 4 ++-- .../java/api/generator/renderers/BaseRenderer.java | 2 +- .../java/api/generator/renderers/BuilderRenderer.java | 6 +++--- .../java/api/generator/renderers/UnionRenderer.java | 2 +- .../renderers/YangModuleInfoTemplateRenderer.java | 2 +- .../java/api/generator/util/TextTemplateUtil.java | 2 +- .../opendaylight/mdsal/binding2/unionTemplate.scala.txt | 2 +- 29 files changed, 59 insertions(+), 59 deletions(-) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/AbstractBaseType.java (95%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/BindingGeneratorUtil.java (97%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/BindingTypes.java (95%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/ReferencedTypeImpl.java (89%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/TypeConstants.java (84%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/Types.java (99%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/generated/type/builder/AbstractGeneratedType.java (97%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java (97%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/generated/type/builder/AbstractTypeMember.java (96%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java (97%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java (97%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/generated/type/builder/ConstantImpl.java (94%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/generated/type/builder/EnumerationBuilderImpl.java (97%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java (94%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/generated/type/builder/GeneratedPropertyImpl.java (94%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java (98%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java (96%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/generated/type/builder/MethodParameterImpl.java (92%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java (95%) rename binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/{binding2 => binding/javav2}/generator/util/generated/type/builder/MethodSignatureImpl.java (95%) diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenType.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenType.java index 98ad2d4281..8f71dcacdd 100644 --- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenType.java +++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenType.java @@ -18,8 +18,8 @@ import java.util.Iterator; import java.util.List; 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.binding.javav2.generator.util.BindingGeneratorUtil; +import org.opendaylight.mdsal.binding.javav2.generator.util.ReferencedTypeImpl; 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; diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java index 95fde163ea..8cdec5dc73 100644 --- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java +++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java @@ -21,6 +21,10 @@ import java.util.regex.Pattern; import org.opendaylight.mdsal.binding.javav2.generator.impl.txt.yangTemplateForModule; import org.opendaylight.mdsal.binding.javav2.generator.impl.txt.yangTemplateForNode; import org.opendaylight.mdsal.binding.javav2.generator.impl.util.YangTextTemplate; +import org.opendaylight.mdsal.binding.javav2.generator.util.BindingGeneratorUtil; +import org.opendaylight.mdsal.binding.javav2.generator.util.BindingTypes; +import org.opendaylight.mdsal.binding.javav2.generator.util.Types; +import org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder.GeneratedTypeBuilderImpl; 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; @@ -28,10 +32,6 @@ import org.opendaylight.mdsal.binding.javav2.model.api.type.builder.GeneratedTyp 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.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.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/binding/javav2/generator/impl/util/YangTextTemplate.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/util/YangTextTemplate.java index 134f03a242..f828f17f14 100644 --- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/util/YangTextTemplate.java +++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/util/YangTextTemplate.java @@ -15,7 +15,7 @@ import com.google.common.base.Strings; 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.binding.javav2.generator.util.Types; 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; 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/binding/javav2/generator/util/AbstractBaseType.java similarity index 95% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/AbstractBaseType.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/AbstractBaseType.java index 2b5cf6279d..0fe2ec1fdc 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/binding/javav2/generator/util/AbstractBaseType.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.util; +package org.opendaylight.mdsal.binding.javav2.generator.util; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/BindingGeneratorUtil.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/BindingGeneratorUtil.java similarity index 97% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/BindingGeneratorUtil.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/BindingGeneratorUtil.java index 6cbebecc17..ecd3e46f40 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/BindingGeneratorUtil.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/BindingGeneratorUtil.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.util; +package org.opendaylight.mdsal.binding.javav2.generator.util; import com.google.common.annotations.Beta; import com.google.common.base.CharMatcher; 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/binding/javav2/generator/util/BindingTypes.java similarity index 95% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/BindingTypes.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/BindingTypes.java index 9338a8f680..6716b513b3 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/binding/javav2/generator/util/BindingTypes.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.util; +package org.opendaylight.mdsal.binding.javav2.generator.util; import javax.management.NotificationListener; import org.opendaylight.mdsal.binding.javav2.model.api.ConcreteType; diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/ReferencedTypeImpl.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/ReferencedTypeImpl.java similarity index 89% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/ReferencedTypeImpl.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/ReferencedTypeImpl.java index d09b108afa..3ea30de3ea 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/ReferencedTypeImpl.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/ReferencedTypeImpl.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.util; +package org.opendaylight.mdsal.binding.javav2.generator.util; /** * diff --git a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/TypeConstants.java b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/TypeConstants.java similarity index 84% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/TypeConstants.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/TypeConstants.java index cfff9140af..dc0dea8a16 100644 --- a/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/TypeConstants.java +++ b/binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/TypeConstants.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.util; +package org.opendaylight.mdsal.binding.javav2.generator.util; import com.google.common.annotations.Beta; 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/binding/javav2/generator/util/Types.java similarity index 99% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/Types.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/Types.java index 6d9e6c309b..c2cdf7e263 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/binding/javav2/generator/util/Types.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.util; +package org.opendaylight.mdsal.binding.javav2.generator.util; import com.google.common.annotations.Beta; import com.google.common.base.CharMatcher; 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/binding/javav2/generator/util/generated/type/builder/AbstractGeneratedType.java similarity index 97% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractGeneratedType.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/AbstractGeneratedType.java index 2a82163b4f..c4b5d6e164 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/binding/javav2/generator/util/generated/type/builder/AbstractGeneratedType.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.util.generated.type.builder; +package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; @@ -14,7 +14,7 @@ import java.util.ArrayList; 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.binding.javav2.generator.util.AbstractBaseType; 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; 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/binding/javav2/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java similarity index 97% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java index 9fcced3062..e8efb6b73d 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/binding/javav2/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java @@ -1,19 +1,19 @@ /* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.mdsal.binding2.generator.util.generated.type.builder; +package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; 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.binding.javav2.generator.util.AbstractBaseType; 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; 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/binding/javav2/generator/util/generated/type/builder/AbstractTypeMember.java similarity index 96% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractTypeMember.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/AbstractTypeMember.java index f3ad027728..4a71d3d821 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/binding/javav2/generator/util/generated/type/builder/AbstractTypeMember.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2013 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.util.generated.type.builder; +package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import java.util.List; 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/binding/javav2/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java similarity index 97% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/AbstractTypeMemberBuilder.java index 7dbf76cfd1..86cdd921e7 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/binding/javav2/generator/util/generated/type/builder/AbstractTypeMemberBuilder.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.util.generated.type.builder; +package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; 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/binding/javav2/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java similarity index 97% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java index 41c4301daa..03c2936d8b 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/binding/javav2/generator/util/generated/type/builder/AnnotationTypeBuilderImpl.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2013 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.util.generated.type.builder; +package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import com.google.common.collect.ComparisonChain; @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; -import org.opendaylight.mdsal.binding2.generator.util.AbstractBaseType; +import org.opendaylight.mdsal.binding.javav2.generator.util.AbstractBaseType; 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; 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/binding/javav2/generator/util/generated/type/builder/ConstantImpl.java similarity index 94% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/ConstantImpl.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/ConstantImpl.java index 5992c7c643..d6e1e54128 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/binding/javav2/generator/util/generated/type/builder/ConstantImpl.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.util.generated.type.builder; +package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import java.util.Objects; 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/binding/javav2/generator/util/generated/type/builder/EnumerationBuilderImpl.java similarity index 97% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/EnumerationBuilderImpl.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/EnumerationBuilderImpl.java index f65ef2da1a..2ebac8a83c 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/binding/javav2/generator/util/generated/type/builder/EnumerationBuilderImpl.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.util.generated.type.builder; +package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import com.google.common.base.Optional; @@ -16,7 +16,7 @@ import java.util.Objects; 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.binding.javav2.generator.util.AbstractBaseType; 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; 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/binding/javav2/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java similarity index 94% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.java index 17d27725c5..025d470d5e 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/binding/javav2/generator/util/generated/type/builder/GeneratedPropertyBuilderImpl.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.util.generated.type.builder; +package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import java.util.List; 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/binding/javav2/generator/util/generated/type/builder/GeneratedPropertyImpl.java similarity index 94% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedPropertyImpl.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedPropertyImpl.java index 0d4715f7b3..c6a8cab263 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/binding/javav2/generator/util/generated/type/builder/GeneratedPropertyImpl.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.util.generated.type.builder; +package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import java.util.List; 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/binding/javav2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java similarity index 98% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java index 4762bac05d..597027c55e 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/binding/javav2/generator/util/generated/type/builder/GeneratedTOBuilderImpl.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.util.generated.type.builder; +package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import com.google.common.base.Optional; 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/binding/javav2/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java similarity index 96% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.java index 2c617055bc..4c02cadeb4 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/binding/javav2/generator/util/generated/type/builder/GeneratedTypeBuilderImpl.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.util.generated.type.builder; +package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import com.google.common.base.Optional; 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/binding/javav2/generator/util/generated/type/builder/MethodParameterImpl.java similarity index 92% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodParameterImpl.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/MethodParameterImpl.java index 6e632b000e..0ed03516c7 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/binding/javav2/generator/util/generated/type/builder/MethodParameterImpl.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.util.generated.type.builder; +package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import java.util.Objects; 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/binding/javav2/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java similarity index 95% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java index d131e84046..90bb5e32b9 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/binding/javav2/generator/util/generated/type/builder/MethodSignatureBuilderImpl.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2013 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.util.generated.type.builder; +package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; 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/binding/javav2/generator/util/generated/type/builder/MethodSignatureImpl.java similarity index 95% rename from binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding2/generator/util/generated/type/builder/MethodSignatureImpl.java rename to binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/MethodSignatureImpl.java index 67466cb3d8..47ff88606c 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/binding/javav2/generator/util/generated/type/builder/MethodSignatureImpl.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2013 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.util.generated.type.builder; +package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder; import com.google.common.annotations.Beta; import java.util.List; 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 1ff7cd94d4..5c6a05943a 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 @@ -20,7 +20,7 @@ import java.util.LinkedList; 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.binding.javav2.generator.util.Types; 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; 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 64ecc2270a..bbb89f14a2 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 @@ -29,9 +29,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; -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.binding.javav2.generator.util.ReferencedTypeImpl; +import org.opendaylight.mdsal.binding.javav2.generator.util.Types; +import org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder.GeneratedTOBuilderImpl; import org.opendaylight.mdsal.binding2.java.api.generator.util.AlphabeticallyTypeMemberComparator; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty; import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject; diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/UnionRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding2/java/api/generator/renderers/UnionRenderer.java index 21b97c38e4..dce6e76b39 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 @@ -8,7 +8,7 @@ package org.opendaylight.mdsal.binding2.java.api.generator.renderers; -import static org.opendaylight.mdsal.binding2.generator.util.Types.BOOLEAN; +import static org.opendaylight.mdsal.binding.javav2.generator.util.Types.BOOLEAN; import static org.opendaylight.mdsal.binding2.java.api.generator.util.TextTemplateUtil.fieldName; import com.google.common.base.Function; 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 407cc17c66..9be1efd5ab 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 @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.TreeMap; -import org.opendaylight.mdsal.binding2.generator.util.Types; +import org.opendaylight.mdsal.binding.javav2.generator.util.Types; 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; 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 627944c9af..152cf7ad39 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 @@ -17,7 +17,7 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; import java.util.StringTokenizer; -import org.opendaylight.mdsal.binding2.generator.util.Types; +import org.opendaylight.mdsal.binding.javav2.generator.util.Types; 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; 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 b0ba383075..96ceb354db 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 @@ -10,7 +10,7 @@ @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 +@import org.opendaylight.mdsal.binding.javav2.generator.util.Types.getOuterClassName @(baseType: GeneratedType, importedNames: Map[String, String], finalProperties: List[GeneratedProperty], parentProperties: List[GeneratedProperty], properties: List[GeneratedProperty], propertyList: String) -- 2.36.6