Merge pull request #462 from jmakeig/dataservices-example

Data Services example clean-up

Author: rjrudin

examples/data-services/README.md

@@ -17,6 +17,14 @@ Next, run the following Gradle task to deploy the example application:
 This creates an app server suitable for Data Services - i.e. one without a rewriter. It also creates a user named 
 "data-services-example-user" which demonstrates the minimum set of roles needed to invoke a Data Services endpoint. 
 
+To generate the `org.example.HelloWorld` proxy class, run:
+
+```shell
+gradle generateHelloWorld
+```
+
+Take a look at `build.gradle` to see how this task is implemented using `com.marklogic.client.tools.gradle.EndpointProxiesGenTask`.
+
 You can then test the application either by running the following Gradle task:
 
 ```shell

examples/data-services/build.gradle

@@ -1,10 +1,12 @@
 plugins {
 	id "java"
 	id "net.saliman.properties" version "1.4.6"
-	id "com.marklogic.ml-gradle" version "3.13.0"
+	id "com.marklogic.ml-gradle" version "3.14.0"
 	id 'com.marklogic.ml-development-tools' version '4.2.0'
 }
 
+// apply plugin : 'eclipse'
+
 task generateHelloWorld(type: com.marklogic.client.tools.gradle.EndpointProxiesGenTask) {
 	description = "This task is used to generate the src/main/java/com/acme/HelloWorld.java class"
 	serviceDeclarationFile = 'src/main/ml-modules/root/helloWorld/service.json'

examples/data-services/src/main/java/org/example/HelloWorld.java

@@ -5,7 +5,6 @@
 
 
 import com.marklogic.client.DatabaseClient;
-
 import com.marklogic.client.impl.BaseProxy;
 
 /**
@@ -33,7 +32,7 @@ private HelloWorldImpl(DatabaseClient dbClient) {
             public String whatsUp(String greeting, Long frequency) {
               return BaseProxy.StringType.toString(
                 baseProxy
-                .request("helloWorld.sjs", BaseProxy.ParameterValuesKind.MULTIPLE_ATOMICS)
+                .request("whatsUp.sjs", BaseProxy.ParameterValuesKind.MULTIPLE_ATOMICS)
                 .withSession()
                 .withParams(
                     BaseProxy.atomicParam("greeting", false, BaseProxy.StringType.fromString(greeting)),