Skip to content

Commit 99e65e5

Browse files
HugoMarioHugoMario
authored
Merge pull request #11195 from swagger-api/sample-update-v3
Sample update v3
2 parents 3625e64 + e378967 commit 99e65e5

File tree

622 files changed

+9283
-7682
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

622 files changed

+9283
-7682
lines changed

‎samples/client/petstore/java/feign/.swagger-codegen/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.26-SNAPSHOT
1+
3.0.28-SNAPSHOT

‎samples/client/petstore/java/feign/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@
253253
<maven.compiler.source>${java.version}</maven.compiler.source>
254254
<maven.compiler.target>${java.version}</maven.compiler.target>
255255
<swagger-core-version>2.0.0</swagger-core-version>
256-
<feign-version>9.4.0</feign-version>
257-
<feign-form-version>2.1.0</feign-form-version>
256+
<feign-version>11.6</feign-version>
257+
<feign-form-version>3.8.0</feign-form-version>
258258
<jackson-version>2.10.1</jackson-version>
259259
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
260260
<junit-version>4.13.1</junit-version>

‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import io.swagger.client.EncodingUtils;
55

66
import java.math.BigDecimal;
7-
import io.swagger.client.model.Body2;
8-
import io.swagger.client.model.Body3;
9-
import io.swagger.client.model.Body4;
10-
import io.swagger.client.model.Body5;
117
import io.swagger.client.model.Client;
8+
import io.swagger.client.model.EnumFormBody;
9+
import io.swagger.client.model.FakeBody;
10+
import io.swagger.client.model.FakeBody1;
11+
import io.swagger.client.model.FakeJsonFormDataBody;
1212
import io.swagger.client.model.OuterComposite;
1313

1414
import java.util.ArrayList;
@@ -89,7 +89,7 @@ public interface FakeApi extends ApiClient.Api {
8989
"Content-Type: application/xml; charset&#x3D;utf-8",
9090
"Accept: */*",
9191
})
92-
void testEndpointParameters(Body2 body);
92+
void testEndpointParameters(FakeBody body);
9393
/**
9494
* To test enum parameters
9595
* To test enum parameters
@@ -162,7 +162,7 @@ public TestEnumParametersQueryParams enumQueryInteger(final Integer value) {
162162
"Content-Type: */*",
163163
"Accept: */*",
164164
})
165-
void testEnumRequestBody(Body4 body);
165+
void testEnumRequestBody(EnumFormBody body);
166166
/**
167167
* test inline additionalProperties
168168
*
@@ -184,5 +184,5 @@ public TestEnumParametersQueryParams enumQueryInteger(final Integer value) {
184184
"Content-Type: application/json",
185185
"Accept: */*",
186186
})
187-
void testJsonFormData(Body5 body);
187+
void testJsonFormData(FakeJsonFormDataBody body);
188188
}

‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuth.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,19 @@ public void apply(RequestTemplate template) {
8383
}
8484
// If first time, get the token
8585
if (expirationTimeMillis == null || System.currentTimeMillis() >= expirationTimeMillis) {
86-
updateAccessToken();
86+
updateAccessToken(template);
8787
}
8888
if (getAccessToken() != null) {
8989
template.header("Authorization", "Bearer " + getAccessToken());
9090
}
9191
}
9292

93-
public synchronized void updateAccessToken() {
93+
public synchronized void updateAccessToken(RequestTemplate template) {
9494
OAuthJSONAccessTokenResponse accessTokenResponse;
9595
try {
9696
accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
9797
} catch (Exception e) {
98-
throw new RetryableException(e.getMessage(), e,null);
98+
throw new RetryableException(400, e.getMessage(), template.request().httpMethod(), e, null, template.request());
9999
}
100100
if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
101101
setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn());

‎samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Body6.java‎ renamed to ‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalAnimalIdBody.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
import com.fasterxml.jackson.annotation.JsonValue;
2020
import io.swagger.v3.oas.annotations.media.Schema;
2121
/**
22-
* Body6
22+
* AnimalAnimalIdBody
2323
*/
2424

2525

26-
public class Body6 {
26+
public class AnimalAnimalIdBody {
2727
@JsonProperty("name")
2828
private String name = null;
2929

3030
@JsonProperty("status")
3131
private String status = null;
3232

33-
public Body6 name(String name) {
33+
public AnimalAnimalIdBody name(String name) {
3434
this.name = name;
3535
return this;
3636
}
@@ -48,7 +48,7 @@ public void setName(String name) {
4848
this.name = name;
4949
}
5050

51-
public Body6 status(String status) {
51+
public AnimalAnimalIdBody status(String status) {
5252
this.status = status;
5353
return this;
5454
}
@@ -75,9 +75,9 @@ public boolean equals(java.lang.Object o) {
7575
if (o == null || getClass() != o.getClass()) {
7676
return false;
7777
}
78-
Body6 body6 = (Body6) o;
79-
return Objects.equals(this.name, body6.name) &&
80-
Objects.equals(this.status, body6.status);
78+
AnimalAnimalIdBody animalAnimalIdBody = (AnimalAnimalIdBody) o;
79+
return Objects.equals(this.name, animalAnimalIdBody.name) &&
80+
Objects.equals(this.status, animalAnimalIdBody.status);
8181
}
8282

8383
@Override
@@ -89,7 +89,7 @@ public int hashCode() {
8989
@Override
9090
public String toString() {
9191
StringBuilder sb = new StringBuilder();
92-
sb.append("class Body6 {\n");
92+
sb.append("class AnimalAnimalIdBody {\n");
9393

9494
sb.append(" name: ").append(toIndentedString(name)).append("\n");
9595
sb.append(" status: ").append(toIndentedString(status)).append("\n");

‎samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Body7.java‎ renamed to ‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/DogDogIdBody.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
import com.fasterxml.jackson.annotation.JsonValue;
2020
import io.swagger.v3.oas.annotations.media.Schema;
2121
/**
22-
* Body7
22+
* DogDogIdBody
2323
*/
2424

2525

26-
public class Body7 {
26+
public class DogDogIdBody {
2727
@JsonProperty("name")
2828
private String name = null;
2929

3030
@JsonProperty("status")
3131
private String status = null;
3232

33-
public Body7 name(String name) {
33+
public DogDogIdBody name(String name) {
3434
this.name = name;
3535
return this;
3636
}
@@ -48,7 +48,7 @@ public void setName(String name) {
4848
this.name = name;
4949
}
5050

51-
public Body7 status(String status) {
51+
public DogDogIdBody status(String status) {
5252
this.status = status;
5353
return this;
5454
}
@@ -75,9 +75,9 @@ public boolean equals(java.lang.Object o) {
7575
if (o == null || getClass() != o.getClass()) {
7676
return false;
7777
}
78-
Body7 body7 = (Body7) o;
79-
return Objects.equals(this.name, body7.name) &&
80-
Objects.equals(this.status, body7.status);
78+
DogDogIdBody dogDogIdBody = (DogDogIdBody) o;
79+
return Objects.equals(this.name, dogDogIdBody.name) &&
80+
Objects.equals(this.status, dogDogIdBody.status);
8181
}
8282

8383
@Override
@@ -89,7 +89,7 @@ public int hashCode() {
8989
@Override
9090
public String toString() {
9191
StringBuilder sb = new StringBuilder();
92-
sb.append("class Body7 {\n");
92+
sb.append("class DogDogIdBody {\n");
9393

9494
sb.append(" name: ").append(toIndentedString(name)).append("\n");
9595
sb.append(" status: ").append(toIndentedString(status)).append("\n");

‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Body4.java‎ renamed to ‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumFormBody.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import java.util.ArrayList;
2222
import java.util.List;
2323
/**
24-
* Body4
24+
* EnumFormBody
2525
*/
2626

2727

28-
public class Body4 {
28+
public class EnumFormBody {
2929
/**
3030
* Gets or Sets enumFormStringArray
3131
*/
@@ -129,12 +129,12 @@ public static EnumQueryDoubleEnum fromValue(String text) {
129129
} @JsonProperty("enum_query_double")
130130
private EnumQueryDoubleEnum enumQueryDouble = null;
131131

132-
public Body4 enumFormStringArray(List<EnumFormStringArrayEnum> enumFormStringArray) {
132+
public EnumFormBody enumFormStringArray(List<EnumFormStringArrayEnum> enumFormStringArray) {
133133
this.enumFormStringArray = enumFormStringArray;
134134
return this;
135135
}
136136

137-
public Body4 addEnumFormStringArrayItem(EnumFormStringArrayEnum enumFormStringArrayItem) {
137+
public EnumFormBody addEnumFormStringArrayItem(EnumFormStringArrayEnum enumFormStringArrayItem) {
138138
if (this.enumFormStringArray == null) {
139139
this.enumFormStringArray = new ArrayList<>();
140140
}
@@ -155,7 +155,7 @@ public void setEnumFormStringArray(List<EnumFormStringArrayEnum> enumFormStringA
155155
this.enumFormStringArray = enumFormStringArray;
156156
}
157157

158-
public Body4 enumFormString(EnumFormStringEnum enumFormString) {
158+
public EnumFormBody enumFormString(EnumFormStringEnum enumFormString) {
159159
this.enumFormString = enumFormString;
160160
return this;
161161
}
@@ -173,7 +173,7 @@ public void setEnumFormString(EnumFormStringEnum enumFormString) {
173173
this.enumFormString = enumFormString;
174174
}
175175

176-
public Body4 enumQueryDouble(EnumQueryDoubleEnum enumQueryDouble) {
176+
public EnumFormBody enumQueryDouble(EnumQueryDoubleEnum enumQueryDouble) {
177177
this.enumQueryDouble = enumQueryDouble;
178178
return this;
179179
}
@@ -200,10 +200,10 @@ public boolean equals(java.lang.Object o) {
200200
if (o == null || getClass() != o.getClass()) {
201201
return false;
202202
}
203-
Body4 body4 = (Body4) o;
204-
return Objects.equals(this.enumFormStringArray, body4.enumFormStringArray) &&
205-
Objects.equals(this.enumFormString, body4.enumFormString) &&
206-
Objects.equals(this.enumQueryDouble, body4.enumQueryDouble);
203+
EnumFormBody enumFormBody = (EnumFormBody) o;
204+
return Objects.equals(this.enumFormStringArray, enumFormBody.enumFormStringArray) &&
205+
Objects.equals(this.enumFormString, enumFormBody.enumFormString) &&
206+
Objects.equals(this.enumQueryDouble, enumFormBody.enumQueryDouble);
207207
}
208208

209209
@Override
@@ -215,7 +215,7 @@ public int hashCode() {
215215
@Override
216216
public String toString() {
217217
StringBuilder sb = new StringBuilder();
218-
sb.append("class Body4 {\n");
218+
sb.append("class EnumFormBody {\n");
219219

220220
sb.append(" enumFormStringArray: ").append(toIndentedString(enumFormStringArray)).append("\n");
221221
sb.append(" enumFormString: ").append(toIndentedString(enumFormString)).append("\n");

0 commit comments

Comments
 (0)