update mleap dependency version with 0.13.0

Author: asarb

pom.xml

@@ -154,7 +154,7 @@
     <dependency>
       <groupId>ml.combust.mleap</groupId>
       <artifactId>mleap-runtime_2.11</artifactId>
-      <version>0.9.6</version>
+      <version>0.13.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

src/main/java/com/amazonaws/sagemaker/controller/ServingController.java

@@ -94,7 +94,7 @@ public ResponseEntity performShallowHealthCheck() {
     public ResponseEntity returnBatchExecutionParameter() throws JsonProcessingException {
         final BatchExecutionParameter batchParam = new BatchExecutionParameter(SystemUtils.getNumberOfThreads(1),
             "SINGLE_RECORD", 5);
-        final String responseStr = new ObjectMapper().writeValueAsString(batchParam);
+        final String responseStr = mapper.writeValueAsString(batchParam);
         return ResponseEntity.ok(responseStr);
     }
 

src/main/java/com/amazonaws/sagemaker/utils/ScalaUtils.java

@@ -23,16 +23,18 @@
 import ml.combust.mleap.runtime.frame.DefaultLeapFrame;
 import ml.combust.mleap.runtime.frame.Row;
 import ml.combust.mleap.runtime.frame.Transformer;
+import ml.combust.mleap.runtime.javadsl.LeapFrameSupport;
 import org.apache.commons.lang3.StringUtils;
 import scala.collection.JavaConverters;
-import scala.collection.Seq;
 
 /**
  * Utility class for dealing with Scala to Java conversion related issues. These functionalities are moved to this
  * class so that they can be easily mocked out by PowerMockito.mockStatic while testing the actual classes.
  */
 public class ScalaUtils {
 
+    private final static LeapFrameSupport leapFrameSupport = new LeapFrameSupport();
+
     /**
      * Invokes MLeap transformer object with DefaultLeapFrame and returns DefaultLeapFrame from MLeap helper Try Monad
      *
@@ -53,9 +55,7 @@ public static DefaultLeapFrame transformLeapFrame(final Transformer transformer,
      * @return the DefaultLeapFrame in helper
      */
     public static DefaultLeapFrame selectFromLeapFrame(final DefaultLeapFrame leapFrame, final String key) {
-        final Seq<String> predictionColumnSelectionArgs = JavaConverters
-            .asScalaIteratorConverter(Collections.singletonList(key).iterator()).asScala().toSeq();
-        return leapFrame.select(predictionColumnSelectionArgs).get();
+        return leapFrameSupport.select(leapFrame, Collections.singletonList(key));
     }
 
     /**
@@ -66,8 +66,7 @@ public static DefaultLeapFrame selectFromLeapFrame(final DefaultLeapFrame leapFr
      * @return ArrayRow which can be used to retrieve the original output
      */
     public static ArrayRow getOutputArrayRow(final DefaultLeapFrame leapFrame) {
-        final Iterator<Row> rowIterator = JavaConverters.asJavaIterableConverter(leapFrame.collect()).asJava()
-            .iterator();
+        final Iterator<Row> rowIterator = leapFrameSupport.collect(leapFrame).iterator();
         // SageMaker input structure only allows to call MLeap transformer for single data point
         return (ArrayRow) (rowIterator.next());
     }