Skip to content

Commit 4241b11

Browse files
SergeyLyakhovwing328
SergeyLyakhov
authored and
wing328
committed
[Java][jersey2] Fix logging for jersey2 + java6 (#6715). (#7348)
* [Java][jersey2] Fix logging for jersey2 + java6 (#6715). * Fix formatting according to comments.
1 parent 75c0180 commit 4241b11

File tree

26 files changed

+1313
-1012
lines changed

26 files changed

+1313
-1012
lines changed

‎modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/ApiClient.mustache‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import org.glassfish.jersey.client.ClientConfig;
1515
import org.glassfish.jersey.client.ClientProperties;
1616
import org.glassfish.jersey.client.HttpUrlConnectorProvider;
1717
import org.glassfish.jersey.jackson.JacksonFeature;
18-
import org.glassfish.jersey.logging.LoggingFeature;
1918
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
2019
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
2120
import org.glassfish.jersey.media.multipart.MultiPart;
@@ -27,9 +26,11 @@ import java.io.InputStream;
2726
{{^supportJava6}}
2827
import java.nio.file.Files;
2928
import java.nio.file.StandardCopyOption;
29+
import org.glassfish.jersey.logging.LoggingFeature;
3030
{{/supportJava6}}
3131
{{#supportJava6}}
3232
import org.apache.commons.io.FileUtils;
33+
import org.glassfish.jersey.filter.LoggingFilter;
3334
{{/supportJava6}}
3435
import java.util.Collection;
3536
import java.util.Collections;
@@ -771,10 +772,15 @@ public class ApiClient {
771772
clientConfig.register(JacksonFeature.class);
772773
clientConfig.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true);
773774
if (debugging) {
775+
{{^supportJava6}}
774776
clientConfig.register(new LoggingFeature(java.util.logging.Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME), java.util.logging.Level.INFO, LoggingFeature.Verbosity.PAYLOAD_ANY, 1024*50 /* Log payloads up to 50K */));
775777
clientConfig.property(LoggingFeature.LOGGING_FEATURE_VERBOSITY, LoggingFeature.Verbosity.PAYLOAD_ANY);
776778
// Set logger to ALL
777779
java.util.logging.Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME).setLevel(java.util.logging.Level.ALL);
780+
{{/supportJava6}}
781+
{{#supportJava6}}
782+
clientConfig.register(new LoggingFilter(java.util.logging.Logger.getLogger(LoggingFilter.class.getName()), true));
783+
{{/supportJava6}}
778784
}
779785
performAdditionalClientConfiguration(clientConfig);
780786
return ClientBuilder.newClient(clientConfig);

‎modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,14 @@ if(hasProperty('target') && target == 'android') {
107107
ext {
108108
swagger_annotations_version = "1.5.15"
109109
jackson_version = "2.8.9"
110-
jersey_version = "2.25.1"
111110
{{#supportJava6}}
111+
jersey_version = "2.6"
112112
commons_io_version=2.5
113113
commons_lang3_version=3.6
114114
{{/supportJava6}}
115+
{{^supportJava6}}
116+
jersey_version = "2.25.1"
117+
{{/supportJava6}}
115118
junit_version = "4.12"
116119
}
117120

‎modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.sbt.mustache‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ lazy val root = (project in file(".")).
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
1212
"io.swagger" % "swagger-annotations" % "1.5.15",
13-
"org.glassfish.jersey.core" % "jersey-client" % "2.25.1",
14-
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1",
15-
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1",
13+
"org.glassfish.jersey.core" % "jersey-client" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
14+
"org.glassfish.jersey.media" % "jersey-media-multipart" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
15+
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}},
1616
"com.fasterxml.jackson.core" % "jackson-core" % "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
1717
"com.fasterxml.jackson.core" % "jackson-annotations" % "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",
1818
"com.fasterxml.jackson.core" % "jackson-databind" % "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" % "compile",

‎samples/client/petstore/java/jersey2-java6/.swagger-codegen/VERSION‎

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

‎samples/client/petstore/java/jersey2-java6/README.md‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# swagger-petstore-jersey2
1+
# swagger-petstore-jersey2-java6
22

33
## Requirements
44

@@ -27,7 +27,7 @@ Add this dependency to your project's POM:
2727
```xml
2828
<dependency>
2929
<groupId>io.swagger</groupId>
30-
<artifactId>swagger-petstore-jersey2</artifactId>
30+
<artifactId>swagger-petstore-jersey2-java6</artifactId>
3131
<version>1.0.0</version>
3232
<scope>compile</scope>
3333
</dependency>
@@ -38,7 +38,7 @@ Add this dependency to your project's POM:
3838
Add this dependency to your project's build file:
3939

4040
```groovy
41-
compile "io.swagger:swagger-petstore-jersey2:1.0.0"
41+
compile "io.swagger:swagger-petstore-jersey2-java6:1.0.0"
4242
```
4343

4444
### Others
@@ -49,7 +49,7 @@ At first generate the JAR by executing:
4949

5050
Then manually install the following JARs:
5151

52-
* target/swagger-petstore-jersey2-1.0.0.jar
52+
* target/swagger-petstore-jersey2-java6-1.0.0.jar
5353
* target/lib/*.jar
5454

5555
## Getting Started
@@ -61,22 +61,22 @@ Please follow the [installation](#installation) instruction and execute the foll
6161
import io.swagger.client.*;
6262
import io.swagger.client.auth.*;
6363
import io.swagger.client.model.*;
64-
import io.swagger.client.api.FakeApi;
64+
import io.swagger.client.api.AnotherFakeApi;
6565

6666
import java.io.File;
6767
import java.util.*;
6868

69-
public class FakeApiExample {
69+
public class AnotherFakeApiExample {
7070

7171
public static void main(String[] args) {
7272

73-
FakeApi apiInstance = new FakeApi();
73+
AnotherFakeApi apiInstance = new AnotherFakeApi();
7474
Client body = new Client(); // Client | client model
7575
try {
76-
Client result = apiInstance.testClientModel(body);
76+
Client result = apiInstance.testSpecialTags(body);
7777
System.out.println(result);
7878
} catch (ApiException e) {
79-
System.err.println("Exception when calling FakeApi#testClientModel");
79+
System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
8080
e.printStackTrace();
8181
}
8282
}
@@ -86,13 +86,21 @@ public class FakeApiExample {
8686

8787
## Documentation for API Endpoints
8888

89-
All URIs are relative to *http://petstore.swagger.io/v2*
89+
All URIs are relative to *http://petstore.swagger.io:80/v2*
9090

9191
Class | Method | HTTP request | Description
9292
------------ | ------------- | ------------- | -------------
93+
*AnotherFakeApi* | [**testSpecialTags**](docs/AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
94+
*FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean |
95+
*FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite |
96+
*FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number |
97+
*FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string |
9398
*FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
9499
*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
95100
*FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
101+
*FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
102+
*FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
103+
*FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
96104
*PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
97105
*PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
98106
*PetApi* | [**findPetsByStatus**](docs/PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
@@ -101,9 +109,9 @@ Class | Method | HTTP request | Description
101109
*PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
102110
*PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
103111
*PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
104-
*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
112+
*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
105113
*StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
106-
*StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
114+
*StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
107115
*StoreApi* | [**placeOrder**](docs/StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
108116
*UserApi* | [**createUser**](docs/UserApi.md#createUser) | **POST** /user | Create user
109117
*UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
@@ -123,10 +131,10 @@ Class | Method | HTTP request | Description
123131
- [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
124132
- [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
125133
- [ArrayTest](docs/ArrayTest.md)
126-
- [Cat](docs/Cat.md)
134+
- [Capitalization](docs/Capitalization.md)
127135
- [Category](docs/Category.md)
136+
- [ClassModel](docs/ClassModel.md)
128137
- [Client](docs/Client.md)
129-
- [Dog](docs/Dog.md)
130138
- [EnumArrays](docs/EnumArrays.md)
131139
- [EnumClass](docs/EnumClass.md)
132140
- [EnumTest](docs/EnumTest.md)
@@ -140,11 +148,15 @@ Class | Method | HTTP request | Description
140148
- [Name](docs/Name.md)
141149
- [NumberOnly](docs/NumberOnly.md)
142150
- [Order](docs/Order.md)
151+
- [OuterComposite](docs/OuterComposite.md)
152+
- [OuterEnum](docs/OuterEnum.md)
143153
- [Pet](docs/Pet.md)
144154
- [ReadOnlyFirst](docs/ReadOnlyFirst.md)
145155
- [SpecialModelName](docs/SpecialModelName.md)
146156
- [Tag](docs/Tag.md)
147157
- [User](docs/User.md)
158+
- [Cat](docs/Cat.md)
159+
- [Dog](docs/Dog.md)
148160

149161

150162
## Documentation for Authorization
@@ -156,6 +168,12 @@ Authentication schemes defined for the API:
156168
- **API key parameter name**: api_key
157169
- **Location**: HTTP header
158170

171+
### api_key_query
172+
173+
- **Type**: API key
174+
- **API key parameter name**: api_key_query
175+
- **Location**: URL query string
176+
159177
### http_basic_test
160178

161179
- **Type**: HTTP basic authentication

‎samples/client/petstore/java/jersey2-java6/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ if(hasProperty('target') && target == 'android') {
9595
ext {
9696
swagger_annotations_version = "1.5.15"
9797
jackson_version = "2.8.9"
98-
jersey_version = "2.25.1"
98+
jersey_version = "2.6"
9999
commons_io_version=2.5
100100
commons_lang3_version=3.6
101101
junit_version = "4.12"

‎samples/client/petstore/java/jersey2-java6/build.sbt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ lazy val root = (project in file(".")).
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
1212
"io.swagger" % "swagger-annotations" % "1.5.15",
13-
"org.glassfish.jersey.core" % "jersey-client" % "2.25.1",
14-
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1",
15-
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1",
13+
"org.glassfish.jersey.core" % "jersey-client" % "2.6",
14+
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.6",
15+
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.6",
1616
"com.fasterxml.jackson.core" % "jackson-core" % "2.6.4" % "compile",
1717
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.4" % "compile",
1818
"com.fasterxml.jackson.core" % "jackson-databind" % "2.6.4" % "compile",

‎samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/ApiClient.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.glassfish.jersey.client.ClientProperties;
1616
import org.glassfish.jersey.client.HttpUrlConnectorProvider;
1717
import org.glassfish.jersey.jackson.JacksonFeature;
18-
import org.glassfish.jersey.logging.LoggingFeature;
1918
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
2019
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
2120
import org.glassfish.jersey.media.multipart.MultiPart;
@@ -25,6 +24,7 @@
2524
import java.io.InputStream;
2625

2726
import org.apache.commons.io.FileUtils;
27+
import org.glassfish.jersey.filter.LoggingFilter;
2828
import java.util.Collection;
2929
import java.util.Collections;
3030
import java.util.Map;
@@ -761,10 +761,7 @@ protected Client buildHttpClient(boolean debugging) {
761761
clientConfig.register(JacksonFeature.class);
762762
clientConfig.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true);
763763
if (debugging) {
764-
clientConfig.register(new LoggingFeature(java.util.logging.Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME), java.util.logging.Level.INFO, LoggingFeature.Verbosity.PAYLOAD_ANY, 1024*50 /* Log payloads up to 50K */));
765-
clientConfig.property(LoggingFeature.LOGGING_FEATURE_VERBOSITY, LoggingFeature.Verbosity.PAYLOAD_ANY);
766-
// Set logger to ALL
767-
java.util.logging.Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME).setLevel(java.util.logging.Level.ALL);
764+
clientConfig.register(new LoggingFilter(java.util.logging.Logger.getLogger(LoggingFilter.class.getName()), true));
768765
}
769766
performAdditionalClientConfiguration(clientConfig);
770767
return ClientBuilder.newClient(clientConfig);

0 commit comments

Comments
 (0)