From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 27 Apr 2022 15:39:42 +0000 (+0200)
Subject: Import exception references
X-Git-Tag: v10.0.0~74
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=commitdiff_plain;h=4c2990d640ee5cd0811e1c7af6f2664822f95cb8

Import exception references

We may be generating a competing construct, hence need to use
importedName for {IllegalArgument,NullPointer}Exception.

Change-Id: I3fe59a745bc17b292d8d50e6c55ef8669b0ee35a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend
index 79567d51bc..b24cf82879 100644
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/BuilderTemplate.xtend
@@ -226,7 +226,7 @@ class BuilderTemplate extends AbstractBuilderTemplate {
          * </ul>
          *
          * @param arg grouping object
-         * @throws IllegalArgumentException if given argument is none of valid types or has property with incompatible value
+         * @throws «IAE.importedName» if given argument is none of valid types or has property with incompatible value
         */
     '''
 
@@ -435,7 +435,7 @@ class BuilderTemplate extends AbstractBuilderTemplate {
               *
               * @param augmentation augmentation to be added
               * @return this builder
-              * @throws NullPointerException if {@code augmentation} is null
+              * @throws «NPE.importedName» if {@code augmentation} is null
               */
             public «type.name» addAugmentation(«augmentTypeRef» augmentation) {
                 if (!(this.«AUGMENTATION_FIELD» instanceof «hashMapRef»)) {
diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend
index 08935e81aa..be2f6e8e03 100644
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend
@@ -428,7 +428,7 @@ class ClassTemplate extends BaseTemplate {
     def protected bitsArgs() '''
         «JU_LIST.importedName»<«STRING.importedName»> properties = «Lists.importedName».newArrayList(«allProperties.propsAsArgs»);
         if (!properties.contains(defaultValue)) {
-            throw new «IllegalArgumentException.importedName»("invalid default parameter");
+            throw new «IAE.importedName»("invalid default parameter");
         }
         int i = 0;
         return new «genTO.name»(
diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend
index 8923918678..c382c0902f 100644
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend
@@ -92,7 +92,7 @@ class EnumTemplate extends BaseTemplate {
              *
              * @param name YANG assigned name
              * @return corresponding «enums.name» item, or {@code null} if no such item exists
-             * @throws NullPointerException if {@code name} is null
+             * @throws «NPE.importedName» if {@code name} is null
              */
             public static «enums.importedNullable» forName(«STRING.importedName» name) {
                 return switch (name) {
@@ -123,8 +123,8 @@ class EnumTemplate extends BaseTemplate {
              *
              * @param name YANG assigned name
              * @return corresponding «enums.name» item
-             * @throws NullPointerException if {@code name} is null
-             * @throws IllegalArgumentException if {@code name} does not match any item
+             * @throws «NPE.importedName» if {@code name} is null
+             * @throws «IAE.importedName» if {@code name} does not match any item
              */
             public static «enums.importedNonNull» ofName(«STRING.importedName» name) {
                 return «CODEHELPERS.importedName».checkEnum(forName(name), name);
@@ -135,7 +135,7 @@ class EnumTemplate extends BaseTemplate {
              *
              * @param intValue integer value
              * @return corresponding «enums.name» item
-             * @throws IllegalArgumentException if {@code intValue} does not match any item
+             * @throws «IAE.importedName» if {@code intValue} does not match any item
              */
             public static «enums.importedNonNull» ofValue(int intValue) {
                 return «CODEHELPERS.importedName».checkEnum(forValue(intValue), intValue);
diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java
index 1df057e7d4..845545b506 100644
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/JavaFileTemplate.java
@@ -75,6 +75,10 @@ class JavaFileTemplate {
      * {@code java.lang.Deprecated} as a JavaTypeName.
      */
     static final @NonNull JavaTypeName DEPRECATED = JavaTypeName.create(Deprecated.class);
+    /**
+     * {@code java.lang.IllegalArgumentException} as a JavaTypeName.
+     */
+    static final @NonNull JavaTypeName IAE = JavaTypeName.create(IllegalArgumentException.class);
     /**
      * {@code java.lang.NullPointerException} as a JavaTypeName.
      */