Skip to content

Commit

Permalink
Add metadata for Jakarta Servlet API (#213)
Browse files Browse the repository at this point in the history
  • Loading branch information
bclozel authored Feb 13, 2023
1 parent 99f25c7 commit b662836
Show file tree
Hide file tree
Showing 10 changed files with 129 additions and 2 deletions.
8 changes: 6 additions & 2 deletions metadata/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,11 @@
"module": "io.opentelemetry:opentelemetry-sdk-metrics"
},
{
"directory": "io.opentelemetry/opentelemetry-sdk-trace",
"module": "io.opentelemetry:opentelemetry-sdk-trace"
"directory": "io.opentelemetry/opentelemetry-sdk-trace",
"module": "io.opentelemetry:opentelemetry-sdk-trace"
},
{
"directory" : "jakarta.servlet/jakarta.servlet-api",
"module" : "jakarta.servlet:jakarta.servlet-api"
}
]
3 changes: 3 additions & 0 deletions metadata/jakarta.servlet/jakarta.servlet-api/5.0.0/index.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[
"resource-config.json"
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@

{
"bundles": [
{
"name": "jakarta.servlet.LocalStrings",
"locales": [
"und"
],
"condition": {
"typeReachable": "jakarta.servlet.GenericServlet"
}
},
{
"name": "jakarta.servlet.http.LocalStrings",
"locales": [
"und"
],
"condition": {
"typeReachable": "jakarta.servlet.http.HttpServlet"
}
}
]
}
10 changes: 10 additions & 0 deletions metadata/jakarta.servlet/jakarta.servlet-api/index.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"latest": true,
"metadata-version": "5.0.0",
"module": "jakarta.servlet:jakarta.servlet-api",
"tested-versions": [
"5.0.0"
]
}
]
11 changes: 11 additions & 0 deletions tests/src/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -614,5 +614,16 @@
]
}
]
},
{
"test-project-path" : "jakarta.servlet/jakarta.servlet-api/5.0.0",
"libraries" : [
{
"name" : "jakarta.servlet:jakarta.servlet-api",
"versions" : [
"5.0.0"
]
}
]
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
gradlew.bat
gradlew
gradle/
build/
17 changes: 17 additions & 0 deletions tests/src/jakarta.servlet/jakarta.servlet-api/5.0.0/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Copyright and related rights waived via CC0
*
* You should have received a copy of the CC0 legalcode along with this
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
*/

plugins {
id "org.graalvm.internal.tck"
}

String libraryVersion = tck.testedLibraryVersion.get()

dependencies {
testImplementation "jakarta.servlet:jakarta.servlet-api:$libraryVersion"
testImplementation 'org.assertj:assertj-core:3.22.0'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
library.version = 5.0.0
metadata.dir = jakarta.servlet/jakarta.servlet-api/5.0.0/
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
pluginManagement {
def tckPath = Objects.requireNonNullElse(
System.getenv("GVM_TCK_TCKDIR"),
"../../../../tck-build-logic"
)
includeBuild(tckPath)
}

plugins {
id "org.graalvm.internal.tck-settings" version "1.0.0-SNAPSHOT"
}

rootProject.name = 'jakarta.servlet.jakarta.servlet-api_tests'
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Copyright and related rights waived via CC0
*
* You should have received a copy of the CC0 legalcode along with this
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
*/
package jakarta_servlet.jakarta_servlet_api;

import java.io.IOException;

import jakarta.servlet.GenericServlet;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServlet;
import org.junit.jupiter.api.Test;


class JakartaServletTests {
@Test
void instantiateServlet() {
new CustomServlet();
}

@Test
void instantiateHttpServlet() {
new CustomHttpServlet();
}

static class CustomServlet extends GenericServlet {
@Override
public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {

}
}

static class CustomHttpServlet extends HttpServlet {

}
}

0 comments on commit b662836

Please sign in to comment.