QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize packages; rename Request to Input and Response to Output

Browse Source
This commit is contained in:
darin.kelkhoff
2022-07-14 13:06:25 -05:00
parent a301890972
commit 4b80bd589c
5 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -53,12 +53,12 @@
<dependency> <dependency>
<groupId>com.kingsrook.qqq</groupId> <groupId>com.kingsrook.qqq</groupId>
<artifactId>qqq-backend-core</artifactId> <artifactId>qqq-backend-core</artifactId>
<version>0.1.0</version> <version>0.2.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.kingsrook.qqq</groupId> <groupId>com.kingsrook.qqq</groupId>
<artifactId>qqq-backend-module-rdbms</artifactId> <artifactId>qqq-backend-module-rdbms</artifactId>
<version>0.1.0</version> <version>0.2.0-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

6
src/main/java/com/kingsrook/qqq/frontend/picocli/PicoCliProcessCallback.java
View File

@ -27,9 +27,9 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Scanner; import java.util.Scanner;
import com.kingsrook.qqq.backend.core.callbacks.QProcessCallback; import com.kingsrook.qqq.backend.core.actions.processes.QProcessCallback;
import com.kingsrook.qqq.backend.core.model.actions.query.QQueryFilter; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
import picocli.CommandLine; import picocli.CommandLine;

4
src/main/java/com/kingsrook/qqq/frontend/picocli/QCommandBuilder.java
View File

@ -29,10 +29,10 @@ import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData;
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.fields.QFieldMetaData;
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.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.utils.CollectionUtils; import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.StringUtils;
import picocli.CommandLine; import picocli.CommandLine;

144
src/main/java/com/kingsrook/qqq/frontend/picocli/QPicoCliImplementation.java
View File

@ -32,48 +32,48 @@ import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.kingsrook.qqq.backend.core.actions.CountAction; import com.kingsrook.qqq.backend.core.actions.metadata.MetaDataAction;
import com.kingsrook.qqq.backend.core.actions.DeleteAction; import com.kingsrook.qqq.backend.core.actions.metadata.TableMetaDataAction;
import com.kingsrook.qqq.backend.core.actions.InsertAction; import com.kingsrook.qqq.backend.core.actions.processes.RunProcessAction;
import com.kingsrook.qqq.backend.core.actions.MetaDataAction; import com.kingsrook.qqq.backend.core.actions.tables.CountAction;
import com.kingsrook.qqq.backend.core.actions.QueryAction; import com.kingsrook.qqq.backend.core.actions.tables.DeleteAction;
import com.kingsrook.qqq.backend.core.actions.RunProcessAction; import com.kingsrook.qqq.backend.core.actions.tables.InsertAction;
import com.kingsrook.qqq.backend.core.actions.TableMetaDataAction; import com.kingsrook.qqq.backend.core.actions.tables.QueryAction;
import com.kingsrook.qqq.backend.core.actions.UpdateAction; import com.kingsrook.qqq.backend.core.actions.tables.UpdateAction;
import com.kingsrook.qqq.backend.core.adapters.CsvToQRecordAdapter; import com.kingsrook.qqq.backend.core.adapters.CsvToQRecordAdapter;
import com.kingsrook.qqq.backend.core.adapters.JsonToQFieldMappingAdapter; import com.kingsrook.qqq.backend.core.adapters.JsonToQFieldMappingAdapter;
import com.kingsrook.qqq.backend.core.adapters.JsonToQRecordAdapter; import com.kingsrook.qqq.backend.core.adapters.JsonToQRecordAdapter;
import com.kingsrook.qqq.backend.core.adapters.QInstanceAdapter; import com.kingsrook.qqq.backend.core.adapters.QInstanceAdapter;
import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.exceptions.QModuleDispatchException; import com.kingsrook.qqq.backend.core.exceptions.QModuleDispatchException;
import com.kingsrook.qqq.backend.core.model.actions.count.CountRequest; import com.kingsrook.qqq.backend.core.model.actions.metadata.MetaDataInput;
import com.kingsrook.qqq.backend.core.model.actions.count.CountResult; import com.kingsrook.qqq.backend.core.model.actions.metadata.MetaDataOutput;
import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteRequest; import com.kingsrook.qqq.backend.core.model.actions.metadata.TableMetaDataInput;
import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteResult; import com.kingsrook.qqq.backend.core.model.actions.metadata.TableMetaDataOutput;
import com.kingsrook.qqq.backend.core.model.actions.insert.InsertRequest; import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessInput;
import com.kingsrook.qqq.backend.core.model.actions.insert.InsertResult; import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessOutput;
import com.kingsrook.qqq.backend.core.model.actions.metadata.MetaDataRequest;
import com.kingsrook.qqq.backend.core.model.actions.metadata.MetaDataResult;
import com.kingsrook.qqq.backend.core.model.actions.metadata.table.TableMetaDataRequest;
import com.kingsrook.qqq.backend.core.model.actions.metadata.table.TableMetaDataResult;
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.QCriteriaOperator;
import com.kingsrook.qqq.backend.core.model.actions.query.QFilterCriteria;
import com.kingsrook.qqq.backend.core.model.actions.query.QQueryFilter;
import com.kingsrook.qqq.backend.core.model.actions.query.QueryRequest;
import com.kingsrook.qqq.backend.core.model.actions.query.QueryResult;
import com.kingsrook.qqq.backend.core.model.actions.shared.mapping.AbstractQFieldMapping; import com.kingsrook.qqq.backend.core.model.actions.shared.mapping.AbstractQFieldMapping;
import com.kingsrook.qqq.backend.core.model.actions.update.UpdateRequest; import com.kingsrook.qqq.backend.core.model.actions.tables.count.CountInput;
import com.kingsrook.qqq.backend.core.model.actions.update.UpdateResult; import com.kingsrook.qqq.backend.core.model.actions.tables.count.CountOutput;
import com.kingsrook.qqq.backend.core.model.actions.tables.delete.DeleteInput;
import com.kingsrook.qqq.backend.core.model.actions.tables.delete.DeleteOutput;
import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput;
import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertOutput;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterCriteria;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput;
import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateInput;
import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateOutput;
import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.data.QRecord;
import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData;
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.fields.QFieldMetaData;
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.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.core.modules.QAuthenticationModuleDispatcher; import com.kingsrook.qqq.backend.core.modules.authentication.QAuthenticationModuleDispatcher;
import com.kingsrook.qqq.backend.core.modules.interfaces.QAuthenticationModuleInterface; import com.kingsrook.qqq.backend.core.modules.authentication.QAuthenticationModuleInterface;
import com.kingsrook.qqq.backend.core.utils.JsonUtils; import com.kingsrook.qqq.backend.core.utils.JsonUtils;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import picocli.CommandLine; import picocli.CommandLine;
@ -367,7 +367,7 @@ public class QPicoCliImplementation
{ {
String processName = processParseResult.commandSpec().name(); String processName = processParseResult.commandSpec().name();
QProcessMetaData process = qInstance.getProcess(processName); QProcessMetaData process = qInstance.getProcess(processName);
RunProcessRequest request = new RunProcessRequest(qInstance); RunProcessInput request = new RunProcessInput(qInstance);
request.setSession(session); request.setSession(session);
request.setProcessName(processName); request.setProcessName(processName);
@ -384,7 +384,7 @@ public class QPicoCliImplementation
try try
{ {
RunProcessResult result = new RunProcessAction().execute(request); RunProcessOutput result = new RunProcessAction().execute(request);
subCommandLine.getOut().println("Process Results: "); // todo better!! subCommandLine.getOut().println("Process Results: "); // todo better!!
for(QFieldMetaData outputField : process.getOutputFields()) for(QFieldMetaData outputField : process.getOutputFields())
{ {
@ -414,12 +414,12 @@ public class QPicoCliImplementation
*******************************************************************************/ *******************************************************************************/
private int runTableMetaData(CommandLine commandLine, String tableName, ParseResult subParseResult) throws QException private int runTableMetaData(CommandLine commandLine, String tableName, ParseResult subParseResult) throws QException
{ {
TableMetaDataRequest tableMetaDataRequest = new TableMetaDataRequest(qInstance); TableMetaDataInput tableMetaDataInput = new TableMetaDataInput(qInstance);
tableMetaDataRequest.setSession(session); tableMetaDataInput.setSession(session);
tableMetaDataRequest.setTableName(tableName); tableMetaDataInput.setTableName(tableName);
TableMetaDataAction tableMetaDataAction = new TableMetaDataAction(); TableMetaDataAction tableMetaDataAction = new TableMetaDataAction();
TableMetaDataResult tableMetaDataResult = tableMetaDataAction.execute(tableMetaDataRequest); TableMetaDataOutput tableMetaDataOutput = tableMetaDataAction.execute(tableMetaDataInput);
commandLine.getOut().println(JsonUtils.toPrettyJson(tableMetaDataResult)); commandLine.getOut().println(JsonUtils.toPrettyJson(tableMetaDataOutput));
return commandLine.getCommandSpec().exitCodeOnSuccess(); return commandLine.getCommandSpec().exitCodeOnSuccess();
} }
@ -430,14 +430,14 @@ public class QPicoCliImplementation
*******************************************************************************/ *******************************************************************************/
private int runTableCount(CommandLine commandLine, String tableName, ParseResult subParseResult) throws QException private int runTableCount(CommandLine commandLine, String tableName, ParseResult subParseResult) throws QException
{ {
CountRequest countRequest = new CountRequest(qInstance); CountInput countInput = new CountInput(qInstance);
countRequest.setSession(session); countInput.setSession(session);
countRequest.setTableName(tableName); countInput.setTableName(tableName);
countRequest.setFilter(generateQueryFilter(subParseResult)); countInput.setFilter(generateQueryFilter(subParseResult));
CountAction countAction = new CountAction(); CountAction countAction = new CountAction();
CountResult countResult = countAction.execute(countRequest); CountOutput countOutput = countAction.execute(countInput);
commandLine.getOut().println(JsonUtils.toPrettyJson(countResult)); commandLine.getOut().println(JsonUtils.toPrettyJson(countOutput));
return commandLine.getCommandSpec().exitCodeOnSuccess(); return commandLine.getCommandSpec().exitCodeOnSuccess();
} }
@ -448,16 +448,16 @@ public class QPicoCliImplementation
*******************************************************************************/ *******************************************************************************/
private int runTableQuery(CommandLine commandLine, String tableName, ParseResult subParseResult) throws QException private int runTableQuery(CommandLine commandLine, String tableName, ParseResult subParseResult) throws QException
{ {
QueryRequest queryRequest = new QueryRequest(qInstance); QueryInput queryInput = new QueryInput(qInstance);
queryRequest.setSession(session); queryInput.setSession(session);
queryRequest.setTableName(tableName); queryInput.setTableName(tableName);
queryRequest.setSkip(subParseResult.matchedOptionValue("skip", null)); queryInput.setSkip(subParseResult.matchedOptionValue("skip", null));
queryRequest.setLimit(subParseResult.matchedOptionValue("limit", DEFAULT_LIMIT)); queryInput.setLimit(subParseResult.matchedOptionValue("limit", DEFAULT_LIMIT));
queryRequest.setFilter(generateQueryFilter(subParseResult)); queryInput.setFilter(generateQueryFilter(subParseResult));
QueryAction queryAction = new QueryAction(); QueryAction queryAction = new QueryAction();
QueryResult queryResult = queryAction.execute(queryRequest); QueryOutput queryOutput = queryAction.execute(queryInput);
commandLine.getOut().println(JsonUtils.toPrettyJson(queryResult)); commandLine.getOut().println(JsonUtils.toPrettyJson(queryOutput));
return commandLine.getCommandSpec().exitCodeOnSuccess(); return commandLine.getCommandSpec().exitCodeOnSuccess();
} }
@ -492,9 +492,9 @@ public class QPicoCliImplementation
*******************************************************************************/ *******************************************************************************/
private int runTableInsert(CommandLine commandLine, String tableName, ParseResult subParseResult) throws QException private int runTableInsert(CommandLine commandLine, String tableName, ParseResult subParseResult) throws QException
{ {
InsertRequest insertRequest = new InsertRequest(qInstance); InsertInput insertInput = new InsertInput(qInstance);
insertRequest.setSession(session); insertInput.setSession(session);
insertRequest.setTableName(tableName); insertInput.setTableName(tableName);
QTableMetaData table = qInstance.getTable(tableName); QTableMetaData table = qInstance.getTable(tableName);
AbstractQFieldMapping<?> mapping = null; AbstractQFieldMapping<?> mapping = null;
@ -565,11 +565,11 @@ public class QPicoCliImplementation
} }
} }
insertRequest.setRecords(recordList); insertInput.setRecords(recordList);
InsertAction insertAction = new InsertAction(); InsertAction insertAction = new InsertAction();
InsertResult insertResult = insertAction.execute(insertRequest); InsertOutput insertOutput = insertAction.execute(insertInput);
commandLine.getOut().println(JsonUtils.toPrettyJson(insertResult)); commandLine.getOut().println(JsonUtils.toPrettyJson(insertOutput));
return commandLine.getCommandSpec().exitCodeOnSuccess(); return commandLine.getCommandSpec().exitCodeOnSuccess();
} }
@ -580,9 +580,9 @@ public class QPicoCliImplementation
*******************************************************************************/ *******************************************************************************/
private int runTableUpdate(CommandLine commandLine, String tableName, ParseResult subParseResult) throws QException private int runTableUpdate(CommandLine commandLine, String tableName, ParseResult subParseResult) throws QException
{ {
UpdateRequest updateRequest = new UpdateRequest(qInstance); UpdateInput updateInput = new UpdateInput(qInstance);
updateRequest.setSession(session); updateInput.setSession(session);
updateRequest.setTableName(tableName); updateInput.setTableName(tableName);
QTableMetaData table = qInstance.getTable(tableName); QTableMetaData table = qInstance.getTable(tableName);
List<QRecord> recordList = new ArrayList<>(); List<QRecord> recordList = new ArrayList<>();
@ -616,10 +616,10 @@ public class QPicoCliImplementation
return commandLine.getCommandSpec().exitCodeOnUsageHelp(); return commandLine.getCommandSpec().exitCodeOnUsageHelp();
} }
updateRequest.setRecords(recordList); updateInput.setRecords(recordList);
UpdateAction updateAction = new UpdateAction(); UpdateAction updateAction = new UpdateAction();
UpdateResult updateResult = updateAction.execute(updateRequest); UpdateOutput updateResult = updateAction.execute(updateInput);
commandLine.getOut().println(JsonUtils.toPrettyJson(updateResult)); commandLine.getOut().println(JsonUtils.toPrettyJson(updateResult));
return commandLine.getCommandSpec().exitCodeOnSuccess(); return commandLine.getCommandSpec().exitCodeOnSuccess();
} }
@ -631,19 +631,19 @@ public class QPicoCliImplementation
*******************************************************************************/ *******************************************************************************/
private int runTableDelete(CommandLine commandLine, String tableName, ParseResult subParseResult) throws QException private int runTableDelete(CommandLine commandLine, String tableName, ParseResult subParseResult) throws QException
{ {
DeleteRequest deleteRequest = new DeleteRequest(qInstance); DeleteInput deleteInput = new DeleteInput(qInstance);
deleteRequest.setSession(session); deleteInput.setSession(session);
deleteRequest.setTableName(tableName); deleteInput.setTableName(tableName);
///////////////////////////////////////////// /////////////////////////////////////////////
// get the pKeys that the user specified // // get the pKeys that the user specified //
///////////////////////////////////////////// /////////////////////////////////////////////
String primaryKeyOption = subParseResult.matchedOptionValue("--primaryKey", ""); String primaryKeyOption = subParseResult.matchedOptionValue("--primaryKey", "");
Serializable[] primaryKeyValues = primaryKeyOption.split(","); Serializable[] primaryKeyValues = primaryKeyOption.split(",");
deleteRequest.setPrimaryKeys(Arrays.asList(primaryKeyValues)); deleteInput.setPrimaryKeys(Arrays.asList(primaryKeyValues));
DeleteAction deleteAction = new DeleteAction(); DeleteAction deleteAction = new DeleteAction();
DeleteResult deleteResult = deleteAction.execute(deleteRequest); DeleteOutput deleteResult = deleteAction.execute(deleteInput);
commandLine.getOut().println(JsonUtils.toPrettyJson(deleteResult)); commandLine.getOut().println(JsonUtils.toPrettyJson(deleteResult));
return commandLine.getCommandSpec().exitCodeOnSuccess(); return commandLine.getCommandSpec().exitCodeOnSuccess();
} }
@ -657,11 +657,11 @@ public class QPicoCliImplementation
{ {
if(parseResult.hasMatchedOption("--meta-data")) if(parseResult.hasMatchedOption("--meta-data"))
{ {
MetaDataRequest metaDataRequest = new MetaDataRequest(qInstance); MetaDataInput metaDataInput = new MetaDataInput(qInstance);
metaDataRequest.setSession(session); metaDataInput.setSession(session);
MetaDataAction metaDataAction = new MetaDataAction(); MetaDataAction metaDataAction = new MetaDataAction();
MetaDataResult metaDataResult = metaDataAction.execute(metaDataRequest); MetaDataOutput metaDataOutput = metaDataAction.execute(metaDataInput);
commandLine.getOut().println(JsonUtils.toPrettyJson(metaDataResult)); commandLine.getOut().println(JsonUtils.toPrettyJson(metaDataOutput));
return commandLine.getCommandSpec().exitCodeOnSuccess(); return commandLine.getCommandSpec().exitCodeOnSuccess();
} }

14
src/test/java/com/kingsrook/qqq/frontend/picocli/TestUtils.java
View File

@ -25,15 +25,15 @@ package com.kingsrook.qqq.frontend.picocli;
import java.io.InputStream; import java.io.InputStream;
import java.sql.Connection; import java.sql.Connection;
import java.util.List; import java.util.List;
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.metadata.QAuthenticationMetaData; import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationMetaData;
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.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;