README.md

@@ -1,4 +1,10 @@
-# Java Client of Toggl's Reports API
+# [ARCHIVED] Java Client of Toggl's Reports API
+
+> [!WARNING]  
+> Toggl hat disabled this api-version. You need to port to v9.
+> 
+> A new client has been generated -> [toggl-api-v9](https://github.com/rocketbase-io/toggl-api-v9)
+
 
 This project is a Java client for the public [Toggl' Reports API](https://github.com/toggl/toggl_api_docs). 
 The client is based on a fluent java api that maps the cascade of methods to the Toggl's api endpoints. For example:
@@ -27,7 +33,7 @@ Step 2. Add the dependency
 <dependency>
     <groupId>com.github.rocketbase-io</groupId>
     <artifactId>toggl-report-api</artifactId>
-    <version>toggl-report-api-1.0.0</version>
+    <version>toggl-report-api-1.1.0</version>
 </dependency>
 ```
 
@@ -98,4 +104,4 @@ This API depends on these other popular modules (versions of spring-boot bom 2.1
 * `org.apache.httpcomponents` artifact `httpclient` version `4.5.9`
 
 Since all these artifacts are pretty popular take with care the possible artifact's version conflicts. If you are going
- to use this software under an Android device consider the [httpclient issues](https://hc.apache.org/httpcomponents-client-4.3.x/android-port.html).
+ to use this software under an Android device consider the [httpclient issues](https://hc.apache.org/httpcomponents-client-4.3.x/android-port.html).

pom.xml

@@ -20,19 +20,18 @@
 
     <groupId>io.rocketbase.toggl</groupId>
     <artifactId>toggl-report-api</artifactId>
-    <version>1.1.0</version>
+    <version>3.0.1-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
 
-        <spring-boot.version>2.1.8.RELEASE</spring-boot.version>
-        <guava.version>28.1-jre</guava.version>
+        <spring-boot.version>2.7.2</spring-boot.version>
     </properties>
 
     <scm>
         <developerConnection>scm:git:git@github.com:rocketbase-io/toggl-report-api.git</developerConnection>
-        <tag>toggl-report-api-1.1.0</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <dependencyManagement>
@@ -53,15 +52,14 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

src/main/java/io/rocketbase/toggl/api/AbstractBaseRequestChain.java → src/main/java/io/rocketbase/toggl/report/AbstractBaseRequestChain.java

@@ -1,8 +1,7 @@
-package io.rocketbase.toggl.api;
+package io.rocketbase.toggl.report;
 
-import com.google.common.base.Joiner;
-import io.rocketbase.toggl.api.model.Billable;
-import io.rocketbase.toggl.api.model.DisplayHours;
+import io.rocketbase.toggl.report.model.Billable;
+import io.rocketbase.toggl.report.model.DisplayHours;
 import org.springframework.core.ParameterizedTypeReference;
 
 import java.text.SimpleDateFormat;
@@ -75,9 +74,7 @@ public T clientIds(String... ids) {
     public T clientIds(List<String> ids) {
         super.getUriBuilder()
                 .addParameter("client_ids",
-                        Joiner.on(",")
-                                .skipNulls()
-                                .join(ids));
+                        String.join(",", ids));
         return (T) this;
     }
 
@@ -91,9 +88,7 @@ public T projectIds(String... ids) {
     public T projectIds(List<String> ids) {
         super.getUriBuilder()
                 .addParameter("project_ids",
-                        Joiner.on(",")
-                                .skipNulls()
-                                .join(ids));
+                        String.join(",", ids));
         return (T) this;
     }
 
@@ -104,9 +99,7 @@ public T userIds(String... ids) {
     public T userIds(List<String> ids) {
         super.getUriBuilder()
                 .addParameter("user_ids",
-                        Joiner.on(",")
-                                .skipNulls()
-                                .join(ids));
+                        String.join(",", ids));
         return (T) this;
     }
 
@@ -120,9 +113,7 @@ public T membersOfGroupIds(String... ids) {
     public T membersOfGroupIds(List<String> ids) {
         super.getUriBuilder()
                 .addParameter("members_of_group_ids",
-                        Joiner.on(",")
-                                .skipNulls()
-                                .join(ids));
+                        String.join(",", ids));
         return (T) this;
     }
 
@@ -136,9 +127,7 @@ public T orMembersOfGroupIds(String... ids) {
     public T orMembersOfGroupIds(List<String> ids) {
         super.getUriBuilder()
                 .addParameter("or_members_of_group_ids",
-                        Joiner.on(",")
-                                .skipNulls()
-                                .join(ids));
+                        String.join(",", ids));
         return (T) this;
     }
 
@@ -152,9 +141,7 @@ public T tagIds(String... ids) {
     public T tagIds(List<String> ids) {
         super.getUriBuilder()
                 .addParameter("tag_ids",
-                        Joiner.on(",")
-                                .skipNulls()
-                                .join(ids));
+                        String.join(",", ids));
         return (T) this;
     }
 
@@ -168,9 +155,7 @@ public T taskIds(String... ids) {
     public T taskIds(List<String> ids) {
         super.getUriBuilder()
                 .addParameter("task_ids",
-                        Joiner.on(",")
-                                .skipNulls()
-                                .join(ids));
+                        String.join(",", ids));
         return (T) this;
     }
 
@@ -181,9 +166,7 @@ public T timeEntryIds(String... ids) {
     public T timeEntryIds(List<String> ids) {
         super.getUriBuilder()
                 .addParameter("time_entry_ids",
-                        Joiner.on(",")
-                                .skipNulls()
-                                .join(ids));
+                        String.join(",", ids));
         return (T) this;
     }
 

src/main/java/io/rocketbase/toggl/api/ExecutableRequestChain.java → src/main/java/io/rocketbase/toggl/report/ExecutableRequestChain.java

@@ -1,4 +1,4 @@
-package io.rocketbase.toggl.api;
+package io.rocketbase.toggl.report;
 
 import lombok.SneakyThrows;
 import org.springframework.core.ParameterizedTypeReference;

src/main/java/io/rocketbase/toggl/api/GetDetailed.java → src/main/java/io/rocketbase/toggl/report/GetDetailed.java

@@ -1,6 +1,6 @@
-package io.rocketbase.toggl.api;
+package io.rocketbase.toggl.report;
 
-import io.rocketbase.toggl.api.model.DetailedResult;
+import io.rocketbase.toggl.report.model.DetailedResult;
 import org.springframework.core.ParameterizedTypeReference;
 
 public class GetDetailed extends AbstractBaseRequestChain<GetDetailed, DetailedResult> {

src/main/java/io/rocketbase/toggl/api/GetWeeklyProjectsEarnings.java → src/main/java/io/rocketbase/toggl/report/GetWeeklyProjectsEarnings.java

@@ -1,6 +1,6 @@
-package io.rocketbase.toggl.api;
+package io.rocketbase.toggl.report;
 
-import io.rocketbase.toggl.api.model.WeeklyProjectsEarningsResult;
+import io.rocketbase.toggl.report.model.WeeklyProjectsEarningsResult;
 import org.springframework.core.ParameterizedTypeReference;
 
 public class GetWeeklyProjectsEarnings extends AbstractBaseRequestChain<GetWeeklyProjectsEarnings, WeeklyProjectsEarningsResult> {

src/main/java/io/rocketbase/toggl/api/GetWeeklyProjectsTime.java → src/main/java/io/rocketbase/toggl/report/GetWeeklyProjectsTime.java

@@ -1,6 +1,6 @@
-package io.rocketbase.toggl.api;
+package io.rocketbase.toggl.report;
 
-import io.rocketbase.toggl.api.model.WeeklyProjectsTimeResult;
+import io.rocketbase.toggl.report.model.WeeklyProjectsTimeResult;
 import org.springframework.core.ParameterizedTypeReference;
 
 public class GetWeeklyProjectsTime extends AbstractBaseRequestChain<GetWeeklyProjectsTime, WeeklyProjectsTimeResult> {

src/main/java/io/rocketbase/toggl/api/GetWeeklyUsersEarnings.java → src/main/java/io/rocketbase/toggl/report/GetWeeklyUsersEarnings.java

@@ -1,6 +1,6 @@
-package io.rocketbase.toggl.api;
+package io.rocketbase.toggl.report;
 
-import io.rocketbase.toggl.api.model.WeeklyUsersEarningsResult;
+import io.rocketbase.toggl.report.model.WeeklyUsersEarningsResult;
 import org.springframework.core.ParameterizedTypeReference;
 
 public class GetWeeklyUsersEarnings extends AbstractBaseRequestChain<GetWeeklyUsersEarnings, WeeklyUsersEarningsResult> {

src/main/java/io/rocketbase/toggl/api/GetWeeklyUsersTime.java → src/main/java/io/rocketbase/toggl/report/GetWeeklyUsersTime.java

@@ -1,7 +1,6 @@
-package io.rocketbase.toggl.api;
+package io.rocketbase.toggl.report;
 
-import io.rocketbase.toggl.api.model.WeeklyProjectsTimeResult;
-import io.rocketbase.toggl.api.model.WeeklyUsersTimeResult;
+import io.rocketbase.toggl.report.model.WeeklyUsersTimeResult;
 import org.springframework.core.ParameterizedTypeReference;
 
 public class GetWeeklyUsersTime extends AbstractBaseRequestChain<GetWeeklyUsersTime, WeeklyUsersTimeResult> {

src/main/java/io/rocketbase/toggl/api/RequestChain.java → src/main/java/io/rocketbase/toggl/report/RequestChain.java

@@ -1,7 +1,7 @@
-package io.rocketbase.toggl.api;
+package io.rocketbase.toggl.report;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
+import java.util.Objects;
+import java.util.Optional;
 
 class RequestChain {
 
@@ -12,14 +12,14 @@ class RequestChain {
     private final String path;
 
     public RequestChain(RequestContext context, String path) {
-        Preconditions.checkNotNull(context);
+        Objects.nonNull(context);
         this.context = context;
         this.path = path;
-        this.parent = Optional.absent();
+        this.parent = Optional.empty();
     }
 
     public RequestChain(RequestChain parent, String path) {
-        Preconditions.checkNotNull(parent);
+        Objects.nonNull(parent);
         this.context = parent.getContext();
         this.parent = Optional.of(parent);
         this.path = path;

src/main/java/io/rocketbase/toggl/api/RequestContext.java → src/main/java/io/rocketbase/toggl/report/RequestContext.java

@@ -1,4 +1,4 @@
-package io.rocketbase.toggl.api;
+package io.rocketbase.toggl.report;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.codec.binary.Base64;
@@ -23,7 +23,7 @@ public class RequestContext {
     private ClientHttpRequestFactory requestFactory;
     private RestTemplate restTemplate;
     private String basicAuth = null;
-    private long throttlePeriod = 1100;
+    private long throttlePeriod = 1010;
 
     RequestContext(TogglReportApiBuilder apiBuilder) {
         this.apiBuilder = apiBuilder;
@@ -37,7 +37,7 @@ public class RequestContext {
 
 
     protected ObjectMapper getObjectMapper() {
-        ObjectMapper mapper = new ObjectMapper();
+        ObjectMapper mapper = new ObjectMapper().findAndRegisterModules();
         return mapper;
     }