From 3d23234f00eb059a2edbeae3d5c559efb47bed03 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 27 Feb 2019 16:47:52 +0100 Subject: [PATCH] Remove yang-model-immutable This is an unfinished component, remove it as it will need to be reimplemented from scratch. Change-Id: Ic55be7d3b66ea23d6a5363e1d6529542c394fb16 Signed-off-by: Robert Varga --- artifacts/pom.xml | 5 -- docs/pom.xml | 4 -- yang/pom.xml | 1 - yang/yang-model-immutable/pom.xml | 35 ---------- .../immutable/AbstractChoiceCaseNode.java | 16 ----- .../AbstractContainerSchemaNode.java | 16 ----- .../immutable/AbstractDataNodeContainer.java | 32 --------- .../immutable/AbstractListSchemaNode.java | 16 ----- .../yang/model/immutable/AbstractModule.java | 16 ----- .../AbstractNotificationDefinition.java | 16 ----- .../immutable/AbstractSchemaContext.java | 29 -------- .../immutable/CommonContainerSchemaNode.java | 19 ------ .../yang/model/immutable/package-info.java | 66 ------------------- 13 files changed, 271 deletions(-) delete mode 100644 yang/yang-model-immutable/pom.xml delete mode 100644 yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractChoiceCaseNode.java delete mode 100644 yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractContainerSchemaNode.java delete mode 100644 yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractDataNodeContainer.java delete mode 100644 yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractListSchemaNode.java delete mode 100644 yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractModule.java delete mode 100644 yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractNotificationDefinition.java delete mode 100644 yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractSchemaContext.java delete mode 100644 yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/CommonContainerSchemaNode.java delete mode 100644 yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/package-info.java diff --git a/artifacts/pom.xml b/artifacts/pom.xml index d2cff423f3..8f166773b4 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -84,11 +84,6 @@ yang-model-export 3.0.0-SNAPSHOT - - org.opendaylight.yangtools - yang-model-immutable - 3.0.0-SNAPSHOT - org.opendaylight.yangtools yang-model-util diff --git a/docs/pom.xml b/docs/pom.xml index 521dda6046..8d4f412b22 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -66,10 +66,6 @@ org.opendaylight.yangtools yang-model-export - - org.opendaylight.yangtools - yang-model-immutable - org.opendaylight.yangtools yang-model-util diff --git a/yang/pom.xml b/yang/pom.xml index 836bcf6d57..73c9914334 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -36,7 +36,6 @@ yang-maven-plugin-spi yang-model-api yang-model-export - yang-model-immutable yang-model-util diff --git a/yang/yang-model-immutable/pom.xml b/yang/yang-model-immutable/pom.xml deleted file mode 100644 index 497d7ea860..0000000000 --- a/yang/yang-model-immutable/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - 4.0.0 - - org.opendaylight.yangtools - bundle-parent - 3.0.0-SNAPSHOT - ../../bundle-parent - - - yang-model-immutable - bundle - ${project.artifactId} - ${project.artifactId} - - - - org.opendaylight.yangtools - yang-model-api - - - - org.immutables - value - - - diff --git a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractChoiceCaseNode.java b/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractChoiceCaseNode.java deleted file mode 100644 index 363b45bf67..0000000000 --- a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractChoiceCaseNode.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2016 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.yangtools.yang.model.immutable; - -import org.immutables.value.Value; -import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; - -@Value.Immutable -abstract class AbstractChoiceCaseNode extends AbstractDataNodeContainer implements CaseSchemaNode { - -} diff --git a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractContainerSchemaNode.java b/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractContainerSchemaNode.java deleted file mode 100644 index b49246331c..0000000000 --- a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractContainerSchemaNode.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2016 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.yangtools.yang.model.immutable; - -import org.immutables.value.Value; -import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; - -@Value.Immutable -abstract class AbstractContainerSchemaNode extends CommonContainerSchemaNode implements ContainerSchemaNode { - -} diff --git a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractDataNodeContainer.java b/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractDataNodeContainer.java deleted file mode 100644 index 6938022333..0000000000 --- a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractDataNodeContainer.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2016 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.yangtools.yang.model.immutable; - -import static java.util.Objects.requireNonNull; - -import java.util.Collection; -import java.util.Map; -import java.util.Optional; -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; -import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; - -abstract class AbstractDataNodeContainer implements DataNodeContainer { - - abstract Map children(); - - @Override - public final Collection getChildNodes() { - return children().values(); - } - - @Override - public final Optional findDataChildByName(final QName name) { - return Optional.ofNullable(children().get(requireNonNull(name))); - } -} diff --git a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractListSchemaNode.java b/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractListSchemaNode.java deleted file mode 100644 index ce2c246767..0000000000 --- a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractListSchemaNode.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2016 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.yangtools.yang.model.immutable; - -import org.immutables.value.Value; -import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; - -@Value.Immutable -abstract class AbstractListSchemaNode extends AbstractDataNodeContainer implements ListSchemaNode { - -} diff --git a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractModule.java b/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractModule.java deleted file mode 100644 index f01ac25ec9..0000000000 --- a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractModule.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2016 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.yangtools.yang.model.immutable; - -import org.immutables.value.Value; -import org.opendaylight.yangtools.yang.model.api.Module; - -@Value.Immutable -abstract class AbstractModule extends AbstractDataNodeContainer implements Module { - -} diff --git a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractNotificationDefinition.java b/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractNotificationDefinition.java deleted file mode 100644 index 3a2d54e143..0000000000 --- a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractNotificationDefinition.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2016 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.yangtools.yang.model.immutable; - -import org.immutables.value.Value; -import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; - -@Value.Immutable -abstract class AbstractNotificationDefinition extends AbstractDataNodeContainer implements NotificationDefinition { - -} diff --git a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractSchemaContext.java b/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractSchemaContext.java deleted file mode 100644 index c6603472c2..0000000000 --- a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/AbstractSchemaContext.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2016 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.yangtools.yang.model.immutable; - -import java.util.Optional; -import org.immutables.value.Value; -import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; - -@Value.Immutable -abstract class AbstractSchemaContext extends CommonContainerSchemaNode implements SchemaContext { - - @Override - public Optional findModule(final QNameModule qnameModule) { - throw new UnsupportedOperationException("Not implemented"); - } - - @Override - public Optional findModule(final String name, final Optional revision) { - throw new UnsupportedOperationException("Not implemented"); - } -} diff --git a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/CommonContainerSchemaNode.java b/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/CommonContainerSchemaNode.java deleted file mode 100644 index 83f39f0f7b..0000000000 --- a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/CommonContainerSchemaNode.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2016 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.yangtools.yang.model.immutable; - -import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; - -/** - * Common abstract class capturing {@link AbstractDataNodeContainer} and {@link ContainerSchemaNode}. - * - * @author Robert Varga - */ -abstract class CommonContainerSchemaNode extends AbstractDataNodeContainer implements ContainerSchemaNode { - -} diff --git a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/package-info.java b/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/package-info.java deleted file mode 100644 index 854983d6ce..0000000000 --- a/yang/yang-model-immutable/src/main/java/org/opendaylight/yangtools/yang/model/immutable/package-info.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2016 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 - */ -/** - * Generated immutable implementations for org.opendaylight.yangtools.yang.model.api interfaces. - * - * @author Robert Varga - */ -@Include(value = { - org.opendaylight.yangtools.yang.model.api.ActionDefinition.class, - org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode.class, - org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode.class, - org.opendaylight.yangtools.yang.model.api.ExtensionDefinition.class, - org.opendaylight.yangtools.yang.model.api.FeatureDefinition.class, - org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode.class, - org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode.class, - org.opendaylight.yangtools.yang.model.api.LeafSchemaNode.class, - org.opendaylight.yangtools.yang.model.api.ModuleImport.class, - org.opendaylight.yangtools.yang.model.api.RpcDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit.class, - org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair.class, - org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.Int8TypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.Int16TypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.Int32TypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.Int64TypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.LengthConstraint.class, - org.opendaylight.yangtools.yang.model.api.type.PatternConstraint.class, - org.opendaylight.yangtools.yang.model.api.type.RangeConstraint.class, - org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.Uint8TypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.Uint16TypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.Uint32TypeDefinition.class, - org.opendaylight.yangtools.yang.model.api.type.Uint64TypeDefinition.class, -}) -@Style( - builderVisibility = BuilderVisibility.PUBLIC, - strictBuilder = true, - visibility = ImplementationVisibility.PRIVATE, - allowedClasspathAnnotations = { Override.class, - SuppressWarnings.class, SuppressFBWarnings.class, - NotThreadSafe.class, Immutable.class, - Generated.class }) -package org.opendaylight.yangtools.yang.model.immutable; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import javax.annotation.concurrent.Immutable; -import javax.annotation.concurrent.NotThreadSafe; -import org.immutables.value.Generated; -import org.immutables.value.Value.Include; -import org.immutables.value.Value.Style; -import org.immutables.value.Value.Style.BuilderVisibility; -import org.immutables.value.Value.Style.ImplementationVisibility; -- 2.36.6