Fix critical code quality issues and strengthen test coverage

- Replace deprecated CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES with SNAKE_CASE
- Fix ExecutionException unwrapping in CachingInternalClient to preserve root cause
- Specify UTF-8 charset explicitly in ApiKeyRequestInterceptor
- Throw IllegalArgumentException instead of returning null from getFields() with empty fields
- Scope feign-httpclient to test (production code only uses feign.Client)
- Scope lombok to provided (compile-time annotation processor only)
- Remove redundant bulkAsArray() method from IpdataService
- Add Javadoc to IpdataService public API
- Remove package-private setters from IpdataModel (Jackson uses field access)
- Fix testSingleFields to use fixture IP instead of hardcoded 8.8.8.8
- Strengthen testError to assert RemoteIpdataException with 401 status
- Add EdgeCaseTest with negative tests for empty fields and exception unwrapping

https://claude.ai/code/session_01KxvyXRVVZaLrgTZshvsZY6

Author: claude

pom.xml

@@ -58,6 +58,7 @@
       <groupId>io.github.openfeign</groupId>
       <artifactId>feign-httpclient</artifactId>
       <version>${version.client.feign}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -79,6 +80,7 @@
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
       <version>1.18.38</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>

src/main/java/io/ipdata/client/model/IpdataModel.java

@@ -1,15 +1,12 @@
 package io.ipdata.client.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AccessLevel;
 import lombok.Getter;
-import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
 import java.util.List;
 
-@Setter(AccessLevel.PACKAGE)
 @ToString
 @Getter
 @Accessors(fluent = true)

src/main/java/io/ipdata/client/service/ApiKeyRequestInterceptor.java

@@ -7,6 +7,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 
 @RequiredArgsConstructor
 @Slf4j
@@ -22,7 +23,7 @@ class ApiKeyRequestInterceptor implements RequestInterceptor {
     String version;
     try {
       version = CharStreams.toString(new InputStreamReader(ApiKeyRequestInterceptor.class
-        .getResourceAsStream("/io/ipdata/client/VERSION"))).replaceAll("\\n", "");
+        .getResourceAsStream("/io/ipdata/client/VERSION"), StandardCharsets.UTF_8)).replaceAll("\\n", "");
       version = String.format("io.ipdata.client.java.%s", version);
     } catch (Exception e) {
       log.error(e.getMessage(), e);

src/main/java/io/ipdata/client/service/CachingInternalClient.java

@@ -29,12 +29,20 @@ class CachingInternalClient implements IpdataInternalClient, IpdataInternalSingl
   private final LoadingCache<String, Currency> currencyCache;
   private final LoadingCache<String, ThreatModel> threatCache;
 
+  private static IpdataException unwrap(ExecutionException e) throws IpdataException {
+    Throwable cause = e.getCause();
+    if (cause instanceof IpdataException) {
+      throw (IpdataException) cause;
+    }
+    throw new IpdataException(cause != null ? cause.getMessage() : e.getMessage(), cause != null ? cause : e);
+  }
+
   @Override
   public IpdataModel getFields(String ip, String fields) throws IpdataException {
     try {
       return fieldsCache.get(HashPair.of(ip, fields));
     } catch (ExecutionException e) {
-      throw new IpdataException(e.getMessage(), e);
+      throw unwrap(e);
     }
   }
 
@@ -43,7 +51,7 @@ public AsnModel asn(String ip) throws IpdataException {
     try {
       return asnCache.get(ip);
     } catch (ExecutionException e) {
-      throw new IpdataException(e.getMessage(), e);
+      throw unwrap(e);
     }
   }
 
@@ -52,7 +60,7 @@ public TimeZone timeZone(String ip) throws IpdataException {
     try {
       return tzCache.get(ip);
     } catch (ExecutionException e) {
-      throw new IpdataException(e.getMessage(), e);
+      throw unwrap(e);
     }
   }
 
@@ -61,7 +69,7 @@ public Currency currency(String ip) throws IpdataException {
     try {
       return currencyCache.get(ip);
     } catch (ExecutionException e) {
-      throw new IpdataException(e.getMessage(), e);
+      throw unwrap(e);
     }
   }
 
@@ -70,7 +78,7 @@ public ThreatModel threat(String ip) throws IpdataException {
     try {
       return threatCache.get(ip);
     } catch (ExecutionException e) {
-      throw new IpdataException(e.getMessage(), e);
+      throw unwrap(e);
     }
   }
 
@@ -79,7 +87,7 @@ public IpdataModel ipdata(String ip) throws IpdataException {
     try {
       return ipdataCache.get(ip);
     } catch (ExecutionException e) {
-      throw new IpdataException(e.getMessage(), e);
+      throw unwrap(e);
     }
   }
 

src/main/java/io/ipdata/client/service/IpdataService.java

@@ -5,13 +5,48 @@
 
 import java.util.List;
 
+/**
+ * Primary interface for accessing the ipdata.co API.
+ * <p>
+ * Provides methods for looking up geolocation, threat intelligence, and other
+ * metadata for IP addresses. Supports single IP lookups, bulk lookups, and
+ * selective field retrieval.
+ * <p>
+ * Also exposes single-field accessors (e.g. {@code getCountryName}, {@code getCity})
+ * inherited from {@link IpdataInternalSingleFieldClient}.
+ *
+ * @see io.ipdata.client.Ipdata#builder()
+ */
 public interface IpdataService extends IpdataInternalSingleFieldClient {
 
+  /**
+   * Retrieves the full IP data model for the given IP address.
+   *
+   * @param ip an IPv4 or IPv6 address
+   * @return the full geolocation and metadata for the IP
+   * @throws IpdataException if the API call fails
+   */
   IpdataModel ipdata(String ip) throws IpdataException;
 
+  /**
+   * Retrieves IP data for multiple IP addresses in a single request.
+   *
+   * @param ips list of IPv4 or IPv6 addresses
+   * @return a list of IP data models, one per input address
+   * @throws IpdataException if the API call fails
+   */
   List<IpdataModel> bulk(List<String> ips) throws IpdataException;
 
-  IpdataModel[] bulkAsArray(List<String> ips) throws IpdataException;
-
+  /**
+   * Retrieves only the specified fields for the given IP address.
+   * <p>
+   * Fields are sorted before querying to maximize cache hit rates when caching is enabled.
+   *
+   * @param ip     an IPv4 or IPv6 address
+   * @param fields one or more fields to retrieve (e.g. {@code IpdataField.ASN}, {@code IpdataField.CURRENCY})
+   * @return a partial IP data model containing only the requested fields
+   * @throws IpdataException          if the API call fails
+   * @throws IllegalArgumentException if no fields are specified
+   */
   IpdataModel getFields(String ip, IpdataField<?>... fields) throws IpdataException;
 }

src/main/java/io/ipdata/client/service/IpdataServiceBuilder.java

@@ -18,7 +18,7 @@
 
 import java.net.URL;
 
-import static com.fasterxml.jackson.databind.PropertyNamingStrategy.CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES;
+import static com.fasterxml.jackson.databind.PropertyNamingStrategies.SNAKE_CASE;
 
 @RequiredArgsConstructor(staticName = "of")
 public class IpdataServiceBuilder {
@@ -31,7 +31,7 @@ public class IpdataServiceBuilder {
 
   public IpdataService build() {
     final ObjectMapper mapper = new ObjectMapper();
-    mapper.setPropertyNamingStrategy(CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES);
+    mapper.setPropertyNamingStrategy(SNAKE_CASE);
     mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);

src/main/java/io/ipdata/client/service/IpdataServiceSupport.java

@@ -30,15 +30,10 @@ private IpdataInternalSingleFieldClient getApi() {
     return singleFieldClient;
   }
 
-  @Override
-  public IpdataModel[] bulkAsArray(List<String> ips) throws IpdataException {
-    return bulk(ips).toArray(new IpdataModel[0]);
-  }
-
   @Override
   public IpdataModel getFields(String ip, IpdataField<?>... fields) throws IpdataException {
     if (fields.length == 0) {
-      return null;
+      throw new IllegalArgumentException("At least one field must be specified");
     }
     //sorting here to improve the likelihood of a cache hit, otherwise a permutation of the same
     //array would result into a different cache key, and thus a cache miss

src/test/java/io/ipdata/client/EdgeCaseTest.java

@@ -0,0 +1,73 @@
+package io.ipdata.client;
+
+import io.ipdata.client.error.IpdataException;
+import io.ipdata.client.error.RemoteIpdataException;
+import io.ipdata.client.model.IpdataModel;
+import io.ipdata.client.service.IpdataService;
+import lombok.SneakyThrows;
+import org.junit.Assert;
+import org.junit.Test;
+
+import static io.ipdata.client.service.IpdataField.ASN;
+import static io.ipdata.client.service.IpdataField.CURRENCY;
+
+public class EdgeCaseTest {
+
+  private static final TestContext TEST_CONTEXT = new TestContext(MockIpdataServer.API_KEY, MockIpdataServer.getInstance().getUrl());
+
+  @Test(expected = IllegalArgumentException.class)
+  @SneakyThrows
+  public void testGetFieldsWithNoFieldsThrows() {
+    IpdataService service = TEST_CONTEXT.ipdataService();
+    service.getFields("8.8.8.8");
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  @SneakyThrows
+  public void testGetFieldsWithNoFieldsThrowsCaching() {
+    IpdataService service = TEST_CONTEXT.cachingIpdataService();
+    service.getFields("8.8.8.8");
+  }
+
+  @Test
+  @SneakyThrows
+  public void testInvalidKeyReturnsRemoteException() {
+    IpdataService service = Ipdata.builder()
+      .url(TEST_CONTEXT.url())
+      .key("INVALID_KEY")
+      .noCache()
+      .get();
+    try {
+      service.ipdata("8.8.8.8");
+      Assert.fail("Expected RemoteIpdataException");
+    } catch (RemoteIpdataException e) {
+      Assert.assertEquals(401, e.getStatus());
+      Assert.assertNotNull(e.getMessage());
+    }
+  }
+
+  @Test
+  @SneakyThrows
+  public void testCachedInvalidKeyUnwrapsException() {
+    IpdataService service = Ipdata.builder()
+      .url(TEST_CONTEXT.url())
+      .key("INVALID_KEY")
+      .withDefaultCache()
+      .get();
+    try {
+      service.ipdata("8.8.8.8");
+      Assert.fail("Expected RemoteIpdataException");
+    } catch (RemoteIpdataException e) {
+      Assert.assertEquals(401, e.getStatus());
+    }
+  }
+
+  @Test
+  @SneakyThrows
+  public void testGetFieldsReturnsSelectedFields() {
+    IpdataService service = TEST_CONTEXT.ipdataService();
+    IpdataModel model = service.getFields("8.8.8.8", ASN, CURRENCY);
+    Assert.assertNotNull(model.asn());
+    Assert.assertNotNull(model.currency());
+  }
+}

src/test/java/io/ipdata/client/FullModelTest.java

@@ -1,18 +1,15 @@
 package io.ipdata.client;
 
-import feign.httpclient.ApacheHttpClient;
 import io.ipdata.client.error.IpdataException;
+import io.ipdata.client.error.RemoteIpdataException;
 import io.ipdata.client.model.IpdataModel;
 import io.ipdata.client.service.IpdataService;
 import lombok.SneakyThrows;
-import org.apache.http.impl.client.HttpClientBuilder;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.concurrent.TimeUnit;
-
 
 @RunWith(Parameterized.class)
 public class FullModelTest {
@@ -44,21 +41,24 @@ public void testFullResponse() {
   public void testSingleFields() {
     IpdataService ipdataService = fixture.service();
     String field = ipdataService.getCountryName(fixture.target());
-    String expected = TEST_CONTEXT.get("/8.8.8.8/country_name", null);
-    Assert.assertEquals(field, expected);
+    String expected = TEST_CONTEXT.get("/" + fixture.target() + "/country_name", null);
+    Assert.assertEquals(expected, field);
   }
 
 
   @SneakyThrows
-  @Test(expected = IpdataException.class)
+  @Test
   public void testError() {
     IpdataService serviceWithInvalidKey = Ipdata.builder().url(TEST_CONTEXT.url())
       .key("THIS_IS_AN_INVALID_KEY")
-      .withDefaultCache()
-      .feignClient(new ApacheHttpClient(HttpClientBuilder.create()
-        .setConnectionTimeToLive(10, TimeUnit.SECONDS)
-        .build())).get();
-    serviceWithInvalidKey.ipdata(fixture.target());
+      .noCache()
+      .get();
+    try {
+      serviceWithInvalidKey.ipdata(fixture.target());
+      Assert.fail("Expected RemoteIpdataException");
+    } catch (RemoteIpdataException e) {
+      Assert.assertEquals(401, e.getStatus());
+    }
   }
 
   @Parameterized.Parameters

src/test/java/io/ipdata/client/TestContext.java

@@ -23,7 +23,7 @@
 import java.net.URL;
 import java.util.Map;
 
-import static com.fasterxml.jackson.databind.PropertyNamingStrategy.CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES;
+import static com.fasterxml.jackson.databind.PropertyNamingStrategies.SNAKE_CASE;
 import static java.lang.System.getenv;
 import static java.util.Arrays.asList;
 import static net.javacrumbs.jsonunit.JsonAssert.assertJsonEquals;
@@ -51,7 +51,7 @@ public TestContext(String key, String url) {
     this.key = key;
     this.url = new URL(url);
     mapper = new ObjectMapper();
-    mapper.setPropertyNamingStrategy(CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES);
+    mapper.setPropertyNamingStrategy(SNAKE_CASE);
     mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true);
     mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
     httpClient = HttpClientBuilder.create().build();