Skip to content

Commit d35db02

Browse files
dhfelixdhfelix
committedOct 27, 2017
Reorder project path
·
v1.2.1v1.0.0
1 parent 9da61f1 commit d35db02

19 files changed

+1226
-1226
lines changed
 

‎rdap-json-renderer/.gitignore ‎.gitignore

File renamed without changes.

‎rdap-json-renderer/pom.xml ‎pom.xml

+42-42
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
5-
<groupId>mx.nic.rdap</groupId>
6-
<artifactId>rdap-json-renderer</artifactId>
7-
<version>1.0.0</version>
8-
<packaging>jar</packaging>
9-
10-
<name>rdap-json-renderer</name>
11-
12-
<properties>
13-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<maven.compiler.source>1.8</maven.compiler.source>
15-
<maven.compiler.target>1.8</maven.compiler.target>
16-
</properties>
17-
18-
<dependencies>
19-
<dependency>
20-
<groupId>mx.nic.rdap</groupId>
21-
<artifactId>rdap-renderer-api</artifactId>
22-
<version>1.0.0</version>
23-
</dependency>
24-
<dependency>
25-
<groupId>mx.nic.rdap</groupId>
26-
<artifactId>rdap-renderer-test-api</artifactId>
27-
<version>1.0.0</version>
28-
<scope>test</scope>
29-
</dependency>
30-
<dependency>
31-
<groupId>org.glassfish</groupId>
32-
<artifactId>javax.json</artifactId>
33-
<version>1.0.4</version>
34-
</dependency>
35-
<dependency>
36-
<groupId>junit</groupId>
37-
<artifactId>junit</artifactId>
38-
<version>4.12</version>
39-
<scope>test</scope>
40-
</dependency>
41-
</dependencies>
42-
</project>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<groupId>mx.nic.rdap</groupId>
6+
<artifactId>rdap-json-renderer</artifactId>
7+
<version>1.0.0</version>
8+
<packaging>jar</packaging>
9+
10+
<name>rdap-json-renderer</name>
11+
12+
<properties>
13+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14+
<maven.compiler.source>1.8</maven.compiler.source>
15+
<maven.compiler.target>1.8</maven.compiler.target>
16+
</properties>
17+
18+
<dependencies>
19+
<dependency>
20+
<groupId>mx.nic.rdap</groupId>
21+
<artifactId>rdap-renderer-api</artifactId>
22+
<version>1.0.0</version>
23+
</dependency>
24+
<dependency>
25+
<groupId>mx.nic.rdap</groupId>
26+
<artifactId>rdap-renderer-test-api</artifactId>
27+
<version>1.0.0</version>
28+
<scope>test</scope>
29+
</dependency>
30+
<dependency>
31+
<groupId>org.glassfish</groupId>
32+
<artifactId>javax.json</artifactId>
33+
<version>1.0.4</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>junit</groupId>
37+
<artifactId>junit</artifactId>
38+
<version>4.12</version>
39+
<scope>test</scope>
40+
</dependency>
41+
</dependencies>
42+
</project>

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/AutnumJsonWriter.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/AutnumJsonWriter.java

+56-56
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
1-
/**
2-
*
3-
*/
4-
package mx.nic.rdap.renderer.json.writer;
5-
6-
import java.util.List;
7-
8-
import javax.json.Json;
9-
import javax.json.JsonArray;
10-
import javax.json.JsonArrayBuilder;
11-
import javax.json.JsonObject;
12-
import javax.json.JsonObjectBuilder;
13-
14-
import mx.nic.rdap.core.db.Autnum;
15-
import mx.nic.rdap.renderer.util.RendererUtil;
16-
17-
public class AutnumJsonWriter {
18-
19-
public static JsonArray getJsonArray(List<Autnum> autnums) {
20-
JsonArrayBuilder builder = Json.createArrayBuilder();
21-
22-
for (Autnum autnum : autnums) {
23-
builder.add(getJson(autnum));
24-
}
25-
return builder.build();
26-
}
27-
28-
public static JsonObject getJson(Autnum autnum) {
29-
JsonObjectBuilder builder = Json.createObjectBuilder();
30-
builder.add("objectClassName", "autnum");
31-
JsonUtil.fillCommonRdapJsonObject(builder, autnum);
32-
33-
String key = "startAutnum";
34-
if (RendererUtil.isObjectVisible(autnum.getStartAutnum()))
35-
builder.add(key, autnum.getStartAutnum());
36-
37-
key = "endAutnum";
38-
if (RendererUtil.isObjectVisible(autnum.getEndAutnum()))
39-
builder.add(key, autnum.getEndAutnum());
40-
41-
key = "name";
42-
if (RendererUtil.isObjectVisible(autnum.getName()))
43-
builder.add(key, autnum.getName());
44-
45-
key = "type";
46-
if (RendererUtil.isObjectVisible(autnum.getType()))
47-
builder.add(key, autnum.getType());
48-
49-
key = "country";
50-
if (RendererUtil.isObjectVisible(autnum.getCountryCode()))
51-
builder.add(key, autnum.getCountryCode());
52-
53-
return builder.build();
54-
}
55-
56-
}
1+
/**
2+
*
3+
*/
4+
package mx.nic.rdap.renderer.json.writer;
5+
6+
import java.util.List;
7+
8+
import javax.json.Json;
9+
import javax.json.JsonArray;
10+
import javax.json.JsonArrayBuilder;
11+
import javax.json.JsonObject;
12+
import javax.json.JsonObjectBuilder;
13+
14+
import mx.nic.rdap.core.db.Autnum;
15+
import mx.nic.rdap.renderer.util.RendererUtil;
16+
17+
public class AutnumJsonWriter {
18+
19+
public static JsonArray getJsonArray(List<Autnum> autnums) {
20+
JsonArrayBuilder builder = Json.createArrayBuilder();
21+
22+
for (Autnum autnum : autnums) {
23+
builder.add(getJson(autnum));
24+
}
25+
return builder.build();
26+
}
27+
28+
public static JsonObject getJson(Autnum autnum) {
29+
JsonObjectBuilder builder = Json.createObjectBuilder();
30+
builder.add("objectClassName", "autnum");
31+
JsonUtil.fillCommonRdapJsonObject(builder, autnum);
32+
33+
String key = "startAutnum";
34+
if (RendererUtil.isObjectVisible(autnum.getStartAutnum()))
35+
builder.add(key, autnum.getStartAutnum());
36+
37+
key = "endAutnum";
38+
if (RendererUtil.isObjectVisible(autnum.getEndAutnum()))
39+
builder.add(key, autnum.getEndAutnum());
40+
41+
key = "name";
42+
if (RendererUtil.isObjectVisible(autnum.getName()))
43+
builder.add(key, autnum.getName());
44+
45+
key = "type";
46+
if (RendererUtil.isObjectVisible(autnum.getType()))
47+
builder.add(key, autnum.getType());
48+
49+
key = "country";
50+
if (RendererUtil.isObjectVisible(autnum.getCountryCode()))
51+
builder.add(key, autnum.getCountryCode());
52+
53+
return builder.build();
54+
}
55+
56+
}

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/DomainJsonWriter.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/DomainJsonWriter.java

+53-53
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
package mx.nic.rdap.renderer.json.writer;
2-
3-
import javax.json.Json;
4-
import javax.json.JsonObject;
5-
import javax.json.JsonObjectBuilder;
6-
7-
import mx.nic.rdap.core.db.Domain;
8-
import mx.nic.rdap.renderer.util.RendererUtil;
9-
10-
public class DomainJsonWriter {
11-
12-
public static JsonObject getJson(Domain domain) {
13-
JsonObjectBuilder builder = Json.createObjectBuilder();
14-
15-
builder.add("objectClassName", "domain");
16-
JsonUtil.fillCommonRdapJsonObject(builder, domain);
17-
18-
String key = "ldhName";
19-
String value = domain.getFQDN();
20-
if (RendererUtil.isObjectVisible(domain.getLdhName()))
21-
builder.add(key, value);
22-
23-
key = "unicodeName";
24-
value = domain.getUnicodeFQDN();
25-
if (RendererUtil.isObjectVisible(domain.getUnicodeName()))
26-
builder.add(key, value);
27-
28-
key = "variants";
29-
if (RendererUtil.isObjectVisible(domain.getVariants()))
30-
builder.add(key, VariantJsonWriter.getJsonArray(domain.getVariants()));
31-
32-
key = "publicIds";
33-
if (RendererUtil.isObjectVisible(domain.getPublicIds())) {
34-
builder.add(key, PublicIdJsonWriter.getJsonArray(domain.getPublicIds()));
35-
}
36-
37-
key = "nameservers";
38-
if (RendererUtil.isObjectVisible(domain.getNameServers()))
39-
builder.add(key, NameserverJsonWriter.getJsonArray(domain.getNameServers()));
40-
41-
key = "secureDNS";
42-
if (RendererUtil.isObjectVisible(domain.getSecureDNS()))
43-
builder.add(key, SecureDNSJsonWriter.getJsonObject(domain.getSecureDNS()));
44-
45-
key = "network";
46-
if (RendererUtil.isObjectVisible(domain.getIpNetwork())) {
47-
builder.add(key, IpNetworkJsonWriter.getJson(domain.getIpNetwork()));
48-
}
49-
50-
return builder.build();
51-
}
52-
53-
}
1+
package mx.nic.rdap.renderer.json.writer;
2+
3+
import javax.json.Json;
4+
import javax.json.JsonObject;
5+
import javax.json.JsonObjectBuilder;
6+
7+
import mx.nic.rdap.core.db.Domain;
8+
import mx.nic.rdap.renderer.util.RendererUtil;
9+
10+
public class DomainJsonWriter {
11+
12+
public static JsonObject getJson(Domain domain) {
13+
JsonObjectBuilder builder = Json.createObjectBuilder();
14+
15+
builder.add("objectClassName", "domain");
16+
JsonUtil.fillCommonRdapJsonObject(builder, domain);
17+
18+
String key = "ldhName";
19+
String value = domain.getFQDN();
20+
if (RendererUtil.isObjectVisible(domain.getLdhName()))
21+
builder.add(key, value);
22+
23+
key = "unicodeName";
24+
value = domain.getUnicodeFQDN();
25+
if (RendererUtil.isObjectVisible(domain.getUnicodeName()))
26+
builder.add(key, value);
27+
28+
key = "variants";
29+
if (RendererUtil.isObjectVisible(domain.getVariants()))
30+
builder.add(key, VariantJsonWriter.getJsonArray(domain.getVariants()));
31+
32+
key = "publicIds";
33+
if (RendererUtil.isObjectVisible(domain.getPublicIds())) {
34+
builder.add(key, PublicIdJsonWriter.getJsonArray(domain.getPublicIds()));
35+
}
36+
37+
key = "nameservers";
38+
if (RendererUtil.isObjectVisible(domain.getNameServers()))
39+
builder.add(key, NameserverJsonWriter.getJsonArray(domain.getNameServers()));
40+
41+
key = "secureDNS";
42+
if (RendererUtil.isObjectVisible(domain.getSecureDNS()))
43+
builder.add(key, SecureDNSJsonWriter.getJsonObject(domain.getSecureDNS()));
44+
45+
key = "network";
46+
if (RendererUtil.isObjectVisible(domain.getIpNetwork())) {
47+
builder.add(key, IpNetworkJsonWriter.getJson(domain.getIpNetwork()));
48+
}
49+
50+
return builder.build();
51+
}
52+
53+
}

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/DsDataJsonWriter.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/DsDataJsonWriter.java

+59-59
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
1-
package mx.nic.rdap.renderer.json.writer;
2-
3-
import java.util.List;
4-
5-
import javax.json.Json;
6-
import javax.json.JsonArray;
7-
import javax.json.JsonArrayBuilder;
8-
import javax.json.JsonObject;
9-
import javax.json.JsonObjectBuilder;
10-
11-
import mx.nic.rdap.core.db.DsData;
12-
import mx.nic.rdap.renderer.util.RendererUtil;
13-
14-
public class DsDataJsonWriter {
15-
16-
public static JsonArray getJsonArray(List<DsData> dsDataList) {
17-
JsonArrayBuilder builder = Json.createArrayBuilder();
18-
19-
for (DsData dsData : dsDataList) {
20-
builder.add(getJsonObject(dsData));
21-
}
22-
23-
return builder.build();
24-
}
25-
26-
private static JsonObject getJsonObject(DsData dsData) {
27-
JsonObjectBuilder builder = Json.createObjectBuilder();
28-
String key = "keyTag";
29-
Integer intValue = dsData.getKeytag();
30-
if (RendererUtil.isObjectVisible(intValue))
31-
builder.add(key, intValue);
32-
33-
key = "algorithm";
34-
intValue = dsData.getAlgorithm();
35-
if (RendererUtil.isObjectVisible(intValue))
36-
builder.add(key, intValue);
37-
38-
key = "digest";
39-
String stringValue = dsData.getDigest();
40-
if (RendererUtil.isObjectVisible(stringValue))
41-
builder.add(key, stringValue);
42-
43-
key = "digestType";
44-
intValue = dsData.getDigestType();
45-
if (RendererUtil.isObjectVisible(intValue))
46-
builder.add(key, intValue);
47-
48-
key = "events";
49-
if (RendererUtil.isObjectVisible(dsData.getEvents()))
50-
builder.add(key, EventJsonWriter.getJsonArray(dsData.getEvents()));
51-
52-
key = "links";
53-
if (RendererUtil.isObjectVisible(dsData.getLinks()))
54-
builder.add(key, LinkJsonWriter.getJsonArray(dsData.getLinks()));
55-
56-
return builder.build();
57-
}
58-
59-
}
1+
package mx.nic.rdap.renderer.json.writer;
2+
3+
import java.util.List;
4+
5+
import javax.json.Json;
6+
import javax.json.JsonArray;
7+
import javax.json.JsonArrayBuilder;
8+
import javax.json.JsonObject;
9+
import javax.json.JsonObjectBuilder;
10+
11+
import mx.nic.rdap.core.db.DsData;
12+
import mx.nic.rdap.renderer.util.RendererUtil;
13+
14+
public class DsDataJsonWriter {
15+
16+
public static JsonArray getJsonArray(List<DsData> dsDataList) {
17+
JsonArrayBuilder builder = Json.createArrayBuilder();
18+
19+
for (DsData dsData : dsDataList) {
20+
builder.add(getJsonObject(dsData));
21+
}
22+
23+
return builder.build();
24+
}
25+
26+
private static JsonObject getJsonObject(DsData dsData) {
27+
JsonObjectBuilder builder = Json.createObjectBuilder();
28+
String key = "keyTag";
29+
Integer intValue = dsData.getKeytag();
30+
if (RendererUtil.isObjectVisible(intValue))
31+
builder.add(key, intValue);
32+
33+
key = "algorithm";
34+
intValue = dsData.getAlgorithm();
35+
if (RendererUtil.isObjectVisible(intValue))
36+
builder.add(key, intValue);
37+
38+
key = "digest";
39+
String stringValue = dsData.getDigest();
40+
if (RendererUtil.isObjectVisible(stringValue))
41+
builder.add(key, stringValue);
42+
43+
key = "digestType";
44+
intValue = dsData.getDigestType();
45+
if (RendererUtil.isObjectVisible(intValue))
46+
builder.add(key, intValue);
47+
48+
key = "events";
49+
if (RendererUtil.isObjectVisible(dsData.getEvents()))
50+
builder.add(key, EventJsonWriter.getJsonArray(dsData.getEvents()));
51+
52+
key = "links";
53+
if (RendererUtil.isObjectVisible(dsData.getLinks()))
54+
builder.add(key, LinkJsonWriter.getJsonArray(dsData.getLinks()));
55+
56+
return builder.build();
57+
}
58+
59+
}

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/EntityJsonWriter.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/EntityJsonWriter.java

+72-72
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
1-
package mx.nic.rdap.renderer.json.writer;
2-
3-
import java.util.List;
4-
5-
import javax.json.Json;
6-
import javax.json.JsonArray;
7-
import javax.json.JsonArrayBuilder;
8-
import javax.json.JsonObject;
9-
import javax.json.JsonObjectBuilder;
10-
11-
import mx.nic.rdap.core.catalog.Role;
12-
import mx.nic.rdap.core.db.Entity;
13-
import mx.nic.rdap.renderer.util.RendererUtil;
14-
15-
public class EntityJsonWriter {
16-
17-
public static JsonObject getJson(Entity entity) {
18-
19-
JsonObjectBuilder builder = Json.createObjectBuilder();
20-
builder.add("objectClassName", "entity");
21-
22-
JsonUtil.fillCommonRdapJsonObject(builder, entity);
23-
24-
String key = "roles";
25-
if (RendererUtil.isObjectVisible(entity.getRoles())) {
26-
builder.add(key, getRolesJsonArray(entity.getRoles()));
27-
}
28-
29-
key = "publicIds";
30-
if (RendererUtil.isObjectVisible(entity.getPublicIds())) {
31-
builder.add(key, PublicIdJsonWriter.getJsonArray(entity.getPublicIds()));
32-
}
33-
34-
key = "networks";
35-
if (RendererUtil.isObjectVisible(entity.getIpNetworks())) {
36-
builder.add(key, IpNetworkJsonWriter.getJsonArray(entity.getIpNetworks()));
37-
}
38-
39-
key = "autnums";
40-
if (RendererUtil.isObjectVisible(entity.getAutnums())) {
41-
builder.add(key, AutnumJsonWriter.getJsonArray(entity.getAutnums()));
42-
}
43-
44-
key = "vcardArray";
45-
if (RendererUtil.isObjectVisible(entity.getVCardList())) {
46-
builder.add(key, VCardJsonWriter.getJson(entity.getVCardList().get(0)));
47-
}
48-
49-
return builder.build();
50-
}
51-
52-
public static JsonArray getJsonArray(List<Entity> entities) {
53-
JsonArrayBuilder builder = Json.createArrayBuilder();
54-
55-
for (Entity entity : entities) {
56-
builder.add(getJson(entity));
57-
}
58-
59-
return builder.build();
60-
}
61-
62-
private static JsonArray getRolesJsonArray(List<Role> roles) {
63-
JsonArrayBuilder builder = Json.createArrayBuilder();
64-
65-
for (Role role : roles) {
66-
builder.add(role.getValue());
67-
}
68-
69-
return builder.build();
70-
}
71-
72-
}
1+
package mx.nic.rdap.renderer.json.writer;
2+
3+
import java.util.List;
4+
5+
import javax.json.Json;
6+
import javax.json.JsonArray;
7+
import javax.json.JsonArrayBuilder;
8+
import javax.json.JsonObject;
9+
import javax.json.JsonObjectBuilder;
10+
11+
import mx.nic.rdap.core.catalog.Role;
12+
import mx.nic.rdap.core.db.Entity;
13+
import mx.nic.rdap.renderer.util.RendererUtil;
14+
15+
public class EntityJsonWriter {
16+
17+
public static JsonObject getJson(Entity entity) {
18+
19+
JsonObjectBuilder builder = Json.createObjectBuilder();
20+
builder.add("objectClassName", "entity");
21+
22+
JsonUtil.fillCommonRdapJsonObject(builder, entity);
23+
24+
String key = "roles";
25+
if (RendererUtil.isObjectVisible(entity.getRoles())) {
26+
builder.add(key, getRolesJsonArray(entity.getRoles()));
27+
}
28+
29+
key = "publicIds";
30+
if (RendererUtil.isObjectVisible(entity.getPublicIds())) {
31+
builder.add(key, PublicIdJsonWriter.getJsonArray(entity.getPublicIds()));
32+
}
33+
34+
key = "networks";
35+
if (RendererUtil.isObjectVisible(entity.getIpNetworks())) {
36+
builder.add(key, IpNetworkJsonWriter.getJsonArray(entity.getIpNetworks()));
37+
}
38+
39+
key = "autnums";
40+
if (RendererUtil.isObjectVisible(entity.getAutnums())) {
41+
builder.add(key, AutnumJsonWriter.getJsonArray(entity.getAutnums()));
42+
}
43+
44+
key = "vcardArray";
45+
if (RendererUtil.isObjectVisible(entity.getVCardList())) {
46+
builder.add(key, VCardJsonWriter.getJson(entity.getVCardList().get(0)));
47+
}
48+
49+
return builder.build();
50+
}
51+
52+
public static JsonArray getJsonArray(List<Entity> entities) {
53+
JsonArrayBuilder builder = Json.createArrayBuilder();
54+
55+
for (Entity entity : entities) {
56+
builder.add(getJson(entity));
57+
}
58+
59+
return builder.build();
60+
}
61+
62+
private static JsonArray getRolesJsonArray(List<Role> roles) {
63+
JsonArrayBuilder builder = Json.createArrayBuilder();
64+
65+
for (Role role : roles) {
66+
builder.add(role.getValue());
67+
}
68+
69+
return builder.build();
70+
}
71+
72+
}

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/EventJsonWriter.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/EventJsonWriter.java

+51-51
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
1-
package mx.nic.rdap.renderer.json.writer;
2-
3-
import java.util.Date;
4-
import java.util.List;
5-
6-
import javax.json.Json;
7-
import javax.json.JsonArray;
8-
import javax.json.JsonArrayBuilder;
9-
import javax.json.JsonObject;
10-
import javax.json.JsonObjectBuilder;
11-
12-
import mx.nic.rdap.core.catalog.EventAction;
13-
import mx.nic.rdap.core.db.Event;
14-
import mx.nic.rdap.renderer.util.RendererUtil;
15-
16-
public class EventJsonWriter {
17-
public static JsonArray getJsonArray(List<Event> events) {
18-
JsonArrayBuilder builder = Json.createArrayBuilder();
19-
20-
for (Event event : events) {
21-
builder.add(getJsonObject(event));
22-
}
23-
24-
return builder.build();
25-
}
26-
27-
private static JsonObject getJsonObject(Event event) {
28-
JsonObjectBuilder builder = Json.createObjectBuilder();
29-
30-
String key = "eventAction";
31-
EventAction action = event.getEventAction();
32-
if (RendererUtil.isObjectVisible(action))
33-
builder.add(key, action.getValue());
34-
35-
key = "eventActor";
36-
String value = event.getEventActor();
37-
if (RendererUtil.isObjectVisible(value))
38-
builder.add(key, value);
39-
40-
key = "eventDate";
41-
Date eventDate = event.getEventDate();
42-
if (RendererUtil.isObjectVisible(eventDate))
43-
builder.add(key, eventDate.toInstant().toString());
44-
45-
key = "links";
46-
if (RendererUtil.isObjectVisible(event.getLinks()))
47-
builder.add(key, LinkJsonWriter.getJsonArray(event.getLinks()));
48-
49-
return builder.build();
50-
}
51-
}
1+
package mx.nic.rdap.renderer.json.writer;
2+
3+
import java.util.Date;
4+
import java.util.List;
5+
6+
import javax.json.Json;
7+
import javax.json.JsonArray;
8+
import javax.json.JsonArrayBuilder;
9+
import javax.json.JsonObject;
10+
import javax.json.JsonObjectBuilder;
11+
12+
import mx.nic.rdap.core.catalog.EventAction;
13+
import mx.nic.rdap.core.db.Event;
14+
import mx.nic.rdap.renderer.util.RendererUtil;
15+
16+
public class EventJsonWriter {
17+
public static JsonArray getJsonArray(List<Event> events) {
18+
JsonArrayBuilder builder = Json.createArrayBuilder();
19+
20+
for (Event event : events) {
21+
builder.add(getJsonObject(event));
22+
}
23+
24+
return builder.build();
25+
}
26+
27+
private static JsonObject getJsonObject(Event event) {
28+
JsonObjectBuilder builder = Json.createObjectBuilder();
29+
30+
String key = "eventAction";
31+
EventAction action = event.getEventAction();
32+
if (RendererUtil.isObjectVisible(action))
33+
builder.add(key, action.getValue());
34+
35+
key = "eventActor";
36+
String value = event.getEventActor();
37+
if (RendererUtil.isObjectVisible(value))
38+
builder.add(key, value);
39+
40+
key = "eventDate";
41+
Date eventDate = event.getEventDate();
42+
if (RendererUtil.isObjectVisible(eventDate))
43+
builder.add(key, eventDate.toInstant().toString());
44+
45+
key = "links";
46+
if (RendererUtil.isObjectVisible(event.getLinks()))
47+
builder.add(key, LinkJsonWriter.getJsonArray(event.getLinks()));
48+
49+
return builder.build();
50+
}
51+
}

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/IpNetworkJsonWriter.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/IpNetworkJsonWriter.java

+71-71
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,71 @@
1-
package mx.nic.rdap.renderer.json.writer;
2-
3-
import java.util.List;
4-
5-
import javax.json.Json;
6-
import javax.json.JsonArray;
7-
import javax.json.JsonArrayBuilder;
8-
import javax.json.JsonObject;
9-
import javax.json.JsonObjectBuilder;
10-
11-
import mx.nic.rdap.core.db.IpNetwork;
12-
import mx.nic.rdap.renderer.util.RendererUtil;
13-
14-
public class IpNetworkJsonWriter {
15-
16-
public static JsonArray getJsonArray(List<IpNetwork> ips) {
17-
JsonArrayBuilder builder = Json.createArrayBuilder();
18-
19-
for (IpNetwork ip : ips) {
20-
builder.add(getJson(ip));
21-
}
22-
23-
return builder.build();
24-
}
25-
26-
public static JsonObject getJson(IpNetwork ipNetwork) {
27-
28-
JsonObjectBuilder builder = Json.createObjectBuilder();
29-
builder.add("objectClassName", "ip network");
30-
31-
String key = "startAddress";
32-
String value = ipNetwork.getStartAddress() != null ? ipNetwork.getStartAddress().getHostAddress() : null;
33-
if (RendererUtil.isObjectVisible(value))
34-
builder.add(key, value);
35-
36-
key = "endAddress";
37-
value = ipNetwork.getEndAddress() != null ? ipNetwork.getEndAddress().getHostAddress() : null;
38-
if (RendererUtil.isObjectVisible(value))
39-
builder.add(key, value);
40-
41-
key = "ipVersion";
42-
value = ipNetwork.getIpVersion() != null ? ipNetwork.getIpVersion().getVersionName() : null;
43-
if (RendererUtil.isObjectVisible(value))
44-
builder.add(key, value);
45-
46-
key = "name";
47-
value = ipNetwork.getName();
48-
if (RendererUtil.isObjectVisible(value))
49-
builder.add(key, value);
50-
51-
key = "type";
52-
value = ipNetwork.getType();
53-
if (RendererUtil.isObjectVisible(value))
54-
builder.add(key, value);
55-
56-
key = "country";
57-
value = ipNetwork.getCountry();
58-
if (RendererUtil.isObjectVisible(value))
59-
builder.add(key, value);
60-
61-
JsonUtil.fillCommonRdapJsonObject(builder, ipNetwork);
62-
63-
key = "parentHandle";
64-
value = ipNetwork.getParentHandle();
65-
if (RendererUtil.isObjectVisible(value))
66-
builder.add(key, value);
67-
68-
return builder.build();
69-
}
70-
71-
}
1+
package mx.nic.rdap.renderer.json.writer;
2+
3+
import java.util.List;
4+
5+
import javax.json.Json;
6+
import javax.json.JsonArray;
7+
import javax.json.JsonArrayBuilder;
8+
import javax.json.JsonObject;
9+
import javax.json.JsonObjectBuilder;
10+
11+
import mx.nic.rdap.core.db.IpNetwork;
12+
import mx.nic.rdap.renderer.util.RendererUtil;
13+
14+
public class IpNetworkJsonWriter {
15+
16+
public static JsonArray getJsonArray(List<IpNetwork> ips) {
17+
JsonArrayBuilder builder = Json.createArrayBuilder();
18+
19+
for (IpNetwork ip : ips) {
20+
builder.add(getJson(ip));
21+
}
22+
23+
return builder.build();
24+
}
25+
26+
public static JsonObject getJson(IpNetwork ipNetwork) {
27+
28+
JsonObjectBuilder builder = Json.createObjectBuilder();
29+
builder.add("objectClassName", "ip network");
30+
31+
String key = "startAddress";
32+
String value = ipNetwork.getStartAddress() != null ? ipNetwork.getStartAddress().getHostAddress() : null;
33+
if (RendererUtil.isObjectVisible(value))
34+
builder.add(key, value);
35+
36+
key = "endAddress";
37+
value = ipNetwork.getEndAddress() != null ? ipNetwork.getEndAddress().getHostAddress() : null;
38+
if (RendererUtil.isObjectVisible(value))
39+
builder.add(key, value);
40+
41+
key = "ipVersion";
42+
value = ipNetwork.getIpVersion() != null ? ipNetwork.getIpVersion().getVersionName() : null;
43+
if (RendererUtil.isObjectVisible(value))
44+
builder.add(key, value);
45+
46+
key = "name";
47+
value = ipNetwork.getName();
48+
if (RendererUtil.isObjectVisible(value))
49+
builder.add(key, value);
50+
51+
key = "type";
52+
value = ipNetwork.getType();
53+
if (RendererUtil.isObjectVisible(value))
54+
builder.add(key, value);
55+
56+
key = "country";
57+
value = ipNetwork.getCountry();
58+
if (RendererUtil.isObjectVisible(value))
59+
builder.add(key, value);
60+
61+
JsonUtil.fillCommonRdapJsonObject(builder, ipNetwork);
62+
63+
key = "parentHandle";
64+
value = ipNetwork.getParentHandle();
65+
if (RendererUtil.isObjectVisible(value))
66+
builder.add(key, value);
67+
68+
return builder.build();
69+
}
70+
71+
}

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/JsonUtil.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/JsonUtil.java

+92-92
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,92 @@
1-
package mx.nic.rdap.renderer.json.writer;
2-
3-
import java.util.List;
4-
5-
import javax.json.Json;
6-
import javax.json.JsonArray;
7-
import javax.json.JsonArrayBuilder;
8-
import javax.json.JsonObjectBuilder;
9-
10-
import mx.nic.rdap.core.catalog.Status;
11-
import mx.nic.rdap.core.db.RdapObject;
12-
import mx.nic.rdap.renderer.util.RendererUtil;
13-
14-
/**
15-
* Utilities for json renderer
16-
*/
17-
public class JsonUtil {
18-
19-
public static JsonArray getRdapConformance(List<String> others) {
20-
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
21-
if (others != null) {
22-
for (String s : others) {
23-
arrayBuilder.add(s);
24-
}
25-
}
26-
return arrayBuilder.build();
27-
}
28-
29-
public static JsonArray getRdapConformance(String... others) {
30-
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
31-
arrayBuilder.add("rdap_level_0");
32-
if (others != null) {
33-
for (String s : others) {
34-
arrayBuilder.add(s);
35-
}
36-
}
37-
return arrayBuilder.build();
38-
}
39-
40-
public static JsonObjectBuilder fillCommonRdapJsonObject(JsonObjectBuilder builder, RdapObject object) {
41-
42-
43-
String key = "handle";
44-
if (RendererUtil.isObjectVisible(object.getHandle()))
45-
builder.add(key, object.getHandle());
46-
47-
key = "remarks";
48-
if (RendererUtil.isObjectVisible(object.getRemarks()))
49-
builder.add(key, RemarkJsonWriter.getJsonArray(object.getRemarks()));
50-
51-
key = "links";
52-
if (RendererUtil.isObjectVisible(object.getLinks()))
53-
builder.add(key,
54-
LinkJsonWriter.getJsonArray(object.getLinks()));
55-
56-
key = "events";
57-
if (RendererUtil.isObjectVisible(object.getEvents()))
58-
builder.add(key, EventJsonWriter.getJsonArray(object.getEvents()));
59-
60-
key = "status";
61-
if (RendererUtil.isObjectVisible(object.getStatus()))
62-
builder.add(key, getStatusJsonArray(object.getStatus()));
63-
64-
key = "port43";
65-
if (RendererUtil.isObjectVisible(object.getPort43()))
66-
builder.add(key, object.getPort43());
67-
68-
key = "entities";
69-
if (RendererUtil.isObjectVisible(object.getEntities()))
70-
builder.add(key, EntityJsonWriter.getJsonArray(object.getEntities()));
71-
72-
key = "lang";
73-
if (RendererUtil.isObjectVisible(object.getLang())) {
74-
builder.add(key, object.getLang());
75-
}
76-
77-
return builder;
78-
}
79-
80-
81-
82-
private static JsonArray getStatusJsonArray(List<Status> statusList) {
83-
JsonArrayBuilder builder = Json.createArrayBuilder();
84-
85-
for (Status s : statusList) {
86-
builder.add(s.getValue());
87-
}
88-
89-
return builder.build();
90-
}
91-
92-
}
1+
package mx.nic.rdap.renderer.json.writer;
2+
3+
import java.util.List;
4+
5+
import javax.json.Json;
6+
import javax.json.JsonArray;
7+
import javax.json.JsonArrayBuilder;
8+
import javax.json.JsonObjectBuilder;
9+
10+
import mx.nic.rdap.core.catalog.Status;
11+
import mx.nic.rdap.core.db.RdapObject;
12+
import mx.nic.rdap.renderer.util.RendererUtil;
13+
14+
/**
15+
* Utilities for json renderer
16+
*/
17+
public class JsonUtil {
18+
19+
public static JsonArray getRdapConformance(List<String> others) {
20+
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
21+
if (others != null) {
22+
for (String s : others) {
23+
arrayBuilder.add(s);
24+
}
25+
}
26+
return arrayBuilder.build();
27+
}
28+
29+
public static JsonArray getRdapConformance(String... others) {
30+
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
31+
arrayBuilder.add("rdap_level_0");
32+
if (others != null) {
33+
for (String s : others) {
34+
arrayBuilder.add(s);
35+
}
36+
}
37+
return arrayBuilder.build();
38+
}
39+
40+
public static JsonObjectBuilder fillCommonRdapJsonObject(JsonObjectBuilder builder, RdapObject object) {
41+
42+
43+
String key = "handle";
44+
if (RendererUtil.isObjectVisible(object.getHandle()))
45+
builder.add(key, object.getHandle());
46+
47+
key = "remarks";
48+
if (RendererUtil.isObjectVisible(object.getRemarks()))
49+
builder.add(key, RemarkJsonWriter.getJsonArray(object.getRemarks()));
50+
51+
key = "links";
52+
if (RendererUtil.isObjectVisible(object.getLinks()))
53+
builder.add(key,
54+
LinkJsonWriter.getJsonArray(object.getLinks()));
55+
56+
key = "events";
57+
if (RendererUtil.isObjectVisible(object.getEvents()))
58+
builder.add(key, EventJsonWriter.getJsonArray(object.getEvents()));
59+
60+
key = "status";
61+
if (RendererUtil.isObjectVisible(object.getStatus()))
62+
builder.add(key, getStatusJsonArray(object.getStatus()));
63+
64+
key = "port43";
65+
if (RendererUtil.isObjectVisible(object.getPort43()))
66+
builder.add(key, object.getPort43());
67+
68+
key = "entities";
69+
if (RendererUtil.isObjectVisible(object.getEntities()))
70+
builder.add(key, EntityJsonWriter.getJsonArray(object.getEntities()));
71+
72+
key = "lang";
73+
if (RendererUtil.isObjectVisible(object.getLang())) {
74+
builder.add(key, object.getLang());
75+
}
76+
77+
return builder;
78+
}
79+
80+
81+
82+
private static JsonArray getStatusJsonArray(List<Status> statusList) {
83+
JsonArrayBuilder builder = Json.createArrayBuilder();
84+
85+
for (Status s : statusList) {
86+
builder.add(s.getValue());
87+
}
88+
89+
return builder.build();
90+
}
91+
92+
}

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/KeyDataJsonWriter.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/KeyDataJsonWriter.java

+58-58
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
1-
package mx.nic.rdap.renderer.json.writer;
2-
3-
import java.util.List;
4-
5-
import javax.json.Json;
6-
import javax.json.JsonArray;
7-
import javax.json.JsonArrayBuilder;
8-
import javax.json.JsonObjectBuilder;
9-
import javax.json.JsonValue;
10-
11-
import mx.nic.rdap.core.db.KeyData;
12-
import mx.nic.rdap.renderer.util.RendererUtil;
13-
14-
public class KeyDataJsonWriter {
15-
16-
public static JsonArray getJsonArray(List<KeyData> keyDataList) {
17-
JsonArrayBuilder builder = Json.createArrayBuilder();
18-
for (KeyData keyData : keyDataList) {
19-
builder.add(getJsonObject(keyData));
20-
}
21-
return builder.build();
22-
}
23-
24-
private static JsonValue getJsonObject(KeyData keyData) {
25-
JsonObjectBuilder builder = Json.createObjectBuilder();
26-
27-
String key = "flags";
28-
Integer intValue = keyData.getFlags();
29-
if (RendererUtil.isObjectVisible(intValue))
30-
builder.add(key, intValue);
31-
32-
key = "protocol";
33-
intValue = keyData.getProtocol();
34-
if (RendererUtil.isObjectVisible(intValue))
35-
builder.add(key, intValue);
36-
37-
key = "publicKey";
38-
String stringValue = keyData.getPublicKey();
39-
if (RendererUtil.isObjectVisible(stringValue))
40-
builder.add(key, stringValue);
41-
42-
key = "algorithm";
43-
intValue = keyData.getAlgorithm();
44-
if (RendererUtil.isObjectVisible(intValue))
45-
builder.add(key, intValue);
46-
47-
key = "events";
48-
if (RendererUtil.isObjectVisible(keyData.getEvents()))
49-
builder.add(key, EventJsonWriter.getJsonArray(keyData.getEvents()));
50-
51-
key = "links";
52-
if (RendererUtil.isObjectVisible(keyData.getLinks()))
53-
builder.add(key, LinkJsonWriter.getJsonArray(keyData.getLinks()));
54-
55-
return builder.build();
56-
}
57-
58-
}
1+
package mx.nic.rdap.renderer.json.writer;
2+
3+
import java.util.List;
4+
5+
import javax.json.Json;
6+
import javax.json.JsonArray;
7+
import javax.json.JsonArrayBuilder;
8+
import javax.json.JsonObjectBuilder;
9+
import javax.json.JsonValue;
10+
11+
import mx.nic.rdap.core.db.KeyData;
12+
import mx.nic.rdap.renderer.util.RendererUtil;
13+
14+
public class KeyDataJsonWriter {
15+
16+
public static JsonArray getJsonArray(List<KeyData> keyDataList) {
17+
JsonArrayBuilder builder = Json.createArrayBuilder();
18+
for (KeyData keyData : keyDataList) {
19+
builder.add(getJsonObject(keyData));
20+
}
21+
return builder.build();
22+
}
23+
24+
private static JsonValue getJsonObject(KeyData keyData) {
25+
JsonObjectBuilder builder = Json.createObjectBuilder();
26+
27+
String key = "flags";
28+
Integer intValue = keyData.getFlags();
29+
if (RendererUtil.isObjectVisible(intValue))
30+
builder.add(key, intValue);
31+
32+
key = "protocol";
33+
intValue = keyData.getProtocol();
34+
if (RendererUtil.isObjectVisible(intValue))
35+
builder.add(key, intValue);
36+
37+
key = "publicKey";
38+
String stringValue = keyData.getPublicKey();
39+
if (RendererUtil.isObjectVisible(stringValue))
40+
builder.add(key, stringValue);
41+
42+
key = "algorithm";
43+
intValue = keyData.getAlgorithm();
44+
if (RendererUtil.isObjectVisible(intValue))
45+
builder.add(key, intValue);
46+
47+
key = "events";
48+
if (RendererUtil.isObjectVisible(keyData.getEvents()))
49+
builder.add(key, EventJsonWriter.getJsonArray(keyData.getEvents()));
50+
51+
key = "links";
52+
if (RendererUtil.isObjectVisible(keyData.getLinks()))
53+
builder.add(key, LinkJsonWriter.getJsonArray(keyData.getLinks()));
54+
55+
return builder.build();
56+
}
57+
58+
}

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/LinkJsonWriter.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/LinkJsonWriter.java

+137-137
Original file line numberDiff line numberDiff line change
@@ -1,137 +1,137 @@
1-
package mx.nic.rdap.renderer.json.writer;
2-
3-
import java.util.List;
4-
5-
import javax.json.Json;
6-
import javax.json.JsonArray;
7-
import javax.json.JsonArrayBuilder;
8-
import javax.json.JsonObject;
9-
import javax.json.JsonObjectBuilder;
10-
import javax.json.JsonValue;
11-
12-
import mx.nic.rdap.core.db.Link;
13-
import mx.nic.rdap.renderer.util.RendererUtil;
14-
15-
public class LinkJsonWriter {
16-
17-
public static JsonArray getJsonArray(List<Link> links) {
18-
JsonArrayBuilder builder = Json.createArrayBuilder();
19-
20-
for (Link link : links) {
21-
builder.add(getJsonObject(link));
22-
}
23-
24-
return builder.build();
25-
}
26-
27-
private static JsonObject getJsonObject(Link link) {
28-
JsonObjectBuilder builder = Json.createObjectBuilder();
29-
30-
String key = "value";
31-
String value = link.getValue();
32-
if (RendererUtil.isObjectVisible(value))
33-
builder.add(key, value);
34-
35-
key = "rel";
36-
value = link.getRel();
37-
if (RendererUtil.isObjectVisible(value))
38-
builder.add(key, value);
39-
40-
key = "href";
41-
value = link.getHref();
42-
if (RendererUtil.isObjectVisible(value))
43-
builder.add(key, value);
44-
45-
key = "hreflang";
46-
List<String> hreflangs = link.getHreflang();
47-
if (RendererUtil.isObjectVisible(hreflangs)) {
48-
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
49-
for (String lang : hreflangs) {
50-
arrayBuilder.add(lang);
51-
}
52-
builder.add(key, arrayBuilder.build());
53-
}
54-
55-
key = "title";
56-
value = link.getTitle();
57-
if (RendererUtil.isObjectVisible(value))
58-
builder.add(key, value);
59-
60-
key = "media";
61-
value = link.getMedia();
62-
if (RendererUtil.isObjectVisible(value))
63-
builder.add(key, value);
64-
65-
key = "type";
66-
value = link.getType();
67-
if (RendererUtil.isObjectVisible(value))
68-
builder.add(key, value);
69-
70-
return builder.build();
71-
}
72-
73-
/**
74-
* There is no privacy settings for links in notices, the server will show
75-
* every data of remarks
76-
*/
77-
public static JsonArray getNoticeLinksJsonArray(List<Link> links) {
78-
JsonArrayBuilder builder = Json.createArrayBuilder();
79-
80-
for (Link link : links) {
81-
builder.add(getNoticesLinksJsonObject(link));
82-
}
83-
84-
return builder.build();
85-
}
86-
87-
/**
88-
* There is no privacy settings for links in notices, the server will show
89-
* every data of remarks
90-
*/
91-
private static JsonValue getNoticesLinksJsonObject(Link link) {
92-
JsonObjectBuilder builder = Json.createObjectBuilder();
93-
94-
String key = "value";
95-
String value = link.getValue();
96-
if (value != null && !value.isEmpty())
97-
builder.add(key, value);
98-
99-
key = "rel";
100-
value = link.getRel();
101-
if (value != null && !value.isEmpty())
102-
builder.add(key, value);
103-
104-
key = "href";
105-
value = link.getHref();
106-
if (value != null && !value.isEmpty())
107-
builder.add(key, value);
108-
109-
key = "hreflang";
110-
List<String> hreflangs = link.getHreflang();
111-
if (hreflangs != null && !hreflangs.isEmpty()) {
112-
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
113-
for (String lang : hreflangs) {
114-
arrayBuilder.add(lang);
115-
}
116-
builder.add(key, arrayBuilder.build());
117-
}
118-
119-
key = "title";
120-
value = link.getTitle();
121-
if (value != null && !value.isEmpty())
122-
builder.add(key, value);
123-
124-
key = "media";
125-
value = link.getMedia();
126-
if (value != null && !value.isEmpty())
127-
builder.add(key, value);
128-
129-
key = "type";
130-
value = link.getType();
131-
if (value != null && !value.isEmpty())
132-
builder.add(key, value);
133-
134-
return builder.build();
135-
}
136-
137-
}
1+
package mx.nic.rdap.renderer.json.writer;
2+
3+
import java.util.List;
4+
5+
import javax.json.Json;
6+
import javax.json.JsonArray;
7+
import javax.json.JsonArrayBuilder;
8+
import javax.json.JsonObject;
9+
import javax.json.JsonObjectBuilder;
10+
import javax.json.JsonValue;
11+
12+
import mx.nic.rdap.core.db.Link;
13+
import mx.nic.rdap.renderer.util.RendererUtil;
14+
15+
public class LinkJsonWriter {
16+
17+
public static JsonArray getJsonArray(List<Link> links) {
18+
JsonArrayBuilder builder = Json.createArrayBuilder();
19+
20+
for (Link link : links) {
21+
builder.add(getJsonObject(link));
22+
}
23+
24+
return builder.build();
25+
}
26+
27+
private static JsonObject getJsonObject(Link link) {
28+
JsonObjectBuilder builder = Json.createObjectBuilder();
29+
30+
String key = "value";
31+
String value = link.getValue();
32+
if (RendererUtil.isObjectVisible(value))
33+
builder.add(key, value);
34+
35+
key = "rel";
36+
value = link.getRel();
37+
if (RendererUtil.isObjectVisible(value))
38+
builder.add(key, value);
39+
40+
key = "href";
41+
value = link.getHref();
42+
if (RendererUtil.isObjectVisible(value))
43+
builder.add(key, value);
44+
45+
key = "hreflang";
46+
List<String> hreflangs = link.getHreflang();
47+
if (RendererUtil.isObjectVisible(hreflangs)) {
48+
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
49+
for (String lang : hreflangs) {
50+
arrayBuilder.add(lang);
51+
}
52+
builder.add(key, arrayBuilder.build());
53+
}
54+
55+
key = "title";
56+
value = link.getTitle();
57+
if (RendererUtil.isObjectVisible(value))
58+
builder.add(key, value);
59+
60+
key = "media";
61+
value = link.getMedia();
62+
if (RendererUtil.isObjectVisible(value))
63+
builder.add(key, value);
64+
65+
key = "type";
66+
value = link.getType();
67+
if (RendererUtil.isObjectVisible(value))
68+
builder.add(key, value);
69+
70+
return builder.build();
71+
}
72+
73+
/**
74+
* There is no privacy settings for links in notices, the server will show
75+
* every data of remarks
76+
*/
77+
public static JsonArray getNoticeLinksJsonArray(List<Link> links) {
78+
JsonArrayBuilder builder = Json.createArrayBuilder();
79+
80+
for (Link link : links) {
81+
builder.add(getNoticesLinksJsonObject(link));
82+
}
83+
84+
return builder.build();
85+
}
86+
87+
/**
88+
* There is no privacy settings for links in notices, the server will show
89+
* every data of remarks
90+
*/
91+
private static JsonValue getNoticesLinksJsonObject(Link link) {
92+
JsonObjectBuilder builder = Json.createObjectBuilder();
93+
94+
String key = "value";
95+
String value = link.getValue();
96+
if (value != null && !value.isEmpty())
97+
builder.add(key, value);
98+
99+
key = "rel";
100+
value = link.getRel();
101+
if (value != null && !value.isEmpty())
102+
builder.add(key, value);
103+
104+
key = "href";
105+
value = link.getHref();
106+
if (value != null && !value.isEmpty())
107+
builder.add(key, value);
108+
109+
key = "hreflang";
110+
List<String> hreflangs = link.getHreflang();
111+
if (hreflangs != null && !hreflangs.isEmpty()) {
112+
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
113+
for (String lang : hreflangs) {
114+
arrayBuilder.add(lang);
115+
}
116+
builder.add(key, arrayBuilder.build());
117+
}
118+
119+
key = "title";
120+
value = link.getTitle();
121+
if (value != null && !value.isEmpty())
122+
builder.add(key, value);
123+
124+
key = "media";
125+
value = link.getMedia();
126+
if (value != null && !value.isEmpty())
127+
builder.add(key, value);
128+
129+
key = "type";
130+
value = link.getType();
131+
if (value != null && !value.isEmpty())
132+
builder.add(key, value);
133+
134+
return builder.build();
135+
}
136+
137+
}

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/NameserverJsonWriter.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/NameserverJsonWriter.java

+88-88
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,88 @@
1-
package mx.nic.rdap.renderer.json.writer;
2-
3-
import java.net.InetAddress;
4-
import java.util.List;
5-
6-
import javax.json.Json;
7-
import javax.json.JsonArray;
8-
import javax.json.JsonArrayBuilder;
9-
import javax.json.JsonObject;
10-
import javax.json.JsonObjectBuilder;
11-
12-
import mx.nic.rdap.core.db.IpAddress;
13-
import mx.nic.rdap.core.db.Nameserver;
14-
import mx.nic.rdap.core.db.struct.NameserverIpAddressesStruct;
15-
import mx.nic.rdap.renderer.util.RendererUtil;
16-
17-
public class NameserverJsonWriter {
18-
19-
public static JsonArray getJsonArray(List<Nameserver> nameserver) {
20-
JsonArrayBuilder builder = Json.createArrayBuilder();
21-
22-
for (Nameserver ns : nameserver) {
23-
builder.add(getJson(ns));
24-
}
25-
26-
return builder.build();
27-
}
28-
29-
public static JsonObject getJson(Nameserver nameserver) {
30-
JsonObjectBuilder builder = Json.createObjectBuilder();
31-
32-
builder.add("objectClassName", "nameserver");
33-
JsonUtil.fillCommonRdapJsonObject(builder, nameserver);
34-
35-
String key = "ldhName";
36-
String value = nameserver.getLdhName();
37-
if (RendererUtil.isObjectVisible(value))
38-
builder.add(key, value);
39-
40-
key = "unicodeName";
41-
value = nameserver.getUnicodeName();
42-
if (RendererUtil.isObjectVisible(value))
43-
builder.add(key, value);
44-
45-
fillIpAddresses(builder, nameserver.getIpAddresses());
46-
47-
return builder.build();
48-
}
49-
50-
private static void fillIpAddresses(JsonObjectBuilder builder, NameserverIpAddressesStruct ipAdresses) {
51-
String key = "ipAddresses";
52-
if (!RendererUtil.isObjectVisible(ipAdresses))
53-
return;
54-
55-
JsonObjectBuilder addressBuilder = Json.createObjectBuilder();
56-
boolean insertIpAddresses = false;
57-
key = "v4";
58-
List<IpAddress> ipv4List = ipAdresses.getIpv4Adresses();
59-
if (RendererUtil.isObjectVisible(ipv4List)) {
60-
addressBuilder.add(key, getIpAddressJsonArray(ipv4List));
61-
insertIpAddresses = true;
62-
}
63-
64-
key = "v6";
65-
List<IpAddress> ipv6List = ipAdresses.getIpv6Adresses();
66-
if (RendererUtil.isObjectVisible(ipv6List)) {
67-
addressBuilder.add(key, getIpAddressJsonArray(ipv6List));
68-
insertIpAddresses = true;
69-
}
70-
71-
if (insertIpAddresses) {
72-
key = "ipAddresses";
73-
builder.add(key, addressBuilder.build());
74-
}
75-
}
76-
77-
private static JsonArray getIpAddressJsonArray(List<IpAddress> addresses) {
78-
JsonArrayBuilder builder = Json.createArrayBuilder();
79-
for (IpAddress address : addresses) {
80-
InetAddress inetA = address.getAddress();
81-
if (RendererUtil.isObjectVisible(inetA)) {
82-
builder.add(inetA.getHostAddress());
83-
}
84-
}
85-
return builder.build();
86-
}
87-
88-
}
1+
package mx.nic.rdap.renderer.json.writer;
2+
3+
import java.net.InetAddress;
4+
import java.util.List;
5+
6+
import javax.json.Json;
7+
import javax.json.JsonArray;
8+
import javax.json.JsonArrayBuilder;
9+
import javax.json.JsonObject;
10+
import javax.json.JsonObjectBuilder;
11+
12+
import mx.nic.rdap.core.db.IpAddress;
13+
import mx.nic.rdap.core.db.Nameserver;
14+
import mx.nic.rdap.core.db.struct.NameserverIpAddressesStruct;
15+
import mx.nic.rdap.renderer.util.RendererUtil;
16+
17+
public class NameserverJsonWriter {
18+
19+
public static JsonArray getJsonArray(List<Nameserver> nameserver) {
20+
JsonArrayBuilder builder = Json.createArrayBuilder();
21+
22+
for (Nameserver ns : nameserver) {
23+
builder.add(getJson(ns));
24+
}
25+
26+
return builder.build();
27+
}
28+
29+
public static JsonObject getJson(Nameserver nameserver) {
30+
JsonObjectBuilder builder = Json.createObjectBuilder();
31+
32+
builder.add("objectClassName", "nameserver");
33+
JsonUtil.fillCommonRdapJsonObject(builder, nameserver);
34+
35+
String key = "ldhName";
36+
String value = nameserver.getLdhName();
37+
if (RendererUtil.isObjectVisible(value))
38+
builder.add(key, value);
39+
40+
key = "unicodeName";
41+
value = nameserver.getUnicodeName();
42+
if (RendererUtil.isObjectVisible(value))
43+
builder.add(key, value);
44+
45+
fillIpAddresses(builder, nameserver.getIpAddresses());
46+
47+
return builder.build();
48+
}
49+
50+
private static void fillIpAddresses(JsonObjectBuilder builder, NameserverIpAddressesStruct ipAdresses) {
51+
String key = "ipAddresses";
52+
if (!RendererUtil.isObjectVisible(ipAdresses))
53+
return;
54+
55+
JsonObjectBuilder addressBuilder = Json.createObjectBuilder();
56+
boolean insertIpAddresses = false;
57+
key = "v4";
58+
List<IpAddress> ipv4List = ipAdresses.getIpv4Adresses();
59+
if (RendererUtil.isObjectVisible(ipv4List)) {
60+
addressBuilder.add(key, getIpAddressJsonArray(ipv4List));
61+
insertIpAddresses = true;
62+
}
63+
64+
key = "v6";
65+
List<IpAddress> ipv6List = ipAdresses.getIpv6Adresses();
66+
if (RendererUtil.isObjectVisible(ipv6List)) {
67+
addressBuilder.add(key, getIpAddressJsonArray(ipv6List));
68+
insertIpAddresses = true;
69+
}
70+
71+
if (insertIpAddresses) {
72+
key = "ipAddresses";
73+
builder.add(key, addressBuilder.build());
74+
}
75+
}
76+
77+
private static JsonArray getIpAddressJsonArray(List<IpAddress> addresses) {
78+
JsonArrayBuilder builder = Json.createArrayBuilder();
79+
for (IpAddress address : addresses) {
80+
InetAddress inetA = address.getAddress();
81+
if (RendererUtil.isObjectVisible(inetA)) {
82+
builder.add(inetA.getHostAddress());
83+
}
84+
}
85+
return builder.build();
86+
}
87+
88+
}

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/PublicIdJsonWriter.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/PublicIdJsonWriter.java

+41-41
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
package mx.nic.rdap.renderer.json.writer;
2-
3-
import java.util.List;
4-
5-
import javax.json.Json;
6-
import javax.json.JsonArray;
7-
import javax.json.JsonArrayBuilder;
8-
import javax.json.JsonObject;
9-
import javax.json.JsonObjectBuilder;
10-
11-
import mx.nic.rdap.core.db.PublicId;
12-
import mx.nic.rdap.renderer.util.RendererUtil;
13-
14-
public class PublicIdJsonWriter {
15-
16-
public static JsonArray getJsonArray(List<PublicId> publicIds) {
17-
JsonArrayBuilder builder = Json.createArrayBuilder();
18-
19-
for (PublicId publicId : publicIds) {
20-
builder.add(getJson(publicId));
21-
}
22-
23-
return builder.build();
24-
}
25-
26-
private static JsonObject getJson(PublicId publicId) {
27-
JsonObjectBuilder builder = Json.createObjectBuilder();
28-
String key = "type";
29-
if (RendererUtil.isObjectVisible(publicId.getType())) {
30-
builder.add(key, publicId.getType());
31-
}
32-
33-
key = "identifier";
34-
if (RendererUtil.isObjectVisible(publicId.getPublicId())) {
35-
builder.add(key, publicId.getPublicId());
36-
}
37-
38-
return builder.build();
39-
}
40-
41-
}
1+
package mx.nic.rdap.renderer.json.writer;
2+
3+
import java.util.List;
4+
5+
import javax.json.Json;
6+
import javax.json.JsonArray;
7+
import javax.json.JsonArrayBuilder;
8+
import javax.json.JsonObject;
9+
import javax.json.JsonObjectBuilder;
10+
11+
import mx.nic.rdap.core.db.PublicId;
12+
import mx.nic.rdap.renderer.util.RendererUtil;
13+
14+
public class PublicIdJsonWriter {
15+
16+
public static JsonArray getJsonArray(List<PublicId> publicIds) {
17+
JsonArrayBuilder builder = Json.createArrayBuilder();
18+
19+
for (PublicId publicId : publicIds) {
20+
builder.add(getJson(publicId));
21+
}
22+
23+
return builder.build();
24+
}
25+
26+
private static JsonObject getJson(PublicId publicId) {
27+
JsonObjectBuilder builder = Json.createObjectBuilder();
28+
String key = "type";
29+
if (RendererUtil.isObjectVisible(publicId.getType())) {
30+
builder.add(key, publicId.getType());
31+
}
32+
33+
key = "identifier";
34+
if (RendererUtil.isObjectVisible(publicId.getPublicId())) {
35+
builder.add(key, publicId.getPublicId());
36+
}
37+
38+
return builder.build();
39+
}
40+
41+
}

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/RemarkJsonWriter.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/RemarkJsonWriter.java

+94-94
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,94 @@
1-
package mx.nic.rdap.renderer.json.writer;
2-
3-
import java.util.List;
4-
5-
import javax.json.Json;
6-
import javax.json.JsonArray;
7-
import javax.json.JsonArrayBuilder;
8-
import javax.json.JsonObject;
9-
import javax.json.JsonObjectBuilder;
10-
11-
import mx.nic.rdap.core.db.Remark;
12-
import mx.nic.rdap.core.db.RemarkDescription;
13-
import mx.nic.rdap.renderer.util.RendererUtil;
14-
15-
public class RemarkJsonWriter {
16-
public static JsonArray getJsonArray(List<Remark> remarks) {
17-
JsonArrayBuilder builder = Json.createArrayBuilder();
18-
19-
for (Remark remark : remarks) {
20-
JsonObject jsonObject = getJsonObject(remark);
21-
builder.add(jsonObject);
22-
}
23-
24-
return builder.build();
25-
}
26-
27-
private static JsonObject getJsonObject(Remark remark) {
28-
JsonObjectBuilder builder = Json.createObjectBuilder();
29-
30-
String key = "title";
31-
String value = remark.getTitle();
32-
if (RendererUtil.isObjectVisible(value))
33-
builder.add(key, value);
34-
35-
key = "description";
36-
if (RendererUtil.isObjectVisible(remark.getDescriptions()))
37-
builder.add(key, getDescriptionsJsonArray(remark.getDescriptions()));
38-
39-
key = "type";
40-
value = remark.getType();
41-
if (RendererUtil.isObjectVisible(value))
42-
builder.add(key, value);
43-
44-
key = "links";
45-
if (RendererUtil.isObjectVisible(remark.getLinks()))
46-
builder.add(key, LinkJsonWriter.getJsonArray(remark.getLinks()));
47-
48-
key = "lang";
49-
if (RendererUtil.isObjectVisible(remark.getLanguage()))
50-
builder.add("lang", remark.getLanguage());
51-
52-
return builder.build();
53-
}
54-
55-
/**
56-
* There is no privacy settings for notices, the server will show every data
57-
* of remarks
58-
*/
59-
public static JsonObject getNoticeJsonObject(Remark remark) {
60-
JsonObjectBuilder builder = Json.createObjectBuilder();
61-
62-
String key = "title";
63-
String value = remark.getTitle();
64-
if (value != null && !value.isEmpty())
65-
builder.add(key, value);
66-
67-
key = "description";
68-
if (remark.getDescriptions() != null && !remark.getDescriptions().isEmpty())
69-
builder.add(key, getDescriptionsJsonArray(remark.getDescriptions()));
70-
71-
key = "type";
72-
value = remark.getType();
73-
if (value != null && !value.isEmpty())
74-
builder.add(key, value);
75-
76-
key = "links";
77-
if (remark.getLinks() != null && !remark.getLinks().isEmpty())
78-
builder.add(key, LinkJsonWriter.getNoticeLinksJsonArray(remark.getLinks()));
79-
80-
return builder.build();
81-
}
82-
83-
private static JsonArray getDescriptionsJsonArray(List<RemarkDescription> descriptions) {
84-
JsonArrayBuilder builder = Json.createArrayBuilder();
85-
86-
for (RemarkDescription description : descriptions) {
87-
if (RendererUtil.isObjectVisible(description) && RendererUtil.isObjectVisible(description.getDescription())) {
88-
builder.add(description.getDescription());
89-
}
90-
}
91-
92-
return builder.build();
93-
}
94-
}
1+
package mx.nic.rdap.renderer.json.writer;
2+
3+
import java.util.List;
4+
5+
import javax.json.Json;
6+
import javax.json.JsonArray;
7+
import javax.json.JsonArrayBuilder;
8+
import javax.json.JsonObject;
9+
import javax.json.JsonObjectBuilder;
10+
11+
import mx.nic.rdap.core.db.Remark;
12+
import mx.nic.rdap.core.db.RemarkDescription;
13+
import mx.nic.rdap.renderer.util.RendererUtil;
14+
15+
public class RemarkJsonWriter {
16+
public static JsonArray getJsonArray(List<Remark> remarks) {
17+
JsonArrayBuilder builder = Json.createArrayBuilder();
18+
19+
for (Remark remark : remarks) {
20+
JsonObject jsonObject = getJsonObject(remark);
21+
builder.add(jsonObject);
22+
}
23+
24+
return builder.build();
25+
}
26+
27+
private static JsonObject getJsonObject(Remark remark) {
28+
JsonObjectBuilder builder = Json.createObjectBuilder();
29+
30+
String key = "title";
31+
String value = remark.getTitle();
32+
if (RendererUtil.isObjectVisible(value))
33+
builder.add(key, value);
34+
35+
key = "description";
36+
if (RendererUtil.isObjectVisible(remark.getDescriptions()))
37+
builder.add(key, getDescriptionsJsonArray(remark.getDescriptions()));
38+
39+
key = "type";
40+
value = remark.getType();
41+
if (RendererUtil.isObjectVisible(value))
42+
builder.add(key, value);
43+
44+
key = "links";
45+
if (RendererUtil.isObjectVisible(remark.getLinks()))
46+
builder.add(key, LinkJsonWriter.getJsonArray(remark.getLinks()));
47+
48+
key = "lang";
49+
if (RendererUtil.isObjectVisible(remark.getLanguage()))
50+
builder.add("lang", remark.getLanguage());
51+
52+
return builder.build();
53+
}
54+
55+
/**
56+
* There is no privacy settings for notices, the server will show every data
57+
* of remarks
58+
*/
59+
public static JsonObject getNoticeJsonObject(Remark remark) {
60+
JsonObjectBuilder builder = Json.createObjectBuilder();
61+
62+
String key = "title";
63+
String value = remark.getTitle();
64+
if (value != null && !value.isEmpty())
65+
builder.add(key, value);
66+
67+
key = "description";
68+
if (remark.getDescriptions() != null && !remark.getDescriptions().isEmpty())
69+
builder.add(key, getDescriptionsJsonArray(remark.getDescriptions()));
70+
71+
key = "type";
72+
value = remark.getType();
73+
if (value != null && !value.isEmpty())
74+
builder.add(key, value);
75+
76+
key = "links";
77+
if (remark.getLinks() != null && !remark.getLinks().isEmpty())
78+
builder.add(key, LinkJsonWriter.getNoticeLinksJsonArray(remark.getLinks()));
79+
80+
return builder.build();
81+
}
82+
83+
private static JsonArray getDescriptionsJsonArray(List<RemarkDescription> descriptions) {
84+
JsonArrayBuilder builder = Json.createArrayBuilder();
85+
86+
for (RemarkDescription description : descriptions) {
87+
if (RendererUtil.isObjectVisible(description) && RendererUtil.isObjectVisible(description.getDescription())) {
88+
builder.add(description.getDescription());
89+
}
90+
}
91+
92+
return builder.build();
93+
}
94+
}

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/SecureDNSJsonWriter.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/SecureDNSJsonWriter.java

+37-37
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
package mx.nic.rdap.renderer.json.writer;
2-
3-
import javax.json.Json;
4-
import javax.json.JsonObject;
5-
import javax.json.JsonObjectBuilder;
6-
7-
import mx.nic.rdap.core.db.SecureDNS;
8-
import mx.nic.rdap.renderer.util.RendererUtil;
9-
10-
public class SecureDNSJsonWriter {
11-
12-
public static JsonObject getJsonObject(SecureDNS secureDNS) {
13-
JsonObjectBuilder builder = Json.createObjectBuilder();
14-
String key = "zoneSigned";
15-
if (RendererUtil.isObjectVisible(secureDNS.getZoneSigned()))
16-
builder.add(key, secureDNS.getZoneSigned());
17-
18-
key = "delegationSigned";
19-
if (RendererUtil.isObjectVisible(secureDNS.getDelegationSigned()))
20-
builder.add(key, secureDNS.getDelegationSigned());
21-
22-
key = "maxSigLife";
23-
if (RendererUtil.isObjectVisible(secureDNS.getMaxSigLife()))
24-
builder.add(key, secureDNS.getMaxSigLife());
25-
26-
key = "dsData";
27-
if (RendererUtil.isObjectVisible(secureDNS.getDsData()))
28-
builder.add(key, DsDataJsonWriter.getJsonArray(secureDNS.getDsData()));
29-
30-
key = "keyData";
31-
if (RendererUtil.isObjectVisible(secureDNS.getKeyData()))
32-
builder.add(key, KeyDataJsonWriter.getJsonArray(secureDNS.getKeyData()));
33-
34-
return builder.build();
35-
}
36-
37-
}
1+
package mx.nic.rdap.renderer.json.writer;
2+
3+
import javax.json.Json;
4+
import javax.json.JsonObject;
5+
import javax.json.JsonObjectBuilder;
6+
7+
import mx.nic.rdap.core.db.SecureDNS;
8+
import mx.nic.rdap.renderer.util.RendererUtil;
9+
10+
public class SecureDNSJsonWriter {
11+
12+
public static JsonObject getJsonObject(SecureDNS secureDNS) {
13+
JsonObjectBuilder builder = Json.createObjectBuilder();
14+
String key = "zoneSigned";
15+
if (RendererUtil.isObjectVisible(secureDNS.getZoneSigned()))
16+
builder.add(key, secureDNS.getZoneSigned());
17+
18+
key = "delegationSigned";
19+
if (RendererUtil.isObjectVisible(secureDNS.getDelegationSigned()))
20+
builder.add(key, secureDNS.getDelegationSigned());
21+
22+
key = "maxSigLife";
23+
if (RendererUtil.isObjectVisible(secureDNS.getMaxSigLife()))
24+
builder.add(key, secureDNS.getMaxSigLife());
25+
26+
key = "dsData";
27+
if (RendererUtil.isObjectVisible(secureDNS.getDsData()))
28+
builder.add(key, DsDataJsonWriter.getJsonArray(secureDNS.getDsData()));
29+
30+
key = "keyData";
31+
if (RendererUtil.isObjectVisible(secureDNS.getKeyData()))
32+
builder.add(key, KeyDataJsonWriter.getJsonArray(secureDNS.getKeyData()));
33+
34+
return builder.build();
35+
}
36+
37+
}

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/VCardJsonWriter.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/VCardJsonWriter.java

+203-203
Large diffs are not rendered by default.

‎rdap-json-renderer/src/main/java/mx/nic/rdap/renderer/json/writer/VariantJsonWriter.java ‎src/main/java/mx/nic/rdap/renderer/json/writer/VariantJsonWriter.java

+72-72
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
1-
package mx.nic.rdap.renderer.json.writer;
2-
3-
import java.util.List;
4-
5-
import javax.json.Json;
6-
import javax.json.JsonArray;
7-
import javax.json.JsonArrayBuilder;
8-
import javax.json.JsonObject;
9-
import javax.json.JsonObjectBuilder;
10-
11-
import mx.nic.rdap.core.catalog.VariantRelation;
12-
import mx.nic.rdap.core.db.Variant;
13-
import mx.nic.rdap.core.db.VariantName;
14-
import mx.nic.rdap.renderer.util.RendererUtil;
15-
16-
public class VariantJsonWriter {
17-
public static JsonArray getJsonArray(List<Variant> variants) {
18-
JsonArrayBuilder builder = Json.createArrayBuilder();
19-
20-
for (Variant variant : variants) {
21-
builder.add(getJsonObject(variant));
22-
}
23-
24-
return builder.build();
25-
}
26-
27-
private static JsonObject getJsonObject(Variant variant) {
28-
JsonObjectBuilder builder = Json.createObjectBuilder();
29-
30-
String key = "relation";
31-
if (RendererUtil.isObjectVisible(variant.getRelations())) {
32-
builder.add(key, getDomainRelationsJsonArray(variant.getRelations()));
33-
}
34-
35-
key = "idnTable";
36-
String value = variant.getIdnTable();
37-
if (RendererUtil.isObjectVisible(value))
38-
builder.add(key, value);
39-
40-
key = "variantNames";
41-
if (RendererUtil.isObjectVisible(variant.getVariantNames()))
42-
builder.add(key, getVariantNamesJsonArray(variant.getVariantNames()));
43-
44-
return builder.build();
45-
}
46-
47-
private static JsonArray getDomainRelationsJsonArray(List<VariantRelation> relations) {
48-
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
49-
for (VariantRelation relation : relations) {
50-
arrayBuilder.add(relation.getValue());
51-
}
52-
return arrayBuilder.build();
53-
}
54-
55-
private static JsonArray getVariantNamesJsonArray(List<VariantName> variantNames) {
56-
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
57-
58-
for (VariantName variantName : variantNames) {
59-
JsonObjectBuilder builder = Json.createObjectBuilder();
60-
if (RendererUtil.isObjectVisible(variantName.getLdhName())) {
61-
builder.add("ldhName", variantName.getLdhName());
62-
}
63-
if (RendererUtil.isObjectVisible(variantName.getUnicodeName())) {
64-
builder.add("unicodeName", variantName.getUnicodeName());
65-
}
66-
arrayBuilder.add(builder);
67-
}
68-
69-
return arrayBuilder.build();
70-
}
71-
72-
}
1+
package mx.nic.rdap.renderer.json.writer;
2+
3+
import java.util.List;
4+
5+
import javax.json.Json;
6+
import javax.json.JsonArray;
7+
import javax.json.JsonArrayBuilder;
8+
import javax.json.JsonObject;
9+
import javax.json.JsonObjectBuilder;
10+
11+
import mx.nic.rdap.core.catalog.VariantRelation;
12+
import mx.nic.rdap.core.db.Variant;
13+
import mx.nic.rdap.core.db.VariantName;
14+
import mx.nic.rdap.renderer.util.RendererUtil;
15+
16+
public class VariantJsonWriter {
17+
public static JsonArray getJsonArray(List<Variant> variants) {
18+
JsonArrayBuilder builder = Json.createArrayBuilder();
19+
20+
for (Variant variant : variants) {
21+
builder.add(getJsonObject(variant));
22+
}
23+
24+
return builder.build();
25+
}
26+
27+
private static JsonObject getJsonObject(Variant variant) {
28+
JsonObjectBuilder builder = Json.createObjectBuilder();
29+
30+
String key = "relation";
31+
if (RendererUtil.isObjectVisible(variant.getRelations())) {
32+
builder.add(key, getDomainRelationsJsonArray(variant.getRelations()));
33+
}
34+
35+
key = "idnTable";
36+
String value = variant.getIdnTable();
37+
if (RendererUtil.isObjectVisible(value))
38+
builder.add(key, value);
39+
40+
key = "variantNames";
41+
if (RendererUtil.isObjectVisible(variant.getVariantNames()))
42+
builder.add(key, getVariantNamesJsonArray(variant.getVariantNames()));
43+
44+
return builder.build();
45+
}
46+
47+
private static JsonArray getDomainRelationsJsonArray(List<VariantRelation> relations) {
48+
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
49+
for (VariantRelation relation : relations) {
50+
arrayBuilder.add(relation.getValue());
51+
}
52+
return arrayBuilder.build();
53+
}
54+
55+
private static JsonArray getVariantNamesJsonArray(List<VariantName> variantNames) {
56+
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
57+
58+
for (VariantName variantName : variantNames) {
59+
JsonObjectBuilder builder = Json.createObjectBuilder();
60+
if (RendererUtil.isObjectVisible(variantName.getLdhName())) {
61+
builder.add("ldhName", variantName.getLdhName());
62+
}
63+
if (RendererUtil.isObjectVisible(variantName.getUnicodeName())) {
64+
builder.add("unicodeName", variantName.getUnicodeName());
65+
}
66+
arrayBuilder.add(builder);
67+
}
68+
69+
return arrayBuilder.build();
70+
}
71+
72+
}

0 commit comments

Comments
 (0)
Please sign in to comment.