Skip to content

Commit b7e4be7

Browse files
author
ant3
committed
Rebuilt jersey1 client sample
1 parent b107b46 commit b7e4be7

File tree

8 files changed

+46
-11
lines changed

8 files changed

+46
-11
lines changed

samples/client/petstore/java/default/.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,9 @@
1313

1414
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
1515
hs_err_pid*
16+
17+
# build files
18+
**/target
19+
target
20+
.gradle
21+
build

samples/client/petstore/java/default/.swagger-codegen-ignore

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

1515
# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
1616
#foo/**/qux
17-
# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
17+
# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
1818

1919
# You can also negate patterns with an exclamation (!).
2020
# For example, you can ignore all files in a docs folder with the file extension .md:
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#
2+
# Generated by: https://github.com/swagger-api/swagger-codegen.git
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
language: java
17+
jdk:
18+
- oraclejdk8
19+
- oraclejdk7
20+
before_install:
21+
# ensure gradlew has proper permission
22+
- chmod a+x ./gradlew
23+
script:
24+
# test using maven
25+
- mvn test
26+
# uncomment below to test using gradle
27+
# - gradle test
28+
# uncomment below to test using sbt
29+
# - sbt test

samples/client/petstore/java/default/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ if(hasProperty('target') && target == 'android') {
7777

7878
apply plugin: 'java'
7979
apply plugin: 'maven'
80-
80+
8181
sourceCompatibility = JavaVersion.VERSION_1_7
8282
targetCompatibility = JavaVersion.VERSION_1_7
8383

@@ -95,9 +95,9 @@ if(hasProperty('target') && target == 'android') {
9595

9696
ext {
9797
swagger_annotations_version = "1.5.8"
98-
jackson_version = "2.7.0"
98+
jackson_version = "2.7.5"
9999
jersey_version = "1.19.1"
100-
jodatime_version = "2.9.3"
100+
jodatime_version = "2.9.4"
101101
junit_version = "4.12"
102102
}
103103

@@ -109,7 +109,7 @@ dependencies {
109109
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
110110
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
111111
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
112-
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5"
112+
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
113113
compile "joda-time:joda-time:$jodatime_version"
114114
compile "com.brsanthu:migbase64:2.2"
115115
testCompile "junit:junit:$junit_version"

samples/client/petstore/java/default/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<dependency>
147147
<groupId>com.fasterxml.jackson.datatype</groupId>
148148
<artifactId>jackson-datatype-joda</artifactId>
149-
<version>2.1.5</version>
149+
<version>${jackson-version}</version>
150150
</dependency>
151151
<dependency>
152152
<groupId>joda-time</groupId>
@@ -173,8 +173,8 @@
173173
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
174174
<swagger-annotations-version>1.5.8</swagger-annotations-version>
175175
<jersey-version>1.19.1</jersey-version>
176-
<jackson-version>2.7.0</jackson-version>
177-
<jodatime-version>2.9.3</jodatime-version>
176+
<jackson-version>2.7.5</jackson-version>
177+
<jodatime-version>2.9.4</jodatime-version>
178178
<maven-plugin-version>1.0.0</maven-plugin-version>
179179
<junit-version>4.12</junit-version>
180180
</properties>

samples/client/petstore/java/default/src/main/java/io/swagger/client/ApiClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public ApiClient() {
7575

7676
// Setup authentications (key: authentication name, value: authentication).
7777
authentications = new HashMap<String, Authentication>();
78-
authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
7978
authentications.put("petstore_auth", new OAuth());
79+
authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
8080
// Prevent the authentications from being modified.
8181
authentications = Collections.unmodifiableMap(authentications);
8282

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import io.swagger.client.Pair;
1010

1111
import org.joda.time.LocalDate;
12-
import org.joda.time.DateTime;
1312
import java.math.BigDecimal;
13+
import org.joda.time.DateTime;
1414

1515

1616
import java.util.ArrayList;

samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import io.swagger.client.Pair;
1010

1111
import io.swagger.client.model.Pet;
12-
import java.io.File;
1312
import io.swagger.client.model.ModelApiResponse;
13+
import java.io.File;
1414

1515

1616
import java.util.ArrayList;

0 commit comments

Comments
 (0)