Skip to content

Commit 39b045d

Browse files
alexcheng1982alexcheng1982
committed
update openapi spec
1 parent b2411e2 commit 39b045d

File tree

2 files changed

+41
-45
lines changed

2 files changed

+41
-45
lines changed

‎pom.xml‎

Lines changed: 34 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>com.javaaidev</groupId>
88
<artifactId>usda-food-data-central-api-client</artifactId>
99
<packaging>jar</packaging>
10-
<version>1.2.0</version>
10+
<version>1.3.0</version>
1111
<name>USDA FoodData Central API Client</name>
1212
<description>USDA FoodData Central API Client, Generated from OpenAPI spec</description>
1313

@@ -46,18 +46,13 @@
4646
<maven.compiler.source>${java.version}</maven.compiler.source>
4747
<maven.compiler.target>${java.version}</maven.compiler.target>
4848
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
49-
<gson-fire-version>1.9.0</gson-fire-version>
50-
<okhttp-version>4.12.0</okhttp-version>
51-
<gson-version>2.10.1</gson-version>
52-
<commons-lang3-version>3.18.0</commons-lang3-version>
49+
<httpclient-version>5.2.1</httpclient-version>
50+
<jackson-version>2.19.2</jackson-version>
51+
<jackson-databind-version>2.19.2</jackson-databind-version>
5352
<jackson-databind-nullable-version>0.2.8</jackson-databind-nullable-version>
5453
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
5554
<beanvalidation-version>2.0.2</beanvalidation-version>
56-
<junit-version>5.10.3</junit-version>
57-
<junit-platform-runner.version>1.10.0</junit-platform-runner.version>
58-
<jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>
59-
<jsr311-api-version>1.1.1</jsr311-api-version>
60-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
55+
<junit-version>5.10.2</junit-version>
6156
<spotless.version>2.43.0</spotless.version>
6257
</properties>
6358

@@ -68,60 +63,59 @@
6863
<artifactId>jsr305</artifactId>
6964
<version>3.0.2</version>
7065
</dependency>
66+
67+
68+
<!-- HTTP client: apache client -->
7169
<dependency>
72-
<groupId>com.squareup.okhttp3</groupId>
73-
<artifactId>okhttp</artifactId>
74-
<version>${okhttp-version}</version>
70+
<groupId>org.apache.httpcomponents.client5</groupId>
71+
<artifactId>httpclient5</artifactId>
72+
<version>${httpclient-version}</version>
7573
</dependency>
74+
75+
<!-- JSON processing: jackson -->
7676
<dependency>
77-
<groupId>com.squareup.okhttp3</groupId>
78-
<artifactId>logging-interceptor</artifactId>
79-
<version>${okhttp-version}</version>
77+
<groupId>com.fasterxml.jackson.core</groupId>
78+
<artifactId>jackson-core</artifactId>
79+
<version>${jackson-version}</version>
8080
</dependency>
8181
<dependency>
82-
<groupId>com.google.code.gson</groupId>
83-
<artifactId>gson</artifactId>
84-
<version>${gson-version}</version>
82+
<groupId>com.fasterxml.jackson.core</groupId>
83+
<artifactId>jackson-annotations</artifactId>
84+
<version>${jackson-version}</version>
8585
</dependency>
8686
<dependency>
87-
<groupId>io.gsonfire</groupId>
88-
<artifactId>gson-fire</artifactId>
89-
<version>${gson-fire-version}</version>
87+
<groupId>com.fasterxml.jackson.core</groupId>
88+
<artifactId>jackson-databind</artifactId>
89+
<version>${jackson-databind-version}</version>
9090
</dependency>
9191
<dependency>
92-
<groupId>org.apache.commons</groupId>
93-
<artifactId>commons-lang3</artifactId>
94-
<version>${commons-lang3-version}</version>
92+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
93+
<artifactId>jackson-jaxrs-json-provider</artifactId>
94+
<version>${jackson-version}</version>
9595
</dependency>
9696
<dependency>
97-
<groupId>jakarta.annotation</groupId>
98-
<artifactId>jakarta.annotation-api</artifactId>
99-
<version>${jakarta-annotation-version}</version>
100-
<scope>provided</scope>
97+
<groupId>com.fasterxml.jackson.datatype</groupId>
98+
<artifactId>jackson-datatype-jsr310</artifactId>
99+
<version>${jackson-version}</version>
101100
</dependency>
102101
<dependency>
103102
<groupId>org.openapitools</groupId>
104103
<artifactId>jackson-databind-nullable</artifactId>
105104
<version>${jackson-databind-nullable-version}</version>
106105
</dependency>
107106
<dependency>
108-
<groupId>jakarta.ws.rs</groupId>
109-
<artifactId>jakarta.ws.rs-api</artifactId>
110-
<version>${jakarta.ws.rs-api-version}</version>
107+
<groupId>jakarta.annotation</groupId>
108+
<artifactId>jakarta.annotation-api</artifactId>
109+
<version>${jakarta-annotation-version}</version>
110+
<scope>provided</scope>
111111
</dependency>
112112
<!-- test dependencies -->
113113
<dependency>
114114
<groupId>org.junit.jupiter</groupId>
115-
<artifactId>junit-jupiter-engine</artifactId>
115+
<artifactId>junit-jupiter-api</artifactId>
116116
<version>${junit-version}</version>
117117
<scope>test</scope>
118118
</dependency>
119-
<dependency>
120-
<groupId>org.junit.platform</groupId>
121-
<artifactId>junit-platform-runner</artifactId>
122-
<version>${junit-platform-runner.version}</version>
123-
<scope>test</scope>
124-
</dependency>
125119
</dependencies>
126120

127121
<build>
@@ -143,7 +137,7 @@
143137
<apiDocs>false</apiDocs>
144138
</globalProperties>
145139
<configOptions>
146-
<library>okhttp-gson</library>
140+
<library>apache-httpclient</library>
147141
<dateLibrary>java8</dateLibrary>
148142
<hideGenerationTimestamp>true</hideGenerationTimestamp>
149143
<annotationLibrary>none</annotationLibrary>

‎src/main/resources/fdc_api.yaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -763,18 +763,20 @@ components:
763763

764764
AbridgedFoodNutrient:
765765
required:
766-
- id
766+
- nutrientId
767767
- nutrientNumber
768-
- unit
768+
- unitName
769769
properties:
770-
number:
770+
nutrientId:
771771
type: integer
772772
format: uint
773773
example: 303
774-
name:
774+
nutrientNumber:
775+
type: string
776+
nutrientName:
775777
type: string
776778
example: "Iron, Fe"
777-
amount:
779+
value:
778780
type: number
779781
format: float
780782
example: 0.53

0 commit comments

Comments
 (0)