Skip to content

Commit 93fd62c

Browse files
mythzmythz
committed
Remove ResponseStatus and ResponseError from generated dtos and add to client package
1 parent e100e37 commit 93fd62c

File tree

5 files changed

+80
-161
lines changed

5 files changed

+80
-161
lines changed

‎src/AndroidClient/client/src/androidTest/java/io/techstacks/dto.java‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Options:
2-
Date: 2015-03-23 23:00:11
2+
Date: 2015-03-25 08:31:34
33
Version: 1
44
BaseUrl: http://techstacks.io
55
@@ -42,31 +42,6 @@ public static enum TechnologyTier
4242
ThirdPartyServices;
4343
}
4444

45-
@DataContract
46-
public static class ResponseStatus
47-
{
48-
@DataMember(Order=1)
49-
public String ErrorCode = null;
50-
51-
@DataMember(Order=2)
52-
public String Message = null;
53-
54-
@DataMember(Order=3)
55-
public String StackTrace = null;
56-
57-
@DataMember(Order=4)
58-
public ArrayList<ResponseError> Errors = null;
59-
60-
public String getErrorCode() { return ErrorCode; }
61-
public ResponseStatus setErrorCode(String value) { this.ErrorCode = value; return this; }
62-
public String getMessage() { return Message; }
63-
public ResponseStatus setMessage(String value) { this.Message = value; return this; }
64-
public String getStackTrace() { return StackTrace; }
65-
public ResponseStatus setStackTrace(String value) { this.StackTrace = value; return this; }
66-
public ArrayList<ResponseError> getErrors() { return Errors; }
67-
public ResponseStatus setErrors(ArrayList<ResponseError> value) { this.Errors = value; return this; }
68-
}
69-
7045
public static class TechnologyStack extends TechnologyStackBase
7146
{
7247

@@ -249,26 +224,6 @@ public static class TechnologyBase
249224
public TechnologyBase setLastStatusUpdate(Date value) { this.LastStatusUpdate = value; return this; }
250225
}
251226

252-
@DataContract
253-
public static class ResponseError
254-
{
255-
@DataMember(Order=1, EmitDefaultValue=false)
256-
public String ErrorCode = null;
257-
258-
@DataMember(Order=2, EmitDefaultValue=false)
259-
public String FieldName = null;
260-
261-
@DataMember(Order=3, EmitDefaultValue=false)
262-
public String Message = null;
263-
264-
public String getErrorCode() { return ErrorCode; }
265-
public ResponseError setErrorCode(String value) { this.ErrorCode = value; return this; }
266-
public String getFieldName() { return FieldName; }
267-
public ResponseError setFieldName(String value) { this.FieldName = value; return this; }
268-
public String getMessage() { return Message; }
269-
public ResponseError setMessage(String value) { this.Message = value; return this; }
270-
}
271-
272227
public static class TechnologyStackBase
273228
{
274229
public Long Id = null;

‎src/AndroidClient/client/src/androidTest/java/servicestack/net/client/tests/dto.java‎

Lines changed: 25 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Options:
2-
Date: 2015-03-21 19:28:31
2+
Date: 2015-03-25 04:55:22
33
Version: 1
44
BaseUrl: http://localhost:2020
55
@@ -12,7 +12,7 @@
1212
//AddImplicitVersion:
1313
//IncludeTypes:
1414
//ExcludeTypes:
15-
//DefaultImports: java.math.*,java.util.*,net.servicestack.*
15+
//DefaultImports: java.math.*,java.util.*,net.servicestack.client.*
1616
*/
1717

1818
package servicestack.net.client.tests;
@@ -46,31 +46,6 @@ public static class Rockstar
4646
public Rockstar setAge(Integer value) { this.Age = value; return this; }
4747
}
4848

49-
@DataContract
50-
public static class ResponseStatus
51-
{
52-
@DataMember(Order=1)
53-
public String ErrorCode = null;
54-
55-
@DataMember(Order=2)
56-
public String Message = null;
57-
58-
@DataMember(Order=3)
59-
public String StackTrace = null;
60-
61-
@DataMember(Order=4)
62-
public ArrayList<ResponseError> Errors = null;
63-
64-
public String getErrorCode() { return ErrorCode; }
65-
public ResponseStatus setErrorCode(String value) { this.ErrorCode = value; return this; }
66-
public String getMessage() { return Message; }
67-
public ResponseStatus setMessage(String value) { this.Message = value; return this; }
68-
public String getStackTrace() { return StackTrace; }
69-
public ResponseStatus setStackTrace(String value) { this.StackTrace = value; return this; }
70-
public ArrayList<ResponseError> getErrors() { return Errors; }
71-
public ResponseStatus setErrors(ArrayList<ResponseError> value) { this.Errors = value; return this; }
72-
}
73-
7449
public static class MetadataTestChild
7550
{
7651
public String Name = null;
@@ -296,12 +271,12 @@ public static class AllTypes
296271
public BigDecimal Decimal = null;
297272
public String String = null;
298273
public Date DateTime = null;
299-
public String TimeSpan = null;
300-
public String DateTimeOffset = null;
301-
public String Guid = null;
302-
public Integer Char = null;
274+
public TimeSpan TimeSpan = null;
275+
public Date DateTimeOffset = null;
276+
public UUID Guid = null;
277+
public String Char = null;
303278
public Date NullableDateTime = null;
304-
public String NullableTimeSpan = null;
279+
public TimeSpan NullableTimeSpan = null;
305280
public ArrayList<String> StringList = null;
306281
public ArrayList<String> StringArray = null;
307282
public HashMap<String,String> StringMap = null;
@@ -336,18 +311,18 @@ public static class AllTypes
336311
public AllTypes setString(String value) { this.String = value; return this; }
337312
public Date getDateTime() { return DateTime; }
338313
public AllTypes setDateTime(Date value) { this.DateTime = value; return this; }
339-
public String getTimeSpan() { return TimeSpan; }
340-
public AllTypes setTimeSpan(String value) { this.TimeSpan = value; return this; }
341-
public String getDateTimeOffset() { return DateTimeOffset; }
342-
public AllTypes setDateTimeOffset(String value) { this.DateTimeOffset = value; return this; }
343-
public String getGuid() { return Guid; }
344-
public AllTypes setGuid(String value) { this.Guid = value; return this; }
345-
public Integer getChar() { return Char; }
346-
public AllTypes setChar(Integer value) { this.Char = value; return this; }
314+
public TimeSpan getTimeSpan() { return TimeSpan; }
315+
public AllTypes setTimeSpan(TimeSpan value) { this.TimeSpan = value; return this; }
316+
public Date getDateTimeOffset() { return DateTimeOffset; }
317+
public AllTypes setDateTimeOffset(Date value) { this.DateTimeOffset = value; return this; }
318+
public UUID getGuid() { return Guid; }
319+
public AllTypes setGuid(UUID value) { this.Guid = value; return this; }
320+
public String getChar() { return Char; }
321+
public AllTypes setChar(String value) { this.Char = value; return this; }
347322
public Date getNullableDateTime() { return NullableDateTime; }
348323
public AllTypes setNullableDateTime(Date value) { this.NullableDateTime = value; return this; }
349-
public String getNullableTimeSpan() { return NullableTimeSpan; }
350-
public AllTypes setNullableTimeSpan(String value) { this.NullableTimeSpan = value; return this; }
324+
public TimeSpan getNullableTimeSpan() { return NullableTimeSpan; }
325+
public AllTypes setNullableTimeSpan(TimeSpan value) { this.NullableTimeSpan = value; return this; }
351326
public ArrayList<String> getStringList() { return StringList; }
352327
public AllTypes setStringList(ArrayList<String> value) { this.StringList = value; return this; }
353328
public ArrayList<String> getStringArray() { return StringArray; }
@@ -738,26 +713,6 @@ public static class QueryBase
738713
public QueryBase setOrderByDesc(String value) { this.OrderByDesc = value; return this; }
739714
}
740715

741-
@DataContract
742-
public static class ResponseError
743-
{
744-
@DataMember(Order=1, EmitDefaultValue=false)
745-
public String ErrorCode = null;
746-
747-
@DataMember(Order=2, EmitDefaultValue=false)
748-
public String FieldName = null;
749-
750-
@DataMember(Order=3, EmitDefaultValue=false)
751-
public String Message = null;
752-
753-
public String getErrorCode() { return ErrorCode; }
754-
public ResponseError setErrorCode(String value) { this.ErrorCode = value; return this; }
755-
public String getFieldName() { return FieldName; }
756-
public ResponseError setFieldName(String value) { this.FieldName = value; return this; }
757-
public String getMessage() { return Message; }
758-
public ResponseError setMessage(String value) { this.Message = value; return this; }
759-
}
760-
761716
public static class MetadataTestNestedChild
762717
{
763718
public String Name = null;
@@ -1029,10 +984,10 @@ public static class CustomFieldHttpErrorResponse
1029984

1030985
public static class NoRepeatResponse
1031986
{
1032-
public String Id = null;
987+
public UUID Id = null;
1033988

1034-
public String getId() { return Id; }
1035-
public NoRepeatResponse setId(String value) { this.Id = value; return this; }
989+
public UUID getId() { return Id; }
990+
public NoRepeatResponse setId(UUID value) { this.Id = value; return this; }
1036991
}
1037992

1038993
public static class BatchThrowsResponse
@@ -1356,10 +1311,10 @@ public static class FallbackRoute
13561311

13571312
public static class NoRepeat implements IReturn<NoRepeatResponse>
13581313
{
1359-
public String Id = null;
1314+
public UUID Id = null;
13601315

1361-
public String getId() { return Id; }
1362-
public NoRepeat setId(String value) { this.Id = value; return this; }
1316+
public UUID getId() { return Id; }
1317+
public NoRepeat setId(UUID value) { this.Id = value; return this; }
13631318
private static Class responseType = NoRepeatResponse.class;
13641319
public Class getResponseType() { return responseType; }
13651320
}
@@ -1444,6 +1399,7 @@ public static class HelloInService implements IReturn<HelloResponse>
14441399
}
14451400

14461401
@Route("/hello/{Name}")
1402+
// @Route("/hello")
14471403
public static class Hello implements IReturn<HelloResponse>
14481404
{
14491405
@Required()
@@ -1549,8 +1505,8 @@ public static class RestrictedAttributes
15491505
* AllowedAttributes Description
15501506
*/
15511507
@Route(Path="/allowed-attributes", Verbs="GET")
1552-
// @ApiResponse(400, "Your request was not understood")
15531508
@Api("AllowedAttributes Description")
1509+
// @ApiResponse(400, "Your request was not understood")
15541510
@DataContract
15551511
public static class AllowedAttributes
15561512
{

‎src/AndroidClient/client/src/androidTest/java/servicestack/net/client/tests/testdtos.java‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Options:
2-
Date: 2015-03-23 10:31:03
2+
Date: 2015-03-25 08:30:04
33
Version: 1
44
BaseUrl: http://test.servicestack.net
55
@@ -25,31 +25,6 @@
2525
public class testdtos
2626
{
2727

28-
@DataContract
29-
public static class ResponseStatus
30-
{
31-
@DataMember(Order=1)
32-
public String errorCode = null;
33-
34-
@DataMember(Order=2)
35-
public String message = null;
36-
37-
@DataMember(Order=3)
38-
public String stackTrace = null;
39-
40-
@DataMember(Order=4)
41-
public ArrayList<ResponseError> errors = null;
42-
43-
public String getErrorCode() { return errorCode; }
44-
public ResponseStatus setErrorCode(String value) { this.errorCode = value; return this; }
45-
public String getMessage() { return message; }
46-
public ResponseStatus setMessage(String value) { this.message = value; return this; }
47-
public String getStackTrace() { return stackTrace; }
48-
public ResponseStatus setStackTrace(String value) { this.stackTrace = value; return this; }
49-
public ArrayList<ResponseError> getErrors() { return errors; }
50-
public ResponseStatus setErrors(ArrayList<ResponseError> value) { this.errors = value; return this; }
51-
}
52-
5328
public static enum ExternalEnum
5429
{
5530
Foo,
@@ -433,26 +408,6 @@ public static class RequestLogEntry
433408
public RequestLogEntry setRequestDuration(TimeSpan value) { this.requestDuration = value; return this; }
434409
}
435410

436-
@DataContract
437-
public static class ResponseError
438-
{
439-
@DataMember(Order=1, EmitDefaultValue=false)
440-
public String errorCode = null;
441-
442-
@DataMember(Order=2, EmitDefaultValue=false)
443-
public String fieldName = null;
444-
445-
@DataMember(Order=3, EmitDefaultValue=false)
446-
public String message = null;
447-
448-
public String getErrorCode() { return errorCode; }
449-
public ResponseError setErrorCode(String value) { this.errorCode = value; return this; }
450-
public String getFieldName() { return fieldName; }
451-
public ResponseError setFieldName(String value) { this.fieldName = value; return this; }
452-
public String getMessage() { return message; }
453-
public ResponseError setMessage(String value) { this.message = value; return this; }
454-
}
455-
456411
public static enum ExternalEnum2
457412
{
458413
Uno,

‎src/AndroidClient/client/src/main/java/net/servicestack/client/ResponseError.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Copyright (c) 2015 ServiceStack LLC. All rights reserved.
2+
3+
package net.servicestack.client;
4+
5+
@DataContract
6+
public class ResponseError
7+
{
8+
@DataMember(Order=1, EmitDefaultValue=false)
9+
public String errorCode = null;
10+
11+
@DataMember(Order=2, EmitDefaultValue=false)
12+
public String fieldName = null;
13+
14+
@DataMember(Order=3, EmitDefaultValue=false)
15+
public String message = null;
16+
17+
public String getErrorCode() { return errorCode; }
18+
public ResponseError setErrorCode(String value) { this.errorCode = value; return this; }
19+
public String getFieldName() { return fieldName; }
20+
public ResponseError setFieldName(String value) { this.fieldName = value; return this; }
21+
public String getMessage() { return message; }
22+
public ResponseError setMessage(String value) { this.message = value; return this; }
23+
}

‎src/AndroidClient/client/src/main/java/net/servicestack/client/ResponseStatus.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Copyright (c) 2015 ServiceStack LLC. All rights reserved.
2+
3+
package net.servicestack.client;
4+
5+
import java.util.ArrayList;
6+
7+
@DataContract
8+
public class ResponseStatus
9+
{
10+
@DataMember(Order=1)
11+
public String errorCode = null;
12+
13+
@DataMember(Order=2)
14+
public String message = null;
15+
16+
@DataMember(Order=3)
17+
public String stackTrace = null;
18+
19+
@DataMember(Order=4)
20+
public ArrayList<ResponseError> errors = null;
21+
22+
public String getErrorCode() { return errorCode; }
23+
public ResponseStatus setErrorCode(String value) { this.errorCode = value; return this; }
24+
public String getMessage() { return message; }
25+
public ResponseStatus setMessage(String value) { this.message = value; return this; }
26+
public String getStackTrace() { return stackTrace; }
27+
public ResponseStatus setStackTrace(String value) { this.stackTrace = value; return this; }
28+
public ArrayList<ResponseError> getErrors() { return errors; }
29+
public ResponseStatus setErrors(ArrayList<ResponseError> value) { this.errors = value; return this; }
30+
}

0 commit comments

Comments
 (0)