Gen. Abstract*ModuleFactory with WORKING handleChangedClass()

Bug: 2855
Change-Id: I243da5822265db3913f6b0afb2f9393f78b0c24c
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/gofactory/AbsFactoryGeneratedObjectFactory.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/gofactory/AbsFactoryGeneratedObjectFactory.java
index b37d9186d0654a892e80dc5dabca5f47b4a4d463..3ee43a6ba8567e9130af45107583db9d8c1525f6 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/gofactory/AbsFactoryGeneratedObjectFactory.java
+++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/gofactory/AbsFactoryGeneratedObjectFactory.java
@@ -63,6 +63,10 @@ public class AbsFactoryGeneratedObjectFactory {
                                              FullyQualifiedName moduleFQN,
                                              List<Field> moduleFields) {
         JavaFileInputBuilder b = new JavaFileInputBuilder();
                                              FullyQualifiedName moduleFQN,
                                              List<Field> moduleFields) {
         JavaFileInputBuilder b = new JavaFileInputBuilder();

+
+        b.addImportFQN(new FullyQualifiedName(Module.class));
+        b.addImportFQN(new FullyQualifiedName(ModuleIdentifier.class));
+

         Annotation moduleQNameAnnotation = Annotation.createModuleQNameANnotation(yangModuleQName);
         b.addClassAnnotation(moduleQNameAnnotation);
 
         Annotation moduleQNameAnnotation = Annotation.createModuleQNameANnotation(yangModuleQName);
         b.addClassAnnotation(moduleQNameAnnotation);
 


@@ -110,8 +114,14 @@ public class AbsFactoryGeneratedObjectFactory {
         ));
 
         b.addToBody(format("\n"+
         ));
 
         b.addToBody(format("\n"+

-                "public %s handleChangedClass(%s dependencyResolver, %s old, %s bundleContext) throws Exception {\n"+
-                    "return handleChangedClass(old);\n"+
+                "public %s handleChangedClass(%s dependencyResolver, %s old, %s bundleContext) throws Exception {\n" +
+                    // "// @Deprecated return handleChangedClass(old);\n" +
+                    "String instanceName = old.getModule().getIdentifier().getInstanceName();\n" +
+                    "%1$s newModule = new %1$s(new ModuleIdentifier(NAME, instanceName), dependencyResolver);\n" +
+                    "Module oldModule = old.getModule();\n" +
+                    "Class<? extends Module> oldModuleClass = oldModule.getClass();\n" +
+                    genCodeToCopyAttributes(moduleFields) +
+                    "return newModule;\n" +

                 "}\n", moduleFQN, DependencyResolver.class.getCanonicalName(), DynamicMBeanWithInstance.class.getCanonicalName(), BUNDLE_CONTEXT));
 
         b.addToBody(format("\n@Deprecated\n"+
                 "}\n", moduleFQN, DependencyResolver.class.getCanonicalName(), DynamicMBeanWithInstance.class.getCanonicalName(), BUNDLE_CONTEXT));
 
         b.addToBody(format("\n@Deprecated\n"+


@@ -129,6 +139,15 @@ public class AbsFactoryGeneratedObjectFactory {
         return new GeneratedObjectBuilder(b.build()).toGeneratedObject();
     }
 
         return new GeneratedObjectBuilder(b.build()).toGeneratedObject();
     }
 

+    private String genCodeToCopyAttributes(List<Field> moduleFields) {
+        StringBuilder sb = new StringBuilder("\n");
+        for (Field field : moduleFields) {
+            sb.append(format("newModule.set%1$s( (%2$s) oldModuleClass.getMethod(\"get%1$s\").invoke(oldModule));\n", field.getName(), field.getType()));
+        }
+        sb.append('\n');
+        return sb.toString();
+    }
+

     private static String getCreateModule(FullyQualifiedName moduleFQN, List<Field> moduleFields) {
         String result = "\n"+
             "@Override\n"+
     private static String getCreateModule(FullyQualifiedName moduleFQN, List<Field> moduleFields) {
         String result = "\n"+
             "@Override\n"+

diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/GeneratedObjectBuilder.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/GeneratedObjectBuilder.java
index c2aeb89c2d494d117b2310be7248259ff01b99b5..13418f3a475cc56b4c8265f0f2a934a03e7da78c 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/GeneratedObjectBuilder.java
+++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/GeneratedObjectBuilder.java
@@ -34,6 +34,17 @@ public class GeneratedObjectBuilder {
             content.append(input.getFQN().getPackageName());
             content.append(";\n");
         }
             content.append(input.getFQN().getPackageName());
             content.append(";\n");
         }

+
+        if (!input.getImports().isEmpty())
+            content.append('\n');
+        for (FullyQualifiedName importedType : input.getImports()) {
+            content.append("import ");
+            content.append(importedType.toString());
+            content.append(";\n");
+        }
+        if (!input.getImports().isEmpty())
+            content.append('\n');
+

         content.append(maybeAddComment(input.getClassJavaDoc(), true));
 
         for (String classAnnotation : input.getClassAnnotations()) {
         content.append(maybeAddComment(input.getClassJavaDoc(), true));
 
         for (String classAnnotation : input.getClassAnnotations()) {


@@ -64,7 +75,6 @@ public class GeneratedObjectBuilder {
     }
 
     private static String maybeAddComment(Optional<String> comment, boolean isJavadoc) {
     }
 
     private static String maybeAddComment(Optional<String> comment, boolean isJavadoc) {

-

         if (comment.isPresent()) {
             String input = comment.get();
             return StringUtil.writeComment(input, isJavadoc);
         if (comment.isPresent()) {
             String input = comment.get();
             return StringUtil.writeComment(input, isJavadoc);

diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/JavaFileInput.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/JavaFileInput.java
index 76226d0c71ede9dc0a839ca89c331fb643abac62..085b31a2d8cfa1dcc33c91d9623e2b64f4893be2 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/JavaFileInput.java
+++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/JavaFileInput.java
@@ -19,6 +19,8 @@ public interface JavaFileInput {
 
     Optional<String> getHeader();
 
 
     Optional<String> getHeader();
 

+    List<FullyQualifiedName> getImports();
+

     TypeName getType();
 
     Optional<String> getClassJavaDoc();
     TypeName getType();
 
     Optional<String> getClassJavaDoc();

diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/JavaFileInputBuilder.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/JavaFileInputBuilder.java
index 588e218e629f25768d41a8c1fd9a8068c4aaf7aa..c498c5bf9fe9b702f6f7f0f835d9efde964a111d 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/JavaFileInputBuilder.java
+++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/JavaFileInputBuilder.java
@@ -26,6 +26,8 @@ public class JavaFileInputBuilder {
 
     private final List<String> classAnnotations = new ArrayList<>();
 
 
     private final List<String> classAnnotations = new ArrayList<>();
 

+    private final List<FullyQualifiedName> importFQNs = new ArrayList<>();
+

     private final List<FullyQualifiedName> extendsFQNs = new ArrayList<>();
 
     private final List<FullyQualifiedName> implementsFQNs = new ArrayList<>();
     private final List<FullyQualifiedName> extendsFQNs = new ArrayList<>();
 
     private final List<FullyQualifiedName> implementsFQNs = new ArrayList<>();


@@ -44,6 +46,10 @@ public class JavaFileInputBuilder {
         classAnnotations.add(checkNotNull(annotation));
     }
 
         classAnnotations.add(checkNotNull(annotation));
     }
 

+    public void addImportFQN(FullyQualifiedName fqn) {
+        importFQNs.add(fqn);
+    }
+

     public void addExtendsFQN(FullyQualifiedName fqn) {
         extendsFQNs.add(fqn);
     }
     public void addExtendsFQN(FullyQualifiedName fqn) {
         extendsFQNs.add(fqn);
     }


@@ -129,6 +135,11 @@ public class JavaFileInputBuilder {
                 return header;
             }
 
                 return header;
             }
 

+            @Override
+            public List<FullyQualifiedName> getImports() {
+                return Collections.unmodifiableList(importFQNs);
+            }
+

             @Override
             public Optional<String> getClassJavaDoc() {
                 return classJavaDoc;
             @Override
             public Optional<String> getClassJavaDoc() {
                 return classJavaDoc;


@@ -158,6 +169,7 @@ public class JavaFileInputBuilder {
             public List<String> getBodyElements() {
                 return Collections.unmodifiableList(bodyElements);
             }
             public List<String> getBodyElements() {
                 return Collections.unmodifiableList(bodyElements);
             }

+

         };
     }
 }
         };
     }
 }