Fixes and code cleanup

This refer to BS-156
RestComm · Jul 2, 2018 · c128c18 · c128c18
1 parent 44d99ed
commit c128c18
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 6 deletions.
diff --git a/...m/restcomm.core/src/main/java/org/restcomm/connect/core/service/api/RecordingService.java b/...m/restcomm.core/src/main/java/org/restcomm/connect/core/service/api/RecordingService.java
@@ -26,10 +26,29 @@
 
 public interface RecordingService {
 
+    /**
+     * Upload recording file to Amazon S3
+     * @param recordingSid
+     * @param mediaType
+     * @return
+     */
     URI storeRecording(Sid recordingSid, MediaAttributes.MediaType mediaType);
 
+    /**
+     * Prepare Recording URL to store in the Recording.fileUrl property.
+     * This will be used later to access the recording file
+     * @param apiVersion
+     * @param accountSid
+     * @param recordingSid
+     * @param mediaType
+     * @return
+     */
     URI prepareFileUrl (String apiVersion, String accountSid, String recordingSid, MediaAttributes.MediaType mediaType);
 
+    /**
+     *Remove recording file from Amazon S3
+     * @param recordingSid
+     */
     void removeRecording(Sid recordingSid);
 
 }
diff --git a/...core/src/main/java/org/restcomm/connect/core/service/recording/RecordingsServiceImpl.java b/...core/src/main/java/org/restcomm/connect/core/service/recording/RecordingsServiceImpl.java
@@ -44,8 +44,8 @@ public class RecordingsServiceImpl implements RecordingService {
     private final RecordingsDao recordingsDao;
     private final S3AccessTool s3AccessTool;
     private String recordingsPath;
-    private ExecutionContext ec;
-    private UriUtils uriUtils;
+    private final ExecutionContext ec;
+    private final UriUtils uriUtils;
 
     public RecordingsServiceImpl (RecordingsDao recordingsDao, S3AccessTool s3AccessTool, ExecutionContext ec, UriUtils uriUtils) {
         this.recordingsDao = recordingsDao;

diff --git a/....core/src/test/java/org/restcomm/connect/core/service/recording/RecordingServiceTest.java b/....core/src/test/java/org/restcomm/connect/core/service/recording/RecordingServiceTest.java
@@ -55,7 +55,7 @@ public class RecordingServiceTest {
     Sid recordingSid = Sid.generate(Sid.Type.RECORDING);
     URI s3Uri = URI.create("https://127.0.0.1:8099/s3/"+recordingSid.toString());
 
-    UriUtils uriUtils = new UriUtils(daoManager);
+    UriUtils uriUtils = new UriUtils(daoManager, null, false);
 
     @Test
     public void deleteRecordingS3Test() throws IOException {

diff --git a/restcomm/restcomm.testsuite/pom.xml b/restcomm/restcomm.testsuite/pom.xml
@@ -10,6 +10,10 @@
 
     <artifactId>restcomm-connect.testsuite</artifactId>
 
+    <properties>
+        <commons-lang3.version>3.7</commons-lang3.version>
+    </properties>
+
     <dependencies>
         <!-- Testing -->
         <dependency>
@@ -281,7 +285,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.7</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
 
         <dependency>

diff --git a/...m.testsuite/src/main/java/org/restcomm/connect/testsuite/http/util/CustomDnsResolver.java b/...m.testsuite/src/main/java/org/restcomm/connect/testsuite/http/util/CustomDnsResolver.java
@@ -20,6 +20,9 @@
 package org.restcomm.connect.testsuite.http.util;
 
 
+import org.apache.log4j.Logger;
+import sun.rmi.runtime.Log;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.List;
@@ -32,7 +35,8 @@
 public class CustomDnsResolver implements sun.net.spi.nameservice.NameService {
     //Based on https://stackoverflow.com/a/43870031
 
-    private static String LOCALHOST = "127.0.0.1";
+    private static Logger logger = Logger.getLogger(CustomDnsResolver.class);
+    private static final String LOCALHOST = "127.0.0.1";
     private static Map<String, String> domainIpMap;
 
     @Override
@@ -68,7 +72,7 @@ public static void setNameService (Map<String, String> domainIpMapProvided) {
             }
             nameServices.add(new CustomDnsResolver());
         } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            logger.error("Error during setNameService: ",e);
         }
     }