Move AbstractPathExpression to yang-model-spi

A very simplistic base class for implementations. It should not
live in yang-model-util.

JIRA: YANGTOOLS-1052
Change-Id: I8794b64d8ad3572c898c8b944354c99d8ba63aa3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractPathExpression.java b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractPathExpression.java
similarity index 90%
rename from yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractPathExpression.java
rename to yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractPathExpression.java
index a097612ece9e397b3a2f9f261e1375584c9da931..3652e10e8aaeddb6735d09de08091a7239eaf843 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractPathExpression.java
+++ b/yang/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/AbstractPathExpression.java
@@ -5,7 +5,7 @@
  * 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.util;
+package org.opendaylight.yangtools.yang.model.spi;
 
 import static java.util.Objects.requireNonNull;
 
@@ -15,6 +15,9 @@ import com.google.common.base.MoreObjects.ToStringHelper;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.yangtools.yang.model.api.PathExpression;
 
+/**
+ * Convenience base class for {@link PathExpression} implementations.
+ */
 @Beta
 @NonNullByDefault
 public abstract class AbstractPathExpression implements PathExpression {

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PathExpressionImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PathExpressionImpl.java
index 1e35e50823a6a2e02479555db1efe4042f9b2f15..5fe85198d77187bfa6ed369017b64a707f84f113 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PathExpressionImpl.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PathExpressionImpl.java
@@ -13,6 +13,7 @@ import com.google.common.base.MoreObjects.ToStringHelper;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.yangtools.yang.model.spi.AbstractPathExpression;
 
 /**
  * A simple XPathExpression implementation.

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/ParsedPathExpression.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/ParsedPathExpression.java
index 6c482a6254579d1a638bfee73caf76ef3ea8504f..da73ad17d52aaf19d8034f1c34b9316ab03b0f73 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/ParsedPathExpression.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/ParsedPathExpression.java
@@ -11,7 +11,7 @@ import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.MoreObjects.ToStringHelper;
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.opendaylight.yangtools.yang.model.util.AbstractPathExpression;
+import org.opendaylight.yangtools.yang.model.spi.AbstractPathExpression;
 
 @NonNullByDefault
 final class ParsedPathExpression extends AbstractPathExpression {

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/UnparsedPathExpression.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/UnparsedPathExpression.java
index 1f363a86877193d8ab0fa9a2d0211aae12207205..968ffac095dac2435d0e71b4aa65716b40505ad8 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/UnparsedPathExpression.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/UnparsedPathExpression.java
@@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.path;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.MoreObjects.ToStringHelper;
-import org.opendaylight.yangtools.yang.model.util.AbstractPathExpression;
+import org.opendaylight.yangtools.yang.model.spi.AbstractPathExpression;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.ArgumentUtils;
 
 final class UnparsedPathExpression extends AbstractPathExpression {