Skip to content

Commit b455129

Browse files
Release 1.6.2
1 parent 35aa6ca commit b455129

27 files changed

Lines changed: 887 additions & 384 deletions

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ jobs:
5858
env:
5959
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
6060
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
61-
MAVEN_PUBLISH_REGISTRY_URL: "https://s01.oss.sonatype.org/content/repositories/releases/"
61+
MAVEN_PUBLISH_REGISTRY_URL: "https://s01.oss.sonatype.org/content/repositories/releases/"

build.gradle

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,20 @@ publishing {
4646
maven(MavenPublication) {
4747
groupId = 'com.polytomic'
4848
artifactId = 'polytomic-java'
49-
version = '1.6.1'
49+
version = '1.6.2'
5050
from components.java
51+
pom {
52+
licenses {
53+
license {
54+
name = 'MIT'
55+
}
56+
}
57+
scm {
58+
connection = 'scm:git:git://github.com/polytomic/polytomic-java.git'
59+
developerConnection = 'scm:git:git://github.com/polytomic/polytomic-java.git'
60+
url = 'https://github.com/polytomic/polytomic-java'
61+
}
62+
}
5163
}
5264
}
5365
repositories {

gradle/wrapper/gradle-wrapper.jar

-9 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew.bat

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/com/polytomic/api/PolytomicBuilder.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,9 @@ public Polytomic build() {
4646
throw new RuntimeException("Please provide token");
4747
}
4848
this.clientOptionsBuilder.addHeader("Authorization", "Bearer " + this.token);
49-
if (version == null) {
50-
throw new RuntimeException("Please provide version");
49+
if (version != null) {
50+
this.clientOptionsBuilder.addHeader("X-Polytomic-Version", this.version);
5151
}
52-
this.clientOptionsBuilder.addHeader("X-Polytomic-Version", this.version);
5352
clientOptionsBuilder.environment(this.environment);
5453
return new Polytomic(clientOptionsBuilder.build());
5554
}

src/main/java/com/polytomic/api/core/ClientOptions.java

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import java.util.HashMap;
77
import java.util.Map;
8+
import java.util.concurrent.TimeUnit;
89
import java.util.function.Supplier;
910
import okhttp3.OkHttpClient;
1011

@@ -25,16 +26,15 @@ private ClientOptions(
2526
this.environment = environment;
2627
this.headers = new HashMap<>();
2728
this.headers.putAll(headers);
28-
this.headers.putAll(Map.of(
29-
"X-Fern-SDK-Name",
30-
"com.polytomic.fern:api-sdk",
31-
"X-Fern-SDK-Version",
32-
"1.6.1",
33-
"X-Fern-Language",
34-
"JAVA"));
29+
this.headers.putAll(new HashMap<String, String>() {
30+
{
31+
put("X-Fern-Language", "JAVA");
32+
put("X-Fern-SDK-Name", "com.polytomic.fern:api-sdk");
33+
put("X-Fern-SDK-Version", "1.6.2");
34+
}
35+
});
3536
this.headerSuppliers = headerSuppliers;
3637
this.httpClient = httpClient;
37-
;
3838
}
3939

4040
public Environment environment() {
@@ -56,6 +56,19 @@ public OkHttpClient httpClient() {
5656
return this.httpClient;
5757
}
5858

59+
public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) {
60+
if (requestOptions == null) {
61+
return this.httpClient;
62+
}
63+
return this.httpClient
64+
.newBuilder()
65+
.callTimeout(requestOptions.getTimeout().get(), requestOptions.getTimeoutTimeUnit())
66+
.connectTimeout(0, TimeUnit.SECONDS)
67+
.writeTimeout(0, TimeUnit.SECONDS)
68+
.readTimeout(0, TimeUnit.SECONDS)
69+
.build();
70+
}
71+
5972
public static Builder builder() {
6073
return new Builder();
6174
}

src/main/java/com/polytomic/api/core/RequestOptions.java

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,31 @@
55

66
import java.util.HashMap;
77
import java.util.Map;
8+
import java.util.Optional;
9+
import java.util.concurrent.TimeUnit;
810

911
public final class RequestOptions {
1012
private final String token;
1113

1214
private final String version;
1315

14-
private RequestOptions(String token, String version) {
16+
private final Optional<Integer> timeout;
17+
18+
private final TimeUnit timeoutTimeUnit;
19+
20+
private RequestOptions(String token, String version, Optional<Integer> timeout, TimeUnit timeoutTimeUnit) {
1521
this.token = token;
1622
this.version = version;
23+
this.timeout = timeout;
24+
this.timeoutTimeUnit = timeoutTimeUnit;
25+
}
26+
27+
public Optional<Integer> getTimeout() {
28+
return timeout;
29+
}
30+
31+
public TimeUnit getTimeoutTimeUnit() {
32+
return timeoutTimeUnit;
1733
}
1834

1935
public Map<String, String> getHeaders() {
@@ -36,6 +52,10 @@ public static final class Builder {
3652

3753
private String version = null;
3854

55+
private Optional<Integer> timeout = null;
56+
57+
private TimeUnit timeoutTimeUnit = TimeUnit.SECONDS;
58+
3959
public Builder token(String token) {
4060
this.token = token;
4161
return this;
@@ -46,8 +66,19 @@ public Builder version(String version) {
4666
return this;
4767
}
4868

69+
public Builder timeout(Integer timeout) {
70+
this.timeout = Optional.of(timeout);
71+
return this;
72+
}
73+
74+
public Builder timeout(Integer timeout, TimeUnit timeoutTimeUnit) {
75+
this.timeout = Optional.of(timeout);
76+
this.timeoutTimeUnit = timeoutTimeUnit;
77+
return this;
78+
}
79+
4980
public RequestOptions build() {
50-
return new RequestOptions(token, version);
81+
return new RequestOptions(token, version, timeout, timeoutTimeUnit);
5182
}
5283
}
5384
}

0 commit comments

Comments
 (0)