Thanks to visit codestin.com
Credit goes to github.com

Skip to content

add dynamic CDR properties #507

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
May 26, 2023
Merged

add dynamic CDR properties #507

Show file tree
Hide file tree
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
16 changes: 16 additions & 0 deletions src/main/java/org/asteriskjava/manager/event/CdrEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import org.asteriskjava.util.DateUtil;

import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.TimeZone;

/**
Expand Down Expand Up @@ -66,12 +68,14 @@ public class CdrEvent extends ManagerEvent {
private String uniqueId;
private String userField;
private String recordfile;
private Map<String,String> dynamicProperties;

/**
* @param source
*/
public CdrEvent(Object source) {
super(source);
dynamicProperties = new HashMap<>();
}

/**
Expand Down Expand Up @@ -521,4 +525,16 @@ public String getRecordfile() {
public void setRecordfile(String recordfile) {
this.recordfile = recordfile;
}

public Map<String, String> getDynamicProperties() {
return dynamicProperties;
}

public void setDynamicProperties(Map<String, String> dynamicProperties) {
this.dynamicProperties = dynamicProperties;
}

public void addDynamicProperties(String key, String value) {
this.dynamicProperties.put(key,value);
}
}
24 changes: 19 additions & 5 deletions src/main/java/org/asteriskjava/manager/util/EventAttributesHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package org.asteriskjava.manager.util;

import org.asteriskjava.manager.event.CdrEvent;
import org.asteriskjava.manager.event.UserEvent;
import org.asteriskjava.manager.response.ManagerResponse;
import org.asteriskjava.util.AstUtil;
Expand Down Expand Up @@ -81,12 +82,25 @@ public static void setAttributes(Object target, Map<String, Object> attributes,
// it seems silly to warn if it's a user event -- maybe it was
// intentional
if (setter == null && !(target instanceof UserEvent) && !target.getClass().equals(ManagerResponse.class)) {
logger.warn("Unable to set property '" + entry.getKey() + "' to '" + entry.getValue() + "' on "
+ target.getClass().getName()
+ ": no setter. Please report at https://github.com/asterisk-java/asterisk-java/issues");

for (Map.Entry<String, Object> entry2 : attributes.entrySet()) {
logger.debug("Key: " + entry2.getKey() + " Value: " + entry2.getValue());
//CDR has dynamic properties
if (target instanceof CdrEvent) {
try {
Method addproperty= CdrEvent.class.getMethod("addDynamicProperties", String.class, String.class);
addproperty.invoke(target, entry.getKey(), entry.getValue().toString());
} catch (Exception e) {
logger.error("Unable to set Dynamic CDR Property '" + entry.getKey() + "' to '" + entry.getValue(), e);
continue;
}

} else {
logger.warn("Unable to set property '" + entry.getKey() + "' to '" + entry.getValue() + "' on "
+ target.getClass().getName()
+ ": no setter. Please report at https://github.com/asterisk-java/asterisk-java/issues");

for (Map.Entry<String, Object> entry2 : attributes.entrySet()) {
logger.debug("Key: " + entry2.getKey() + " Value: " + entry2.getValue());
}
}
}

Expand Down