diff options
5 files changed, 14 insertions, 12 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/GUIHandler.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/GUIHandler.java index 025075be8fd..1e717f89819 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/GUIHandler.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/GUIHandler.java @@ -10,18 +10,18 @@ import com.yahoo.vespa.model.container.component.Handler; /** * @author Henrik Høiness */ - public class GUIHandler extends Handler<AbstractConfigProducer<?>> { - public static final String BUNDLE = "container-search-gui"; - public static final String CLASS = "com.yahoo.search.query.gui.GUIHandler"; - public static final String BINDING = "*/querybuilder/*"; - public GUIHandler() { - super(new ComponentModel(bundleSpec(CLASS, BUNDLE))); - } + public static final String BUNDLE = "container-search-gui"; + public static final String CLASS = "com.yahoo.search.query.gui.GUIHandler"; + public static final String BINDING = "*/querybuilder/*"; + + public GUIHandler() { + super(new ComponentModel(bundleSpec(CLASS, BUNDLE))); + } - public static BundleInstantiationSpecification bundleSpec(String className, String bundle) { - return BundleInstantiationSpecification.getFromStrings(className, className, bundle); - } + public static BundleInstantiationSpecification bundleSpec(String className, String bundle) { + return BundleInstantiationSpecification.getFromStrings(className, className, bundle); + } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleMapper.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleMapper.java index cca6f43faa3..13dfc3ae745 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleMapper.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/BundleMapper.java @@ -11,8 +11,7 @@ import java.util.Optional; /** * @author gjoranv - * @author lulf - * @since 5.45 + * @author Ulf Lilleengen */ public class BundleMapper { diff --git a/parent/pom.xml b/parent/pom.xml index c7e0f490905..e6ad2b18df9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -110,6 +110,7 @@ <arg>-Xlint:-try</arg> <arg>-Xlint:-processing</arg> <arg>-Xlint:-varargs</arg> + <arg>-Xlint:-options</arg> <arg>-Werror</arg> </compilerArgs> </configuration> diff --git a/processing/pom.xml b/processing/pom.xml index 9bb9ee77037..7e36ea28ccc 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -49,6 +49,7 @@ <arg>-Xlint:all</arg> <arg>-Xlint:-rawtypes</arg> <arg>-Xlint:-serial</arg> + <arg>-Xlint:-options</arg> <!-- TODO: Remove when on a version above Java 8 --> <arg>-Werror</arg> </compilerArgs> </configuration> diff --git a/standalone-container/vespa-standalone-container.spec b/standalone-container/vespa-standalone-container.spec index 281516ae552..e6c6222b5ac 100644 --- a/standalone-container/vespa-standalone-container.spec +++ b/standalone-container/vespa-standalone-container.spec @@ -54,6 +54,7 @@ declare -a modules=( jdisc-security-filters jdisc_core jdisc_http_service + model-evaluation simplemetrics standalone-container vespa-athenz |