Merge "Allow {Class,Method}Generator.process() to throw CannotCompileException"

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/ClassGenerator.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/ClassGenerator.java
index 14fb87efd6fbc44ee4f4f0362060efdc38e7e30d..f67fc69458d8b2975c293da50906f5462cad72c8 100644 (file)
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/ClassGenerator.java
+++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/ClassGenerator.java
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.yangtools.sal.binding.generator.util;
 
+import javassist.CannotCompileException;
 import javassist.CtClass;
 
 public interface ClassGenerator {
-    void process(CtClass cls);
+    void process(CtClass cls) throws CannotCompileException;
 }

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/JavassistUtils.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/JavassistUtils.java
index e6dc7623a89a917d3c6a68ff1f8c64b15350d773..e3a56e5d5140e5f4c70e63461d7d5ec2dac27c28 100644 (file)
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/JavassistUtils.java
+++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/JavassistUtils.java
@@ -9,11 +9,9 @@ package org.opendaylight.yangtools.sal.binding.generator.util;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
-
 import java.util.Collection;
 import java.util.Map;
 import java.util.WeakHashMap;
-
 import javassist.CannotCompileException;
 import javassist.ClassClassPath;
 import javassist.ClassPath;
@@ -24,7 +22,6 @@ import javassist.CtMethod;
 import javassist.LoaderClassPath;
 import javassist.Modifier;
 import javassist.NotFoundException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -104,13 +101,13 @@ public final class JavassistUtils {
         }
     }
 
-    public CtClass createClass(final String fqn, final ClassGenerator cls) {
+    public CtClass createClass(final String fqn, final ClassGenerator cls) throws CannotCompileException {
         CtClass target = classPool.makeClass(fqn);
         cls.process(target);
         return target;
     }
 
-    public CtClass createClass(final String fqn, final CtClass superInterface, final ClassGenerator cls) {
+    public CtClass createClass(final String fqn, final CtClass superInterface, final ClassGenerator cls) throws CannotCompileException {
         CtClass target = classPool.makeClass(fqn);
         implementsType(target, superInterface);
         cls.process(target);

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/MethodGenerator.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/MethodGenerator.java
index eb0c8c1cd4f8770eda8817954df7f23f8cddf5e0..50d9f97713cda2f676aad231a7e73c1ac564d3e8 100644 (file)
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/MethodGenerator.java
+++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/MethodGenerator.java
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.yangtools.sal.binding.generator.util;
 
+import javassist.CannotCompileException;
 import javassist.CtMethod;
 
 public interface MethodGenerator {
-    void process(CtMethod method);
+    void process(CtMethod method) throws CannotCompileException;
 }