Skip to content

Commit 5048705

Browse files
micbarmicbar
committed
Merge pull request #12 from owncloud/allof-workaround
add workaround for composed types
1 parent 32729b3 commit 5048705

23 files changed

+398
-398
lines changed

‎.openapi-generator/FILES

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@ README.md
22
client/CMakeLists.txt
33
client/OAIBaseItem.cpp
44
client/OAIBaseItem.h
5-
client/OAIBaseItem_allOf.cpp
6-
client/OAIBaseItem_allOf.h
7-
client/OAICollection_of_drive.cpp
8-
client/OAICollection_of_drive.h
5+
client/OAIBaseItemInline.cpp
6+
client/OAIBaseItemInline.h
97
client/OAICollection_of_driveItems.cpp
108
client/OAICollection_of_driveItems.h
9+
client/OAICollection_of_drives.cpp
10+
client/OAICollection_of_drives.h
1111
client/OAIDeleted.cpp
1212
client/OAIDeleted.h
1313
client/OAIDirectoryObject.cpp
1414
client/OAIDirectoryObject.h
15-
client/OAIDirectoryObject_allOf.cpp
16-
client/OAIDirectoryObject_allOf.h
15+
client/OAIDirectoryObjectInline.cpp
16+
client/OAIDirectoryObjectInline.h
1717
client/OAIDrive.cpp
1818
client/OAIDrive.h
19+
client/OAIDriveInline.cpp
20+
client/OAIDriveInline.h
1921
client/OAIDriveItem.cpp
2022
client/OAIDriveItem.h
21-
client/OAIDriveItem_allOf.cpp
22-
client/OAIDriveItem_allOf.h
23-
client/OAIDrive_allOf.cpp
24-
client/OAIDrive_allOf.h
23+
client/OAIDriveItemInline.cpp
24+
client/OAIDriveItemInline.h
2525
client/OAIDrivesApi.cpp
2626
client/OAIDrivesApi.h
2727
client/OAIEntity.cpp
@@ -74,6 +74,6 @@ client/OAIServerConfiguration.h
7474
client/OAIServerVariable.h
7575
client/OAIUser.cpp
7676
client/OAIUser.h
77-
client/OAIUser_allOf.cpp
78-
client/OAIUser_allOf.h
77+
client/OAIUserInline.cpp
78+
client/OAIUserInline.h
7979
client/client.pri

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void Example::exampleFunction1(){
6464
loop.quit();
6565
});
6666
67-
OAIDrive oai_drive = create(); // OAIDrive | New navigation property values
67+
OAIDrive oai_drive = create(); // OAIDrive | New space property values
6868
apiInstance.drives_CreateDrive(oai_drive);
6969
QTimer::singleShot(5000, &loop, &QEventLoop::quit);
7070
loop.exec();

‎client/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ find_package(Qt5Network REQUIRED)
1616

1717
add_library(${PROJECT_NAME}
1818
OAIBaseItem.cpp
19-
OAIBaseItem_allOf.cpp
20-
OAICollection_of_drive.cpp
19+
OAIBaseItemInline.cpp
2120
OAICollection_of_driveItems.cpp
21+
OAICollection_of_drives.cpp
2222
OAIDeleted.cpp
2323
OAIDirectoryObject.cpp
24-
OAIDirectoryObject_allOf.cpp
24+
OAIDirectoryObjectInline.cpp
2525
OAIDrive.cpp
26+
OAIDriveInline.cpp
2627
OAIDriveItem.cpp
27-
OAIDriveItem_allOf.cpp
28-
OAIDrive_allOf.cpp
28+
OAIDriveItemInline.cpp
2929
OAIEntity.cpp
3030
OAIFileSystemInfo.cpp
3131
OAIFolder.cpp
@@ -41,7 +41,7 @@ add_library(${PROJECT_NAME}
4141
OAIOpenGraphFile.cpp
4242
OAIQuota.cpp
4343
OAIUser.cpp
44-
OAIUser_allOf.cpp
44+
OAIUserInline.cpp
4545
OAIDrivesApi.cpp
4646
OAIMeDriveApi.cpp
4747
OAIMeDriveRootApi.cpp

‎client/OAIBaseItem.h

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

2121
#include <QJsonObject>
2222

23-
#include "OAIBaseItem_allOf.h"
23+
#include "OAIBaseItemInline.h"
2424
#include "OAIEntity.h"
2525
#include "OAIIdentitySet.h"
2626
#include "OAIItemReference.h"

‎client/OAIBaseItem_allOf.cpp renamed to ‎client/OAIBaseItemInline.cpp

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Do not edit the class manually.
1010
*/
1111

12-
#include "OAIBaseItem_allOf.h"
12+
#include "OAIBaseItemInline.h"
1313

1414
#include <QDebug>
1515
#include <QJsonArray>
@@ -20,18 +20,18 @@
2020

2121
namespace OpenAPI {
2222

23-
OAIBaseItem_allOf::OAIBaseItem_allOf(QString json) {
23+
OAIBaseItemInline::OAIBaseItemInline(QString json) {
2424
this->initializeModel();
2525
this->fromJson(json);
2626
}
2727

28-
OAIBaseItem_allOf::OAIBaseItem_allOf() {
28+
OAIBaseItemInline::OAIBaseItemInline() {
2929
this->initializeModel();
3030
}
3131

32-
OAIBaseItem_allOf::~OAIBaseItem_allOf() {}
32+
OAIBaseItemInline::~OAIBaseItemInline() {}
3333

34-
void OAIBaseItem_allOf::initializeModel() {
34+
void OAIBaseItemInline::initializeModel() {
3535

3636
m_created_by_isSet = false;
3737
m_created_by_isValid = false;
@@ -67,14 +67,14 @@ void OAIBaseItem_allOf::initializeModel() {
6767
m_last_modified_by_user_isValid = false;
6868
}
6969

70-
void OAIBaseItem_allOf::fromJson(QString jsonString) {
70+
void OAIBaseItemInline::fromJson(QString jsonString) {
7171
QByteArray array(jsonString.toStdString().c_str());
7272
QJsonDocument doc = QJsonDocument::fromJson(array);
7373
QJsonObject jsonObject = doc.object();
7474
this->fromJsonObject(jsonObject);
7575
}
7676

77-
void OAIBaseItem_allOf::fromJsonObject(QJsonObject json) {
77+
void OAIBaseItemInline::fromJsonObject(QJsonObject json) {
7878

7979
m_created_by_isValid = ::OpenAPI::fromJsonValue(created_by, json[QString("createdBy")]);
8080
m_created_by_isSet = !json[QString("createdBy")].isNull() && m_created_by_isValid;
@@ -110,14 +110,14 @@ void OAIBaseItem_allOf::fromJsonObject(QJsonObject json) {
110110
m_last_modified_by_user_isSet = !json[QString("lastModifiedByUser")].isNull() && m_last_modified_by_user_isValid;
111111
}
112112

113-
QString OAIBaseItem_allOf::asJson() const {
113+
QString OAIBaseItemInline::asJson() const {
114114
QJsonObject obj = this->asJsonObject();
115115
QJsonDocument doc(obj);
116116
QByteArray bytes = doc.toJson();
117117
return QString(bytes);
118118
}
119119

120-
QJsonObject OAIBaseItem_allOf::asJsonObject() const {
120+
QJsonObject OAIBaseItemInline::asJsonObject() const {
121121
QJsonObject obj;
122122
if (created_by.isSet()) {
123123
obj.insert(QString("createdBy"), ::OpenAPI::toJsonValue(created_by));
@@ -155,183 +155,183 @@ QJsonObject OAIBaseItem_allOf::asJsonObject() const {
155155
return obj;
156156
}
157157

158-
OAIIdentitySet OAIBaseItem_allOf::getCreatedBy() const {
158+
OAIIdentitySet OAIBaseItemInline::getCreatedBy() const {
159159
return created_by;
160160
}
161-
void OAIBaseItem_allOf::setCreatedBy(const OAIIdentitySet &created_by) {
161+
void OAIBaseItemInline::setCreatedBy(const OAIIdentitySet &created_by) {
162162
this->created_by = created_by;
163163
this->m_created_by_isSet = true;
164164
}
165165

166-
bool OAIBaseItem_allOf::is_created_by_Set() const{
166+
bool OAIBaseItemInline::is_created_by_Set() const{
167167
return m_created_by_isSet;
168168
}
169169

170-
bool OAIBaseItem_allOf::is_created_by_Valid() const{
170+
bool OAIBaseItemInline::is_created_by_Valid() const{
171171
return m_created_by_isValid;
172172
}
173173

174-
QDateTime OAIBaseItem_allOf::getCreatedDateTime() const {
174+
QDateTime OAIBaseItemInline::getCreatedDateTime() const {
175175
return created_date_time;
176176
}
177-
void OAIBaseItem_allOf::setCreatedDateTime(const QDateTime &created_date_time) {
177+
void OAIBaseItemInline::setCreatedDateTime(const QDateTime &created_date_time) {
178178
this->created_date_time = created_date_time;
179179
this->m_created_date_time_isSet = true;
180180
}
181181

182-
bool OAIBaseItem_allOf::is_created_date_time_Set() const{
182+
bool OAIBaseItemInline::is_created_date_time_Set() const{
183183
return m_created_date_time_isSet;
184184
}
185185

186-
bool OAIBaseItem_allOf::is_created_date_time_Valid() const{
186+
bool OAIBaseItemInline::is_created_date_time_Valid() const{
187187
return m_created_date_time_isValid;
188188
}
189189

190-
QString OAIBaseItem_allOf::getDescription() const {
190+
QString OAIBaseItemInline::getDescription() const {
191191
return description;
192192
}
193-
void OAIBaseItem_allOf::setDescription(const QString &description) {
193+
void OAIBaseItemInline::setDescription(const QString &description) {
194194
this->description = description;
195195
this->m_description_isSet = true;
196196
}
197197

198-
bool OAIBaseItem_allOf::is_description_Set() const{
198+
bool OAIBaseItemInline::is_description_Set() const{
199199
return m_description_isSet;
200200
}
201201

202-
bool OAIBaseItem_allOf::is_description_Valid() const{
202+
bool OAIBaseItemInline::is_description_Valid() const{
203203
return m_description_isValid;
204204
}
205205

206-
QString OAIBaseItem_allOf::getETag() const {
206+
QString OAIBaseItemInline::getETag() const {
207207
return e_tag;
208208
}
209-
void OAIBaseItem_allOf::setETag(const QString &e_tag) {
209+
void OAIBaseItemInline::setETag(const QString &e_tag) {
210210
this->e_tag = e_tag;
211211
this->m_e_tag_isSet = true;
212212
}
213213

214-
bool OAIBaseItem_allOf::is_e_tag_Set() const{
214+
bool OAIBaseItemInline::is_e_tag_Set() const{
215215
return m_e_tag_isSet;
216216
}
217217

218-
bool OAIBaseItem_allOf::is_e_tag_Valid() const{
218+
bool OAIBaseItemInline::is_e_tag_Valid() const{
219219
return m_e_tag_isValid;
220220
}
221221

222-
OAIIdentitySet OAIBaseItem_allOf::getLastModifiedBy() const {
222+
OAIIdentitySet OAIBaseItemInline::getLastModifiedBy() const {
223223
return last_modified_by;
224224
}
225-
void OAIBaseItem_allOf::setLastModifiedBy(const OAIIdentitySet &last_modified_by) {
225+
void OAIBaseItemInline::setLastModifiedBy(const OAIIdentitySet &last_modified_by) {
226226
this->last_modified_by = last_modified_by;
227227
this->m_last_modified_by_isSet = true;
228228
}
229229

230-
bool OAIBaseItem_allOf::is_last_modified_by_Set() const{
230+
bool OAIBaseItemInline::is_last_modified_by_Set() const{
231231
return m_last_modified_by_isSet;
232232
}
233233

234-
bool OAIBaseItem_allOf::is_last_modified_by_Valid() const{
234+
bool OAIBaseItemInline::is_last_modified_by_Valid() const{
235235
return m_last_modified_by_isValid;
236236
}
237237

238-
QDateTime OAIBaseItem_allOf::getLastModifiedDateTime() const {
238+
QDateTime OAIBaseItemInline::getLastModifiedDateTime() const {
239239
return last_modified_date_time;
240240
}
241-
void OAIBaseItem_allOf::setLastModifiedDateTime(const QDateTime &last_modified_date_time) {
241+
void OAIBaseItemInline::setLastModifiedDateTime(const QDateTime &last_modified_date_time) {
242242
this->last_modified_date_time = last_modified_date_time;
243243
this->m_last_modified_date_time_isSet = true;
244244
}
245245

246-
bool OAIBaseItem_allOf::is_last_modified_date_time_Set() const{
246+
bool OAIBaseItemInline::is_last_modified_date_time_Set() const{
247247
return m_last_modified_date_time_isSet;
248248
}
249249

250-
bool OAIBaseItem_allOf::is_last_modified_date_time_Valid() const{
250+
bool OAIBaseItemInline::is_last_modified_date_time_Valid() const{
251251
return m_last_modified_date_time_isValid;
252252
}
253253

254-
QString OAIBaseItem_allOf::getName() const {
254+
QString OAIBaseItemInline::getName() const {
255255
return name;
256256
}
257-
void OAIBaseItem_allOf::setName(const QString &name) {
257+
void OAIBaseItemInline::setName(const QString &name) {
258258
this->name = name;
259259
this->m_name_isSet = true;
260260
}
261261

262-
bool OAIBaseItem_allOf::is_name_Set() const{
262+
bool OAIBaseItemInline::is_name_Set() const{
263263
return m_name_isSet;
264264
}
265265

266-
bool OAIBaseItem_allOf::is_name_Valid() const{
266+
bool OAIBaseItemInline::is_name_Valid() const{
267267
return m_name_isValid;
268268
}
269269

270-
OAIItemReference OAIBaseItem_allOf::getParentReference() const {
270+
OAIItemReference OAIBaseItemInline::getParentReference() const {
271271
return parent_reference;
272272
}
273-
void OAIBaseItem_allOf::setParentReference(const OAIItemReference &parent_reference) {
273+
void OAIBaseItemInline::setParentReference(const OAIItemReference &parent_reference) {
274274
this->parent_reference = parent_reference;
275275
this->m_parent_reference_isSet = true;
276276
}
277277

278-
bool OAIBaseItem_allOf::is_parent_reference_Set() const{
278+
bool OAIBaseItemInline::is_parent_reference_Set() const{
279279
return m_parent_reference_isSet;
280280
}
281281

282-
bool OAIBaseItem_allOf::is_parent_reference_Valid() const{
282+
bool OAIBaseItemInline::is_parent_reference_Valid() const{
283283
return m_parent_reference_isValid;
284284
}
285285

286-
QString OAIBaseItem_allOf::getWebUrl() const {
286+
QString OAIBaseItemInline::getWebUrl() const {
287287
return web_url;
288288
}
289-
void OAIBaseItem_allOf::setWebUrl(const QString &web_url) {
289+
void OAIBaseItemInline::setWebUrl(const QString &web_url) {
290290
this->web_url = web_url;
291291
this->m_web_url_isSet = true;
292292
}
293293

294-
bool OAIBaseItem_allOf::is_web_url_Set() const{
294+
bool OAIBaseItemInline::is_web_url_Set() const{
295295
return m_web_url_isSet;
296296
}
297297

298-
bool OAIBaseItem_allOf::is_web_url_Valid() const{
298+
bool OAIBaseItemInline::is_web_url_Valid() const{
299299
return m_web_url_isValid;
300300
}
301301

302-
OAIUser OAIBaseItem_allOf::getCreatedByUser() const {
302+
OAIUser OAIBaseItemInline::getCreatedByUser() const {
303303
return created_by_user;
304304
}
305-
void OAIBaseItem_allOf::setCreatedByUser(const OAIUser &created_by_user) {
305+
void OAIBaseItemInline::setCreatedByUser(const OAIUser &created_by_user) {
306306
this->created_by_user = created_by_user;
307307
this->m_created_by_user_isSet = true;
308308
}
309309

310-
bool OAIBaseItem_allOf::is_created_by_user_Set() const{
310+
bool OAIBaseItemInline::is_created_by_user_Set() const{
311311
return m_created_by_user_isSet;
312312
}
313313

314-
bool OAIBaseItem_allOf::is_created_by_user_Valid() const{
314+
bool OAIBaseItemInline::is_created_by_user_Valid() const{
315315
return m_created_by_user_isValid;
316316
}
317317

318-
OAIUser OAIBaseItem_allOf::getLastModifiedByUser() const {
318+
OAIUser OAIBaseItemInline::getLastModifiedByUser() const {
319319
return last_modified_by_user;
320320
}
321-
void OAIBaseItem_allOf::setLastModifiedByUser(const OAIUser &last_modified_by_user) {
321+
void OAIBaseItemInline::setLastModifiedByUser(const OAIUser &last_modified_by_user) {
322322
this->last_modified_by_user = last_modified_by_user;
323323
this->m_last_modified_by_user_isSet = true;
324324
}
325325

326-
bool OAIBaseItem_allOf::is_last_modified_by_user_Set() const{
326+
bool OAIBaseItemInline::is_last_modified_by_user_Set() const{
327327
return m_last_modified_by_user_isSet;
328328
}
329329

330-
bool OAIBaseItem_allOf::is_last_modified_by_user_Valid() const{
330+
bool OAIBaseItemInline::is_last_modified_by_user_Valid() const{
331331
return m_last_modified_by_user_isValid;
332332
}
333333

334-
bool OAIBaseItem_allOf::isSet() const {
334+
bool OAIBaseItemInline::isSet() const {
335335
bool isObjectUpdated = false;
336336
do {
337337
if (created_by.isSet()) {
@@ -392,7 +392,7 @@ bool OAIBaseItem_allOf::isSet() const {
392392
return isObjectUpdated;
393393
}
394394

395-
bool OAIBaseItem_allOf::isValid() const {
395+
bool OAIBaseItemInline::isValid() const {
396396
// only required properties are required for the object to be considered valid
397397
return true;
398398
}

0 commit comments

Comments
 (0)