From 3c729f4fece53228cfa5c0a7f56bd7c909bac59d Mon Sep 17 00:00:00 2001
From: sdelamo <sergio.delamo@softamo.com>
Date: Sat, 11 Nov 2023 18:13:58 +0100
Subject: [PATCH] remove yaml configuration from hibernate JPA guide

See: https://github.com/micronaut-projects/micronaut-guides/issues/1356

properties
---
 guides/micronaut-jpa-hibernate/metadata.json  |  2 +-
 .../micronaut-jpa-hibernate.adoc              |  4 +--
 .../src/main/resources/application.properties | 14 ++++++++++
 .../src/main/resources/application.yml        | 27 -------------------
 4 files changed, 17 insertions(+), 30 deletions(-)
 create mode 100644 guides/micronaut-jpa-hibernate/src/main/resources/application.properties
 delete mode 100644 guides/micronaut-jpa-hibernate/src/main/resources/application.yml

diff --git a/guides/micronaut-jpa-hibernate/metadata.json b/guides/micronaut-jpa-hibernate/metadata.json
index f8dc7a25e7b..cb62a7907a4 100644
--- a/guides/micronaut-jpa-hibernate/metadata.json
+++ b/guides/micronaut-jpa-hibernate/metadata.json
@@ -9,7 +9,7 @@
   "apps": [
     {
       "name": "default",
-      "features": ["yaml","graalvm", "hibernate-jpa", "data-jpa", "serialization-jackson", "validation"]
+      "features": ["graalvm", "hibernate-jpa", "data-jpa", "serialization-jackson", "validation"]
     }
   ]
 }
diff --git a/guides/micronaut-jpa-hibernate/micronaut-jpa-hibernate.adoc b/guides/micronaut-jpa-hibernate/micronaut-jpa-hibernate.adoc
index dba42040800..2959f81fed1 100644
--- a/guides/micronaut-jpa-hibernate/micronaut-jpa-hibernate.adoc
+++ b/guides/micronaut-jpa-hibernate/micronaut-jpa-hibernate.adoc
@@ -28,9 +28,9 @@ dependency:jakarta.persistence-api[groupId=jakarta.persistence,version=2.2.3,cal
 
 Define the data source in `src/main/resources/application.yml`.
 
-common:yaml-dependency.adoc[]
+Define the data source in `src/main/resources/application.properties`.
 
-resource:application.yml[tag=datasource]
+resource:application.properties[tag=datasource]
 
 NOTE: This way of defining the datasource properties means that we can externalize the configuration, for example for production environment, and also provide a default value for development. If the environment variables are not defined the Micronaut framework will use the default values. +
 Also keep in mind that it is necessary to escape the `:` in the connection URL using backticks ```.
diff --git a/guides/micronaut-jpa-hibernate/src/main/resources/application.properties b/guides/micronaut-jpa-hibernate/src/main/resources/application.properties
new file mode 100644
index 00000000000..9a737d13271
--- /dev/null
+++ b/guides/micronaut-jpa-hibernate/src/main/resources/application.properties
@@ -0,0 +1,14 @@
+micronaut.application.name=micronautguide
+#tag::application[]
+application.max=50
+#end::application[]
+#tag::datasource[]
+datasources.default.password=${JDBC_PASSWORD:""}
+datasources.default.url=${JDBC_URL:`jdbc:h2:mem:default;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE`}
+datasources.default.username=${JDBC_USER:sa}
+datasources.default.driver-class-name=${JDBC_DRIVER:org.h2.Driver}
+#end::datasource[]
+#tag::jpa[]
+jpa.default.properties.hibernate.hbm2ddl.auto=update
+jpa.default.properties.hibernate.show_sql=true
+#end::jpa[]
\ No newline at end of file
diff --git a/guides/micronaut-jpa-hibernate/src/main/resources/application.yml b/guides/micronaut-jpa-hibernate/src/main/resources/application.yml
deleted file mode 100644
index b3f88547c41..00000000000
--- a/guides/micronaut-jpa-hibernate/src/main/resources/application.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-micronaut:
-  application:
-    name: micronautguide
----
-#tag::application[]
-application:
-  max: 50
-    #end::application[]
----
-#tag::datasource[]
-datasources:
-  default:
-    url: ${JDBC_URL:`jdbc:h2:mem:default;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE`}
-    username: ${JDBC_USER:sa}
-    password: ${JDBC_PASSWORD:""}
-    driverClassName: ${JDBC_DRIVER:org.h2.Driver}
-#end::datasource[]
----
-#tag::jpa[]
-jpa:
-  default:
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: update
-        show_sql: true
-#end::jpa[]
\ No newline at end of file