Skip to content

Commit 8835092

Browse files
committed
Migrate to okhttp client + android compatibility.
1 parent 5f0cf33 commit 8835092

31 files changed

+107
-382
lines changed

build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories {
1010
}
1111

1212
group = 'org.typesense'
13-
version = '0.0.6'
13+
version = '0.0.7-beta1'
1414
sourceCompatibility = 1.8
1515
targetCompatibility = 1.8
1616

@@ -62,14 +62,12 @@ check.dependsOn integrationTest
6262

6363
dependencies {
6464
implementation "javax.xml.bind:jaxb-api:2.3.1"
65-
implementation "org.glassfish.jersey.core:jersey-client:3.0.4"
66-
implementation "org.glassfish.jersey.media:jersey-media-json-jackson:3.0.4"
67-
implementation "org.glassfish.jersey.inject:jersey-hk2:3.0.4"
6865
implementation "org.apache.logging.log4j:log4j-api:2.19.0"
6966
implementation "org.apache.logging.log4j:log4j-core:2.19.0"
7067
implementation "io.swagger.core.v3:swagger-annotations:2.0.0"
71-
implementation "org.glassfish.jersey.connectors:jersey-apache-connector:3.0.4"
72-
implementation "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.2"
68+
implementation "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.14.1"
69+
implementation "com.squareup.okhttp3:okhttp:4.9.1"
70+
7371
testImplementation "junit:junit:4.12"
7472
testImplementation "org.hamcrest:hamcrest-all:1.3"
7573
integrationTestImplementation "junit:junit:4.12"

src/main/java/org/typesense/api/Alias.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.typesense.api;
22

3-
import org.typesense.api.exceptions.TypesenseError;
43
import org.typesense.model.CollectionAlias;
54

65
public class Alias {
@@ -14,11 +13,11 @@ public Alias(ApiCall apiCall, String name) {
1413
}
1514

1615
public CollectionAlias retrieve() throws Exception {
17-
return this.apiCall.get(this.getEndpoint(),CollectionAlias.class);
16+
return this.apiCall.get(this.getEndpoint(), null, CollectionAlias.class);
1817
}
1918

2019
public CollectionAlias delete() throws Exception {
21-
return this.apiCall.delete(this.getEndpoint(),CollectionAlias.class);
20+
return this.apiCall.delete(this.getEndpoint(), null, CollectionAlias.class);
2221
}
2322

2423
public String getEndpoint(){

src/main/java/org/typesense/api/Aliases.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.typesense.api;
22

3-
import org.typesense.api.exceptions.TypesenseError;
43
import org.typesense.model.CollectionAlias;
54
import org.typesense.model.CollectionAliasSchema;
65
import org.typesense.model.CollectionAliasesResponse;
@@ -16,11 +15,11 @@ public Aliases(ApiCall apiCall){
1615

1716

1817
public CollectionAlias upsert(String name, CollectionAliasSchema collectionAliasSchema) throws Exception {
19-
return this.apiCall.put(RESOURCE_PATH + "/" + name, collectionAliasSchema, CollectionAlias.class);
18+
return this.apiCall.put(RESOURCE_PATH + "/" + name, collectionAliasSchema, null, CollectionAlias.class);
2019
}
2120

2221
public CollectionAliasesResponse retrieve() throws Exception {
23-
return this.apiCall.get(RESOURCE_PATH,CollectionAliasesResponse.class);
22+
return this.apiCall.get(RESOURCE_PATH, null, CollectionAliasesResponse.class);
2423
}
2524

2625
}

0 commit comments

Comments
 (0)