From fac987134c9e7e4ec978623367c13d0294d9dbde Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 7 Oct 2020 23:38:00 +0200
Subject: [PATCH] Remove DOMSchemaService.getSessionContext()

This method is not really useful, as we never needed it. Remove it.

Change-Id: I809dc005e0a62d1087d7e6e29f9b686de27aeb57
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../mdsal/dom/api/DOMSchemaService.java             | 11 -----------
 .../schema/ScanningSchemaServiceProviderTest.java   |  5 -----
 .../mdsal/dom/spi/AbstractDOMSchemaService.java     | 13 +++++--------
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMSchemaService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMSchemaService.java
index 7bc12c9577..dfacb4889e 100644
--- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMSchemaService.java
+++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMSchemaService.java
@@ -12,17 +12,6 @@ import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener;
 
 public interface DOMSchemaService extends DOMExtensibleService<DOMSchemaService, DOMSchemaServiceExtension> {
-    /**
-     * Returns session specific YANG schema context.
-     *
-     * @return schemaContext
-     * @deprecated This method never fully materialized, use {@link #getGlobalContext()} instead.
-     */
-    @Deprecated(forRemoval = true)
-    default EffectiveModelContext getSessionContext() {
-        throw new UnsupportedOperationException("getSessionContext() is not specified nor implemented");
-    }
-
     /**
      * Returns global schema context.
      *
diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/schema/ScanningSchemaServiceProviderTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/schema/ScanningSchemaServiceProviderTest.java
index 9fefcdf70c..84c503b841 100644
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/schema/ScanningSchemaServiceProviderTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/schema/ScanningSchemaServiceProviderTest.java
@@ -159,11 +159,6 @@ public class ScanningSchemaServiceProviderTest {
         assertEquals(schemaService.getExtensions().values().iterator().next(), schemaService);
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void getSessionContextTest() {
-        schemaService.getSessionContext();
-    }
-
     private void addYangs(final ScanningSchemaServiceProvider service) {
         final List<Registration> registerAvailableYangs = service.registerAvailableYangs(yangs);
         assertTrue(!registerAvailableYangs.isEmpty());
diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractDOMSchemaService.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractDOMSchemaService.java
index 2b0ec4f20c..c08ed8f7c0 100644
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractDOMSchemaService.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractDOMSchemaService.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
+import static com.google.common.base.Preconditions.checkState;
+
 import com.google.common.annotations.Beta;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;
@@ -36,13 +38,8 @@ public abstract class AbstractDOMSchemaService implements DOMSchemaService, Effe
 
     @Override
     public final EffectiveModelContext getEffectiveModelContext() {
-        // Always route context queries to a single method
-        return getGlobalContext();
-    }
-
-    @Override
-    public final EffectiveModelContext getSessionContext() {
-        // This method should not be implemented
-        throw new UnsupportedOperationException();
+        final EffectiveModelContext ret = getGlobalContext();
+        checkState(ret != null, "Global context is not available in %s", this);
+        return ret;
     }
 }
-- 
2.36.6