From 2f46137dc96468449c0d24d559f54ca562909364 Mon Sep 17 00:00:00 2001 From: yatharthranjan Date: Tue, 20 Oct 2020 14:58:10 +0100 Subject: [PATCH 01/10] Snapshot version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2a494b41..2bb486bb 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ subprojects { apply plugin: 'java-library' group = 'org.radarbase' - version = '0.3.2' + version = '0.3.3-SNAPSHOT' sourceCompatibility = 1.8 targetCompatibility = 1.8 From 809caacc9afea2ed7819557f7e70346d573bc15c Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 26 Oct 2020 10:25:32 +0100 Subject: [PATCH 02/10] Updated dependencies --- Dockerfile | 2 +- build.gradle | 8 +++---- gradle/wrapper/gradle-wrapper.jar | Bin 58910 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- gradlew.bat | 21 +++--------------- kafka-connect-fitbit-source/build.gradle | 12 +++++----- .../fitbit/user/ServiceUserRepository.java | 2 +- kafka-connect-rest-source/build.gradle | 6 ++--- .../rest/single/SingleRequestGenerator.java | 2 +- 10 files changed, 21 insertions(+), 36 deletions(-) diff --git a/Dockerfile b/Dockerfile index dc34311e..f1f346a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ COPY ./kafka-connect-fitbit-source/src/ /code/kafka-connect-fitbit-source/src RUN ./gradlew jar -FROM confluentinc/cp-kafka-connect-base:5.5.0 +FROM confluentinc/cp-kafka-connect-base:5.5.2 MAINTAINER Joris Borgdorff diff --git a/build.gradle b/build.gradle index 2bb486bb..350926dc 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,9 @@ description = 'kafka-connect-rest-source' subprojects { ext { - kafkaVersion = '2.5.0' - confluentVersion = '5.5.0' - jacksonVersion = '2.11.0' + kafkaVersion = '2.5.1' + confluentVersion = '5.5.2' + jacksonVersion = '2.11.3' } apply plugin: 'java' @@ -27,7 +27,7 @@ subprojects { } wrapper { - gradleVersion '6.4.1' + gradleVersion '6.6.1' } evaluationDependsOnChildren() diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c053550b91381bbd28b1afc82d634bf73a8a..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644 GIT binary patch delta 6656 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 Yte!%o?r4GTrVtxD61Ym!|5fq-1K$0e!T1w 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4f0001d..12d38de6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c515..4f906e0c 100755 --- a/gradlew +++ b/gradlew @@ -130,7 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index a9f778a7..ac1b06f9 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,21 +64,6 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line @@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/kafka-connect-fitbit-source/build.gradle b/kafka-connect-fitbit-source/build.gradle index 1ae0fe16..79071e29 100644 --- a/kafka-connect-fitbit-source/build.gradle +++ b/kafka-connect-fitbit-source/build.gradle @@ -1,21 +1,21 @@ dependencies { api project(':kafka-connect-rest-source') api group: 'io.confluent', name: 'kafka-connect-avro-converter', version: confluentVersion - api group: 'org.radarcns', name: 'radar-schemas-commons', version: '0.5.3' + api group: 'org.radarcns', name: 'radar-schemas-commons', version: '0.5.14' - implementation group: 'org.radarcns', name: 'oauth-client-util', version: '0.5.8' + implementation group: 'org.radarcns', name: 'oauth-client-util', version: '0.6.0' implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: jacksonVersion implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: jacksonVersion - implementation 'com.google.firebase:firebase-admin:6.12.2' + implementation 'com.google.firebase:firebase-admin:6.16.0' // Included in connector runtime compileOnly group: 'org.apache.kafka', name: 'connect-api', version: kafkaVersion compileOnly group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.4.2' - testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.4.2' - testRuntimeOnly group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.6.2' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.6.2' + testRuntimeOnly group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.30' testImplementation group: 'org.apache.kafka', name: 'connect-api', version: kafkaVersion } diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java index 63318a44..c67e93ad 100644 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java @@ -59,7 +59,7 @@ public class ServiceUserRepository implements UserRepository { private static final ObjectReader USER_READER = JSON_READER.forType(User.class); private static final ObjectReader OAUTH_READER = JSON_READER.forType(OAuth2UserCredentials.class); private static final RequestBody EMPTY_BODY = - RequestBody.create(MediaType.parse("application/json; charset=utf-8"), ""); + RequestBody.create("", MediaType.parse("application/json; charset=utf-8")); private static final Duration FETCH_THRESHOLD = Duration.ofMinutes(1L); private final OkHttpClient client; diff --git a/kafka-connect-rest-source/build.gradle b/kafka-connect-rest-source/build.gradle index d9709aef..97c085e8 100644 --- a/kafka-connect-rest-source/build.gradle +++ b/kafka-connect-rest-source/build.gradle @@ -1,12 +1,12 @@ dependencies { - api group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.14.2' + api group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.9.0' // Included in connector runtime compileOnly group: 'org.apache.kafka', name: 'connect-api', version: kafkaVersion testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.4.2' - testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.4.2' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.6.2' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.6.2' testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.27.0' testImplementation group: 'com.github.tomakehurst', name: 'wiremock', version: '2.23.2' diff --git a/kafka-connect-rest-source/src/main/java/org/radarbase/connect/rest/single/SingleRequestGenerator.java b/kafka-connect-rest-source/src/main/java/org/radarbase/connect/rest/single/SingleRequestGenerator.java index f1ded4bc..4cff9842 100644 --- a/kafka-connect-rest-source/src/main/java/org/radarbase/connect/rest/single/SingleRequestGenerator.java +++ b/kafka-connect-rest-source/src/main/java/org/radarbase/connect/rest/single/SingleRequestGenerator.java @@ -81,7 +81,7 @@ public void initialize(RestSourceConnectorConfig config) { } else { mediaType = MediaType.parse(contentType); } - body = RequestBody.create(mediaType, singleConfig.getData()); + body = RequestBody.create(singleConfig.getData(), mediaType); } converter = config.getPayloadToSourceRecordConverter(); From 5bb8caf33dec882c742d9e151a9ff45082f5f28c Mon Sep 17 00:00:00 2001 From: mpgxvii Date: Tue, 2 Mar 2021 01:53:18 +0800 Subject: [PATCH 03/10] Change externalUserId to serviceUserId in LocalUser according to changes in the external service repository --- .../connect/rest/fitbit/user/LocalUser.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/LocalUser.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/LocalUser.java index b37c8393..b570eecb 100644 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/LocalUser.java +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/LocalUser.java @@ -35,7 +35,7 @@ public class LocalUser implements User { private static final Pattern ILLEGAL_CHARACTERS_PATTERN = Pattern.compile("[^a-zA-Z0-9_-]"); private String id; private String version; - private String externalUserId; + private String serviceUserId; private String projectId; private String userId; private String sourceId; @@ -62,7 +62,7 @@ public void setId(String id) { } public String getExternalUserId() { - return externalUserId; + return serviceUserId; } public String getProjectId() { @@ -95,7 +95,7 @@ public void setOauth2Credentials(OAuth2UserCredentials oauth2Credentials) { @JsonSetter("fitbitUserId") public void setFitbitUserId(String id) { - this.externalUserId = id; + this.serviceUserId = id; } @Override @@ -120,7 +120,7 @@ public LocalUser copy() { LocalUser copy = new LocalUser(); copy.id = id; copy.version = version; - copy.externalUserId = externalUserId; + copy.serviceUserId = serviceUserId; copy.projectId = projectId; copy.userId = userId; copy.startDate = startDate; @@ -142,7 +142,7 @@ public synchronized SchemaAndValue getObservationKey(AvroData avroData) { public String toString() { return "LocalUser{id='" + id + '\'' + ", version='" + version + '\'' - + ", externalUserId='" + externalUserId + '\'' + + ", externalUserId='" + serviceUserId + '\'' + ", projectId='" + projectId + '\'' + ", userId='" + userId + '\'' + ", sourceId='" + sourceId + '\'' @@ -161,7 +161,7 @@ public boolean equals(Object o) { LocalUser localUser = (LocalUser) o; return Objects.equals(id, localUser.id) && Objects.equals(version, localUser.version) - && Objects.equals(externalUserId, localUser.externalUserId) + && Objects.equals(serviceUserId, localUser.serviceUserId) && Objects.equals(projectId, localUser.projectId) && Objects.equals(userId, localUser.userId) && Objects.equals(sourceId, localUser.sourceId) From 4b98c057eae999c64bd06e8fab68ead32e9cf308 Mon Sep 17 00:00:00 2001 From: mpgxvii Date: Tue, 2 Mar 2021 01:54:13 +0800 Subject: [PATCH 04/10] Fix ServiceUserRepository according to pagination changes in the external service repository --- .../fitbit/user/ServiceUserRepository.java | 2 +- .../connect/rest/fitbit/user/Users.java | 6 ++++- .../connect/rest/fitbit/util/Page.java | 22 +++++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/util/Page.java diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java index c67e93ad..6109a9b9 100644 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java @@ -150,7 +150,7 @@ public boolean hasPendingUpdates() { @Override public void applyPendingUpdates() throws IOException { logger.info("Requesting user information from webservice"); - Request request = requestFor("users?source-type=FitBit").build(); + Request request = requestFor("users?source-type=FitBit?page=1&size=" + Integer.MAX_VALUE).build(); this.timedCachedUsers = this.makeRequest(request, USER_LIST_READER).getUsers().stream() .filter(u -> u.isComplete() diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/Users.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/Users.java index cb18ef11..40bc4ee4 100644 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/Users.java +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/Users.java @@ -19,16 +19,20 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import org.radarbase.connect.rest.fitbit.util.Page; + import java.util.ArrayList; import java.util.List; public class Users { private final List users; + private final Page metadata; @JsonCreator - public Users(@JsonProperty("users") List users) { + public Users(@JsonProperty("users") List users, @JsonProperty("metadata") Page metadata) { this.users = new ArrayList<>(users); + this.metadata = metadata; } public List getUsers() { diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/util/Page.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/util/Page.java new file mode 100644 index 00000000..a73893cd --- /dev/null +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/util/Page.java @@ -0,0 +1,22 @@ +package org.radarbase.connect.rest.fitbit.util; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class Page { + + public int pageNumber; + public int pageSize; + public long totalElements; + public int offset; + + public Page(@JsonProperty("pageNumber") int pageNumber, + @JsonProperty("pageSize") int pageSize, + @JsonProperty("totalElements") long totalElements, + @JsonProperty("offset") int offset) { + this.pageNumber = pageNumber; + this.pageSize = pageSize; + this.totalElements = totalElements; + this.offset = offset; + } + +} From 4b8458f0bd7e154a5be5f8f967e0134aafa97335 Mon Sep 17 00:00:00 2001 From: mpgxvii Date: Tue, 2 Mar 2021 16:50:48 +0800 Subject: [PATCH 05/10] Fix user repository request --- .../connect/rest/fitbit/user/ServiceUserRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java index 6109a9b9..4dcf349b 100644 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java @@ -150,7 +150,7 @@ public boolean hasPendingUpdates() { @Override public void applyPendingUpdates() throws IOException { logger.info("Requesting user information from webservice"); - Request request = requestFor("users?source-type=FitBit?page=1&size=" + Integer.MAX_VALUE).build(); + Request request = requestFor("users?source-type=FitBit&page=1&size=" + Integer.MAX_VALUE).build(); this.timedCachedUsers = this.makeRequest(request, USER_LIST_READER).getUsers().stream() .filter(u -> u.isComplete() From f3d9cc0378cb940bb8c2f80b4e24a5b19f1af840 Mon Sep 17 00:00:00 2001 From: mpgxvii Date: Tue, 2 Mar 2021 18:05:09 +0800 Subject: [PATCH 06/10] Fix user repository request --- .../connect/rest/fitbit/user/ServiceUserRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java index 4dcf349b..c67e93ad 100644 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java @@ -150,7 +150,7 @@ public boolean hasPendingUpdates() { @Override public void applyPendingUpdates() throws IOException { logger.info("Requesting user information from webservice"); - Request request = requestFor("users?source-type=FitBit&page=1&size=" + Integer.MAX_VALUE).build(); + Request request = requestFor("users?source-type=FitBit").build(); this.timedCachedUsers = this.makeRequest(request, USER_LIST_READER).getUsers().stream() .filter(u -> u.isComplete() From 0ef8f8338a6b0f8378968ec2679d9c9826569316 Mon Sep 17 00:00:00 2001 From: mpgxvii Date: Tue, 2 Mar 2021 23:30:27 +0800 Subject: [PATCH 07/10] Remove metadata and Page since this can be ignored --- .../connect/rest/fitbit/user/Users.java | 8 +++---- .../connect/rest/fitbit/util/Page.java | 22 ------------------- 2 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/util/Page.java diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/Users.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/Users.java index 40bc4ee4..e2f28045 100644 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/Users.java +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/Users.java @@ -18,21 +18,19 @@ package org.radarbase.connect.rest.fitbit.user; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import org.radarbase.connect.rest.fitbit.util.Page; import java.util.ArrayList; import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public class Users { private final List users; - private final Page metadata; - @JsonCreator - public Users(@JsonProperty("users") List users, @JsonProperty("metadata") Page metadata) { + public Users(@JsonProperty("users") List users) { this.users = new ArrayList<>(users); - this.metadata = metadata; } public List getUsers() { diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/util/Page.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/util/Page.java deleted file mode 100644 index a73893cd..00000000 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/util/Page.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.radarbase.connect.rest.fitbit.util; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class Page { - - public int pageNumber; - public int pageSize; - public long totalElements; - public int offset; - - public Page(@JsonProperty("pageNumber") int pageNumber, - @JsonProperty("pageSize") int pageSize, - @JsonProperty("totalElements") long totalElements, - @JsonProperty("offset") int offset) { - this.pageNumber = pageNumber; - this.pageSize = pageSize; - this.totalElements = totalElements; - this.offset = offset; - } - -} From 3b268bcc86bcc0d741c42a577a5212158e988373 Mon Sep 17 00:00:00 2001 From: mpgxvii Date: Tue, 2 Mar 2021 23:31:24 +0800 Subject: [PATCH 08/10] Change authorized property to isAuthorized --- .../org/radarbase/connect/rest/fitbit/user/LocalUser.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/LocalUser.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/LocalUser.java index b570eecb..0412d577 100644 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/LocalUser.java +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/LocalUser.java @@ -35,17 +35,19 @@ public class LocalUser implements User { private static final Pattern ILLEGAL_CHARACTERS_PATTERN = Pattern.compile("[^a-zA-Z0-9_-]"); private String id; private String version; - private String serviceUserId; private String projectId; private String userId; private String sourceId; private Instant startDate = Instant.parse("2017-01-01T00:00:00Z"); private Instant endDate = Instant.parse("9999-12-31T23:59:59.999Z"); + @JsonProperty("serviceUserId") + private String serviceUserId; + @JsonProperty("oauth2") private OAuth2UserCredentials oauth2Credentials = new OAuth2UserCredentials(); - @JsonProperty("authorized") + @JsonProperty("isAuthorized") private Boolean isAuthorized; @JsonIgnore From 541a3047254ad8f67d996387a2a579c4af92ce2b Mon Sep 17 00:00:00 2001 From: mpgxvii Date: Tue, 2 Mar 2021 23:32:45 +0800 Subject: [PATCH 09/10] Update required scope MEASUREMENT.CREATE --- README.md | 2 +- .../connect/rest/fitbit/user/ServiceUserRepository.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 88279ca3..82379590 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ If the ManagementPortal is used to authenticate against the user repository, ple ``` Client ID: fitbit.user.repository.client.id Client Secret: fitbit.user.repository.client.secret -Scope: SUBJECT.READ +Scope: SUBJECT.READ MEASUREMENT.CREATE Resources: res_restAuthorizer Grant types: client_credentials Access Token validity: 600 diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java index c67e93ad..626c5562 100644 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/user/ServiceUserRepository.java @@ -101,7 +101,7 @@ public void initialize(RestSourceConnectorConfig config) { this.repositoryClient = new OAuth2Client.Builder() .credentials(clientId, clientSecret) .endpoint(tokenUrl) - .scopes("SUBJECT.READ") + .scopes("SUBJECT.READ MEASUREMENT.CREATE") .httpClient(client) .build(); } else if (clientId != null) { From 278edc265c87c83f27a57ac9a26ae2db1aea830e Mon Sep 17 00:00:00 2001 From: Yatharth Ranjan Date: Thu, 4 Mar 2021 11:41:30 +0000 Subject: [PATCH 10/10] Bump version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 350926dc..e7f408b0 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ subprojects { apply plugin: 'java-library' group = 'org.radarbase' - version = '0.3.3-SNAPSHOT' + version = '0.3.3' sourceCompatibility = 1.8 targetCompatibility = 1.8