Skip to content

Commit f429cc7

Browse files
agafoxagafox
committed
Merge Issue-2274 with origin/master
# Conflicts: # restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java # restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Conference.java # restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/ConferenceCenter.java
1 parent b1f0ba1 commit f429cc7

8 files changed

Lines changed: 55 additions & 68 deletions

File tree

‎restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/AccountsEndpoint.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,8 @@
6262
import java.util.ArrayList;
6363
import java.util.List;
6464

65-
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
66-
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
67-
import static javax.ws.rs.core.MediaType.APPLICATION_XML;
68-
import static javax.ws.rs.core.MediaType.APPLICATION_XML_TYPE;
69-
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
70-
import static javax.ws.rs.core.Response.Status.CONFLICT;
71-
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
65+
import static javax.ws.rs.core.MediaType.*;
66+
import static javax.ws.rs.core.Response.Status.*;
7267
import static javax.ws.rs.core.Response.ok;
7368
import static javax.ws.rs.core.Response.status;
7469

‎restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import akka.event.LoggingAdapter;
3030
import akka.pattern.AskTimeoutException;
3131
import akka.util.Timeout;
32-
3332
import org.apache.commons.configuration.Configuration;
3433
import org.apache.http.HttpStatus;
3534
import org.apache.http.NameValuePair;
@@ -110,7 +109,6 @@
110109
import org.restcomm.connect.telephony.api.StopBridge;
111110
import org.restcomm.connect.telephony.api.StopConference;
112111
import org.restcomm.connect.tts.api.SpeechSynthesizerResponse;
113-
114112
import scala.concurrent.Await;
115113
import scala.concurrent.Future;
116114
import scala.concurrent.duration.Duration;
@@ -119,7 +117,6 @@
119117
import javax.servlet.sip.SipServletRequest;
120118
import javax.servlet.sip.SipServletResponse;
121119
import javax.servlet.sip.SipSession;
122-
123120
import java.io.IOException;
124121
import java.math.BigDecimal;
125122
import java.net.MalformedURLException;

‎restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/IvrEndpoint.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@
1919
*/
2020
package org.restcomm.connect.mgcp;
2121

22-
import static jain.protocol.ip.mgcp.message.parms.ReturnCode.Transaction_Executed_Normally;
23-
24-
import java.util.HashMap;
25-
import java.util.Map;
26-
27-
import org.mobicents.protocols.mgcp.jain.pkg.AUMgcpEvent;
28-
import org.mobicents.protocols.mgcp.jain.pkg.AUPackage;
29-
import org.restcomm.connect.commons.patterns.Observe;
30-
import org.restcomm.connect.commons.patterns.StopObserving;
31-
3222
import akka.actor.ActorRef;
3323
import jain.protocol.ip.mgcp.JainIPMgcpException;
3424
import jain.protocol.ip.mgcp.JainMgcpResponseEvent;
@@ -45,6 +35,15 @@
4535
import jain.protocol.ip.mgcp.message.parms.ReturnCode;
4636
import jain.protocol.ip.mgcp.pkg.MgcpEvent;
4737
import jain.protocol.ip.mgcp.pkg.PackageName;
38+
import org.mobicents.protocols.mgcp.jain.pkg.AUMgcpEvent;
39+
import org.mobicents.protocols.mgcp.jain.pkg.AUPackage;
40+
import org.restcomm.connect.commons.patterns.Observe;
41+
import org.restcomm.connect.commons.patterns.StopObserving;
42+
43+
import java.util.HashMap;
44+
import java.util.Map;
45+
46+
import static jain.protocol.ip.mgcp.message.parms.ReturnCode.Transaction_Executed_Normally;
4847

4948
/**
5049
* @author quintana.thomas@gmail.com (Thomas Quintana)

‎restcomm/restcomm.mgcp/src/test/java/org/restcomm/connect/mgcp/EndpointTest.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,6 @@
1919
*/
2020
package org.restcomm.connect.mgcp;
2121

22-
import static org.junit.Assert.assertTrue;
23-
24-
import org.junit.AfterClass;
25-
import org.junit.BeforeClass;
26-
import org.junit.Test;
27-
import org.mobicents.protocols.mgcp.jain.pkg.AUMgcpEvent;
28-
import org.mobicents.protocols.mgcp.jain.pkg.AUPackage;
29-
import org.restcomm.connect.commons.patterns.Observe;
30-
import org.restcomm.connect.commons.patterns.Observing;
31-
import org.restcomm.connect.commons.patterns.StopObserving;
32-
3322
import akka.actor.ActorRef;
3423
import akka.actor.ActorSystem;
3524
import akka.actor.Props;
@@ -44,6 +33,16 @@
4433
import jain.protocol.ip.mgcp.message.parms.EventName;
4534
import jain.protocol.ip.mgcp.message.parms.ReturnCode;
4635
import jain.protocol.ip.mgcp.pkg.MgcpEvent;
36+
import org.junit.AfterClass;
37+
import org.junit.BeforeClass;
38+
import org.junit.Test;
39+
import org.mobicents.protocols.mgcp.jain.pkg.AUMgcpEvent;
40+
import org.mobicents.protocols.mgcp.jain.pkg.AUPackage;
41+
import org.restcomm.connect.commons.patterns.Observe;
42+
import org.restcomm.connect.commons.patterns.Observing;
43+
import org.restcomm.connect.commons.patterns.StopObserving;
44+
45+
import static org.junit.Assert.assertTrue;
4746

4847
/**
4948
* @author maria.farooq@telestax.com (Maria Farooq)

‎restcomm/restcomm.mrb/src/main/java/org/restcomm/connect/mrb/MediaResourceBrokerGeneric.java‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@
2020
*/
2121
package org.restcomm.connect.mrb;
2222

23-
import java.net.InetAddress;
24-
import java.net.URI;
25-
import java.net.UnknownHostException;
26-
import java.util.HashMap;
27-
import java.util.List;
28-
import java.util.Map;
29-
23+
import akka.actor.ActorRef;
24+
import akka.actor.Props;
25+
import akka.actor.UntypedActor;
26+
import akka.actor.UntypedActorFactory;
27+
import akka.event.Logging;
28+
import akka.event.LoggingAdapter;
29+
import jain.protocol.ip.mgcp.CreateProviderException;
30+
import jain.protocol.ip.mgcp.JainMgcpProvider;
31+
import jain.protocol.ip.mgcp.JainMgcpStack;
3032
import org.apache.commons.configuration.Configuration;
3133
import org.joda.time.DateTime;
3234
import org.mobicents.protocols.mgcp.stack.JainMgcpStackImpl;
@@ -49,15 +51,12 @@
4951
import org.restcomm.connect.mrb.api.StartMediaResourceBroker;
5052
import org.restcomm.connect.telephony.api.ConferenceStateChanged;
5153

52-
import akka.actor.ActorRef;
53-
import akka.actor.Props;
54-
import akka.actor.UntypedActor;
55-
import akka.actor.UntypedActorFactory;
56-
import akka.event.Logging;
57-
import akka.event.LoggingAdapter;
58-
import jain.protocol.ip.mgcp.CreateProviderException;
59-
import jain.protocol.ip.mgcp.JainMgcpProvider;
60-
import jain.protocol.ip.mgcp.JainMgcpStack;
54+
import java.net.InetAddress;
55+
import java.net.URI;
56+
import java.net.UnknownHostException;
57+
import java.util.HashMap;
58+
import java.util.List;
59+
import java.util.Map;
6160

6261
/**
6362
* @author maria.farooq@telestax.com (Maria Farooq)

‎restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MgcpMediaGroup.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@
2020

2121
package org.restcomm.connect.mscontrol.mms;
2222

23-
import java.net.URI;
24-
import java.util.ArrayList;
25-
import java.util.HashSet;
26-
import java.util.List;
27-
import java.util.Set;
28-
23+
import akka.actor.ActorRef;
24+
import akka.event.Logging;
25+
import akka.event.LoggingAdapter;
26+
import jain.protocol.ip.mgcp.message.parms.ConnectionIdentifier;
27+
import jain.protocol.ip.mgcp.message.parms.ConnectionMode;
2928
import jain.protocol.ip.mgcp.pkg.MgcpEvent;
3029
import org.mobicents.protocols.mgcp.jain.pkg.AUMgcpEvent;
3130
import org.restcomm.connect.commons.fsm.Action;
@@ -63,11 +62,11 @@
6362
import org.restcomm.connect.mscontrol.api.messages.Stop;
6463
import org.restcomm.connect.mscontrol.api.messages.StopMediaGroup;
6564

66-
import akka.actor.ActorRef;
67-
import akka.event.Logging;
68-
import akka.event.LoggingAdapter;
69-
import jain.protocol.ip.mgcp.message.parms.ConnectionIdentifier;
70-
import jain.protocol.ip.mgcp.message.parms.ConnectionMode;
65+
import java.net.URI;
66+
import java.util.ArrayList;
67+
import java.util.HashSet;
68+
import java.util.List;
69+
import java.util.Set;
7170

7271
/**
7372
* @author quintana.thomas@gmail.com (Thomas Quintana)

‎restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MmsConferenceController.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121

2222
package org.restcomm.connect.mscontrol.mms;
2323

24-
import java.util.ArrayList;
25-
import java.util.HashSet;
26-
import java.util.List;
27-
import java.util.Set;
28-
24+
import akka.actor.ActorRef;
25+
import akka.event.Logging;
26+
import akka.event.LoggingAdapter;
27+
import jain.protocol.ip.mgcp.message.parms.ConnectionMode;
2928
import org.mobicents.servlet.restcomm.mscontrol.messages.MediaServerConferenceControllerStateChanged;
3029
import org.restcomm.connect.commons.annotations.concurrency.Immutable;
3130
import org.restcomm.connect.commons.dao.Sid;
@@ -62,10 +61,10 @@
6261
import org.restcomm.connect.mscontrol.api.messages.StopMediaGroup;
6362
import org.restcomm.connect.mscontrol.api.messages.StopRecording;
6463

65-
import akka.actor.ActorRef;
66-
import akka.event.Logging;
67-
import akka.event.LoggingAdapter;
68-
import jain.protocol.ip.mgcp.message.parms.ConnectionMode;
64+
import java.util.ArrayList;
65+
import java.util.HashSet;
66+
import java.util.List;
67+
import java.util.Set;
6968

7069
/**
7170
* @author Henrique Rosa (henrique.rosa@telestax.com)

‎restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/ConferenceCenter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private ActorRef getConference(final String name) {
7070
@Override
7171
public UntypedActor create() throws Exception {
7272
//Here Here we can pass Gateway where call is connected
73-
return new Conference(name, factory, storage);
73+
return new Conference(name, factory, storage, getSelf());
7474
}
7575
});
7676
return getContext().actorOf(props);

0 commit comments

Comments
 (0)