";
-
- Object withParameter(Object value);
-
- default Object withoutParameter() {
- return withParameter(WITHOUT_PARAMETER_MARKER);
- }
-
- static MethodInvoker invokeOn(Object object) {
- return method -> method(method, object);
- }
-
- @FunctionalInterface
- interface MethodInvoker {
- Invoker method(Method method);
-
- static Invoker method(Method method, Object object) {
- return value -> {
- try {
- if (value == WITHOUT_PARAMETER_MARKER) {
- return method.invoke(object);
- }
- return method.invoke(object, value);
- } catch (IllegalAccessException | InvocationTargetException e) {
- throw new RuntimeException(e);
- }
- };
- }
- }
-}
diff --git a/asterisk-java-core/src/main/java/org/asteriskjava/core/databind/utils/ReflectionUtils.java b/asterisk-java-core/src/main/java/org/asteriskjava/core/databind/utils/ReflectionUtils.java
deleted file mode 100644
index 3bfdcf693..000000000
--- a/asterisk-java-core/src/main/java/org/asteriskjava/core/databind/utils/ReflectionUtils.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2004-2023 Asterisk Java contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.asteriskjava.core.databind.utils;
-
-import java.lang.reflect.Method;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import static java.lang.reflect.Modifier.*;
-
-/**
- * Convenient class to deal with getters and setters from mapped classes.
- *
- * @author Stefan Reuter
- * @author Robert Sutton
- * @author Piotr Olaszewski
- * @since 1.0.0
- */
-public final class ReflectionUtils {
- private ReflectionUtils() {
- }
-
- /**
- * Returns a {@link Map} of getter methods of the given class.
- *
- * The key of the map contains the name of the attribute that can be accessed by the getter, the value being the
- * getter itself (an instance of Method). A method is considered a getter if its name starts with 'get' or 'is'.
- * It is declared public and takes no arguments.
- *
- * @param clazz the class to return the getters for
- * @return a Map of attributes and their accessor methods (getters)
- */
- public static Map getGetters(Class clazz) {
- Map accessors = new LinkedHashMap<>();
-
- Method[] methods = clazz.getMethods();
- for (Method method : methods) {
- String methodName = method.getName();
- if (method.getParameterCount() > 0 ||
- method.getReturnType() == Void.TYPE ||
- !isPublic(method.getModifiers()) ||
- isNative(method.getModifiers()) ||
- isAbstract(method.getModifiers()) ||
- isStatic(method.getModifiers()) ||
- methodName.equals("toString")
- ) {
- continue;
- }
-
- String name = null;
-
- if (methodName.startsWith("get")) {
- name = methodName.substring("get".length());
- } else if (methodName.startsWith("is")) {
- name = methodName.substring("is".length());
- }
-
- if (name == null || name.isEmpty()) {
- continue;
- }
-
- accessors.put(name, method);
- }
-
- return accessors;
- }
-
- /**
- * Returns a {@link Map} of setter methods of the given class.
- *
- * The key of the map contains the name of the attribute that can be accessed by the setter, the value the setter
- * itself (an instance of {@link Method}). A method is considered a setter if its name starts with 'set', it is
- * declared public and takes exactly one argument.
- *
- * @param clazz the class to return the setters for
- * @return a Map of attributes and their accessor methods (setters)
- */
- public static Map getSetters(Class clazz) {
- Map accessors = new LinkedHashMap<>();
-
- Method[] methods = clazz.getMethods();
- for (Method method : methods) {
- String methodName = method.getName();
- if (!methodName.startsWith("set") ||
- method.getParameterCount() != 1 ||
- !isPublic(method.getModifiers()) ||
- isNative(method.getModifiers()) ||
- isAbstract(method.getModifiers()) ||
- isStatic(method.getModifiers()) ||
- methodName.equals("toString")
- ) {
- continue;
- }
-
- String name = methodName.substring("set".length());
-
- if (name.isEmpty()) {
- continue;
- }
-
- accessors.put(name, method);
- }
- return accessors;
- }
-}
diff --git a/src/main/java/org/asteriskjava/util/AstState.java b/asterisk-java-core/src/main/java/org/asteriskjava/core/legacy/AstState.java
similarity index 83%
rename from src/main/java/org/asteriskjava/util/AstState.java
rename to asterisk-java-core/src/main/java/org/asteriskjava/core/legacy/AstState.java
index afe67770d..0bc6c4990 100644
--- a/src/main/java/org/asteriskjava/util/AstState.java
+++ b/asterisk-java-core/src/main/java/org/asteriskjava/core/legacy/AstState.java
@@ -1,4 +1,19 @@
-package org.asteriskjava.util;
+/*
+ * Copyright 2004-2023 Asterisk Java contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.asteriskjava.core.legacy;
import java.util.Collections;
import java.util.HashMap;
diff --git a/asterisk-java-core/src/test/java/org/asteriskjava/core/databind/AsteriskDecoderTest.java b/asterisk-java-core/src/test/java/org/asteriskjava/core/databind/AsteriskDecoderTest.java
index 5a21a2124..18fb640e2 100644
--- a/asterisk-java-core/src/test/java/org/asteriskjava/core/databind/AsteriskDecoderTest.java
+++ b/asterisk-java-core/src/test/java/org/asteriskjava/core/databind/AsteriskDecoderTest.java
@@ -18,7 +18,11 @@
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.asteriskjava.core.databind.annotation.AsteriskAttributesBucket;
+import org.asteriskjava.core.databind.annotation.AsteriskDeserialize;
import org.asteriskjava.core.databind.annotation.AsteriskName;
+import org.asteriskjava.core.databind.deserializer.AsteriskBooleanDeserializer;
+import org.asteriskjava.core.databind.deserializer.AsteriskMapDeserializer;
import org.junit.jupiter.api.Test;
import java.time.Instant;
@@ -26,15 +30,17 @@
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
import static org.asteriskjava.core.NewlineDelimiter.LF;
import static org.asteriskjava.core.databind.AsteriskDecoderTest.BaseBean.ResponseType.Goodbye;
+import static org.asteriskjava.core.databind.AsteriskDecoderTest.BaseBean.ResponseType.Success;
class AsteriskDecoderTest {
- private final AsteriskDecoder asteriskDecoder = new AsteriskDecoder();
-
@Test
void shouldDecodeForSimpleBeanWhichExtendsFormBaseBean() {
//given
+ AsteriskDecoder asteriskDecoder = new AsteriskDecoder();
+
Instant date = Instant.parse("2023-11-20T20:33:30.002Z");
Map content = Map.of(
@@ -53,6 +59,7 @@ void shouldDecodeForSimpleBeanWhichExtendsFormBaseBean() {
expected.setActionId("id-1");
expected.setDateReceived(date);
expected.setResponse(Goodbye);
+ expected.setUnmatchedAttributes(null);
assertThat(simpleBean).isEqualTo(expected);
}
@@ -74,6 +81,24 @@ void shouldDecodeListValues() {
assertThat(listBean).isEqualTo(expected);
}
+ @Test
+ void shouldDecodeListValuesWhenIsOnlyOneElement() {
+ //given
+ AsteriskDecoder asteriskDecoder = new AsteriskDecoder();
+
+ Map content = Map.of(
+ "Number", 1
+ );
+
+ //when
+ ListBean listBean = asteriskDecoder.decode(content, ListBean.class);
+
+ //then
+ ListBean expected = new ListBean();
+ expected.setNumbers(List.of(1));
+ assertThat(listBean).isEqualTo(expected);
+ }
+
@Test
void shouldDecodeMap() {
//given
@@ -120,16 +145,15 @@ void shouldDecodeSimpleBeanFromString() {
AsteriskDecoder asteriskDecoder = new AsteriskDecoder();
Instant date = Instant.parse("2023-11-20T20:33:30.002Z");
- String string = """
+ String content = """
ActionID: id-1
DateReceived: %s
Challenge: 123456
Response: Goodbye
""".formatted(date);
- String[] content = string.split(LF.getPattern());
//when
- SimpleBean simpleBean = asteriskDecoder.decode(content, SimpleBean.class);
+ SimpleBean simpleBean = asteriskDecoder.decode(content, LF, SimpleBean.class);
//then
SimpleBean expected = new SimpleBean();
@@ -137,6 +161,7 @@ void shouldDecodeSimpleBeanFromString() {
expected.setActionId("id-1");
expected.setDateReceived(date);
expected.setResponse(Goodbye);
+ expected.setUnmatchedAttributes(null);
assertThat(simpleBean).isEqualTo(expected);
}
@@ -145,15 +170,14 @@ void shouldDecoderListFromString() {
//given
AsteriskDecoder asteriskDecoder = new AsteriskDecoder();
- String string = """
+ String content = """
Number: 1
Number: 2
Number: 3
""";
- String[] content = string.split(LF.getPattern());
//when
- ListBean listBean = asteriskDecoder.decode(content, ListBean.class);
+ ListBean listBean = asteriskDecoder.decode(content, LF, ListBean.class);
//then
ListBean expected = new ListBean();
@@ -166,13 +190,12 @@ void shouldDecodeMapFromString() {
//given
AsteriskDecoder asteriskDecoder = new AsteriskDecoder();
- String string = """
+ String content = """
Header: 1=name1
""";
- String[] content = string.split(LF.getPattern());
//when
- MapBean someClass = asteriskDecoder.decode(content, MapBean.class);
+ MapBean someClass = asteriskDecoder.decode(content, LF, MapBean.class);
//then
Map map = Map.of(1, "name1");
@@ -186,15 +209,14 @@ void shouldDecodeMapWhenIsListOfEntriesFromString() {
//given
AsteriskDecoder asteriskDecoder = new AsteriskDecoder();
- String string = """
+ String content = """
Header: 1=name1
Header: 2=name2
Header: 3=name3
""";
- String[] content = string.split(LF.getPattern());
//when
- MapBean mapBean = asteriskDecoder.decode(content, MapBean.class);
+ MapBean mapBean = asteriskDecoder.decode(content, LF, MapBean.class);
//then
Map map = Map.of(
@@ -207,6 +229,107 @@ void shouldDecodeMapWhenIsListOfEntriesFromString() {
assertThat(mapBean).isEqualTo(expected);
}
+ @Test
+ void shouldHandleEmptyValues() {
+ //given
+ AsteriskDecoder asteriskDecoder = new AsteriskDecoder();
+
+ String content = """
+ Response: Success
+ ActionID: id-1
+ Challenge:
+ """;
+
+ //when
+ SimpleBean simpleBean = asteriskDecoder.decode(content, LF, SimpleBean.class);
+
+ //then
+ SimpleBean expected = new SimpleBean();
+ expected.setChallenge(null);
+ expected.setActionId("id-1");
+ expected.setResponse(Success);
+ expected.setUnmatchedAttributes(null);
+ assertThat(simpleBean).isEqualTo(expected);
+ }
+
+ @Test
+ void shouldEncodeMethodWithAttributesBucket() {
+ //given
+ AsteriskDecoder asteriskDecoder = new AsteriskDecoder();
+
+ String content = """
+ Response: Success
+ ActionID: id-1
+ Challenge: 123456
+ FirstUnmatched: first
+ SecondUnmatched: second
+ """;
+
+ //when
+ SimpleBean simpleBean = asteriskDecoder.decode(content, LF, SimpleBean.class);
+
+ //then
+ assertThat(simpleBean.getChallenge()).isEqualTo("123456");
+ assertThat(simpleBean.getUnmatchedAttributes()).containsOnly(
+ entry("FirstUnmatched", "first"),
+ entry("SecondUnmatched", "second")
+ );
+ }
+
+ @Test
+ void shouldHandleWhenFieldSeparatorIsInFieldValue() {
+ //given
+ AsteriskDecoder asteriskDecoder = new AsteriskDecoder();
+
+ String content = """
+ Response: Success
+ ActionID: id-1
+ Challenge: (Colon: 123456)
+ FirstUnmatched: first
+ SecondUnmatched: second
+ """;
+
+ //when
+ SimpleBean simpleBean = asteriskDecoder.decode(content, LF, SimpleBean.class);
+
+ //then
+ assertThat(simpleBean.getChallenge()).isEqualTo("(Colon: 123456)");
+ }
+
+ @Test
+ void shouldHandleParametersWhichLooksLikeList() {
+ //given
+ AsteriskDecoder asteriskDecoder = new AsteriskDecoder();
+
+ String content = """
+ Number-000001: 1
+ Number-000002: 2
+ Number-000003: 3
+ """;
+
+ //when
+ ListBean listBean = asteriskDecoder.decode(content, LF, ListBean.class);
+
+ //then
+ assertThat(listBean.getNumbers()).containsExactly(1, 2, 3);
+ }
+
+ @Test
+ void shouldHandleBoolean() {
+ //given
+ AsteriskDecoder asteriskDecoder = new AsteriskDecoder();
+
+ String content = """
+ HttpEnabled: true
+ """;
+
+ //when
+ SimpleBean simpleBean = asteriskDecoder.decode(content, LF, SimpleBean.class);
+
+ //then
+ assertThat(simpleBean.isHttpEnabled()).isTrue();
+ }
+
public static class BaseBean {
public enum ResponseType {
Success,
@@ -220,6 +343,9 @@ public enum ResponseType {
private String actionId;
+ @AsteriskAttributesBucket
+ private Map unmatchedAttributes;
+
public ResponseType getResponse() {
return response;
}
@@ -240,11 +366,18 @@ public String getActionId() {
return actionId;
}
- @AsteriskName("ActionID")
public void setActionId(String actionId) {
this.actionId = actionId;
}
+ public Map getUnmatchedAttributes() {
+ return unmatchedAttributes;
+ }
+
+ public void setUnmatchedAttributes(Map unmatchedAttributes) {
+ this.unmatchedAttributes = unmatchedAttributes;
+ }
+
@Override
public boolean equals(Object object) {
if (this == object) {
@@ -261,6 +394,7 @@ public boolean equals(Object object) {
.append(response, base.response)
.append(dateReceived, base.dateReceived)
.append(actionId, base.actionId)
+ .append(unmatchedAttributes, base.unmatchedAttributes)
.isEquals();
}
@@ -270,6 +404,7 @@ public int hashCode() {
.append(response)
.append(dateReceived)
.append(actionId)
+ .append(unmatchedAttributes)
.toHashCode();
}
@@ -279,6 +414,7 @@ public String toString() {
.append("response", response)
.append("dateReceived", dateReceived)
.append("actionId", actionId)
+ .append("unmatchedAttributes", unmatchedAttributes)
.toString();
}
}
@@ -286,6 +422,9 @@ public String toString() {
public static class SimpleBean extends BaseBean {
private String challenge;
+ @AsteriskDeserialize(deserializer = AsteriskBooleanDeserializer.class)
+ private boolean httpEnabled;
+
public String getChallenge() {
return challenge;
}
@@ -294,6 +433,14 @@ public void setChallenge(String challenge) {
this.challenge = challenge;
}
+ public boolean isHttpEnabled() {
+ return httpEnabled;
+ }
+
+ public void setHttpEnabled(boolean httpEnabled) {
+ this.httpEnabled = httpEnabled;
+ }
+
@Override
public boolean equals(Object object) {
if (this == object) {
@@ -330,13 +477,13 @@ public String toString() {
}
public static class ListBean {
+ @AsteriskName("Number")
private List numbers;
public List getNumbers() {
return numbers;
}
- @AsteriskName("Number")
public void setNumbers(List numbers) {
this.numbers = numbers;
}
@@ -374,13 +521,14 @@ public String toString() {
}
public static class MapBean {
+ @AsteriskName("Header")
+ @AsteriskDeserialize(deserializer = AsteriskMapDeserializer.class, keyAs = Integer.class, valueAs = String.class)
private Map headers;
public Map getHeaders() {
return headers;
}
- @AsteriskName("Header")
public void setHeaders(Map headers) {
this.headers = headers;
}
diff --git a/asterisk-java-core/src/test/java/org/asteriskjava/core/databind/AsteriskEncoderTest.java b/asterisk-java-core/src/test/java/org/asteriskjava/core/databind/AsteriskEncoderTest.java
index 73e76fae6..5eea0d55c 100644
--- a/asterisk-java-core/src/test/java/org/asteriskjava/core/databind/AsteriskEncoderTest.java
+++ b/asterisk-java-core/src/test/java/org/asteriskjava/core/databind/AsteriskEncoderTest.java
@@ -15,73 +15,56 @@
*/
package org.asteriskjava.core.databind;
+import org.asteriskjava.core.databind.annotation.AsteriskConverter;
import org.asteriskjava.core.databind.annotation.AsteriskName;
+import org.asteriskjava.core.databind.converter.CommaConverter;
import org.junit.jupiter.api.Test;
+import java.util.EnumSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import static java.util.Comparator.naturalOrder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.asteriskjava.core.NewlineDelimiter.LF;
import static org.asteriskjava.core.databind.AsteriskEncoderTest.SimpleBean.AuthType.MD5;
+import static org.asteriskjava.core.databind.AsteriskEncoderTest.SimpleBean.AuthType.SHA1;
class AsteriskEncoderTest {
@Test
- void shouldEncodeWithoutSortingFields() {
+ void shouldEncodeObject() {
//given
AsteriskEncoder asteriskEncoder = new AsteriskEncoder(LF);
- Map source = new LinkedHashMap<>();
- source.put("Z", "value z");
- source.put("A", "value a");
- source.put("M", "value m");
- source.put("F", "value f");
+ SimpleBean bean = new SimpleBean();
+ bean.setActionId("id-1");
+ bean.setAuthType(MD5);
+ bean.setCodecs(List.of("codec1", "codec2"));
+ Map variable = new LinkedHashMap<>();
+ variable.put("key1", "value1");
+ variable.put("key2", "value2");
+ variable.put("key3", "value3");
+ bean.setVariable(variable);
//when
- String encode = asteriskEncoder.encode(source);
+ String string = asteriskEncoder.encode(bean);
//then
- String expected = "Z: value z" + LF.getPattern();
- expected += "A: value a" + LF.getPattern();
- expected += "M: value m" + LF.getPattern();
- expected += "F: value f" + LF.getPattern() + LF.getPattern();
- assertThat(encode).isEqualTo(expected);
- }
-
- @Test
- void shouldEncodeAndSortFields() {
- //given
- AsteriskEncoder asteriskEncoder = new AsteriskEncoder(LF, naturalOrder());
-
- Map source = Map.of(
- "Z", "value z",
- "A", "value a",
- "M", "value m",
- "F", "value f"
+ assertThat(string).contains(
+ "Action: SimpleBean", "ActionID: id-1", "AuthType: MD5", "Codecs: codec1,codec2",
+ "Variable: key1=value1", "Variable: key2=value2", "Variable: key3=value3"
);
-
- //when
- String encode = asteriskEncoder.encode(source);
-
- //then
- String expected = "A: value a" + LF.getPattern();
- expected += "F: value f" + LF.getPattern();
- expected += "M: value m" + LF.getPattern();
- expected += "Z: value z" + LF.getPattern() + LF.getPattern();
- assertThat(encode).isEqualTo(expected);
}
@Test
- void shouldEncodeObject() {
+ void shouldNotEncodeNulls() {
//given
AsteriskEncoder asteriskEncoder = new AsteriskEncoder(LF);
SimpleBean bean = new SimpleBean();
bean.setActionId("id-1");
bean.setAuthType(MD5);
- bean.setCodecs(List.of("codec1", "codec2"));
+ bean.setCodecs(null);
Map variable = new LinkedHashMap<>();
variable.put("key1", "value1");
variable.put("key2", "value2");
@@ -92,37 +75,86 @@ void shouldEncodeObject() {
String string = asteriskEncoder.encode(bean);
//then
- String expected = "Action: SimpleBean" + LF.getPattern();
- expected += "ActionID: id-1" + LF.getPattern();
- expected += "AuthType: MD5" + LF.getPattern();
- expected += "Codecs: codec1,codec2" + LF.getPattern();
- expected += "Variable: key1=value1" + LF.getPattern();
- expected += "Variable: key2=value2" + LF.getPattern();
- expected += "Variable: key3=value3" + LF.getPattern() + LF.getPattern();
assertThat(string).contains(
- "Action: SimpleBean", "ActionID: id-1", "AuthType: MD5", "Codecs: codec1,codec2",
+ "Action: SimpleBean", "ActionID: id-1", "AuthType: MD5",
"Variable: key1=value1", "Variable: key2=value2", "Variable: key3=value3"
+ ).doesNotContain(
+ "Codecs: null"
);
}
+ @Test
+ void shouldEncodeEnumSet() {
+ //given
+ AsteriskEncoder asteriskEncoder = new AsteriskEncoder(LF);
+
+ SimpleBean bean = new SimpleBean();
+ bean.setActionId("id-1");
+ bean.setAuths(EnumSet.of(MD5, SHA1));
+
+ //when
+ String string = asteriskEncoder.encode(bean);
+
+ //then
+ assertThat(string).contains("Action: SimpleBean", "ActionID: id-1", "Auths: MD5,SHA1");
+ }
+
+ @Test
+ void shouldHandleListOfCustomObjectsWithCounter() {
+ //given
+ AsteriskEncoder asteriskEncoder = new AsteriskEncoder(LF);
+
+ SimpleBean.Config config1 = new SimpleBean.Config()
+ .setAuth(MD5)
+ .setCategory("category1");
+ SimpleBean.Config config2 = new SimpleBean.Config()
+ .setAuth(MD5)
+ .setCategory("category2");
+
+ SimpleBean bean = new SimpleBean();
+ bean.setActionId("id-1");
+ bean.setConfigs(List.of(config1, config2));
+
+ //when
+ String string = asteriskEncoder.encode(bean);
+
+ //then
+ assertThat(string)
+ .contains(
+ "Action: SimpleBean", "ActionID: id-1",
+ "Authorization-000000: MD5",
+ "Category-000000: category1",
+ "Authorization-000001: MD5",
+ "Category-000001: category2"
+ )
+ .doesNotContain("Configs:");
+ }
+
public static class SimpleBean {
public enum AuthType {
MD5,
+ SHA1,
}
+ @AsteriskName("ActionID")
private String actionId;
private AuthType authType;
+ @AsteriskConverter(CommaConverter.class)
private List codecs;
private Map variable;
+ @AsteriskConverter(CommaConverter.class)
+ private EnumSet auths;
+
+ private List configs;
+
public String getAction() {
return "SimpleBean";
}
- @AsteriskName("ActionID")
public String getActionId() {
return actionId;
}
@@ -154,5 +186,45 @@ public Map getVariable() {
public void setVariable(Map variable) {
this.variable = variable;
}
+
+ public EnumSet getAuths() {
+ return auths;
+ }
+
+ public void setAuths(EnumSet auths) {
+ this.auths = auths;
+ }
+
+ public List getConfigs() {
+ return configs;
+ }
+
+ public void setConfigs(List configs) {
+ this.configs = configs;
+ }
+
+ public static class Config {
+ @AsteriskName("Authorization")
+ private AuthType auth;
+ private String category;
+
+ public AuthType getAuth() {
+ return auth;
+ }
+
+ public Config setAuth(AuthType auth) {
+ this.auth = auth;
+ return this;
+ }
+
+ public String getCategory() {
+ return category;
+ }
+
+ public Config setCategory(String category) {
+ this.category = category;
+ return this;
+ }
+ }
}
}
diff --git a/asterisk-java-core/src/test/java/org/asteriskjava/core/databind/utils/AsteriskBooleanTest.java b/asterisk-java-core/src/test/java/org/asteriskjava/core/databind/utils/AsteriskBooleanTest.java
new file mode 100644
index 000000000..cc6411a5f
--- /dev/null
+++ b/asterisk-java-core/src/test/java/org/asteriskjava/core/databind/utils/AsteriskBooleanTest.java
@@ -0,0 +1,44 @@
+package org.asteriskjava.core.databind.utils;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.asteriskjava.core.databind.utils.AsteriskBoolean.toBoolean;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
+class AsteriskBooleanTest {
+ @ParameterizedTest
+ @MethodSource("values")
+ void testIsTrue(Object value, boolean expected) {
+ //when
+ boolean actual = toBoolean(value);
+
+ //then
+ assertThat(actual).isEqualTo(expected);
+ }
+
+ public static Stream values() {
+ return Stream.of(
+ arguments("yes", true),
+ arguments("y", true),
+ arguments("t", true),
+ arguments("1", true),
+ arguments("on", true),
+ arguments("ON", true),
+ arguments("Enabled", true),
+ arguments("true", true),
+
+ arguments("no", false),
+ arguments("false", false),
+ arguments("n", false),
+ arguments("f", false),
+ arguments("0", false),
+ arguments("off", false),
+ arguments(null, false)
+ );
+ }
+}
diff --git a/asterisk-java-core/src/test/java/org/asteriskjava/core/databind/utils/ReflectionUtilsTest.java b/asterisk-java-core/src/test/java/org/asteriskjava/core/databind/utils/ReflectionUtilsTest.java
deleted file mode 100644
index 9a42f6f1b..000000000
--- a/asterisk-java-core/src/test/java/org/asteriskjava/core/databind/utils/ReflectionUtilsTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright 2004-2023 Asterisk Java contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.asteriskjava.core.databind.utils;
-
-import org.junit.jupiter.api.Test;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.StringJoiner;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.asteriskjava.core.databind.utils.ReflectionUtils.getGetters;
-
-class ReflectionUtilsTest {
- @Test
- void shouldDoesNotReturnGetterWhenHasAnyParameters() {
- //when
- Map getters = getGetters(InvalidClass.class);
-
- //then
- assertThat(getters).doesNotContainKey("WithParameters");
- }
-
- @Test
- void shouldDoesNotReturnGetterWhenHasVoidType() {
- //when
- Map getters = getGetters(InvalidClass.class);
-
- //then
- assertThat(getters).doesNotContainKey("WithVoidType");
- }
-
- @Test
- void shouldDoesNotReturnGetterWhenHasNotPublicScope() {
- //when
- Map getters = getGetters(InvalidClass.class);
-
- //then
- assertThat(getters).doesNotContainKey("WhichIsHasNotPublicScope");
- }
-
- @Test
- void shouldDoesNotReturnGetterWhenIsNative() {
- //when
- Map getters = getGetters(InvalidClass.class);
-
- //then
- assertThat(getters).doesNotContainKey("WithNative");
- }
-
- @Test
- void shouldDoesNotReturnGetterWhenIsAbstract() {
- //when
- Map getters = getGetters(InvalidClass.class);
-
- //then
- assertThat(getters).doesNotContainKey("WithAbstract");
- }
-
- @Test
- void shouldDoesNotReturnGetterWhenIsStatic() {
- //when
- Map getters = getGetters(InvalidClass.class);
-
- //then
- assertThat(getters).doesNotContainKey("WithStatic");
- }
-
- @Test
- void shouldDoesNotReturnGetterWhenIsToString() {
- //when
- Map getters = getGetters(InvalidClass.class);
-
- //then
- assertThat(getters).doesNotContainKey("toString");
- }
-
- @Test
- void shouldDoesNotReturnGetterWhenNameHasOnlyGet() {
- //when
- Map getters = getGetters(InvalidClass.class);
-
- //then
- assertThat(getters).isEmpty();
- }
-
- @Test
- void shouldDoesNotReturnGetterWhenNameHasOnlyIs() {
- //when
- Map getters = getGetters(InvalidClass.class);
-
- //then
- assertThat(getters).isEmpty();
- }
-
- static abstract class InvalidClass {
- public String getWithParameters(String parameter) {
- return parameter;
- }
-
- public void getWithVoidType() {
- }
-
- String getWhichIsHasNotPublicScope() {
- return "";
- }
-
- public native String getWithNative();
-
- public abstract String getWithAbstract();
-
- public static String getWithStatic() {
- return "";
- }
-
- public String get() {
- return "";
- }
-
- public String is() {
- return "";
- }
-
- @Override
- public String toString() {
- return new StringJoiner(", ", InvalidClass.class.getSimpleName() + "[", "]")
- .toString();
- }
- }
-
- @Test
- void shouldReturnValidGetters() {
- //when
- Map getters = getGetters(ValidClass.class);
-
- //then
- assertThat(getters).containsOnlyKeys("Value", "Valid", "Action");
- }
-
- static class ValidClass {
-
- public String getValue() {
- return "value";
- }
-
- public boolean isValid() {
- return true;
- }
-
- public String getAction() {
- return "NewAction";
- }
- }
-}
diff --git a/build.gradle b/build.gradle
index a090a61d1..245d94ce7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,6 +26,7 @@ dependencies {
implementation project(':asterisk-java-core')
implementation 'com.google.guava:guava:32.1.3-jre'
+ implementation 'commons-codec:commons-codec:1.16.0'
implementation 'org.apache.logging.log4j:log4j-core:2.22.0'
implementation 'org.reflections:reflections:0.10.2'
implementation 'org.slf4j:slf4j-api:2.0.9'
@@ -34,6 +35,8 @@ dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testImplementation 'org.mockito:mockito-core:5.7.0'
testImplementation 'ch.qos.logback:logback-classic:1.4.11'
+
+ testRuntimeOnly libs.junit.platform.launcher
}
tasks.named('test') {
diff --git a/settings.gradle b/settings.gradle
index b974395f0..b71520df7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,3 +2,31 @@ rootProject.name = 'asterisk-java'
include 'asterisk-java-ami'
include 'asterisk-java-core'
+
+dependencyResolutionManagement {
+ versionCatalogs {
+ libs {
+ library('assertj-core', 'org.assertj:assertj-core:3.27.6')
+ library('jsonassert', 'org.skyscreamer:jsonassert:1.5.3')
+ library('junit-jupiter', 'org.junit.jupiter:junit-jupiter:6.0.0')
+ library('junit-platform-launcher', 'org.junit.platform:junit-platform-launcher:6.0.0')
+ library('mockito-core', 'org.mockito:mockito-core:5.20.0')
+
+ library('apache-commons-codec', 'commons-codec:commons-codec:1.19.0')
+ library('apache-commons-lang3', 'org.apache.commons:commons-lang3:3.19.0')
+
+ library('netty-codec', 'io.netty:netty-codec:4.2.7.Final')
+ library('netty-handler', 'io.netty:netty-handler:4.2.7.Final')
+ library('netty-transport', 'io.netty:netty-transport:4.2.7.Final')
+
+ library('jackson-databind', 'com.fasterxml.jackson.core:jackson-databind:2.16.1')
+ library('jackson-datatype-jsr310', 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1')
+
+ library('slf4j-api', 'org.slf4j:slf4j-api:2.0.17')
+ library('slf4j-simple', 'org.slf4j:slf4j-simple:2.0.17')
+
+ library('testcontainers-bom', 'org.testcontainers:testcontainers-bom:2.0.1')
+ library('testcontainers-junit-jupiter', 'org.testcontainers:junit-jupiter:2.0.1')
+ }
+ }
+}
diff --git a/src/main/java/org/asteriskjava/fastagi/AsyncAgiServer.java b/src/main/java/org/asteriskjava/fastagi/AsyncAgiServer.java
index bbb136a41..cae686f8d 100644
--- a/src/main/java/org/asteriskjava/fastagi/AsyncAgiServer.java
+++ b/src/main/java/org/asteriskjava/fastagi/AsyncAgiServer.java
@@ -1,5 +1,6 @@
package org.asteriskjava.fastagi;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.fastagi.internal.AsyncAgiConnectionHandler;
import org.asteriskjava.fastagi.internal.DefaultAgiChannelFactory;
import org.asteriskjava.lock.LockableMap;
@@ -7,7 +8,6 @@
import org.asteriskjava.manager.ManagerConnection;
import org.asteriskjava.manager.ManagerEventListener;
import org.asteriskjava.manager.event.AsyncAgiEvent;
-import org.asteriskjava.manager.event.ManagerEvent;
import org.asteriskjava.manager.event.RenameEvent;
import org.asteriskjava.util.Log;
import org.asteriskjava.util.LogFactory;
diff --git a/src/main/java/org/asteriskjava/fastagi/internal/AsyncAgiWriter.java b/src/main/java/org/asteriskjava/fastagi/internal/AsyncAgiWriter.java
index 68dcfd894..c9d6dcc76 100644
--- a/src/main/java/org/asteriskjava/fastagi/internal/AsyncAgiWriter.java
+++ b/src/main/java/org/asteriskjava/fastagi/internal/AsyncAgiWriter.java
@@ -1,6 +1,6 @@
package org.asteriskjava.fastagi.internal;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
import org.asteriskjava.fastagi.AgiException;
import org.asteriskjava.fastagi.AgiWriter;
import org.asteriskjava.fastagi.command.AgiCommand;
diff --git a/src/main/java/org/asteriskjava/live/AsteriskServer.java b/src/main/java/org/asteriskjava/live/AsteriskServer.java
index 4eea8687d..c45f0275c 100644
--- a/src/main/java/org/asteriskjava/live/AsteriskServer.java
+++ b/src/main/java/org/asteriskjava/live/AsteriskServer.java
@@ -16,6 +16,7 @@
*/
package org.asteriskjava.live;
+import org.asteriskjava.ami.action.api.CommandAction;
import org.asteriskjava.config.ConfigFile;
import org.asteriskjava.manager.ManagerConnection;
import org.asteriskjava.manager.ManagerEventListener;
@@ -397,7 +398,7 @@ void originateToApplicationAsync(String channel, String application, String data
* @return a List containing strings representing the lines returned by the
* CLI command.
* @throws ManagerCommunicationException if the command can't be executed.
- * @see org.asteriskjava.manager.action.CommandAction
+ * @see CommandAction
* @since 0.3
*/
List executeCliCommand(String command) throws ManagerCommunicationException;
diff --git a/src/main/java/org/asteriskjava/live/ChannelState.java b/src/main/java/org/asteriskjava/live/ChannelState.java
index a27f4b2bd..af040dc6b 100644
--- a/src/main/java/org/asteriskjava/live/ChannelState.java
+++ b/src/main/java/org/asteriskjava/live/ChannelState.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.live;
-import org.asteriskjava.util.AstState;
+import org.asteriskjava.core.legacy.AstState;
/**
* The lifecycle status of an {@link org.asteriskjava.live.AsteriskChannel}.
diff --git a/src/main/java/org/asteriskjava/live/internal/AgentManager.java b/src/main/java/org/asteriskjava/live/internal/AgentManager.java
index f9f5a2533..1527d9010 100644
--- a/src/main/java/org/asteriskjava/live/internal/AgentManager.java
+++ b/src/main/java/org/asteriskjava/live/internal/AgentManager.java
@@ -16,6 +16,7 @@
*/
package org.asteriskjava.live.internal;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.live.AgentState;
import org.asteriskjava.live.AsteriskAgent;
import org.asteriskjava.live.ManagerCommunicationException;
diff --git a/src/main/java/org/asteriskjava/live/internal/AsteriskChannelImpl.java b/src/main/java/org/asteriskjava/live/internal/AsteriskChannelImpl.java
index 195d9a094..f4fd3cf3b 100644
--- a/src/main/java/org/asteriskjava/live/internal/AsteriskChannelImpl.java
+++ b/src/main/java/org/asteriskjava/live/internal/AsteriskChannelImpl.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.live.internal;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
import org.asteriskjava.live.*;
import org.asteriskjava.lock.LockableList;
import org.asteriskjava.lock.LockableMap;
diff --git a/src/main/java/org/asteriskjava/live/internal/AsteriskQueueMemberImpl.java b/src/main/java/org/asteriskjava/live/internal/AsteriskQueueMemberImpl.java
index 1e754594a..102e99da5 100644
--- a/src/main/java/org/asteriskjava/live/internal/AsteriskQueueMemberImpl.java
+++ b/src/main/java/org/asteriskjava/live/internal/AsteriskQueueMemberImpl.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.live.internal;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
import org.asteriskjava.live.*;
import org.asteriskjava.lock.Locker.LockCloser;
import org.asteriskjava.manager.action.QueuePauseAction;
diff --git a/src/main/java/org/asteriskjava/live/internal/AsteriskServerImpl.java b/src/main/java/org/asteriskjava/live/internal/AsteriskServerImpl.java
index 830e333ad..d3cf56ec1 100644
--- a/src/main/java/org/asteriskjava/live/internal/AsteriskServerImpl.java
+++ b/src/main/java/org/asteriskjava/live/internal/AsteriskServerImpl.java
@@ -17,8 +17,16 @@
package org.asteriskjava.live.internal;
import org.asteriskjava.AsteriskVersion;
-import org.asteriskjava.ami.action.ManagerAction;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.annotation.GeneratedEvents;
+import org.asteriskjava.ami.action.api.CommandAction;
+import org.asteriskjava.ami.action.api.DbGetAction;
+import org.asteriskjava.ami.action.api.DbPutAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
+import org.asteriskjava.ami.action.api.response.CommandActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.event.DbGetResponseEvent;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.config.ConfigFile;
import org.asteriskjava.live.*;
import org.asteriskjava.lock.Lockable;
@@ -29,7 +37,10 @@
import org.asteriskjava.manager.*;
import org.asteriskjava.manager.action.*;
import org.asteriskjava.manager.event.*;
-import org.asteriskjava.manager.response.*;
+import org.asteriskjava.manager.response.GetConfigResponse;
+import org.asteriskjava.manager.response.MailboxCountResponse;
+import org.asteriskjava.manager.response.ManagerError;
+import org.asteriskjava.manager.response.ModuleCheckResponse;
import org.asteriskjava.util.AstUtil;
import org.asteriskjava.util.DateUtil;
import org.asteriskjava.util.Log;
@@ -40,6 +51,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import static java.util.Objects.requireNonNull;
+
/**
* Default implementation of the {@link AsteriskServer} interface.
*
@@ -445,10 +458,10 @@ public String getVersion() throws ManagerCommunicationException {
}
response = sendAction(new CommandAction(command));
- if (response instanceof CommandResponse) {
+ if (response instanceof CommandActionResponse) {
final List result;
- result = ((CommandResponse) response).getResult();
+ result = ((CommandActionResponse) response).getOutput();
if (!result.isEmpty()) {
version = result.get(0);
}
@@ -481,10 +494,10 @@ public int[] getVersion(String file) throws ManagerCommunicationException {
command = SHOW_VERSION_FILES_COMMAND;
}
response = sendAction(new CommandAction(command));
- if (response instanceof CommandResponse) {
+ if (response instanceof CommandActionResponse) {
List result;
- result = ((CommandResponse) response).getResult();
+ result = ((CommandActionResponse) response).getOutput();
for (int i = 2; i < result.size(); i++) {
String line;
Matcher matcher;
@@ -569,13 +582,13 @@ public Collection getVoicemailboxes() throws ManagerCommunicationE
} else {
response = sendAction(new CommandAction(SHOW_VOICEMAIL_USERS_COMMAND));
}
- if (!(response instanceof CommandResponse)) {
+ if (!(response instanceof CommandActionResponse)) {
logger.error("Response to CommandAction(\"" + SHOW_VOICEMAIL_USERS_COMMAND + "\") was not a CommandResponse but "
+ response);
return voicemailboxes;
}
- result = ((CommandResponse) response).getResult();
+ result = ((CommandActionResponse) response).getOutput();
if (result == null || result.isEmpty()) {
return voicemailboxes;
}
@@ -628,12 +641,12 @@ public List executeCliCommand(String command) throws ManagerCommunicatio
initializeIfNeeded();
response = sendAction(new CommandAction(command));
- if (!(response instanceof CommandResponse)) {
+ if (!(response instanceof CommandActionResponse)) {
throw new ManagerCommunicationException(
"Response to CommandAction(\"" + command + "\") was not a CommandResponse but " + response, null);
}
- return ((CommandResponse) response).getResult();
+ return ((CommandActionResponse) response).getOutput();
}
public boolean isModuleLoaded(String module) throws ManagerCommunicationException {
@@ -781,9 +794,7 @@ ResponseEvents sendEventGeneratingAction(EventGeneratingAction action) throws Ma
}
}
- ResponseEvents
-
- sendEventGeneratingAction(EventGeneratingAction action, long timeout) throws ManagerCommunicationException {
+ ResponseEvents sendEventGeneratingAction(EventGeneratingAction action, long timeout) throws ManagerCommunicationException {
// return connectionPool.sendEventGeneratingAction(action, timeout);
try {
return eventConnection.sendEventGeneratingAction(action, timeout);
@@ -792,6 +803,24 @@ ResponseEvents sendEventGeneratingAction(EventGeneratingAction action) throws Ma
}
}
+ ResponseEvents sendEventGeneratingAction(ManagerAction action, long timeout) throws ManagerCommunicationException {
+ // return connectionPool.sendEventGeneratingAction(action, timeout);
+ try {
+ Class actionCompleteEventClass = null;
+ GeneratedEvents generatedEvents = action.getClass().getAnnotation(GeneratedEvents.class);
+ if (generatedEvents != null) {
+ GeneratedEvents.Event first = Arrays.stream(generatedEvents.value())
+ .filter(GeneratedEvents.Event::complete)
+ .findFirst()
+ .orElse(null);
+ actionCompleteEventClass = requireNonNull(first).value();
+ }
+ return eventConnection.sendEventGeneratingAction(action, timeout, actionCompleteEventClass);
+ } catch (Exception e) {
+ throw ManagerCommunicationExceptionMapper.mapSendActionException(action.getAction(), e);
+ }
+ }
+
OriginateCallbackData getOriginateCallbackDataByTraceId(String traceId) {
try (LockCloser closer = originateCallbacks.withLock()) {
return originateCallbacks.get(traceId);
@@ -1084,7 +1113,10 @@ public List getPeerEntries() throws ManagerCommunicationExceptio
}
public DbGetResponseEvent dbGet(String family, String key) throws ManagerCommunicationException {
- ResponseEvents responseEvents = sendEventGeneratingAction(new DbGetAction(family, key), 2000);
+ DbGetAction dbGetAction = new DbGetAction();
+ dbGetAction.setFamily(family);
+ dbGetAction.setKey(key);
+ ResponseEvents responseEvents = sendEventGeneratingAction(dbGetAction, 2000);
DbGetResponseEvent dbgre = null;
for (ResponseEvent re : responseEvents.getEvents()) {
dbgre = (DbGetResponseEvent) re;
@@ -1100,7 +1132,11 @@ public void dbDel(String family, String key) throws ManagerCommunicationExceptio
}
public void dbPut(String family, String key, String value) throws ManagerCommunicationException {
- sendAction(new DbPutAction(family, key, value));
+ DbPutAction action = new DbPutAction();
+ action.setFamily(family);
+ action.setKey(key);
+ action.setVal(value);
+ sendAction(action);
}
public AsteriskChannel getChannelByNameAndActive(String name) throws ManagerCommunicationException {
diff --git a/src/main/java/org/asteriskjava/live/internal/ChannelManager.java b/src/main/java/org/asteriskjava/live/internal/ChannelManager.java
index a7bf7e2f3..faeb7c1c1 100644
--- a/src/main/java/org/asteriskjava/live/internal/ChannelManager.java
+++ b/src/main/java/org/asteriskjava/live/internal/ChannelManager.java
@@ -16,6 +16,7 @@
*/
package org.asteriskjava.live.internal;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.live.*;
import org.asteriskjava.lock.LockableMap;
import org.asteriskjava.lock.Locker.LockCloser;
diff --git a/src/main/java/org/asteriskjava/live/internal/ManagerCommunicationExceptionMapper.java b/src/main/java/org/asteriskjava/live/internal/ManagerCommunicationExceptionMapper.java
index ff102415c..820343ecb 100644
--- a/src/main/java/org/asteriskjava/live/internal/ManagerCommunicationExceptionMapper.java
+++ b/src/main/java/org/asteriskjava/live/internal/ManagerCommunicationExceptionMapper.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.live.internal;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import org.asteriskjava.live.ManagerCommunicationException;
import org.asteriskjava.manager.EventTimeoutException;
diff --git a/src/main/java/org/asteriskjava/live/internal/MeetMeManager.java b/src/main/java/org/asteriskjava/live/internal/MeetMeManager.java
index 983598adb..3a3c28b52 100644
--- a/src/main/java/org/asteriskjava/live/internal/MeetMeManager.java
+++ b/src/main/java/org/asteriskjava/live/internal/MeetMeManager.java
@@ -16,17 +16,17 @@
*/
package org.asteriskjava.live.internal;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.CommandAction;
+import org.asteriskjava.ami.action.api.response.CommandActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
import org.asteriskjava.live.ManagerCommunicationException;
import org.asteriskjava.live.MeetMeRoom;
import org.asteriskjava.lock.LockableMap;
import org.asteriskjava.lock.Locker.LockCloser;
-import org.asteriskjava.manager.action.CommandAction;
import org.asteriskjava.manager.event.AbstractMeetMeEvent;
import org.asteriskjava.manager.event.MeetMeLeaveEvent;
import org.asteriskjava.manager.event.MeetMeMuteEvent;
import org.asteriskjava.manager.event.MeetMeTalkingEvent;
-import org.asteriskjava.manager.response.CommandResponse;
import org.asteriskjava.manager.response.ManagerError;
import org.asteriskjava.util.DateUtil;
import org.asteriskjava.util.Log;
@@ -177,13 +177,13 @@ private void populateRoom(MeetMeRoomImpl room) {
logger.error("Unable to send \"" + MEETME_LIST_COMMAND + "\" command: " + response.getMessage());
return;
}
- if (!(response instanceof CommandResponse)) {
+ if (!(response instanceof CommandActionResponse)) {
logger.error("Response to \"" + MEETME_LIST_COMMAND + "\" command is not a CommandResponse but "
+ response.getClass());
return;
}
- lines = ((CommandResponse) response).getResult();
+ lines = ((CommandActionResponse) response).getOutput();
for (String line : lines) {
final Matcher matcher;
final Integer userNumber;
diff --git a/src/main/java/org/asteriskjava/live/internal/MeetMeRoomImpl.java b/src/main/java/org/asteriskjava/live/internal/MeetMeRoomImpl.java
index 59da00312..15a50027e 100644
--- a/src/main/java/org/asteriskjava/live/internal/MeetMeRoomImpl.java
+++ b/src/main/java/org/asteriskjava/live/internal/MeetMeRoomImpl.java
@@ -16,12 +16,12 @@
*/
package org.asteriskjava.live.internal;
+import org.asteriskjava.ami.action.api.CommandAction;
import org.asteriskjava.live.ManagerCommunicationException;
import org.asteriskjava.live.MeetMeRoom;
import org.asteriskjava.live.MeetMeUser;
import org.asteriskjava.lock.LockableMap;
import org.asteriskjava.lock.Locker.LockCloser;
-import org.asteriskjava.manager.action.CommandAction;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/src/main/java/org/asteriskjava/live/internal/MeetMeUserImpl.java b/src/main/java/org/asteriskjava/live/internal/MeetMeUserImpl.java
index 099afe65a..cc126330a 100644
--- a/src/main/java/org/asteriskjava/live/internal/MeetMeUserImpl.java
+++ b/src/main/java/org/asteriskjava/live/internal/MeetMeUserImpl.java
@@ -16,11 +16,11 @@
*/
package org.asteriskjava.live.internal;
+import org.asteriskjava.ami.action.api.CommandAction;
import org.asteriskjava.live.ManagerCommunicationException;
import org.asteriskjava.live.MeetMeUser;
import org.asteriskjava.live.MeetMeUserState;
import org.asteriskjava.lock.Locker.LockCloser;
-import org.asteriskjava.manager.action.CommandAction;
import java.util.Date;
diff --git a/src/main/java/org/asteriskjava/live/internal/QueueManager.java b/src/main/java/org/asteriskjava/live/internal/QueueManager.java
index 2194fd78c..fbd50bf63 100644
--- a/src/main/java/org/asteriskjava/live/internal/QueueManager.java
+++ b/src/main/java/org/asteriskjava/live/internal/QueueManager.java
@@ -16,6 +16,7 @@
*/
package org.asteriskjava.live.internal;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.live.AsteriskQueue;
import org.asteriskjava.live.ManagerCommunicationException;
import org.asteriskjava.live.QueueMemberState;
diff --git a/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java b/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java
index 1f977a1ae..a35ef6ae4 100644
--- a/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java
+++ b/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java
@@ -1,5 +1,8 @@
package org.asteriskjava.manager;
+import org.asteriskjava.ami.action.api.response.event.DbGetResponseEvent;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.manager.event.*;
import org.asteriskjava.util.Log;
import org.asteriskjava.util.LogFactory;
diff --git a/src/main/java/org/asteriskjava/manager/DefaultManagerConnection.java b/src/main/java/org/asteriskjava/manager/DefaultManagerConnection.java
index 244d176ba..81a196320 100644
--- a/src/main/java/org/asteriskjava/manager/DefaultManagerConnection.java
+++ b/src/main/java/org/asteriskjava/manager/DefaultManagerConnection.java
@@ -17,10 +17,10 @@
package org.asteriskjava.manager;
import org.asteriskjava.AsteriskVersion;
-import org.asteriskjava.ami.action.ManagerAction;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.ManagerAction;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.manager.action.EventGeneratingAction;
-import org.asteriskjava.manager.event.ManagerEvent;
import org.asteriskjava.manager.internal.ManagerConnectionImpl;
import java.io.IOException;
@@ -313,6 +313,11 @@ public ResponseEvents sendEventGeneratingAction(EventGeneratingAction action, lo
return impl.sendEventGeneratingAction(action, timeout);
}
+ @Override
+ public ResponseEvents sendEventGeneratingAction(ManagerAction action, long timeout, Class actionCompleteEventClass) throws IOException, EventTimeoutException {
+ return impl.sendEventGeneratingAction(action, timeout, actionCompleteEventClass);
+ }
+
@Override
public void sendEventGeneratingAction(EventGeneratingAction action,
SendEventGeneratingActionCallback callback)
diff --git a/src/main/java/org/asteriskjava/manager/ManagerConnection.java b/src/main/java/org/asteriskjava/manager/ManagerConnection.java
index e321f92ad..5a719dbbb 100644
--- a/src/main/java/org/asteriskjava/manager/ManagerConnection.java
+++ b/src/main/java/org/asteriskjava/manager/ManagerConnection.java
@@ -17,11 +17,14 @@
package org.asteriskjava.manager;
import org.asteriskjava.AsteriskVersion;
-import org.asteriskjava.ami.action.ChallengeAction;
-import org.asteriskjava.ami.action.ManagerAction;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.ChallengeAction;
+import org.asteriskjava.ami.action.api.LoginAction;
+import org.asteriskjava.ami.action.api.LogoffAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.manager.action.EventGeneratingAction;
-import org.asteriskjava.manager.event.ManagerEvent;
import java.io.IOException;
import java.net.InetAddress;
@@ -34,7 +37,7 @@
* The ManagerConnection repesents a connection to an Asterisk server and is
* capable of sending {@link ManagerAction}s and
* receiving {@link ManagerActionResponse}s and
- * {@link org.asteriskjava.manager.event.ManagerEvent}s. It does not add any
+ * {@link ManagerEvent}s. It does not add any
* further functionality but rather provides a Java view to Asterisk's Manager
* API (freeing you from TCP/IP connection and parsing stuff).
*
@@ -230,7 +233,7 @@ public interface ManagerConnection {
* incorrect or the ChallengeResponse could not be built.
* @throws TimeoutException if a timeout occurs while waiting for the
* protocol identifier. The connection is closed in this case.
- * @see org.asteriskjava.manager.action.LoginAction
+ * @see LoginAction
* @see ChallengeAction
*/
void login() throws IllegalStateException, IOException, AuthenticationFailedException, TimeoutException;
@@ -250,7 +253,7 @@ public interface ManagerConnection {
* incorrect or the ChallengeResponse could not be built.
* @throws TimeoutException if a timeout occurs while waiting for the
* protocol identifier. The connection is closed in this case.
- * @see org.asteriskjava.manager.action.LoginAction
+ * @see LoginAction
* @see ChallengeAction
* @since 0.3
*/
@@ -260,7 +263,7 @@ public interface ManagerConnection {
* Sends a LogoffAction to the Asterisk server and disconnects.
*
* @throws IllegalStateException if not in state CONNECTED or RECONNECTING.
- * @see org.asteriskjava.manager.action.LogoffAction
+ * @see LogoffAction
*/
void logoff() throws IllegalStateException;
@@ -340,7 +343,7 @@ void sendAction(ManagerAction action, SendActionCallback callback)
/**
* Sends an {@link EventGeneratingAction} to the Asterisk server and waits
* for the corresponding {@link ManagerActionResponse} and the
- * {@link org.asteriskjava.manager.event.ResponseEvent}s
+ * {@link ResponseEvent}s
*
* EventGeneratingActions are {@link ManagerAction}s that don't return their
* response in the corresponding {@link ManagerActionResponse} but send a series
@@ -368,7 +371,7 @@ void sendAction(ManagerAction action, SendActionCallback callback)
* @throws IllegalStateException if you are not connected to an Asterisk
* server.
* @see EventGeneratingAction
- * @see org.asteriskjava.manager.event.ResponseEvent
+ * @see ResponseEvent
* @since 0.2
*/
ResponseEvents sendEventGeneratingAction(EventGeneratingAction action)
@@ -377,7 +380,7 @@ ResponseEvents sendEventGeneratingAction(EventGeneratingAction action)
/**
* Sends an {@link EventGeneratingAction} to the Asterisk server and waits
* for the corresponding {@link ManagerActionResponse} and the
- * {@link org.asteriskjava.manager.event.ResponseEvent}s
+ * {@link ResponseEvent}s
*
* EventGeneratingActions are {@link ManagerAction}s that don't return their
* response in the corresponding {@link ManagerActionResponse} but send a series
@@ -408,12 +411,14 @@ ResponseEvents sendEventGeneratingAction(EventGeneratingAction action)
* @throws IllegalStateException if you are not connected to an Asterisk
* server.
* @see EventGeneratingAction
- * @see org.asteriskjava.manager.event.ResponseEvent
+ * @see ResponseEvent
* @since 0.2
*/
ResponseEvents sendEventGeneratingAction(EventGeneratingAction action, long timeout)
throws IOException, EventTimeoutException, IllegalArgumentException, IllegalStateException;
+ ResponseEvents sendEventGeneratingAction(ManagerAction action, long timeout, Class actionCompleteEventClass) throws IOException, EventTimeoutException;
+
/**
* Asynchronously sends an {@link EventGeneratingAction} to the Asterisk
* server. This is similar to
@@ -431,7 +436,7 @@ void sendEventGeneratingAction(
/**
* Registers an event listener that is called whenever an
- * {@link org.asteriskjava.manager.event.ManagerEvent} is receiced from the
+ * {@link ManagerEvent} is receiced from the
* Asterisk server.
*
* Event listeners are notified about new events in the same order as they
diff --git a/src/main/java/org/asteriskjava/manager/ManagerConnectionFactory.java b/src/main/java/org/asteriskjava/manager/ManagerConnectionFactory.java
index 0a4c2963a..27c98a896 100644
--- a/src/main/java/org/asteriskjava/manager/ManagerConnectionFactory.java
+++ b/src/main/java/org/asteriskjava/manager/ManagerConnectionFactory.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
/**
* This factory is the canonical way to obtain new
diff --git a/src/main/java/org/asteriskjava/manager/ManagerEventListener.java b/src/main/java/org/asteriskjava/manager/ManagerEventListener.java
index bc829999e..41ba53249 100644
--- a/src/main/java/org/asteriskjava/manager/ManagerEventListener.java
+++ b/src/main/java/org/asteriskjava/manager/ManagerEventListener.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager;
-import org.asteriskjava.manager.event.ManagerEvent;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import java.util.EventListener;
@@ -26,7 +26,7 @@
*
* @author srt
* @version $Id$
- * @see org.asteriskjava.manager.event.ManagerEvent
+ * @see ManagerEvent
*/
public interface ManagerEventListener extends EventListener {
/**
diff --git a/src/main/java/org/asteriskjava/manager/ManagerEventListenerProxy.java b/src/main/java/org/asteriskjava/manager/ManagerEventListenerProxy.java
index 12050c8e8..0d8078e23 100644
--- a/src/main/java/org/asteriskjava/manager/ManagerEventListenerProxy.java
+++ b/src/main/java/org/asteriskjava/manager/ManagerEventListenerProxy.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager;
-import org.asteriskjava.manager.event.ManagerEvent;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.util.DaemonThreadFactory;
import java.util.concurrent.*;
@@ -9,7 +9,7 @@
* Proxies a ManagerEventListener and dispatches events asynchronously by using
* a single threaded executor.
* Use this proxy to prevent the reader thread from being blocked while your
- * application processes {@link org.asteriskjava.manager.event.ManagerEvent}s.
+ * application processes {@link ManagerEvent}s.
* If you want to use the {@link org.asteriskjava.manager.ManagerConnection} for
* sending actions in your {@link org.asteriskjava.manager.ManagerEventListener}
* using a proxy like this one is mandatory; otherwise you will always run into
diff --git a/src/main/java/org/asteriskjava/manager/PingThread.java b/src/main/java/org/asteriskjava/manager/PingThread.java
index b26dd4cf7..0caf4ca4a 100644
--- a/src/main/java/org/asteriskjava/manager/PingThread.java
+++ b/src/main/java/org/asteriskjava/manager/PingThread.java
@@ -16,10 +16,10 @@
*/
package org.asteriskjava.manager;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.PingAction;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
import org.asteriskjava.lock.LockableSet;
import org.asteriskjava.lock.Locker.LockCloser;
-import org.asteriskjava.manager.action.PingAction;
import org.asteriskjava.util.Log;
import org.asteriskjava.util.LogFactory;
diff --git a/src/main/java/org/asteriskjava/manager/ResponseEvents.java b/src/main/java/org/asteriskjava/manager/ResponseEvents.java
index 20b9a53ee..71a2db565 100644
--- a/src/main/java/org/asteriskjava/manager/ResponseEvents.java
+++ b/src/main/java/org/asteriskjava/manager/ResponseEvents.java
@@ -16,8 +16,9 @@
*/
package org.asteriskjava.manager;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
-import org.asteriskjava.manager.event.ResponseEvent;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import java.util.Collection;
@@ -26,7 +27,7 @@
* Contains the result of executing an
* {@link org.asteriskjava.manager.action.EventGeneratingAction}, that is the
* {@link ManagerActionResponse} and any received
- * {@link org.asteriskjava.manager.event.ManagerEvent}s.
+ * {@link ManagerEvent}s.
*
* @author srt
* @version $Id$
diff --git a/src/main/java/org/asteriskjava/manager/SendActionCallback.java b/src/main/java/org/asteriskjava/manager/SendActionCallback.java
index da8ad498a..5ca3bb26e 100644
--- a/src/main/java/org/asteriskjava/manager/SendActionCallback.java
+++ b/src/main/java/org/asteriskjava/manager/SendActionCallback.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager;
-import org.asteriskjava.ami.action.ManagerAction;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.ManagerAction;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
/**
* Callback interface to send {@link ManagerAction}s
diff --git a/src/main/java/org/asteriskjava/manager/SendEventGeneratingActionCallback.java b/src/main/java/org/asteriskjava/manager/SendEventGeneratingActionCallback.java
index 437c049ed..4a7585ab6 100644
--- a/src/main/java/org/asteriskjava/manager/SendEventGeneratingActionCallback.java
+++ b/src/main/java/org/asteriskjava/manager/SendEventGeneratingActionCallback.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
import org.asteriskjava.manager.response.ManagerError;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/AbsoluteTimeoutAction.java b/src/main/java/org/asteriskjava/manager/action/AbsoluteTimeoutAction.java
index 74abe9faf..48bf20de2 100644
--- a/src/main/java/org/asteriskjava/manager/action/AbsoluteTimeoutAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/AbsoluteTimeoutAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The AbsoluteTimeoutAction sets the absolute maximum amount of time permitted
diff --git a/src/main/java/org/asteriskjava/manager/action/AbstractMeetMeMuteAction.java b/src/main/java/org/asteriskjava/manager/action/AbstractMeetMeMuteAction.java
index eb4b8e033..136b8c5c7 100644
--- a/src/main/java/org/asteriskjava/manager/action/AbstractMeetMeMuteAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/AbstractMeetMeMuteAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* Abstract base class for mute and unmute actions.
diff --git a/src/main/java/org/asteriskjava/manager/action/AgentCallbackLoginAction.java b/src/main/java/org/asteriskjava/manager/action/AgentCallbackLoginAction.java
deleted file mode 100644
index e89f45cf1..000000000
--- a/src/main/java/org/asteriskjava/manager/action/AgentCallbackLoginAction.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-
-/**
- * The AgentCallbackLoginAction sets an agent as logged in with callback.
- * You can pass an extentsion (and optionally a context) to specify the
- * destination of the callback.
- * In contrast to the AgentCallbackLogin application that you can use within
- * Asterisk's dialplan, you don't need to know the agent's password when logging
- * in an agent.
- * Available since Asterisk 1.2, deprecated in Asterisk 1.4 and removed in Asterisk 1.6.
- *
- * @author srt
- * @version $Id$
- * @since 0.2
- * @deprecated use {@link org.asteriskjava.manager.action.QueueAddAction} instead.
- */
-@Deprecated
-public class AgentCallbackLoginAction extends AbstractManagerAction {
- /**
- * Serializable version identifier.
- */
- private static final long serialVersionUID = 5239805071977668779L;
- private String agent;
- private String exten;
- private String context;
- private Boolean ackCall;
- private Long wrapupTime;
-
- /**
- * Creates a new empty AgentCallbackLoginAction.
- */
- public AgentCallbackLoginAction() {
-
- }
-
- /**
- * Creates a new AgentCallbackLoginAction, that logs in the given agent at
- * the given callback extension.
- *
- * @param agent the name of the agent to log in
- * @param exten the extension that is called to connect a queue member with
- * this agent
- */
- public AgentCallbackLoginAction(String agent, String exten) {
- this.agent = agent;
- this.exten = exten;
- }
-
- /**
- * Creates a new AgentCallbackLoginAction, that logs in the given agent at
- * the given callback extension in the given context.
- *
- * @param agent the name of the agent to log in
- * @param exten the extension that is called to connect a queue member with
- * this agent
- * @param context the context of the extension to use for callback
- */
- public AgentCallbackLoginAction(String agent, String exten, String context) {
- this(agent, exten);
- this.context = context;
- }
-
- /**
- * Creates a new AgentCallbackLoginAction, that logs in the given agent at
- * the given callback extension in the given context.
- *
- * @param agent the name of the agent to log in
- * @param exten the extension that is called to connect a queue member with
- * this agent
- * @param context the context of the extension to use for callback
- * @param ackCall Boolean.TRUE to require an acknowledgement by
- * '#' when agent is called back, Boolean.FALSE otherwise.
- * null if default should be used.
- * @param wrapupTime the minimum amount of time (in seconds) after disconnecting before
- * the caller can receive a new call.
- * null if default should be used.
- * @since 1.0.0
- */
- public AgentCallbackLoginAction(String agent, String exten, String context, Boolean ackCall, Long wrapupTime) {
- this(agent, exten, context);
- this.ackCall = ackCall;
- this.wrapupTime = wrapupTime;
- }
-
- /**
- * Returns the name of this action, i.e. "AgentCallbackLogin".
- *
- * @return the name of this action
- */
- @Override
- public String getAction() {
- return "AgentCallbackLogin";
- }
-
- /**
- * Returns the name of the agent to log in, for example "1002".
- *
- * @return the name of the agent to log in
- */
- public String getAgent() {
- return agent;
- }
-
- /**
- * Sets the name of the agent to log in, for example "1002".
- * This is property is mandatory.
- *
- * @param agent the name of the agent to log in
- */
- public void setAgent(String agent) {
- this.agent = agent;
- }
-
- /**
- * Returns the extension to use for callback.
- *
- * @return the extension to use for callback.
- */
- public String getExten() {
- return exten;
- }
-
- /**
- * Sets the extension to use for callback.
- * This is property is mandatory.
- *
- * @param exten the extension to use for callback.
- */
- public void setExten(String exten) {
- this.exten = exten;
- }
-
- /**
- * Returns the context of the extension to use for callback.
- *
- * @return the context of the extension to use for callback.
- */
- public String getContext() {
- return context;
- }
-
- /**
- * Sets the context of the extension to use for callback.
- *
- * @param context the context of the extension to use for callback.
- */
- public void setContext(String context) {
- this.context = context;
- }
-
- /**
- * Returns if an acknowledgement is needed when agent is called back.
- *
- * @return Boolean.TRUE if acknowledgement by '#' is required when agent is
- * called back, Boolean.FALSE otherwise. null if
- * default should be used.
- */
- public Boolean getAckCall() {
- return ackCall;
- }
-
- /**
- * Sets if an acknowledgement is needed when agent is called back.
- * This property is optional, it allows you to override the defaults defined
- * in Asterisk's configuration.
- *
- * @param ackCall Boolean.TRUE to require an acknowledgement by
- * '#' when agent is called back, Boolean.FALSE otherwise.
- * null if default should be used.
- */
- public void setAckCall(Boolean ackCall) {
- this.ackCall = ackCall;
- }
-
- /**
- * Returns the minimum amount of time after disconnecting before the caller
- * can receive a new call.
- *
- * @return the minimum amount of time after disconnecting before the caller
- * can receive a new call in seconds.
- */
- public Long getWrapupTime() {
- return wrapupTime;
- }
-
- /**
- * Sets the minimum amount of time after disconnecting before the caller can
- * receive a new call.
- * This property is optional, it allows you to override the defaults defined
- * in Asterisk's configuration.
- *
- * @param wrapupTime the minimum amount of time (in seconds) after disconnecting before
- * the caller can receive a new call.
- * null if default should be used.
- */
- public void setWrapupTime(Long wrapupTime) {
- this.wrapupTime = wrapupTime;
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/AgentLogoffAction.java b/src/main/java/org/asteriskjava/manager/action/AgentLogoffAction.java
index b9acc9274..24fa9a151 100644
--- a/src/main/java/org/asteriskjava/manager/action/AgentLogoffAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/AgentLogoffAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The AgentLogoffAction sets an agent as no longer logged in.
diff --git a/src/main/java/org/asteriskjava/manager/action/AgentsAction.java b/src/main/java/org/asteriskjava/manager/action/AgentsAction.java
index 8619fff33..13a174da0 100644
--- a/src/main/java/org/asteriskjava/manager/action/AgentsAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/AgentsAction.java
@@ -16,9 +16,9 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.AgentsCompleteEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* The AgentsAction requests the state of all agents.
diff --git a/src/main/java/org/asteriskjava/manager/action/AgiAction.java b/src/main/java/org/asteriskjava/manager/action/AgiAction.java
index 326909881..eae9ad0fd 100644
--- a/src/main/java/org/asteriskjava/manager/action/AgiAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/AgiAction.java
@@ -16,9 +16,9 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.AsyncAgiEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* Add a new AGI command to execute by the Async AGI application.
diff --git a/src/main/java/org/asteriskjava/manager/action/AtxferAction.java b/src/main/java/org/asteriskjava/manager/action/AtxferAction.java
index 7054962be..f5e946d10 100644
--- a/src/main/java/org/asteriskjava/manager/action/AtxferAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/AtxferAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* Starts an attended transfer. This action seems to be a bit of a hack. See
diff --git a/src/main/java/org/asteriskjava/manager/action/BridgeAction.java b/src/main/java/org/asteriskjava/manager/action/BridgeAction.java
index 395bcb3be..3a993f610 100644
--- a/src/main/java/org/asteriskjava/manager/action/BridgeAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/BridgeAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The BridgeAction bridges two channels that are currently active on the system.
diff --git a/src/main/java/org/asteriskjava/manager/action/ChangeMonitorAction.java b/src/main/java/org/asteriskjava/manager/action/ChangeMonitorAction.java
index c0242123f..d3bbc31d9 100644
--- a/src/main/java/org/asteriskjava/manager/action/ChangeMonitorAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ChangeMonitorAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ChangeMonitorAction changes the monitoring filename of a channel. It has
diff --git a/src/main/java/org/asteriskjava/manager/action/CommandAction.java b/src/main/java/org/asteriskjava/manager/action/CommandAction.java
deleted file mode 100644
index 9e90ef49f..000000000
--- a/src/main/java/org/asteriskjava/manager/action/CommandAction.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-import org.asteriskjava.ami.action.annotation.ExpectedResponse;
-import org.asteriskjava.manager.response.CommandResponse;
-
-/**
- * The CommandAction sends a command line interface (CLI) command to the
- * asterisk server.
- * For a list of supported commands type help on Asterisk's
- * command line.
- * In response to a CommandAction you will receive a CommandResponse that
- * contains the CLI output.
- * Example:
- *
- * CommandAction commandAction = new CommandAction("iax2 show peers");
- * CommandResponse response = (CommandResponse) c.sendAction(commandAction);
- * for (String line : response.getResult())
- * {
- * System.out.println(line);
- * }
- *
- * Where c is an instance of
- * {@link org.asteriskjava.manager.ManagerConnection}.
- *
- * @author srt
- * @version $Id$
- * @see org.asteriskjava.manager.response.CommandResponse
- */
-@ExpectedResponse(CommandResponse.class)
-public class CommandAction extends AbstractManagerAction {
- static final long serialVersionUID = 4753117770471622025L;
- protected String command;
-
- /**
- * Creates a new CommandAction.
- */
- public CommandAction() {
-
- }
-
- /**
- * Creates a new CommandAction with the given command.
- *
- * @param command the CLI command to execute.
- * @since 0.2
- */
- public CommandAction(String command) {
- this.command = command;
- }
-
- /**
- * Returns the name of this action, i.e. "Command".
- */
- @Override
- public String getAction() {
- return "Command";
- }
-
- /**
- * Returns the command.
- */
- public String getCommand() {
- return command;
- }
-
- /**
- * Sets the CLI command to send to the Asterisk server.
- */
- public void setCommand(String command) {
- this.command = command;
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/ConfbridgeKickAction.java b/src/main/java/org/asteriskjava/manager/action/ConfbridgeKickAction.java
index 0e6a56528..7ee7ccb26 100644
--- a/src/main/java/org/asteriskjava/manager/action/ConfbridgeKickAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ConfbridgeKickAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ConfbridgeKickAction kicks a channel out of a conference.
diff --git a/src/main/java/org/asteriskjava/manager/action/ConfbridgeListAction.java b/src/main/java/org/asteriskjava/manager/action/ConfbridgeListAction.java
index 9a015b4ca..4d72bf234 100644
--- a/src/main/java/org/asteriskjava/manager/action/ConfbridgeListAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ConfbridgeListAction.java
@@ -1,8 +1,8 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.ConfbridgeListCompleteEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* Lists all users in a particular ConfBridge conference. ConfbridgeList will follow as separate events,
diff --git a/src/main/java/org/asteriskjava/manager/action/ConfbridgeListRoomsAction.java b/src/main/java/org/asteriskjava/manager/action/ConfbridgeListRoomsAction.java
index e79d9ee3a..dc5fc5650 100644
--- a/src/main/java/org/asteriskjava/manager/action/ConfbridgeListRoomsAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ConfbridgeListRoomsAction.java
@@ -1,8 +1,8 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.ConfbridgeListRoomsCompleteEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* Lists data about all active conferences. ConfbridgeListRoomsEvent will follow
diff --git a/src/main/java/org/asteriskjava/manager/action/ConfbridgeLockAction.java b/src/main/java/org/asteriskjava/manager/action/ConfbridgeLockAction.java
index c5e082f7a..b2bde4c29 100644
--- a/src/main/java/org/asteriskjava/manager/action/ConfbridgeLockAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ConfbridgeLockAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ConfbridgeLockAction lockes a specified conference.
diff --git a/src/main/java/org/asteriskjava/manager/action/ConfbridgeMuteAction.java b/src/main/java/org/asteriskjava/manager/action/ConfbridgeMuteAction.java
index 7867d6fae..1716d3714 100644
--- a/src/main/java/org/asteriskjava/manager/action/ConfbridgeMuteAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ConfbridgeMuteAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ConfbridgeMuteAction mutes a channel in a conference.
diff --git a/src/main/java/org/asteriskjava/manager/action/ConfbridgeSetSingleVideoSrcAction.java b/src/main/java/org/asteriskjava/manager/action/ConfbridgeSetSingleVideoSrcAction.java
index c99877082..8c40bb590 100644
--- a/src/main/java/org/asteriskjava/manager/action/ConfbridgeSetSingleVideoSrcAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ConfbridgeSetSingleVideoSrcAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ConfbridgeSetSingleVideoSrcAction sets a conference user as the single video source distributed to all other video-capable participants.
diff --git a/src/main/java/org/asteriskjava/manager/action/ConfbridgeStartRecordAction.java b/src/main/java/org/asteriskjava/manager/action/ConfbridgeStartRecordAction.java
index 93d009a89..95e31ad21 100644
--- a/src/main/java/org/asteriskjava/manager/action/ConfbridgeStartRecordAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ConfbridgeStartRecordAction.java
@@ -15,7 +15,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ConfbridgeStartAction starts an audio recording of a conference.
diff --git a/src/main/java/org/asteriskjava/manager/action/ConfbridgeStopRecordAction.java b/src/main/java/org/asteriskjava/manager/action/ConfbridgeStopRecordAction.java
index d7993d36f..3563d837e 100644
--- a/src/main/java/org/asteriskjava/manager/action/ConfbridgeStopRecordAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ConfbridgeStopRecordAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ConfbridgeStopAction stops an audio recording of a conference.
diff --git a/src/main/java/org/asteriskjava/manager/action/ConfbridgeUnlockAction.java b/src/main/java/org/asteriskjava/manager/action/ConfbridgeUnlockAction.java
index 8598c76c0..61cf3f797 100644
--- a/src/main/java/org/asteriskjava/manager/action/ConfbridgeUnlockAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ConfbridgeUnlockAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ConfbridgeUnlockAction unlocks a specified conference.
diff --git a/src/main/java/org/asteriskjava/manager/action/ConfbridgeUnmuteAction.java b/src/main/java/org/asteriskjava/manager/action/ConfbridgeUnmuteAction.java
index eb57d8e1b..c98693f46 100644
--- a/src/main/java/org/asteriskjava/manager/action/ConfbridgeUnmuteAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ConfbridgeUnmuteAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ConfbridgeUnmuteAction unmutes a channel in a conference.
diff --git a/src/main/java/org/asteriskjava/manager/action/CoreSettingsAction.java b/src/main/java/org/asteriskjava/manager/action/CoreSettingsAction.java
deleted file mode 100644
index b16db8980..000000000
--- a/src/main/java/org/asteriskjava/manager/action/CoreSettingsAction.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-import org.asteriskjava.ami.action.annotation.ExpectedResponse;
-import org.asteriskjava.manager.response.CoreSettingsResponse;
-
-/**
- * The CoreStatusAction requests a settings summary from the server. The settings
- * include the version, system name, and various system limits.
- * It returns a {@link org.asteriskjava.manager.response.CoreSettingsResponse}.
- * Available since Asterisk 1.6.0
- *
- * @author srt
- * @version $Id$
- * @see org.asteriskjava.manager.response.CoreSettingsResponse
- * @since 1.0.0
- */
-@ExpectedResponse(CoreSettingsResponse.class)
-public class CoreSettingsAction extends AbstractManagerAction {
- static final long serialVersionUID = 1L;
-
- /**
- * Creates a new CoreSettingsAction.
- */
- public CoreSettingsAction() {
-
- }
-
- /**
- * Returns the name of this action, i.e. "CoreSettings".
- */
- @Override
- public String getAction() {
- return "CoreSettings";
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/CoreShowChannelsAction.java b/src/main/java/org/asteriskjava/manager/action/CoreShowChannelsAction.java
index b090d0c33..2061eb6ef 100644
--- a/src/main/java/org/asteriskjava/manager/action/CoreShowChannelsAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/CoreShowChannelsAction.java
@@ -17,9 +17,9 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.CoreShowChannelsCompleteEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* The CoreShowChannelsAction requests the state of all active channels.
diff --git a/src/main/java/org/asteriskjava/manager/action/CoreStatusAction.java b/src/main/java/org/asteriskjava/manager/action/CoreStatusAction.java
deleted file mode 100644
index fc90e99dc..000000000
--- a/src/main/java/org/asteriskjava/manager/action/CoreStatusAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-import org.asteriskjava.ami.action.annotation.ExpectedResponse;
-import org.asteriskjava.manager.response.CoreStatusResponse;
-
-/**
- * The CoreStatusAction requests a status summary from the server.
- * It returns a {@link org.asteriskjava.manager.response.CoreStatusResponse}.
- * Available since Asterisk 1.6.0
- *
- * @author srt
- * @version $Id$
- * @see org.asteriskjava.manager.response.CoreStatusResponse
- * @since 1.0.0
- */
-@ExpectedResponse(CoreStatusResponse.class)
-public class CoreStatusAction extends AbstractManagerAction {
- static final long serialVersionUID = 1L;
-
- /**
- * Creates a new CoreStatusAction.
- */
- public CoreStatusAction() {
-
- }
-
- /**
- * Returns the name of this action, i.e. "CoreStatus".
- */
- @Override
- public String getAction() {
- return "CoreStatus";
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/DahdiShowChannelsAction.java b/src/main/java/org/asteriskjava/manager/action/DahdiShowChannelsAction.java
index f08014abc..3433d1d75 100644
--- a/src/main/java/org/asteriskjava/manager/action/DahdiShowChannelsAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/DahdiShowChannelsAction.java
@@ -16,9 +16,9 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.DahdiShowChannelsCompleteEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* The DahdiShowChannelsAction requests the state of all Dahdi channels.
diff --git a/src/main/java/org/asteriskjava/manager/action/DbDelAction.java b/src/main/java/org/asteriskjava/manager/action/DbDelAction.java
deleted file mode 100644
index f2435efa7..000000000
--- a/src/main/java/org/asteriskjava/manager/action/DbDelAction.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-
-/**
- * Deletes an entry in the Asterisk database for a given family and key.
- * Available since Asterisk 1.2 with BRIStuff patches and since Asterisk 1.6
- *
- * @author gmi
- */
-public class DbDelAction extends AbstractManagerAction {
- private static final long serialVersionUID = 921037572305993779L;
- private String family;
- private String key;
-
- /**
- * Creates a new empty DbDelAction.
- */
- public DbDelAction() {
-
- }
-
- /**
- * Creates a new DbDelAction that deletes the value of the database
- *
- * @param family the family of the key
- * @param key the key of the entry to delete
- */
- public DbDelAction(String family, String key) {
- this.family = family;
- this.key = key;
- }
-
- @Override
- public String getAction() {
- return "DBDel";
- }
-
- /**
- * Returns the family of the key to delete
- *
- * @return the family of the key to delete
- */
- public String getFamily() {
- return family;
- }
-
- /**
- * Sets the family of the key to delete
- *
- * @param family the family of the key to delete
- */
- public void setFamily(String family) {
- this.family = family;
- }
-
- /**
- * Returns the the key to delete
- *
- * @return the key to delete
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Sets the key to delete
- *
- * @param key the key to delete
- */
- public void setKey(String key) {
- this.key = key;
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/DbDelTreeAction.java b/src/main/java/org/asteriskjava/manager/action/DbDelTreeAction.java
deleted file mode 100644
index ae47f72ff..000000000
--- a/src/main/java/org/asteriskjava/manager/action/DbDelTreeAction.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-
-/**
- * Recursivly deletes entries in the Asterisk database for a given family and key.
- * Available since Asterisk 1.6
- *
- * @author gmi
- * @since 1.0.0
- */
-public class DbDelTreeAction extends AbstractManagerAction {
- private static final long serialVersionUID = 1L;
- private String family;
- private String key;
-
- /**
- * Creates a new empty DbDelTreeAction.
- */
- public DbDelTreeAction() {
-
- }
-
- /**
- * Creates a new DbDelTreeAction.
- *
- * @param family the family of the key
- * @param key the key of the entries to delete
- */
- public DbDelTreeAction(String family, String key) {
- this.family = family;
- this.key = key;
- }
-
- @Override
- public String getAction() {
- return "DBDelTree";
- }
-
- /**
- * Returns the family of the key to delete.
- *
- * @return the family of the key to delete
- */
- public String getFamily() {
- return family;
- }
-
- /**
- * Sets the family of the key to delete.
- *
- * @param family the family of the key to delete
- */
- public void setFamily(String family) {
- this.family = family;
- }
-
- /**
- * Returns the the key to delete.
- *
- * @return the key to delete
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Sets the key to delete.
- *
- * @param key the key to delete
- */
- public void setKey(String key) {
- this.key = key;
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/DbGetAction.java b/src/main/java/org/asteriskjava/manager/action/DbGetAction.java
deleted file mode 100644
index cfa8670f7..000000000
--- a/src/main/java/org/asteriskjava/manager/action/DbGetAction.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-import org.asteriskjava.manager.event.DbGetResponseEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
-
-/**
- * Retrieves an entry in the Asterisk database for a given family and key.
- * If an entry is found a DBGetResponseEvent is sent by Asterisk containing the
- * value, otherwise a ManagerError indicates that no entry matches.
- * It is implemented in main/db.c.
- * Available since Asterisk 1.2
- *
- * @author srt
- * @version $Id$
- * @see org.asteriskjava.manager.event.DbGetResponseEvent
- * @since 0.2
- */
-public class DbGetAction extends AbstractManagerAction implements EventGeneratingAction {
- /**
- * Serial version identifier
- */
- private static final long serialVersionUID = 921037572305993779L;
- private String family;
- private String key;
-
- /**
- * Creates a new empty DbGetAction.
- */
- public DbGetAction() {
-
- }
-
- /**
- * Creates a new DbGetAction that retrieves the value of the database entry
- * with the given key in the given family.
- *
- * @param family the family of the key
- * @param key the key of the entry to retrieve
- * @since 0.2
- */
- public DbGetAction(String family, String key) {
- this.family = family;
- this.key = key;
- }
-
- @Override
- public String getAction() {
- return "DBGet";
- }
-
- /**
- * Returns the family of the key.
- *
- * @return the family of the key.
- */
- public String getFamily() {
- return family;
- }
-
- /**
- * Sets the family of the key.
- *
- * @param family the family of the key.
- */
- public void setFamily(String family) {
- this.family = family;
- }
-
- /**
- * Returns the the key of the entry to retrieve.
- *
- * @return the key of the entry to retrieve.
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Sets the key of the entry to retrieve.
- *
- * @param key the key of the entry to retrieve.
- */
- public void setKey(String key) {
- this.key = key;
- }
-
- public Class getActionCompleteEventClass() {
- return DbGetResponseEvent.class;
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/DbPutAction.java b/src/main/java/org/asteriskjava/manager/action/DbPutAction.java
deleted file mode 100644
index ccfb9c52c..000000000
--- a/src/main/java/org/asteriskjava/manager/action/DbPutAction.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-
-/**
- * Adds or updates an entry in the Asterisk database for a given family, key,
- * and value.
- * Available since Asterisk 1.2
- *
- * @author srt
- * @version $Id$
- * @since 0.2
- */
-public class DbPutAction extends AbstractManagerAction {
- /**
- * Serial version identifier.
- */
- private static final long serialVersionUID = 921037572305993779L;
- private String family;
- private String key;
- private String val;
-
- /**
- * Creates a new empty DbPutAction.
- */
- public DbPutAction() {
-
- }
-
- /**
- * Creates a new DbPutAction that sets the value of the database entry with
- * the given key in the given family.
- *
- * @param family the family of the key
- * @param key the key of the entry to set
- * @param val the value to set
- * @since 0.2
- */
- public DbPutAction(String family, String key, String val) {
- this.family = family;
- this.key = key;
- this.val = val;
- }
-
- @Override
- public String getAction() {
- return "DBPut";
- }
-
- /**
- * Returns the family of the key to set.
- *
- * @return the family of the key to set.
- */
- public String getFamily() {
- return family;
- }
-
- /**
- * Sets the family of the key to set.
- *
- * @param family the family of the key to set.
- */
- public void setFamily(String family) {
- this.family = family;
- }
-
- /**
- * Returns the the key to set.
- *
- * @return the key to set.
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Sets the key to set.
- *
- * @param key the key to set.
- */
- public void setKey(String key) {
- this.key = key;
- }
-
- /**
- * Returns the value to set.
- *
- * @return the value to set.
- */
- public String getVal() {
- return val;
- }
-
- /**
- * Sets the value to set.
- *
- * @param val the value to set.
- */
- public void setVal(String val) {
- this.val = val;
- }
-
- /**
- * Returns the value to set for BRIstuffed versions.
- *
- * @return the value to set.
- * @since 1.0.0
- */
- public String getValue() {
- return val;
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/DongleSendSMSAction.java b/src/main/java/org/asteriskjava/manager/action/DongleSendSMSAction.java
index b8e240351..dbd664e6e 100644
--- a/src/main/java/org/asteriskjava/manager/action/DongleSendSMSAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/DongleSendSMSAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
public class DongleSendSMSAction extends AbstractManagerAction {
static final long serialVersionUID = 8194597741743334704L;
diff --git a/src/main/java/org/asteriskjava/manager/action/DongleShowDevicesAction.java b/src/main/java/org/asteriskjava/manager/action/DongleShowDevicesAction.java
index 2d82a66bf..132450db3 100644
--- a/src/main/java/org/asteriskjava/manager/action/DongleShowDevicesAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/DongleShowDevicesAction.java
@@ -1,8 +1,8 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.DongleShowDevicesCompleteEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
public class DongleShowDevicesAction extends AbstractManagerAction
diff --git a/src/main/java/org/asteriskjava/manager/action/EventGeneratingAction.java b/src/main/java/org/asteriskjava/manager/action/EventGeneratingAction.java
index 36437a168..f5f637c47 100644
--- a/src/main/java/org/asteriskjava/manager/action/EventGeneratingAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/EventGeneratingAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.ManagerAction;
-import org.asteriskjava.manager.event.ResponseEvent;
+import org.asteriskjava.ami.action.api.ManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
/**
* The EventGeneratingAction interface is implemented by ManagerActions that
@@ -28,7 +28,7 @@
*
* @author srt
* @version $Id$
- * @see org.asteriskjava.manager.event.ResponseEvent
+ * @see ResponseEvent
* @since 0.2
*/
public interface EventGeneratingAction extends ManagerAction {
@@ -37,7 +37,7 @@ public interface EventGeneratingAction extends ManagerAction {
* response events for this action.
*
* @return a Class that is an instance of ResponseEvent.
- * @see org.asteriskjava.manager.event.ResponseEvent
+ * @see ResponseEvent
*/
Class getActionCompleteEventClass();
}
diff --git a/src/main/java/org/asteriskjava/manager/action/EventsAction.java b/src/main/java/org/asteriskjava/manager/action/EventsAction.java
deleted file mode 100644
index 86b8ed1c9..000000000
--- a/src/main/java/org/asteriskjava/manager/action/EventsAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-
-/**
- * With the EventsAction you can specify what kind of events should be sent to
- * this manager connection.
- *
- * @author srt
- * @version $Id$
- */
-public class EventsAction extends AbstractManagerAction {
- /**
- * Serializable version identifier.
- */
- static final long serialVersionUID = -8042435402644984875L;
-
- private String eventMask;
-
- /**
- * Creates a new empty EventsAction.
- */
- public EventsAction() {
-
- }
-
- /**
- * Creates a new EventsAction that applies the given event mask to the
- * current manager connection.
- *
- * @param eventMask the event mask. Set to "on" if all events should be
- * send, "off" if not events should be sent or a combination of
- * "system", "call" and "log" (separated by ',') to specify what
- * kind of events should be sent.
- * @since 0.2
- */
- public EventsAction(String eventMask) {
- this.eventMask = eventMask;
- }
-
- /**
- * Returns the name of this action, i.e. "Events".
- */
- @Override
- public String getAction() {
- return "Events";
- }
-
- /**
- * Returns the event mask.
- */
- public String getEventMask() {
- return eventMask;
- }
-
- /**
- * Sets the event mask.
- * Set to "on" if all events should be send, "off" if not events should be
- * sent or a combination of "system", "call" and "log" (separated by ',') to
- * specify what kind of events should be sent.
- */
- public void setEventMask(String eventMask) {
- this.eventMask = eventMask;
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/ExecAction.java b/src/main/java/org/asteriskjava/manager/action/ExecAction.java
index ae74418e1..8eca8fff6 100644
--- a/src/main/java/org/asteriskjava/manager/action/ExecAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ExecAction.java
@@ -16,9 +16,9 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
import org.asteriskjava.ami.action.annotation.ExpectedResponse;
-import org.asteriskjava.manager.response.CommandResponse;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.CommandActionResponse;
/**
* The CommandAction sends a command line interface (CLI) command to the
@@ -46,9 +46,9 @@
*
* @author srt
* @version $Id$
- * @see org.asteriskjava.manager.response.CommandResponse
+ * @see CommandActionResponse
*/
-@ExpectedResponse(CommandResponse.class)
+@ExpectedResponse(CommandActionResponse.class)
public class ExecAction extends AbstractManagerAction {
static final long serialVersionUID = 4753117770471622025L;
protected String command;
diff --git a/src/main/java/org/asteriskjava/manager/action/ExtensionStateAction.java b/src/main/java/org/asteriskjava/manager/action/ExtensionStateAction.java
index 2524303c4..8ba382e79 100644
--- a/src/main/java/org/asteriskjava/manager/action/ExtensionStateAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ExtensionStateAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
import org.asteriskjava.ami.action.annotation.ExpectedResponse;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
import org.asteriskjava.manager.response.ExtensionStateResponse;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/FilterAction.java b/src/main/java/org/asteriskjava/manager/action/FilterAction.java
index 78aab42e6..fbcdef8de 100644
--- a/src/main/java/org/asteriskjava/manager/action/FilterAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/FilterAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The FilterAction dynamically adds filters for the current user in a manager session.
diff --git a/src/main/java/org/asteriskjava/manager/action/GetConfigAction.java b/src/main/java/org/asteriskjava/manager/action/GetConfigAction.java
index 36f18b6e8..fa0eff40d 100644
--- a/src/main/java/org/asteriskjava/manager/action/GetConfigAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/GetConfigAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
import org.asteriskjava.ami.action.annotation.ExpectedResponse;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
import org.asteriskjava.manager.response.GetConfigResponse;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/GetVarAction.java b/src/main/java/org/asteriskjava/manager/action/GetVarAction.java
index aa61c705d..01939aca7 100644
--- a/src/main/java/org/asteriskjava/manager/action/GetVarAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/GetVarAction.java
@@ -16,9 +16,9 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
import org.asteriskjava.ami.action.annotation.ExpectedResponse;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
import org.asteriskjava.manager.response.GetVarResponse;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/HangupAction.java b/src/main/java/org/asteriskjava/manager/action/HangupAction.java
index 30369e5ba..54d1e284b 100644
--- a/src/main/java/org/asteriskjava/manager/action/HangupAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/HangupAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The HangupAction causes Asterisk to hang up a given channel.
diff --git a/src/main/java/org/asteriskjava/manager/action/IaxPeerListAction.java b/src/main/java/org/asteriskjava/manager/action/IaxPeerListAction.java
index 58425c3a6..973b9e4ed 100644
--- a/src/main/java/org/asteriskjava/manager/action/IaxPeerListAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/IaxPeerListAction.java
@@ -16,9 +16,9 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.PeerlistCompleteEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* Retrieves a list of all defined IAX peers.
diff --git a/src/main/java/org/asteriskjava/manager/action/JabberSendAction.java b/src/main/java/org/asteriskjava/manager/action/JabberSendAction.java
index d09e60ebc..e8b02e4e7 100644
--- a/src/main/java/org/asteriskjava/manager/action/JabberSendAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/JabberSendAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The JabberSendAction sends a Jabber (XMPP) message to a recipient.
diff --git a/src/main/java/org/asteriskjava/manager/action/ListCommandsAction.java b/src/main/java/org/asteriskjava/manager/action/ListCommandsAction.java
deleted file mode 100644
index ab9e8676d..000000000
--- a/src/main/java/org/asteriskjava/manager/action/ListCommandsAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2004-2007 Stefan Reuter and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
-
-/**
- * The ListCommandsAction returns possible commands in the Manager interface.
- *
- * Use the getAttributes method on the ManagerResponse for a map of commands and explanations.
- *
- * @author martins
- * @see ManagerActionResponse#getAttributes()
- * @since 0.3
- */
-public class ListCommandsAction extends AbstractManagerAction {
- /**
- * Serializable version identifier
- */
- private static final long serialVersionUID = -2651441681309280764L;
-
- /**
- * Creates a new ListCommandsAction.
- */
- public ListCommandsAction() {
-
- }
-
- /**
- * Returns the name of this action, i.e. "ListCommands".
- */
- @Override
- public String getAction() {
- return "ListCommands";
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/LocalOptimizeAwayAction.java b/src/main/java/org/asteriskjava/manager/action/LocalOptimizeAwayAction.java
index 70087c2bb..1798a981f 100644
--- a/src/main/java/org/asteriskjava/manager/action/LocalOptimizeAwayAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/LocalOptimizeAwayAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* LocalOptimizeAway action -- Optimize away a local channel when possible.
diff --git a/src/main/java/org/asteriskjava/manager/action/LoginAction.java b/src/main/java/org/asteriskjava/manager/action/LoginAction.java
deleted file mode 100644
index 655ff6624..000000000
--- a/src/main/java/org/asteriskjava/manager/action/LoginAction.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-import org.asteriskjava.ami.action.ChallengeAction;
-
-/**
- * The LoginAction authenticates the connection.
- * A successful login is the precondition for sending any other action except
- * for the ChallengeAction.
- * An unsuccessful login results in an ManagerError being received from the
- * server with a message set to "Authentication failed" and the socket being
- * closed by Asterisk.
- *
- * @author srt
- * @version $Id$
- * @see ChallengeAction
- * @see org.asteriskjava.manager.response.ManagerError
- */
-public class LoginAction extends AbstractManagerAction {
- /**
- * Serializable version identifier
- */
- static final long serialVersionUID = -2600694249339115032L;
-
- private String username;
- private String secret;
- private String authType;
- private String key;
- private String events;
-
- /**
- * Creates a new empty LoginAction.
- */
- public LoginAction() {
-
- }
-
- /**
- * Creates a new LoginAction that performs a cleartext login.
- * You should not use cleartext login if you are concerned about security,
- * using {@link ChallengeAction} and login with a password hash instead.
- *
- * @param username the username as configured in Asterisk's
- * manager.conf
- * @param secret the user's password as configured in Asterisk's
- * manager.conf
- * @since 0.2
- */
- public LoginAction(String username, String secret) {
- this.username = username;
- this.secret = secret;
- }
-
- /**
- * Creates a new LoginAction that performs a login via challenge/response.
- *
- * @param username the username as configured in Asterisk's
- * manager.conf
- * @param authType the digest alogrithm, must match the digest algorithm
- * that was used with the corresponding ChallengeAction.
- * @param key the hash of the user's password and the challenge
- * @since 0.2
- */
- public LoginAction(String username, String authType, String key) {
- this.username = username;
- this.authType = authType;
- this.key = key;
- }
-
- /**
- * Creates a new LoginAction that performs a login via challenge/response.
- *
- * @param username the username as configured in Asterisk's
- * manager.conf
- * @param authType the digest alogrithm, must match the digest algorithm
- * that was used with the corresponding ChallengeAction.
- * @param key the hash of the user's password and the challenge
- * @param events the event mask. Set to "on" if all events should be send,
- * "off" if not events should be sent or a combination of
- * "system", "call" and "log" (separated by ',') to specify what
- * kind of events should be sent.
- * @since 0.2
- */
- public LoginAction(String username, String authType, String key,
- String events) {
- this.username = username;
- this.authType = authType;
- this.key = key;
- this.events = events;
- }
-
- /**
- * Returns the name of this action, i.e. "Login".
- */
- @Override
- public String getAction() {
- return "Login";
- }
-
- /**
- * Returns the username.
- */
- public String getUsername() {
- return username;
- }
-
- /**
- * Sets the username as configured in asterik's manager.conf.
- */
- public void setUsername(String username) {
- this.username = username;
- }
-
- /**
- * Returns the secret.
- */
- public String getSecret() {
- return secret;
- }
-
- /**
- * Sets the secret to use when using cleartext login.
- * The secret contains the user's password as configured in Asterisk's
- * manager.conf.
- * The secret and key properties are mutually exclusive.
- */
- public void setSecret(String secret) {
- this.secret = secret;
- }
-
- /**
- * Returns the digest alogrithm when using challenge/response.
- */
- public String getAuthType() {
- return authType;
- }
-
- /**
- * Sets the digest alogrithm when using challenge/response.
- * The digest algorithm is used to create the key based on the challenge and
- * the user's password.
- * Currently Asterisk supports only "MD5".
- */
- public void setAuthType(String authType) {
- this.authType = authType;
- }
-
- /**
- * @return Returns the key.
- */
- public String getKey() {
- return key;
- }
-
- /**
- * @param key The key to set.
- */
- public void setKey(String key) {
- this.key = key;
- }
-
- /**
- * Returns the event mask.
- *
- * @return the event mask.
- */
- public String getEvents() {
- return events;
- }
-
- /**
- * Sets the event mask.
- *
- * @param events the event mask. Set to "on" if all events should be send,
- * "off" if not events should be sent or a combination of
- * "system", "call" and "log" (separated by ',') to specify what
- * kind of events should be sent.
- */
- public void setEvents(String events) {
- this.events = events;
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/LogoffAction.java b/src/main/java/org/asteriskjava/manager/action/LogoffAction.java
deleted file mode 100644
index 0f218d61f..000000000
--- a/src/main/java/org/asteriskjava/manager/action/LogoffAction.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-
-/**
- * The LogoffAction causes the server to close the connection.
- *
- * @author srt
- * @version $Id$
- */
-public class LogoffAction extends AbstractManagerAction {
- /**
- * Serializable version identifier
- */
- static final long serialVersionUID = -7576797478570238525L;
-
- /**
- * Creates a new LogoffAction.
- */
- public LogoffAction() {
-
- }
-
- /**
- * Returns the name of this action, i.e. "Logoff".
- */
- @Override
- public String getAction() {
- return "Logoff";
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/MWIDeleteAction.java b/src/main/java/org/asteriskjava/manager/action/MWIDeleteAction.java
index 5a5d0bfc4..ca46e8d1f 100644
--- a/src/main/java/org/asteriskjava/manager/action/MWIDeleteAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/MWIDeleteAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
public class MWIDeleteAction extends AbstractManagerAction {
static final long serialVersionUID = 1L;
diff --git a/src/main/java/org/asteriskjava/manager/action/MWIUpdateAction.java b/src/main/java/org/asteriskjava/manager/action/MWIUpdateAction.java
index dccb20e83..0dee254b0 100644
--- a/src/main/java/org/asteriskjava/manager/action/MWIUpdateAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/MWIUpdateAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
public class MWIUpdateAction extends AbstractManagerAction {
static final long serialVersionUID = 1L;
diff --git a/src/main/java/org/asteriskjava/manager/action/MailboxCountAction.java b/src/main/java/org/asteriskjava/manager/action/MailboxCountAction.java
index 28c5a6dba..469e886c8 100644
--- a/src/main/java/org/asteriskjava/manager/action/MailboxCountAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/MailboxCountAction.java
@@ -5,8 +5,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
import org.asteriskjava.ami.action.annotation.ExpectedResponse;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
import org.asteriskjava.manager.response.MailboxCountResponse;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/MailboxStatusAction.java b/src/main/java/org/asteriskjava/manager/action/MailboxStatusAction.java
index 39a674b47..66ccafb9e 100644
--- a/src/main/java/org/asteriskjava/manager/action/MailboxStatusAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/MailboxStatusAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
import org.asteriskjava.ami.action.annotation.ExpectedResponse;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
import org.asteriskjava.manager.response.MailboxStatusResponse;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/MessageSendAction.java b/src/main/java/org/asteriskjava/manager/action/MessageSendAction.java
index 1dcbc0e0a..bcfdee349 100644
--- a/src/main/java/org/asteriskjava/manager/action/MessageSendAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/MessageSendAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/src/main/java/org/asteriskjava/manager/action/MixMonitorAction.java b/src/main/java/org/asteriskjava/manager/action/MixMonitorAction.java
index e92a41a94..690dae446 100644
--- a/src/main/java/org/asteriskjava/manager/action/MixMonitorAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/MixMonitorAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
import org.asteriskjava.ami.action.annotation.ExpectedResponse;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
import org.asteriskjava.manager.response.MixMonitorResponse;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/MixMonitorMuteAction.java b/src/main/java/org/asteriskjava/manager/action/MixMonitorMuteAction.java
index 7fe589bba..fcad6f700 100644
--- a/src/main/java/org/asteriskjava/manager/action/MixMonitorMuteAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/MixMonitorMuteAction.java
@@ -15,7 +15,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* MixMonitorMute can be used to mute and un-mute an existing recording.
diff --git a/src/main/java/org/asteriskjava/manager/action/ModuleCheckAction.java b/src/main/java/org/asteriskjava/manager/action/ModuleCheckAction.java
index 4f4890822..d4b11a1d7 100644
--- a/src/main/java/org/asteriskjava/manager/action/ModuleCheckAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ModuleCheckAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
import org.asteriskjava.ami.action.annotation.ExpectedResponse;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
import org.asteriskjava.manager.response.ModuleCheckResponse;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/ModuleLoadAction.java b/src/main/java/org/asteriskjava/manager/action/ModuleLoadAction.java
index e242c6669..fa9d35ad4 100644
--- a/src/main/java/org/asteriskjava/manager/action/ModuleLoadAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ModuleLoadAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ModuleLoadAction loads, unloads or reloads Asterisk modules.
diff --git a/src/main/java/org/asteriskjava/manager/action/MonitorAction.java b/src/main/java/org/asteriskjava/manager/action/MonitorAction.java
index 344ebfd70..f8851de37 100644
--- a/src/main/java/org/asteriskjava/manager/action/MonitorAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/MonitorAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The MonitorAction starts monitoring (recording) a channel.
diff --git a/src/main/java/org/asteriskjava/manager/action/MuteAudioAction.java b/src/main/java/org/asteriskjava/manager/action/MuteAudioAction.java
index c037efc9a..dd8cd813f 100644
--- a/src/main/java/org/asteriskjava/manager/action/MuteAudioAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/MuteAudioAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* Action: MuteAudio Synopsis: Mute an audio stream Privilege: system,all
diff --git a/src/main/java/org/asteriskjava/manager/action/OriginateAction.java b/src/main/java/org/asteriskjava/manager/action/OriginateAction.java
index c48e2d26d..0456fabea 100644
--- a/src/main/java/org/asteriskjava/manager/action/OriginateAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/OriginateAction.java
@@ -16,9 +16,9 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.OriginateResponseEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
import org.asteriskjava.util.Log;
import org.asteriskjava.util.LogFactory;
diff --git a/src/main/java/org/asteriskjava/manager/action/PJSIPNotifyAction.java b/src/main/java/org/asteriskjava/manager/action/PJSIPNotifyAction.java
index ba356c7e1..a5a4215af 100644
--- a/src/main/java/org/asteriskjava/manager/action/PJSIPNotifyAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/PJSIPNotifyAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/src/main/java/org/asteriskjava/manager/action/PJSipShowContactsAction.java b/src/main/java/org/asteriskjava/manager/action/PJSipShowContactsAction.java
index 564ce865c..076f1430d 100644
--- a/src/main/java/org/asteriskjava/manager/action/PJSipShowContactsAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/PJSipShowContactsAction.java
@@ -16,9 +16,9 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.ContactListComplete;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* Retrieves a list of all defined PJSIP contacts.
diff --git a/src/main/java/org/asteriskjava/manager/action/PJSipShowEndpointAction.java b/src/main/java/org/asteriskjava/manager/action/PJSipShowEndpointAction.java
index ea5ded353..6af62a68c 100644
--- a/src/main/java/org/asteriskjava/manager/action/PJSipShowEndpointAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/PJSipShowEndpointAction.java
@@ -16,9 +16,9 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.EndpointDetailComplete;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* Retrieves details about a given endpoint.
diff --git a/src/main/java/org/asteriskjava/manager/action/PJSipShowEndpointsAction.java b/src/main/java/org/asteriskjava/manager/action/PJSipShowEndpointsAction.java
index 97a1140f5..c4a94f881 100644
--- a/src/main/java/org/asteriskjava/manager/action/PJSipShowEndpointsAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/PJSipShowEndpointsAction.java
@@ -16,9 +16,9 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.EndpointListComplete;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* Retrieves a list of all defined SIP peers.
diff --git a/src/main/java/org/asteriskjava/manager/action/ParkAction.java b/src/main/java/org/asteriskjava/manager/action/ParkAction.java
index 1e9533b6b..4a1d990e6 100644
--- a/src/main/java/org/asteriskjava/manager/action/ParkAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ParkAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ParkAction parks a channel using Asterisk's park feature.
diff --git a/src/main/java/org/asteriskjava/manager/action/ParkedCallsAction.java b/src/main/java/org/asteriskjava/manager/action/ParkedCallsAction.java
index ceb34f78c..5947624d7 100644
--- a/src/main/java/org/asteriskjava/manager/action/ParkedCallsAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ParkedCallsAction.java
@@ -16,9 +16,9 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.ParkedCallsCompleteEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* The ParkedCallsAction requests a list of all currently parked calls.
diff --git a/src/main/java/org/asteriskjava/manager/action/PauseMixMonitorAction.java b/src/main/java/org/asteriskjava/manager/action/PauseMixMonitorAction.java
index 940d88ae1..6d69a3430 100644
--- a/src/main/java/org/asteriskjava/manager/action/PauseMixMonitorAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/PauseMixMonitorAction.java
@@ -17,7 +17,7 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The PauseMixMonitorAction temporarily stop/start monitoring (recording) a/both channel(s).
diff --git a/src/main/java/org/asteriskjava/manager/action/PauseMonitorAction.java b/src/main/java/org/asteriskjava/manager/action/PauseMonitorAction.java
index 72caefefc..acd5a0e42 100644
--- a/src/main/java/org/asteriskjava/manager/action/PauseMonitorAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/PauseMonitorAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The PauseMonitorAction temporarily stop monitoring (recording) a channel.
diff --git a/src/main/java/org/asteriskjava/manager/action/PingAction.java b/src/main/java/org/asteriskjava/manager/action/PingAction.java
deleted file mode 100644
index 97fecb8dd..000000000
--- a/src/main/java/org/asteriskjava/manager/action/PingAction.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-import org.asteriskjava.ami.action.annotation.ExpectedResponse;
-import org.asteriskjava.manager.response.PingResponse;
-
-/**
- * The PingAction is used to keep the manager connection open and performs no operation.
- * Asterisk versions prior to 1.6 send a "Pong" response, since Asterisk 1.6 a
- * "Success" response is sent with a "Ping" property set to "Pong".
- *
- * @author srt
- * @version $Id$
- */
-@ExpectedResponse(PingResponse.class)
-public class PingAction extends AbstractManagerAction {
- /**
- * Serializable version identifier.
- */
- private static final long serialVersionUID = -2930397629192323391L;
-
- /**
- * Creates a new PingAction.
- */
- public PingAction() {
- super();
- }
-
- /**
- * Returns the name of this action, i.e. "Ping".
- */
- @Override
- public String getAction() {
- return "Ping";
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/PlayDtmfAction.java b/src/main/java/org/asteriskjava/manager/action/PlayDtmfAction.java
index e0a2b7846..4020a7536 100644
--- a/src/main/java/org/asteriskjava/manager/action/PlayDtmfAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/PlayDtmfAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The PlayDTMFAction plays a DTMF digit on the specified channel.
diff --git a/src/main/java/org/asteriskjava/manager/action/QueueAddAction.java b/src/main/java/org/asteriskjava/manager/action/QueueAddAction.java
deleted file mode 100644
index 2d22039ef..000000000
--- a/src/main/java/org/asteriskjava/manager/action/QueueAddAction.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-
-/**
- * The QueueAddAction adds a new member to a queue.
- * It is implemented in apps/app_queue.c
- * The memberName property was added in Asterisk 1.4, the
- * stateInterface property in Asterisk 1.6.
- *
- * @author srt
- * @version $Id$
- */
-public class QueueAddAction extends AbstractManagerAction {
- private static final long serialVersionUID = 2L;
- private String queue;
- private String iface;
- private Integer penalty;
- private Boolean paused;
- private String memberName;
- private String stateInterface;
-
- /**
- * Creates a new empty QueueAddAction.
- */
- public QueueAddAction() {
-
- }
-
- /**
- * Creates a new QueueAddAction that adds a new member on the given
- * interface to the given queue.
- *
- * @param queue the name of the queue the new member will be added to
- * @param iface Sets the interface to add. To add a specific channel just
- * use the channel name, e.g. "SIP/1234".
- * @since 0.2
- */
- public QueueAddAction(String queue, String iface) {
- this.queue = queue;
- this.iface = iface;
- }
-
- /**
- * Creates a new QueueAddAction that adds a new member on the given
- * interface to the given queue with the given penalty.
- *
- * @param queue the name of the queue the new member will be added to
- * @param iface Sets the interface to add. To add a specific channel just
- * use the channel name, e.g. "SIP/1234".
- * @param penalty the penalty for this member. The penalty must be a
- * positive integer or 0 for no penalty. When calls are
- * distributed members with higher penalties are considered last.
- * @since 0.2
- */
- public QueueAddAction(String queue, String iface, Integer penalty) {
- this.queue = queue;
- this.iface = iface;
- this.penalty = penalty;
- }
-
- /**
- * Returns the name of this action, i.e. "QueueAdd".
- */
- @Override
- public String getAction() {
- return "QueueAdd";
- }
-
- /**
- * Returns the name of the queue the new member will be added to.
- *
- * @return the name of the queue the new member will be added to.
- */
- public String getQueue() {
- return queue;
- }
-
- /**
- * Sets the name of the queue the new member will be added to.
- * This property is mandatory.
- *
- * @param queue the name of the queue the new member will be added to.
- */
- public void setQueue(String queue) {
- this.queue = queue;
- }
-
- /**
- * Returns the name of the channel to dial to reach this member.
- *
- * @return the name of the channel to dial to reach this member.
- */
- public String getInterface() {
- return iface;
- }
-
- /**
- * Sets the name of the channel (Technology/Location) to dial to reach this member.
- * This property is mandatory.
- *
- * @param iface the name of the channel to dial to reach this member, e.g. "SIP/1234".
- */
- public void setInterface(String iface) {
- this.iface = iface;
- }
-
- /**
- * Returns the penalty for this member.
- *
- * @return the penalty for this member.
- */
- public Integer getPenalty() {
- return penalty;
- }
-
- /**
- * Sets the penalty for this member.
- * The penalty must be a positive integer or 0 for no penalty. If it is
- * not set 0 is assumed.
- * When calls are distributed members with higher penalties are considered
- * last.
- *
- * @param penalty the penalty for this member.
- */
- public void setPenalty(Integer penalty) {
- this.penalty = penalty;
- }
-
- /**
- * Returns if the queue member should be paused when added.
- *
- * @return Boolean.TRUE if the queue member should be paused when added.
- * @since 0.2
- */
- public Boolean getPaused() {
- return paused;
- }
-
- /**
- * Sets if the queue member should be paused when added.
- *
- * @param paused Boolean.TRUE if the queue member should be paused when
- * added.
- * @since 0.2
- */
- public void setPaused(Boolean paused) {
- this.paused = paused;
- }
-
- /**
- * Returns the name of the queue memeber (agent name).
- * Available since Asterisk 1.4
- *
- * @return the name of the queue memeber (agent name).
- * @since 1.0.0
- */
- public String getMemberName() {
- return memberName;
- }
-
- /**
- * Sets the name of the queue memeber (agent name).
- * Available since Asterisk 1.4
- *
- * @param memberName the name of the queue memeber (agent name).
- * @since 1.0.0
- */
- public void setMemberName(String memberName) {
- this.memberName = memberName;
- }
-
- /**
- * Returns the name of the channel from which to read devicestate changes.
- * Available since Asterisk 1.6
- *
- * @return the name of the channel from which to read devicestate changes.
- * @since 1.0.0
- */
- public String getStateInterface() {
- return stateInterface;
- }
-
- /**
- * Sets the name of the channel (Technology/Location) from which to read devicestate changes.
- * Available since Asterisk 1.6
- *
- * @param stateInterface the name of the channel from which to read devicestate changes.
- * @since 1.0.0
- */
- public void setStateInterface(String stateInterface) {
- this.stateInterface = stateInterface;
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/QueueChangePriorityCallerAction.java b/src/main/java/org/asteriskjava/manager/action/QueueChangePriorityCallerAction.java
index 9e56a4c90..13ab1b7c1 100644
--- a/src/main/java/org/asteriskjava/manager/action/QueueChangePriorityCallerAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/QueueChangePriorityCallerAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The QueueChangePriorityCallerAction requests to change priority of caller.
diff --git a/src/main/java/org/asteriskjava/manager/action/QueueLogAction.java b/src/main/java/org/asteriskjava/manager/action/QueueLogAction.java
index c9630a978..95beb9926 100644
--- a/src/main/java/org/asteriskjava/manager/action/QueueLogAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/QueueLogAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The QueueLogAction adds a custom log entry to the queue_log.
diff --git a/src/main/java/org/asteriskjava/manager/action/QueueMemberRingInUseAction.java b/src/main/java/org/asteriskjava/manager/action/QueueMemberRingInUseAction.java
index 1708de96a..40df1fcf3 100644
--- a/src/main/java/org/asteriskjava/manager/action/QueueMemberRingInUseAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/QueueMemberRingInUseAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The QueueMemberRingInUseAction requests to change RingInUse value of queue member.
diff --git a/src/main/java/org/asteriskjava/manager/action/QueuePauseAction.java b/src/main/java/org/asteriskjava/manager/action/QueuePauseAction.java
index 0c8372cfc..5884a2b40 100644
--- a/src/main/java/org/asteriskjava/manager/action/QueuePauseAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/QueuePauseAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The QueuePauseAction makes a queue member temporarily unavailabe (or
diff --git a/src/main/java/org/asteriskjava/manager/action/QueuePenaltyAction.java b/src/main/java/org/asteriskjava/manager/action/QueuePenaltyAction.java
index 37a254cdb..2e4d15ce0 100644
--- a/src/main/java/org/asteriskjava/manager/action/QueuePenaltyAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/QueuePenaltyAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The QueuePenaltyAction sets the penalty for a queue member.
diff --git a/src/main/java/org/asteriskjava/manager/action/QueueRemoveAction.java b/src/main/java/org/asteriskjava/manager/action/QueueRemoveAction.java
index 7ab93ef01..5452fb24c 100644
--- a/src/main/java/org/asteriskjava/manager/action/QueueRemoveAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/QueueRemoveAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The QueueRemoveAction removes a member from a queue.
diff --git a/src/main/java/org/asteriskjava/manager/action/QueueResetAction.java b/src/main/java/org/asteriskjava/manager/action/QueueResetAction.java
index 777584e70..2e80b6a9d 100644
--- a/src/main/java/org/asteriskjava/manager/action/QueueResetAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/QueueResetAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The QueueResetAction resets all statistical data of a given queue or all queues.
diff --git a/src/main/java/org/asteriskjava/manager/action/QueueStatusAction.java b/src/main/java/org/asteriskjava/manager/action/QueueStatusAction.java
index 7f9bc227a..9e8f80210 100644
--- a/src/main/java/org/asteriskjava/manager/action/QueueStatusAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/QueueStatusAction.java
@@ -16,9 +16,9 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.QueueStatusCompleteEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* The QueueStatusAction requests the state of all defined queues their members
diff --git a/src/main/java/org/asteriskjava/manager/action/QueueSummaryAction.java b/src/main/java/org/asteriskjava/manager/action/QueueSummaryAction.java
index 12e13d5bf..1bda795bf 100644
--- a/src/main/java/org/asteriskjava/manager/action/QueueSummaryAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/QueueSummaryAction.java
@@ -1,9 +1,9 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.QueueSummaryCompleteEvent;
import org.asteriskjava.manager.event.QueueSummaryEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* The QueueSummaryAction retrieves the summary for one or all queues.
diff --git a/src/main/java/org/asteriskjava/manager/action/RedirectAction.java b/src/main/java/org/asteriskjava/manager/action/RedirectAction.java
index f787beac1..357f2747a 100644
--- a/src/main/java/org/asteriskjava/manager/action/RedirectAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/RedirectAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* Redirects a given channel (and an optional additional channel) to a new
diff --git a/src/main/java/org/asteriskjava/manager/action/SendTextAction.java b/src/main/java/org/asteriskjava/manager/action/SendTextAction.java
index 48be8e2f5..8ea967070 100644
--- a/src/main/java/org/asteriskjava/manager/action/SendTextAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SendTextAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* Sends a text message to a given channel while in a call.
diff --git a/src/main/java/org/asteriskjava/manager/action/SetCdrUserFieldAction.java b/src/main/java/org/asteriskjava/manager/action/SetCdrUserFieldAction.java
index 3f37408ee..86e3a537d 100644
--- a/src/main/java/org/asteriskjava/manager/action/SetCdrUserFieldAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SetCdrUserFieldAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The SetCDRUserFieldAction causes the user field of the call detail record for
diff --git a/src/main/java/org/asteriskjava/manager/action/SetVarAction.java b/src/main/java/org/asteriskjava/manager/action/SetVarAction.java
index e3fde9d88..73309dcbb 100644
--- a/src/main/java/org/asteriskjava/manager/action/SetVarAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SetVarAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The SetVarAction sets the value of a global or local channel variable.
diff --git a/src/main/java/org/asteriskjava/manager/action/ShowDialplanAction.java b/src/main/java/org/asteriskjava/manager/action/ShowDialplanAction.java
index a9c30f381..f26d2ec83 100644
--- a/src/main/java/org/asteriskjava/manager/action/ShowDialplanAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ShowDialplanAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
-import org.asteriskjava.manager.event.ResponseEvent;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.ShowDialplanCompleteEvent;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/SipNotifyAction.java b/src/main/java/org/asteriskjava/manager/action/SipNotifyAction.java
index b5a4097ef..65fe690a4 100644
--- a/src/main/java/org/asteriskjava/manager/action/SipNotifyAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SipNotifyAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/src/main/java/org/asteriskjava/manager/action/SipPeersAction.java b/src/main/java/org/asteriskjava/manager/action/SipPeersAction.java
index 1f2dcae26..f75638d72 100644
--- a/src/main/java/org/asteriskjava/manager/action/SipPeersAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SipPeersAction.java
@@ -16,9 +16,9 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.PeerlistCompleteEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* Retrieves a list of all defined SIP peers.
diff --git a/src/main/java/org/asteriskjava/manager/action/SipShowPeerAction.java b/src/main/java/org/asteriskjava/manager/action/SipShowPeerAction.java
index 2b463c272..643d7ec36 100644
--- a/src/main/java/org/asteriskjava/manager/action/SipShowPeerAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SipShowPeerAction.java
@@ -16,9 +16,9 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
import org.asteriskjava.ami.action.annotation.ExpectedResponse;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
import org.asteriskjava.manager.response.SipShowPeerResponse;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/SipShowRegistryAction.java b/src/main/java/org/asteriskjava/manager/action/SipShowRegistryAction.java
index af96baaec..21b679277 100644
--- a/src/main/java/org/asteriskjava/manager/action/SipShowRegistryAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SipShowRegistryAction.java
@@ -16,10 +16,10 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.RegistrationsCompleteEvent;
import org.asteriskjava.manager.event.RegistryEntryEvent;
-import org.asteriskjava.manager.event.ResponseEvent;
/**
* Retrieves a list with the details about the SIP registrations.
diff --git a/src/main/java/org/asteriskjava/manager/action/SkypeAccountPropertyAction.java b/src/main/java/org/asteriskjava/manager/action/SkypeAccountPropertyAction.java
index 5d30c33a3..5adfca924 100644
--- a/src/main/java/org/asteriskjava/manager/action/SkypeAccountPropertyAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SkypeAccountPropertyAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/org/asteriskjava/manager/action/SkypeAddBuddyAction.java b/src/main/java/org/asteriskjava/manager/action/SkypeAddBuddyAction.java
index 90cb1330b..c94f22f98 100644
--- a/src/main/java/org/asteriskjava/manager/action/SkypeAddBuddyAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SkypeAddBuddyAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The SkypeAddBuddyAction adds a buddy to the buddy list of a Skype for Asterisk user.
diff --git a/src/main/java/org/asteriskjava/manager/action/SkypeBuddiesAction.java b/src/main/java/org/asteriskjava/manager/action/SkypeBuddiesAction.java
index 292a39ae0..d20183d9d 100644
--- a/src/main/java/org/asteriskjava/manager/action/SkypeBuddiesAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SkypeBuddiesAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
-import org.asteriskjava.manager.event.ResponseEvent;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.SkypeBuddyListCompleteEvent;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/SkypeBuddyAction.java b/src/main/java/org/asteriskjava/manager/action/SkypeBuddyAction.java
index b0a9ffdb5..5eceb601e 100644
--- a/src/main/java/org/asteriskjava/manager/action/SkypeBuddyAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SkypeBuddyAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
import org.asteriskjava.ami.action.annotation.ExpectedResponse;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
import org.asteriskjava.manager.response.SkypeBuddyResponse;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/SkypeChatSendAction.java b/src/main/java/org/asteriskjava/manager/action/SkypeChatSendAction.java
index 5454308bb..57e5bd20d 100644
--- a/src/main/java/org/asteriskjava/manager/action/SkypeChatSendAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SkypeChatSendAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The SkypeChatSendAction sends a Skype Chat message to a buddy of a Skype for Asterisk user.
diff --git a/src/main/java/org/asteriskjava/manager/action/SkypeLicenseListAction.java b/src/main/java/org/asteriskjava/manager/action/SkypeLicenseListAction.java
index 490c7c5ea..0896ded58 100644
--- a/src/main/java/org/asteriskjava/manager/action/SkypeLicenseListAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SkypeLicenseListAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
-import org.asteriskjava.manager.event.ResponseEvent;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.SkypeBuddyListCompleteEvent;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/SkypeLicenseStatusAction.java b/src/main/java/org/asteriskjava/manager/action/SkypeLicenseStatusAction.java
index 0516c56df..8ac9b7a48 100644
--- a/src/main/java/org/asteriskjava/manager/action/SkypeLicenseStatusAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SkypeLicenseStatusAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
import org.asteriskjava.ami.action.annotation.ExpectedResponse;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
import org.asteriskjava.manager.response.SkypeLicenseStatusResponse;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/SkypeRemoveBuddyAction.java b/src/main/java/org/asteriskjava/manager/action/SkypeRemoveBuddyAction.java
index 4cdfb517c..d04f6a6cf 100644
--- a/src/main/java/org/asteriskjava/manager/action/SkypeRemoveBuddyAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/SkypeRemoveBuddyAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The SkypeRemoveBuddyAction removes a buddy from the buddy list of a Skype for Asterisk user.
diff --git a/src/main/java/org/asteriskjava/manager/action/StatusAction.java b/src/main/java/org/asteriskjava/manager/action/StatusAction.java
index f353165db..f8fcd4e11 100644
--- a/src/main/java/org/asteriskjava/manager/action/StatusAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/StatusAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
-import org.asteriskjava.manager.event.ResponseEvent;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.StatusCompleteEvent;
import java.util.Iterator;
diff --git a/src/main/java/org/asteriskjava/manager/action/StopMixMonitorAction.java b/src/main/java/org/asteriskjava/manager/action/StopMixMonitorAction.java
index 12b1cb188..e7929b5ab 100644
--- a/src/main/java/org/asteriskjava/manager/action/StopMixMonitorAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/StopMixMonitorAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* Stop the specified MixMonitor on the specified channel.
diff --git a/src/main/java/org/asteriskjava/manager/action/StopMonitorAction.java b/src/main/java/org/asteriskjava/manager/action/StopMonitorAction.java
index a8e718a4d..d2d26355f 100644
--- a/src/main/java/org/asteriskjava/manager/action/StopMonitorAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/StopMonitorAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The StopMonitorAction ends monitoring (recording) a channel.
diff --git a/src/main/java/org/asteriskjava/manager/action/UnpauseMonitorAction.java b/src/main/java/org/asteriskjava/manager/action/UnpauseMonitorAction.java
index 304b0013e..acc21a549 100644
--- a/src/main/java/org/asteriskjava/manager/action/UnpauseMonitorAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/UnpauseMonitorAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The PauseMonitorAction re-enables monitoring (recording) of a channel after
diff --git a/src/main/java/org/asteriskjava/manager/action/UpdateConfigAction.java b/src/main/java/org/asteriskjava/manager/action/UpdateConfigAction.java
deleted file mode 100644
index 637b3e237..000000000
--- a/src/main/java/org/asteriskjava/manager/action/UpdateConfigAction.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright 2004-2007 Stefan Reuter and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.action;
-
-import org.asteriskjava.ami.action.AbstractManagerAction;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * The UpdateConfigAction sends an UpdateConfig command to the asterisk server.
- * Please take note that unlike the manager documentation, this command does not
- * dump back the config file upon success -- it only tells you it succeeded. You
- * should use the handy addCommand method this class provides for specifying
- * what actions you would like to take on the configuration file. It will
- * generate appropriate sequence numbers for the command. You may use the static
- * ACTION_* fields provided by this action to specify what action you would like
- * to take, while avoiding handling the strings required. Plain fields:
- * SrcFilename: Configuration filename to read(e.g. foo.conf) DstFilename:
- * Configuration filename to write(e.g. foo.conf) Reload: Whether or not a
- * reload should take place (or name of specific module) Repeatable fields:
- * Action-XXXXXX: Action to Take (NewCat,RenameCat,DelCat,Update,Delete,Append)
- * Cat-XXXXXX: Category to operate on Var-XXXXXX: Variable to work on
- * Value-XXXXXX: Value to work on Match-XXXXXX: Extra match required to match
- * line
- *
- * @author martins
- * @see org.asteriskjava.manager.response.GetConfigResponse
- * @see org.asteriskjava.manager.action.UpdateConfigAction#addCommand
- * @since 0.3
- */
-public class UpdateConfigAction extends AbstractManagerAction {
- /**
- * Serializable version identifier.
- */
- static final long serialVersionUID = 4753117770471622025L;
-
- private static final String RELOAD_STRING_YES = "Yes";
- private static final String RELOAD_STRING_NO = "No";
-
- /* Actions accepted by commands in the sequence */
- public static final String ACTION_NEWCAT = "NewCat";
- public static final String ACTION_RENAMECAT = "RenameCat";
- public static final String ACTION_DELCAT = "DelCat";
- public static final String ACTION_UPDATE = "Update";
- public static final String ACTION_DELETE = "Delete";
- public static final String ACTION_APPEND = "Append";
-
- protected String srcFilename;
- protected String dstFilename;
- protected String reload;
-
- protected int actionCounter;
- protected Map actions;
-
- /**
- * Creates a new UpdateConfigAction.
- */
- public UpdateConfigAction() {
- this.actionCounter = 0;
- actions = new HashMap<>();
- }
-
- /**
- * Creates a new UpdateConfigAction with the given parameters.
- *
- * @param srcFilename the name of the file to get.
- */
- public UpdateConfigAction(String srcFilename, String dstFilename, boolean reload) {
- this.actionCounter = 0;
- this.srcFilename = srcFilename;
- this.dstFilename = dstFilename;
- setReload(reload);
- actions = new HashMap<>();
- }
-
- /**
- * Adds a command to update a config file while sparing you the details of
- * the Manager's required syntax. If you want to omit one of the command's
- * sections, provide a null value to this method. The command index will be
- * incremented even if you supply a null for all parameters, though the map
- * will be unaffected.
- *
- * @param action Action to Take
- * (NewCat,RenameCat,DelCat,Update,Delete,Append), see static
- * fields
- * @param cat Category to operate on
- * @param var Variable to work on
- * @param value Value to work on
- * @param match Extra match required to match line
- */
- public void addCommand(String action, String cat, String var, String value, String match) {
- // for convienence of reference, shorter!
- final String stringCounter = String.format("%06d", this.actionCounter);
-
- if (action != null) {
- actions.put("Action-" + stringCounter, action);
- }
-
- if (cat != null) {
- actions.put("Cat-" + stringCounter, cat);
- }
-
- if (var != null) {
- actions.put("Var-" + stringCounter, var);
- }
-
- if (value != null) {
- actions.put("Value-" + stringCounter, value);
- }
-
- if (match != null) {
- actions.put("Match-" + stringCounter, match);
- }
-
- this.actionCounter++;
- }
-
- /**
- * Returns the name of this action, i.e. "UpdateConfig".
- */
- @Override
- public String getAction() {
- return "UpdateConfig";
- }
-
- /**
- * Returns the source filename.
- */
- public String getSrcFilename() {
- return srcFilename;
- }
-
- /**
- * Sets the source filename.
- */
- public void setSrcFilename(String filename) {
- this.srcFilename = filename;
- }
-
- /**
- * Returns the destination filename.
- */
- public String getDstFilename() {
- return dstFilename;
- }
-
- /**
- * Sets the source filename.
- */
- public void setDstFilename(String filename) {
- this.dstFilename = filename;
- }
-
- /**
- * @return should Asterisk reload, or the name of a specific module to
- * reload
- */
- public String getReload() {
- return reload;
- }
-
- /**
- * Sets the reload behavior of this action, or sets a specific module to be
- * reloaded
- *
- * @param reload the reload parameter to set
- * @see org.asteriskjava.manager.action.UpdateConfigAction#setReload(boolean)
- */
- public void setReload(String reload) {
- this.reload = reload;
- }
-
- /**
- * Sets the reload behavior of this action. If you don't know what string to
- * feed Asterisk, this method will provide the appropriate one.
- *
- * @param reload the reload parameter to set
- * @see org.asteriskjava.manager.action.UpdateConfigAction#setReload(String)
- */
- public void setReload(boolean reload) {
- this.reload = reload ? UpdateConfigAction.RELOAD_STRING_YES : UpdateConfigAction.RELOAD_STRING_NO;
- }
-
- /**
- * Returns Map of the action's desired operations where Map keys contain:
- * action,cat,var,value,match pairs followed by -XXXXXX, and the Map values
- * contain the values for those keys. This method will typically only be
- * used by the ActionBuilder to generate the actual strings to be sent to
- * the manager interface.
- *
- * @return a Map of the actions that should be taken
- * @see org.asteriskjava.manager.action.UpdateConfigAction#addCommand
- */
- public Map getAttributes() {
- return actions;
- }
-
- /**
- * You may use this field to directly, programmatically add your own Map of
- * key,value pairs that you would like to send for this command. Setting
- * your own map will reset the command index to the number of keys in the
- * Map
- *
- * @param actions the actions to set
- * @see org.asteriskjava.manager.action.UpdateConfigAction#addCommand
- */
- public void setAttributes(Map actions) {
- this.actions = actions;
- this.actionCounter = actions.keySet().size();
- }
-
-}
diff --git a/src/main/java/org/asteriskjava/manager/action/UserEventAction.java b/src/main/java/org/asteriskjava/manager/action/UserEventAction.java
index f145380d7..8c69d7409 100644
--- a/src/main/java/org/asteriskjava/manager/action/UserEventAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/UserEventAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
import org.asteriskjava.manager.event.UserEvent;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/VoicemailUsersListAction.java b/src/main/java/org/asteriskjava/manager/action/VoicemailUsersListAction.java
index 8a5bd4d68..c1188e969 100644
--- a/src/main/java/org/asteriskjava/manager/action/VoicemailUsersListAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/VoicemailUsersListAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
-import org.asteriskjava.manager.event.ResponseEvent;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.VoicemailUserEntryCompleteEvent;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/ZapDialOffhookAction.java b/src/main/java/org/asteriskjava/manager/action/ZapDialOffhookAction.java
index 93b4aad2f..5c8097851 100644
--- a/src/main/java/org/asteriskjava/manager/action/ZapDialOffhookAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ZapDialOffhookAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ZapDialOffhookAction dials a number on a zap channel while offhook.
diff --git a/src/main/java/org/asteriskjava/manager/action/ZapDndOffAction.java b/src/main/java/org/asteriskjava/manager/action/ZapDndOffAction.java
index 47be0d29f..36e07ef04 100644
--- a/src/main/java/org/asteriskjava/manager/action/ZapDndOffAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ZapDndOffAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ZapDNDOnAction switches a zap channel "Do Not Disturb" status off.
diff --git a/src/main/java/org/asteriskjava/manager/action/ZapDndOnAction.java b/src/main/java/org/asteriskjava/manager/action/ZapDndOnAction.java
index 0f55cc778..4557da248 100644
--- a/src/main/java/org/asteriskjava/manager/action/ZapDndOnAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ZapDndOnAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ZapDNDOnAction switches a zap channel "Do Not Disturb" status on.
diff --git a/src/main/java/org/asteriskjava/manager/action/ZapHangupAction.java b/src/main/java/org/asteriskjava/manager/action/ZapHangupAction.java
index 29d4e3ed6..e0ac269f1 100644
--- a/src/main/java/org/asteriskjava/manager/action/ZapHangupAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ZapHangupAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ZapHangupAction hangs up a zap channel.
diff --git a/src/main/java/org/asteriskjava/manager/action/ZapRestartAction.java b/src/main/java/org/asteriskjava/manager/action/ZapRestartAction.java
index fead5d77f..58ff6afa1 100644
--- a/src/main/java/org/asteriskjava/manager/action/ZapRestartAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ZapRestartAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* Fully restarts all zaptel channels and terminates any calls on Zap
diff --git a/src/main/java/org/asteriskjava/manager/action/ZapShowChannelsAction.java b/src/main/java/org/asteriskjava/manager/action/ZapShowChannelsAction.java
index 1f04e1913..f91545124 100644
--- a/src/main/java/org/asteriskjava/manager/action/ZapShowChannelsAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ZapShowChannelsAction.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
-import org.asteriskjava.manager.event.ResponseEvent;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.event.ZapShowChannelsCompleteEvent;
/**
diff --git a/src/main/java/org/asteriskjava/manager/action/ZapTransferAction.java b/src/main/java/org/asteriskjava/manager/action/ZapTransferAction.java
index d8b693a7e..8d6f8cec8 100644
--- a/src/main/java/org/asteriskjava/manager/action/ZapTransferAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/ZapTransferAction.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.action;
-import org.asteriskjava.ami.action.AbstractManagerAction;
+import org.asteriskjava.ami.action.api.AbstractManagerAction;
/**
* The ZapTransferAction transfers a zap channel.
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractAgentEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractAgentEvent.java
index e6519e4a3..9415bac40 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractAgentEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractAgentEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
import java.util.Map;
/**
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractBridgeEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractBridgeEvent.java
index 58f9fcf42..67ee3ef91 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractBridgeEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractBridgeEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Created by Alexander Polakov on 1/26/15.
*/
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractChannelEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractChannelEvent.java
index 198991978..119a6279c 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractChannelEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractChannelEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Abstract base class providing common properties channel related events.
*
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractChannelTalkingEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractChannelTalkingEvent.java
index e2a278ab6..276104d46 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractChannelTalkingEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractChannelTalkingEvent.java
@@ -15,6 +15,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
public abstract class AbstractChannelTalkingEvent extends ManagerEvent {
private String language;
private String accountCode;
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractFaxEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractFaxEvent.java
index 0e33dff41..3da70437a 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractFaxEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractFaxEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* An AbstractFaxEvent is a base class for fax related events
*/
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractHoldEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractHoldEvent.java
index 8ab2e517c..1c7a8e87d 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractHoldEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractHoldEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A HoldEvent is triggered when a channel is put on hold (or no longer on
* hold).
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractMeetMeEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractMeetMeEvent.java
index 0a2bcbdce..bd61e114c 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractMeetMeEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractMeetMeEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Abstract base class providing common properties for MeetMe (Asterisk's
* conference system) events.
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractMixMonitorEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractMixMonitorEvent.java
index 28dca2d3c..932d793bc 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractMixMonitorEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractMixMonitorEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Abstract base class for mix monitoring events.
*
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractMonitorEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractMonitorEvent.java
index 0a85054ee..1dca09611 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractMonitorEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractMonitorEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Abstract base class for monitoring events.
* Monitoring events are implemented in res/res_monitor.c
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java
index 373eae815..e411553e7 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractParkedCallEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Abstract base class for several call parking related events.
*
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractQueueMemberEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractQueueMemberEvent.java
index b03360fab..8d12e26cd 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractQueueMemberEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractQueueMemberEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Abstract base class for several queue member related events.
*
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractRtcpEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractRtcpEvent.java
index 7e137214d..71a823dff 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractRtcpEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractRtcpEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
import java.net.InetAddress;
import java.net.UnknownHostException;
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractRtpStatEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractRtpStatEvent.java
index a98746143..a00eda80b 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractRtpStatEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractRtpStatEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Abstract base class for RTP statistics events.
*
diff --git a/src/main/java/org/asteriskjava/manager/event/AgentCallbackLoginEvent.java b/src/main/java/org/asteriskjava/manager/event/AgentCallbackLoginEvent.java
index 578a9e047..abddfbca0 100644
--- a/src/main/java/org/asteriskjava/manager/event/AgentCallbackLoginEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AgentCallbackLoginEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* An AgentCallbackLoginEvent is triggered when an agent is successfully logged in using
* AgentCallbackLogin.
diff --git a/src/main/java/org/asteriskjava/manager/event/AgentCallbackLogoffEvent.java b/src/main/java/org/asteriskjava/manager/event/AgentCallbackLogoffEvent.java
index ab67d0835..8db80fba1 100644
--- a/src/main/java/org/asteriskjava/manager/event/AgentCallbackLogoffEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AgentCallbackLogoffEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* An AgentCallbackLogoffEvent is triggered when an agent that previously logged in using
* AgentCallbackLogin is logged of.
diff --git a/src/main/java/org/asteriskjava/manager/event/AgentCalledEvent.java b/src/main/java/org/asteriskjava/manager/event/AgentCalledEvent.java
index 29b863d29..fce6d932e 100644
--- a/src/main/java/org/asteriskjava/manager/event/AgentCalledEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AgentCalledEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
import java.util.Map;
/**
diff --git a/src/main/java/org/asteriskjava/manager/event/AgentLoginEvent.java b/src/main/java/org/asteriskjava/manager/event/AgentLoginEvent.java
index 08dfcf3ce..fce1c8eb7 100644
--- a/src/main/java/org/asteriskjava/manager/event/AgentLoginEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AgentLoginEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* An AgentLoginEvent is triggered when an agent is successfully logged in using AgentLogin.
* It is implemented in channels/chan_agent.c
diff --git a/src/main/java/org/asteriskjava/manager/event/AgentLogoffEvent.java b/src/main/java/org/asteriskjava/manager/event/AgentLogoffEvent.java
index e5e699a83..6691c6609 100644
--- a/src/main/java/org/asteriskjava/manager/event/AgentLogoffEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AgentLogoffEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* An AgentCallbackLogoffEvent is triggered when an agent that previously logged in using AgentLogin
* is logged of.
diff --git a/src/main/java/org/asteriskjava/manager/event/AgentsCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/AgentsCompleteEvent.java
index c4ab8553b..22cd48a7f 100644
--- a/src/main/java/org/asteriskjava/manager/event/AgentsCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AgentsCompleteEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* An AgentsCompleteEvent is triggered after the state of all agents has been
* reported in response to an AgentsAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/AgentsEvent.java b/src/main/java/org/asteriskjava/manager/event/AgentsEvent.java
index cbb2b0379..b5f71fd08 100644
--- a/src/main/java/org/asteriskjava/manager/event/AgentsEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AgentsEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* An AgentsEvent is triggered for each agent in response to an AgentsAction.
*
diff --git a/src/main/java/org/asteriskjava/manager/event/AgiExecEvent.java b/src/main/java/org/asteriskjava/manager/event/AgiExecEvent.java
index aa44573e3..99db7da6b 100644
--- a/src/main/java/org/asteriskjava/manager/event/AgiExecEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AgiExecEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* AgiExecEvents are triggered when an AGI command is executed. For each command two events are triggered:
* one before excution ("Start") and one after execution ("End").
diff --git a/src/main/java/org/asteriskjava/manager/event/AlarmClearEvent.java b/src/main/java/org/asteriskjava/manager/event/AlarmClearEvent.java
index 2b8eee9a8..233f944ae 100644
--- a/src/main/java/org/asteriskjava/manager/event/AlarmClearEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AlarmClearEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* An AlarmEvent is triggered when a Zap channel leaves alarm state.
* It is implemented in channels/chan_zap.c
diff --git a/src/main/java/org/asteriskjava/manager/event/AlarmEvent.java b/src/main/java/org/asteriskjava/manager/event/AlarmEvent.java
index 7a1c7ed6d..d7fd77318 100644
--- a/src/main/java/org/asteriskjava/manager/event/AlarmEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AlarmEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* An AlarmEvent is triggered when a Zap channel enters or changes alarm state.
* It is implemented in channels/chan_zap.c
diff --git a/src/main/java/org/asteriskjava/manager/event/AorDetail.java b/src/main/java/org/asteriskjava/manager/event/AorDetail.java
index fa8f8cd8a..8958667b5 100644
--- a/src/main/java/org/asteriskjava/manager/event/AorDetail.java
+++ b/src/main/java/org/asteriskjava/manager/event/AorDetail.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A ContactStatusDetail event is triggered in response to a
* {@link org.asteriskjava.manager.action.PJSipShowEndpoint}, and contains
diff --git a/src/main/java/org/asteriskjava/manager/event/AsyncAgiEvent.java b/src/main/java/org/asteriskjava/manager/event/AsyncAgiEvent.java
index deeff2bf8..8617cfb8d 100644
--- a/src/main/java/org/asteriskjava/manager/event/AsyncAgiEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AsyncAgiEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.ArrayList;
diff --git a/src/main/java/org/asteriskjava/manager/event/AuthDetail.java b/src/main/java/org/asteriskjava/manager/event/AuthDetail.java
index b9cf5cb66..99adedd27 100644
--- a/src/main/java/org/asteriskjava/manager/event/AuthDetail.java
+++ b/src/main/java/org/asteriskjava/manager/event/AuthDetail.java
@@ -1,6 +1,8 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* An AuthDetail event is triggered in response to a
* {@link org.asteriskjava.manager.action.PJSipShowEndpoint},
diff --git a/src/main/java/org/asteriskjava/manager/event/BridgeEvent.java b/src/main/java/org/asteriskjava/manager/event/BridgeEvent.java
index c9067c4d9..8a01c4752 100644
--- a/src/main/java/org/asteriskjava/manager/event/BridgeEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/BridgeEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A BridgeEvent is triggered when a link between two voice channels is established ("Link") or
* discontinued ("Unlink").
diff --git a/src/main/java/org/asteriskjava/manager/event/BridgeExecEvent.java b/src/main/java/org/asteriskjava/manager/event/BridgeExecEvent.java
index b6b316c4d..209bd9d62 100644
--- a/src/main/java/org/asteriskjava/manager/event/BridgeExecEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/BridgeExecEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A BridgeExecEvent is triggered when two channels are bridged through a feature code or bridging the channels fails.
* It is implemented in main/features.c
diff --git a/src/main/java/org/asteriskjava/manager/event/BridgeMergeEvent.java b/src/main/java/org/asteriskjava/manager/event/BridgeMergeEvent.java
index 54c45d967..7024e3757 100644
--- a/src/main/java/org/asteriskjava/manager/event/BridgeMergeEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/BridgeMergeEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
public class BridgeMergeEvent extends ManagerEvent {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/org/asteriskjava/manager/event/CdrEvent.java b/src/main/java/org/asteriskjava/manager/event/CdrEvent.java
index fe15b41f5..3ccdcd896 100644
--- a/src/main/java/org/asteriskjava/manager/event/CdrEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/CdrEvent.java
@@ -16,6 +16,7 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.util.DateUtil;
import java.util.Date;
diff --git a/src/main/java/org/asteriskjava/manager/event/CelEvent.java b/src/main/java/org/asteriskjava/manager/event/CelEvent.java
index e8e25cacd..7d226cb0d 100644
--- a/src/main/java/org/asteriskjava/manager/event/CelEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/CelEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Raised when a Channel Event Log is generated for a channel.
* https://wiki.asterisk.org/wiki/display/AST/Asterisk+13+ManagerEvent_CEL
diff --git a/src/main/java/org/asteriskjava/manager/event/ChallengeResponseFailedEvent.java b/src/main/java/org/asteriskjava/manager/event/ChallengeResponseFailedEvent.java
index 3c88d838a..050403a04 100644
--- a/src/main/java/org/asteriskjava/manager/event/ChallengeResponseFailedEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ChallengeResponseFailedEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
diff --git a/src/main/java/org/asteriskjava/manager/event/ChallengeSentEvent.java b/src/main/java/org/asteriskjava/manager/event/ChallengeSentEvent.java
index c924266e9..5305f6b9d 100644
--- a/src/main/java/org/asteriskjava/manager/event/ChallengeSentEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ChallengeSentEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Created by plhk on 1/15/15.
*/
diff --git a/src/main/java/org/asteriskjava/manager/event/ChanSpyStartEvent.java b/src/main/java/org/asteriskjava/manager/event/ChanSpyStartEvent.java
index bfe0bc7e8..e27e8cbf7 100644
--- a/src/main/java/org/asteriskjava/manager/event/ChanSpyStartEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ChanSpyStartEvent.java
@@ -17,6 +17,8 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
public class ChanSpyStartEvent extends ManagerEvent {
/**
* Serial version identifier
diff --git a/src/main/java/org/asteriskjava/manager/event/ChanSpyStopEvent.java b/src/main/java/org/asteriskjava/manager/event/ChanSpyStopEvent.java
index 872cb74d6..84922c3f1 100644
--- a/src/main/java/org/asteriskjava/manager/event/ChanSpyStopEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ChanSpyStopEvent.java
@@ -15,6 +15,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
public class ChanSpyStopEvent extends ManagerEvent {
private static final long serialVersionUID = 3256725065466000696L;
diff --git a/src/main/java/org/asteriskjava/manager/event/ChannelReloadEvent.java b/src/main/java/org/asteriskjava/manager/event/ChannelReloadEvent.java
index d3a6b998e..931fe481b 100644
--- a/src/main/java/org/asteriskjava/manager/event/ChannelReloadEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ChannelReloadEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/src/main/java/org/asteriskjava/manager/event/ChannelUpdateEvent.java b/src/main/java/org/asteriskjava/manager/event/ChannelUpdateEvent.java
index 1b8b78184..0f45f103a 100644
--- a/src/main/java/org/asteriskjava/manager/event/ChannelUpdateEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ChannelUpdateEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A ChannelUpdateEvent provides additional channel type specific information like
* the SIP call id or IAX2 call numbers about a channel.
diff --git a/src/main/java/org/asteriskjava/manager/event/ConfbridgeListCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/ConfbridgeListCompleteEvent.java
index 82f4ea5a7..751cf593c 100644
--- a/src/main/java/org/asteriskjava/manager/event/ConfbridgeListCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ConfbridgeListCompleteEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
public class ConfbridgeListCompleteEvent extends ResponseEvent {
/**
* Serializable version identifier
diff --git a/src/main/java/org/asteriskjava/manager/event/ConfbridgeListEvent.java b/src/main/java/org/asteriskjava/manager/event/ConfbridgeListEvent.java
index dc76b41fe..3349f8981 100644
--- a/src/main/java/org/asteriskjava/manager/event/ConfbridgeListEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ConfbridgeListEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* Response to a {@link org.asteriskjava.manager.action.ConfbridgeListAction}.
*
diff --git a/src/main/java/org/asteriskjava/manager/event/ConfbridgeListRoomsCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/ConfbridgeListRoomsCompleteEvent.java
index 2b7a24c6e..1916bab98 100644
--- a/src/main/java/org/asteriskjava/manager/event/ConfbridgeListRoomsCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ConfbridgeListRoomsCompleteEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
public class ConfbridgeListRoomsCompleteEvent extends ResponseEvent {
/**
* Serializable version identifier
diff --git a/src/main/java/org/asteriskjava/manager/event/ConfbridgeListRoomsEvent.java b/src/main/java/org/asteriskjava/manager/event/ConfbridgeListRoomsEvent.java
index 22a91649e..f85bb3f8b 100644
--- a/src/main/java/org/asteriskjava/manager/event/ConfbridgeListRoomsEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ConfbridgeListRoomsEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
public class ConfbridgeListRoomsEvent extends ResponseEvent {
/**
* Serializable version identifier
diff --git a/src/main/java/org/asteriskjava/manager/event/ConnectEvent.java b/src/main/java/org/asteriskjava/manager/event/ConnectEvent.java
index 20a3589a6..8940562ad 100644
--- a/src/main/java/org/asteriskjava/manager/event/ConnectEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ConnectEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A ConnectEvent is triggered after successful login to the Asterisk server.
* It is a pseudo event not directly related to an Asterisk generated event.
diff --git a/src/main/java/org/asteriskjava/manager/event/ContactList.java b/src/main/java/org/asteriskjava/manager/event/ContactList.java
index 8d23aca21..5a8a116aa 100644
--- a/src/main/java/org/asteriskjava/manager/event/ContactList.java
+++ b/src/main/java/org/asteriskjava/manager/event/ContactList.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A ContactListCompleteEvent is triggered after the details of all peers has
* been reported in response to an PJSipShowContactsAction.
@@ -219,7 +221,7 @@ public String toString() {
+ ", roundtripusec=" + roundtripusec + ", expirationtime=" + expirationtime + ", authenticatequalify="
+ authenticatequalify + ", objectname=" + objectname + ", useragent=" + useragent + ", uri=" + uri
+ ", viaaddr=" + viaaddr + ", qualifyfrequency=" + qualifyfrequency + ", path=" + path + ", endpoint="
- + endpoint + ", viaport=" + viaport + ", outboundproxy=" + outboundproxy + ", actionId=" + actionId
+ + endpoint + ", viaport=" + viaport + ", outboundproxy=" + outboundproxy + ", actionId=" + getActionId()
+ ", objecttype=" + objecttype + ", pruneonboot=" + pruneonboot + ", status=" + status + "]\n";
}
diff --git a/src/main/java/org/asteriskjava/manager/event/ContactListComplete.java b/src/main/java/org/asteriskjava/manager/event/ContactListComplete.java
index 13fb427fd..8c945dc26 100644
--- a/src/main/java/org/asteriskjava/manager/event/ContactListComplete.java
+++ b/src/main/java/org/asteriskjava/manager/event/ContactListComplete.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A PeerlistCompleteEvent is triggered after the details of all peers has been
* reported in response to an SIPPeersAction or SIPShowPeerAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/ContactStatusDetail.java b/src/main/java/org/asteriskjava/manager/event/ContactStatusDetail.java
index efdb18a78..34edb2b97 100644
--- a/src/main/java/org/asteriskjava/manager/event/ContactStatusDetail.java
+++ b/src/main/java/org/asteriskjava/manager/event/ContactStatusDetail.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A ContactStatusDetail event is triggered in response to a
* {@link org.asteriskjava.manager.action.PJSipShowEndpoint}, and contains
diff --git a/src/main/java/org/asteriskjava/manager/event/ContactStatusEvent.java b/src/main/java/org/asteriskjava/manager/event/ContactStatusEvent.java
index eb0b9e463..aa41a2d50 100644
--- a/src/main/java/org/asteriskjava/manager/event/ContactStatusEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ContactStatusEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Raised when the state of a contact changes.
*
diff --git a/src/main/java/org/asteriskjava/manager/event/CoreShowChannelEvent.java b/src/main/java/org/asteriskjava/manager/event/CoreShowChannelEvent.java
index 3c8ee2225..3aa7be95b 100644
--- a/src/main/java/org/asteriskjava/manager/event/CoreShowChannelEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/CoreShowChannelEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A CoreShowChannelEvent is triggered for each active channel in response to a
* CoreShowChannelsAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/CoreShowChannelsCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/CoreShowChannelsCompleteEvent.java
index c4276e9c4..b81e1281d 100644
--- a/src/main/java/org/asteriskjava/manager/event/CoreShowChannelsCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/CoreShowChannelsCompleteEvent.java
@@ -17,6 +17,8 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A CoreShowChannelsCompleteEvent is triggered after the state of all channels has been reported in response
* to a CoreShowChannelsAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/DAHDIChannelEvent.java b/src/main/java/org/asteriskjava/manager/event/DAHDIChannelEvent.java
index 72134b028..e43a054d3 100644
--- a/src/main/java/org/asteriskjava/manager/event/DAHDIChannelEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DAHDIChannelEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* @author Sebastian
*/
diff --git a/src/main/java/org/asteriskjava/manager/event/DahdiShowChannelsCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/DahdiShowChannelsCompleteEvent.java
index 8053e1e4e..dbb72629a 100644
--- a/src/main/java/org/asteriskjava/manager/event/DahdiShowChannelsCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DahdiShowChannelsCompleteEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A DahdiShowChannelsCompleteEvent is triggered after the state of all Dahdi channels has been reported
* in response to a DahdiShowChannelsAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/DahdiShowChannelsEvent.java b/src/main/java/org/asteriskjava/manager/event/DahdiShowChannelsEvent.java
index 38035de39..757cc3d71 100644
--- a/src/main/java/org/asteriskjava/manager/event/DahdiShowChannelsEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DahdiShowChannelsEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A DahdiShowChannelsEvent is triggered in response to a DahdiShowChannelsAction and shows the state of
* a Dahdi channel.
diff --git a/src/main/java/org/asteriskjava/manager/event/DbGetResponseEvent.java b/src/main/java/org/asteriskjava/manager/event/DbGetResponseEvent.java
deleted file mode 100644
index fdd74b35f..000000000
--- a/src/main/java/org/asteriskjava/manager/event/DbGetResponseEvent.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.event;
-
-/**
- * A DBGetResponseEvent is sent in response to a DBGetAction and contains the
- * entry that was queried.
- * Available since Asterisk 1.2
- *
- * @author srt
- * @version $Id$
- * @see org.asteriskjava.manager.action.DbGetAction
- * @since 0.2
- */
-public class DbGetResponseEvent extends ResponseEvent {
- private String family;
- private String key;
- private String val;
-
- /**
- * Serial version identifier
- */
- private static final long serialVersionUID = -1177773673509373296L;
-
- /**
- * @param source
- */
- public DbGetResponseEvent(Object source) {
- super(source);
- }
-
- /**
- * Returns the family of the database entry that was queried.
- *
- * @return the family of the database entry that was queried.
- */
- public String getFamily() {
- return family;
- }
-
- /**
- * Sets the family of the database entry that was queried.
- *
- * @param family the family of the database entry that was queried.
- */
- public void setFamily(String family) {
- this.family = family;
- }
-
- /**
- * Returns the key of the database entry that was queried.
- *
- * @return the key of the database entry that was queried.
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Sets the key of the database entry that was queried.
- *
- * @param key the key of the database entry that was queried.
- */
- public void setKey(String key) {
- this.key = key;
- }
-
- /**
- * Returns the value of the database entry that was queried.
- *
- * @return the value of the database entry that was queried.
- */
- public String getVal() {
- return val;
- }
-
- /**
- * Sets the value of the database entry that was queried.
- *
- * @param val the value of the database entry that was queried.
- */
- public void setVal(String val) {
- this.val = val;
- }
-
- /**
- * Sets the value of the database entry that was queried.
- * It seems that in ast 1.2 ( 1.2.9 +BRIStuff ? ) at least the key is
- * not val anymore but value.
- *
- * @param val the value of the database entry that was queried.
- */
- public void setValue(String val) {
- this.val = val;
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/event/DeviceStateChangeEvent.java b/src/main/java/org/asteriskjava/manager/event/DeviceStateChangeEvent.java
index 841a25be4..1fe83bf64 100644
--- a/src/main/java/org/asteriskjava/manager/event/DeviceStateChangeEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DeviceStateChangeEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
public class DeviceStateChangeEvent extends ManagerEvent {
/**
*
diff --git a/src/main/java/org/asteriskjava/manager/event/DialEvent.java b/src/main/java/org/asteriskjava/manager/event/DialEvent.java
index 4af7c5e6f..360394ff2 100644
--- a/src/main/java/org/asteriskjava/manager/event/DialEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DialEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A dial event is triggered whenever a phone attempts to dial someone.
*
diff --git a/src/main/java/org/asteriskjava/manager/event/DialStateEvent.java b/src/main/java/org/asteriskjava/manager/event/DialStateEvent.java
index 7e6ce09c6..cdbec2137 100644
--- a/src/main/java/org/asteriskjava/manager/event/DialStateEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DialStateEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
public class DialStateEvent extends ManagerEvent {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/org/asteriskjava/manager/event/DisconnectEvent.java b/src/main/java/org/asteriskjava/manager/event/DisconnectEvent.java
index 7ce68e4f3..34b87fcf8 100644
--- a/src/main/java/org/asteriskjava/manager/event/DisconnectEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DisconnectEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A DisconnectEvent is triggered when the connection to the asterisk server is lost.
* It is a pseudo event not directly related to an Asterisk generated event.
diff --git a/src/main/java/org/asteriskjava/manager/event/DndStateEvent.java b/src/main/java/org/asteriskjava/manager/event/DndStateEvent.java
index 1e4e4bccf..b4e2f9a38 100644
--- a/src/main/java/org/asteriskjava/manager/event/DndStateEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DndStateEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A DNDStateEvent is triggered by the Zap channel driver when a channel enters
* or leaves DND (do not disturb) state.
diff --git a/src/main/java/org/asteriskjava/manager/event/DongleCENDEvent.java b/src/main/java/org/asteriskjava/manager/event/DongleCENDEvent.java
index 4911a06f1..a2a2af0c6 100644
--- a/src/main/java/org/asteriskjava/manager/event/DongleCENDEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DongleCENDEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
public class DongleCENDEvent extends ManagerEvent {
private static final long serialVersionUID = 3257845467831284784L;
private String device;
diff --git a/src/main/java/org/asteriskjava/manager/event/DongleCallStateChangeEvent.java b/src/main/java/org/asteriskjava/manager/event/DongleCallStateChangeEvent.java
index 1c32b334d..73472e851 100644
--- a/src/main/java/org/asteriskjava/manager/event/DongleCallStateChangeEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DongleCallStateChangeEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
public class DongleCallStateChangeEvent extends ManagerEvent {
private static final long serialVersionUID = 3257845467831284784L;
private String device;
diff --git a/src/main/java/org/asteriskjava/manager/event/DongleDeviceEntryEvent.java b/src/main/java/org/asteriskjava/manager/event/DongleDeviceEntryEvent.java
index 08020c101..c34124596 100644
--- a/src/main/java/org/asteriskjava/manager/event/DongleDeviceEntryEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DongleDeviceEntryEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
public class DongleDeviceEntryEvent extends ResponseEvent {
/**
diff --git a/src/main/java/org/asteriskjava/manager/event/DongleNewCMGREvent.java b/src/main/java/org/asteriskjava/manager/event/DongleNewCMGREvent.java
index cbc3d457a..09fb46600 100644
--- a/src/main/java/org/asteriskjava/manager/event/DongleNewCMGREvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DongleNewCMGREvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
public class DongleNewCMGREvent extends ManagerEvent {
private static final long serialVersionUID = 3257845467831284784L;
private String device;
diff --git a/src/main/java/org/asteriskjava/manager/event/DongleNewSMSBase64Event.java b/src/main/java/org/asteriskjava/manager/event/DongleNewSMSBase64Event.java
index ba794e9e3..9acdbc3a0 100644
--- a/src/main/java/org/asteriskjava/manager/event/DongleNewSMSBase64Event.java
+++ b/src/main/java/org/asteriskjava/manager/event/DongleNewSMSBase64Event.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
public class DongleNewSMSBase64Event extends ManagerEvent {
private static final long serialVersionUID = 3257845467831284784L;
private String from;
diff --git a/src/main/java/org/asteriskjava/manager/event/DongleNewSMSEvent.java b/src/main/java/org/asteriskjava/manager/event/DongleNewSMSEvent.java
index b6d07b1f0..c38558e1c 100644
--- a/src/main/java/org/asteriskjava/manager/event/DongleNewSMSEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DongleNewSMSEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
public class DongleNewSMSEvent extends ManagerEvent {
private static final long serialVersionUID = 3257845467831284784L;
private String from;
diff --git a/src/main/java/org/asteriskjava/manager/event/DongleShowDevicesCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/DongleShowDevicesCompleteEvent.java
index c61e690ea..be9901b8a 100644
--- a/src/main/java/org/asteriskjava/manager/event/DongleShowDevicesCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DongleShowDevicesCompleteEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A DahdiShowChannelsCompleteEvent is triggered after the state of all Dahdi channels has been reported
* in response to a DahdiShowChannelsAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/DongleStatusEvent.java b/src/main/java/org/asteriskjava/manager/event/DongleStatusEvent.java
index 6ea1c24d6..2e4be5eaa 100644
--- a/src/main/java/org/asteriskjava/manager/event/DongleStatusEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DongleStatusEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
public class DongleStatusEvent extends ManagerEvent {
private static final long serialVersionUID = 3257845467831284784L;
private String device;
diff --git a/src/main/java/org/asteriskjava/manager/event/DtmfEvent.java b/src/main/java/org/asteriskjava/manager/event/DtmfEvent.java
index 14b107a8c..a1c03b615 100644
--- a/src/main/java/org/asteriskjava/manager/event/DtmfEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DtmfEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A DtmfEvent is triggered each time a DTMF digit is sent or received on a
* channel.
diff --git a/src/main/java/org/asteriskjava/manager/event/EndpointDetail.java b/src/main/java/org/asteriskjava/manager/event/EndpointDetail.java
index b2aa6408f..a05bdcaef 100644
--- a/src/main/java/org/asteriskjava/manager/event/EndpointDetail.java
+++ b/src/main/java/org/asteriskjava/manager/event/EndpointDetail.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A EndpointDetail event is triggered in response to a
* {@link org.asteriskjava.manager.action.PJSipShowEndpoint}, and contains
diff --git a/src/main/java/org/asteriskjava/manager/event/EndpointDetailComplete.java b/src/main/java/org/asteriskjava/manager/event/EndpointDetailComplete.java
index f1c07eac2..d5fef2d23 100644
--- a/src/main/java/org/asteriskjava/manager/event/EndpointDetailComplete.java
+++ b/src/main/java/org/asteriskjava/manager/event/EndpointDetailComplete.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* An EndpointDetailComplete event is triggered after the details of an endpoint has been
* reported in response to a PJSIPShowEndpoint
diff --git a/src/main/java/org/asteriskjava/manager/event/EndpointList.java b/src/main/java/org/asteriskjava/manager/event/EndpointList.java
index 3781a4cf1..6bc89de4c 100644
--- a/src/main/java/org/asteriskjava/manager/event/EndpointList.java
+++ b/src/main/java/org/asteriskjava/manager/event/EndpointList.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A PeerlistCompleteEvent is triggered after the details of all peers has been
* reported in response to an SIPPeersAction or SIPShowPeerAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/EndpointListComplete.java b/src/main/java/org/asteriskjava/manager/event/EndpointListComplete.java
index 432a2de94..75890e559 100644
--- a/src/main/java/org/asteriskjava/manager/event/EndpointListComplete.java
+++ b/src/main/java/org/asteriskjava/manager/event/EndpointListComplete.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* An EndpointListComplete event is triggered after the details of all end points have been
* reported in response to a PJSIPShowEndpoints event.
diff --git a/src/main/java/org/asteriskjava/manager/event/ExtensionStatusEvent.java b/src/main/java/org/asteriskjava/manager/event/ExtensionStatusEvent.java
index 037d273a1..991d24c00 100644
--- a/src/main/java/org/asteriskjava/manager/event/ExtensionStatusEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ExtensionStatusEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* An ExtensionStatusEvent is triggered when the state of an extension changes.
* For this to work for you must provide appropriate hints in your dialplan to
diff --git a/src/main/java/org/asteriskjava/manager/event/FullyBootedEvent.java b/src/main/java/org/asteriskjava/manager/event/FullyBootedEvent.java
index 3577e22b7..82c6c7b5c 100644
--- a/src/main/java/org/asteriskjava/manager/event/FullyBootedEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/FullyBootedEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Indicates that Asterisk has loaded all its modules and finished booting.
* It is handy to have a single event notification for when all Asterisk
diff --git a/src/main/java/org/asteriskjava/manager/event/HoldedCallEvent.java b/src/main/java/org/asteriskjava/manager/event/HoldedCallEvent.java
index 0aff8ed1a..0b83e4c67 100644
--- a/src/main/java/org/asteriskjava/manager/event/HoldedCallEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/HoldedCallEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A HoldedCallEvent is triggered when a channel is put on hold.
* It is implemented in res/res_features.c
diff --git a/src/main/java/org/asteriskjava/manager/event/InvalidAccountId.java b/src/main/java/org/asteriskjava/manager/event/InvalidAccountId.java
index be7bbe4c1..2f7353664 100644
--- a/src/main/java/org/asteriskjava/manager/event/InvalidAccountId.java
+++ b/src/main/java/org/asteriskjava/manager/event/InvalidAccountId.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* @author Jefferson Alves Reis (jefaokpta) < jefaokpta@hotmail.com >
* Date: 2021-03-03
diff --git a/src/main/java/org/asteriskjava/manager/event/InvalidPasswordEvent.java b/src/main/java/org/asteriskjava/manager/event/InvalidPasswordEvent.java
index c0a9090a1..fb9297651 100644
--- a/src/main/java/org/asteriskjava/manager/event/InvalidPasswordEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/InvalidPasswordEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Created by Alexander Polakov on 1/23/15.
*/
diff --git a/src/main/java/org/asteriskjava/manager/event/JabberEventEvent.java b/src/main/java/org/asteriskjava/manager/event/JabberEventEvent.java
index 0e78da0af..7253eefa8 100644
--- a/src/main/java/org/asteriskjava/manager/event/JabberEventEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/JabberEventEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A JabberEventEvent is triggered when Asterisk receives a Jabber (XMPP) message.
* It is implemented in res/res_jabber.c
diff --git a/src/main/java/org/asteriskjava/manager/event/JitterBufStatsEvent.java b/src/main/java/org/asteriskjava/manager/event/JitterBufStatsEvent.java
index daf0f6531..5c89f9bbf 100644
--- a/src/main/java/org/asteriskjava/manager/event/JitterBufStatsEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/JitterBufStatsEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A JitterBufStatsEvent is triggered at the end of IAX2 calls and reports
* jitter statistics.
diff --git a/src/main/java/org/asteriskjava/manager/event/ListDialplanEvent.java b/src/main/java/org/asteriskjava/manager/event/ListDialplanEvent.java
index 7e9740bed..bb43b9546 100644
--- a/src/main/java/org/asteriskjava/manager/event/ListDialplanEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ListDialplanEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A ShowDialplanCompleteEvent is triggered for each priority in the dialplan
* in response to a ShowDialplanAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/LocalBridgeEvent.java b/src/main/java/org/asteriskjava/manager/event/LocalBridgeEvent.java
index 45dd94ba5..a25aa1629 100644
--- a/src/main/java/org/asteriskjava/manager/event/LocalBridgeEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/LocalBridgeEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* https://wiki.asterisk.org/wiki/display/AST/Asterisk+11+ManagerEvent_LocalBridge
* Triggered when 2 halves of a local channels are bridged
diff --git a/src/main/java/org/asteriskjava/manager/event/LocalOptimizationBeginEvent.java b/src/main/java/org/asteriskjava/manager/event/LocalOptimizationBeginEvent.java
index aa815f099..39ed9cabd 100644
--- a/src/main/java/org/asteriskjava/manager/event/LocalOptimizationBeginEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/LocalOptimizationBeginEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Raised when two halves of a Local Channel begin to optimize themselves out of
* the media path. Available since Asterisk 12
diff --git a/src/main/java/org/asteriskjava/manager/event/LocalOptimizationEndEvent.java b/src/main/java/org/asteriskjava/manager/event/LocalOptimizationEndEvent.java
index 4d4f20d88..b8a29b815 100644
--- a/src/main/java/org/asteriskjava/manager/event/LocalOptimizationEndEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/LocalOptimizationEndEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Raised when two halves of a Local Channel have finished optimizing themselves
* out of the media path. Available since Asterisk 12
diff --git a/src/main/java/org/asteriskjava/manager/event/LogChannelEvent.java b/src/main/java/org/asteriskjava/manager/event/LogChannelEvent.java
index c3c924f94..30f73c2fe 100644
--- a/src/main/java/org/asteriskjava/manager/event/LogChannelEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/LogChannelEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A LogChannelEvent is triggered when logging is turned on or off.
* It is implemented in logger.c
diff --git a/src/main/java/org/asteriskjava/manager/event/MasqueradeEvent.java b/src/main/java/org/asteriskjava/manager/event/MasqueradeEvent.java
index 1f2513daf..f68318f3e 100644
--- a/src/main/java/org/asteriskjava/manager/event/MasqueradeEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/MasqueradeEvent.java
@@ -16,7 +16,8 @@
*/
package org.asteriskjava.manager.event;
-import org.asteriskjava.util.AstState;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+import org.asteriskjava.core.legacy.AstState;
/**
* A MasqueradeEvent is triggered when Asterisk masquerades a channel.
@@ -56,7 +57,7 @@ public void setClone(String clone) {
* Returns the state of the clone channel.
*
* @return the state of the clone channel.
- * @see org.asteriskjava.util.AstState
+ * @see AstState
*/
public Integer getCloneState() {
return AstState.str2state(cloneStateDesc);
@@ -92,7 +93,7 @@ public void setOriginal(String original) {
* Returns the state of the original channel.
*
* @return the state of the original channel.
- * @see org.asteriskjava.util.AstState
+ * @see AstState
*/
public Integer getOriginalState() {
return AstState.str2state(originalStateDesc);
diff --git a/src/main/java/org/asteriskjava/manager/event/MeetMeEndEvent.java b/src/main/java/org/asteriskjava/manager/event/MeetMeEndEvent.java
index aefb5819f..c3958affe 100644
--- a/src/main/java/org/asteriskjava/manager/event/MeetMeEndEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/MeetMeEndEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A MeetMeEnd event indicates that a conference room was disposed.
* Available since Asterisk 1.6.
diff --git a/src/main/java/org/asteriskjava/manager/event/MessageWaitingEvent.java b/src/main/java/org/asteriskjava/manager/event/MessageWaitingEvent.java
index f2a9bb532..1fb360fa0 100644
--- a/src/main/java/org/asteriskjava/manager/event/MessageWaitingEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/MessageWaitingEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A MessageWaitingEvent is triggered when someone leaves voicemail.
* It is implemented in apps/app_voicemail.c
diff --git a/src/main/java/org/asteriskjava/manager/event/ModuleLoadReportEvent.java b/src/main/java/org/asteriskjava/manager/event/ModuleLoadReportEvent.java
index 0ec7547ce..01b84d095 100644
--- a/src/main/java/org/asteriskjava/manager/event/ModuleLoadReportEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ModuleLoadReportEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A ModuleLoadReportEvent is triggerd when Asterisk has completed loading its modules.
* It is implemented in main/loader.c
diff --git a/src/main/java/org/asteriskjava/manager/event/MusicOnHoldEvent.java b/src/main/java/org/asteriskjava/manager/event/MusicOnHoldEvent.java
index ffeb20d57..d6122bf17 100644
--- a/src/main/java/org/asteriskjava/manager/event/MusicOnHoldEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/MusicOnHoldEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A MusicOnHoldEvent is triggered when music on hold starts or stops on a
* channel.
diff --git a/src/main/java/org/asteriskjava/manager/event/NewAccountCodeEvent.java b/src/main/java/org/asteriskjava/manager/event/NewAccountCodeEvent.java
index 58d6fb41f..1cf69351d 100644
--- a/src/main/java/org/asteriskjava/manager/event/NewAccountCodeEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/NewAccountCodeEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A NewAccountCodeEvent indicates that the account code used for CDR has
* changed.
diff --git a/src/main/java/org/asteriskjava/manager/event/NewConnectedLineEvent.java b/src/main/java/org/asteriskjava/manager/event/NewConnectedLineEvent.java
index c145f5c76..578006cfa 100644
--- a/src/main/java/org/asteriskjava/manager/event/NewConnectedLineEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/NewConnectedLineEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Created by plhk on 1/15/15.
*/
diff --git a/src/main/java/org/asteriskjava/manager/event/NewExtenEvent.java b/src/main/java/org/asteriskjava/manager/event/NewExtenEvent.java
index ddf71a982..d5ccf65db 100644
--- a/src/main/java/org/asteriskjava/manager/event/NewExtenEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/NewExtenEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A NewExtenEvent is triggered when a channel is connected to a new extension.
*
diff --git a/src/main/java/org/asteriskjava/manager/event/OriginateResponseEvent.java b/src/main/java/org/asteriskjava/manager/event/OriginateResponseEvent.java
index 93bf466ee..291dd531d 100644
--- a/src/main/java/org/asteriskjava/manager/event/OriginateResponseEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/OriginateResponseEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* Response to an OriginateAction.
*
diff --git a/src/main/java/org/asteriskjava/manager/event/ParkedCallsCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/ParkedCallsCompleteEvent.java
index a00d9e10f..38e3b1855 100644
--- a/src/main/java/org/asteriskjava/manager/event/ParkedCallsCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ParkedCallsCompleteEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A ParkedCallsCompleteEvent is triggered after all parked calls have been
* reported in response to a ParkedCallsAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/PeerEntryEvent.java b/src/main/java/org/asteriskjava/manager/event/PeerEntryEvent.java
index 45244f669..5e9f191cc 100644
--- a/src/main/java/org/asteriskjava/manager/event/PeerEntryEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/PeerEntryEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A PeerEntryEvent is triggered in response to a
* {@link org.asteriskjava.manager.action.SipPeersAction},
diff --git a/src/main/java/org/asteriskjava/manager/event/PeerStatusEvent.java b/src/main/java/org/asteriskjava/manager/event/PeerStatusEvent.java
index 3fd689d25..d4ccb9610 100644
--- a/src/main/java/org/asteriskjava/manager/event/PeerStatusEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/PeerStatusEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A PeerStatusEvent is triggered when a SIP or IAX client attempts to registrer at this asterisk
* server.
diff --git a/src/main/java/org/asteriskjava/manager/event/PeerlistCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/PeerlistCompleteEvent.java
index f81453328..8f81186a7 100644
--- a/src/main/java/org/asteriskjava/manager/event/PeerlistCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/PeerlistCompleteEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A PeerlistCompleteEvent is triggered after the details of all peers has been reported in response
* to an SIPPeersAction or SIPShowPeerAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/PeersEvent.java b/src/main/java/org/asteriskjava/manager/event/PeersEvent.java
index 5a4ed9f11..1327471d8 100644
--- a/src/main/java/org/asteriskjava/manager/event/PeersEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/PeersEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
import java.util.List;
/**
diff --git a/src/main/java/org/asteriskjava/manager/event/PickupEvent.java b/src/main/java/org/asteriskjava/manager/event/PickupEvent.java
index 13e47466e..4827711d1 100644
--- a/src/main/java/org/asteriskjava/manager/event/PickupEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/PickupEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
public class PickupEvent extends ManagerEvent {
/**
*
diff --git a/src/main/java/org/asteriskjava/manager/event/PriEventEvent.java b/src/main/java/org/asteriskjava/manager/event/PriEventEvent.java
index 47908969e..4a79300f0 100644
--- a/src/main/java/org/asteriskjava/manager/event/PriEventEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/PriEventEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* This event is implemented in channels/chan_dahdi.c.
* Available since Asterisk 1.6.1
diff --git a/src/main/java/org/asteriskjava/manager/event/ProtocolIdentifierReceivedEvent.java b/src/main/java/org/asteriskjava/manager/event/ProtocolIdentifierReceivedEvent.java
index 381f3960d..c61dfb9ed 100644
--- a/src/main/java/org/asteriskjava/manager/event/ProtocolIdentifierReceivedEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ProtocolIdentifierReceivedEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A ProtocolIdentifierReceivedEvent is triggered when the network connection to the Asterisk
* server has been established and the protocol identifier has been sent.
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueEntryEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueEntryEvent.java
index b48c923e4..5cf194ea0 100644
--- a/src/main/java/org/asteriskjava/manager/event/QueueEntryEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/QueueEntryEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A QueueEntryEvent is triggered in response to a QueueStatusAction and
* contains information about an entry in a queue.
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueEvent.java
index c733fc0a4..245679588 100644
--- a/src/main/java/org/asteriskjava/manager/event/QueueEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/QueueEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Abstract base class providing common properties for JoinEvent and LeaveEvent.
*
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueMemberEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueMemberEvent.java
index 04f92ecd7..35f6b8d99 100644
--- a/src/main/java/org/asteriskjava/manager/event/QueueMemberEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/QueueMemberEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A QueueMemberEvent is triggered in response to a QueueStatusAction and
* contains information about a member of a queue.
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueMemberPenaltyEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueMemberPenaltyEvent.java
index e77d943d0..57c1aadf9 100644
--- a/src/main/java/org/asteriskjava/manager/event/QueueMemberPenaltyEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/QueueMemberPenaltyEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A QueueMemberPenaltyEvent is triggered when a queue member is assigned a
* new penalty.
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueParamsEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueParamsEvent.java
index bca9afffe..408d4b4e4 100644
--- a/src/main/java/org/asteriskjava/manager/event/QueueParamsEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/QueueParamsEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A QueueParamsEvent is triggered in response to a QueueStatusAction and contains the parameters of
* a queue.
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueStatusCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueStatusCompleteEvent.java
index 44ab073e8..c06666d87 100644
--- a/src/main/java/org/asteriskjava/manager/event/QueueStatusCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/QueueStatusCompleteEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A QueueStatusCompleteEvent is triggered after the state of all queues has been reported in response
* to a QueueStatusAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueSummaryCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueSummaryCompleteEvent.java
index 2c2e72d66..ccebf0c2b 100644
--- a/src/main/java/org/asteriskjava/manager/event/QueueSummaryCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/QueueSummaryCompleteEvent.java
@@ -1,5 +1,6 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.action.QueueSummaryAction;
/**
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueSummaryEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueSummaryEvent.java
index 723c51aab..df069361a 100644
--- a/src/main/java/org/asteriskjava/manager/event/QueueSummaryEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/QueueSummaryEvent.java
@@ -1,5 +1,6 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.action.QueueSummaryAction;
/**
diff --git a/src/main/java/org/asteriskjava/manager/event/ReceiveFaxEvent.java b/src/main/java/org/asteriskjava/manager/event/ReceiveFaxEvent.java
index 2585040db..fd967a713 100644
--- a/src/main/java/org/asteriskjava/manager/event/ReceiveFaxEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ReceiveFaxEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A ReceiveFaxEvent is an event of Digium's Fax For Asterisk add-on.
*/
diff --git a/src/main/java/org/asteriskjava/manager/event/RegistrationsCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/RegistrationsCompleteEvent.java
index f79103c89..ec9c52a81 100644
--- a/src/main/java/org/asteriskjava/manager/event/RegistrationsCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/RegistrationsCompleteEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A RegistrationsCompleteEvent is triggered after the details of all SIP
* registrations has been reported in response to an SipShowRegistryAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/RegistryEntryEvent.java b/src/main/java/org/asteriskjava/manager/event/RegistryEntryEvent.java
index 1280e86e7..d008ca1c1 100644
--- a/src/main/java/org/asteriskjava/manager/event/RegistryEntryEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/RegistryEntryEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A RegistryEntry is triggered in response to a SipShowRegistryAction and contains
* information about a SIP registration.
diff --git a/src/main/java/org/asteriskjava/manager/event/RegistryEvent.java b/src/main/java/org/asteriskjava/manager/event/RegistryEvent.java
index 90b842413..41dd98006 100644
--- a/src/main/java/org/asteriskjava/manager/event/RegistryEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/RegistryEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A RegistryEvent is triggered when this asterisk server attempts to register
* as a client at another SIP or IAX server.
diff --git a/src/main/java/org/asteriskjava/manager/event/ReloadEvent.java b/src/main/java/org/asteriskjava/manager/event/ReloadEvent.java
index 6bc8f6824..29947e18a 100644
--- a/src/main/java/org/asteriskjava/manager/event/ReloadEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ReloadEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A ReloadEvent is triggerd when the reload console command is executed or the
* Asterisk server is started.
diff --git a/src/main/java/org/asteriskjava/manager/event/RenameEvent.java b/src/main/java/org/asteriskjava/manager/event/RenameEvent.java
index 6bab2bfc9..9c4fcba6d 100644
--- a/src/main/java/org/asteriskjava/manager/event/RenameEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/RenameEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A RenameEvent is triggered when the name of a channel is changed.
*
diff --git a/src/main/java/org/asteriskjava/manager/event/RequestBadFormatEvent.java b/src/main/java/org/asteriskjava/manager/event/RequestBadFormatEvent.java
index cd2f96ce5..6a2947fc0 100644
--- a/src/main/java/org/asteriskjava/manager/event/RequestBadFormatEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/RequestBadFormatEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A RequestBadFormatEvent is triggered when bad format of request.
*/
diff --git a/src/main/java/org/asteriskjava/manager/event/ShowDialplanCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/ShowDialplanCompleteEvent.java
index 8aa8a55c4..970fbfe88 100644
--- a/src/main/java/org/asteriskjava/manager/event/ShowDialplanCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ShowDialplanCompleteEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A ShowDialplanCompleteEvent is triggered after the dialplan has been reported
* in response to a ShowDialplanAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/ShutdownEvent.java b/src/main/java/org/asteriskjava/manager/event/ShutdownEvent.java
index 46eee4d9a..cbbef8a4b 100644
--- a/src/main/java/org/asteriskjava/manager/event/ShutdownEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ShutdownEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A ShutdownEvent is triggered when the asterisk server is shut down or restarted.
* It is implemented in asterisk.c
diff --git a/src/main/java/org/asteriskjava/manager/event/SkypeAccountStatusEvent.java b/src/main/java/org/asteriskjava/manager/event/SkypeAccountStatusEvent.java
index e433b3d19..e58725249 100644
--- a/src/main/java/org/asteriskjava/manager/event/SkypeAccountStatusEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/SkypeAccountStatusEvent.java
@@ -18,6 +18,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A SkypeAccountStatusEvent is sent when a Skype for Asterisk user logs in or out
* of the Skype community.
diff --git a/src/main/java/org/asteriskjava/manager/event/SkypeBuddyEntryEvent.java b/src/main/java/org/asteriskjava/manager/event/SkypeBuddyEntryEvent.java
index e38826277..a255487dd 100644
--- a/src/main/java/org/asteriskjava/manager/event/SkypeBuddyEntryEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/SkypeBuddyEntryEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A SkypeBuddyEntryEvent is triggered in response to a SkypeBuddiesAction for each
* buddy on the buddy list.
diff --git a/src/main/java/org/asteriskjava/manager/event/SkypeBuddyListCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/SkypeBuddyListCompleteEvent.java
index e960a526a..3fda1e8fc 100644
--- a/src/main/java/org/asteriskjava/manager/event/SkypeBuddyListCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/SkypeBuddyListCompleteEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A SkypeBuddyListCompleteEvent is triggered in response to a SkypeBuddiesAction when
* all buddies have been reported.
diff --git a/src/main/java/org/asteriskjava/manager/event/SkypeBuddyStatusEvent.java b/src/main/java/org/asteriskjava/manager/event/SkypeBuddyStatusEvent.java
index eda2121f8..d62a3c95f 100644
--- a/src/main/java/org/asteriskjava/manager/event/SkypeBuddyStatusEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/SkypeBuddyStatusEvent.java
@@ -18,6 +18,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/src/main/java/org/asteriskjava/manager/event/SkypeChatMessageEvent.java b/src/main/java/org/asteriskjava/manager/event/SkypeChatMessageEvent.java
index a4c597577..ae2f4bf9e 100644
--- a/src/main/java/org/asteriskjava/manager/event/SkypeChatMessageEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/SkypeChatMessageEvent.java
@@ -16,6 +16,7 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.util.Base64;
import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/org/asteriskjava/manager/event/SkypeLicenseEvent.java b/src/main/java/org/asteriskjava/manager/event/SkypeLicenseEvent.java
index 2d0d2c09e..1ecb59d77 100644
--- a/src/main/java/org/asteriskjava/manager/event/SkypeLicenseEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/SkypeLicenseEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A SkypeLicenseEvent is triggered in response to a SkypeLicenseListAction for each
* license installed on the system.
diff --git a/src/main/java/org/asteriskjava/manager/event/SkypeLicenseListCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/SkypeLicenseListCompleteEvent.java
index 796d6ec4e..d1cdb988b 100644
--- a/src/main/java/org/asteriskjava/manager/event/SkypeLicenseListCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/SkypeLicenseListCompleteEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A SkypeLicenseListCompleteEvent is triggered in response to a SkypeLicenseListAction when
* all licenses have been reported.
diff --git a/src/main/java/org/asteriskjava/manager/event/StatusCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/StatusCompleteEvent.java
index 74e0a124c..a121e70cd 100644
--- a/src/main/java/org/asteriskjava/manager/event/StatusCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/StatusCompleteEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A StatusCompleteEvent is triggered after the state of all channels has been
* reported in response to a StatusAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/StatusEvent.java b/src/main/java/org/asteriskjava/manager/event/StatusEvent.java
index 193a0be3d..29933549a 100644
--- a/src/main/java/org/asteriskjava/manager/event/StatusEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/StatusEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
import java.util.Map;
/**
diff --git a/src/main/java/org/asteriskjava/manager/event/SuccessfulAuthEvent.java b/src/main/java/org/asteriskjava/manager/event/SuccessfulAuthEvent.java
index e8b533ddf..e110c5121 100644
--- a/src/main/java/org/asteriskjava/manager/event/SuccessfulAuthEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/SuccessfulAuthEvent.java
@@ -1,5 +1,7 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Created by plhk on 1/15/15.
*/
diff --git a/src/main/java/org/asteriskjava/manager/event/TransferEvent.java b/src/main/java/org/asteriskjava/manager/event/TransferEvent.java
index f6532cf65..67d6fd41d 100644
--- a/src/main/java/org/asteriskjava/manager/event/TransferEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/TransferEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A TransferEvent is triggered when a SIP channel is transfered.
* It is implemented in channels/chan_sip.c.
diff --git a/src/main/java/org/asteriskjava/manager/event/TransportDetail.java b/src/main/java/org/asteriskjava/manager/event/TransportDetail.java
index d05aaca2a..1916c6259 100644
--- a/src/main/java/org/asteriskjava/manager/event/TransportDetail.java
+++ b/src/main/java/org/asteriskjava/manager/event/TransportDetail.java
@@ -1,6 +1,8 @@
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A TransportDetail event is triggered in response to a
* {@link org.asteriskjava.manager.action.PJSipShowEndpoint}
diff --git a/src/main/java/org/asteriskjava/manager/event/UserEvent.java b/src/main/java/org/asteriskjava/manager/event/UserEvent.java
index 6a8f6a377..b2a339340 100644
--- a/src/main/java/org/asteriskjava/manager/event/UserEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/UserEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* Abstract base class for user events.
*
diff --git a/src/main/java/org/asteriskjava/manager/event/VarSetEvent.java b/src/main/java/org/asteriskjava/manager/event/VarSetEvent.java
index 2bf16e395..5261e26c8 100644
--- a/src/main/java/org/asteriskjava/manager/event/VarSetEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/VarSetEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+
/**
* A VarSetEvent is triggered when a channel or global variable is set in
* Asterisk.
diff --git a/src/main/java/org/asteriskjava/manager/event/VoicemailUserEntryCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/VoicemailUserEntryCompleteEvent.java
index 6f1aebdad..3d7d301d7 100644
--- a/src/main/java/org/asteriskjava/manager/event/VoicemailUserEntryCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/VoicemailUserEntryCompleteEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A VoicemailUserEntryCompleteEvent is triggered after the details of all voicemail users has
* been reported in response to a VoicemailUsersListAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/VoicemailUserEntryEvent.java b/src/main/java/org/asteriskjava/manager/event/VoicemailUserEntryEvent.java
index 8fbc8fd14..7f07ecafe 100644
--- a/src/main/java/org/asteriskjava/manager/event/VoicemailUserEntryEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/VoicemailUserEntryEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A VoicemailUserEntryCompleteEvent is triggered in response to a VoicemailUsersListAction
* and contains the details about a voicemail user.
diff --git a/src/main/java/org/asteriskjava/manager/event/ZapShowChannelsCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/ZapShowChannelsCompleteEvent.java
index 55e10313e..4eb575be1 100644
--- a/src/main/java/org/asteriskjava/manager/event/ZapShowChannelsCompleteEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ZapShowChannelsCompleteEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A ZapShowChannelsCompleteEvent is triggered after the state of all zap channels has been reported
* in response to a ZapShowChannelsAction.
diff --git a/src/main/java/org/asteriskjava/manager/event/ZapShowChannelsEvent.java b/src/main/java/org/asteriskjava/manager/event/ZapShowChannelsEvent.java
index 5460927b2..c8beb4e10 100644
--- a/src/main/java/org/asteriskjava/manager/event/ZapShowChannelsEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ZapShowChannelsEvent.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+
/**
* A ZapShowChannelsEvent is triggered in response to a ZapShowChannelsAction
* and shows the state of a zap channel.
diff --git a/src/main/java/org/asteriskjava/manager/internal/ActionBuilder.java b/src/main/java/org/asteriskjava/manager/internal/ActionBuilder.java
index 252bb6a20..be94c9049 100644
--- a/src/main/java/org/asteriskjava/manager/internal/ActionBuilder.java
+++ b/src/main/java/org/asteriskjava/manager/internal/ActionBuilder.java
@@ -17,7 +17,7 @@
package org.asteriskjava.manager.internal;
import org.asteriskjava.AsteriskVersion;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
/**
diff --git a/src/main/java/org/asteriskjava/manager/internal/ActionBuilderImpl.java b/src/main/java/org/asteriskjava/manager/internal/ActionBuilderImpl.java
index 2917eaa59..fe690fcaf 100644
--- a/src/main/java/org/asteriskjava/manager/internal/ActionBuilderImpl.java
+++ b/src/main/java/org/asteriskjava/manager/internal/ActionBuilderImpl.java
@@ -17,8 +17,7 @@
package org.asteriskjava.manager.internal;
import org.asteriskjava.AsteriskVersion;
-import org.asteriskjava.ami.ActionFieldsComparator;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import org.asteriskjava.core.databind.AsteriskEncoder;
import org.asteriskjava.manager.AsteriskMapping;
import org.asteriskjava.manager.action.UserEventAction;
@@ -31,6 +30,8 @@
import java.lang.reflect.Method;
import java.util.*;
+import static org.asteriskjava.core.NewlineDelimiter.CRLF;
+
/**
* Default implementation of the ActionBuilder interface.
*
@@ -49,10 +50,7 @@ class ActionBuilderImpl implements ActionBuilder {
private AsteriskVersion targetVersion;
private final Set membersToIgnore = new HashSet<>();
- private final AsteriskEncoder asteriskEncoder = AsteriskEncoder.builder()
- .crlfNewlineDelimiter()
- .fieldNamesComparator(new ActionFieldsComparator())
- .build();
+ private final AsteriskEncoder asteriskEncoder = new AsteriskEncoder(CRLF);
/**
* Creates a new ActionBuilder for Asterisk 1.0.
diff --git a/src/main/java/org/asteriskjava/manager/internal/AsyncEventPump.java b/src/main/java/org/asteriskjava/manager/internal/AsyncEventPump.java
index c1a843750..02db236fd 100644
--- a/src/main/java/org/asteriskjava/manager/internal/AsyncEventPump.java
+++ b/src/main/java/org/asteriskjava/manager/internal/AsyncEventPump.java
@@ -1,9 +1,9 @@
package org.asteriskjava.manager.internal;
import com.google.common.util.concurrent.RateLimiter;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.lock.Locker;
-import org.asteriskjava.manager.event.ManagerEvent;
import org.asteriskjava.pbx.util.LogTime;
import org.asteriskjava.util.Log;
import org.asteriskjava.util.LogFactory;
diff --git a/src/main/java/org/asteriskjava/manager/internal/Dispatcher.java b/src/main/java/org/asteriskjava/manager/internal/Dispatcher.java
index 95ac2b417..4943b7d21 100644
--- a/src/main/java/org/asteriskjava/manager/internal/Dispatcher.java
+++ b/src/main/java/org/asteriskjava/manager/internal/Dispatcher.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.internal;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
-import org.asteriskjava.manager.event.ManagerEvent;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
+import org.asteriskjava.ami.event.api.ManagerEvent;
/**
* The Dispatcher defines the interface used for communication between
diff --git a/src/main/java/org/asteriskjava/manager/internal/EventBuilder.java b/src/main/java/org/asteriskjava/manager/internal/EventBuilder.java
index 2224dfd2f..31994fbae 100644
--- a/src/main/java/org/asteriskjava/manager/internal/EventBuilder.java
+++ b/src/main/java/org/asteriskjava/manager/internal/EventBuilder.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.internal;
-import org.asteriskjava.manager.event.ManagerEvent;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import java.util.Map;
@@ -25,7 +25,7 @@
*
* @author srt
* @version $Id$
- * @see org.asteriskjava.manager.event.ManagerEvent
+ * @see ManagerEvent
*/
interface EventBuilder {
/**
diff --git a/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java b/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java
index e7241e2f0..78b71e059 100644
--- a/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java
+++ b/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java
@@ -15,7 +15,11 @@
*/
package org.asteriskjava.manager.internal;
-import org.asteriskjava.manager.event.*;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+import org.asteriskjava.ami.event.api.ManagerEvent;
+import org.asteriskjava.manager.event.PeerEntryEvent;
+import org.asteriskjava.manager.event.PeersEvent;
+import org.asteriskjava.manager.event.UserEvent;
import org.asteriskjava.manager.util.EventAttributesHelper;
import org.asteriskjava.util.Log;
import org.asteriskjava.util.LogFactory;
@@ -31,7 +35,7 @@
*
* @author srt
* @version $Id$
- * @see org.asteriskjava.manager.event.ManagerEvent
+ * @see ManagerEvent
*/
class EventBuilderImpl implements EventBuilder {
private static final Set ignoredAttributes = new HashSet<>(Arrays.asList("event"));
@@ -42,10 +46,13 @@ class EventBuilderImpl implements EventBuilder {
private final static Set> knownManagerEventClasses = new Reflections(
"org.asteriskjava.manager.event").getSubTypesOf(ManagerEvent.class);
+ private final static Set> actionResponseEventClasses = new Reflections(
+ "org.asteriskjava.ami.action.api.response.event").getSubTypesOf(ManagerEvent.class);
EventBuilderImpl() {
this.registeredEventClasses = new HashMap<>();
registerBuiltinEventClasses();
+ registerActionResponseEventClasses();
}
/**
@@ -59,6 +66,14 @@ private void registerBuiltinEventClasses() {
}
}
+ private void registerActionResponseEventClasses() {
+ for (Class managerEventClass : actionResponseEventClasses) {
+ if (!Modifier.isAbstract(managerEventClass.getModifiers())) {
+ registerEventClass(managerEventClass);
+ }
+ }
+ }
+
public final void registerEventClass(Class clazz) throws IllegalArgumentException {
String className;
String eventType;
diff --git a/src/main/java/org/asteriskjava/manager/internal/ManagerConnectionImpl.java b/src/main/java/org/asteriskjava/manager/internal/ManagerConnectionImpl.java
index c6c72f2aa..ba9c4d9ae 100644
--- a/src/main/java/org/asteriskjava/manager/internal/ManagerConnectionImpl.java
+++ b/src/main/java/org/asteriskjava/manager/internal/ManagerConnectionImpl.java
@@ -16,21 +16,19 @@
package org.asteriskjava.manager.internal;
import org.asteriskjava.AsteriskVersion;
-import org.asteriskjava.ami.action.AuthType;
-import org.asteriskjava.ami.action.ChallengeAction;
-import org.asteriskjava.ami.action.ManagerAction;
import org.asteriskjava.ami.action.annotation.ExpectedResponse;
-import org.asteriskjava.ami.action.response.ChallengeManagerActionResponse;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.*;
+import org.asteriskjava.ami.action.api.response.*;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.lock.Lockable;
import org.asteriskjava.lock.LockableList;
import org.asteriskjava.lock.LockableMap;
import org.asteriskjava.lock.Locker.LockCloser;
import org.asteriskjava.manager.*;
-import org.asteriskjava.manager.action.*;
+import org.asteriskjava.manager.action.EventGeneratingAction;
+import org.asteriskjava.manager.action.UserEventAction;
import org.asteriskjava.manager.event.*;
-import org.asteriskjava.manager.response.CommandResponse;
-import org.asteriskjava.manager.response.CoreSettingsResponse;
import org.asteriskjava.manager.response.ManagerError;
import org.asteriskjava.pbx.util.LogTime;
import org.asteriskjava.util.DateUtil;
@@ -45,15 +43,17 @@
import java.net.Socket;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
+import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
+import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.toCollection;
+import static org.apache.commons.codec.digest.DigestUtils.md5Hex;
import static org.asteriskjava.manager.ManagerConnectionState.*;
/**
@@ -75,18 +75,18 @@ public class ManagerConnectionImpl extends Lockable implements ManagerConnection
// NOTE: identifier is AMI_VERSION, defined in include/asterisk/manager.h
// AMI version consists of MAJOR.BREAKING.NON-BREAKING.
private static final String[] SUPPORTED_AMI_VERSIONS = {
- "2.6", // Asterisk 13
- "2.7", // Asterisk 13.2
- "2.8", // Asterisk >13.5
- "2.9", // Asterisk >13.3
- "3.1", // Asterisk =14.3
- "3.2", // Asterisk 14.4.0
- "4.0", // Asterisk 15
- "5.0", // Asterisk 16
- "6.0", // Asterisk 17
- "7.0", // Asterisk 18
- "8.0", // Asterisk 19
- "9.0", // Asterisk 20
+ "2.6", // Asterisk 13
+ "2.7", // Asterisk 13.2
+ "2.8", // Asterisk >13.5
+ "2.9", // Asterisk >13.3
+ "3.1", // Asterisk =14.3
+ "3.2", // Asterisk 14.4.0
+ "4.0", // Asterisk 15
+ "5.0", // Asterisk 16
+ "6.0", // Asterisk 17
+ "7.0", // Asterisk 18
+ "8.0", // Asterisk 19
+ "9.0", // Asterisk 20
};
private static final AtomicLong idCounter = new AtomicLong(0);
@@ -450,7 +450,7 @@ public void login(String eventMask) throws IOException, AuthenticationFailedExce
* timeout ms.
* Sends a {@link ChallengeAction} requesting a challenge for authType
* MD5.
- * When the {@link ChallengeManagerActionResponse} is received a {@link LoginAction}
+ * When the {@link ChallengeActionResponse} is received a {@link LoginAction}
* is sent using the calculated key (MD5 hash of the password appended to
* the received challenge).
*
@@ -509,31 +509,25 @@ protected void doLogin(long timeout, String eventMask)
throw new AuthenticationFailedException("Unable to send challenge action", e);
}
- if (challengeResponse instanceof ChallengeManagerActionResponse) {
- challenge = ((ChallengeManagerActionResponse) challengeResponse).getChallenge();
+ if (challengeResponse instanceof ChallengeActionResponse) {
+ challenge = ((ChallengeActionResponse) challengeResponse).getChallenge();
} else {
disconnect();
throw new AuthenticationFailedException("Unable to get challenge from Asterisk. ChallengeAction returned: "
+ challengeResponse.getMessage());
}
- try {
- MessageDigest md;
+ key = md5Hex(challenge + password);
- md = MessageDigest.getInstance("MD5");
- if (challenge != null) {
- md.update(challenge.getBytes(StandardCharsets.UTF_8));
- }
- if (password != null) {
- md.update(password.getBytes(StandardCharsets.UTF_8));
- }
- key = ManagerUtil.toHexString(md.digest());
- } catch (NoSuchAlgorithmException ex) {
- disconnect();
- throw new AuthenticationFailedException("Unable to create login key using MD5 Message Digest", ex);
+ EnumSet eventMasks = null;
+ if (eventMask != null) {
+ eventMasks = stream(eventMask.split(","))
+ .map(EventMask::valueOf)
+ .collect(toCollection(() -> EnumSet.noneOf(EventMask.class)));
}
- loginAction = new LoginAction(username, "MD5", key, eventMask);
+ loginAction = new LoginAction(username, AuthType.MD5, key);
+ loginAction.setEvents(eventMasks);
try {
loginResponse = sendAction(loginAction);
} catch (Exception e) {
@@ -541,7 +535,7 @@ protected void doLogin(long timeout, String eventMask)
throw new AuthenticationFailedException("Unable to send login action", e);
}
- if (loginResponse instanceof ManagerError) {
+ if (loginResponse.getResponse() == ResponseType.error) {
disconnect();
throw new AuthenticationFailedException(loginResponse.getMessage());
}
@@ -607,13 +601,13 @@ protected AsteriskVersion determineVersion() throws IOException, TimeoutExceptio
protected AsteriskVersion determineVersionByCoreSettings() throws Exception {
ManagerActionResponse response = sendAction(new CoreSettingsAction());
- if (!(response instanceof CoreSettingsResponse)) {
+ if (!(response instanceof CoreSettingsActionResponse)) {
// NOTE: you need system or reporting permissions
logger.info("Could not get core settings, do we have the necessary permissions?");
return null;
}
- String ver = ((CoreSettingsResponse) response).getAsteriskVersion();
+ String ver = ((CoreSettingsActionResponse) response).getAsteriskVersion();
return AsteriskVersion.getDetermineVersionFromString("Asterisk " + ver);
}
@@ -627,13 +621,13 @@ protected AsteriskVersion determineVersionByCoreSettings() throws Exception {
protected AsteriskVersion determineVersionByCoreShowVersion() throws Exception {
final ManagerActionResponse coreShowVersionResponse = sendAction(new CommandAction(CMD_SHOW_VERSION));
- if (coreShowVersionResponse == null || !(coreShowVersionResponse instanceof CommandResponse)) {
+ if (coreShowVersionResponse == null || !(coreShowVersionResponse instanceof CommandActionResponse)) {
// this needs 'command' permissions
logger.info("Could not get response for 'core show version'");
return null;
}
- final List coreShowVersionResult = ((CommandResponse) coreShowVersionResponse).getResult();
+ final List coreShowVersionResult = ((CommandActionResponse) coreShowVersionResponse).getOutput();
if (coreShowVersionResult == null || coreShowVersionResult.isEmpty()) {
logger.warn("Got empty response for 'core show version'");
return null;
@@ -838,28 +832,23 @@ public ResponseEvents sendEventGeneratingAction(EventGeneratingAction action)
*/
public ResponseEvents sendEventGeneratingAction(EventGeneratingAction action, long timeout)
throws IOException, EventTimeoutException, IllegalArgumentException, IllegalStateException {
+ Class actionCompleteEventClass = getActionCompleteEventClass(action);
+ return sendEventGeneratingAction(action, timeout, actionCompleteEventClass);
+ }
+
+ @Override
+ public ResponseEvents sendEventGeneratingAction(ManagerAction action, long timeout, Class actionCompleteEventClass) throws IOException, EventTimeoutException {
final ResponseEventsImpl responseEvents;
final ResponseEventHandler responseEventHandler;
final String internalActionId;
- if (action == null) {
- throw new IllegalArgumentException("Unable to send action: action is null.");
- } else if (action.getActionCompleteEventClass() == null) {
- throw new IllegalArgumentException(
- "Unable to send action: actionCompleteEventClass for " + action.getClass().getName() + " is null.");
- } else if (!ResponseEvent.class.isAssignableFrom(action.getActionCompleteEventClass())) {
- throw new IllegalArgumentException(
- "Unable to send action: actionCompleteEventClass (" + action.getActionCompleteEventClass().getName()
- + ") for " + action.getClass().getName() + " is not a ResponseEvent.");
- }
-
if (state != CONNECTED) {
throw new IllegalStateException(
"Actions may only be sent when in state " + "CONNECTED but connection is in state " + state);
}
responseEvents = new ResponseEventsImpl();
- responseEventHandler = new ResponseEventHandler(responseEvents, action.getActionCompleteEventClass());
+ responseEventHandler = new ResponseEventHandler(responseEvents, actionCompleteEventClass);
internalActionId = createInternalActionId();
@@ -913,16 +902,7 @@ public ResponseEvents sendEventGeneratingAction(EventGeneratingAction action, lo
public void sendEventGeneratingAction(EventGeneratingAction action, SendEventGeneratingActionCallback callback)
throws IOException, IllegalArgumentException, IllegalStateException {
- if (action == null) {
- throw new IllegalArgumentException("Unable to send action: action is null.");
- } else if (action.getActionCompleteEventClass() == null) {
- throw new IllegalArgumentException(
- "Unable to send action: actionCompleteEventClass for " + action.getClass().getName() + " is null.");
- } else if (!ResponseEvent.class.isAssignableFrom(action.getActionCompleteEventClass())) {
- throw new IllegalArgumentException(
- "Unable to send action: actionCompleteEventClass (" + action.getActionCompleteEventClass().getName()
- + ") for " + action.getClass().getName() + " is not a ResponseEvent.");
- }
+ Class actionCompleteEventClass = getActionCompleteEventClass(action);
if (state != CONNECTED) {
throw new IllegalStateException(
@@ -933,7 +913,7 @@ public void sendEventGeneratingAction(EventGeneratingAction action, SendEventGen
if (callback != null) {
AsyncEventGeneratingResponseHandler responseEventHandler = new AsyncEventGeneratingResponseHandler(
- action.getActionCompleteEventClass(), callback);
+ actionCompleteEventClass, callback);
// register response handler...
try (LockCloser closer = this.responseListeners.withLock()) {
@@ -949,6 +929,20 @@ public void sendEventGeneratingAction(EventGeneratingAction action, SendEventGen
writer.sendAction(action, internalActionId);
}
+ private static Class getActionCompleteEventClass(EventGeneratingAction action) {
+ if (action == null) {
+ throw new IllegalArgumentException("Unable to send action: action is null.");
+ } else if (action.getActionCompleteEventClass() == null) {
+ throw new IllegalArgumentException(
+ "Unable to send action: actionCompleteEventClass for " + action.getClass().getName() + " is null.");
+ } else if (!ResponseEvent.class.isAssignableFrom(action.getActionCompleteEventClass())) {
+ throw new IllegalArgumentException(
+ "Unable to send action: actionCompleteEventClass (" + action.getActionCompleteEventClass().getName()
+ + ") for " + action.getClass().getName() + " is not a ResponseEvent.");
+ }
+ return action.getActionCompleteEventClass();
+ }
+
/**
* Creates a new unique internal action id based on the hash code of this
* connection and a sequence.
diff --git a/src/main/java/org/asteriskjava/manager/internal/ManagerReader.java b/src/main/java/org/asteriskjava/manager/internal/ManagerReader.java
index 9510bcb3f..c579bad19 100644
--- a/src/main/java/org/asteriskjava/manager/internal/ManagerReader.java
+++ b/src/main/java/org/asteriskjava/manager/internal/ManagerReader.java
@@ -16,8 +16,8 @@
*/
package org.asteriskjava.manager.internal;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
-import org.asteriskjava.manager.event.ManagerEvent;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.util.SocketConnectionFacade;
import java.io.IOException;
diff --git a/src/main/java/org/asteriskjava/manager/internal/ManagerReaderImpl.java b/src/main/java/org/asteriskjava/manager/internal/ManagerReaderImpl.java
index c9d06e832..0d5f493d2 100644
--- a/src/main/java/org/asteriskjava/manager/internal/ManagerReaderImpl.java
+++ b/src/main/java/org/asteriskjava/manager/internal/ManagerReaderImpl.java
@@ -17,9 +17,9 @@
package org.asteriskjava.manager.internal;
import com.google.common.util.concurrent.RateLimiter;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.manager.event.DisconnectEvent;
-import org.asteriskjava.manager.event.ManagerEvent;
import org.asteriskjava.manager.event.ProtocolIdentifierReceivedEvent;
import org.asteriskjava.manager.internal.backwardsCompatibility.BackwardsCompatibilityForManagerEvents;
import org.asteriskjava.pbx.util.LogTime;
diff --git a/src/main/java/org/asteriskjava/manager/internal/ManagerUtil.java b/src/main/java/org/asteriskjava/manager/internal/ManagerUtil.java
index 545b9f18a..3faaa4b7d 100644
--- a/src/main/java/org/asteriskjava/manager/internal/ManagerUtil.java
+++ b/src/main/java/org/asteriskjava/manager/internal/ManagerUtil.java
@@ -41,24 +41,6 @@ private ManagerUtil() {
}
- /**
- * Converts a byte array to a hex string representing it. The hex digits are
- * lower case.
- *
- * @param b the byte array to convert
- * @return the hex representation of b
- */
- public static String toHexString(byte[] b) {
- final StringBuilder sb;
-
- sb = new StringBuilder(b.length * 2);
- for (byte aB : b) {
- sb.append(hexChar[(aB & 0xf0) >>> 4]);
- sb.append(hexChar[aB & 0x0f]);
- }
- return sb.toString();
- }
-
/**
* Returns the internal action id contained in the given action id.
*
diff --git a/src/main/java/org/asteriskjava/manager/internal/ManagerWriter.java b/src/main/java/org/asteriskjava/manager/internal/ManagerWriter.java
index f7c04dccf..f4af76a65 100644
--- a/src/main/java/org/asteriskjava/manager/internal/ManagerWriter.java
+++ b/src/main/java/org/asteriskjava/manager/internal/ManagerWriter.java
@@ -17,7 +17,7 @@
package org.asteriskjava.manager.internal;
import org.asteriskjava.AsteriskVersion;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import org.asteriskjava.util.SocketConnectionFacade;
import java.io.IOException;
diff --git a/src/main/java/org/asteriskjava/manager/internal/ManagerWriterImpl.java b/src/main/java/org/asteriskjava/manager/internal/ManagerWriterImpl.java
index d94776dc5..7f0307e04 100644
--- a/src/main/java/org/asteriskjava/manager/internal/ManagerWriterImpl.java
+++ b/src/main/java/org/asteriskjava/manager/internal/ManagerWriterImpl.java
@@ -17,7 +17,7 @@
package org.asteriskjava.manager.internal;
import org.asteriskjava.AsteriskVersion;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import org.asteriskjava.lock.Lockable;
import org.asteriskjava.lock.Locker.LockCloser;
import org.asteriskjava.util.SocketConnectionFacade;
diff --git a/src/main/java/org/asteriskjava/manager/internal/ResponseBuilder.java b/src/main/java/org/asteriskjava/manager/internal/ResponseBuilder.java
index 144ba2723..56dd0b649 100644
--- a/src/main/java/org/asteriskjava/manager/internal/ResponseBuilder.java
+++ b/src/main/java/org/asteriskjava/manager/internal/ResponseBuilder.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.internal;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
import java.util.Map;
diff --git a/src/main/java/org/asteriskjava/manager/internal/ResponseBuilderImpl.java b/src/main/java/org/asteriskjava/manager/internal/ResponseBuilderImpl.java
index eb183fb86..71ead95f1 100644
--- a/src/main/java/org/asteriskjava/manager/internal/ResponseBuilderImpl.java
+++ b/src/main/java/org/asteriskjava/manager/internal/ResponseBuilderImpl.java
@@ -15,10 +15,10 @@
*/
package org.asteriskjava.manager.internal;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
-import org.asteriskjava.ami.action.response.ResponseType;
+import org.asteriskjava.ami.action.api.response.CommandActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ResponseType;
import org.asteriskjava.core.databind.AsteriskDecoder;
-import org.asteriskjava.manager.response.CommandResponse;
import org.asteriskjava.manager.response.ManagerError;
import org.asteriskjava.manager.util.EventAttributesHelper;
import org.slf4j.Logger;
@@ -45,12 +45,12 @@ class ResponseBuilderImpl implements ResponseBuilder {
private static final String RESPONSE_TYPE_ERROR = "error";
private static final String OUTPUT_RESPONSE_KEY = "output"; //Asterisk 14.3.0
- private final AsteriskDecoder asteriskDecoder = new AsteriskDecoder(false);
+ private final AsteriskDecoder asteriskDecoder = new AsteriskDecoder();
@SuppressWarnings("unchecked")
public ManagerActionResponse buildResponse(Class responseClass, Map attributes) {
responseClass = responseClass == null ? ManagerActionResponse.class : responseClass;
- if (responseClass.getPackageName().contains("org.asteriskjava.ami.action.response")) {
+ if (responseClass.getPackageName().contains("org.asteriskjava.ami.action.api.response")) {
ManagerActionResponse response = asteriskDecoder.decode(attributes, responseClass);
response.setAttributes(new HashMap<>(attributes));
return response;
@@ -74,8 +74,8 @@ public ManagerActionResponse buildResponse(Class result = new ArrayList<>();
//For Asterisk 14
if (attributes.get(OUTPUT_RESPONSE_KEY) != null) {
@@ -97,7 +97,7 @@ public ManagerActionResponse buildResponse(Class
- * Asterisk's handling of the command action is generelly quite hairy. It sends a "Response:
- * Follows" line followed by the raw output of the command including empty lines. At the end of the
- * command output a line containing "--END COMMAND--" is sent. The reader parses this response into
- * a CommandResponse object to hide these details.
- *
- * @author srt
- * @version $Id$
- * @see org.asteriskjava.manager.action.CommandAction
- */
-public class CommandResponse extends ManagerActionResponse {
- private static final long serialVersionUID = 1L;
-
- private String privilege;
- private List result;
-
- /**
- * Returns the AMI authorization class of this response.
- *
- * @return always "Command"
- * @since 1.0.0
- */
- public String getPrivilege() {
- return privilege;
- }
-
- public void setPrivilege(String privilege) {
- this.privilege = privilege;
- }
-
- /**
- * Returns a List of strings representing the lines returned by the CLI command.
- *
- * @return a List of strings representing the lines returned by the CLI command.
- */
- public List getResult() {
- return result;
- }
-
- /**
- * Sets the result.
- */
- public void setResult(List result) {
- this.result = result;
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/response/CoreSettingsResponse.java b/src/main/java/org/asteriskjava/manager/response/CoreSettingsResponse.java
deleted file mode 100644
index 45107dc37..000000000
--- a/src/main/java/org/asteriskjava/manager/response/CoreSettingsResponse.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.response;
-
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
-
-/**
- * Corresponds to a CoreSettingsAction and contains the current settings summary of the
- * Asterisk server.
- *
- * @author srt
- * @version $Id$
- * @see org.asteriskjava.manager.action.CoreSettingsAction
- * @since 1.0.0
- */
-public class CoreSettingsResponse extends ManagerActionResponse {
- private static final long serialVersionUID = 1L;
-
- private String amiVersion;
- private String asteriskVersion;
- private String systemName;
- private Integer coreMaxCalls;
- private Double coreMaxLoadAvg;
- private String coreRunUser;
- private String coreRunGroup;
- private Integer coreMaxFilehandles;
- private Boolean coreRealtimeEnabled;
- private Boolean coreCdrEnabled;
- private Boolean coreHttpEnabled;
-
- /**
- * Returns the version of the Asterisk Manager Interface (AMI). For Asterisk 1.6 this is "1.1".
- *
- * @return the version of the Asterisk Manager Interface (AMI).
- */
- public String getAmiVersion() {
- return amiVersion;
- }
-
- public void setAmiVersion(String amiVersion) {
- this.amiVersion = amiVersion;
- }
-
- /**
- * Returns the version of the Asterisk server. For example "1.6.0-beta9".
- *
- * @return the version of the Asterisk server.
- */
- public String getAsteriskVersion() {
- return asteriskVersion;
- }
-
- public void setAsteriskVersion(String asteriskVersion) {
- this.asteriskVersion = asteriskVersion;
- }
-
- public String getSystemName() {
- return systemName;
- }
-
- public void setSystemName(String systemName) {
- this.systemName = systemName;
- }
-
- public Integer getCoreMaxCalls() {
- return coreMaxCalls;
- }
-
- public void setCoreMaxCalls(Integer coreMaxCalls) {
- this.coreMaxCalls = coreMaxCalls;
- }
-
- public Double getCoreMaxLoadAvg() {
- return coreMaxLoadAvg;
- }
-
- public void setCoreMaxLoadAvg(Double coreMaxLoadAvg) {
- this.coreMaxLoadAvg = coreMaxLoadAvg;
- }
-
- public String getCoreRunUser() {
- return coreRunUser;
- }
-
- public void setCoreRunUser(String coreRunUser) {
- this.coreRunUser = coreRunUser;
- }
-
- public String getCoreRunGroup() {
- return coreRunGroup;
- }
-
- public void setCoreRunGroup(String coreRunGroup) {
- this.coreRunGroup = coreRunGroup;
- }
-
- public Integer getCoreMaxFilehandles() {
- return coreMaxFilehandles;
- }
-
- public void setCoreMaxFilehandles(Integer coreMaxFilehandles) {
- this.coreMaxFilehandles = coreMaxFilehandles;
- }
-
- /**
- * Checks whether the realtime subsystem is enabled.
- *
- * @return true if the realtime subsystem is enabled, false otherwise.
- */
- public boolean isCoreRealtimeEnabled() {
- return coreRealtimeEnabled != null && coreRealtimeEnabled;
- }
-
- public void setCoreRealtimeEnabled(Boolean coreRealtimeEnabled) {
- this.coreRealtimeEnabled = coreRealtimeEnabled;
- }
-
- /**
- * Checks whether the CDR (call detail records) subsystem is enabled.
- *
- * @return true if the CDR subsystem is enabled, false otherwise.
- */
- public boolean isCoreCdrEnabled() {
- return coreCdrEnabled != null && coreCdrEnabled;
- }
-
- public void setCoreCdrEnabled(Boolean coreCdrEnabled) {
- this.coreCdrEnabled = coreCdrEnabled;
- }
-
- /**
- * Checks whether the HTTP subsystem is enabled.
- *
- * @return true if the HTTP subsystem is enabled, false otherwise.
- */
- public boolean isCoreHttpEnabled() {
- return coreHttpEnabled != null && coreHttpEnabled;
- }
-
- public void setCoreHttpEnabled(Boolean coreHttpEnabled) {
- this.coreHttpEnabled = coreHttpEnabled;
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/response/CoreStatusResponse.java b/src/main/java/org/asteriskjava/manager/response/CoreStatusResponse.java
deleted file mode 100644
index 2c9f3e65c..000000000
--- a/src/main/java/org/asteriskjava/manager/response/CoreStatusResponse.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright 2004-2006 Stefan Reuter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.asteriskjava.manager.response;
-
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
-import org.asteriskjava.util.DateUtil;
-
-import java.util.Date;
-import java.util.TimeZone;
-
-/**
- * Corresponds to a CoreStatusAction and contains the current status summary of the
- * Asterisk server.
- *
- * @author srt
- * @version $Id$
- * @see org.asteriskjava.manager.action.CoreStatusAction
- * @since 1.0.0
- */
-public class CoreStatusResponse extends ManagerActionResponse {
- private static final long serialVersionUID = 1L;
-
- private String coreStartupTime;
- private String coreReloadTime;
- private Integer coreCurrentCalls;
- private String coreStartupDate;
- private String coreReloadDate;
-
-
- /**
- * Returns the time the server (core module) was last reloaded. The format is %H:%M:%S.
- *
- * @return the time the server (core module) was last reloaded.
- */
- public String getCoreReloadTime() {
- return coreReloadTime;
- }
-
- public void setCoreReloadTime(String s) {
- // format is %H:%M:%S
- this.coreReloadTime = s;
- }
-
- /**
- * Returns the date the server (core module) was last reloaded. The format is Y-%m-%d.
- * Available since Asterisk 1.6.3
- *
- * @return the date the server (core module) was last reloaded.
- */
- public String getCoreReloadDate() {
- return coreReloadDate;
- }
-
- public void setCoreReloadDate(String CoreReloadDate) {
- this.coreReloadDate = CoreReloadDate;
- }
-
- /**
- * Returns the and time the server (core module) was last reloaded.
- * If either the date or time property is null (e.g. on Asterisk prior to 1.6.3) this method
- * returns null.
- *
- * @return the and time the server (core module) was last reloaded or null if not available.
- * @see #getCoreReloadDate()
- * @see #getCoreReloadTime()
- * @see #getCoreReloadDateTimeAsDate(java.util.TimeZone)
- */
- public Date getCoreReloadDateTimeAsDate() {
- return getCoreReloadDateTimeAsDate(null);
- }
-
- /**
- * Returns the date the server (core module) was last reloaded.
- * If either the date or time property is null (e.g. on Asterisk prior to 1.6.3) this method
- * returns null.
- *
- * @param tz the time zone of the Asterisk server, null to use the default time zone.
- * @return the date the server (core module) was last reloaded or null if not available.
- * @see #getCoreReloadDate()
- * @see #getCoreReloadTime()
- */
- public Date getCoreReloadDateTimeAsDate(TimeZone tz) {
- if (coreReloadDate == null || coreReloadTime == null) {
- return null;
- }
-
- return DateUtil.parseDateTime(coreReloadDate + " " + coreReloadTime, tz);
- }
-
- /**
- * Returns the date the server was started. The format is Y-%m-%d.
- * Available since Asterisk 1.6.3
- *
- * @return the date the server was started.
- */
- public String getCoreStartupDate() {
- return coreStartupDate;
- }
-
- public void setCoreStartupDate(String CoreStartupDate) {
- this.coreStartupDate = CoreStartupDate;
- }
-
- /**
- * Returns the time the server was started. The format is %H:%M:%S.
- *
- * @return the time the server was started.
- */
- public String getCoreStartupTime() {
- return coreStartupTime;
- }
-
- public void setCoreStartupTime(String s) {
- // format is %H:%M:%S
- this.coreStartupTime = s;
- }
-
- /**
- * Returns the date and time the server was started.
- * If either the date or time property is null (e.g. on Asterisk prior to 1.6.3) this method
- * returns null.
- *
- * @return the date the server was started or null if not available.
- * @see #getCoreStartupDate()
- * @see #getCoreStartupTime()
- * @see #getCoreStartupDateTimeAsDate(java.util.TimeZone)
- */
- public Date getCoreStartupDateTimeAsDate() {
- return getCoreStartupDateTimeAsDate(null);
- }
-
- /**
- * Returns the date and time the server was started.
- * If either the date or time property is null (e.g. on Asterisk prior to 1.6.3) this method
- * returns null.
- *
- * @param tz the time zone of the Asterisk server, null to use the default time zone.
- * @return the date the server was started or null if not available.
- * @see #getCoreStartupDate()
- * @see #getCoreStartupTime()
- */
- public Date getCoreStartupDateTimeAsDate(TimeZone tz) {
- if (coreStartupDate == null || coreStartupTime == null) {
- return null;
- }
-
- return DateUtil.parseDateTime(coreStartupDate + " " + coreStartupTime, tz);
- }
-
- /**
- * Returns the number of currently active channels on the server.
- *
- * @return the number of currently active channels on the server.
- */
- public Integer getCoreCurrentCalls() {
- return coreCurrentCalls;
- }
-
- public void setCoreCurrentCalls(Integer coreCurrentCalls) {
- this.coreCurrentCalls = coreCurrentCalls;
- }
-}
diff --git a/src/main/java/org/asteriskjava/manager/response/ExtensionStateResponse.java b/src/main/java/org/asteriskjava/manager/response/ExtensionStateResponse.java
index 168ca239f..c8be71f03 100644
--- a/src/main/java/org/asteriskjava/manager/response/ExtensionStateResponse.java
+++ b/src/main/java/org/asteriskjava/manager/response/ExtensionStateResponse.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.response;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
/**
* Response to an {@link org.asteriskjava.manager.action.ExtensionStateAction}.
diff --git a/src/main/java/org/asteriskjava/manager/response/GetConfigResponse.java b/src/main/java/org/asteriskjava/manager/response/GetConfigResponse.java
index 7268f3e12..6a5c4dae8 100644
--- a/src/main/java/org/asteriskjava/manager/response/GetConfigResponse.java
+++ b/src/main/java/org/asteriskjava/manager/response/GetConfigResponse.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.response;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
import java.util.Locale;
import java.util.Map;
diff --git a/src/main/java/org/asteriskjava/manager/response/GetVarResponse.java b/src/main/java/org/asteriskjava/manager/response/GetVarResponse.java
index 2ae370f36..e142ddf08 100644
--- a/src/main/java/org/asteriskjava/manager/response/GetVarResponse.java
+++ b/src/main/java/org/asteriskjava/manager/response/GetVarResponse.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.response;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
/**
* Corresponds to a GetVarAction and contains the value of the requested variable.
diff --git a/src/main/java/org/asteriskjava/manager/response/MailboxCountResponse.java b/src/main/java/org/asteriskjava/manager/response/MailboxCountResponse.java
index 497cc6224..b7163dbfd 100644
--- a/src/main/java/org/asteriskjava/manager/response/MailboxCountResponse.java
+++ b/src/main/java/org/asteriskjava/manager/response/MailboxCountResponse.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.response;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
/**
* A MailboxCountResponse is sent in response to a MailboxCountAction and contains the number of old
diff --git a/src/main/java/org/asteriskjava/manager/response/MailboxStatusResponse.java b/src/main/java/org/asteriskjava/manager/response/MailboxStatusResponse.java
index aeffd5224..56a33814c 100644
--- a/src/main/java/org/asteriskjava/manager/response/MailboxStatusResponse.java
+++ b/src/main/java/org/asteriskjava/manager/response/MailboxStatusResponse.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.response;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
/**
* A MailboxStatusResponse is sent in response to a MailboxStatusAction and indicates if a set
diff --git a/src/main/java/org/asteriskjava/manager/response/ManagerError.java b/src/main/java/org/asteriskjava/manager/response/ManagerError.java
index 85052ef64..cb1c11b24 100644
--- a/src/main/java/org/asteriskjava/manager/response/ManagerError.java
+++ b/src/main/java/org/asteriskjava/manager/response/ManagerError.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.response;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
/**
* Represents an "Response: Error" response received from the asterisk server.
diff --git a/src/main/java/org/asteriskjava/manager/response/MixMonitorResponse.java b/src/main/java/org/asteriskjava/manager/response/MixMonitorResponse.java
index ffc747b1c..649e437b3 100644
--- a/src/main/java/org/asteriskjava/manager/response/MixMonitorResponse.java
+++ b/src/main/java/org/asteriskjava/manager/response/MixMonitorResponse.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.response;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
/**
* A MixMonitorResponse is sent in response to a MixMonitorAction and provides
diff --git a/src/main/java/org/asteriskjava/manager/response/ModuleCheckResponse.java b/src/main/java/org/asteriskjava/manager/response/ModuleCheckResponse.java
index a73519ad2..84e5fc608 100644
--- a/src/main/java/org/asteriskjava/manager/response/ModuleCheckResponse.java
+++ b/src/main/java/org/asteriskjava/manager/response/ModuleCheckResponse.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.response;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
/**
* Corresponds to a ModuleCheckAction and contains the version of the module.
diff --git a/src/main/java/org/asteriskjava/manager/response/SipShowPeerResponse.java b/src/main/java/org/asteriskjava/manager/response/SipShowPeerResponse.java
index b8babdf7f..ee9070e01 100644
--- a/src/main/java/org/asteriskjava/manager/response/SipShowPeerResponse.java
+++ b/src/main/java/org/asteriskjava/manager/response/SipShowPeerResponse.java
@@ -15,7 +15,7 @@
*/
package org.asteriskjava.manager.response;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
import java.util.Map;
diff --git a/src/main/java/org/asteriskjava/manager/response/SkypeBuddyResponse.java b/src/main/java/org/asteriskjava/manager/response/SkypeBuddyResponse.java
index 21cbe2e97..2fc603e1c 100644
--- a/src/main/java/org/asteriskjava/manager/response/SkypeBuddyResponse.java
+++ b/src/main/java/org/asteriskjava/manager/response/SkypeBuddyResponse.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.response;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
/**
* Corresponds to a SkypeBuddyAction and contains the details of a Skype buddy.
diff --git a/src/main/java/org/asteriskjava/manager/response/SkypeLicenseStatusResponse.java b/src/main/java/org/asteriskjava/manager/response/SkypeLicenseStatusResponse.java
index 493162c57..cc80e2bcf 100644
--- a/src/main/java/org/asteriskjava/manager/response/SkypeLicenseStatusResponse.java
+++ b/src/main/java/org/asteriskjava/manager/response/SkypeLicenseStatusResponse.java
@@ -16,7 +16,7 @@
*/
package org.asteriskjava.manager.response;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
/**
* Corresponds to a SkypeLicenseStatusAction and contains the number of licensed Skype calls.
diff --git a/src/main/java/org/asteriskjava/manager/util/EventAttributesHelper.java b/src/main/java/org/asteriskjava/manager/util/EventAttributesHelper.java
index afc58e4a7..0b572e342 100644
--- a/src/main/java/org/asteriskjava/manager/util/EventAttributesHelper.java
+++ b/src/main/java/org/asteriskjava/manager/util/EventAttributesHelper.java
@@ -15,7 +15,7 @@
*/
package org.asteriskjava.manager.util;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
import org.asteriskjava.manager.event.CdrEvent;
import org.asteriskjava.manager.event.UserEvent;
import org.asteriskjava.util.AstUtil;
@@ -30,6 +30,7 @@
import java.util.Set;
import static java.util.Arrays.stream;
+import static org.asteriskjava.core.databind.utils.AsteriskBoolean.toBoolean;
import static org.slf4j.LoggerFactory.getLogger;
/**
@@ -113,7 +114,7 @@ public static void setAttributes(Object target, Map attributes,
dataType = setter.getParameterTypes()[0];
if (dataType == Boolean.class) {
- value = AstUtil.isTrue(entry.getValue());
+ value = toBoolean(entry.getValue());
} else if (dataType.isAssignableFrom(String.class)) {
value = parseString(entry);
} else if (dataType.isAssignableFrom(Map.class)) {
@@ -134,7 +135,7 @@ public static void setAttributes(Object target, Map attributes,
Constructor constructor = dataType.getConstructor(String.class);
// Asterisk sometimes uses yes/no instead of True/False for boolean. java.lang.Boolean(String) doesn't handle this.
if (dataType.isAssignableFrom(Boolean.class)) {
- value = constructor.newInstance(AstUtil.convertAsteriskBooleanStringToStandardBooleanString((String) entry.getValue()));
+ value = toBoolean(entry.getValue());
} else value = constructor.newInstance(entry.getValue());
} catch (Exception e) {
logger.error("Unable to convert value: Called the constructor of " + dataType + " with value '"
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/BridgeAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/BridgeAction.java
index 650fc4ce5..9bc8e7119 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/BridgeAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/BridgeAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import org.asteriskjava.pbx.Channel;
public class BridgeAction extends AbstractManagerAction {
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/CommandAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/CommandAction.java
index 2b6acb163..e4339349e 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/CommandAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/CommandAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
public class CommandAction extends AbstractManagerAction {
@@ -15,7 +15,7 @@ public CommandAction() {
@Override
public ManagerAction getAJAction() {
- final org.asteriskjava.manager.action.CommandAction action = new org.asteriskjava.manager.action.CommandAction();
+ final org.asteriskjava.ami.action.api.CommandAction action = new org.asteriskjava.ami.action.api.CommandAction();
action.setCommand(this._command);
action.setActionId(this.getActionId());
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ConfbridgeKickAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ConfbridgeKickAction.java
index b5ef3409d..dbfbbd64f 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ConfbridgeKickAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ConfbridgeKickAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
public class ConfbridgeKickAction extends AbstractManagerAction {
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ConfbridgeListAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ConfbridgeListAction.java
index 4f6ec7938..2ebc149c9 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ConfbridgeListAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ConfbridgeListAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
public class ConfbridgeListAction extends AbstractManagerAction implements EventGeneratingAction {
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/DbGetAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/DbGetAction.java
index 06e6648be..80386d6aa 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/DbGetAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/DbGetAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
public class DbGetAction extends AbstractManagerAction {
@@ -14,7 +14,7 @@ public DbGetAction(final String family, final String key) {
@Override
public ManagerAction getAJAction() {
- final org.asteriskjava.manager.action.DbGetAction action = new org.asteriskjava.manager.action.DbGetAction();
+ final org.asteriskjava.ami.action.api.DbGetAction action = new org.asteriskjava.ami.action.api.DbGetAction();
action.setActionId(this.getActionId());
action.setKey(this._key);
action.setFamily(this._family);
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/GetVarAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/GetVarAction.java
index e899b0f39..caf487d8a 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/GetVarAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/GetVarAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import org.asteriskjava.pbx.Channel;
public class GetVarAction extends AbstractManagerAction {
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/HangupAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/HangupAction.java
index 3ad525359..3d1c41738 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/HangupAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/HangupAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import org.asteriskjava.pbx.Channel;
public class HangupAction extends AbstractManagerAction {
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ListCommandsAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ListCommandsAction.java
index 7b0bc324a..a11a23c33 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ListCommandsAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ListCommandsAction.java
@@ -1,12 +1,12 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
public class ListCommandsAction extends AbstractManagerAction {
@Override
public ManagerAction getAJAction() {
- final org.asteriskjava.manager.action.ListCommandsAction action = new org.asteriskjava.manager.action.ListCommandsAction();
+ final org.asteriskjava.ami.action.api.ListCommandsAction action = new org.asteriskjava.ami.action.api.ListCommandsAction();
action.setActionId(this.getActionId());
return action;
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ManagerAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ManagerAction.java
index 6ddf3ecce..2d7aeb829 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ManagerAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/ManagerAction.java
@@ -3,6 +3,6 @@
public interface ManagerAction {
// Converts an iManagerAction into an asterisk-java ManagerAction.
- org.asteriskjava.ami.action.ManagerAction getAJAction();
+ org.asteriskjava.ami.action.api.ManagerAction getAJAction();
}
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/MonitorAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/MonitorAction.java
index 2cb16f786..e81bb064e 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/MonitorAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/MonitorAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import org.asteriskjava.pbx.Channel;
public class MonitorAction extends AbstractManagerAction {
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/OriginateAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/OriginateAction.java
index a822beb16..da196ded4 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/OriginateAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/OriginateAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import org.asteriskjava.pbx.CallerID;
import org.asteriskjava.pbx.Channel;
import org.asteriskjava.pbx.EndPoint;
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/PingAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/PingAction.java
index 835001b1d..94e992380 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/PingAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/PingAction.java
@@ -1,12 +1,12 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
public class PingAction extends AbstractManagerAction {
@Override
public ManagerAction getAJAction() {
- final org.asteriskjava.manager.action.PingAction action = new org.asteriskjava.manager.action.PingAction();
+ final org.asteriskjava.ami.action.api.PingAction action = new org.asteriskjava.ami.action.api.PingAction();
action.setActionId(this.getActionId());
return action;
}
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/PlayDtmfAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/PlayDtmfAction.java
index b6059bf0f..a1ca6f6e9 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/PlayDtmfAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/PlayDtmfAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import org.asteriskjava.pbx.Channel;
import org.asteriskjava.pbx.DTMFTone;
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/RedirectAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/RedirectAction.java
index f9991121d..53a39632e 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/RedirectAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/RedirectAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import org.asteriskjava.pbx.Channel;
import org.asteriskjava.pbx.EndPoint;
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/SetVarAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/SetVarAction.java
index 2928c6c01..92a5cfb8b 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/SetVarAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/SetVarAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import org.asteriskjava.pbx.Channel;
public class SetVarAction extends AbstractManagerAction {
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/SipPeersAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/SipPeersAction.java
index aeb50d200..af00abb3b 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/SipPeersAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/SipPeersAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
public class SipPeersAction extends AbstractManagerAction implements EventGeneratingAction {
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/SipShowPeerAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/SipShowPeerAction.java
index 84a6646f8..0b46fe21b 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/SipShowPeerAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/SipShowPeerAction.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import org.asteriskjava.pbx.EndPoint;
public class SipShowPeerAction extends AbstractManagerAction {
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/StatusAction.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/StatusAction.java
index db257fef8..ebe27d7fb 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/StatusAction.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/actions/StatusAction.java
@@ -1,7 +1,7 @@
package org.asteriskjava.pbx.asterisk.wrap.actions;
import org.asteriskjava.AsteriskVersion;
-import org.asteriskjava.ami.action.ManagerAction;
+import org.asteriskjava.ami.action.api.ManagerAction;
import org.asteriskjava.pbx.Channel;
import org.asteriskjava.pbx.PBXFactory;
import org.asteriskjava.pbx.internal.core.AsteriskPBX;
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/events/DbGetResponseEvent.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/events/DbGetResponseEvent.java
deleted file mode 100644
index f76c4bc2d..000000000
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/events/DbGetResponseEvent.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.asteriskjava.pbx.asterisk.wrap.events;
-
-public class DbGetResponseEvent extends ManagerEvent {
- private static final long serialVersionUID = 1L;
-
- private final String family;
- private final String key;
- private final String val;
-
- public DbGetResponseEvent(final org.asteriskjava.manager.event.DbGetResponseEvent event) {
- super(event);
- this.family = event.getFamily();
- this.key = event.getKey();
- this.val = event.getVal();
- }
-
- public String getVal() {
- return this.val;
- }
-
- public String getFamily() {
- return this.family;
- }
-
- public String getKey() {
- return this.key;
- }
-
-}
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/events/ResponseEvent.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/events/ResponseEvent.java
index bd29067e4..85a0d7380 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/events/ResponseEvent.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/events/ResponseEvent.java
@@ -6,7 +6,7 @@ public class ResponseEvent extends ManagerEvent {
private final String actionId;
private final String internalActionId;
- public ResponseEvent(final org.asteriskjava.manager.event.ResponseEvent event) {
+ public ResponseEvent(final org.asteriskjava.ami.action.api.response.event.ResponseEvent event) {
super(event);
this.actionId = event.getActionId();
this.internalActionId = event.getInternalActionId();
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/response/CommandResponse.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/response/CommandResponse.java
index af55ba501..7c1219d4e 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/response/CommandResponse.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/response/CommandResponse.java
@@ -1,8 +1,8 @@
package org.asteriskjava.pbx.asterisk.wrap.response;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.CommandActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
-import java.util.Collections;
import java.util.List;
public class CommandResponse extends ManagerResponse {
@@ -13,11 +13,12 @@ public class CommandResponse extends ManagerResponse {
public CommandResponse(ManagerActionResponse response) {
super(response);
- if (response instanceof org.asteriskjava.manager.response.CommandResponse) {
- result = ((org.asteriskjava.manager.response.CommandResponse) response).getResult();
+ if (response instanceof CommandActionResponse) {
+ result = ((CommandActionResponse) response).getOutput();
} else if (response instanceof org.asteriskjava.manager.response.ManagerError) {
error = true;
- result = Collections.singletonList(response.getOutput());
+ //todo
+// result = Collections.singletonList(response.getOutput());
}
}
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/response/ManagerError.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/response/ManagerError.java
index 2b2562edf..eda764849 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/response/ManagerError.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/response/ManagerError.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.response;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
public class ManagerError extends CommandResponse {
diff --git a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/response/ManagerResponse.java b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/response/ManagerResponse.java
index 62b1f9dc1..10df0aff5 100644
--- a/src/main/java/org/asteriskjava/pbx/asterisk/wrap/response/ManagerResponse.java
+++ b/src/main/java/org/asteriskjava/pbx/asterisk/wrap/response/ManagerResponse.java
@@ -1,6 +1,6 @@
package org.asteriskjava.pbx.asterisk.wrap.response;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
import org.asteriskjava.manager.response.ManagerError;
import java.util.Date;
@@ -28,12 +28,16 @@ public ManagerResponse(ManagerActionResponse response) {
this._actionId = response.getActionId();
this._server = response.getServer();
this._response = response.getResponse().toString();
- this._eventList = response.getEventList();
+ //todo
+// this._eventList = response.getEventList();
+ this._eventList = null;
this._uniqueId = response.getUniqueId();
this._attributes = response.getAttributes();
if (response instanceof ManagerError) {
- this.message = response.getOutput();
+ //todo
+// this.message = response.getOutput();
+ this.message = null;
} else {
this.message = response.getMessage();
}
diff --git a/src/main/java/org/asteriskjava/pbx/internal/core/CoherentEventFactory.java b/src/main/java/org/asteriskjava/pbx/internal/core/CoherentEventFactory.java
index 971501570..f24ea65d7 100644
--- a/src/main/java/org/asteriskjava/pbx/internal/core/CoherentEventFactory.java
+++ b/src/main/java/org/asteriskjava/pbx/internal/core/CoherentEventFactory.java
@@ -1,6 +1,7 @@
package org.asteriskjava.pbx.internal.core;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.CommandActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
import org.asteriskjava.pbx.asterisk.wrap.actions.ManagerAction;
import org.asteriskjava.pbx.asterisk.wrap.events.ManagerEvent;
import org.asteriskjava.pbx.asterisk.wrap.events.ResponseEvent;
@@ -28,10 +29,10 @@ public class CoherentEventFactory {
private static final Log logger = LogFactory.getLog(CoherentEventFactory.class);
// Events
- static Hashtable, Class> mapEvents = new Hashtable<>();
+ static Hashtable, Class> mapEvents = new Hashtable<>();
// Response
- static Hashtable, Class> mapResponses = new Hashtable<>();
+ static Hashtable, Class> mapResponses = new Hashtable<>();
// static initialiser
static {
@@ -49,12 +50,12 @@ public class CoherentEventFactory {
if (known.getConstructor(clazz) != null) {
if (ResponseEvent.class.isAssignableFrom(known)) {
CoherentEventFactory.mapResponses.put(
- (Class) clazz,
+ (Class) clazz,
(Class) known);
logger.info("Response Event Added " + clazz + " --> " + known);
} else {
- CoherentEventFactory.mapEvents.put((Class) clazz,
+ CoherentEventFactory.mapEvents.put((Class) clazz,
(Class) known);
logger.info("Manager Event Added " + clazz + " --> " + known);
}
@@ -67,7 +68,7 @@ public class CoherentEventFactory {
}
} catch (ClassNotFoundException e) {
logger.error(e, e);
- throw new RuntimeException(e);
+// throw new RuntimeException(e);
} catch (NoSuchMethodException e) {
logger.error(clazz.getCanonicalName() + " doesn't have an appropriate event constructor");
} catch (SecurityException e) {
@@ -75,11 +76,11 @@ public class CoherentEventFactory {
}
}
- CoherentEventFactory.mapResponses.put(org.asteriskjava.manager.event.ResponseEvent.class, ResponseEvent.class);
+ CoherentEventFactory.mapResponses.put(org.asteriskjava.ami.action.api.response.event.ResponseEvent.class, ResponseEvent.class);
}
- public static Class getShadowEvent(org.asteriskjava.manager.event.ManagerEvent event) {
+ public static Class getShadowEvent(org.asteriskjava.ami.event.api.ManagerEvent event) {
Class result = CoherentEventFactory.mapEvents.get(event.getClass());
if (result == null) {
Class response = CoherentEventFactory.mapResponses.get(event.getClass());
@@ -90,12 +91,12 @@ public static Class getShadowEvent(org.asteriskjava.mana
}
- public static ManagerEvent build(final org.asteriskjava.manager.event.ManagerEvent event) {
+ public static ManagerEvent build(final org.asteriskjava.ami.event.api.ManagerEvent event) {
ManagerEvent iEvent = null;
Class target = null;
- if (event instanceof org.asteriskjava.manager.event.ResponseEvent)
+ if (event instanceof org.asteriskjava.ami.action.api.response.event.ResponseEvent)
target = CoherentEventFactory.mapResponses.get(event.getClass());
else
target = CoherentEventFactory.mapEvents.get(event.getClass());
@@ -115,7 +116,7 @@ public static ManagerEvent build(final org.asteriskjava.manager.event.ManagerEve
return iEvent;
}
- public static ResponseEvent build(org.asteriskjava.manager.event.ResponseEvent event) {
+ public static ResponseEvent build(org.asteriskjava.ami.action.api.response.event.ResponseEvent event) {
ResponseEvent response = null;
final Class target = CoherentEventFactory.mapResponses.get(event.getClass());
@@ -139,7 +140,7 @@ public static ResponseEvent build(org.asteriskjava.manager.event.ResponseEvent e
public static ManagerResponse build(ManagerActionResponse response) {
ManagerResponse result;
- if (response instanceof org.asteriskjava.manager.response.CommandResponse) {
+ if (response instanceof CommandActionResponse) {
result = new CommandResponse(response);
} else if (response instanceof org.asteriskjava.manager.response.ManagerError) {
result = new ManagerError(response);
@@ -150,8 +151,8 @@ public static ManagerResponse build(ManagerActionResponse response) {
}
- public static org.asteriskjava.ami.action.ManagerAction build(ManagerAction action) {
- org.asteriskjava.ami.action.ManagerAction result = null;
+ public static org.asteriskjava.ami.action.api.ManagerAction build(ManagerAction action) {
+ org.asteriskjava.ami.action.api.ManagerAction result = null;
// final Class
// target = CoherentEventFactory.mapActions.get(action.getClass());
diff --git a/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerConnection.java b/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerConnection.java
index f02b7dfe6..ee0fca92e 100644
--- a/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerConnection.java
+++ b/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerConnection.java
@@ -1,7 +1,8 @@
package org.asteriskjava.pbx.internal.core;
import org.asteriskjava.AsteriskVersion;
-import org.asteriskjava.ami.action.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.ManagerActionResponse;
+import org.asteriskjava.ami.action.api.response.event.ResponseEvent;
import org.asteriskjava.manager.*;
import org.asteriskjava.pbx.*;
import org.asteriskjava.pbx.asterisk.wrap.actions.*;
@@ -243,7 +244,7 @@ public static ResponseEvents sendEventGeneratingAction(EventGeneratingAction act
.sendEventGeneratingAction(action.getAJEventGeneratingAction());
ResponseEvents convertedEvents = new ResponseEvents();
- for (org.asteriskjava.manager.event.ResponseEvent event : events.getEvents()) {
+ for (ResponseEvent event : events.getEvents()) {
convertedEvents.add(CoherentEventFactory.build(event));
}
return convertedEvents;
@@ -256,7 +257,7 @@ public static ResponseEvents sendEventGeneratingAction(EventGeneratingAction act
.sendEventGeneratingAction(action.getAJEventGeneratingAction(), timeout);
ResponseEvents convertedEvents = new ResponseEvents();
- for (org.asteriskjava.manager.event.ResponseEvent event : events.getEvents()) {
+ for (ResponseEvent event : events.getEvents()) {
convertedEvents.add(CoherentEventFactory.build(event));
}
return convertedEvents;
@@ -283,7 +284,7 @@ public static ManagerResponse sendAction(final ManagerAction action, final int t
CoherentManagerConnection.getInstance();
if ((CoherentManagerConnection.managerConnection != null)
&& (CoherentManagerConnection.managerConnection.getState() == ManagerConnectionState.CONNECTED)) {
- final org.asteriskjava.ami.action.ManagerAction ajAction = action.getAJAction();
+ final org.asteriskjava.ami.action.api.ManagerAction ajAction = action.getAJAction();
ManagerActionResponse response = CoherentManagerConnection.managerConnection
.sendAction(ajAction, timeout);
diff --git a/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerEventQueue.java b/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerEventQueue.java
index 213520fe6..79cd3986c 100644
--- a/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerEventQueue.java
+++ b/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerEventQueue.java
@@ -38,7 +38,7 @@ class CoherentManagerEventQueue implements ManagerEventListener, Runnable {
private volatile boolean _stop = false;
private static final int QUEUE_SIZE = 1000;
- private final BlockingQueue> _eventQueue = new LinkedBlockingQueue<>(
+ private final BlockingQueue> _eventQueue = new LinkedBlockingQueue<>(
QUEUE_SIZE);
long suppressQueueSizeErrorUntil = 0;
@@ -61,7 +61,7 @@ public CoherentManagerEventQueue(String name, ManagerConnection connection) {
* subsequently passed on to the original listener.
*/
@Override
- public void onManagerEvent(final org.asteriskjava.manager.event.ManagerEvent event) {
+ public void onManagerEvent(final org.asteriskjava.ami.event.api.ManagerEvent event) {
// logger.error(event);
boolean wanted = false;
@@ -94,7 +94,7 @@ public void run() {
try {
while (!this._stop) {
try {
- final EventLifeMonitor elm = this._eventQueue.poll(2,
+ final EventLifeMonitor elm = this._eventQueue.poll(2,
TimeUnit.SECONDS);
if (elm != null) {
// A poison queue event means its time to shutdown.
@@ -128,7 +128,7 @@ public void run() {
}
- class PoisonQueueEvent extends org.asteriskjava.manager.event.ManagerEvent {
+ class PoisonQueueEvent extends org.asteriskjava.ami.event.api.ManagerEvent {
private static final long serialVersionUID = 1L;
public PoisonQueueEvent() {
@@ -140,7 +140,7 @@ public PoisonQueueEvent() {
public void stop() {
this._stop = true;
try {
- this._eventQueue.put(new EventLifeMonitor(new PoisonQueueEvent()));
+ this._eventQueue.put(new EventLifeMonitor(new PoisonQueueEvent()));
} catch (InterruptedException e) {
logger.error(e, e);
diff --git a/src/main/java/org/asteriskjava/tools/HtmlEventTracer.java b/src/main/java/org/asteriskjava/tools/HtmlEventTracer.java
index b60b0b0f9..403b8d374 100644
--- a/src/main/java/org/asteriskjava/tools/HtmlEventTracer.java
+++ b/src/main/java/org/asteriskjava/tools/HtmlEventTracer.java
@@ -1,5 +1,6 @@
package org.asteriskjava.tools;
+import org.asteriskjava.ami.event.api.ManagerEvent;
import org.asteriskjava.live.DefaultAsteriskServer;
import org.asteriskjava.manager.ManagerEventListener;
import org.asteriskjava.manager.event.*;
diff --git a/src/main/java/org/asteriskjava/util/AstUtil.java b/src/main/java/org/asteriskjava/util/AstUtil.java
index 0f0383b27..6f0e12f56 100644
--- a/src/main/java/org/asteriskjava/util/AstUtil.java
+++ b/src/main/java/org/asteriskjava/util/AstUtil.java
@@ -13,19 +13,9 @@
* @version $Id$
*/
public class AstUtil {
- private static final Set TRUE_LITERALS;
private static final Set NULL_LITERALS;
static {
- TRUE_LITERALS = new HashSet<>(20);
- TRUE_LITERALS.add("yes");
- TRUE_LITERALS.add("true");
- TRUE_LITERALS.add("y");
- TRUE_LITERALS.add("t");
- TRUE_LITERALS.add("1");
- TRUE_LITERALS.add("on");
- TRUE_LITERALS.add("enabled");
-
NULL_LITERALS = new HashSet<>(20);
NULL_LITERALS.add("