From 0d64ce3e0c07e656ff73a91a70fd8b4c3ef6df1d Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Mon, 27 Nov 2023 09:50:45 -0800 Subject: [PATCH] Don't unnecessarily specify types --- src/main/java/com/maxmind/db/Networks.java | 2 +- src/main/java/com/maxmind/db/Reader.java | 6 +++--- src/test/java/com/maxmind/db/ReaderTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/maxmind/db/Networks.java b/src/main/java/com/maxmind/db/Networks.java index b585d6ea..4214357c 100644 --- a/src/main/java/com/maxmind/db/Networks.java +++ b/src/main/java/com/maxmind/db/Networks.java @@ -96,7 +96,7 @@ public DatabaseRecord next() { prefixLength -= 96; } - return new DatabaseRecord(data, ipAddr, prefixLength); + return new DatabaseRecord<>(data, ipAddr, prefixLength); } catch (IOException e) { throw new NetworksIterationException(e); } diff --git a/src/main/java/com/maxmind/db/Reader.java b/src/main/java/com/maxmind/db/Reader.java index c54b675d..3f83a5ad 100644 --- a/src/main/java/com/maxmind/db/Reader.java +++ b/src/main/java/com/maxmind/db/Reader.java @@ -322,9 +322,9 @@ public Networks networksWithin( int node = traverseResult[0]; int prefix = traverseResult[1]; - return new Networks(this, includeAliasedNetworks, - new Networks.NetworkNode[]{new Networks.NetworkNode(ipBytes, prefix, node)}, - typeParameterClass); + return new Networks<>(this, includeAliasedNetworks, + new Networks.NetworkNode[] {new Networks.NetworkNode(ipBytes, prefix, node)}, + typeParameterClass); } /** diff --git a/src/test/java/com/maxmind/db/ReaderTest.java b/src/test/java/com/maxmind/db/ReaderTest.java index b7998496..bb53b414 100644 --- a/src/test/java/com/maxmind/db/ReaderTest.java +++ b/src/test/java/com/maxmind/db/ReaderTest.java @@ -339,7 +339,7 @@ public void testNetworksWithin() throws IOException, InvalidNetworkException{ boolean includeAliasedNetworks = !test.skipAliasedNetworks; Networks networks = reader.networksWithin(network, includeAliasedNetworks, Map.class); - ArrayList innerIPs = new ArrayList(); + ArrayList innerIPs = new ArrayList<>(); while(networks.hasNext()){ DatabaseRecord> iteration = networks.next(); innerIPs.add(iteration.getNetwork().toString()); @@ -376,7 +376,7 @@ public void testGeoIPNetworksWithin() throws IOException, InvalidNetworkExceptio Networks networks = reader.networksWithin(network, test.skipAliasedNetworks, Map.class); - ArrayList innerIPs = new ArrayList(); + ArrayList innerIPs = new ArrayList<>(); while(networks.hasNext()){ DatabaseRecord> iteration = networks.next(); innerIPs.add(iteration.getNetwork().toString());