Update qqq versions to 0.2.0-SNAPSHOT, with package reorg and request/result rename to input/output

This commit is contained in:
2022-07-15 09:36:33 -05:00
parent ba213e0667
commit cd691aa0c1
2 changed files with 37 additions and 37 deletions

View File

@ -25,26 +25,26 @@ package com.kingsrook.sampleapp;
import java.util.List; import java.util.List;
import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.exceptions.QValueException; import com.kingsrook.qqq.backend.core.exceptions.QValueException;
import com.kingsrook.qqq.backend.core.interfaces.BackendStep; import com.kingsrook.qqq.backend.core.actions.processes.BackendStep;
import com.kingsrook.qqq.backend.core.interfaces.mock.MockBackendStep; import com.kingsrook.qqq.backend.core.processes.implementations.mock.MockBackendStep;
import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepRequest; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput;
import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepResult; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput;
import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationMetaData; 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.QBackendMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.QCodeReference; import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference;
import com.kingsrook.qqq.backend.core.model.metadata.QCodeType; import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeType;
import com.kingsrook.qqq.backend.core.model.metadata.QCodeUsage; import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeUsage;
import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.QFieldType; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType;
import com.kingsrook.qqq.backend.core.model.metadata.QInstance; 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.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.processes.QBackendStepMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QBackendStepMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.processes.QFrontendStepMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QFrontendStepMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.processes.QFunctionInputMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QFunctionInputMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.processes.QFunctionOutputMetaData; 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.QProcessMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.processes.QRecordListMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QRecordListMetaData;
import com.kingsrook.qqq.backend.core.processes.implementations.LoadInitialRecordsStep; import com.kingsrook.qqq.backend.core.processes.implementations.general.LoadInitialRecordsStep;
import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.Cardinality; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.Cardinality;
import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.RecordFormat; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.RecordFormat;
import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemBackendMetaData; import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemBackendMetaData;
@ -349,11 +349,11 @@ public class SampleMetaDataProvider
** **
******************************************************************************/ ******************************************************************************/
@Override @Override
public void run(RunBackendStepRequest runBackendStepRequest, RunBackendStepResult runBackendStepResult) throws QException public void run(RunBackendStepInput runBackendStepInput, RunBackendStepOutput runBackendStepOutput) throws QException
{ {
try try
{ {
Thread.sleep(runBackendStepRequest.getValueInteger(FIELD_SLEEP_MILLIS)); Thread.sleep(runBackendStepInput.getValueInteger(FIELD_SLEEP_MILLIS));
} }
catch(InterruptedException e) catch(InterruptedException e)
{ {
@ -395,12 +395,12 @@ public class SampleMetaDataProvider
** **
******************************************************************************/ ******************************************************************************/
@Override @Override
public void run(RunBackendStepRequest runBackendStepRequest, RunBackendStepResult runBackendStepResult) throws QException public void run(RunBackendStepInput runBackendStepInput, RunBackendStepOutput runBackendStepOutput) throws QException
{ {
int sleepMillis; int sleepMillis;
try try
{ {
sleepMillis = runBackendStepRequest.getValueInteger(FIELD_SLEEP_MILLIS); sleepMillis = runBackendStepInput.getValueInteger(FIELD_SLEEP_MILLIS);
} }
catch(QValueException qve) catch(QValueException qve)
{ {
@ -449,7 +449,7 @@ public class SampleMetaDataProvider
@Override @Override
public void run(RunBackendStepRequest runBackendStepRequest, RunBackendStepResult runBackendStepResult) throws QException public void run(RunBackendStepInput runBackendStepInput, RunBackendStepOutput runBackendStepOutput) throws QException
{ {
////////// //////////
// noop // // noop //

View File

@ -25,14 +25,14 @@ package com.kingsrook.sampleapp;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.UUID; import java.util.UUID;
import com.kingsrook.qqq.backend.core.actions.QueryAction; import com.kingsrook.qqq.backend.core.actions.tables.QueryAction;
import com.kingsrook.qqq.backend.core.actions.RunProcessAction; import com.kingsrook.qqq.backend.core.actions.processes.RunProcessAction;
import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessRequest; import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessInput;
import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessResult; import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessOutput;
import com.kingsrook.qqq.backend.core.model.actions.query.QueryRequest; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput;
import com.kingsrook.qqq.backend.core.model.actions.query.QueryResult; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput;
import com.kingsrook.qqq.backend.core.model.metadata.QInstance; 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.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.model.session.QSession; import com.kingsrook.qqq.backend.core.model.session.QSession;
import com.kingsrook.qqq.backend.module.filesystem.local.actions.FilesystemQueryAction; import com.kingsrook.qqq.backend.module.filesystem.local.actions.FilesystemQueryAction;
import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemTableBackendDetails; import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemTableBackendDetails;
@ -60,13 +60,13 @@ class SampleMetaDataProviderTest
try try
{ {
QueryRequest queryRequest = new QueryRequest(); QueryInput queryInput = new QueryInput();
queryRequest.setInstance(SampleMetaDataProvider.defineInstance()); queryInput.setInstance(SampleMetaDataProvider.defineInstance());
queryRequest.setTableName(fileTable.getName()); queryInput.setTableName(fileTable.getName());
QueryResult queryResult = new FilesystemQueryAction().execute(queryRequest); QueryOutput queryOutput = new FilesystemQueryAction().execute(queryInput);
System.out.println(queryResult); System.out.println(queryOutput);
Assertions.assertEquals(3, queryResult.getRecords().size(), "Should load all records from the file"); Assertions.assertEquals(3, queryOutput.getRecords().size(), "Should load all records from the file");
} }
finally finally
{ {
@ -102,20 +102,20 @@ class SampleMetaDataProviderTest
{ {
QInstance qInstance = SampleMetaDataProvider.defineInstance(); QInstance qInstance = SampleMetaDataProvider.defineInstance();
QTableMetaData personTable = SampleMetaDataProvider.defineTablePerson(); QTableMetaData personTable = SampleMetaDataProvider.defineTablePerson();
RunProcessRequest request = new RunProcessRequest(qInstance); RunProcessInput request = new RunProcessInput(qInstance);
request.setSession(new QSession()); request.setSession(new QSession());
request.setProcessName(SampleMetaDataProvider.PROCESS_NAME_GREET); request.setProcessName(SampleMetaDataProvider.PROCESS_NAME_GREET);
QueryRequest queryRequest = new QueryRequest(qInstance); QueryInput queryInput = new QueryInput(qInstance);
queryRequest.setTableName(personTable.getName()); queryInput.setTableName(personTable.getName());
queryRequest.setSession(new QSession()); queryInput.setSession(new QSession());
QueryResult queryResult = new QueryAction().execute(queryRequest); QueryOutput queryOutput = new QueryAction().execute(queryInput);
request.setRecords(queryResult.getRecords()); request.setRecords(queryOutput.getRecords());
request.addValue("greetingPrefix", "Hello"); request.addValue("greetingPrefix", "Hello");
request.addValue("greetingSuffix", "there"); request.addValue("greetingSuffix", "there");
RunProcessResult result = new RunProcessAction().execute(request); RunProcessOutput result = new RunProcessAction().execute(request);
assertNotNull(result); assertNotNull(result);
assertTrue(result.getRecords().stream().allMatch(r -> r.getValues().containsKey("id")), "records should have an id, set by the process"); assertTrue(result.getRecords().stream().allMatch(r -> r.getValues().containsKey("id")), "records should have an id, set by the process");
} }