Skip to content

Change to lower camel casing for the json values, as change of framew… #16

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
Bohlski merged 2 commits into from
Oct 8, 2021
Merged

Change to lower camel casing for the json values, as change of framew… #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2579ee3
Change to lower camel casing for the json values, as change of framew…
kingudk Sep 28, 2021
3779f3a
Change the annotated name to avoid future conflict on upper or lower …
kingudk Sep 28, 2021
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
10 changes: 5 additions & 5 deletions bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public WebAlarm(Alarm alarm) {

}

@XmlElement(name = "OrigDateTime")
@XmlElement(name = "origDateTime")
public String getOrigDateTime() {
return origDateTime;
}
Expand All @@ -60,7 +60,7 @@ public void setOrigDateTime(String origDateTime) {
this.origDateTime = origDateTime;
}

@XmlElement(name = "AlarmCode")
@XmlElement(name = "alarmCode")
public AlarmCode getAlarmCode() {
return alarmCode;
}
Expand All @@ -69,7 +69,7 @@ public void setAlarmCode(AlarmCode alarmCode) {
this.alarmCode = alarmCode;
}

@XmlElement(name = "AlarmRaiser")
@XmlElement(name = "alarmRaiser")
public String getAlarmRaiser() {
return alarmRaiser;
}
Expand All @@ -78,7 +78,7 @@ public void setAlarmRaiser(String alarmRaiser) {
this.alarmRaiser = alarmRaiser;
}

@XmlElement(name = "AlarmText")
@XmlElement(name = "alarmText")
public String getAlarmText() {
return alarmText;
}
Expand All @@ -87,7 +87,7 @@ public void setAlarmText(String alarmText) {
this.alarmText = alarmText;
}

@XmlElement(name = "CollectionID")
@XmlElement(name = "collectionID")
public String getCollectionID() {
return collectionID;
}
Expand Down
10 changes: 5 additions & 5 deletions bitrepository-webclient/src/main/webapp/alarm-service.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,11 @@
var htmlTableBody = "";
if(j != null) {
for (var i = 0; i < j.length; i++) {
htmlTableBody += "<tr><td>" + j[i].OrigDateTime +
"</td><td>" + j[i].AlarmRaiser +
"</td><td>" + nameMapper.getName(j[i].CollectionID) +
"</td> <td>" + j[i].AlarmCode +
"</td> <td>" + nl2br(j[i].AlarmText) +
htmlTableBody += "<tr><td>" + j[i].origDateTime +
"</td><td>" + j[i].alarmRaiser +
"</td><td>" + nameMapper.getName(j[i].collectionID) +
"</td> <td>" + j[i].alarmCode +
"</td> <td>" + nl2br(j[i].alarmText) +
"</td></tr>";
}
}
Expand Down