Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,30 +36,3 @@ jobs:

- name: Test
run: ./gradlew test
publish:
needs: [ compile, test ]
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
runs-on: ubuntu-latest

steps:
- name: Checkout repo
uses: actions/checkout@v3

- name: Set up Java
id: setup-jre
uses: actions/setup-java@v1
with:
java-version: "11"
architecture: x64

- name: Publish to maven
run: |
./.publish/prepare.sh
./gradlew publish
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
MAVEN_PUBLISH_REGISTRY_URL: "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
MAVEN_SIGNATURE_KID: ${{ secrets.MAVEN_SIGNATURE_KID }}
MAVEN_SIGNATURE_SECRET_KEY: ${{ secrets.MAVEN_SIGNATURE_SECRET_KEY }}
MAVEN_SIGNATURE_PASSWORD: ${{ secrets.MAVEN_SIGNATURE_PASSWORD }}
8 changes: 0 additions & 8 deletions .publish/prepare.sh

This file was deleted.

47 changes: 1 addition & 46 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ plugins {
id 'java-library'
id 'maven-publish'
id 'com.diffplug.spotless' version '6.11.0'
id 'signing'
}

repositories {
mavenCentral()
maven {
url 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
url 'https://s01.oss.sonatype.org/content/repositories/releases/'
}
}

Expand Down Expand Up @@ -36,53 +35,9 @@ java {
withJavadocJar()
}

signing {
sign(publishing.publications)
}
test {
useJUnitPlatform()
testLogging {
showStandardStreams = true
}
}
publishing {
publications {
maven(MavenPublication) {
groupId = 'com.polytomic'
artifactId = 'polytomic-java'
version = '1.15.8'
from components.java
pom {
name = 'polytomic'
description = 'The official SDK of polytomic'
url = 'https://buildwithfern.com'
licenses {
license {
name = 'MIT'
}
}
developers {
developer {
name = 'polytomic'
email = 'developers@polytomic.com'
}
}
scm {
connection = 'scm:git:git://github.com/polytomic/polytomic-java.git'
developerConnection = 'scm:git:git://github.com/polytomic/polytomic-java.git'
url = 'https://github.com/polytomic/polytomic-java'
}
}
}
}
repositories {
maven {
url "$System.env.MAVEN_PUBLISH_REGISTRY_URL"
credentials {
username "$System.env.MAVEN_USERNAME"
password "$System.env.MAVEN_PASSWORD"
}
}
}
}

Empty file removed gradle.properties
Empty file.
5 changes: 3 additions & 2 deletions src/main/java/com/polytomic/api/PolytomicBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ public Polytomic build() {
throw new RuntimeException("Please provide token");
}
this.clientOptionsBuilder.addHeader("Authorization", "Bearer " + this.token);
if (version != null) {
this.clientOptionsBuilder.addHeader("X-Polytomic-Version", this.version);
if (version == null) {
throw new RuntimeException("Please provide version");
}
this.clientOptionsBuilder.addHeader("X-Polytomic-Version", this.version);
clientOptionsBuilder.environment(this.environment);
return new Polytomic(clientOptionsBuilder.build());
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/polytomic/api/core/ClientOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ private ClientOptions(
{
put("X-Fern-Language", "JAVA");
put("X-Fern-SDK-Name", "com.polytomic.fern:api-sdk");
put("X-Fern-SDK-Version", "1.15.8");
put("X-Fern-SDK-Version", "0.0.136");
}
});
this.headerSuppliers = headerSuppliers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@
import com.polytomic.api.core.RequestOptions;
import com.polytomic.api.core.Suppliers;
import com.polytomic.api.resources.bulksync.executions.ExecutionsClient;
import com.polytomic.api.resources.bulksync.requests.BulkSyncActivateRequest;
import com.polytomic.api.resources.bulksync.requests.BulkSyncGetDestinationRequest;
import com.polytomic.api.resources.bulksync.requests.BulkSyncGetRequest;
import com.polytomic.api.resources.bulksync.requests.BulkSyncGetSourceRequest;
import com.polytomic.api.resources.bulksync.requests.BulkSyncGetStatusRequest;
import com.polytomic.api.resources.bulksync.requests.BulkSyncListRequest;
import com.polytomic.api.resources.bulksync.requests.BulkSyncRemoveRequest;
import com.polytomic.api.resources.bulksync.requests.CreateBulkSyncRequest;
Expand All @@ -20,7 +23,6 @@
import com.polytomic.api.resources.bulksync.schedules.SchedulesClient;
import com.polytomic.api.resources.bulksync.schemas.SchemasClient;
import com.polytomic.api.types.ActivateSyncEnvelope;
import com.polytomic.api.types.ActivateSyncInput;
import com.polytomic.api.types.BulkSyncDestEnvelope;
import com.polytomic.api.types.BulkSyncExecutionEnvelope;
import com.polytomic.api.types.BulkSyncListEnvelope;
Expand Down Expand Up @@ -315,11 +317,11 @@ public void remove(String id, BulkSyncRemoveRequest request, RequestOptions requ
}
}

public ActivateSyncEnvelope activate(String id, ActivateSyncInput request) {
public ActivateSyncEnvelope activate(String id, BulkSyncActivateRequest request) {
return activate(id, request, null);
}

public ActivateSyncEnvelope activate(String id, ActivateSyncInput request, RequestOptions requestOptions) {
public ActivateSyncEnvelope activate(String id, BulkSyncActivateRequest request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("api/bulk/syncs")
Expand Down Expand Up @@ -406,22 +408,27 @@ public BulkSyncExecutionEnvelope start(String id, StartBulkSyncRequest request,
}

public BulkSyncStatusEnvelope getStatus(String id) {
return getStatus(id, null);
return getStatus(id, BulkSyncGetStatusRequest.builder().build());
}

public BulkSyncStatusEnvelope getStatus(String id, RequestOptions requestOptions) {
public BulkSyncStatusEnvelope getStatus(String id, BulkSyncGetStatusRequest request) {
return getStatus(id, request, null);
}

public BulkSyncStatusEnvelope getStatus(
String id, BulkSyncGetStatusRequest request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("api/bulk/syncs")
.addPathSegment(id)
.addPathSegments("status")
.build();
Request okhttpRequest = new Request.Builder()
Request.Builder _requestBuilder = new Request.Builder()
.url(httpUrl)
.method("GET", null)
.headers(Headers.of(clientOptions.headers(requestOptions)))
.addHeader("Content-Type", "application/json")
.build();
.addHeader("Content-Type", "application/json");
Request okhttpRequest = _requestBuilder.build();
try {
OkHttpClient client = clientOptions.httpClient();
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
Expand Down Expand Up @@ -486,22 +493,27 @@ public BulkSyncSourceEnvelope getSource(
}

public BulkSyncDestEnvelope getDestination(String id) {
return getDestination(id, null);
return getDestination(id, BulkSyncGetDestinationRequest.builder().build());
}

public BulkSyncDestEnvelope getDestination(String id, RequestOptions requestOptions) {
public BulkSyncDestEnvelope getDestination(String id, BulkSyncGetDestinationRequest request) {
return getDestination(id, request, null);
}

public BulkSyncDestEnvelope getDestination(
String id, BulkSyncGetDestinationRequest request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("api/connections")
.addPathSegment(id)
.addPathSegments("bulksync/target")
.build();
Request okhttpRequest = new Request.Builder()
Request.Builder _requestBuilder = new Request.Builder()
.url(httpUrl)
.method("GET", null)
.headers(Headers.of(clientOptions.headers(requestOptions)))
.addHeader("Content-Type", "application/json")
.build();
.addHeader("Content-Type", "application/json");
Request okhttpRequest = _requestBuilder.build();
try {
OkHttpClient client = clientOptions.httpClient();
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import com.polytomic.api.core.ObjectMappers;
import com.polytomic.api.core.RequestOptions;
import com.polytomic.api.resources.bulksync.executions.requests.ExecutionsExportLogsRequest;
import com.polytomic.api.resources.bulksync.executions.requests.ExecutionsGetLogsRequest;
import com.polytomic.api.resources.bulksync.executions.requests.ExecutionsGetRequest;
import com.polytomic.api.resources.bulksync.executions.requests.ExecutionsListRequest;
import com.polytomic.api.resources.bulksync.executions.requests.ExecutionsListStatusRequest;
import com.polytomic.api.types.BulkSyncExecutionEnvelope;
Expand Down Expand Up @@ -133,23 +135,28 @@ public ListBulkSyncExecutionsEnvelope list(
}

public BulkSyncExecutionEnvelope get(String id, String execId) {
return get(id, execId, null);
return get(id, execId, ExecutionsGetRequest.builder().build());
}

public BulkSyncExecutionEnvelope get(String id, String execId, RequestOptions requestOptions) {
public BulkSyncExecutionEnvelope get(String id, String execId, ExecutionsGetRequest request) {
return get(id, execId, request, null);
}

public BulkSyncExecutionEnvelope get(
String id, String execId, ExecutionsGetRequest request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("api/bulk/syncs")
.addPathSegment(id)
.addPathSegments("executions")
.addPathSegment(execId)
.build();
Request okhttpRequest = new Request.Builder()
Request.Builder _requestBuilder = new Request.Builder()
.url(httpUrl)
.method("GET", null)
.headers(Headers.of(clientOptions.headers(requestOptions)))
.addHeader("Content-Type", "application/json")
.build();
.addHeader("Content-Type", "application/json");
Request okhttpRequest = _requestBuilder.build();
try {
OkHttpClient client = clientOptions.httpClient();
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
Expand All @@ -170,10 +177,16 @@ public BulkSyncExecutionEnvelope get(String id, String execId, RequestOptions re
}

public V4BulkSyncExecutionLogsEnvelope getLogs(String syncId, String executionId) {
return getLogs(syncId, executionId, null);
return getLogs(syncId, executionId, ExecutionsGetLogsRequest.builder().build());
}

public V4BulkSyncExecutionLogsEnvelope getLogs(String syncId, String executionId, RequestOptions requestOptions) {
public V4BulkSyncExecutionLogsEnvelope getLogs(
String syncId, String executionId, ExecutionsGetLogsRequest request) {
return getLogs(syncId, executionId, request, null);
}

public V4BulkSyncExecutionLogsEnvelope getLogs(
String syncId, String executionId, ExecutionsGetLogsRequest request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("api/bulk/syncs")
Expand All @@ -182,12 +195,12 @@ public V4BulkSyncExecutionLogsEnvelope getLogs(String syncId, String executionId
.addPathSegment(executionId)
.addPathSegments("logs")
.build();
Request okhttpRequest = new Request.Builder()
Request.Builder _requestBuilder = new Request.Builder()
.url(httpUrl)
.method("GET", null)
.headers(Headers.of(clientOptions.headers(requestOptions)))
.addHeader("Content-Type", "application/json")
.build();
.addHeader("Content-Type", "application/json");
Request okhttpRequest = _requestBuilder.build();
try {
OkHttpClient client = clientOptions.httpClient();
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/**
* This file was auto-generated by Fern from our API Definition.
*/
package com.polytomic.api.resources.bulksync.executions.requests;

import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.polytomic.api.core.ObjectMappers;
import java.util.Map;

public final class ExecutionsGetLogsRequest {
private final Map<String, Object> additionalProperties;

private ExecutionsGetLogsRequest(Map<String, Object> additionalProperties) {
this.additionalProperties = additionalProperties;
}

@java.lang.Override
public boolean equals(Object other) {
if (this == other) return true;
return other instanceof ExecutionsGetLogsRequest;
}

@JsonAnyGetter
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
}

@java.lang.Override
public String toString() {
return ObjectMappers.stringify(this);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/**
* This file was auto-generated by Fern from our API Definition.
*/
package com.polytomic.api.resources.bulksync.executions.requests;

import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.polytomic.api.core.ObjectMappers;
import java.util.Map;

public final class ExecutionsGetRequest {
private final Map<String, Object> additionalProperties;

private ExecutionsGetRequest(Map<String, Object> additionalProperties) {
this.additionalProperties = additionalProperties;
}

@java.lang.Override
public boolean equals(Object other) {
if (this == other) return true;
return other instanceof ExecutionsGetRequest;
}

@JsonAnyGetter
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
}

@java.lang.Override
public String toString() {
return ObjectMappers.stringify(this);
}
}
Loading
Loading