From 84491e13ddd8454ea2e54a7db92499154d43144c Mon Sep 17 00:00:00 2001 From: Reneta Popova Date: Fri, 12 May 2023 15:48:24 +0100 Subject: [PATCH 1/3] resolved conflict --- modules/ROOT/pages/introduction.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/ROOT/pages/introduction.adoc b/modules/ROOT/pages/introduction.adoc index 7897f32..13281cc 100644 --- a/modules/ROOT/pages/introduction.adoc +++ b/modules/ROOT/pages/introduction.adoc @@ -9,7 +9,11 @@ Each HTTP request can include a list of statements, and for convenience you can The server guards against orphaned transactions by using a timeout. If there are no requests for a given transaction within the timeout period, the server will roll it back. +<<<<<<< HEAD You can configure the timeout in the server configuration, by setting link:{neo4j-docs-base-uri}/operations-manual/{page-version}/configuration/configuration-settings#config_dbms.rest.transaction.idle_timeout[`dbms.rest.transaction.idle_timeout`] to the number of seconds before timeout. +======= +You can configure the timeout in the server configuration, by setting link:{neo4j-docs-base-uri}/operations-manual/{page-version}/configuration/configuration-settings#config_dbms.rest.transaction.idle_timeout[Operations Manual -> Configuration settings `dbms.rest.transaction.idle_timeout`] to the number of seconds before timeout. +>>>>>>> 77386b0... update the link to configs The default timeout is `60` seconds. Responses from the HTTP API can be transmitted as JSON streams, resulting in better performance and lower memory overhead on the server side. From 594e3faa27fe54ac4b37d0beac2d35181dcb956a Mon Sep 17 00:00:00 2001 From: Stefano Ottolenghi Date: Wed, 14 Jun 2023 09:56:01 +0200 Subject: [PATCH 2/3] Warning on http api not available on aura (#75) --- modules/ROOT/pages/actions/index.adoc | 5 +++++ modules/ROOT/pages/discovery.adoc | 5 +++++ modules/ROOT/pages/index.adoc | 7 ++++++- modules/ROOT/pages/introduction.adoc | 5 +++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/modules/ROOT/pages/actions/index.adoc b/modules/ROOT/pages/actions/index.adoc index f900fff..f37aeab 100644 --- a/modules/ROOT/pages/actions/index.adoc +++ b/modules/ROOT/pages/actions/index.adoc @@ -3,6 +3,11 @@ [[http-api-actions]] = Cypher transaction API +[WARNING] +==== +The HTTP API is currently not available on link:{neo4j-docs-base-uri}/aura[Neo4j Aura]. +==== + There are several _actions_ that can be performed using the Cypher transaction HTTP endpoint. *Concepts:* diff --git a/modules/ROOT/pages/discovery.adoc b/modules/ROOT/pages/discovery.adoc index 226337e..b2aee81 100644 --- a/modules/ROOT/pages/discovery.adoc +++ b/modules/ROOT/pages/discovery.adoc @@ -3,6 +3,11 @@ [[http-api-discovery]] = Discovery API +[WARNING] +==== +The HTTP API is currently not available on link:{neo4j-docs-base-uri}/aura[Neo4j Aura]. +==== + The HTTP API uses the port `7474` for HTTP and the port `7473` for HTTPS. [TIP] diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index b177661..c7f56f6 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -3,6 +3,11 @@ [[http-api]] = HTTP API +[WARNING] +==== +The HTTP API is currently not available on link:{neo4j-docs-base-uri}/aura[Neo4j Aura]. +==== + [discrete] == Neo4j v{neo4j-version} @@ -14,7 +19,7 @@ ifdef::backend-pdf[] License: Creative Commons 4.0 endif::[] -Transactional Cypher HTTP endpoint. +Transactional Cypher HTTP endpoint. This manual covers the following areas: diff --git a/modules/ROOT/pages/introduction.adoc b/modules/ROOT/pages/introduction.adoc index 13281cc..35c1358 100644 --- a/modules/ROOT/pages/introduction.adoc +++ b/modules/ROOT/pages/introduction.adoc @@ -3,6 +3,11 @@ [[http-api-introduction]] = Introduction +[WARNING] +==== +The HTTP API is currently not available on link:{neo4j-docs-base-uri}/aura[Neo4j Aura]. +==== + The Neo4j transactional HTTP endpoint allows you to execute a series of Cypher statements within the scope of a transaction. The transaction may be kept open across multiple HTTP requests, until the client chooses to commit or roll back. Each HTTP request can include a list of statements, and for convenience you can include statements along with a request to begin or commit a transaction. From a2251a368985a667ed41f649a67e889e2b251402 Mon Sep 17 00:00:00 2001 From: AlexicaWright <49636617+AlexicaWright@users.noreply.github.com> Date: Wed, 19 Jul 2023 13:08:06 +0200 Subject: [PATCH 3/3] resolved conflict --- modules/ROOT/pages/introduction.adoc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/ROOT/pages/introduction.adoc b/modules/ROOT/pages/introduction.adoc index 35c1358..42d3d01 100644 --- a/modules/ROOT/pages/introduction.adoc +++ b/modules/ROOT/pages/introduction.adoc @@ -14,11 +14,7 @@ Each HTTP request can include a list of statements, and for convenience you can The server guards against orphaned transactions by using a timeout. If there are no requests for a given transaction within the timeout period, the server will roll it back. -<<<<<<< HEAD You can configure the timeout in the server configuration, by setting link:{neo4j-docs-base-uri}/operations-manual/{page-version}/configuration/configuration-settings#config_dbms.rest.transaction.idle_timeout[`dbms.rest.transaction.idle_timeout`] to the number of seconds before timeout. -======= -You can configure the timeout in the server configuration, by setting link:{neo4j-docs-base-uri}/operations-manual/{page-version}/configuration/configuration-settings#config_dbms.rest.transaction.idle_timeout[Operations Manual -> Configuration settings `dbms.rest.transaction.idle_timeout`] to the number of seconds before timeout. ->>>>>>> 77386b0... update the link to configs The default timeout is `60` seconds. Responses from the HTTP API can be transmitted as JSON streams, resulting in better performance and lower memory overhead on the server side.