Skip to content

Commit 624dc60

Browse files
ibauersachsibauersachs
committed
Cleanup remaining use of raw types
1 parent 02d2816 commit 624dc60

7 files changed

Lines changed: 38 additions & 45 deletions

File tree

‎EXAMPLES.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ if (l.getResult() == Lookup.SUCCESSFUL) {
3838

3939
```java
4040
ZoneTransferIn xfr = ZoneTransferIn.newAXFR(Name.root, "192.5.5.241", null);
41-
List records = xfr.run();
42-
for (Iterator it = records.iterator(); it.hasNext();) {
43-
System.out.println(it.next());
41+
xfr.run();
42+
for (Record r : xfr.getAXFR()) {
43+
System.out.println(r);
4444
}
4545
```
4646

‎src/main/java/org/xbill/DNS/Cache.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@ private synchronized Element oneElement(Name name, Object types, int type, int m
218218
throw new IllegalArgumentException("oneElement(ANY)");
219219
}
220220
if (types instanceof List) {
221-
List list = (List) types;
222-
for (Object o : list) {
223-
Element set = (Element) o;
221+
@SuppressWarnings("unchecked")
222+
List<Element> list = (List<Element>) types;
223+
for (Element set : list) {
224224
if (set.getType() == type) {
225225
found = set;
226226
break;
@@ -290,9 +290,10 @@ private synchronized void removeElement(Name name, int type) {
290290
return;
291291
}
292292
if (types instanceof List) {
293-
List list = (List) types;
293+
@SuppressWarnings("unchecked")
294+
List<Element> list = (List<Element>) types;
294295
for (int i = 0; i < list.size(); i++) {
295-
Element elt = (Element) list.get(i);
296+
Element elt = list.get(i);
296297
if (elt.getType() == type) {
297298
list.remove(i);
298299
if (list.size() == 0) {

‎src/main/java/org/xbill/DNS/SimpleResolver.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,13 +371,13 @@ private Message sendAXFR(Message query) throws IOException {
371371
} catch (ZoneTransferException e) {
372372
throw new WireParseException(e.getMessage());
373373
}
374-
List records = xfrin.getAXFR();
374+
List<Record> records = xfrin.getAXFR();
375375
Message response = new Message(query.getHeader().getID());
376376
response.getHeader().setFlag(Flags.AA);
377377
response.getHeader().setFlag(Flags.QR);
378378
response.addRecord(query.getQuestion(), Section.QUESTION);
379-
for (Object record : records) {
380-
response.addRecord((Record) record, Section.ANSWER);
379+
for (Record record : records) {
380+
response.addRecord(record, Section.ANSWER);
381381
}
382382
return response;
383383
}

‎src/main/java/org/xbill/DNS/Zone.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ public class Zone implements Serializable {
2929
private Map<Name, Object> data;
3030
private Name origin;
3131
private Object originNode;
32-
private int dclass = DClass.IN;
3332
private RRset NS;
3433
private SOARecord SOA;
3534
private boolean hasWild;
3635

3736
class ZoneIterator implements Iterator<RRset> {
38-
private Iterator zentries;
37+
private Iterator<Map.Entry<Name, Object>> zentries;
3938
private RRset[] current;
4039
private int count;
4140
private boolean wantLastSOA;
@@ -77,7 +76,7 @@ public RRset next() {
7776
if (count == current.length) {
7877
current = null;
7978
while (zentries.hasNext()) {
80-
Map.Entry entry = (Map.Entry) zentries.next();
79+
Map.Entry<Name, Object> entry = zentries.next();
8180
if (entry.getKey().equals(origin)) {
8281
continue;
8382
}
@@ -178,14 +177,14 @@ private void fromXFR(ZoneTransferIn xfrin) throws IOException, ZoneTransferExcep
178177
}
179178

180179
origin = xfrin.getName();
181-
List records = xfrin.run();
182-
for (Object o : records) {
183-
Record record = (Record) o;
184-
maybeAddRecord(record);
185-
}
180+
xfrin.run();
186181
if (!xfrin.isAXFR()) {
187182
throw new IllegalArgumentException("zones can only be created from AXFRs");
188183
}
184+
185+
for (Record record : xfrin.getAXFR()) {
186+
maybeAddRecord(record);
187+
}
189188
validate();
190189
}
191190

@@ -227,7 +226,7 @@ public SOARecord getSOA() {
227226

228227
/** Returns the Zone's class */
229228
public int getDClass() {
230-
return dclass;
229+
return DClass.IN;
231230
}
232231

233232
private synchronized Object exactName(Name name) {
@@ -245,7 +244,7 @@ private synchronized RRset[] allRRsets(Object types) {
245244
}
246245
}
247246

248-
private synchronized <T extends Record> RRset oneRRset(Object types, int type) {
247+
private synchronized RRset oneRRset(Object types, int type) {
249248
if (type == Type.ANY) {
250249
throw new IllegalArgumentException("oneRRset(ANY)");
251250
}
@@ -266,7 +265,7 @@ private synchronized <T extends Record> RRset oneRRset(Object types, int type) {
266265
return null;
267266
}
268267

269-
private synchronized <T extends Record> RRset findRRset(Name name, int type) {
268+
private synchronized RRset findRRset(Name name, int type) {
270269
Object types = exactName(name);
271270
if (types == null) {
272271
return null;
@@ -314,9 +313,10 @@ private synchronized void removeRRset(Name name, int type) {
314313
return;
315314
}
316315
if (types instanceof List) {
317-
List list = (List) types;
316+
@SuppressWarnings("unchecked")
317+
List<RRset> list = (List<RRset>) types;
318318
for (int i = 0; i < list.size(); i++) {
319-
RRset set = (RRset) list.get(i);
319+
RRset set = list.get(i);
320320
if (set.getType() == type) {
321321
list.remove(i);
322322
if (list.size() == 0) {
@@ -454,7 +454,7 @@ public SetResponse findRecords(Name name, int type) {
454454
* @return The matching RRset
455455
* @see RRset
456456
*/
457-
public <T extends Record> RRset findExactMatch(Name name, int type) {
457+
public RRset findExactMatch(Name name, int type) {
458458
Object types = exactName(name);
459459
if (types == null) {
460460
return null;
@@ -499,7 +499,7 @@ public <T extends Record> void addRecord(T r) {
499499
* @param r The record to be removed
500500
* @see Record
501501
*/
502-
public <T extends Record> void removeRecord(T r) {
502+
public void removeRecord(Record r) {
503503
Name name = r.getName();
504504
int rtype = r.getRRsetType();
505505
synchronized (this) {

‎src/main/java/org/xbill/DNS/ZoneTransferIn.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -560,22 +560,16 @@ public void run(ZoneTransferHandler handler) throws IOException, ZoneTransferExc
560560
}
561561

562562
/**
563-
* Does the zone transfer.
563+
* Does the zone transfer using an internal handler. Results can be obtained by calling {@link
564+
* #getAXFR()} or getIXFR
564565
*
565-
* @return A list, which is either an AXFR-style response (List of Records), and IXFR-style
566-
* response (List of Deltas), or null, which indicates that an IXFR was performed and the zone
567-
* is up to date.
568566
* @throws IOException The zone transfer failed to due an IO problem.
569567
* @throws ZoneTransferException The zone transfer failed to due a problem with the zone transfer
570568
* itself.
571569
*/
572-
public List run() throws IOException, ZoneTransferException {
570+
public void run() throws IOException, ZoneTransferException {
573571
BasicHandler handler = new BasicHandler();
574572
run(handler);
575-
if (handler.axfr != null) {
576-
return handler.axfr;
577-
}
578-
return handler.ixfr;
579573
}
580574

581575
private BasicHandler getBasicHandler() throws IllegalArgumentException {
@@ -600,7 +594,7 @@ public boolean isAXFR() {
600594
* @throws IllegalArgumentException The transfer used the callback interface, so the response was
601595
* not stored.
602596
*/
603-
public List getAXFR() {
597+
public List<Record> getAXFR() {
604598
BasicHandler handler = getBasicHandler();
605599
return handler.axfr;
606600
}
@@ -619,7 +613,7 @@ public boolean isIXFR() {
619613
* @throws IllegalArgumentException The transfer used the callback interface, so the response was
620614
* not stored.
621615
*/
622-
public List getIXFR() {
616+
public List<Delta> getIXFR() {
623617
BasicHandler handler = getBasicHandler();
624618
return handler.ixfr;
625619
}

‎src/main/java/org/xbill/DNS/tools/xfrin.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
package org.xbill.DNS.tools;
44

55
import java.util.Iterator;
6-
import java.util.List;
76
import org.xbill.DNS.Lookup;
87
import org.xbill.DNS.Name;
98
import org.xbill.DNS.Record;
109
import org.xbill.DNS.SimpleResolver;
1110
import org.xbill.DNS.TSIG;
1211
import org.xbill.DNS.Type;
1312
import org.xbill.DNS.ZoneTransferIn;
13+
import org.xbill.DNS.ZoneTransferIn.Delta;
1414

1515
public class xfrin {
1616

@@ -82,21 +82,19 @@ public static void main(String[] args) throws Exception {
8282
xfrin = ZoneTransferIn.newAXFR(zname, server, port, key);
8383
}
8484

85-
List response = xfrin.run();
85+
xfrin.run();
8686
if (xfrin.isAXFR()) {
8787
if (ixfr_serial >= 0) {
8888
System.out.println("AXFR-like IXFR response");
8989
} else {
9090
System.out.println("AXFR response");
9191
}
92-
for (Object o : response) {
93-
System.out.println(o);
92+
for (Record record : xfrin.getAXFR()) {
93+
System.out.println(record);
9494
}
9595
} else if (xfrin.isIXFR()) {
9696
System.out.println("IXFR response");
97-
for (Object o : response) {
98-
ZoneTransferIn.Delta delta;
99-
delta = (ZoneTransferIn.Delta) o;
97+
for (Delta delta : xfrin.getIXFR()) {
10098
System.out.println("delta from " + delta.start + " to " + delta.end);
10199
System.out.println("deletes");
102100
Iterator<Record> it2 = delta.deletes.iterator();

‎src/test/java/org/xbill/DNS/APLRecordTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void ctor_4arg_basic() {
152152
@Test
153153
void ctor_4arg_empty_elements() {
154154
APLRecord ar = new APLRecord(m_an, DClass.IN, m_ttl, new ArrayList<>());
155-
assertEquals(new ArrayList(), ar.getElements());
155+
assertEquals(new ArrayList<>(), ar.getElements());
156156
}
157157

158158
@Test

0 commit comments

Comments
 (0)