Reformat

Author: AB-xdev

openapi/openapi.yml

@@ -154,37 +154,37 @@ components:
         - sort
     CategorySession:
       allOf:
-      - $ref: '#/components/schemas/BaseCategory'
-      - type: object
-        readOnly: true
-        properties:
-          name:
-            type: string
-          categoryItems:
-            type: array
-            items:
-              $ref: '#/components/schemas/CategoryItem'
-        required:
-          - name
-          - categoryItems
+        - $ref: '#/components/schemas/BaseCategory'
+        - type: object
+          readOnly: true
+          properties:
+            name:
+              type: string
+            categoryItems:
+              type: array
+              items:
+                $ref: '#/components/schemas/CategoryItem'
+          required:
+            - name
+            - categoryItems
     CategoryAll:
       allOf:
-      - $ref: '#/components/schemas/BaseCategory'
-      - type: object
-        readOnly: true
-        properties:
-          title:
-            type: string
-          items:
-            type: array
+        - $ref: '#/components/schemas/BaseCategory'
+        - type: object
+          readOnly: true
+          properties:
+            title:
+              type: string
             items:
-              $ref: '#/components/schemas/CategoryItemAll'
-          type:
-            type: string
-        required:
-          - title
-          - items
-          - type
+              type: array
+              items:
+                $ref: '#/components/schemas/CategoryItemAll'
+            type:
+              type: string
+          required:
+            - items
+            - title
+            - type
     CategoryItem:
       type: object
       readOnly: true
@@ -198,14 +198,14 @@ components:
         - name
     CategoryItemAll:
       allOf:
-      - $ref: '#/components/schemas/CategoryItem'
-      - type: object
-        readOnly: true
-        properties:
-          sort:
-            type: integer
-        required:
-          - sort
+        - $ref: '#/components/schemas/CategoryItem'
+        - type: object
+          readOnly: true
+          properties:
+            sort:
+              type: integer
+          required:
+            - sort
     Link:
       type: object
       readOnly: true
@@ -335,54 +335,53 @@ components:
         - title
     Session:
       allOf:
-      - $ref: '#/components/schemas/BaseSession'
-      - type: object
-        readOnly: true
-        properties:
-          id:
-            type: string
-            format: integer # Sessions Endpoint contains only numeric IDs
-          room:
-            type: string
-            nullable: true
-          speakers:
-            type: array
-            items:
-              $ref: '#/components/schemas/SpeakerMinimal'
-          questionAnswers:
-            type: array
-            items:
-              $ref: '#/components/schemas/QuestionAnswerFull'
-          categories:
-            type: array
-            items:
-              $ref: '#/components/schemas/CategorySession'
-        required:
-          - id
-          - room
-          - questionAnswers
-          - speakers
-          - categories
+        - $ref: '#/components/schemas/BaseSession'
+        - type: object
+          readOnly: true
+          properties:
+            id:
+              type: string
+              format: integer # Sessions Endpoint contains only numeric IDs
+            room:
+              type: string
+              nullable: true
+            speakers:
+              type: array
+              items:
+                $ref: '#/components/schemas/SpeakerMinimal'
+            questionAnswers:
+              type: array
+              items:
+                $ref: '#/components/schemas/QuestionAnswerFull'
+            categories:
+              type: array
+              items:
+                $ref: '#/components/schemas/CategorySession'
+          required:
+            - id
+            - questionAnswers
+            - speakers
+            - categories
     SessionAll:
       allOf:
-      - $ref: '#/components/schemas/BaseSession'
-      - type: object
-        readOnly: true
-        properties:
-          id:
-            type: string # All Endpoint contains numeric IDs mixed with UUIDs
-          speakers:
-            type: array
-            items:
-              type: string # All Endpoint
-          questionAnswers:
-            type: array
-            items:
-              $ref: '#/components/schemas/QuestionAnswer' # All Endpoint
-        required:
-          - id
-          - questionAnswers
-          - speakers
+        - $ref: '#/components/schemas/BaseSession'
+        - type: object
+          readOnly: true
+          properties:
+            id:
+              type: string # All Endpoint contains numeric IDs mixed with UUIDs
+            speakers:
+              type: array
+              items:
+                type: string # All Endpoint
+            questionAnswers:
+              type: array
+              items:
+                $ref: '#/components/schemas/QuestionAnswer' # All Endpoint
+          required:
+            - id
+            - questionAnswers
+            - speakers
     SessionGroup:
       type: object
       readOnly: true

sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Session.java

@@ -99,7 +99,7 @@ public class Session {
   private Integer id;
 
   public static final String JSON_PROPERTY_ROOM = "room";
-  private String room;
+  private JsonNullable<String> room = JsonNullable.<String>undefined();
 
   public static final String JSON_PROPERTY_SPEAKERS = "speakers";
   private List<SpeakerMinimal> speakers = new ArrayList<>();
@@ -458,8 +458,8 @@ public void setId(Integer id) {
 
 
   public Session room(String room) {
+    this.room = JsonNullable.<String>of(room);
 
-    this.room = room;
     return this;
   }
 
@@ -468,20 +468,28 @@ public Session room(String room) {
    * @return room
   **/
   @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_ROOM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JsonIgnore
 
   public String getRoom() {
-    return room;
+        return room.orElse(null);
   }
 
+  @JsonProperty(JSON_PROPERTY_ROOM)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
+  public JsonNullable<String> getRoom_JsonNullable() {
+    return room;
+  }
+  
   @JsonProperty(JSON_PROPERTY_ROOM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setRoom(String room) {
+  public void setRoom_JsonNullable(JsonNullable<String> room) {
     this.room = room;
   }
 
+  public void setRoom(String room) {
+    this.room = JsonNullable.<String>of(room);
+  }
+
 
   public Session speakers(List<SpeakerMinimal> speakers) {
 
@@ -605,7 +613,7 @@ public boolean equals(Object o) {
         equalsNullable(this.recordingUrl, session.recordingUrl) &&
         Objects.equals(this.status, session.status) &&
         Objects.equals(this.id, session.id) &&
-        Objects.equals(this.room, session.room) &&
+        equalsNullable(this.room, session.room) &&
         Objects.equals(this.speakers, session.speakers) &&
         Objects.equals(this.questionAnswers, session.questionAnswers) &&
         Objects.equals(this.categories, session.categories);
@@ -617,7 +625,7 @@ private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b)
 
   @Override
   public int hashCode() {
-    return Objects.hash(title, hashCodeNullable(description), startsAt, endsAt, isServiceSession, isPlenumSession, categoryItems, roomId, hashCodeNullable(liveUrl), hashCodeNullable(recordingUrl), status, id, room, speakers, questionAnswers, categories);
+    return Objects.hash(title, hashCodeNullable(description), startsAt, endsAt, isServiceSession, isPlenumSession, categoryItems, roomId, hashCodeNullable(liveUrl), hashCodeNullable(recordingUrl), status, id, hashCodeNullable(room), speakers, questionAnswers, categories);
   }
 
   private static <T> int hashCodeNullable(JsonNullable<T> a) {