Remove JsonInjector class

horgh · horgh · commit dc2a2a4ad049 · 2025-09-26T19:53:16.000Z
This was not doing much given we always passed IP and network as null.
In the past, when we used Jackson for MMDB deserialization, this was
more extensively used.
diff --git a/src/main/java/com/maxmind/geoip2/JsonInjector.java b/src/main/java/com/maxmind/geoip2/JsonInjector.java
diff --git a/src/main/java/com/maxmind/geoip2/WebServiceClient.java b/src/main/java/com/maxmind/geoip2/WebServiceClient.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());
diff --git a/src/main/java/com/maxmind/geoip2/model/AnonymousIpResponse.java b/src/main/java/com/maxmind/geoip2/model/AnonymousIpResponse.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,
diff --git a/src/main/java/com/maxmind/geoip2/model/AnonymousPlusResponse.java b/src/main/java/com/maxmind/geoip2/model/AnonymousPlusResponse.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
diff --git a/src/main/java/com/maxmind/geoip2/model/AsnResponse.java b/src/main/java/com/maxmind/geoip2/model/AsnResponse.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
     ) {
diff --git a/src/main/java/com/maxmind/geoip2/model/CityResponse.java b/src/main/java/com/maxmind/geoip2/model/CityResponse.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,
diff --git a/src/main/java/com/maxmind/geoip2/model/ConnectionTypeResponse.java b/src/main/java/com/maxmind/geoip2/model/ConnectionTypeResponse.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;
diff --git a/src/main/java/com/maxmind/geoip2/model/CountryResponse.java b/src/main/java/com/maxmind/geoip2/model/CountryResponse.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);
diff --git a/src/main/java/com/maxmind/geoip2/model/DomainResponse.java b/src/main/java/com/maxmind/geoip2/model/DomainResponse.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
     ) {
diff --git a/src/main/java/com/maxmind/geoip2/model/EnterpriseResponse.java b/src/main/java/com/maxmind/geoip2/model/EnterpriseResponse.java
@@ -53,7 +53,7 @@ public EnterpriseResponse(
         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,
diff --git a/src/main/java/com/maxmind/geoip2/model/InsightsResponse.java b/src/main/java/com/maxmind/geoip2/model/InsightsResponse.java
@@ -45,7 +45,7 @@ public InsightsResponse(
         @JsonProperty("registered_country") Country registeredCountry,
         @JsonProperty("represented_country") RepresentedCountry representedCountry,
         @JsonProperty("subdivisions") List<Subdivision> subdivisions,
-        @JacksonInject("traits") @JsonProperty("traits") Traits traits
+        @JsonProperty("traits") Traits traits
     ) {
         super(city, continent, country, location, maxmind, postal, registeredCountry,
             representedCountry, subdivisions, traits);
diff --git a/src/main/java/com/maxmind/geoip2/model/IpRiskResponse.java b/src/main/java/com/maxmind/geoip2/model/IpRiskResponse.java
@@ -30,14 +30,14 @@ public class IpRiskResponse extends IpBaseResponse {
      * @param ipRisk             the IP risk of a model
      */
     public IpRiskResponse(
-        @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,
         @JsonProperty("ip_risk") double ipRisk
     ) {
diff --git a/src/main/java/com/maxmind/geoip2/model/IspResponse.java b/src/main/java/com/maxmind/geoip2/model/IspResponse.java
@@ -40,7 +40,7 @@ public IspResponse(
         @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,
         @JsonProperty("isp") @MaxMindDbParameter(name = "isp") String isp,
         @JsonProperty("mobile_country_code") @MaxMindDbParameter(name = "mobile_country_code")
@@ -49,7 +49,7 @@ public IspResponse(
         String mobileNetworkCode,
         @JsonProperty("organization") @MaxMindDbParameter(name = "organization")
         String organization,
-        @JacksonInject("network") @JsonProperty("network")
+        @JsonProperty("network")
         @JsonDeserialize(using = NetworkDeserializer.class) @MaxMindDbParameter(name = "network")
         Network network
     ) {
diff --git a/src/main/java/com/maxmind/geoip2/record/Traits.java b/src/main/java/com/maxmind/geoip2/record/Traits.java
@@ -91,7 +91,7 @@ public Traits(
         @JsonProperty("autonomous_system_organization") String autonomousSystemOrganization,
         @JsonProperty("connection_type") ConnectionType connectionType,
         @JsonProperty("domain") String domain,
-        @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_anycast") boolean isAnycast,
@@ -103,7 +103,7 @@ public Traits(
         @JsonProperty("isp") String isp,
         @JsonProperty("mobile_country_code") String mobileCountryCode,
         @JsonProperty("mobile_network_code") String mobileNetworkCode,
-        @JacksonInject("network") @JsonProperty("network")
+        @JsonProperty("network")
         @JsonDeserialize(using = NetworkDeserializer.class) Network network,
         @JsonProperty("organization") String organization,
         @JsonProperty("user_type") String userType,

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,8 @@ private <T> T handleResponse(HttpResponse<InputStream> response, Class<T> cls)`
`397`	`397`	`+ status + ") for " + uri, status, uri);`
`398`	`398`	`}`
`399`	`399`
`400`		`- InjectableValues inject = new JsonInjector(locales, null, null);`
	`400`	`+ InjectableValues inject = new InjectableValues.Std()`
	`401`	`+ .addValue("locales", locales);`
`401`	`402`
`402`	`403`	`try {`
`403`	`404`	`return mapper.readerFor(cls).with(inject).readValue(response.body());`