From 18a9b7db8bb0a4e7d1cb8ee8cfbf71db0ff1e67e Mon Sep 17 00:00:00 2001
From: Sergio del Amo <sergio.delamo@softamo.com>
Date: Mon, 5 Feb 2024 21:46:54 +0100
Subject: [PATCH] properties intead of yaml (#1430)

---
 guides/micronaut-security-jwt/metadata.json   |  2 +-
 .../micronaut-security-jwt.adoc               |  8 ++---
 .../src/main/resources/application.properties | 20 +++++++++++
 .../src/main/resources/application.yml        | 36 -------------------
 4 files changed, 24 insertions(+), 42 deletions(-)
 create mode 100644 guides/micronaut-security-jwt/src/main/resources/application.properties
 delete mode 100644 guides/micronaut-security-jwt/src/main/resources/application.yml

diff --git a/guides/micronaut-security-jwt/metadata.json b/guides/micronaut-security-jwt/metadata.json
index 45cc9a5af5..e27e5aeaed 100644
--- a/guides/micronaut-security-jwt/metadata.json
+++ b/guides/micronaut-security-jwt/metadata.json
@@ -8,7 +8,7 @@
   "apps": [
     {
       "name": "default",
-      "features": ["yaml", "security-jwt", "data-jdbc", "reactor", "graalvm", "validation"]
+      "features": ["security-jwt", "data-jdbc", "reactor", "graalvm", "validation"]
     }
   ]
 }
diff --git a/guides/micronaut-security-jwt/micronaut-security-jwt.adoc b/guides/micronaut-security-jwt/micronaut-security-jwt.adoc
index 1462725408..735346e3bc 100644
--- a/guides/micronaut-security-jwt/micronaut-security-jwt.adoc
+++ b/guides/micronaut-security-jwt/micronaut-security-jwt.adoc
@@ -18,11 +18,9 @@ common:create-app-features.adoc[]
 
 === Configuration
 
-Note the following configuration in the generated `application.yml`:
+Note the following configuration in the generated `application.properties`:
 
-common:yaml-dependency.adoc[]
-
-resource:application.yml[tag=security]
+resource:application.properties[tag=security]
 
 <1> Set `authentication` to `bearer` to receive a JSON response from the login endpoint.
 <2> Change this to your own secret and keep it safe (do not store this in your VCS).
@@ -83,7 +81,7 @@ Access tokens expire. You can control the expiration with `micronaut.security.to
 
 First, add the following configuration:
 
-resource:application.yml[tag=refresh]
+resource:application.properties[tag=refresh]
 
 <1> To generate a refresh token your application must have beans of type:
 https://micronaut-projects.github.io/micronaut-security/latest/api/io/micronaut/security/token/generator/RefreshTokenGenerator.html[RefreshTokenGenerator],
diff --git a/guides/micronaut-security-jwt/src/main/resources/application.properties b/guides/micronaut-security-jwt/src/main/resources/application.properties
new file mode 100644
index 0000000000..2e40296117
--- /dev/null
+++ b/guides/micronaut-security-jwt/src/main/resources/application.properties
@@ -0,0 +1,20 @@
+micronaut.application.name=micronautguide
+#tag::security[]
+# <1>
+micronaut.security.authentication=bearer
+# <2>
+micronaut.security.token.jwt.signatures.secret.generator.secret="${JWT_GENERATOR_SIGNATURE_SECRET:pleaseChangeThisSecretForANewOne}"'
+#end::security[]
+#tag::refresh[]
+# <1>
+micronaut.security.token.jwt.generator.refresh-token.secret="${JWT_GENERATOR_SIGNATURE_SECRET:pleaseChangeThisSecretForANewOne}"'
+#end::refresh[]
+---
+#tag::datasources[]
+datasources.default.password=
+datasources.default.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+datasources.default.username=sa
+datasources.default.driver-class-name=org.h2.Driver
+datasources.default.schema-generate=CREATE_DROP
+datasources.default.dialect=H2
+#end::datasource[]
diff --git a/guides/micronaut-security-jwt/src/main/resources/application.yml b/guides/micronaut-security-jwt/src/main/resources/application.yml
deleted file mode 100644
index 3a8dec16a2..0000000000
--- a/guides/micronaut-security-jwt/src/main/resources/application.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-micronaut:
-  application:
-    name: micronautguide
----
-#tag::security[]
-micronaut:
-  security:
-    authentication: bearer # <1>
-    token:
-      jwt:
-        signatures:
-          secret:
-            generator:
-              secret: '"${JWT_GENERATOR_SIGNATURE_SECRET:pleaseChangeThisSecretForANewOne}"' # <2>
-#end::security[]
----
-#tag::refresh[]
-micronaut:
-  security:
-    token:
-      jwt:
-        generator:
-          refresh-token:
-            secret: '"${JWT_GENERATOR_SIGNATURE_SECRET:pleaseChangeThisSecretForANewOne}"' # <1>
-#end::refresh[]
----
-#tag::datasources[]
-datasources:
-  default:
-    url: jdbc:h2:mem:devDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
-    driverClassName: org.h2.Driver
-    username: sa
-    password: ''
-    schema-generate: CREATE_DROP
-    dialect: H2
-#end::datasources[]