Delete imtent po and reformat code

Signed-off-by: ShuhaoCai <caishuhao@huawei.com>
Issue-ID: USECASEUI-704
Change-Id: I1047a092291996c609bfa5efd03e35c3b2ff607a

3 files changed, 12 insertions, 12 deletions

diff --git a/intentanalysis/src/main/resources/mybatis/sql/ExpectationMapper.xml b/intentanalysis/src/main/resources/mybatis/sql/ExpectationMapper.xml
index 5c5ac06..720bdd5 100644
--- a/intentanalysis/src/main/resources/mybatis/sql/ExpectationMapper.xml
+++ b/intentanalysis/src/main/resources/mybatis/sql/ExpectationMapper.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.onap.usecaseui.server.mapper.ExpectationMapper">
+<mapper namespace="org.onap.usecaseui.intentanalysis.mapper.ExpectationMapper">
 
 
-    <select id="selectExpectationByIntentId" resultType="org.onap.usecaseui.intentanalysis.bean.po.ExpectationPo">
+    <select id="selectExpectationByIntentId" resultType="org.onap.usecaseui.intentanalysis.bean.models.Expectation">
         select expectation_id expectationId, expectation_name expectationName,
                target_moi targetMOI, intent_id intentId
         from expectation
@@ -15,8 +15,8 @@
     <insert id="insertExpectation">
         insert into expectation(expectation_id, expectation_name, target_moi, intent_id)
         values
-        <foreach collection="list" index="index" item="item" separator=",">
-            (#{item.expectationId}, #{item.expectationName}, #{item.targetMOI}, #{item.intentId})
+        <foreach collection="expectationList" index="index" item="item" separator=",">
+            (#{item.expectationId}, #{item.expectationName}, #{item.targetMOI}, #{intentId})
         </foreach>
     </insert>
 
diff --git a/intentanalysis/src/main/resources/mybatis/sql/IntentMapper.xml b/intentanalysis/src/main/resources/mybatis/sql/IntentMapper.xml
index c814bfe..335ba6d 100644
--- a/intentanalysis/src/main/resources/mybatis/sql/IntentMapper.xml
+++ b/intentanalysis/src/main/resources/mybatis/sql/IntentMapper.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.onap.usecaseui.server.mapper.IntentMapper">
+<mapper namespace="org.onap.usecaseui.intentanalysis.mapper.IntentMapper">
 
-    <select id="selectIntentById" resultType="org.onap.usecaseui.intentanalysis.bean.po.IntentPo">
+    <select id="selectIntentById" resultType="org.onap.usecaseui.intentanalysis.bean.models.Intent">
         select intent_id intentId, intent_name intentName from intent
         where intent_id = #{intentId}
     </select>
 
-    <select id="selectIntents" resultType="org.onap.usecaseui.intentanalysis.bean.po.IntentPo">
+    <select id="selectIntents" resultType="org.onap.usecaseui.intentanalysis.bean.models.Intent">
         select intent_id intentId, intent_name intentName from intent
     </select>
 
@@ -18,7 +18,7 @@
         values(#{intentId}, #{intentName})
     </insert>
 
-    <update id="updateIntent" parameterType="org.onap.usecaseui.intentanalysis.bean.po.IntentPo">
+    <update id="updateIntent" parameterType="org.onap.usecaseui.intentanalysis.bean.models.Intent">
         update intent
         <trim prefix="set" suffixOverrides=",">
             <if test="intentId != null">intent_id = #{intentId},</if>
diff --git a/intentanalysis/src/main/resources/mybatis/sql/StateMapper.xml b/intentanalysis/src/main/resources/mybatis/sql/StateMapper.xml
index 987c75f..4850870 100644
--- a/intentanalysis/src/main/resources/mybatis/sql/StateMapper.xml
+++ b/intentanalysis/src/main/resources/mybatis/sql/StateMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.onap.usecaseui.server.mapper.StateMapper">
+<mapper namespace="org.onap.usecaseui.intentanalysis.mapper.StateMapper">
 
-    <select id="selectStateByExpectation" resultType="org.onap.usecaseui.intentanalysis.bean.po.StatePo">
+    <select id="selectStateByExpectation" resultType="org.onap.usecaseui.intentanalysis.bean.models.State">
         select state_id stateId, state_name stateName, expectation_id expectationId,
                is_satisfied isSatisfied, condition
         from state
@@ -14,8 +14,8 @@
     <insert id="insertState" parameterType="java.util.ArrayList">
         insert into state(state_id, state_name, expectation_id, is_satisfied, condition)
         values
-        <foreach collection="list" index="index" item="item" separator=",">
-            (#{item.stateId}, #{item.stateName}, #{item.expectationId}, #{item.isSatisfied}, #{item.condition})
+        <foreach collection="stateList" index="index" item="item" separator=",">
+            (#{item.stateId}, #{item.stateName}, #{expectationId}, #{item.isSatisfied}, #{item.condition})
         </foreach>
     </insert>