Remove redundant constructors now that IP/network are auto-injected

- Remove copy constructors from model classes that only populated IP address and network
  (AnonymousIpResponse, AnonymousPlusResponse, ConnectionTypeResponse, AsnResponse,
  DomainResponse, IspResponse, IpRiskResponse)
- Update DatabaseReader getter methods to return responses directly
- Update annotations to use @MaxMindDbIpAddress and @MaxMindDbNetwork for context injection
- Remove @MaxMindDbConstructor from Traits that was only needed for ConnectionType conversion
- Add @MaxMindDbCreator to ConnectionType.fromString() for enum deserialization

These constructors are no longer needed since IP address and network are now automatically
injected via @MaxMindDbIpAddress and @MaxMindDbNetwork annotations, and enum conversion
is handled by @MaxMindDbCreator.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>

Author: oschwald

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

@@ -317,8 +317,6 @@ private Optional<CountryResponse> getCountry(
         return Optional.of(
             new CountryResponse(
                 response,
-                result.ipAddress(),
-                result.network(),
                 locales
             )
         );
@@ -354,12 +352,7 @@ private Optional<CityResponse> getCity(
             return Optional.empty();
         }
         return Optional.of(
-            new CityResponse(
-                response,
-                result.ipAddress(),
-                result.network(),
-                locales
-            )
+            new CityResponse(response, locales)
         );
     }
 
@@ -400,13 +393,7 @@ private Optional<AnonymousIpResponse> getAnonymousIp(
         if (response == null) {
             return Optional.empty();
         }
-        return Optional.of(
-            new AnonymousIpResponse(
-                response,
-                result.ipAddress(),
-                result.network()
-            )
-        );
+        return Optional.of(response);
     }
 
     /**
@@ -447,13 +434,7 @@ private Optional<AnonymousPlusResponse> getAnonymousPlus(
         if (response == null) {
             return Optional.empty();
         }
-        return Optional.of(
-            new AnonymousPlusResponse(
-                response,
-                result.ipAddress(),
-                result.network()
-            )
-        );
+        return Optional.of(response);
     }
 
 
@@ -493,13 +474,7 @@ private Optional<IpRiskResponse> getIpRisk(InetAddress ipAddress) throws IOExcep
         if (response == null) {
             return Optional.empty();
         }
-        return Optional.of(
-            new IpRiskResponse(
-                response,
-                result.ipAddress(),
-                result.network()
-            )
-        );
+        return Optional.of(response);
     }
 
     /**
@@ -538,13 +513,7 @@ private Optional<AsnResponse> getAsn(InetAddress ipAddress)
         if (response == null) {
             return Optional.empty();
         }
-        return Optional.of(
-            new AsnResponse(
-                response,
-                result.ipAddress(),
-                result.network()
-            )
-        );
+        return Optional.of(response);
     }
 
     /**
@@ -584,13 +553,7 @@ private Optional<ConnectionTypeResponse> getConnectionType(
         if (response == null) {
             return Optional.empty();
         }
-        return Optional.of(
-            new ConnectionTypeResponse(
-                response,
-                result.ipAddress(),
-                result.network()
-            )
-        );
+        return Optional.of(response);
     }
 
     /**
@@ -630,13 +593,7 @@ private Optional<DomainResponse> getDomain(
         if (response == null) {
             return Optional.empty();
         }
-        return Optional.of(
-            new DomainResponse(
-                response,
-                result.ipAddress(),
-                result.network()
-            )
-        );
+        return Optional.of(response);
     }
 
     /**
@@ -677,12 +634,7 @@ private Optional<EnterpriseResponse> getEnterprise(
             return Optional.empty();
         }
         return Optional.of(
-            new EnterpriseResponse(
-                response,
-                result.ipAddress(),
-                result.network(),
-                locales
-            )
+            new EnterpriseResponse(response, locales)
         );
     }
 
@@ -723,13 +675,7 @@ private Optional<IspResponse> getIsp(
         if (response == null) {
             return Optional.empty();
         }
-        return Optional.of(
-            new IspResponse(
-                response,
-                result.ipAddress(),
-                result.network()
-            )
-        );
+        return Optional.of(response);
     }
 
     /**

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

@@ -5,6 +5,8 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.maxmind.db.MaxMindDbIpAddress;
+import com.maxmind.db.MaxMindDbNetwork;
 import com.maxmind.db.MaxMindDbParameter;
 import com.maxmind.db.Network;
 import com.maxmind.geoip2.JsonSerializable;
@@ -29,7 +31,7 @@
  */
 public record AnonymousIpResponse(
     @JsonProperty("ip_address")
-    @MaxMindDbParameter(name = "ip_address")
+    @MaxMindDbIpAddress
     String ipAddress,
 
     @JsonProperty("is_anonymous")
@@ -58,35 +60,10 @@ public record AnonymousIpResponse(
 
     @JsonProperty("network")
     @JsonDeserialize(using = NetworkDeserializer.class)
-    @MaxMindDbParameter(name = "network")
+    @MaxMindDbNetwork
     Network network
 ) implements JsonSerializable {
 
-    /**
-     * Constructs an instance of {@code AnonymousIpResponse} from the values in the passed
-     * response and the specified IP address and network.
-     *
-     * @param response the response to copy
-     * @param ipAddress the IP address being checked
-     * @param network   the network associated with the record
-     */
-    public AnonymousIpResponse(
-        AnonymousIpResponse response,
-        String ipAddress,
-        Network network
-    ) {
-        this(
-            ipAddress,
-            response.isAnonymous(),
-            response.isAnonymousVpn(),
-            response.isHostingProvider(),
-            response.isPublicProxy(),
-            response.isResidentialProxy(),
-            response.isTorExitNode(),
-            network
-        );
-    }
-
     /**
      * @return The IP address that the data in the model is for.
      * @deprecated Use {@link #ipAddress()} instead. This method will be removed in 6.0.0.

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

@@ -6,6 +6,8 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.maxmind.db.MaxMindDbConstructor;
+import com.maxmind.db.MaxMindDbIpAddress;
+import com.maxmind.db.MaxMindDbNetwork;
 import com.maxmind.db.MaxMindDbParameter;
 import com.maxmind.db.Network;
 import com.maxmind.geoip2.JsonSerializable;
@@ -37,7 +39,7 @@
  */
 public record AnonymousPlusResponse(
     @JsonProperty("ip_address")
-    @MaxMindDbParameter(name = "ip_address")
+    @MaxMindDbIpAddress
     String ipAddress,
 
     @JsonProperty("is_anonymous")
@@ -66,7 +68,7 @@ public record AnonymousPlusResponse(
 
     @JsonProperty("network")
     @JsonDeserialize(using = NetworkDeserializer.class)
-    @MaxMindDbParameter(name = "network")
+    @MaxMindDbNetwork
     Network network,
 
     @JsonProperty("anonymizer_confidence")
@@ -100,7 +102,7 @@ public record AnonymousPlusResponse(
      */
     @MaxMindDbConstructor
     public AnonymousPlusResponse(
-        @MaxMindDbParameter(name = "ip_address") String ipAddress,
+        @MaxMindDbIpAddress String ipAddress,
         @MaxMindDbParameter(name = "is_anonymous", useDefault = true)
         boolean isAnonymous,
         @MaxMindDbParameter(name = "is_anonymous_vpn", useDefault = true)
@@ -113,7 +115,7 @@ public AnonymousPlusResponse(
         boolean isResidentialProxy,
         @MaxMindDbParameter(name = "is_tor_exit_node", useDefault = true)
         boolean isTorExitNode,
-        @MaxMindDbParameter(name = "network") Network network,
+        @MaxMindDbNetwork Network network,
         @MaxMindDbParameter(name = "anonymizer_confidence") Integer anonymizerConfidence,
         @MaxMindDbParameter(name = "network_last_seen") String networkLastSeen,
         @MaxMindDbParameter(name = "provider_name") String providerName
@@ -133,34 +135,6 @@ public AnonymousPlusResponse(
         );
     }
 
-    /**
-     * Constructs an instance of {@code AnonymousPlusResponse} from the values in the
-     * response and the specified IP address and network.
-     *
-     * @param response  the response to copy
-     * @param ipAddress the IP address being checked
-     * @param network   the network associated with the record
-     */
-    public AnonymousPlusResponse(
-        AnonymousPlusResponse response,
-        String ipAddress,
-        Network network
-    ) {
-        this(
-            ipAddress,
-            response.isAnonymous(),
-            response.isAnonymousVpn(),
-            response.isHostingProvider(),
-            response.isPublicProxy(),
-            response.isResidentialProxy(),
-            response.isTorExitNode(),
-            network,
-            response.anonymizerConfidence(),
-            response.networkLastSeen(),
-            response.providerName()
-        );
-    }
-
     /**
      * @return The IP address that the data in the model is for.
      * @deprecated Use {@link #ipAddress()} instead. This method will be removed in 6.0.0.

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

@@ -5,6 +5,8 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.maxmind.db.MaxMindDbIpAddress;
+import com.maxmind.db.MaxMindDbNetwork;
 import com.maxmind.db.MaxMindDbParameter;
 import com.maxmind.db.Network;
 import com.maxmind.geoip2.JsonSerializable;
@@ -30,35 +32,15 @@ public record AsnResponse(
     String autonomousSystemOrganization,
 
     @JsonProperty("ip_address")
-    @MaxMindDbParameter(name = "ip_address")
+    @MaxMindDbIpAddress
     String ipAddress,
 
     @JsonProperty("network")
     @JsonDeserialize(using = NetworkDeserializer.class)
-    @MaxMindDbParameter(name = "network")
+    @MaxMindDbNetwork
     Network network
 ) implements JsonSerializable {
 
-    /**
-     * Constructs an instance of {@code AsnResponse} with only the specified values set.
-     *
-     * @param response The {@code AsnResponse} object to copy.
-     * @param ipAddress The IP address that the data in the model is for.
-     * @param network The network associated with the record.
-     */
-    public AsnResponse(
-        AsnResponse response,
-        String ipAddress,
-        Network network
-    ) {
-        this(
-            response.autonomousSystemNumber(),
-            response.autonomousSystemOrganization(),
-            ipAddress,
-            network
-        );
-    }
-
     /**
      * @return The autonomous system number associated with the IP address.
      * @deprecated Use {@link #autonomousSystemNumber()} instead. This method will be removed

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

@@ -108,14 +108,10 @@ public record CityResponse(
      * Constructs an instance of {@code CityResponse} with the specified parameters.
      *
      * @param response the response
-     * @param ipAddress the IP address that the data in the model is for.
-     * @param network the network associated with the record.
      * @param locales the locales
      */
     public CityResponse(
         CityResponse response,
-        String ipAddress,
-        Network network,
         List<String> locales
     ) {
         this(
@@ -128,7 +124,7 @@ public CityResponse(
             new Country(response.registeredCountry(), locales),
             new RepresentedCountry(response.representedCountry(), locales),
             mapSubdivisions(response.subdivisions(), locales),
-            new Traits(response.traits(), ipAddress, network)
+            response.traits()
         );
     }