afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

corefx - removed jackson annotations from data fields as there is no longer a need to deal with them in json form

Browse source
This commit is contained in:
Blake J. Harnden 2019-06-14 14:17:41 -07:00
parent d1d6c401f0
commit 778021c553
7 changed files with 0 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
corefx/src/main/java/com/core/data/CoreEvent.java
View file

@ -1,6 +1,5 @@
package com.core.data; package com.core.data;
import com.fasterxml.jackson.annotation.JsonSetter;
import lombok.Data; import lombok.Data;
@Data @Data
@ -11,9 +10,4 @@ public class CoreEvent {
private Double time; private Double time;
private EventType eventType; private EventType eventType;
private String data; private String data;
@JsonSetter("event_type")
public void setEventType(int value) {
eventType = EventType.get(value);
}
} }

22
corefx/src/main/java/com/core/data/CoreLink.java
View file

@ -1,7 +1,5 @@
package com.core.data; package com.core.data;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -12,36 +10,16 @@ import lombok.NoArgsConstructor;
public class CoreLink { public class CoreLink {
@EqualsAndHashCode.Include @EqualsAndHashCode.Include
private Integer id; private Integer id;
@JsonIgnore
private Float weight = 1.0f; private Float weight = 1.0f;
@JsonIgnore
private boolean loaded = true; private boolean loaded = true;
@JsonIgnore
private double throughput; private double throughput;
@JsonIgnore
private boolean visible = true; private boolean visible = true;
@JsonProperty("message_type")
private Integer messageType; private Integer messageType;
private Integer type = 1; private Integer type = 1;
@JsonProperty("node_one")
private Integer nodeOne; private Integer nodeOne;
@JsonProperty("node_two")
private Integer nodeTwo; private Integer nodeTwo;
@JsonProperty("interface_one")
private CoreInterface interfaceOne; private CoreInterface interfaceOne;
@JsonProperty("interface_two")
private CoreInterface interfaceTwo; private CoreInterface interfaceTwo;
private CoreLinkOptions options = new CoreLinkOptions(); private CoreLinkOptions options = new CoreLinkOptions();
public CoreLink(Integer id) { public CoreLink(Integer id) {

6
corefx/src/main/java/com/core/data/CoreNode.java
View file

@ -2,7 +2,6 @@ package com.core.data;
import com.core.graph.RadioIcon; import com.core.graph.RadioIcon;
import com.core.utils.IconUtils; import com.core.utils.IconUtils;
import com.fasterxml.jackson.annotation.JsonIgnore;
import edu.uci.ics.jung.visualization.LayeredIcon; import edu.uci.ics.jung.visualization.LayeredIcon;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -27,15 +26,10 @@ public class CoreNode {
private Set<String> services = new HashSet<>(); private Set<String> services = new HashSet<>();
private String emane; private String emane;
private String url; private String url;
@JsonIgnore
private NodeType nodeType; private NodeType nodeType;
@JsonIgnore
private String icon; private String icon;
@JsonIgnore
private boolean loaded = true; private boolean loaded = true;
@JsonIgnore
private LayeredIcon graphIcon; private LayeredIcon graphIcon;
@JsonIgnore
private RadioIcon radioIcon = new RadioIcon(); private RadioIcon radioIcon = new RadioIcon();
public CoreNode(Integer id) { public CoreNode(Integer id) {

3
corefx/src/main/java/com/core/data/CoreService.java
View file

@ -1,6 +1,5 @@
package com.core.data; package com.core.data;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
@ -14,9 +13,7 @@ public class CoreService {
private List<String> configs = new ArrayList<>(); private List<String> configs = new ArrayList<>();
private List<String> startup = new ArrayList<>(); private List<String> startup = new ArrayList<>();
private List<String> validate = new ArrayList<>(); private List<String> validate = new ArrayList<>();
@JsonProperty("validation_mode")
private String validationMode; private String validationMode;
@JsonProperty("validation_timer")
private String validationTimer; private String validationTimer;
private List<String> shutdown = new ArrayList<>(); private List<String> shutdown = new ArrayList<>();
private String meta; private String meta;

2
corefx/src/main/java/com/core/data/Hook.java
View file

@ -1,13 +1,11 @@
package com.core.data; package com.core.data;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
@Data @Data
public class Hook { public class Hook {
private String file; private String file;
private Integer state; private Integer state;
@JsonIgnore
private String stateDisplay; private String stateDisplay;
private String data; private String data;
} }

2
corefx/src/main/java/com/core/data/InterfaceThroughput.java
View file

@ -1,12 +1,10 @@
package com.core.data; package com.core.data;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
@Data @Data
public class InterfaceThroughput { public class InterfaceThroughput {
private int node; private int node;
@JsonProperty("interface")
private int nodeInterface; private int nodeInterface;
private double throughput; private double throughput;
} }

7
corefx/src/main/java/com/core/data/MobilityConfig.java
View file

@ -1,7 +1,5 @@
package com.core.data; package com.core.data;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.io.File; import java.io.File;
@ -9,17 +7,12 @@ import java.io.File;
@Data @Data
public class MobilityConfig { public class MobilityConfig {
private String file; private String file;
@JsonIgnore
private File scriptFile; private File scriptFile;
@JsonProperty("refresh_ms")
private Integer refresh; private Integer refresh;
private String loop; private String loop;
private String autostart; private String autostart;
private String map; private String map;
@JsonProperty("script_start")
private String startScript; private String startScript;
@JsonProperty("script_pause")
private String pauseScript; private String pauseScript;
@JsonProperty("script_stop")
private String stopScript; private String stopScript;
} }