Return the name of the record for C/DNAME

ibauersachs · ibauersachs · commit a8f5f7d4f57a · 2020-10-28T21:20:17.000+01:00
See https://tools.ietf.org/html/rfc2181#section-10.1.1 for a detailed explanation Closes dnsjava#136
diff --git a/src/main/java/org/xbill/DNS/CNAMERecord.java b/src/main/java/org/xbill/DNS/CNAMERecord.java
@@ -26,8 +26,14 @@ public Name getTarget() {
     return getSingleName();
   }
 
-  /** Gets the alias specified by the CNAME Record */
+  /**
+   * Gets the name of this record, aka the <i>alias</i> or <i>label</i> to the <i>canonical name</i>
+   * specified in {@link #getTarget()}.
+   *
+   * @deprecated use {@link #getName()}
+   */
+  @Deprecated
   public Name getAlias() {
-    return getSingleName();
+    return getName();
   }
 }
diff --git a/src/main/java/org/xbill/DNS/DNAMERecord.java b/src/main/java/org/xbill/DNS/DNAMERecord.java
@@ -25,8 +25,14 @@ public Name getTarget() {
     return getSingleName();
   }
 
-  /** Gets the alias specified by the DNAME Record */
+  /**
+   * Gets the name of this record, aka the <i>alias</i> or <i>label</i> to the <i>delegation
+   * name</i> specified in {@link #getTarget()}.
+   *
+   * @deprecated use {@link #getName()}
+   */
+  @Deprecated
   public Name getAlias() {
-    return getSingleName();
+    return getName();
   }
 }
diff --git a/src/test/java/org/xbill/DNS/CNAMERecordTest.java b/src/test/java/org/xbill/DNS/CNAMERecordTest.java
@@ -39,6 +39,7 @@
 
 import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("deprecation")
 class CNAMERecordTest {
   @Test
   void ctor_0arg() {
@@ -59,6 +60,6 @@ void ctor_4arg() throws TextParseException {
     assertEquals(DClass.IN, d.getDClass());
     assertEquals(0xABCDEL, d.getTTL());
     assertEquals(a, d.getTarget());
-    assertEquals(a, d.getAlias());
+    assertEquals(n, d.getAlias());
   }
 }
diff --git a/src/test/java/org/xbill/DNS/DNAMERecordTest.java b/src/test/java/org/xbill/DNS/DNAMERecordTest.java
@@ -39,6 +39,7 @@
 
 import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("deprecation")
 class DNAMERecordTest {
   @Test
   void ctor_0arg() {
@@ -59,6 +60,6 @@ void ctor_4arg() throws TextParseException {
     assertEquals(DClass.IN, d.getDClass());
     assertEquals(0xABCDEL, d.getTTL());
     assertEquals(a, d.getTarget());
-    assertEquals(a, d.getAlias());
+    assertEquals(n, d.getAlias());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,14 @@ public Name getTarget() {`
`26`	`26`	`return getSingleName();`
`27`	`27`	`}`
`28`	`28`
`29`		`- /** Gets the alias specified by the CNAME Record */`
	`29`	`+ /**`
	`30`	`+ * Gets the name of this record, aka the <i>alias</i> or <i>label</i> to the <i>canonical name</i>`
	`31`	`+ * specified in {@link #getTarget()}.`
	`32`	`+ *`
	`33`	`+ * @deprecated use {@link #getName()}`
	`34`	`+ */`
	`35`	`+ @Deprecated`
`30`	`36`	`public Name getAlias() {`
`31`		`- return getSingleName();`
	`37`	`+ return getName();`
`32`	`38`	`}`
`33`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,14 @@ public Name getTarget() {`
`25`	`25`	`return getSingleName();`
`26`	`26`	`}`
`27`	`27`
`28`		`- /** Gets the alias specified by the DNAME Record */`
	`28`	`+ /**`
	`29`	`+ * Gets the name of this record, aka the <i>alias</i> or <i>label</i> to the <i>delegation`
	`30`	`+ * name</i> specified in {@link #getTarget()}.`
	`31`	`+ *`
	`32`	`+ * @deprecated use {@link #getName()}`
	`33`	`+ */`
	`34`	`+ @Deprecated`
`29`	`35`	`public Name getAlias() {`
`30`		`- return getSingleName();`
	`36`	`+ return getName();`
`31`	`37`	`}`
`32`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`
`40`	`40`	`import org.junit.jupiter.api.Test;`
`41`	`41`
	`42`	`+@SuppressWarnings("deprecation")`
`42`	`43`	`class CNAMERecordTest {`
`43`	`44`	`@Test`
`44`	`45`	`void ctor_0arg() {`
`@@ -59,6 +60,6 @@ void ctor_4arg() throws TextParseException {`
`59`	`60`	`assertEquals(DClass.IN, d.getDClass());`
`60`	`61`	`assertEquals(0xABCDEL, d.getTTL());`
`61`	`62`	`assertEquals(a, d.getTarget());`
`62`		`- assertEquals(a, d.getAlias());`
	`63`	`+ assertEquals(n, d.getAlias());`
`63`	`64`	`}`
`64`	`65`	`}`