svn commit: r1820968 - in /ofbiz/branches/release16.11: ./ framework/base/src/main/java/org/apache/ofbiz/base/OfbizDslDescriptorForEclipse.dsld framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyBaseScript.groovy

Author: jleroux
Date: Fri Jan 12 11:28:17 2018
New Revision: 1820968

URL: http://svn.apache.org/viewvc?rev=1820968&view=rev
Log:
"Applied fix from trunk framework for revision: 1820966  "
------------------------------------------------------------------------
r1820966 | jleroux | 2018-01-12 12:24:48 +0100 (ven., 12 janv. 2018) | 9 lines

Fixed: Correcting findOne() in OfbizDslDescriptorForEclipse.dsld
(OFBIZ-10159)

The method findOne() which is set in the OfbizDslDescriptorForEclipse.dsld is
wrong, since there is no implementation for this method, which only has a String
and a List as parameters. I changed it to the correct method, so it can be used
within groovy properly, also I put an implementation in the GroovyBaseScriptFile

Thanks: Dennis Balkir
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/OfbizDslDescriptorForEclipse.dsld
    ofbiz/branches/release16.11/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyBaseScript.groovy

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 12 11:28:17 2018
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,1816297,
 1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,1816297,
 1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/OfbizDslDescriptorForEclipse.dsld
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/OfbizDslDescriptorForEclipse.dsld?rev=1820968&r1=1820967&r2=1820968&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/OfbizDslDescriptorForEclipse.dsld (original)
+++ ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/OfbizDslDescriptorForEclipse.dsld Fri Jan 12 11:28:17 2018
@@ -23,17 +23,18 @@ contribute(currentType(subType('groovy.l
  property name: 'delegator', type: 'org.apache.ofbiz.entity.Delegator'
  property name: 'dispatcher', type: 'org.apache.ofbiz.service.LocalDispatcher'
 
- method name: 'runService', type: 'java.util.Map', params: [serviceName: 'String', inputMap: 'java.util.Map']
- method name: 'makeValue', type: 'java.util.Map', params: [entityName: 'String']
- method name: 'findOne', type: 'java.util.Map', params: [entityName: 'String', inputMap: 'java.util.Map']
- method name: 'findList', type: 'java.util.List', params: [entityName: 'String', inputMap: 'java.util.Map']
- method name: 'select', type: 'org.apache.ofbiz.entity.util.EntityQuery', params: [entity: 'java.util.Set']
- method name: 'select', type: 'org.apache.ofbiz.entity.util.EntityQuery', params: [entity: 'String...']
- method name: 'from', type: 'org.apache.ofbiz.entity.util.EntityQuery', params: [entity: 'java.lang.Object']
- method name: 'success', type: 'def', params: [message: 'String']
- method name: 'failure', type: 'java.util.Map', params: [message: 'String']
- method name: 'error', type: 'def', params: [message: 'String']
- method name: 'logInfo', type: 'void', params: [message: 'String']
- method name: 'logWarning', type: 'void', params: [message: 'String']
- method name: 'logError', type: 'void', params: [message: 'String']
+    method name: 'runService', type: 'java.util.Map', params: [serviceName: 'String', inputMap: 'java.util.Map']
+    method name: 'makeValue', type: 'java.util.Map', params: [entityName: 'String']
+    method name: 'findOne', type: 'java.util.Map', params: [entityName: 'String', fields: 'java.util.Map', useCache: 'boolean']
+    method name: 'findList', type: 'java.util.List', params: [entityName: 'String', inputMap: 'java.util.Map']
+    method name: 'select', type: 'org.apache.ofbiz.entity.util.EntityQuery', params: [entity: 'java.util.Set']
+    method name: 'select', type: 'org.apache.ofbiz.entity.util.EntityQuery', params: [entity: 'String...']
+    method name: 'from', type: 'org.apache.ofbiz.entity.util.EntityQuery', params: [entity: 'java.lang.Object']
+    method name: 'success', type: 'def', params: [message: 'String']
+    method name: 'failure', type: 'java.util.Map', params: [message: 'String']
+    method name: 'error', type: 'def', params: [message: 'String']
+    method name: 'logInfo', type: 'void', params: [message: 'String']
+    method name: 'logWarning', type: 'void', params: [message: 'String']
+    method name: 'logError', type: 'void', params: [message: 'String']
+    method name: 'logVerbose', type: 'void', params: [message: 'String']
 }

Modified: ofbiz/branches/release16.11/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyBaseScript.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyBaseScript.groovy?rev=1820968&r1=1820967&r2=1820968&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyBaseScript.groovy (original)
+++ ofbiz/branches/release16.11/framework/service/src/main/java/org/apache/ofbiz/service/engine/GroovyBaseScript.groovy Fri Jan 12 11:28:17 2018
@@ -18,10 +18,13 @@
  *******************************************************************************/
 package org.apache.ofbiz.service.engine
 
+import java.util.Map
+
 import org.apache.ofbiz.base.util.Debug
 import org.apache.ofbiz.entity.util.EntityQuery
 import org.apache.ofbiz.service.ServiceUtil
 import org.apache.ofbiz.service.ExecutionServiceException
+import org.apache.ofbiz.entity.GenericValue
 
 abstract class GroovyBaseScript extends Script {
     public static final String module = GroovyBaseScript.class.getName()
@@ -63,6 +66,10 @@ abstract class GroovyBaseScript extends
         return EntityQuery.use(binding.getVariable('delegator')).select(fields)
     }
 
+    GenericValue findOne(String entityName, Map<String, ? extends Object> fields, boolean useCache) {
+        return binding.getVariable('delegator').findOne(entityName, fields, useCache)
+    }
+
     def success(String message) {
         // TODO: implement some clever i18n mechanism based on the userLogin and locale in the binding
         if (this.binding.hasVariable('request')) {