diff options
| author | gjoranv <gv@verizonmedia.com> | 2019-08-22 11:59:50 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2019-08-22 11:59:50 +0200 |
| commit | e5b271f06ff5422aa96f1690769ec6d91d85c2dc (patch) | |
| tree | 8f2d1497f256c4199b72cdd0d2f434bd2e052561 /configgen | |
| parent | 7f3a76b5c7ff6f59075abd0b23a7726195a2617c (diff) | |
Don't add findbugs annotations to generated config classes.
Diffstat (limited to 'configgen')
3 files changed, 6 insertions, 8 deletions
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java b/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java index 4da546a7179..e6f305b3847 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java @@ -340,7 +340,7 @@ public class ConfigGenerator { "%s\n" +// "\n" +// " @Override\n" +// - " protected boolean doSetValue(@NonNull String name) {\n" +// + " protected boolean doSetValue(String name) {\n" +// " try {\n" +// " value = Enum.valueOf(name);\n" +// " return true;\n" +// diff --git a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java index 40c903ee929..6df3ad5425a 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java @@ -72,7 +72,6 @@ public class JavaClassBuilder implements ClassBuilder { "import java.util.*;\n" + // "import java.io.File;\n" + // "import java.nio.file.Path;\n" + // - "import edu.umd.cs.findbugs.annotations.NonNull;\n" + // "import com.yahoo.config.*;"; } diff --git a/configgen/src/test/resources/allfeatures.reference b/configgen/src/test/resources/allfeatures.reference index f075daecd04..b84f01f380b 100644 --- a/configgen/src/test/resources/allfeatures.reference +++ b/configgen/src/test/resources/allfeatures.reference @@ -8,7 +8,6 @@ package com.yahoo.configgen; import java.util.*; import java.io.File; import java.nio.file.Path; -import edu.umd.cs.findbugs.annotations.NonNull; import com.yahoo.config.*; /** @@ -1112,7 +1111,7 @@ public final class AllfeaturesConfig extends ConfigInstance { public final static Enum FOOBAR = Enum.FOOBAR; @Override - protected boolean doSetValue(@NonNull String name) { + protected boolean doSetValue(String name) { try { value = Enum.valueOf(name); return true; @@ -1142,7 +1141,7 @@ public final class AllfeaturesConfig extends ConfigInstance { public final static Enum FOOBAR2 = Enum.FOOBAR2; @Override - protected boolean doSetValue(@NonNull String name) { + protected boolean doSetValue(String name) { try { value = Enum.valueOf(name); return true; @@ -1171,7 +1170,7 @@ public final class AllfeaturesConfig extends ConfigInstance { public final static Enum VALUES = Enum.VALUES; @Override - protected boolean doSetValue(@NonNull String name) { + protected boolean doSetValue(String name) { try { value = Enum.valueOf(name); return true; @@ -1731,7 +1730,7 @@ public final class AllfeaturesConfig extends ConfigInstance { public final static Enum TYPE = Enum.TYPE; @Override - protected boolean doSetValue(@NonNull String name) { + protected boolean doSetValue(String name) { try { value = Enum.valueOf(name); return true; @@ -2029,7 +2028,7 @@ public final class AllfeaturesConfig extends ConfigInstance { public final static Enum TYPE = Enum.TYPE; @Override - protected boolean doSetValue(@NonNull String name) { + protected boolean doSetValue(String name) { try { value = Enum.valueOf(name); return true; |