2 files changed, 8 insertions, 6 deletions
diff --git a/intentanalysis/src/main/resources/mybatis/sql/ContextMapper.xml b/intentanalysis/src/main/resources/mybatis/sql/ContextMapper.xml
index ff04551..6eb44e3 100644
--- a/intentanalysis/src/main/resources/mybatis/sql/ContextMapper.xml
+++ b/intentanalysis/src/main/resources/mybatis/sql/ContextMapper.xml
@@ -40,10 +40,14 @@
     </update>
 
     <delete id="deleteContext">
-        DELETE FROM context WHERE context_id = #{context.contextId}
+        DELETE
+        FROM context
+        WHERE context_id = #{contextId}
     </delete>
 
     <delete id="deleteContextList">
-        DELETE FROM context WHERE parent_id = #{parentId}
+        DELETE
+        FROM context
+        WHERE parent_id = #{parentId}
     </delete>
 </mapper>
diff --git a/intentanalysis/src/main/resources/mybatis/sql/ExpectationMapper.xml b/intentanalysis/src/main/resources/mybatis/sql/ExpectationMapper.xml
index 16c7850..e6a3b26 100644
--- a/intentanalysis/src/main/resources/mybatis/sql/ExpectationMapper.xml
+++ b/intentanalysis/src/main/resources/mybatis/sql/ExpectationMapper.xml
@@ -21,15 +21,13 @@
     </insert>
 
     <select id="selectIntentExpectationList" resultType="org.onap.usecaseui.intentanalysis.bean.models.Expectation">
-        select expectation_id expectationId, expectation_name expectationName, expectation_type expectationType,
-               intent_id intentId
+        select expectation_id expectationId, expectation_name expectationName, expectation_type expectationType
         from expectation
         where intent_id = #{intentId}
     </select>
 
     <select id="selectIntentExpectation" resultType="org.onap.usecaseui.intentanalysis.bean.models.Expectation">
-        select expectation_id expectationId, expectation_name expectationName, expectation_type expectationType,
-               intent_id intentId
+        select expectation_id expectationId, expectation_name expectationName, expectation_type expectationType
         from expectation
         where expectation_id = #{expectationId}
     </select>