From c654eff41b0ed5f7db360452dcf3f4161aa9a4c8 Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Wed, 30 Nov 2016 16:58:11 +0900
Subject: [PATCH] Update doc for spring.data.neo4j.open-in-view

See gh-7533
---
 ...itional-spring-configuration-metadata.json | 19 -------------------
 .../appendix-application-properties.adoc      |  2 +-
 .../main/asciidoc/spring-boot-features.adoc   |  2 +-
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index b2ccbda8b44..fe52f44404e 100644
--- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -368,25 +368,6 @@
       }
     ]
   },
-  {
-    "name": "spring.data.neo4j.session.scope",
-    "values": [
-      {
-        "value": "singleton"
-      },
-      {
-        "value": "session"
-      },
-      {
-        "value": "request"
-      }
-    ],
-    "providers": [
-      {
-        "name": "any"
-      }
-    ]
-  },
   {
     "name": "spring.datasource.driver-class-name",
     "providers": [
diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index d28abf5163f..c719953b9f4 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -578,9 +578,9 @@ content into your application; rather pick only the properties that you need.
 	# NEO4J ({sc-spring-boot-autoconfigure}/neo4j/Neo4jProperties.{sc-ext}[Neo4jProperties])
 	spring.data.neo4j.compiler= # Compiler to use.
 	spring.data.neo4j.embedded.enabled=true # Enable embedded mode if the embedded driver is available.
+	spring.data.neo4j.open-in-view=false # Register OpenSessionInViewInterceptor. Binds a Neo4j Session to the thread for the entire processing of the request.
 	spring.data.neo4j.password= # Login password of the server.
 	spring.data.neo4j.repositories.enabled=true # Enable Neo4j repositories.
-	spring.data.neo4j.session.scope=singleton # Scope (lifetime) of the session.
 	spring.data.neo4j.uri= # URI used by the driver. Auto-detected by default.
 	spring.data.neo4j.username= # Login user of the server.
 
diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index d3852fe5be2..d4dda9ac88a 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -3405,7 +3405,7 @@ By default, the lifetime of the session is scope to the application. If you are
 web application you can change it to scope or request easily:
 
 ----
-	spring.data.neo4j.session.scope=session
+	spring.data.neo4j.open-in-view=true
 ----