svn commit: r1765313 - in /ofbiz/trunk/applications/content: minilang/data/DataServices.xml servicedef/services_contenttypes.xml

[Deepak Dixit-5]

Author: deepak
Date: Mon Oct 17 15:24:01 2016
New Revision: 1765313

URL: http://svn.apache.org/viewvc?rev=1765313&view=rev
Log:
Improved: Convert MetaDataPredicate entity related CRUD services from simple to entity-auto.
(OFBIZ-8362)(OFBIZ-8363)(OFBIZ-8364)

Thanks Pawan Verma for your contribution.

Modified:
    ofbiz/trunk/applications/content/minilang/data/DataServices.xml
    ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml

Modified: ofbiz/trunk/applications/content/minilang/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/data/DataServices.xml?rev=1765313&r1=1765312&r2=1765313&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/minilang/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/minilang/data/DataServices.xml Mon Oct 17 15:24:01 2016
@@ -220,28 +220,6 @@ under the License.
         <remove-value value-field="lookedUpValue"/>
     </simple-method>
 
-    <!-- Methods for MetaDataPredicate -->
-    <simple-method method-name="createMetaDataPredicate" short-description="Create Data Resource Role">
-        <make-value entity-name="MetaDataPredicate" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-        <field-to-result result-name="metaDataPredicateId" field="newEntity.metaDataPredicateId"/>
-    </simple-method>
-    <simple-method method-name="updateMetaDataPredicate" short-description="Update Data Resource Role">
-        <make-value entity-name="MetaDataPredicate" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="MetaDataPredicate" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeMetaDataPredicate" short-description="Remove Data Resource Role">
-        <make-value entity-name="MetaDataPredicate" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="MetaDataPredicate" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
     <!-- Methods for ElectronicText -->
     <simple-method method-name="createElectronicText" short-description="Create Electronic Text">
         <make-value entity-name="ElectronicText" value-field="newEntity"/>

Modified: ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml?rev=1765313&r1=1765312&r2=1765313&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml Mon Oct 17 15:24:01 2016
@@ -201,22 +201,19 @@ under the License.
     </service>
 
     <!-- MetaDataPredicate services -->
-    <service name="createMetaDataPredicate" engine="simple" default-entity-name="MetaDataPredicate" auth="true"
-            location="component://content/minilang/data/DataServices.xml" invoke="createMetaDataPredicate">
+    <service name="createMetaDataPredicate" engine="entity-auto" default-entity-name="MetaDataPredicate" auth="true" invoke="create">
         <description>Create a MetaDataPredicate</description>
         <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
-        <auto-attributes include="pk" mode="INOUT" optional="true"/>
+        <auto-attributes include="pk" mode="INOUT" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateMetaDataPredicate" engine="simple" default-entity-name="MetaDataPredicate" auth="true"
-            location="component://content/minilang/data/DataServices.xml" invoke="updateMetaDataPredicate">
+    <service name="updateMetaDataPredicate" engine="entity-auto" default-entity-name="MetaDataPredicate" auth="true" invoke="update">
         <description>Update a MetaDataPredicate</description>
         <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeMetaDataPredicate" engine="simple" default-entity-name="MetaDataPredicate" auth="true"
-        location="component://content/minilang/data/DataServices.xml" invoke="removeMetaDataPredicate">
+    <service name="removeMetaDataPredicate" engine="entity-auto" default-entity-name="MetaDataPredicate" auth="true" invoke="delete">
         <description>Remove MetaDataPredicate</description>
         <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>