Make SessionId a string everywhere

Fixes #100

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.2.3
+* ``Session#id`` is now a String #100
+* Updated dependencies
+
 # 1.2.2
 * Updated dependencies
   * Updated to OpenAPI Generator 7.4

openapi/openapi.yml

@@ -289,6 +289,8 @@ components:
       type: object
       readOnly: true
       properties:
+        id:
+          type: string
         title:
           type: string
         description:
@@ -325,6 +327,7 @@ components:
           $ref: '#/components/schemas/Status'
           nullable: true
       required:
+        - id
         - categoryItems
         - endsAt
         - isPlenumSession
@@ -339,9 +342,6 @@ components:
         - type: object
           readOnly: true
           properties:
-            id:
-              type: string
-              format: integer # Sessions Endpoint contains only numeric IDs
             room:
               type: string
               nullable: true
@@ -358,7 +358,6 @@ components:
               items:
                 $ref: '#/components/schemas/CategorySession'
           required:
-            - id
             - questionAnswers
             - speakers
             - categories
@@ -368,8 +367,6 @@ components:
         - type: object
           readOnly: true
           properties:
-            id:
-              type: string # All Endpoint contains numeric IDs mixed with UUIDs
             speakers:
               type: array
               items:
@@ -379,9 +376,19 @@ components:
               items:
                 $ref: '#/components/schemas/QuestionAnswer' # All Endpoint
           required:
-            - id
             - questionAnswers
             - speakers
+    SessionMinimal:
+      type: object
+      readOnly: true
+      properties:
+        id:
+          type: integer
+        name:
+          type: string
+      required:
+        - id
+        - name
     SessionGroup:
       type: object
       readOnly: true
@@ -396,17 +403,6 @@ components:
             $ref: '#/components/schemas/Session'
         isDefault:
           type: boolean
-    SessionMinimal:
-      type: object
-      readOnly: true
-      properties:
-        id:
-          type: integer
-        name:
-          type: string
-      required:
-        - id
-        - name
     BaseSpeakerEssential:
       type: object
       readOnly: true

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

@@ -40,6 +40,7 @@
  * BaseSession
  */
 @JsonPropertyOrder({
+  BaseSession.JSON_PROPERTY_ID,
   BaseSession.JSON_PROPERTY_TITLE,
   BaseSession.JSON_PROPERTY_DESCRIPTION,
   BaseSession.JSON_PROPERTY_STARTS_AT,
@@ -53,6 +54,9 @@
   BaseSession.JSON_PROPERTY_STATUS
 })
 public class BaseSession {
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
   public static final String JSON_PROPERTY_TITLE = "title";
   private String title;
 
@@ -89,6 +93,32 @@ public class BaseSession {
   public BaseSession() {
   }
 
+  public BaseSession id(String id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @jakarta.annotation.Nonnull
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getId() {
+    return id;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public void setId(String id) {
+    this.id = id;
+  }
+
+
   public BaseSession title(String title) {
 
     this.title = title;
@@ -415,7 +445,8 @@ public boolean equals(Object o) {
       return false;
     }
     BaseSession baseSession = (BaseSession) o;
-    return Objects.equals(this.title, baseSession.title) &&
+    return Objects.equals(this.id, baseSession.id) &&
+        Objects.equals(this.title, baseSession.title) &&
         equalsNullable(this.description, baseSession.description) &&
         Objects.equals(this.startsAt, baseSession.startsAt) &&
         Objects.equals(this.endsAt, baseSession.endsAt) &&
@@ -434,7 +465,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);
+    return Objects.hash(id, title, hashCodeNullable(description), startsAt, endsAt, isServiceSession, isPlenumSession, categoryItems, roomId, hashCodeNullable(liveUrl), hashCodeNullable(recordingUrl), status);
   }
 
   private static <T> int hashCodeNullable(JsonNullable<T> a) {
@@ -448,6 +479,7 @@ private static <T> int hashCodeNullable(JsonNullable<T> a) {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class BaseSession {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    title: ").append(toIndentedString(title)).append("\n");
     sb.append("    description: ").append(toIndentedString(description)).append("\n");
     sb.append("    startsAt: ").append(toIndentedString(startsAt)).append("\n");
@@ -506,6 +538,16 @@ public String toUrlQueryString(String prefix) {
 
     StringJoiner joiner = new StringJoiner("&");
 
+    // add `id` to the URL query string
+    if (getId() != null) {
+      try {
+        joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20")));
+      } catch (UnsupportedEncodingException e) {
+        // Should never happen, UTF-8 is always supported
+        throw new RuntimeException(e);
+      }
+    }
+
     // add `title` to the URL query string
     if (getTitle() != null) {
       try {

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

@@ -43,6 +43,7 @@
  * Session
  */
 @JsonPropertyOrder({
+  Session.JSON_PROPERTY_ID,
   Session.JSON_PROPERTY_TITLE,
   Session.JSON_PROPERTY_DESCRIPTION,
   Session.JSON_PROPERTY_STARTS_AT,
@@ -54,13 +55,15 @@
   Session.JSON_PROPERTY_LIVE_URL,
   Session.JSON_PROPERTY_RECORDING_URL,
   Session.JSON_PROPERTY_STATUS,
-  Session.JSON_PROPERTY_ID,
   Session.JSON_PROPERTY_ROOM,
   Session.JSON_PROPERTY_SPEAKERS,
   Session.JSON_PROPERTY_QUESTION_ANSWERS,
   Session.JSON_PROPERTY_CATEGORIES
 })
 public class Session {
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
   public static final String JSON_PROPERTY_TITLE = "title";
   private String title;
 
@@ -94,9 +97,6 @@ public class Session {
   public static final String JSON_PROPERTY_STATUS = "status";
   private Status status;
 
-  public static final String JSON_PROPERTY_ID = "id";
-  private Integer id;
-
   public static final String JSON_PROPERTY_ROOM = "room";
   private JsonNullable<String> room = JsonNullable.<String>undefined();
 
@@ -112,6 +112,32 @@ public class Session {
   public Session() {
   }
 
+  public Session id(String id) {
+    
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @jakarta.annotation.Nonnull
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public String getId() {
+    return id;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public void setId(String id) {
+    this.id = id;
+  }
+
+
   public Session title(String title) {
 
     this.title = title;
@@ -430,32 +456,6 @@ public void setStatus(Status status) {
   }
 
 
-  public Session id(Integer id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @jakarta.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Integer getId() {
-    return id;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setId(Integer id) {
-    this.id = id;
-  }
-
-
   public Session room(String room) {
     this.room = JsonNullable.<String>of(room);
 
@@ -600,7 +600,8 @@ public boolean equals(Object o) {
       return false;
     }
     Session session = (Session) o;
-    return Objects.equals(this.title, session.title) &&
+    return Objects.equals(this.id, session.id) &&
+        Objects.equals(this.title, session.title) &&
         equalsNullable(this.description, session.description) &&
         Objects.equals(this.startsAt, session.startsAt) &&
         Objects.equals(this.endsAt, session.endsAt) &&
@@ -611,7 +612,6 @@ public boolean equals(Object o) {
         equalsNullable(this.liveUrl, session.liveUrl) &&
         equalsNullable(this.recordingUrl, session.recordingUrl) &&
         Objects.equals(this.status, session.status) &&
-        Objects.equals(this.id, session.id) &&
         equalsNullable(this.room, session.room) &&
         Objects.equals(this.speakers, session.speakers) &&
         Objects.equals(this.questionAnswers, session.questionAnswers) &&
@@ -624,7 +624,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, hashCodeNullable(room), speakers, questionAnswers, categories);
+    return Objects.hash(id, title, hashCodeNullable(description), startsAt, endsAt, isServiceSession, isPlenumSession, categoryItems, roomId, hashCodeNullable(liveUrl), hashCodeNullable(recordingUrl), status, hashCodeNullable(room), speakers, questionAnswers, categories);
   }
 
   private static <T> int hashCodeNullable(JsonNullable<T> a) {
@@ -638,6 +638,7 @@ private static <T> int hashCodeNullable(JsonNullable<T> a) {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Session {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    title: ").append(toIndentedString(title)).append("\n");
     sb.append("    description: ").append(toIndentedString(description)).append("\n");
     sb.append("    startsAt: ").append(toIndentedString(startsAt)).append("\n");
@@ -649,7 +650,6 @@ public String toString() {
     sb.append("    liveUrl: ").append(toIndentedString(liveUrl)).append("\n");
     sb.append("    recordingUrl: ").append(toIndentedString(recordingUrl)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    room: ").append(toIndentedString(room)).append("\n");
     sb.append("    speakers: ").append(toIndentedString(speakers)).append("\n");
     sb.append("    questionAnswers: ").append(toIndentedString(questionAnswers)).append("\n");
@@ -701,6 +701,16 @@ public String toUrlQueryString(String prefix) {
 
     StringJoiner joiner = new StringJoiner("&");
 
+    // add `id` to the URL query string
+    if (getId() != null) {
+      try {
+        joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20")));
+      } catch (UnsupportedEncodingException e) {
+        // Should never happen, UTF-8 is always supported
+        throw new RuntimeException(e);
+      }
+    }
+
     // add `title` to the URL query string
     if (getTitle() != null) {
       try {
@@ -815,16 +825,6 @@ public String toUrlQueryString(String prefix) {
       }
     }
 
-    // add `id` to the URL query string
-    if (getId() != null) {
-      try {
-        joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20")));
-      } catch (UnsupportedEncodingException e) {
-        // Should never happen, UTF-8 is always supported
-        throw new RuntimeException(e);
-      }
-    }
-
     // add `room` to the URL query string
     if (getRoom() != null) {
       try {