Skip to content

Commit 31976d5

Browse files
ibauersachsibauersachs
committed
Keep dnssec classes package-private as much as possible
1 parent cb7cb72 commit 31976d5

File tree

63 files changed

+45
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+45
-79
lines changed

src/main/java/org/xbill/DNS/dnssec/validator/ByteArrayComparator.java renamed to src/main/java/org/xbill/DNS/dnssec/ByteArrayComparator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: BSD-3-Clause
22
// Copyright (c) 2005 VeriSign. All rights reserved.
33
// Copyright (c) 2013-2021 Ingo Bauersachs
4-
package org.xbill.DNS.dnssec.validator;
4+
package org.xbill.DNS.dnssec;
55

66
import java.util.Comparator;
77

@@ -11,7 +11,7 @@
1111
*
1212
* @since 3.5
1313
*/
14-
class ByteArrayComparator implements Comparator<Object> {
14+
final class ByteArrayComparator implements Comparator<Object> {
1515
private static final int MAX_BYTE = 0xFF;
1616

1717
/** {@inheritDoc} */

src/main/java/org/xbill/DNS/dnssec/validator/DnsSecVerifier.java renamed to src/main/java/org/xbill/DNS/dnssec/DnsSecVerifier.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: BSD-3-Clause
22
// Copyright (c) 2005 VeriSign. All rights reserved.
33
// Copyright (c) 2013-2021 Ingo Bauersachs
4-
package org.xbill.DNS.dnssec.validator;
4+
package org.xbill.DNS.dnssec;
55

66
import java.time.Instant;
77
import java.util.ArrayList;
@@ -15,8 +15,6 @@
1515
import org.xbill.DNS.RRset;
1616
import org.xbill.DNS.Record;
1717
import org.xbill.DNS.Type;
18-
import org.xbill.DNS.dnssec.SRRset;
19-
import org.xbill.DNS.dnssec.SecurityStatus;
2018

2119
/**
2220
* A class for performing basic DNSSEC verification. The DNSJAVA package contains a similar class.
@@ -25,7 +23,7 @@
2523
* @since 3.5
2624
*/
2725
@Slf4j
28-
class DnsSecVerifier {
26+
final class DnsSecVerifier {
2927
/**
3028
* Find the matching DNSKEY(s) to an RRSIG within a DNSKEY rrset. Normally this will only return
3129
* one DNSKEY. It can return more than one, since KeyID/Footprints are not guaranteed to be

src/main/java/org/xbill/DNS/dnssec/validator/FindKeyState.java renamed to src/main/java/org/xbill/DNS/dnssec/FindKeyState.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
// Copyright (c) 2005 VeriSign. All rights reserved.
33
// Copyright (c) 2013-2021 Ingo Bauersachs
44

5-
package org.xbill.DNS.dnssec.validator;
5+
package org.xbill.DNS.dnssec;
66

77
import org.xbill.DNS.Name;
8-
import org.xbill.DNS.dnssec.SRRset;
98

109
/**
1110
* State-object for the key-finding phase.
1211
*
1312
* @since 3.5
1413
*/
15-
class FindKeyState {
14+
final class FindKeyState {
1615
/** The (initial) DS RRset for the following DNSKEY search and validate phase. */
1716
SRRset dsRRset;
1817

src/main/java/org/xbill/DNS/dnssec/validator/JustifiedSecStatus.java renamed to src/main/java/org/xbill/DNS/dnssec/JustifiedSecStatus.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
// SPDX-License-Identifier: BSD-3-Clause
2-
package org.xbill.DNS.dnssec.validator;
3-
4-
import org.xbill.DNS.dnssec.SMessage;
5-
import org.xbill.DNS.dnssec.SecurityStatus;
2+
package org.xbill.DNS.dnssec;
63

74
/**
85
* Codes for DNSSEC security statuses along with a reason why the status was determined.
96
*
107
* @since 3.5
118
*/
12-
class JustifiedSecStatus {
9+
final class JustifiedSecStatus {
1310
SecurityStatus status;
1411
String reason;
1512

src/main/java/org/xbill/DNS/dnssec/validator/KeyCache.java renamed to src/main/java/org/xbill/DNS/dnssec/KeyCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: BSD-3-Clause
22
// Copyright (c) 2005 VeriSign. All rights reserved.
33
// Copyright (c) 2013-2021 Ingo Bauersachs
4-
package org.xbill.DNS.dnssec.validator;
4+
package org.xbill.DNS.dnssec;
55

66
import java.time.Clock;
77
import java.time.Instant;

src/main/java/org/xbill/DNS/dnssec/validator/KeyEntry.java renamed to src/main/java/org/xbill/DNS/dnssec/KeyEntry.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22
// Copyright (c) 2005 VeriSign. All rights reserved.
33
// Copyright (c) 2013-2021 Ingo Bauersachs
44

5-
package org.xbill.DNS.dnssec.validator;
5+
package org.xbill.DNS.dnssec;
66

77
import lombok.EqualsAndHashCode;
88
import lombok.extern.slf4j.Slf4j;
99
import org.xbill.DNS.Name;
1010
import org.xbill.DNS.Record;
1111
import org.xbill.DNS.Type;
12-
import org.xbill.DNS.dnssec.R;
13-
import org.xbill.DNS.dnssec.SRRset;
14-
import org.xbill.DNS.dnssec.SecurityStatus;
1512

1613
/**
1714
* DNSKEY cache entry for a given {@link Name}, with or without actual keys.

src/main/java/org/xbill/DNS/dnssec/validator/NSEC3ValUtils.java renamed to src/main/java/org/xbill/DNS/dnssec/NSEC3ValUtils.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: BSD-3-Clause
22
// Copyright (c) 2005 VeriSign. All rights reserved.
33
// Copyright (c) 2013-2021 Ingo Bauersachs
4-
package org.xbill.DNS.dnssec.validator;
4+
package org.xbill.DNS.dnssec;
55

66
import java.security.NoSuchAlgorithmException;
77
import java.security.interfaces.DSAPublicKey;
@@ -24,8 +24,6 @@
2424
import org.xbill.DNS.Record;
2525
import org.xbill.DNS.TextParseException;
2626
import org.xbill.DNS.Type;
27-
import org.xbill.DNS.dnssec.SRRset;
28-
import org.xbill.DNS.dnssec.SecurityStatus;
2927
import org.xbill.DNS.utils.base32;
3028

3129
/**

src/main/java/org/xbill/DNS/dnssec/validator/ResponseClassification.java renamed to src/main/java/org/xbill/DNS/dnssec/ResponseClassification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: BSD-3-Clause
22
// Copyright (c) 2005 VeriSign. All rights reserved.
33
// Copyright (c) 2013-2021 Ingo Bauersachs
4-
package org.xbill.DNS.dnssec.validator;
4+
package org.xbill.DNS.dnssec;
55

66
/**
77
* These are response subtypes. They are necessary for determining the validation strategy. They

‎src/main/java/org/xbill/DNS/dnssec/SMessage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* @since 3.5
2626
*/
2727
@Slf4j
28-
public final class SMessage {
28+
final class SMessage {
2929
private static final int NUM_SECTIONS = 3;
3030
private static final int MAX_FLAGS = 16;
3131
private static final int EXTENDED_FLAGS_BIT_OFFSET = 4;

‎src/main/java/org/xbill/DNS/dnssec/SRRset.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@EqualsAndHashCode(
1919
callSuper = true,
2020
of = {"securityStatus", "ownerName"})
21-
public class SRRset extends RRset {
21+
class SRRset extends RRset {
2222
private SecurityStatus securityStatus;
2323
private Name ownerName;
2424

0 commit comments

Comments
 (0)