Merge binding-model-{api,ri} 89/112389/3
authorRobert Varga <robert.varga@pantheon.tech>
Sun, 30 Jun 2024 09:10:10 +0000 (11:10 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Sun, 30 Jun 2024 13:05:12 +0000 (15:05 +0200)
commit8f5ddb88beb4a95f6eb907851c077d21388135be
tree58a5c9fccef753b715a2aab28d03c1992688b348
parent539426f9e087618c1605e00849e9b520fa57210a
Merge binding-model-{api,ri}

Splitting model-api from model-ri does not make much sense at this
point. Merge the two into binding-model, which properly depends on
binding-spec, just as model-ri used to.

JIRA: YANGTOOLS-1576
Change-Id: I13d5c592b6b60edcc264d9885376f83a2ccb9368
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
97 files changed:
artifacts/pom.xml
binding/binding-codegen/pom.xml
binding/binding-data-codec-dynamic/pom.xml
binding/binding-data-codec-dynamic/src/main/java/module-info.java
binding/binding-generator/pom.xml
binding/binding-generator/src/main/java/module-info.java
binding/binding-model-api/pom.xml [deleted file]
binding/binding-model-ri/src/main/java/module-info.java [deleted file]
binding/binding-model/pom.xml [moved from binding/binding-model-ri/pom.xml with 76% similarity]
binding/binding-model/src/main/java/module-info.java [moved from binding/binding-model-api/src/main/java/module-info.java with 66% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/AbstractType.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/AbstractType.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/AccessModifier.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/AccessModifier.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/AnnotationType.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/AnnotationType.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/BaseTypeWithRestrictions.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/BaseTypeWithRestrictions.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/CodeGenerator.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/CodeGenerator.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/ConcreteType.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/ConcreteType.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/Constant.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/Constant.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/DefaultType.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/DefaultType.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/DocumentedType.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/DocumentedType.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/Enumeration.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/Enumeration.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/GeneratedProperty.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/GeneratedProperty.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/GeneratedTransferObject.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/GeneratedTransferObject.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/GeneratedType.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/GeneratedType.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/JavaTypeName.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/JavaTypeName.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/MethodSignature.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/MethodSignature.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/ParameterizedType.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/ParameterizedType.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/Restrictions.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/Restrictions.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/Type.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/Type.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/TypeComment.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/TypeComment.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/TypeMember.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/TypeMember.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/TypeMemberComment.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/TypeMemberComment.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/WildcardType.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/WildcardType.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/YangSourceDefinition.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/YangSourceDefinition.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/package-info.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/package-info.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/AnnotableTypeBuilder.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/AnnotableTypeBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/AnnotationTypeBuilder.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/AnnotationTypeBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/ConstantBuilder.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/ConstantBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/EnumBuilder.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/EnumBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedPropertyBuilder.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedPropertyBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTOBuilder.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTOBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTypeBuilder.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTypeBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTypeBuilderBase.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/GeneratedTypeBuilderBase.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/MethodSignatureBuilder.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/MethodSignatureBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/TypeMemberBuilder.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/TypeMemberBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/package-info.java [moved from binding/binding-model-api/src/main/java/org/opendaylight/yangtools/binding/model/api/type/builder/package-info.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/BaseYangTypes.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/BaseYangTypes.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/BindingTypes.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/BindingTypes.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/TypeConstants.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/TypeConstants.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/Types.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/Types.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractEnumerationBuilder.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractEnumerationBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractGeneratedTOBuilder.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractGeneratedTOBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractGeneratedType.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractGeneratedType.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractGeneratedTypeBuilder.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractGeneratedTypeBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractTypeMember.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractTypeMember.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractTypeMemberBuilder.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractTypeMemberBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AnnotationTypeBuilderImpl.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AnnotationTypeBuilderImpl.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/CodegenEnumerationBuilder.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/CodegenEnumerationBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/CodegenGeneratedTOBuilder.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/CodegenGeneratedTOBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/CodegenGeneratedTypeBuilder.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/CodegenGeneratedTypeBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/ConstantImpl.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/ConstantImpl.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedPropertyBuilderImpl.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedPropertyBuilderImpl.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedPropertyImpl.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedPropertyImpl.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/MethodParameterImpl.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/MethodParameterImpl.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/MethodSignatureBuilderImpl.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/MethodSignatureBuilderImpl.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/MethodSignatureImpl.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/MethodSignatureImpl.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/RuntimeEnumerationBuilder.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/RuntimeEnumerationBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/RuntimeGeneratedTOBuilder.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/RuntimeGeneratedTOBuilder.java with 100% similarity]
binding/binding-model/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/RuntimeGeneratedTypeBuilder.java [moved from binding/binding-model-ri/src/main/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/RuntimeGeneratedTypeBuilder.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/api/JavaTypeNameTest.java [moved from binding/binding-model-api/src/test/java/org/opendaylight/yangtools/binding/model/api/JavaTypeNameTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/api/TypeTest.java [moved from binding/binding-model-api/src/test/java/org/opendaylight/yangtools/binding/model/api/TypeTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/BaseYangTypesTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/BaseYangTypesTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/BindingTypesTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/BindingTypesTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/TypeNameTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/TypeNameTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/TypesTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/TypesTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractGeneratedTypeBuilderTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractGeneratedTypeBuilderTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractTypeMemberTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AbstractTypeMemberTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AnnotationBuilderTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/AnnotationBuilderTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/ConstantImplTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/ConstantImplTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/EnumerationBuilderImplTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/EnumerationBuilderImplTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedPropertyBuilderImplTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedPropertyBuilderImplTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedPropertyImplTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedPropertyImplTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedPropertyTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedPropertyTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedTOBuilderImplTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedTOBuilderImplTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedTOBuilderTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedTOBuilderTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedTypeBuilderTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/GeneratedTypeBuilderTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/MethodParameterImplTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/MethodParameterImplTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/MethodSignatureBuilderImplTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/MethodSignatureBuilderImplTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/MethodSignatureBuilderTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/MethodSignatureBuilderTest.java with 100% similarity]
binding/binding-model/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/MethodSignatureImplTest.java [moved from binding/binding-model-ri/src/test/java/org/opendaylight/yangtools/binding/model/ri/generated/type/builder/MethodSignatureImplTest.java with 100% similarity]
binding/binding-model/src/test/resources/base-yang-types.yang [moved from binding/binding-model-ri/src/test/resources/base-yang-types.yang with 100% similarity]
binding/binding-runtime-api/pom.xml
binding/binding-runtime-api/src/main/java/module-info.java
binding/binding-runtime-spi/pom.xml
binding/binding-runtime-spi/src/main/java/module-info.java
binding/pom.xml
features/odl-yangtools-binding-runtime/pom.xml
features/odl-yangtools-binding-runtime/src/main/feature/template.xml