Skip to content

issue#38 : add version to master vision card model #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 15, 2020
Merged

issue#38 : add version to master vision card model #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/main/java/com/smatechnologies/opcon/restapiclient/model/MasterVisionCard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public abstract class MasterVisionCard {
public static final String PROPERTY_QOS_CRITICAL_THRESHOLD = "qosCriticalThreshold";
public static final String PROPERTY_SLA_TOLERABLE_THRESHOLD = "slaTolerableThreshold";
public static final String PROPERTY_SLA_CRITICAL_THRESHOLD = "slaCriticalThreshold";
public static final String PROPERTY_VERSION = "version";

protected static final String PROPERTY_PARENT_MASTER_VISION_CARD = "parentMasterVisionCard";

Expand All @@ -44,6 +45,7 @@ public abstract class MasterVisionCard {
private Integer qosCriticalThreshold;
private Integer slaTolerableThreshold;
private Integer slaCriticalThreshold;
private Integer version;

public Integer getId() {
return id;
Expand Down Expand Up @@ -133,6 +135,14 @@ public void setSlaCriticalThreshold(Integer slaCriticalThreshold) {
this.slaCriticalThreshold = slaCriticalThreshold;
}

public Integer getVersion() {
return version;
}

public void setVersion(Integer version) {
this.version = version;
}

@JsonIgnore
public abstract Type getType();

Expand All @@ -153,12 +163,13 @@ public boolean equals(Object o) {
Objects.equals(qosTolerableThreshold, that.qosTolerableThreshold) &&
Objects.equals(qosCriticalThreshold, that.qosCriticalThreshold) &&
Objects.equals(slaTolerableThreshold, that.slaTolerableThreshold) &&
Objects.equals(slaCriticalThreshold, that.slaCriticalThreshold);
Objects.equals(slaCriticalThreshold, that.slaCriticalThreshold)&&
Objects.equals(version, that.version);
}

@Override
public int hashCode() {
return Objects.hash(id, trackId, name, description, offset, associatedFrequencies, associatedRoles, qosTolerableThreshold, qosCriticalThreshold, slaTolerableThreshold, slaCriticalThreshold);
return Objects.hash(id, trackId, name, description, offset, associatedFrequencies, associatedRoles, qosTolerableThreshold, qosCriticalThreshold, slaTolerableThreshold, slaCriticalThreshold, version);
}

public enum Type {
Expand Down