Migrated to jetty 11.0.24

.github/workflows/build-dev-release.yml

@@ -4,8 +4,10 @@ on: workflow_dispatch
 
 jobs:
   build:
-    uses: th2-net/.github/.github/workflows/compound-java.yml@main
+    uses: th2-net/.github/.github/workflows/compound-java.yml@integration-tests # FIXME: switch to main branch
     with:
+      integration-test-enabled: true
+      integration-test-projects: "['cradle-admin-tool-cli','cradle-admin-tool-http']"
       build-target: 'Docker'
       devRelease: true
       createTag: true

.github/workflows/build-release.yml

@@ -4,8 +4,10 @@ on: workflow_dispatch
 
 jobs:
   build:
-    uses: th2-net/.github/.github/workflows/compound-java.yml@main
+    uses: th2-net/.github/.github/workflows/compound-java.yml@integration-tests # FIXME: switch to main branch
     with:
+      integration-test-enabled: true
+      integration-test-projects: "['cradle-admin-tool-cli','cradle-admin-tool-http']"
       build-target: 'Docker'
       devRelease: false
       createTag: true

.github/workflows/build-sanpshot.yml

@@ -11,8 +11,12 @@ on:
 
 jobs:
   build-job:
-    uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main
+    uses: th2-net/.github/.github/workflows/compound-java-dev.yml@integration-tests # FIXME: switch to main branch
     with:
+      integration-test-enabled: true
+      scanner-enabled: false
+      strict-scanner: false
+      integration-test-projects: "['cradle-admin-tool-cli','cradle-admin-tool-http']"
       build-target: 'Docker'
       docker-username: ${{ github.actor }}
     secrets:

README.md

@@ -1,4 +1,4 @@
-# th2-cradle-admin 1.11.2
+# th2-cradle-admin 2.0.0
 
 The th2-cradle-admin is a set of projects for managing books and pages in th2 storage.
 
@@ -70,6 +70,11 @@ spec:
 
 ## Release notes:
 
+### 2.0.0-dev
+* Updated:
+  * migrated to jetty: `11.0.24`
+  * Cradle API to `5.4.4-dev`
+
 ### 1.11.2-dev
 
 * Included scripts for REST API interaction and installed required utils into docker image 

build.gradle

@@ -40,7 +40,7 @@ subprojects {
         implementation(libs.cradle.cassandra)
         implementation "org.slf4j:slf4j-api"
 
-        testImplementation(libs.junit.jupiter.integration)
+        testImplementation(libs.th2.junit.jupiter.integration)
 
         testImplementation(libs.mockito.core)
         testImplementation(libs.mockito.junit.jupiter)
@@ -60,6 +60,8 @@ subprojects {
 
     tasks.register('integrationTest', Test) {
         group = 'verification'
+        systemProperty 'datastax-java-driver.advanced.connection.init-query-timeout', '5 seconds'
+        systemProperty 'datastax-java-driver.basic.request.timeout', '10 seconds'
         useJUnitPlatform {
             includeTags('integration')
         }

cradle-admin-tool-http/README.md

@@ -1,4 +1,4 @@
-# cradle-admin-tool-http (1.11.1-dev)
+# cradle-admin-tool-http (2.0.0-dev)
 Service which allows user to manage books/pages via RestAPI requests.
 - The first page in a book can be created only if start time is more than current time.
 - After the first page all new pages must have start time more than current time + `bookRefreshIntervalMillis` * 2
@@ -76,6 +76,13 @@ Help:
 
 ## Release notes
 
+### 2.0.0-dev
+* Updated:
+  * migrated to jetty: `11.0.24`
+  * th2-gradle-plugin: `0.1.6` (th2-bom: `4.9.0`)
+  * Cradle API to `5.4.4-dev`
+  * jackson-datatype-jsr310: `2.18.2`
+
 ### 1.11.1-dev
 
 + Updated:

cradle-admin-tool-http/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'application'
-    id 'com.exactpro.th2.gradle.component'
+    alias(libs.plugins.th2.component)
 }
 
 dependencies {
@@ -18,8 +18,6 @@ dependencies {
     implementation 'org.apache.commons:commons-lang3'
 
     testImplementation project(':cradle-admin-tool-test')
-    //noinspection DependencyNotationArgument
-    testImplementation group: "org.eclipse.jetty", name: "jetty-http", classifier: "tests"
     testImplementation "org.eclipse.jetty:jetty-util"
 }
 

cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/HttpServer.java

@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright 2021-2023 Exactpro (Exactpro Systems Limited)
+/*
+ * Copyright 2021-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,12 +12,18 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- ******************************************************************************/
+ */
 
 package com.exactpro.th2.cradle.adm.http;
 
 import com.exactpro.cradle.CradleStorage;
-import com.exactpro.th2.cradle.adm.http.servlets.*;
+import com.exactpro.th2.cradle.adm.http.servlets.GetBookInfoServlet;
+import com.exactpro.th2.cradle.adm.http.servlets.GetBookServlet;
+import com.exactpro.th2.cradle.adm.http.servlets.ListAllBookSchemasServlet;
+import com.exactpro.th2.cradle.adm.http.servlets.NewBookServlet;
+import com.exactpro.th2.cradle.adm.http.servlets.NewPageServlet;
+import com.exactpro.th2.cradle.adm.http.servlets.RemovePageServlet;
+import com.exactpro.th2.cradle.adm.http.servlets.UpdatePageServlet;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
@@ -28,11 +34,12 @@
 
 public class HttpServer implements AutoCloseable {
 
-	private static final Logger logger = LoggerFactory.getLogger(HttpServer.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(HttpServer.class);
 
 	private final Configuration configuration;
 	private final CradleStorage storage;
 	protected Server server;
+	protected ServerConnector serverConnector;
 
 	public HttpServer(Configuration configuration, CradleStorage storage) {
 		this.configuration = configuration;
@@ -42,7 +49,7 @@ public HttpServer(Configuration configuration, CradleStorage storage) {
 	protected void createServer() {
 		this.server = new Server();
 
-		ServerConnector serverConnector = new ServerConnector(this.server);
+		serverConnector = new ServerConnector(this.server);
 		serverConnector.setHost(configuration.getIp());
 		serverConnector.setPort(configuration.getPort());
 
@@ -63,11 +70,20 @@ public void run() throws Exception {
 		servletHandler.addServletWithMapping(new ServletHolder(new UpdatePageServlet(storage)), "/update-page");
 
 		server.start();
-		logger.info("server started: http://{}:{}/", configuration.getIp(), configuration.getPort());
+		LOGGER.info("server started: http://{}:{}/", configuration.getIp(), configuration.getPort());
 	}
 
 	@Override
-	public void close() throws Exception {
-		server.stop();
+	public void close() {
+		try {
+			server.stop();
+		} catch (Exception e) {
+			LOGGER.error("Stop server failure", e);
+		}
+		try {
+			serverConnector.close();
+		} catch (Exception e) {
+			LOGGER.error("Close server connector failure", e);
+		}
 	}
 }

cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/GetAllBooksHttpMode.java

@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright 2022-2022 Exactpro (Exactpro Systems Limited)
+/*
+ * Copyright 2022-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- ******************************************************************************/
+ */
 
 package com.exactpro.th2.cradle.adm.http.modes;
 
@@ -21,8 +21,7 @@
 import com.exactpro.th2.cradle.adm.http.params.HttpParamBuilder;
 import com.exactpro.th2.cradle.adm.modes.GetAllBooksMode;
 import com.exactpro.th2.cradle.adm.params.GetAllBooksParams;
-
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 
 public class GetAllBooksHttpMode extends GetAllBooksMode implements HttpMode<GetAllBooksParams> {
@@ -32,8 +31,7 @@ public HttpParamBuilder<GetAllBooksParams> createParamsBuilder() {
     }
 
     @Override
-    public boolean initParams(HttpServletRequest req) throws InvalidConfigurationException {
+    public void initParams(HttpServletRequest req) throws InvalidConfigurationException {
         this.param = getParams(req);
-        return true;
     }
 }

cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/GetBookInfoHttpMode.java

@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright 2022-2022 Exactpro (Exactpro Systems Limited)
+/*
+ * Copyright 2022-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- ******************************************************************************/
+ */
 
 package com.exactpro.th2.cradle.adm.http.modes;
 
@@ -23,7 +23,7 @@
 import com.exactpro.th2.cradle.adm.params.GetBookInfoParams;
 import com.exactpro.th2.cradle.adm.results.BooksListInfo;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class GetBookInfoHttpMode extends GetBookInfoMode implements HttpMode<GetBookInfoParams> {
 
@@ -33,9 +33,8 @@ public HttpParamBuilder<GetBookInfoParams> createParamsBuilder() {
 	}
 
 	@Override
-	public boolean initParams(HttpServletRequest req) throws InvalidConfigurationException {
+	public void initParams(HttpServletRequest req) throws InvalidConfigurationException {
 		this.param = getParams(req);
-		return true;
 	}
 
 	@Override

cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/HttpMode.java

@@ -1,5 +1,5 @@
-/*******************************************************************************
- * Copyright 2021-2021 Exactpro (Exactpro Systems Limited)
+/*
+ * Copyright 2021-2024 Exactpro (Exactpro Systems Limited)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,19 +12,19 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- ******************************************************************************/
+ */
 
 package com.exactpro.th2.cradle.adm.http.modes;
 
 import com.exactpro.th2.cradle.adm.InvalidConfigurationException;
 import com.exactpro.th2.cradle.adm.http.params.HttpParamBuilder;
+import jakarta.servlet.http.HttpServletRequest;
 
-import javax.servlet.http.HttpServletRequest;
 
 public interface HttpMode<T> {
 
 	HttpParamBuilder<T> createParamsBuilder();
-	boolean initParams(HttpServletRequest commandLine) throws InvalidConfigurationException;
+	void initParams(HttpServletRequest commandLine) throws InvalidConfigurationException;
 
 	default T getParams(HttpServletRequest commandLine) throws InvalidConfigurationException {
 		var builder = createParamsBuilder();

cradle-admin-tool-http/src/main/java/com/exactpro/th2/cradle/adm/http/modes/ListAllBookSchemasHttpMode.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2024 Exactpro (Exactpro Systems Limited)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.exactpro.th2.cradle.adm.http.modes;
 
 import com.exactpro.th2.cradle.adm.InvalidConfigurationException;
@@ -7,7 +23,7 @@
 import com.exactpro.th2.cradle.adm.params.NoParams;
 import com.exactpro.th2.cradle.adm.results.BookSchemaInfo;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class ListAllBookSchemasHttpMode extends ListAllBookSchemasMode implements HttpMode<NoParams> {
 
@@ -22,8 +38,7 @@ public HttpParamBuilder<NoParams> createParamsBuilder() {
     }
 
     @Override
-    public boolean initParams(HttpServletRequest commandLine) throws InvalidConfigurationException {
+    public void initParams(HttpServletRequest commandLine) throws InvalidConfigurationException {
         this.param = getParams(commandLine);
-        return true;
     }
 }