Clean up

Author: Markus-Malkusch

src/main/java/de/malkusch/niu/Authentication.java

@@ -67,7 +67,7 @@ public Token token() throws IOException {
 
     private final Duration expirationWindow;
     private static final String LOGIN_URI = "https://account-fk.niu.com/v3/api/oauth2/token";
-    private static Duration EXPIRES_AT_FALLBACK = Duration.ofHours(1);
+    private static final Duration EXPIRES_AT_FALLBACK = Duration.ofHours(1);
 
     private void refreshToken() throws IOException {
 

src/main/java/de/malkusch/niu/Client.java

@@ -1,34 +1,28 @@
 package de.malkusch.niu;
 
-import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
-import static java.net.URLEncoder.encode;
-import static java.util.Arrays.stream;
-import static java.util.Objects.requireNonNull;
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import de.malkusch.niu.Authentication.Token;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpRequest.BodyPublishers;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.time.Duration;
 
-import com.fasterxml.jackson.core.JacksonException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import de.malkusch.niu.Authentication.Token;
+import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
+import static java.net.URLEncoder.encode;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Arrays.stream;
+import static java.util.Objects.requireNonNull;
 
 record Field(String name, String value) {
 
     String urlencoded() {
-        try {
-            return encode(name, "UTF-8") + "=" + encode(value, "UTF-8");
-
-        } catch (UnsupportedEncodingException e) {
-            throw new IllegalStateException(e);
-        }
+        return encode(name, UTF_8) + "=" + encode(value, UTF_8);
     }
 }
 

src/main/java/de/malkusch/niu/Niu.java

@@ -135,7 +135,7 @@ record Data(int bindDaysCount, double totalMileage) {
         return new Odometer(response.data.bindDaysCount, response.data.totalMileage);
     }
 
-    public static record Odometer(int days, double mileage) {
+    public record Odometer(int days, double mileage) {
     }
 
     private static Instant timestamp(long timestamp) {

src/main/java/de/malkusch/niu/Retry.java

@@ -1,27 +1,25 @@
 package de.malkusch.niu;
 
-import java.io.IOException;
-import java.time.Duration;
-
 import dev.failsafe.Failsafe;
 import dev.failsafe.FailsafeException;
 import dev.failsafe.FailsafeExecutor;
 import dev.failsafe.RetryPolicy;
 
+import java.io.IOException;
+import java.time.Duration;
+
 interface Retry<T> {
 
-    public record Configuration(int retries, Duration delay) {
+    record Configuration(int retries, Duration delay) {
 
         static final Configuration DISABLED = new Configuration(0, Duration.ZERO);
 
-        static final Configuration DEFAULT = new Configuration(3, Duration.ofSeconds(10));
-
         boolean isDisabled() {
             return this == DISABLED;
         }
-    };
+    }
 
-    public static <T> Retry<T> build(Configuration configuration) {
+    static <T> Retry<T> build(Configuration configuration) {
         if (configuration.isDisabled()) {
             return new DisabledRetry<>();
 
@@ -31,27 +29,27 @@ public static <T> Retry<T> build(Configuration configuration) {
     }
 
     @FunctionalInterface
-    static interface Operation<T, E1 extends Throwable, E2 extends Throwable> {
+    interface Operation<T, E1 extends Throwable, E2 extends Throwable> {
         T execute() throws E1, E2;
     }
 
     <E1 extends Throwable, E2 extends Throwable> T retry(Operation<T, E1, E2> operation) throws E1, E2;
 
-    static final class DisabledRetry<T> implements Retry<T> {
+    final class DisabledRetry<T> implements Retry<T> {
 
         @Override
         public <E1 extends Throwable, E2 extends Throwable> T retry(Operation<T, E1, E2> operation) throws E1, E2 {
             return operation.execute();
         }
     }
 
-    static final class FailSafeRetry<T> implements Retry<T> {
+    final class FailSafeRetry<T> implements Retry<T> {
 
         private final FailsafeExecutor<T> failsafe;
 
         FailSafeRetry(Configuration configuration) {
             failsafe = Failsafe.with( //
-                    RetryPolicy.<T> builder() //
+                    RetryPolicy.<T>builder() //
                             .handle(IOException.class) //
                             .withMaxRetries(configuration.retries()) //
                             .withDelay(configuration.delay()) //