From 000a073ebbd970625c2dc588803cc3f29123a918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6rdes?= Date: Thu, 12 Feb 2026 10:00:54 +0100 Subject: [PATCH 1/2] inline list items with otherAttributeInfo --- .../predic8/membrane/annot/generator/JsonSchemaGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/annot/src/main/java/com/predic8/membrane/annot/generator/JsonSchemaGenerator.java b/annot/src/main/java/com/predic8/membrane/annot/generator/JsonSchemaGenerator.java index a98b57181f..18c62367af 100644 --- a/annot/src/main/java/com/predic8/membrane/annot/generator/JsonSchemaGenerator.java +++ b/annot/src/main/java/com/predic8/membrane/annot/generator/JsonSchemaGenerator.java @@ -499,7 +499,6 @@ private boolean shouldInlineListItems(MainInfo main, ChildElementInfo cei) { if (ei.getAnnotation().collapsed()) return false; if (ei.getAnnotation().noEnvelope()) return false; - if (ei.isString()) return false; return hasAnyConfigurableProperty(ei, main); } @@ -525,6 +524,7 @@ private boolean hasAnyConfigurableProperty(ElementInfo ei, MainInfo main) { .anyMatch(ai -> !"id".equals(ai.getXMLName())) || ei.getTci() != null || !ei.getChildElementSpecs().isEmpty() + || ei.getOai() != null || hasComponentChild(ei, main); } From bd02559080fae926d73972b98ff7b9ff7299f8b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6rdes?= Date: Thu, 12 Feb 2026 10:04:24 +0100 Subject: [PATCH 2/2] update examples --- README.md | 17 +++++++---------- .../security/basic-auth/simple/apis.yaml | 10 ++++------ distribution/examples/security/login/apis.yaml | 7 +++---- .../oauth2/api/authorization_server/apis.yaml | 7 +++---- .../credentials/authorization_server/apis.yaml | 7 +++---- .../implicit/authorization_server/apis.yaml | 7 +++---- .../membrane/authorization_server/apis.yaml | 7 +++---- .../websockets/websocket-stomp/apis.yaml | 5 ++--- distribution/router/conf/apis.yaml | 5 ++--- .../getting-started/45-Admin-Web-Console.yaml | 5 ++--- 10 files changed, 32 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index 8f7f011c4b..bb156b63f5 100644 --- a/README.md +++ b/README.md @@ -959,10 +959,9 @@ api: consentFile: consentFile.json staticUserDataProvider: users: - - user: - username: john - password: secret - email: john@predic8.de + - username: john + password: secret + email: john@predic8.de staticClientList: clients: - clientId: abc @@ -992,12 +991,10 @@ api: flow: - basicAuthentication: users: - - user: - username: alice - password: secret - - user: - username: bob - password: secret + - username: alice + password: secret + - username: bob + password: secret target: url: https://api.predic8.de ``` diff --git a/distribution/examples/security/basic-auth/simple/apis.yaml b/distribution/examples/security/basic-auth/simple/apis.yaml index fb536db49d..400a936d17 100644 --- a/distribution/examples/security/basic-auth/simple/apis.yaml +++ b/distribution/examples/security/basic-auth/simple/apis.yaml @@ -4,12 +4,10 @@ api: flow: - basicAuthentication: users: - - user: - username: alice - password: membrane - - user: - username: bob - password: membrane2025 + - username: alice + password: membrane + - username: bob + password: membrane2025 target: url: https://api.predic8.de diff --git a/distribution/examples/security/login/apis.yaml b/distribution/examples/security/login/apis.yaml index 3bf34941fb..6bc0f5a7e8 100644 --- a/distribution/examples/security/login/apis.yaml +++ b/distribution/examples/security/login/apis.yaml @@ -8,10 +8,9 @@ api: location: ./dialog staticUserDataProvider: users: - - user: - username: john - password: password - secret: abcdefghijklmnop + - username: john + password: password + secret: abcdefghijklmnop totpTokenProvider: {} target: host: membrane-soa.org diff --git a/distribution/examples/security/oauth2/api/authorization_server/apis.yaml b/distribution/examples/security/oauth2/api/authorization_server/apis.yaml index 07ef2539d2..ef3790b16e 100644 --- a/distribution/examples/security/oauth2/api/authorization_server/apis.yaml +++ b/distribution/examples/security/oauth2/api/authorization_server/apis.yaml @@ -8,10 +8,9 @@ api: # UserDataProvider is exchangeable, e.g. for a database table staticUserDataProvider: users: - - user: - username: john - password: password - email: john@predic8.de + - username: john + password: password + email: john@predic8.de staticClientList: clients: - clientId: abc diff --git a/distribution/examples/security/oauth2/credentials/authorization_server/apis.yaml b/distribution/examples/security/oauth2/credentials/authorization_server/apis.yaml index 61355e051d..9b6964ec7d 100644 --- a/distribution/examples/security/oauth2/credentials/authorization_server/apis.yaml +++ b/distribution/examples/security/oauth2/credentials/authorization_server/apis.yaml @@ -8,10 +8,9 @@ api: # UserDataProvider is exchangeable, e.g. for a database table staticUserDataProvider: users: - - user: - username: john - password: password - email: john@predic8.de + - username: john + password: password + email: john@predic8.de staticClientList: clients: - clientId: abc diff --git a/distribution/examples/security/oauth2/implicit/authorization_server/apis.yaml b/distribution/examples/security/oauth2/implicit/authorization_server/apis.yaml index da0dbaca60..baae769341 100644 --- a/distribution/examples/security/oauth2/implicit/authorization_server/apis.yaml +++ b/distribution/examples/security/oauth2/implicit/authorization_server/apis.yaml @@ -10,10 +10,9 @@ api: # UserDataProvider is exchangeable, e.g. for a database table staticUserDataProvider: users: - - user: - username: john - password: password - email: john@predic8.de + - username: john + password: password + email: john@predic8.de staticClientList: clients: - client: diff --git a/distribution/examples/security/oauth2/membrane/authorization_server/apis.yaml b/distribution/examples/security/oauth2/membrane/authorization_server/apis.yaml index dcb667f770..7fe31a8dbc 100644 --- a/distribution/examples/security/oauth2/membrane/authorization_server/apis.yaml +++ b/distribution/examples/security/oauth2/membrane/authorization_server/apis.yaml @@ -10,10 +10,9 @@ api: # UserDataProvider is exchangeable, e.g. for a database table staticUserDataProvider: users: - - user: - username: john - password: password - email: john@predic8.de + - username: john + password: password + email: john@predic8.de staticClientList: clients: - clientId: abc diff --git a/distribution/examples/websockets/websocket-stomp/apis.yaml b/distribution/examples/websockets/websocket-stomp/apis.yaml index d54b0d33fa..5ccd7117db 100644 --- a/distribution/examples/websockets/websocket-stomp/apis.yaml +++ b/distribution/examples/websockets/websocket-stomp/apis.yaml @@ -34,7 +34,6 @@ api: flow: - basicAuthentication: users: - - user: - username: admin - password: membrane + - username: admin + password: membrane - adminConsole: {} diff --git a/distribution/router/conf/apis.yaml b/distribution/router/conf/apis.yaml index 0ea85ee9b5..9a8c2b9ff4 100644 --- a/distribution/router/conf/apis.yaml +++ b/distribution/router/conf/apis.yaml @@ -43,7 +43,6 @@ api: # Protect the Admin Console using authentication (Basic, OAuth2, ACL, or none). - basicAuthentication: users: - - user: - username: admin - password: admin + - username: admin + password: admin - adminConsole: {} diff --git a/distribution/tutorials/getting-started/45-Admin-Web-Console.yaml b/distribution/tutorials/getting-started/45-Admin-Web-Console.yaml index 2f5e1da161..491b589479 100644 --- a/distribution/tutorials/getting-started/45-Admin-Web-Console.yaml +++ b/distribution/tutorials/getting-started/45-Admin-Web-Console.yaml @@ -19,9 +19,8 @@ api: # Protect the Admin Console using authentication (Basic, OAuth2, ACL, or none). - basicAuthentication: users: - - user: - username: admin - password: admin + - username: admin + password: admin - adminConsole: readOnly: true