diff --git a/build.gradle b/build.gradle index be102e41..aec7c2be 100755 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'idea' id 'eclipse' + id 'de.undercouch.download' version '5.2.0' id 'java' id 'java-library' id 'maven' @@ -65,9 +66,9 @@ uploadArchives { developers { developer { - id 'squarepegg' - name 'Nic Pegg' - email 'nic@devcycle.com' + id 'devcycle' + name 'DevCycle Engineering' + email 'support@devcycle.com' organization 'DevCycle' } } @@ -101,6 +102,21 @@ task execute(type:JavaExec) { classpath = sourceSets.main.runtimeClasspath } +def wasmResourcePath = "$projectDir/src/main/resources" +def wasmVersion = "1.1.1" +def wasmUrl = "https://unpkg.com/@devcycle/bucketing-assembly-script@$wasmVersion/build/bucketing-lib.release.wasm" +task downloadDVCBucketingWASM(type: Download) { + src wasmUrl + dest wasmResourcePath + doLast { + println "Completed DVC Bucketing WASM Download to $wasmResourcePath" + } +} + +build { + dependsOn downloadDVCBucketingWASM +} + ext { retrofit_version = "2.9.0" jackson_version = "2.13.3" @@ -129,10 +145,6 @@ dependencies { implementation ("io.github.kawamuray.wasmtime:wasmtime-java:$wasmtime_version") - implementation("com.squareup.okhttp3:logging-interceptor:$okhttp_version") { - exclude group: "com.squareup.okhttp3", module: "okhttp" - } - compileOnly("org.projectlombok:lombok:$lombok_version") testAnnotationProcessor("org.projectlombok:lombok:$lombok_version") diff --git a/src/main/java/com/devcycle/sdk/server/local/api/DVCLocalEventsApiClient.java b/src/main/java/com/devcycle/sdk/server/local/api/DVCLocalEventsApiClient.java index 4208cb63..37800a77 100644 --- a/src/main/java/com/devcycle/sdk/server/local/api/DVCLocalEventsApiClient.java +++ b/src/main/java/com/devcycle/sdk/server/local/api/DVCLocalEventsApiClient.java @@ -7,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import okhttp3.OkHttpClient; -import okhttp3.logging.HttpLoggingInterceptor; -import okhttp3.logging.HttpLoggingInterceptor.Level; import retrofit2.Retrofit; import retrofit2.converter.jackson.JacksonConverterFactory; @@ -18,7 +16,6 @@ public final class DVCLocalEventsApiClient { private final OkHttpClient.Builder okBuilder; private final Retrofit.Builder adapterBuilder; - private HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); @@ -46,9 +43,6 @@ private DVCLocalEventsApiClient(DVCLocalOptions options) { public DVCLocalEventsApiClient(String serverKey, DVCLocalOptions options) { this(options); okBuilder.addInterceptor(new AuthorizationHeaderInterceptor(serverKey)); - logging.setLevel(Level.BODY); - - okBuilder.addInterceptor(logging); } public IDVCApi initialize() { diff --git a/src/main/resources/bucketing-lib.release.wasm b/src/main/resources/bucketing-lib.release.wasm index 393cff03..e1f13e07 100644 Binary files a/src/main/resources/bucketing-lib.release.wasm and b/src/main/resources/bucketing-lib.release.wasm differ diff --git a/src/test/java/com/devcycle/sdk/server/cloud/DVCCloudClientTest.java b/src/test/java/com/devcycle/sdk/server/cloud/DVCCloudClientTest.java index 0103c05b..0daa621b 100755 --- a/src/test/java/com/devcycle/sdk/server/cloud/DVCCloudClientTest.java +++ b/src/test/java/com/devcycle/sdk/server/cloud/DVCCloudClientTest.java @@ -1,18 +1,6 @@ package com.devcycle.sdk.server.cloud; -import com.devcycle.sdk.server.cloud.api.DVCCloudClient; -import com.devcycle.sdk.server.cloud.model.DVCCloudOptions; -import com.devcycle.sdk.server.common.api.IDVCApi; -import com.devcycle.sdk.server.common.api.DVCApiMock; -import com.devcycle.sdk.server.common.exception.DVCException; -import com.devcycle.sdk.server.common.model.*; -import com.devcycle.sdk.server.helpers.WhiteBox; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import static org.mockito.Mockito.when; import java.math.BigDecimal; import java.time.Instant; @@ -20,7 +8,20 @@ import java.util.Map; import java.util.UUID; -import static org.mockito.Mockito.when; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +import com.devcycle.sdk.server.cloud.api.DVCCloudClient; +import com.devcycle.sdk.server.cloud.model.DVCCloudOptions; +import com.devcycle.sdk.server.common.api.DVCApiMock; +import com.devcycle.sdk.server.common.api.IDVCApi; +import com.devcycle.sdk.server.common.exception.DVCException; +import com.devcycle.sdk.server.common.model.*; +import com.devcycle.sdk.server.helpers.WhiteBox; /** * API tests for DevcycleApi diff --git a/src/test/java/com/devcycle/sdk/server/common/api/DVCApiMock.java b/src/test/java/com/devcycle/sdk/server/common/api/DVCApiMock.java index 847ffabe..95e44293 100644 --- a/src/test/java/com/devcycle/sdk/server/common/api/DVCApiMock.java +++ b/src/test/java/com/devcycle/sdk/server/common/api/DVCApiMock.java @@ -1,11 +1,12 @@ package com.devcycle.sdk.server.common.api; -import com.devcycle.sdk.server.helpers.TestResponse; +import java.util.Map; + import com.devcycle.sdk.server.common.model.*; +import com.devcycle.sdk.server.helpers.TestResponse; import com.devcycle.sdk.server.local.model.EventsBatch; -import retrofit2.Call; -import java.util.Map; +import retrofit2.Call; public class DVCApiMock implements IDVCApi { diff --git a/src/test/java/com/devcycle/sdk/server/helpers/TestResponse.java b/src/test/java/com/devcycle/sdk/server/helpers/TestResponse.java index 80a7ab71..c516309f 100644 --- a/src/test/java/com/devcycle/sdk/server/helpers/TestResponse.java +++ b/src/test/java/com/devcycle/sdk/server/helpers/TestResponse.java @@ -1,15 +1,14 @@ package com.devcycle.sdk.server.helpers; -import com.devcycle.sdk.server.common.model.DVCResponse; -import com.devcycle.sdk.server.common.model.Feature; -import com.devcycle.sdk.server.common.model.Variable; -import retrofit2.Call; -import retrofit2.mock.Calls; - import java.util.HashMap; import java.util.Map; import java.util.UUID; +import com.devcycle.sdk.server.common.model.*; + +import retrofit2.Call; +import retrofit2.mock.Calls; + public final class TestResponse { private TestResponse() { diff --git a/src/test/java/com/devcycle/sdk/server/local/DVCLocalClientTest.java b/src/test/java/com/devcycle/sdk/server/local/DVCLocalClientTest.java index 48371f8d..c3801ebc 100644 --- a/src/test/java/com/devcycle/sdk/server/local/DVCLocalClientTest.java +++ b/src/test/java/com/devcycle/sdk/server/local/DVCLocalClientTest.java @@ -3,9 +3,6 @@ import java.util.Map; import java.util.UUID; -import com.devcycle.sdk.server.common.model.PlatformData; -import com.devcycle.sdk.server.local.managers.EventQueueManager; -import com.devcycle.sdk.server.local.model.DVCLocalOptions; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -13,11 +10,14 @@ import org.mockito.junit.MockitoJUnitRunner; import com.devcycle.sdk.server.common.model.Feature; +import com.devcycle.sdk.server.common.model.PlatformData; import com.devcycle.sdk.server.common.model.User; import com.devcycle.sdk.server.common.model.Variable; import com.devcycle.sdk.server.helpers.WhiteBox; import com.devcycle.sdk.server.local.api.DVCLocalClient; import com.devcycle.sdk.server.local.bucketing.LocalBucketing; +import com.devcycle.sdk.server.local.managers.EventQueueManager; +import com.devcycle.sdk.server.local.model.DVCLocalOptions; @RunWith(MockitoJUnitRunner.class) public class DVCLocalClientTest { diff --git a/src/test/java/com/devcycle/sdk/server/local/LocalBucketingTest.java b/src/test/java/com/devcycle/sdk/server/local/LocalBucketingTest.java index 88115600..f190abef 100644 --- a/src/test/java/com/devcycle/sdk/server/local/LocalBucketingTest.java +++ b/src/test/java/com/devcycle/sdk/server/local/LocalBucketingTest.java @@ -1,5 +1,13 @@ package com.devcycle.sdk.server.local; +import java.util.UUID; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.junit.MockitoJUnitRunner; + import com.devcycle.sdk.server.common.model.Event; import com.devcycle.sdk.server.common.model.User; import com.devcycle.sdk.server.local.bucketing.LocalBucketing; @@ -7,13 +15,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; - -import java.util.UUID; @RunWith(MockitoJUnitRunner.class) public class LocalBucketingTest {