From 778021c5531ab9f3aa89981038373610d51e4a82 Mon Sep 17 00:00:00 2001 From: "Blake J. Harnden" Date: Fri, 14 Jun 2019 14:17:41 -0700 Subject: [PATCH] corefx - removed jackson annotations from data fields as there is no longer a need to deal with them in json form --- .../main/java/com/core/data/CoreEvent.java | 6 ----- .../src/main/java/com/core/data/CoreLink.java | 22 ------------------- .../src/main/java/com/core/data/CoreNode.java | 6 ----- .../main/java/com/core/data/CoreService.java | 3 --- corefx/src/main/java/com/core/data/Hook.java | 2 -- .../com/core/data/InterfaceThroughput.java | 2 -- .../java/com/core/data/MobilityConfig.java | 7 ------ 7 files changed, 48 deletions(-) diff --git a/corefx/src/main/java/com/core/data/CoreEvent.java b/corefx/src/main/java/com/core/data/CoreEvent.java index 9ac8ed03..718097d8 100644 --- a/corefx/src/main/java/com/core/data/CoreEvent.java +++ b/corefx/src/main/java/com/core/data/CoreEvent.java @@ -1,6 +1,5 @@ package com.core.data; -import com.fasterxml.jackson.annotation.JsonSetter; import lombok.Data; @Data @@ -11,9 +10,4 @@ public class CoreEvent { private Double time; private EventType eventType; private String data; - - @JsonSetter("event_type") - public void setEventType(int value) { - eventType = EventType.get(value); - } } diff --git a/corefx/src/main/java/com/core/data/CoreLink.java b/corefx/src/main/java/com/core/data/CoreLink.java index f3d4a215..88c6ff30 100644 --- a/corefx/src/main/java/com/core/data/CoreLink.java +++ b/corefx/src/main/java/com/core/data/CoreLink.java @@ -1,7 +1,5 @@ package com.core.data; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -12,36 +10,16 @@ import lombok.NoArgsConstructor; public class CoreLink { @EqualsAndHashCode.Include private Integer id; - - @JsonIgnore private Float weight = 1.0f; - - @JsonIgnore private boolean loaded = true; - - @JsonIgnore private double throughput; - - @JsonIgnore private boolean visible = true; - - @JsonProperty("message_type") private Integer messageType; - private Integer type = 1; - - @JsonProperty("node_one") private Integer nodeOne; - - @JsonProperty("node_two") private Integer nodeTwo; - - @JsonProperty("interface_one") private CoreInterface interfaceOne; - - @JsonProperty("interface_two") private CoreInterface interfaceTwo; - private CoreLinkOptions options = new CoreLinkOptions(); public CoreLink(Integer id) { diff --git a/corefx/src/main/java/com/core/data/CoreNode.java b/corefx/src/main/java/com/core/data/CoreNode.java index f441bd69..ab5240a8 100644 --- a/corefx/src/main/java/com/core/data/CoreNode.java +++ b/corefx/src/main/java/com/core/data/CoreNode.java @@ -2,7 +2,6 @@ package com.core.data; import com.core.graph.RadioIcon; import com.core.utils.IconUtils; -import com.fasterxml.jackson.annotation.JsonIgnore; import edu.uci.ics.jung.visualization.LayeredIcon; import lombok.Data; import lombok.EqualsAndHashCode; @@ -27,15 +26,10 @@ public class CoreNode { private Set services = new HashSet<>(); private String emane; private String url; - @JsonIgnore private NodeType nodeType; - @JsonIgnore private String icon; - @JsonIgnore private boolean loaded = true; - @JsonIgnore private LayeredIcon graphIcon; - @JsonIgnore private RadioIcon radioIcon = new RadioIcon(); public CoreNode(Integer id) { diff --git a/corefx/src/main/java/com/core/data/CoreService.java b/corefx/src/main/java/com/core/data/CoreService.java index ed9dd230..c33aebed 100644 --- a/corefx/src/main/java/com/core/data/CoreService.java +++ b/corefx/src/main/java/com/core/data/CoreService.java @@ -1,6 +1,5 @@ package com.core.data; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import java.util.ArrayList; @@ -14,9 +13,7 @@ public class CoreService { private List configs = new ArrayList<>(); private List startup = new ArrayList<>(); private List validate = new ArrayList<>(); - @JsonProperty("validation_mode") private String validationMode; - @JsonProperty("validation_timer") private String validationTimer; private List shutdown = new ArrayList<>(); private String meta; diff --git a/corefx/src/main/java/com/core/data/Hook.java b/corefx/src/main/java/com/core/data/Hook.java index 35b1a934..652976b0 100644 --- a/corefx/src/main/java/com/core/data/Hook.java +++ b/corefx/src/main/java/com/core/data/Hook.java @@ -1,13 +1,11 @@ package com.core.data; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; @Data public class Hook { private String file; private Integer state; - @JsonIgnore private String stateDisplay; private String data; } diff --git a/corefx/src/main/java/com/core/data/InterfaceThroughput.java b/corefx/src/main/java/com/core/data/InterfaceThroughput.java index 1c6303e0..8df86501 100644 --- a/corefx/src/main/java/com/core/data/InterfaceThroughput.java +++ b/corefx/src/main/java/com/core/data/InterfaceThroughput.java @@ -1,12 +1,10 @@ package com.core.data; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; @Data public class InterfaceThroughput { private int node; - @JsonProperty("interface") private int nodeInterface; private double throughput; } diff --git a/corefx/src/main/java/com/core/data/MobilityConfig.java b/corefx/src/main/java/com/core/data/MobilityConfig.java index 67b5d769..f16de6ff 100644 --- a/corefx/src/main/java/com/core/data/MobilityConfig.java +++ b/corefx/src/main/java/com/core/data/MobilityConfig.java @@ -1,7 +1,5 @@ package com.core.data; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import java.io.File; @@ -9,17 +7,12 @@ import java.io.File; @Data public class MobilityConfig { private String file; - @JsonIgnore private File scriptFile; - @JsonProperty("refresh_ms") private Integer refresh; private String loop; private String autostart; private String map; - @JsonProperty("script_start") private String startScript; - @JsonProperty("script_pause") private String pauseScript; - @JsonProperty("script_stop") private String stopScript; }