From b3b36d58f323a30db123f54c96de3a36bccc8fdb Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 30 Jul 2018 18:59:59 +0200
Subject: [PATCH] Revert "Fix JDK9 compilation"

This reverts commit 8092c5b5ee7c018ec4ad16246b98e55696662e70.

Change-Id: I210f8cef662f67a195ed1c079400987735989858
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../yang/model/api/stmt/DataTreeAwareEffectiveStatement.java    | 2 +-
 .../yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java
index fd7c298607..f677ec2824 100644
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java
@@ -54,6 +54,6 @@ public interface DataTreeAwareEffectiveStatement<A, D extends DeclaredStatement<
      */
     default <E extends DataTreeEffectiveStatement<?>> @NonNull Optional<E> findDataTreeNode(
             final @NonNull QName qname) {
-        return Optional.ofNullable((E)get(Namespace.class, requireNonNull(qname)));
+        return Optional.ofNullable(get(Namespace.class, requireNonNull(qname)));
     }
 }
diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java
index e35aeb80bb..ff9363526b 100644
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java
@@ -50,6 +50,6 @@ public interface SchemaTreeAwareEffectiveStatement<A, D extends DeclaredStatemen
      */
     default <E extends SchemaTreeEffectiveStatement<?>> @NonNull Optional<E> findSchemaTreeNode(
             final @NonNull QName qname) {
-        return Optional.ofNullable((E)get(Namespace.class, requireNonNull(qname)));
+        return Optional.ofNullable(get(Namespace.class, requireNonNull(qname)));
     }
 }
-- 
2.36.6