From 20faa589d955725606a400437fc3f85f7da1ce52 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 8 Apr 2019 13:24:31 +0200
Subject: [PATCH] Make MethodSignature default-related methods required

This promotes retrofitted isDefault() and setDefault() methods
to be properly required, addressing the associated FIXME.

Change-Id: Ibc958ce02c36a317f9b6f4c04632a3d6cecf0f7c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../mdsal/binding/model/api/MethodSignature.java             | 5 +----
 .../model/api/type/builder/MethodSignatureBuilder.java       | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/MethodSignature.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/MethodSignature.java
index 9e4047e1d1..b6cb410b36 100644
--- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/MethodSignature.java
+++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/MethodSignature.java
@@ -37,10 +37,7 @@ public interface MethodSignature extends TypeMember {
      *
      * @return <code>true</code> if the method signature is defined as default.
      */
-    // FIXME: 4.0.0: make this method non-default
-    default boolean isDefault() {
-        return false;
-    }
+    boolean isDefault();
 
     /**
      * Returns the List of parameters that method declare. If the method does not contain any parameters, the method
diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/MethodSignatureBuilder.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/MethodSignatureBuilder.java
index 6a82004ab0..34c7b3861d 100644
--- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/MethodSignatureBuilder.java
+++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/type/builder/MethodSignatureBuilder.java
@@ -40,10 +40,7 @@ public interface MethodSignatureBuilder extends TypeMemberBuilder<MethodSignatur
      * @param isDefault true if this signature is to represent a default method.
      * @return this builder
      */
-    // FIXME: 4.0.0: make this method non-default
-    default MethodSignatureBuilder setDefault(final boolean isDefault) {
-        throw new UnsupportedOperationException(getClass() + " does not override setDefault");
-    }
+    MethodSignatureBuilder setDefault(boolean isDefault);
 
     /**
      * Adds Parameter into the List of method parameters. Neither the Name or Type of parameter can be {@code null}.
-- 
2.36.6