From 98d4641b4c5d02dc79e59b05911b4f4e0c2d543a Mon Sep 17 00:00:00 2001 From: Piotr Olaszewski Date: Sun, 9 Oct 2022 18:26:28 +0200 Subject: [PATCH 1/2] Add missing fields for call parking events --- .editorconfig | 2 +- .../manager/event/AbstractParkedCallEvent.java | 9 +++++++++ .../manager/event/AbstractUnParkedEvent.java | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index f02d2801a..974f98cf2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,5 @@ [*.{java,html}] charset = utf-8 -indent_style = tab +indent_style = space indent_size = 4 trim_trailing_whitespace = true diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java index 2460aadc3..440cc94f8 100644 --- a/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java +++ b/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java @@ -42,6 +42,7 @@ public abstract class AbstractParkedCallEvent extends ManagerEvent { private String parkeeExten; private Integer parkeePriority; private String parkeeUniqueid; + private String parkeeLinkedid; // Previously: From private String parkerDialString; private String parkingLot; @@ -231,6 +232,14 @@ public void setParkeeUniqueid(String parkeeUniqueid) { this.parkeeUniqueid = parkeeUniqueid; } + public String getParkeeLinkedid() { + return parkeeLinkedid; + } + + public void setParkeeLinkedid(String parkeeLinkedid) { + this.parkeeLinkedid = parkeeLinkedid; + } + public String getParkerDialString() { return parkerDialString; } diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractUnParkedEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractUnParkedEvent.java index 61cb00f85..73097dd9d 100644 --- a/src/main/java/org/asteriskjava/manager/event/AbstractUnParkedEvent.java +++ b/src/main/java/org/asteriskjava/manager/event/AbstractUnParkedEvent.java @@ -37,6 +37,8 @@ public class AbstractUnParkedEvent extends AbstractParkedCallEvent { private String parkerExten; private String parkerPriority; private String parkerUniqueid; + private String parkerLinkedid; + private String parkerLanguage; /** * @param source @@ -140,4 +142,20 @@ public String getParkerUniqueid() { public void setParkerUniqueid(String parkerUniqueid) { this.parkerUniqueid = parkerUniqueid; } + + public String getParkerLinkedid() { + return parkerLinkedid; + } + + public void setParkerLinkedid(String parkerLinkedid) { + this.parkerLinkedid = parkerLinkedid; + } + + public String getParkerLanguage() { + return parkerLanguage; + } + + public void setParkerLanguage(String parkerLanguage) { + this.parkerLanguage = parkerLanguage; + } } From 78758492a671fb15a17e18ab9ce256947ea6fe93 Mon Sep 17 00:00:00 2001 From: Piotr Olaszewski Date: Sun, 9 Oct 2022 18:27:14 +0200 Subject: [PATCH 2/2] Remove duplicated parkingLot methods --- .../manager/event/AbstractParkedCallEvent.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java index 440cc94f8..373eae815 100644 --- a/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java +++ b/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java @@ -248,14 +248,6 @@ public void setParkerDialString(String parkerDialString) { this.parkerDialString = parkerDialString; } - public String getParkinglot() { - return parkingLot; - } - - public void setParkinglot(String parkinglot) { - this.parkingLot = parkinglot; - } - public String getParkingSpace() { return parkingSpace; }