From 6b0b7873034952a28263f744500c532724982957 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Mon, 3 Jan 2022 16:38:57 +0100 Subject: Remove obsolete usage of ServletPathsConfig --- .../test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java | 2 -- .../com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java | 3 --- 2 files changed, 5 deletions(-) diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java index d5229add01b..c975f7c17c3 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/FilterTestCase.java @@ -22,7 +22,6 @@ import com.yahoo.jdisc.http.ConnectorConfig; import com.yahoo.jdisc.http.HttpRequest; import com.yahoo.jdisc.http.HttpResponse; import com.yahoo.jdisc.http.ServerConfig; -import com.yahoo.jdisc.http.ServletPathsConfig; import com.yahoo.jdisc.http.filter.RequestFilter; import com.yahoo.jdisc.http.filter.ResponseFilter; import com.yahoo.jdisc.http.filter.ResponseHeaderFilter; @@ -585,7 +584,6 @@ public class FilterTestCase { bind(FilterBindings.class).toInstance(filterBindings); bind(ServerConfig.class).toInstance(new ServerConfig(new ServerConfig.Builder().strictFiltering(strictFiltering))); bind(ConnectorConfig.class).toInstance(new ConnectorConfig(new ConnectorConfig.Builder())); - bind(ServletPathsConfig.class).toInstance(new ServletPathsConfig(new ServletPathsConfig.Builder())); bind(ConnectionLog.class).toInstance(new VoidConnectionLog()); bind(RequestLog.class).toInstance(new VoidRequestLog()); } diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java index 613c5e88cf2..baf198dde5d 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java @@ -7,7 +7,6 @@ import com.google.inject.util.Modules; import com.yahoo.container.logging.ConnectionLog; import com.yahoo.container.logging.RequestLog; import com.yahoo.jdisc.http.ServerConfig; -import com.yahoo.jdisc.http.ServletPathsConfig; import com.yahoo.jdisc.http.server.jetty.testutils.ConnectorFactoryRegistryModule; import com.yahoo.jdisc.test.ServerProviderConformanceTest; import org.apache.http.HttpResponse; @@ -773,8 +772,6 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest { .toInstance(new FilterBindings.Builder().build()); bind(ServerConfig.class) .toInstance(new ServerConfig(new ServerConfig.Builder())); - bind(ServletPathsConfig.class) - .toInstance(new ServletPathsConfig(new ServletPathsConfig.Builder())); bind(ConnectionLog.class) .toInstance(new VoidConnectionLog()); bind(RequestLog.class) -- cgit v1.2.3 From 3a3c8c75bda8889303f12ff5a09cbf44fc2d18b6 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Mon, 3 Jan 2022 16:49:06 +0100 Subject: Remove servlet related config defs. --- container-core/abi-spec.json | 94 ---------------------- .../container.servlet.servlet-config.def | 5 -- .../jdisc.http.jdisc.http.servlet-paths.def | 6 -- 3 files changed, 105 deletions(-) delete mode 100644 container-core/src/main/resources/configdefinitions/container.servlet.servlet-config.def delete mode 100644 container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json index 174febca9df..d5be3ab52f2 100644 --- a/container-core/abi-spec.json +++ b/container-core/abi-spec.json @@ -2090,100 +2090,6 @@ "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] }, - "com.yahoo.jdisc.http.ServletPathsConfig$Builder": { - "superClass": "java.lang.Object", - "interfaces": [ - "com.yahoo.config.ConfigInstance$Builder" - ], - "attributes": [ - "public" - ], - "methods": [ - "public void ()", - "public void (com.yahoo.jdisc.http.ServletPathsConfig)", - "public com.yahoo.jdisc.http.ServletPathsConfig$Builder servlets(java.lang.String, com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder)", - "public com.yahoo.jdisc.http.ServletPathsConfig$Builder servlets(java.util.Map)", - "public com.yahoo.jdisc.http.ServletPathsConfig$Builder servlets(java.lang.String, java.util.function.Consumer)", - "public final boolean dispatchGetConfig(com.yahoo.config.ConfigInstance$Producer)", - "public final java.lang.String getDefMd5()", - "public final java.lang.String getDefName()", - "public final java.lang.String getDefNamespace()", - "public final boolean getApplyOnRestart()", - "public final void setApplyOnRestart(boolean)", - "public com.yahoo.jdisc.http.ServletPathsConfig build()" - ], - "fields": [ - "public java.util.Map servlets" - ] - }, - "com.yahoo.jdisc.http.ServletPathsConfig$Producer": { - "superClass": "java.lang.Object", - "interfaces": [ - "com.yahoo.config.ConfigInstance$Producer" - ], - "attributes": [ - "public", - "interface", - "abstract" - ], - "methods": [ - "public abstract void getConfig(com.yahoo.jdisc.http.ServletPathsConfig$Builder)" - ], - "fields": [] - }, - "com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder": { - "superClass": "java.lang.Object", - "interfaces": [ - "com.yahoo.config.ConfigBuilder" - ], - "attributes": [ - "public" - ], - "methods": [ - "public void ()", - "public void (com.yahoo.jdisc.http.ServletPathsConfig$Servlets)", - "public com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder path(java.lang.String)", - "public com.yahoo.jdisc.http.ServletPathsConfig$Servlets build()" - ], - "fields": [] - }, - "com.yahoo.jdisc.http.ServletPathsConfig$Servlets": { - "superClass": "com.yahoo.config.InnerNode", - "interfaces": [], - "attributes": [ - "public", - "final" - ], - "methods": [ - "public void (com.yahoo.jdisc.http.ServletPathsConfig$Servlets$Builder)", - "public java.lang.String path()" - ], - "fields": [] - }, - "com.yahoo.jdisc.http.ServletPathsConfig": { - "superClass": "com.yahoo.config.ConfigInstance", - "interfaces": [], - "attributes": [ - "public", - "final" - ], - "methods": [ - "public static java.lang.String getDefMd5()", - "public static java.lang.String getDefName()", - "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", - "public void (com.yahoo.jdisc.http.ServletPathsConfig$Builder)", - "public java.util.Map servlets()", - "public com.yahoo.jdisc.http.ServletPathsConfig$Servlets servlets(java.lang.String)" - ], - "fields": [ - "public static final java.lang.String CONFIG_DEF_MD5", - "public static final java.lang.String CONFIG_DEF_NAME", - "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", - "public static final java.lang.String[] CONFIG_DEF_SCHEMA" - ] - }, "com.yahoo.jdisc.http.filter.DiscFilterRequest$ThreadLocalSimpleDateFormat": { "superClass": "java.lang.ThreadLocal", "interfaces": [], diff --git a/container-core/src/main/resources/configdefinitions/container.servlet.servlet-config.def b/container-core/src/main/resources/configdefinitions/container.servlet.servlet-config.def deleted file mode 100644 index 3cc65475913..00000000000 --- a/container-core/src/main/resources/configdefinitions/container.servlet.servlet-config.def +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -# TODO Vespa 8 Remove config definition -namespace=container.servlet -map{} string - diff --git a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def deleted file mode 100644 index af788764364..00000000000 --- a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -# TODO Vespa 8 Remove config definition -namespace=jdisc.http - -# path by servlet componentId -servlets{}.path string -- cgit v1.2.3 From a7906f5a9a2f31f92fee7696443e90f885ba62c7 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Mon, 3 Jan 2022 17:04:03 +0100 Subject: Remove 'servlet' from rnc schema. --- .../src/main/resources/schema/containercluster.rnc | 13 ------------- config-model/src/test/schema-test-files/services.xml | 14 -------------- .../src/test/schema-test-files/standalone-container.xml | 14 -------------- 3 files changed, 41 deletions(-) diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc index b06bf0897cf..e8ff1721397 100644 --- a/config-model/src/main/resources/schema/containercluster.rnc +++ b/config-model/src/main/resources/schema/containercluster.rnc @@ -12,7 +12,6 @@ ContainerCluster = element container | jdisc { } ContainerServices = - Servlet* & SearchInContainer? & DocprocInContainer? & ProcessingInContainer? & @@ -136,18 +135,6 @@ Threadpool = element threadpool { element queue-size { xsd:nonNegativeInteger } } -# Servlet: - -Servlet = element servlet { - ComponentDefinition & - ServletConfig? & - element path { xsd:string { pattern = "\w[\w_/\-\.]*(\*)?" } } -} - -ServletConfig = element servlet-config { - anyElement+ -} - # SEARCH: SearchInContainer = element search { diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml index b477ceef169..9ccf50de906 100644 --- a/config-model/src/test/schema-test-files/services.xml +++ b/config-model/src/test/schema-test-files/services.xml @@ -58,20 +58,6 @@ - - p/a/t/h - - - - Apps/app_1.3-4/* - - 0 - - - bar - - - diff --git a/config-model/src/test/schema-test-files/standalone-container.xml b/config-model/src/test/schema-test-files/standalone-container.xml index 85f577882fb..cc34ae43712 100644 --- a/config-model/src/test/schema-test-files/standalone-container.xml +++ b/config-model/src/test/schema-test-files/standalone-container.xml @@ -2,20 +2,6 @@ - - p/a/t/h - - - - Apps/app_1.3-4/* - - 0 - - - bar - - - -- cgit v1.2.3 From cb23280a8b73e2af78ce91b07f66d0a01ae00f38 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Mon, 3 Jan 2022 17:09:28 +0100 Subject: Remove error handling for 'servlet' element in services.xml --- .../com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index d5c64689648..7f0948cccda 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -187,7 +187,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder { addConfiguredComponents(deployState, cluster, spec); addSecretStore(cluster, spec, deployState); - addServlets(deployState, spec, cluster); addModelEvaluation(spec, cluster, context); addModelEvaluationBundles(cluster); @@ -527,12 +526,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder { return http; } - // TODO Vespa 8: Remove - private void addServlets(DeployState deployState, Element spec, ApplicationContainerCluster cluster) { - if (XML.getChildren(spec, "servlet").size() > 0) - throw new IllegalArgumentException("The 'servlet' tag is no longer supported in services.xml. Please use a handler instead."); - } - private void addDocumentApi(Element spec, ApplicationContainerCluster cluster) { ContainerDocumentApi containerDocumentApi = buildDocumentApi(cluster, spec); if (containerDocumentApi == null) return; -- cgit v1.2.3 From a4658d0d0df841e8d65238c39497aed5ff1b9f1d Mon Sep 17 00:00:00 2001 From: gjoranv Date: Mon, 3 Jan 2022 17:11:13 +0100 Subject: Remove package-info for empty c.y.container.servlet package --- .../src/main/java/com/yahoo/container/servlet/package-info.java | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 container-core/src/main/java/com/yahoo/container/servlet/package-info.java diff --git a/container-core/src/main/java/com/yahoo/container/servlet/package-info.java b/container-core/src/main/java/com/yahoo/container/servlet/package-info.java deleted file mode 100644 index 8ecb3cbe827..00000000000 --- a/container-core/src/main/java/com/yahoo/container/servlet/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -// TODO Vespa 8 Remove export package -@ExportPackage -package com.yahoo.container.servlet; - -import com.yahoo.osgi.annotation.ExportPackage; - -- cgit v1.2.3