inline list items with otherAttributeInfo (#2777)

* inline list items with otherAttributeInfo

* update examples

Author: christiangoerdes

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
 ```

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);
     }
 

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
 

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

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

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

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:

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

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: {}

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: {}