From 933cd2a6ed7a778101a5e238e0244ecdfe4fc43b Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Tue, 5 Jul 2022 13:53:01 -0500 Subject: [PATCH] Reverting to 'Function' from 'BackendStep' (that's new in the 0.1 line) --- .../com/kingsrook/sampleapp/SampleMetaDataProvider.java | 8 ++++---- .../kingsrook/sampleapp/SampleMetaDataProviderTest.java | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/kingsrook/sampleapp/SampleMetaDataProvider.java b/src/main/java/com/kingsrook/sampleapp/SampleMetaDataProvider.java index 4d834ad8..8cee65c3 100644 --- a/src/main/java/com/kingsrook/sampleapp/SampleMetaDataProvider.java +++ b/src/main/java/com/kingsrook/sampleapp/SampleMetaDataProvider.java @@ -24,7 +24,7 @@ package com.kingsrook.sampleapp; import java.util.List; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.interfaces.mock.MockBackendStep; +import com.kingsrook.qqq.backend.core.interfaces.mock.MockFunctionBody; import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationMetaData; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; import com.kingsrook.qqq.backend.core.model.metadata.QCodeReference; @@ -34,8 +34,8 @@ import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.QFieldType; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.processes.QBackendStepMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QFunctionInputMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.processes.QFunctionMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QFunctionOutputMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QRecordListMetaData; @@ -195,10 +195,10 @@ public class SampleMetaDataProvider .withName(PROCESS_NAME_GREET) .withLabel("Greet People") .withTableName("person") - .addStep(new QBackendStepMetaData() + .addFunction(new QFunctionMetaData() .withName("prepare") .withCode(new QCodeReference() - .withName(MockBackendStep.class.getName()) + .withName(MockFunctionBody.class.getName()) .withCodeType(QCodeType.JAVA) .withCodeUsage(QCodeUsage.FUNCTION)) // todo - needed, or implied in this context? .withInputData(new QFunctionInputMetaData() diff --git a/src/test/java/com/kingsrook/sampleapp/SampleMetaDataProviderTest.java b/src/test/java/com/kingsrook/sampleapp/SampleMetaDataProviderTest.java index 50317d14..097b9764 100644 --- a/src/test/java/com/kingsrook/sampleapp/SampleMetaDataProviderTest.java +++ b/src/test/java/com/kingsrook/sampleapp/SampleMetaDataProviderTest.java @@ -27,7 +27,6 @@ import java.io.IOException; import java.util.UUID; import com.kingsrook.qqq.backend.core.actions.QueryAction; import com.kingsrook.qqq.backend.core.actions.RunProcessAction; -import com.kingsrook.qqq.backend.core.interfaces.mock.MockBackendStep; import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessRequest; import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessResult; import com.kingsrook.qqq.backend.core.model.actions.query.QueryRequest; @@ -114,8 +113,8 @@ class SampleMetaDataProviderTest QueryResult queryResult = new QueryAction().execute(queryRequest); request.setRecords(queryResult.getRecords()); - request.addValue(MockBackendStep.FIELD_GREETING_PREFIX, "Hello"); - request.addValue(MockBackendStep.FIELD_GREETING_SUFFIX, "there"); + request.addValue("greetingPrefix", "Hello"); + request.addValue("greetingSuffix", "there"); RunProcessResult result = new RunProcessAction().execute(request); assertNotNull(result);