Skip to content

Commit c365e69

Browse files
author
gm2552
committed
Supporting TXT record type.
1 parent 2cda24a commit c365e69

4 files changed

Lines changed: 114 additions & 9 deletions

File tree

pom.xml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>dns</artifactId>
66
<name>Direct Project DNS services</name>
7-
<version>6.0.1-SNAPSHOT</version>
7+
<version>6.0.1</version>
88
<description>Direct Project DNS services</description>
99
<inceptionYear>2010</inceptionYear>
1010
<url>https://github.com/DirectProjectJavaRI/dns</url>
@@ -32,7 +32,7 @@
3232
<parent>
3333
<groupId>org.springframework.boot</groupId>
3434
<artifactId>spring-boot-starter-parent</artifactId>
35-
<version>2.1.3.RELEASE</version>
35+
<version>2.1.6.RELEASE</version>
3636
<relativePath />
3737
</parent>
3838
<licenses>
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>org.springframework.boot</groupId>
4848
<artifactId>spring-boot-dependencies</artifactId>
49-
<version>2.1.3.RELEASE</version>
49+
<version>2.1.6.RELEASE</version>
5050
<type>pom</type>
5151
<scope>import</scope>
5252
</dependency>
@@ -116,12 +116,12 @@
116116
<dependency>
117117
<groupId>org.nhind</groupId>
118118
<artifactId>direct-common</artifactId>
119-
<version>6.0</version>
119+
<version>6.0.1</version>
120120
</dependency>
121121
<dependency>
122122
<groupId>org.nhind</groupId>
123123
<artifactId>config-service-jar</artifactId>
124-
<version>6.0.2</version>
124+
<version>6.0.3</version>
125125
<scope>test</scope>
126126
</dependency>
127127
<dependency>
@@ -282,8 +282,7 @@
282282
</goals>
283283
</execution>
284284
</executions>
285-
</plugin>
286-
<!-- for releases only
285+
</plugin>
287286
<plugin>
288287
<groupId>org.apache.maven.plugins</groupId>
289288
<artifactId>maven-gpg-plugin</artifactId>
@@ -296,8 +295,7 @@
296295
</goals>
297296
</execution>
298297
</executions>
299-
</plugin>
300-
-->
298+
</plugin>
301299
</plugins>
302300
</build>
303301
<reporting>

src/main/java/org/nhindirect/dns/AbstractDNSStore.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ public Message get(Message request) throws DNSException
136136
case Type.NS:
137137
case Type.CNAME:
138138
case Type.TXT:
139+
case Type.CAA:
139140
{
140141
try
141142
{

src/site/apt/releaseNotes.apt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@
66
Greg Meyer
77
---
88

9+
{6.0.1}
10+
11+
Changes included with release 6.0.1
12+
13+
[]
14+
15+
Enhancements
16+
17+
* Adding in support for TXT record types.
18+
19+
[]
20+
21+
Bug Fixes
22+
23+
* NA
24+
925
{6.0}
1026

1127
Changes included with release 6.0

src/test/java/org/nhindirect/dns/DNSServer_Function_Test.java

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,96 @@ protected void doAssertions(Collection<Record> records) throws Exception
881881
}.perform();
882882
}
883883

884+
@Test
885+
public void testQueryTXTRecord_AssertRecordsRetrieved() throws Exception
886+
{
887+
new TestPlan()
888+
{
889+
protected void addRecords() throws Exception
890+
{
891+
ArrayList<DNSRecord> recs = new ArrayList<>();
892+
DNSRecord rec = DNSRecordUtil.createTXTRecord("domain.com", "ns.domain.com");
893+
recs.add(rec);
894+
895+
rec = DNSRecordUtil.createTXTRecord("domain.com", "ns2.domain.com");
896+
recs.add(rec);
897+
898+
rec = DNSRecordUtil.createTXTRecord("domain2.com", "ns.domain2.com");
899+
recs.add(rec);
900+
901+
for (DNSRecord addRec : recs)
902+
dnsService.addDNSRecord(addRec);
903+
904+
}
905+
906+
protected Collection<Query> getTestQueries() throws Exception
907+
{
908+
Collection<Query> queries = new ArrayList<Query>();
909+
queries.add(new Query("domain.com", Type.TXT));
910+
911+
return queries;
912+
}
913+
914+
protected void doAssertions(Collection<Record> records) throws Exception
915+
{
916+
assertNotNull(records);
917+
assertEquals(2, records.size());
918+
919+
920+
for (Record rec : records)
921+
{
922+
assertEquals(Type.TXT, rec.getType());
923+
assertEquals("domain.com.", rec.getName().toString());
924+
}
925+
}
926+
}.perform();
927+
}
928+
929+
@Test
930+
public void testQueryCAARecord_AssertRecordsRetrieved() throws Exception
931+
{
932+
new TestPlan()
933+
{
934+
protected void addRecords() throws Exception
935+
{
936+
ArrayList<DNSRecord> recs = new ArrayList<>();
937+
DNSRecord rec = DNSRecordUtil.createTXTRecord("domain.com", "ns.domain.com");
938+
recs.add(rec);
939+
940+
rec = DNSRecordUtil.createTXTRecord("domain.com", "ns2.domain.com");
941+
recs.add(rec);
942+
943+
rec = DNSRecordUtil.createTXTRecord("domain2.com", "ns.domain2.com");
944+
recs.add(rec);
945+
946+
for (DNSRecord addRec : recs)
947+
dnsService.addDNSRecord(addRec);
948+
949+
}
950+
951+
protected Collection<Query> getTestQueries() throws Exception
952+
{
953+
Collection<Query> queries = new ArrayList<Query>();
954+
queries.add(new Query("domain.com", Type.TXT));
955+
956+
return queries;
957+
}
958+
959+
protected void doAssertions(Collection<Record> records) throws Exception
960+
{
961+
assertNotNull(records);
962+
assertEquals(2, records.size());
963+
964+
965+
for (Record rec : records)
966+
{
967+
assertEquals(Type.TXT, rec.getType());
968+
assertEquals("domain.com.", rec.getName().toString());
969+
}
970+
}
971+
}.perform();
972+
}
973+
884974
@Test
885975
public void testQueryUnsupportedQueryType() throws Exception
886976
{

0 commit comments

Comments
 (0)