Skip to content

Commit f221b9d

Browse files
AB-xdevAB-xdev
authored
Merge pull request #62 from xdev-software/add-missing-entries
Add missing entries
2 parents db94801 + cff484e commit f221b9d

File tree

14 files changed

+1118
-183
lines changed

14 files changed

+1118
-183
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# 1.2.0
2+
* Added/Corrected attributes of
3+
* ``/view/All``
4+
* ``session.categories``
5+
* ``speaker.questionAnswers``
6+
* ``/view/Speakers``
7+
* ``questionAnswers``
8+
* ``/view/Sessions``
9+
* ``room``
10+
* ``categories``
11+
112
# 1.1.3
213
* Updated dependencies
314

‎openapi/openapi.yml‎

Lines changed: 101 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ components:
130130
categories:
131131
type: array
132132
items:
133-
$ref: '#/components/schemas/Category'
133+
$ref: '#/components/schemas/CategoryAll'
134134
rooms:
135135
type: array
136136
items:
@@ -141,28 +141,50 @@ components:
141141
- rooms
142142
- sessions
143143
- speakers
144-
Category:
144+
BaseCategory:
145145
type: object
146146
readOnly: true
147147
properties:
148148
id:
149149
type: integer
150-
title:
151-
type: string
152-
items:
153-
type: array
154-
items:
155-
$ref: '#/components/schemas/CategoryItem'
156150
sort:
157151
type: integer
158-
type:
159-
type: string
160152
required:
161153
- id
162-
- items
163154
- sort
164-
- title
165-
- type
155+
CategorySession:
156+
allOf:
157+
- $ref: '#/components/schemas/BaseCategory'
158+
- type: object
159+
readOnly: true
160+
properties:
161+
name:
162+
type: string
163+
categoryItems:
164+
type: array
165+
items:
166+
$ref: '#/components/schemas/CategoryItem'
167+
required:
168+
- name
169+
- categoryItems
170+
CategoryAll:
171+
allOf:
172+
- $ref: '#/components/schemas/BaseCategory'
173+
- type: object
174+
readOnly: true
175+
properties:
176+
title:
177+
type: string
178+
items:
179+
type: array
180+
items:
181+
$ref: '#/components/schemas/CategoryItemAll'
182+
type:
183+
type: string
184+
required:
185+
- items
186+
- title
187+
- type
166188
CategoryItem:
167189
type: object
168190
readOnly: true
@@ -171,12 +193,19 @@ components:
171193
type: integer
172194
name:
173195
type: string
174-
sort:
175-
type: integer
176196
required:
177197
- id
178198
- name
179-
- sort
199+
CategoryItemAll:
200+
allOf:
201+
- $ref: '#/components/schemas/CategoryItem'
202+
- type: object
203+
readOnly: true
204+
properties:
205+
sort:
206+
type: integer
207+
required:
208+
- sort
180209
Link:
181210
type: object
182211
readOnly: true
@@ -306,45 +335,53 @@ components:
306335
- title
307336
Session:
308337
allOf:
309-
- $ref: '#/components/schemas/BaseSession'
310-
- type: object
311-
readOnly: true
312-
properties:
313-
id:
314-
type: string
315-
format: integer # Sessions Endpoint contains only numeric IDs
316-
speakers:
317-
type: array
318-
items:
319-
$ref: '#/components/schemas/SpeakerMinimal' # Sessions Endpoint
320-
questionAnswers:
321-
type: array
322-
items:
323-
$ref: '#/components/schemas/QuestionAnswerFull' # Sessions Endpoint
324-
required:
325-
- id
326-
- questionAnswers
327-
- speakers
338+
- $ref: '#/components/schemas/BaseSession'
339+
- type: object
340+
readOnly: true
341+
properties:
342+
id:
343+
type: string
344+
format: integer # Sessions Endpoint contains only numeric IDs
345+
room:
346+
type: string
347+
nullable: true
348+
speakers:
349+
type: array
350+
items:
351+
$ref: '#/components/schemas/SpeakerMinimal'
352+
questionAnswers:
353+
type: array
354+
items:
355+
$ref: '#/components/schemas/QuestionAnswerFull'
356+
categories:
357+
type: array
358+
items:
359+
$ref: '#/components/schemas/CategorySession'
360+
required:
361+
- id
362+
- questionAnswers
363+
- speakers
364+
- categories
328365
SessionAll:
329366
allOf:
330-
- $ref: '#/components/schemas/BaseSession'
331-
- type: object
332-
readOnly: true
333-
properties:
334-
id:
335-
type: string # All Endpoint contains numeric IDs mixed with UUIDs
336-
speakers:
337-
type: array
338-
items:
339-
type: string # All Endpoint
340-
questionAnswers:
341-
type: array
342-
items:
343-
$ref: '#/components/schemas/QuestionAnswer' # All Endpoint
344-
required:
345-
- id
346-
- questionAnswers
347-
- speakers
367+
- $ref: '#/components/schemas/BaseSession'
368+
- type: object
369+
readOnly: true
370+
properties:
371+
id:
372+
type: string # All Endpoint contains numeric IDs mixed with UUIDs
373+
speakers:
374+
type: array
375+
items:
376+
type: string # All Endpoint
377+
questionAnswers:
378+
type: array
379+
items:
380+
$ref: '#/components/schemas/QuestionAnswer' # All Endpoint
381+
required:
382+
- id
383+
- questionAnswers
384+
- speakers
348385
SessionGroup:
349386
type: object
350387
readOnly: true
@@ -410,7 +447,6 @@ components:
410447
fullName:
411448
type: string
412449
# categoryItems - Always empty; ignored
413-
# questionAnswers - Always empty; ignored
414450
required:
415451
- fullName
416452
- isTopSpeaker
@@ -425,9 +461,14 @@ components:
425461
sessions:
426462
type: array
427463
items:
428-
$ref: '#/components/schemas/SessionMinimal' # Speakers Endpoint
464+
$ref: '#/components/schemas/SessionMinimal'
465+
questionAnswers:
466+
type: array
467+
items:
468+
$ref: '#/components/schemas/QuestionAnswerFull'
429469
required:
430470
- sessions
471+
- questionAnswers
431472
SpeakerAll:
432473
allOf:
433474
- $ref: '#/components/schemas/BaseSpeaker'
@@ -438,8 +479,13 @@ components:
438479
type: array
439480
items:
440481
type: integer # All Endpoint
482+
questionAnswers:
483+
type: array
484+
items:
485+
$ref: '#/components/schemas/QuestionAnswer'
441486
required:
442487
- sessions
488+
- questionAnswers
443489
SpeakerWithEmail:
444490
allOf:
445491
- $ref: '#/components/schemas/BaseSpeakerEssential'

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.xdev-software</groupId>
88
<artifactId>sessionize-java-client-root</artifactId>
9-
<version>1.1.4-SNAPSHOT</version>
9+
<version>1.2.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<organization>

‎sessionize-java-client-demo/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.xdev-software</groupId>
88
<artifactId>sessionize-java-client-demo</artifactId>
9-
<version>1.1.4-SNAPSHOT</version>
9+
<version>1.2.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<inceptionYear>2023</inceptionYear>

‎sessionize-java-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.xdev-software</groupId>
88
<artifactId>sessionize-java-client</artifactId>
9-
<version>1.1.4-SNAPSHOT</version>
9+
<version>1.2.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>sessionize-java-client</name>

‎sessionize-java-client/src/generated/java/software/xdev/sessionize/model/AllResult.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.ArrayList;
2424
import java.util.Arrays;
2525
import java.util.List;
26-
import software.xdev.sessionize.model.Category;
26+
import software.xdev.sessionize.model.CategoryAll;
2727
import software.xdev.sessionize.model.Question;
2828
import software.xdev.sessionize.model.Room;
2929
import software.xdev.sessionize.model.SessionAll;
@@ -56,7 +56,7 @@ public class AllResult {
5656
private List<Question> questions = new ArrayList<>();
5757

5858
public static final String JSON_PROPERTY_CATEGORIES = "categories";
59-
private List<Category> categories = new ArrayList<>();
59+
private List<CategoryAll> categories = new ArrayList<>();
6060

6161
public static final String JSON_PROPERTY_ROOMS = "rooms";
6262
private List<Room> rooms = new ArrayList<>();
@@ -166,13 +166,13 @@ public void setQuestions(List<Question> questions) {
166166
}
167167

168168

169-
public AllResult categories(List<Category> categories) {
169+
public AllResult categories(List<CategoryAll> categories) {
170170

171171
this.categories = categories;
172172
return this;
173173
}
174174

175-
public AllResult addCategoriesItem(Category categoriesItem) {
175+
public AllResult addCategoriesItem(CategoryAll categoriesItem) {
176176
if (this.categories == null) {
177177
this.categories = new ArrayList<>();
178178
}
@@ -188,14 +188,14 @@ public AllResult addCategoriesItem(Category categoriesItem) {
188188
@JsonProperty(JSON_PROPERTY_CATEGORIES)
189189
@JsonInclude(value = JsonInclude.Include.ALWAYS)
190190

191-
public List<Category> getCategories() {
191+
public List<CategoryAll> getCategories() {
192192
return categories;
193193
}
194194

195195

196196
@JsonProperty(JSON_PROPERTY_CATEGORIES)
197197
@JsonInclude(value = JsonInclude.Include.ALWAYS)
198-
public void setCategories(List<Category> categories) {
198+
public void setCategories(List<CategoryAll> categories) {
199199
this.categories = categories;
200200
}
201201

0 commit comments

Comments
 (0)