From df09667fb23345b23f2193665ffade86b5fc6a13 Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@redhat.com>
Date: Wed, 21 Sep 2016 16:21:26 +0200
Subject: [PATCH] Generate interface methods without "public"

Method now tracks visibility explicitly; declarations have a blank
specifier, definitions have "public".

Change-Id: I6b1ce1c58d4f9f861e3117a6bf34aa5c9d6c5aa4
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---
 .../config/yangjmxgenerator/plugin/ftl/model/Method.java  | 2 ++
 .../plugin/ftl/model/MethodDeclaration.java               | 6 ++++++
 .../plugin/ftl/model/MethodDefinition.java                | 8 ++++++++
 .../plugin/ftl/model/MethodSerializer.java                | 3 ++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/Method.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/Method.java
index 3d2fff7f98..d83a70ccee 100644
--- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/Method.java
+++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/Method.java
@@ -10,6 +10,8 @@ package org.opendaylight.controller.config.yangjmxgenerator.plugin.ftl.model;
 import java.util.List;
 
 public interface Method {
+    String getVisibility();
+
     List<String> getModifiers();
 
     String getReturnType();
diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/MethodDeclaration.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/MethodDeclaration.java
index be6b23e879..425f85fe25 100644
--- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/MethodDeclaration.java
+++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/MethodDeclaration.java
@@ -9,6 +9,7 @@ package org.opendaylight.controller.config.yangjmxgenerator.plugin.ftl.model;
 
 import java.util.Collections;
 import java.util.List;
+import org.apache.commons.lang3.StringUtils;
 
 public class MethodDeclaration implements Method {
     private final String returnType;
@@ -44,6 +45,11 @@ public class MethodDeclaration implements Method {
         this.javadoc = javadoc;
     }
 
+    @Override
+    public String getVisibility() {
+        return StringUtils.EMPTY;
+    }
+
     @Override
     public String getReturnType() {
         return returnType;
diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/MethodDefinition.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/MethodDefinition.java
index 9af011fe71..1d0e3a40bf 100644
--- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/MethodDefinition.java
+++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/MethodDefinition.java
@@ -9,8 +9,11 @@ package org.opendaylight.controller.config.yangjmxgenerator.plugin.ftl.model;
 
 import java.util.Collections;
 import java.util.List;
+import javax.lang.model.element.Modifier;
 
 public class MethodDefinition implements Method {
+    private static final String VISIBILITY_PUBLIC = Modifier.PUBLIC.toString();
+
     private final List<String> modifiers;
     private final String returnType;
     private final String name;
@@ -66,6 +69,11 @@ public class MethodDefinition implements Method {
         this.javadoc = javadoc;
     }
 
+    @Override
+    public String getVisibility() {
+        return VISIBILITY_PUBLIC;
+    }
+
     @Override
     public String getReturnType() {
         return returnType;
diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/MethodSerializer.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/MethodSerializer.java
index eba6e53e23..4d727ae5b7 100644
--- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/MethodSerializer.java
+++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/ftl/model/MethodSerializer.java
@@ -22,7 +22,8 @@ class MethodSerializer {
             build.append(a);
         }
 
-        build.append("    " + "public ");
+        build.append("    ");
+        build.append(method.getVisibility()).append(" ");
         for (String mod : method.getModifiers()) {
             build.append(mod).append(" ");
         }
-- 
2.36.6