Merge pull request #608 from maxmind/horgh/rm-jsoninjector

Remove JsonInjector class

Author: oschwald

CHANGELOG.md

@@ -22,6 +22,9 @@ CHANGELOG
 * **BREAKING:** Java 11 support has been dropped. Java 17 or later is now required.
 * **BREAKING:** Removed explicit `serialVersionUID` from all exception classes.
   Java will auto-generate serialVersionUID when needed, following modern practices.
+* **BREAKING:** Removed no longer necessary `JacksonInject` annotations for
+  `ip_address`, `network`, and `traits` from several classes. The
+  `JsonInjector` class was removed.
 
 4.4.0 (2025-08-28)
 ------------------

src/main/java/com/maxmind/geoip2/JsonInjector.java

@@ -397,7 +397,8 @@ private <T> T handleResponse(HttpResponse<InputStream> response, Class<T> cls)
                 + status + ") for " + uri, status, uri);
         }
 
-        InjectableValues inject = new JsonInjector(locales, null, null);
+        InjectableValues inject = new InjectableValues.Std()
+            .addValue("locales", locales);
 
         try {
             return mapper.readerFor(cls).with(inject).readValue(response.body());

src/main/java/com/maxmind/geoip2/WebServiceClient.java

@@ -26,14 +26,14 @@ public class AnonymousIpResponse extends IpBaseResponse {
      * @param network            the network associated with the record
      */
     public AnonymousIpResponse(
-        @JacksonInject("ip_address") @JsonProperty("ip_address") String ipAddress,
+        @JsonProperty("ip_address") String ipAddress,
         @JsonProperty("is_anonymous") boolean isAnonymous,
         @JsonProperty("is_anonymous_vpn") boolean isAnonymousVpn,
         @JsonProperty("is_hosting_provider") boolean isHostingProvider,
         @JsonProperty("is_public_proxy") boolean isPublicProxy,
         @JsonProperty("is_residential_proxy") boolean isResidentialProxy,
         @JsonProperty("is_tor_exit_node") boolean isTorExitNode,
-        @JacksonInject("network") @JsonProperty("network")
+        @JsonProperty("network")
         @JsonDeserialize(using = NetworkDeserializer.class) Network network
     ) {
         super(ipAddress, isAnonymous, isAnonymousVpn, isHostingProvider, isPublicProxy,

src/main/java/com/maxmind/geoip2/model/AnonymousIpResponse.java

@@ -34,14 +34,14 @@ public class AnonymousPlusResponse extends AnonymousIpResponse {
      */
     public AnonymousPlusResponse(
         @JsonProperty("anonymizer_confidence") Integer anonymizerConfidence,
-        @JacksonInject("ip_address") @JsonProperty("ip_address") String ipAddress,
+        @JsonProperty("ip_address") String ipAddress,
         @JsonProperty("is_anonymous") Boolean isAnonymous,
         @JsonProperty("is_anonymous_vpn") Boolean isAnonymousVpn,
         @JsonProperty("is_hosting_provider") Boolean isHostingProvider,
         @JsonProperty("is_public_proxy") Boolean isPublicProxy,
         @JsonProperty("is_residential_proxy") Boolean isResidentialProxy,
         @JsonProperty("is_tor_exit_node") Boolean isTorExitNode,
-        @JacksonInject("network") @JsonDeserialize(using = NetworkDeserializer.class)
+        @JsonDeserialize(using = NetworkDeserializer.class)
         @JsonProperty("network") Network network,
         @JsonProperty("network_last_seen") LocalDate networkLastSeen,
         @JsonProperty("provider_name") String providerName

src/main/java/com/maxmind/geoip2/model/AnonymousPlusResponse.java

@@ -37,9 +37,9 @@ public AsnResponse(
         @JsonProperty("autonomous_system_organization")
         @MaxMindDbParameter(name = "autonomous_system_organization")
         String autonomousSystemOrganization,
-        @JacksonInject("ip_address") @JsonProperty("ip_address")
+        @JsonProperty("ip_address")
         @MaxMindDbParameter(name = "ip_address") String ipAddress,
-        @JacksonInject("network") @JsonProperty("network")
+        @JsonProperty("network")
         @JsonDeserialize(using = NetworkDeserializer.class) @MaxMindDbParameter(name = "network")
         Network network
     ) {

src/main/java/com/maxmind/geoip2/model/AsnResponse.java

@@ -53,7 +53,7 @@ public CityResponse(
         RepresentedCountry representedCountry,
         @JsonProperty("subdivisions") @MaxMindDbParameter(name = "subdivisions")
         ArrayList<Subdivision> subdivisions,
-        @JacksonInject("traits") @JsonProperty("traits") @MaxMindDbParameter(name = "traits")
+        @JsonProperty("traits") @MaxMindDbParameter(name = "traits")
         Traits traits
     ) {
         super(city, continent, country, location, maxmind, postal, registeredCountry,

src/main/java/com/maxmind/geoip2/model/CityResponse.java

@@ -79,8 +79,8 @@ public static ConnectionType fromString(String s) {
      */
     public ConnectionTypeResponse(
         @JsonProperty("connection_type") ConnectionType connectionType,
-        @JacksonInject("ip_address") @JsonProperty("ip_address") String ipAddress,
-        @JacksonInject("network") @JsonProperty("network")
+        @JsonProperty("ip_address") String ipAddress,
+        @JsonProperty("network")
         @JsonDeserialize(using = NetworkDeserializer.class) Network network
     ) {
         this.connectionType = connectionType;

src/main/java/com/maxmind/geoip2/model/ConnectionTypeResponse.java

@@ -40,7 +40,7 @@ public CountryResponse(
         Country registeredCountry,
         @JsonProperty("represented_country") @MaxMindDbParameter(name = "represented_country")
         RepresentedCountry representedCountry,
-        @JacksonInject("traits") @JsonProperty("traits") @MaxMindDbParameter(name = "traits")
+        @JsonProperty("traits") @MaxMindDbParameter(name = "traits")
         Traits traits
     ) {
         super(continent, country, maxmind, registeredCountry, representedCountry, traits);

src/main/java/com/maxmind/geoip2/model/CountryResponse.java

@@ -29,9 +29,9 @@ public class DomainResponse extends AbstractResponse {
     @MaxMindDbConstructor
     public DomainResponse(
         @JsonProperty("domain") @MaxMindDbParameter(name = "domain") String domain,
-        @JacksonInject("ip_address") @JsonProperty("ip_address")
+        @JsonProperty("ip_address")
         @MaxMindDbParameter(name = "ip_address") String ipAddress,
-        @JacksonInject("network") @JsonProperty("network")
+        @JsonProperty("network")
         @JsonDeserialize(using = NetworkDeserializer.class) @MaxMindDbParameter(name = "network")
         Network network
     ) {