Merge pull request #23 from xdev-software/develop

Release 1.1.0

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.1.0
+* Add undocumented ``video_stream`` field for sessions.<br/>Affected endpoints are:
+  * ``/session/add``
+  * ``/session/mod``
+  * ``/session/export``
+
 # 1.0.2
 * Add all available fields to model returned by ``/user/list``
 * Updated dependencies

openapi/openapi.yml

@@ -131,6 +131,12 @@ paths:
             enum: [ 'Y', 'N' ]
             maxLength: 1
           description: 'Y = session is active, N = session is deactivated and hidden'
+        - name: video_stream
+          in: query
+          schema:
+            type: string
+            maxLength: 1024
+          description: 'Livestream url (url is not validated!). Undocumented'
         - name: custom_fields
           in: query
           schema:
@@ -251,6 +257,12 @@ paths:
             enum: [ 'Y', 'N' ]
             maxLength: 1
           description: 'Y = session is active, N = session is deactivated and hidden'
+        - name: video_stream
+          in: query
+          schema:
+            type: string
+            maxLength: 1024
+          description: 'Livestream url (url is not validated!). Undocumented'
       responses:
         '200':
           description: Returned if the request was processed - no matter if it was successful or not; OK when successful; other text-Responses usually indicate an error
@@ -777,6 +789,9 @@ components:
         event_type_sort:
           type: string
           description: 'Numeric string'
+        video_stream:
+          type: string
+          description: 'Livestream url (url is not validated!). Undocumented'
     ExportSpeaker:
       type: object
       readOnly: true

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.xdev-software</groupId>
 	<artifactId>sched-java-client-root</artifactId>
-	<version>1.0.3-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>

sched-java-client-demo/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.xdev-software</groupId>
 	<artifactId>sched-java-client-demo</artifactId>
-	<version>1.0.3-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<inceptionYear>2022</inceptionYear>

sched-java-client-demo/src/main/java/software/xdev/Application.java

@@ -118,6 +118,7 @@ private static void checkSessionAPI(final CustomApiClient apiClient)
 			null,
 			null,
 			"N",
+			null,
 			Map.of("extra", "Joppiesauce")
 		);
 		LOG.info(LOG_RESPONSE, addSessionResponse);
@@ -138,7 +139,8 @@ private static void checkSessionAPI(final CustomApiClient apiClient)
 			null,
 			null,
 			null,
-			"Y"
+			"Y",
+			null
 		);
 		LOG.info(LOG_RESPONSE, modifySessionResponse);
 

sched-java-client/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.xdev-software</groupId>
 	<artifactId>sched-java-client</artifactId>
-	<version>1.0.3-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>sched-java-client</name>

sched-java-client/src/generated/java/software/xdev/sched/api/SessionApi.java

@@ -71,12 +71,13 @@ public void setApiClient(ApiClient apiClient) {
    * @param rsvpUrl URL used for Custom Button (optional)
    * @param ticketMessage Custom ticket upgrade message, displayed when attendee attempts to add the session without the correct ticket (accepts basic HTML) (optional)
    * @param active Y = session is active, N = session is deactivated and hidden (optional)
+   * @param videoStream Livestream url (url is not validated!). Undocumented (optional)
    * @param customFields To add custom named fields, just add your field names and their values (optional)
    * @return String
    * @throws ApiException if fails to make API call
    */
-  public String addSession(String sessionKey, String name, String sessionStart, String sessionEnd, String sessionType, String sessionSubtype, String description, URI mediaUrl, String venue, String address, String tags, String seats, URI rsvpUrl, String ticketMessage, String active, Object customFields) throws ApiException {
-    return this.addSession(sessionKey, name, sessionStart, sessionEnd, sessionType, sessionSubtype, description, mediaUrl, venue, address, tags, seats, rsvpUrl, ticketMessage, active, customFields, Collections.emptyMap());
+  public String addSession(String sessionKey, String name, String sessionStart, String sessionEnd, String sessionType, String sessionSubtype, String description, URI mediaUrl, String venue, String address, String tags, String seats, URI rsvpUrl, String ticketMessage, String active, String videoStream, Object customFields) throws ApiException {
+    return this.addSession(sessionKey, name, sessionStart, sessionEnd, sessionType, sessionSubtype, description, mediaUrl, venue, address, tags, seats, rsvpUrl, ticketMessage, active, videoStream, customFields, Collections.emptyMap());
   }
 
 
@@ -98,12 +99,13 @@ public String addSession(String sessionKey, String name, String sessionStart, St
    * @param rsvpUrl URL used for Custom Button (optional)
    * @param ticketMessage Custom ticket upgrade message, displayed when attendee attempts to add the session without the correct ticket (accepts basic HTML) (optional)
    * @param active Y = session is active, N = session is deactivated and hidden (optional)
+   * @param videoStream Livestream url (url is not validated!). Undocumented (optional)
    * @param customFields To add custom named fields, just add your field names and their values (optional)
    * @param additionalHeaders additionalHeaders for this call
    * @return String
    * @throws ApiException if fails to make API call
    */
-  public String addSession(String sessionKey, String name, String sessionStart, String sessionEnd, String sessionType, String sessionSubtype, String description, URI mediaUrl, String venue, String address, String tags, String seats, URI rsvpUrl, String ticketMessage, String active, Object customFields, Map<String, String> additionalHeaders) throws ApiException {
+  public String addSession(String sessionKey, String name, String sessionStart, String sessionEnd, String sessionType, String sessionSubtype, String description, URI mediaUrl, String venue, String address, String tags, String seats, URI rsvpUrl, String ticketMessage, String active, String videoStream, Object customFields, Map<String, String> additionalHeaders) throws ApiException {
     Object localVarPostBody = null;
 
     // verify the required parameter 'sessionKey' is set
@@ -157,6 +159,7 @@ public String addSession(String sessionKey, String name, String sessionStart, St
     localVarQueryParams.addAll(apiClient.parameterToPair("rsvp_url", rsvpUrl));
     localVarQueryParams.addAll(apiClient.parameterToPair("ticket_message", ticketMessage));
     localVarQueryParams.addAll(apiClient.parameterToPair("active", active));
+    localVarQueryParams.addAll(apiClient.parameterToPair("video_stream", videoStream));
     localVarQueryParams.addAll(apiClient.parameterToPair("custom_fields", customFields));
 
     localVarHeaderParams.putAll(additionalHeaders);
@@ -453,11 +456,12 @@ public List<Session> listSessions(Integer since, String format, String status, S
    * @param rsvpUrl URL used for Custom Button (optional)
    * @param ticketMessage Custom ticket upgrade message, displayed when attendee attempts to add the session without the correct ticket (accepts basic HTML) (optional)
    * @param active Y &#x3D; session is active, N &#x3D; session is deactivated and hidden (optional)
+   * @param videoStream Livestream url (url is not validated!). Undocumented (optional)
    * @return String
    * @throws ApiException if fails to make API call
    */
-  public String modifySession(String sessionKey, String name, String sessionStart, String sessionEnd, String sessionType, String sessionSubtype, String description, URI mediaUrl, String venue, String address, String tags, String seats, URI rsvpUrl, String ticketMessage, String active) throws ApiException {
-    return this.modifySession(sessionKey, name, sessionStart, sessionEnd, sessionType, sessionSubtype, description, mediaUrl, venue, address, tags, seats, rsvpUrl, ticketMessage, active, Collections.emptyMap());
+  public String modifySession(String sessionKey, String name, String sessionStart, String sessionEnd, String sessionType, String sessionSubtype, String description, URI mediaUrl, String venue, String address, String tags, String seats, URI rsvpUrl, String ticketMessage, String active, String videoStream) throws ApiException {
+    return this.modifySession(sessionKey, name, sessionStart, sessionEnd, sessionType, sessionSubtype, description, mediaUrl, venue, address, tags, seats, rsvpUrl, ticketMessage, active, videoStream, Collections.emptyMap());
   }
 
 
@@ -479,11 +483,12 @@ public String modifySession(String sessionKey, String name, String sessionStart,
    * @param rsvpUrl URL used for Custom Button (optional)
    * @param ticketMessage Custom ticket upgrade message, displayed when attendee attempts to add the session without the correct ticket (accepts basic HTML) (optional)
    * @param active Y &#x3D; session is active, N &#x3D; session is deactivated and hidden (optional)
+   * @param videoStream Livestream url (url is not validated!). Undocumented (optional)
    * @param additionalHeaders additionalHeaders for this call
    * @return String
    * @throws ApiException if fails to make API call
    */
-  public String modifySession(String sessionKey, String name, String sessionStart, String sessionEnd, String sessionType, String sessionSubtype, String description, URI mediaUrl, String venue, String address, String tags, String seats, URI rsvpUrl, String ticketMessage, String active, Map<String, String> additionalHeaders) throws ApiException {
+  public String modifySession(String sessionKey, String name, String sessionStart, String sessionEnd, String sessionType, String sessionSubtype, String description, URI mediaUrl, String venue, String address, String tags, String seats, URI rsvpUrl, String ticketMessage, String active, String videoStream, Map<String, String> additionalHeaders) throws ApiException {
     Object localVarPostBody = null;
 
     // verify the required parameter 'sessionKey' is set
@@ -517,6 +522,7 @@ public String modifySession(String sessionKey, String name, String sessionStart,
     localVarQueryParams.addAll(apiClient.parameterToPair("rsvp_url", rsvpUrl));
     localVarQueryParams.addAll(apiClient.parameterToPair("ticket_message", ticketMessage));
     localVarQueryParams.addAll(apiClient.parameterToPair("active", active));
+    localVarQueryParams.addAll(apiClient.parameterToPair("video_stream", videoStream));
 
     localVarHeaderParams.putAll(additionalHeaders);
 

sched-java-client/src/generated/java/software/xdev/sched/model/ExportSession.java

@@ -48,7 +48,8 @@
   ExportSession.JSON_PROPERTY_ID,
   ExportSession.JSON_PROPERTY_VENUE_ID,
   ExportSession.JSON_PROPERTY_SPEAKERS,
-  ExportSession.JSON_PROPERTY_EVENT_TYPE_SORT
+  ExportSession.JSON_PROPERTY_EVENT_TYPE_SORT,
+  ExportSession.JSON_PROPERTY_VIDEO_STREAM
 })
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ExportSession {
@@ -202,6 +203,9 @@ public static InviteOnlyEnum fromValue(String value) {
   public static final String JSON_PROPERTY_EVENT_TYPE_SORT = "event_type_sort";
   private String eventTypeSort;
 
+  public static final String JSON_PROPERTY_VIDEO_STREAM = "video_stream";
+  private String videoStream;
+
   public ExportSession() {
   }
 
@@ -602,6 +606,32 @@ public void setEventTypeSort(String eventTypeSort) {
     this.eventTypeSort = eventTypeSort;
   }
 
+
+  public ExportSession videoStream(String videoStream) {
+    
+    this.videoStream = videoStream;
+    return this;
+  }
+
+   /**
+   * Livestream url (url is not validated!). Undocumented
+   * @return videoStream
+  **/
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_VIDEO_STREAM)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getVideoStream() {
+    return videoStream;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_VIDEO_STREAM)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setVideoStream(String videoStream) {
+    this.videoStream = videoStream;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -625,12 +655,13 @@ public boolean equals(Object o) {
         Objects.equals(this.id, exportSession.id) &&
         Objects.equals(this.venueId, exportSession.venueId) &&
         Objects.equals(this.speakers, exportSession.speakers) &&
-        Objects.equals(this.eventTypeSort, exportSession.eventTypeSort);
+        Objects.equals(this.eventTypeSort, exportSession.eventTypeSort) &&
+        Objects.equals(this.videoStream, exportSession.videoStream);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(eventKey, active, pinned, name, eventStart, eventEnd, eventType, seats, goers, inviteOnly, venue, id, venueId, speakers, eventTypeSort);
+    return Objects.hash(eventKey, active, pinned, name, eventStart, eventEnd, eventType, seats, goers, inviteOnly, venue, id, venueId, speakers, eventTypeSort, videoStream);
   }
 
   @Override
@@ -652,6 +683,7 @@ public String toString() {
     sb.append("    venueId: ").append(toIndentedString(venueId)).append("\n");
     sb.append("    speakers: ").append(toIndentedString(speakers)).append("\n");
     sb.append("    eventTypeSort: ").append(toIndentedString(eventTypeSort)).append("\n");
+    sb.append("    videoStream: ").append(toIndentedString(videoStream)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -849,6 +881,16 @@ public String toUrlQueryString(String prefix) {
       }
     }
 
+    // add `video_stream` to the URL query string
+    if (getVideoStream() != null) {
+      try {
+        joiner.add(String.format("%svideo_stream%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getVideoStream()), "UTF-8").replaceAll("\\+", "%20")));
+      } catch (UnsupportedEncodingException e) {
+        // Should never happen, UTF-8 is always supported
+        throw new RuntimeException(e);
+      }
+    }
+
     return joiner.toString();
   }