diff --git a/src/main/java/com/kingsrook/qqq/backend/core/actions/DeleteAction.java b/src/main/java/com/kingsrook/qqq/backend/core/actions/DeleteAction.java index 3765e017..7b488342 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/actions/DeleteAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/actions/DeleteAction.java @@ -6,8 +6,8 @@ package com.kingsrook.qqq.backend.core.actions; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.DeleteRequest; -import com.kingsrook.qqq.backend.core.model.actions.DeleteResult; +import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteRequest; +import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteResult; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; import com.kingsrook.qqq.backend.core.modules.QModuleDispatcher; import com.kingsrook.qqq.backend.core.modules.interfaces.QModuleInterface; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/actions/InsertAction.java b/src/main/java/com/kingsrook/qqq/backend/core/actions/InsertAction.java index f6d7abb9..9b3baf30 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/actions/InsertAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/actions/InsertAction.java @@ -6,8 +6,8 @@ package com.kingsrook.qqq.backend.core.actions; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.InsertRequest; -import com.kingsrook.qqq.backend.core.model.actions.InsertResult; +import com.kingsrook.qqq.backend.core.model.actions.insert.InsertRequest; +import com.kingsrook.qqq.backend.core.model.actions.insert.InsertResult; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; import com.kingsrook.qqq.backend.core.modules.QModuleDispatcher; import com.kingsrook.qqq.backend.core.modules.interfaces.QModuleInterface; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/actions/MetaDataAction.java b/src/main/java/com/kingsrook/qqq/backend/core/actions/MetaDataAction.java index dfc1a5fc..4f8bc8b3 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/actions/MetaDataAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/actions/MetaDataAction.java @@ -8,8 +8,8 @@ package com.kingsrook.qqq.backend.core.actions; import java.util.LinkedHashMap; import java.util.Map; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.MetaDataRequest; -import com.kingsrook.qqq.backend.core.model.actions.MetaDataResult; +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.metadata.QTableMetaData; import com.kingsrook.qqq.backend.core.model.metadata.frontend.QFrontendTableMetaData; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/actions/QueryAction.java b/src/main/java/com/kingsrook/qqq/backend/core/actions/QueryAction.java index ec4daac0..a801c7b9 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/actions/QueryAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/actions/QueryAction.java @@ -6,8 +6,8 @@ package com.kingsrook.qqq.backend.core.actions; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.QueryRequest; -import com.kingsrook.qqq.backend.core.model.actions.QueryResult; +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.metadata.QBackendMetaData; import com.kingsrook.qqq.backend.core.modules.QModuleDispatcher; import com.kingsrook.qqq.backend.core.modules.interfaces.QModuleInterface; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/actions/TableMetaDataAction.java b/src/main/java/com/kingsrook/qqq/backend/core/actions/TableMetaDataAction.java index af2dba89..2e6e40b9 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/actions/TableMetaDataAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/actions/TableMetaDataAction.java @@ -7,8 +7,8 @@ package com.kingsrook.qqq.backend.core.actions; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException; -import com.kingsrook.qqq.backend.core.model.actions.TableMetaDataRequest; -import com.kingsrook.qqq.backend.core.model.actions.TableMetaDataResult; +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.metadata.QTableMetaData; import com.kingsrook.qqq.backend.core.model.metadata.frontend.QFrontendTableMetaData; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/adapters/CsvToQRecordAdapter.java b/src/main/java/com/kingsrook/qqq/backend/core/adapters/CsvToQRecordAdapter.java index 96a53fd3..0de86b6a 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/adapters/CsvToQRecordAdapter.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/adapters/CsvToQRecordAdapter.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.kingsrook.qqq.backend.core.model.actions.AbstractQFieldMapping; +import com.kingsrook.qqq.backend.core.model.actions.shared.mapping.AbstractQFieldMapping; 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.QTableMetaData; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/adapters/JsonToQFieldMappingAdapter.java b/src/main/java/com/kingsrook/qqq/backend/core/adapters/JsonToQFieldMappingAdapter.java index f1015194..2acbb607 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/adapters/JsonToQFieldMappingAdapter.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/adapters/JsonToQFieldMappingAdapter.java @@ -5,9 +5,9 @@ package com.kingsrook.qqq.backend.core.adapters; -import com.kingsrook.qqq.backend.core.model.actions.AbstractQFieldMapping; -import com.kingsrook.qqq.backend.core.model.actions.QIndexBasedFieldMapping; -import com.kingsrook.qqq.backend.core.model.actions.QKeyBasedFieldMapping; +import com.kingsrook.qqq.backend.core.model.actions.shared.mapping.AbstractQFieldMapping; +import com.kingsrook.qqq.backend.core.model.actions.shared.mapping.QIndexBasedFieldMapping; +import com.kingsrook.qqq.backend.core.model.actions.shared.mapping.QKeyBasedFieldMapping; import com.kingsrook.qqq.backend.core.utils.JsonUtils; import com.kingsrook.qqq.backend.core.utils.StringUtils; import org.json.JSONException; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/adapters/JsonToQRecordAdapter.java b/src/main/java/com/kingsrook/qqq/backend/core/adapters/JsonToQRecordAdapter.java index 6b97f0bb..52fc953c 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/adapters/JsonToQRecordAdapter.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/adapters/JsonToQRecordAdapter.java @@ -8,7 +8,7 @@ package com.kingsrook.qqq.backend.core.adapters; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import com.kingsrook.qqq.backend.core.model.actions.AbstractQFieldMapping; +import com.kingsrook.qqq.backend.core.model.actions.shared.mapping.AbstractQFieldMapping; 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.QTableMetaData; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/DeleteRequest.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/delete/DeleteRequest.java similarity index 93% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/DeleteRequest.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/delete/DeleteRequest.java index cf7b85e9..fbf71984 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/DeleteRequest.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/delete/DeleteRequest.java @@ -2,11 +2,12 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.delete; import java.io.Serializable; import java.util.List; +import com.kingsrook.qqq.backend.core.model.actions.AbstractQTableRequest; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/DeleteResult.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/delete/DeleteResult.java similarity index 88% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/DeleteResult.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/delete/DeleteResult.java index c92f8dcd..dafa1581 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/DeleteResult.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/delete/DeleteResult.java @@ -2,10 +2,11 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.delete; import java.util.List; +import com.kingsrook.qqq.backend.core.model.actions.AbstractQResult; import com.kingsrook.qqq.backend.core.model.data.QRecordWithStatus; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/InsertRequest.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/insert/InsertRequest.java similarity index 92% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/InsertRequest.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/insert/InsertRequest.java index 3c63879f..3dca219b 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/InsertRequest.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/insert/InsertRequest.java @@ -2,10 +2,11 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.insert; import java.util.List; +import com.kingsrook.qqq.backend.core.model.actions.AbstractQTableRequest; import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/InsertResult.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/insert/InsertResult.java similarity index 88% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/InsertResult.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/insert/InsertResult.java index 652b1f3a..40e5767d 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/InsertResult.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/insert/InsertResult.java @@ -2,10 +2,11 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.insert; import java.util.List; +import com.kingsrook.qqq.backend.core.model.actions.AbstractQResult; import com.kingsrook.qqq.backend.core.model.data.QRecordWithStatus; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/MetaDataRequest.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/metadata/MetaDataRequest.java similarity index 87% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/MetaDataRequest.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/metadata/MetaDataRequest.java index 8c0eaf9c..eb1888e3 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/MetaDataRequest.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/metadata/MetaDataRequest.java @@ -2,9 +2,10 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.metadata; +import com.kingsrook.qqq.backend.core.model.actions.AbstractQRequest; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/MetaDataResult.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/metadata/MetaDataResult.java similarity index 89% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/MetaDataResult.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/metadata/MetaDataResult.java index 417821a8..c9eca312 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/MetaDataResult.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/metadata/MetaDataResult.java @@ -2,10 +2,11 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.metadata; import java.util.Map; +import com.kingsrook.qqq.backend.core.model.actions.AbstractQResult; import com.kingsrook.qqq.backend.core.model.metadata.frontend.QFrontendTableMetaData; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/TableMetaDataRequest.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/metadata/table/TableMetaDataRequest.java similarity index 91% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/TableMetaDataRequest.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/metadata/table/TableMetaDataRequest.java index 2d078e3e..3e7a08e1 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/TableMetaDataRequest.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/metadata/table/TableMetaDataRequest.java @@ -2,9 +2,10 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.metadata.table; +import com.kingsrook.qqq.backend.core.model.actions.AbstractQRequest; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/TableMetaDataResult.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/metadata/table/TableMetaDataResult.java similarity index 88% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/TableMetaDataResult.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/metadata/table/TableMetaDataResult.java index e263106b..fad11bce 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/TableMetaDataResult.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/metadata/table/TableMetaDataResult.java @@ -2,9 +2,10 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.metadata.table; +import com.kingsrook.qqq.backend.core.model.actions.AbstractQResult; import com.kingsrook.qqq.backend.core.model.metadata.frontend.QFrontendTableMetaData; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QCriteriaOperator.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QCriteriaOperator.java similarity index 91% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/QCriteriaOperator.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QCriteriaOperator.java index d05d1e38..971b2d07 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QCriteriaOperator.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QCriteriaOperator.java @@ -2,7 +2,7 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.query; /******************************************************************************* diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QFilterCriteria.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QFilterCriteria.java similarity index 98% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/QFilterCriteria.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QFilterCriteria.java index 2e71a6c9..f98eae31 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QFilterCriteria.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QFilterCriteria.java @@ -2,7 +2,7 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.query; import java.io.Serializable; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QFilterOrderBy.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QFilterOrderBy.java similarity index 97% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/QFilterOrderBy.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QFilterOrderBy.java index 4b9d7d05..80875e09 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QFilterOrderBy.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QFilterOrderBy.java @@ -2,7 +2,7 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.query; /******************************************************************************* diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QQueryFilter.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QQueryFilter.java similarity index 98% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/QQueryFilter.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QQueryFilter.java index f1402a6f..2ff15424 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QQueryFilter.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QQueryFilter.java @@ -2,7 +2,7 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.query; import java.util.ArrayList; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QueryRequest.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QueryRequest.java similarity index 95% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/QueryRequest.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QueryRequest.java index 8168c2ef..16a4c93a 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QueryRequest.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QueryRequest.java @@ -2,9 +2,10 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.query; +import com.kingsrook.qqq.backend.core.model.actions.AbstractQTableRequest; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QueryResult.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QueryResult.java similarity index 88% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/QueryResult.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QueryResult.java index 9caf3c02..eb0bb04b 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QueryResult.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/query/QueryResult.java @@ -2,10 +2,11 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.query; import java.util.List; +import com.kingsrook.qqq.backend.core.model.actions.AbstractQResult; import com.kingsrook.qqq.backend.core.model.data.QRecord; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/AbstractQFieldMapping.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/shared/mapping/AbstractQFieldMapping.java similarity index 96% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/AbstractQFieldMapping.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/shared/mapping/AbstractQFieldMapping.java index c98a8cf1..daeb0fa7 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/AbstractQFieldMapping.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/shared/mapping/AbstractQFieldMapping.java @@ -2,7 +2,7 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.shared.mapping; /******************************************************************************* diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QIndexBasedFieldMapping.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/shared/mapping/QIndexBasedFieldMapping.java similarity index 97% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/QIndexBasedFieldMapping.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/shared/mapping/QIndexBasedFieldMapping.java index a35b96f9..9d0fe49b 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QIndexBasedFieldMapping.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/shared/mapping/QIndexBasedFieldMapping.java @@ -2,7 +2,7 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.shared.mapping; import java.util.LinkedHashMap; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QKeyBasedFieldMapping.java b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/shared/mapping/QKeyBasedFieldMapping.java similarity index 97% rename from src/main/java/com/kingsrook/qqq/backend/core/model/actions/QKeyBasedFieldMapping.java rename to src/main/java/com/kingsrook/qqq/backend/core/model/actions/shared/mapping/QKeyBasedFieldMapping.java index 986a402e..3ef6fc95 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/model/actions/QKeyBasedFieldMapping.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/model/actions/shared/mapping/QKeyBasedFieldMapping.java @@ -2,7 +2,7 @@ * Copyright © 2021-2021. Kingsrook LLC . All Rights Reserved. */ -package com.kingsrook.qqq.backend.core.model.actions; +package com.kingsrook.qqq.backend.core.model.actions.shared.mapping; import java.util.LinkedHashMap; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/modules/interfaces/DeleteInterface.java b/src/main/java/com/kingsrook/qqq/backend/core/modules/interfaces/DeleteInterface.java index 9a41340f..9a9bfbcd 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/modules/interfaces/DeleteInterface.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/modules/interfaces/DeleteInterface.java @@ -6,8 +6,8 @@ package com.kingsrook.qqq.backend.core.modules.interfaces; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.DeleteRequest; -import com.kingsrook.qqq.backend.core.model.actions.DeleteResult; +import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteRequest; +import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteResult; /******************************************************************************* diff --git a/src/main/java/com/kingsrook/qqq/backend/core/modules/interfaces/InsertInterface.java b/src/main/java/com/kingsrook/qqq/backend/core/modules/interfaces/InsertInterface.java index ebccdd9a..b8750c82 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/modules/interfaces/InsertInterface.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/modules/interfaces/InsertInterface.java @@ -6,8 +6,8 @@ package com.kingsrook.qqq.backend.core.modules.interfaces; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.InsertRequest; -import com.kingsrook.qqq.backend.core.model.actions.InsertResult; +import com.kingsrook.qqq.backend.core.model.actions.insert.InsertRequest; +import com.kingsrook.qqq.backend.core.model.actions.insert.InsertResult; /******************************************************************************* diff --git a/src/main/java/com/kingsrook/qqq/backend/core/modules/interfaces/QueryInterface.java b/src/main/java/com/kingsrook/qqq/backend/core/modules/interfaces/QueryInterface.java index a6947e91..29528aea 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/modules/interfaces/QueryInterface.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/modules/interfaces/QueryInterface.java @@ -6,8 +6,8 @@ package com.kingsrook.qqq.backend.core.modules.interfaces; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.QueryRequest; -import com.kingsrook.qqq.backend.core.model.actions.QueryResult; +import com.kingsrook.qqq.backend.core.model.actions.query.QueryRequest; +import com.kingsrook.qqq.backend.core.model.actions.query.QueryResult; /******************************************************************************* diff --git a/src/main/java/com/kingsrook/qqq/backend/core/modules/mock/MockDeleteAction.java b/src/main/java/com/kingsrook/qqq/backend/core/modules/mock/MockDeleteAction.java index 7eb0bb61..81fdef1f 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/modules/mock/MockDeleteAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/modules/mock/MockDeleteAction.java @@ -6,8 +6,8 @@ package com.kingsrook.qqq.backend.core.modules.mock; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.DeleteRequest; -import com.kingsrook.qqq.backend.core.model.actions.DeleteResult; +import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteRequest; +import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteResult; import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.data.QRecordWithStatus; import com.kingsrook.qqq.backend.core.modules.interfaces.DeleteInterface; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/modules/mock/MockInsertAction.java b/src/main/java/com/kingsrook/qqq/backend/core/modules/mock/MockInsertAction.java index b6182219..ede358e4 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/modules/mock/MockInsertAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/modules/mock/MockInsertAction.java @@ -6,8 +6,8 @@ package com.kingsrook.qqq.backend.core.modules.mock; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.InsertRequest; -import com.kingsrook.qqq.backend.core.model.actions.InsertResult; +import com.kingsrook.qqq.backend.core.model.actions.insert.InsertRequest; +import com.kingsrook.qqq.backend.core.model.actions.insert.InsertResult; import com.kingsrook.qqq.backend.core.model.data.QRecordWithStatus; import com.kingsrook.qqq.backend.core.modules.interfaces.InsertInterface; diff --git a/src/main/java/com/kingsrook/qqq/backend/core/modules/mock/MockQueryAction.java b/src/main/java/com/kingsrook/qqq/backend/core/modules/mock/MockQueryAction.java index a2ca268c..453d4317 100644 --- a/src/main/java/com/kingsrook/qqq/backend/core/modules/mock/MockQueryAction.java +++ b/src/main/java/com/kingsrook/qqq/backend/core/modules/mock/MockQueryAction.java @@ -8,8 +8,8 @@ package com.kingsrook.qqq.backend.core.modules.mock; import java.util.ArrayList; import java.util.List; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.QueryRequest; -import com.kingsrook.qqq.backend.core.model.actions.QueryResult; +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.data.QRecord; import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; import com.kingsrook.qqq.backend.core.modules.interfaces.QueryInterface; diff --git a/src/test/java/com/kingsrook/qqq/backend/core/actions/DeleteActionTest.java b/src/test/java/com/kingsrook/qqq/backend/core/actions/DeleteActionTest.java index d3231f92..46d12c4d 100644 --- a/src/test/java/com/kingsrook/qqq/backend/core/actions/DeleteActionTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/core/actions/DeleteActionTest.java @@ -7,8 +7,8 @@ package com.kingsrook.qqq.backend.core.actions; import java.util.List; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.DeleteRequest; -import com.kingsrook.qqq.backend.core.model.actions.DeleteResult; +import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteRequest; +import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteResult; import com.kingsrook.qqq.backend.core.utils.TestUtils; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/kingsrook/qqq/backend/core/actions/InsertActionTest.java b/src/test/java/com/kingsrook/qqq/backend/core/actions/InsertActionTest.java index 96c0023d..af5b756d 100644 --- a/src/test/java/com/kingsrook/qqq/backend/core/actions/InsertActionTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/core/actions/InsertActionTest.java @@ -8,8 +8,8 @@ package com.kingsrook.qqq.backend.core.actions; import java.util.ArrayList; import java.util.List; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.InsertRequest; -import com.kingsrook.qqq.backend.core.model.actions.InsertResult; +import com.kingsrook.qqq.backend.core.model.actions.insert.InsertRequest; +import com.kingsrook.qqq.backend.core.model.actions.insert.InsertResult; import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.utils.TestUtils; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/kingsrook/qqq/backend/core/actions/MetaDataActionTest.java b/src/test/java/com/kingsrook/qqq/backend/core/actions/MetaDataActionTest.java index c95ecbee..a092f058 100644 --- a/src/test/java/com/kingsrook/qqq/backend/core/actions/MetaDataActionTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/core/actions/MetaDataActionTest.java @@ -6,8 +6,8 @@ package com.kingsrook.qqq.backend.core.actions; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.MetaDataRequest; -import com.kingsrook.qqq.backend.core.model.actions.MetaDataResult; +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.utils.TestUtils; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/kingsrook/qqq/backend/core/actions/QueryActionTest.java b/src/test/java/com/kingsrook/qqq/backend/core/actions/QueryActionTest.java index f57d14f1..6e603ebd 100644 --- a/src/test/java/com/kingsrook/qqq/backend/core/actions/QueryActionTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/core/actions/QueryActionTest.java @@ -6,8 +6,8 @@ package com.kingsrook.qqq.backend.core.actions; import com.kingsrook.qqq.backend.core.exceptions.QException; -import com.kingsrook.qqq.backend.core.model.actions.QueryRequest; -import com.kingsrook.qqq.backend.core.model.actions.QueryResult; +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.utils.TestUtils; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/com/kingsrook/qqq/backend/core/actions/TableMetaDataActionTest.java b/src/test/java/com/kingsrook/qqq/backend/core/actions/TableMetaDataActionTest.java index 04db6ec9..90d3be01 100644 --- a/src/test/java/com/kingsrook/qqq/backend/core/actions/TableMetaDataActionTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/core/actions/TableMetaDataActionTest.java @@ -7,8 +7,8 @@ package com.kingsrook.qqq.backend.core.actions; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException; -import com.kingsrook.qqq.backend.core.model.actions.TableMetaDataRequest; -import com.kingsrook.qqq.backend.core.model.actions.TableMetaDataResult; +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.utils.TestUtils; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/kingsrook/qqq/backend/core/adapters/CsvToQRecordAdapterTest.java b/src/test/java/com/kingsrook/qqq/backend/core/adapters/CsvToQRecordAdapterTest.java index e1d3f795..527e495b 100644 --- a/src/test/java/com/kingsrook/qqq/backend/core/adapters/CsvToQRecordAdapterTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/core/adapters/CsvToQRecordAdapterTest.java @@ -6,8 +6,8 @@ package com.kingsrook.qqq.backend.core.adapters; import java.util.List; -import com.kingsrook.qqq.backend.core.model.actions.QIndexBasedFieldMapping; -import com.kingsrook.qqq.backend.core.model.actions.QKeyBasedFieldMapping; +import com.kingsrook.qqq.backend.core.model.actions.shared.mapping.QIndexBasedFieldMapping; +import com.kingsrook.qqq.backend.core.model.actions.shared.mapping.QKeyBasedFieldMapping; import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.utils.TestUtils; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/kingsrook/qqq/backend/core/adapters/JsonToQFieldMappingAdapterTest.java b/src/test/java/com/kingsrook/qqq/backend/core/adapters/JsonToQFieldMappingAdapterTest.java index 58cf0d72..a5c2a60c 100644 --- a/src/test/java/com/kingsrook/qqq/backend/core/adapters/JsonToQFieldMappingAdapterTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/core/adapters/JsonToQFieldMappingAdapterTest.java @@ -5,9 +5,9 @@ package com.kingsrook.qqq.backend.core.adapters; -import com.kingsrook.qqq.backend.core.model.actions.AbstractQFieldMapping; -import com.kingsrook.qqq.backend.core.model.actions.QIndexBasedFieldMapping; -import com.kingsrook.qqq.backend.core.model.actions.QKeyBasedFieldMapping; +import com.kingsrook.qqq.backend.core.model.actions.shared.mapping.AbstractQFieldMapping; +import com.kingsrook.qqq.backend.core.model.actions.shared.mapping.QIndexBasedFieldMapping; +import com.kingsrook.qqq.backend.core.model.actions.shared.mapping.QKeyBasedFieldMapping; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/com/kingsrook/qqq/backend/core/utils/JsonUtilsTest.java b/src/test/java/com/kingsrook/qqq/backend/core/utils/JsonUtilsTest.java index 015b85ac..3929bf57 100644 --- a/src/test/java/com/kingsrook/qqq/backend/core/utils/JsonUtilsTest.java +++ b/src/test/java/com/kingsrook/qqq/backend/core/utils/JsonUtilsTest.java @@ -11,10 +11,10 @@ import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.kingsrook.qqq.backend.core.model.actions.QCriteriaOperator; -import com.kingsrook.qqq.backend.core.model.actions.QFilterCriteria; -import com.kingsrook.qqq.backend.core.model.actions.QFilterOrderBy; -import com.kingsrook.qqq.backend.core.model.actions.QQueryFilter; +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.QFilterOrderBy; +import com.kingsrook.qqq.backend.core.model.actions.query.QQueryFilter; import com.kingsrook.qqq.backend.core.model.data.QRecord; import org.json.JSONArray; import org.json.JSONException; diff --git a/src/test/java/com/kingsrook/qqq/backend/core/utils/TestUtils.java b/src/test/java/com/kingsrook/qqq/backend/core/utils/TestUtils.java index 1eeb8e00..f447c8f4 100644 --- a/src/test/java/com/kingsrook/qqq/backend/core/utils/TestUtils.java +++ b/src/test/java/com/kingsrook/qqq/backend/core/utils/TestUtils.java @@ -5,11 +5,22 @@ package com.kingsrook.qqq.backend.core.utils; -import com.kingsrook.qqq.backend.core.model.metadata.QInstance; +import java.util.List; 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.QCodeType; +import com.kingsrook.qqq.backend.core.model.metadata.QCodeUsage; 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.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.QOutputView; +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.QRecordListView; /******************************************************************************* @@ -27,6 +38,7 @@ public class TestUtils QInstance qInstance = new QInstance(); qInstance.addBackend(defineBackend()); qInstance.addTable(defineTablePerson()); + qInstance.addProcess(defineProcessGreetPeople()); return (qInstance); } @@ -63,4 +75,38 @@ public class TestUtils .withField(new QFieldMetaData("email", QFieldType.STRING)); } + + + /******************************************************************************* + ** Define the 'greet people' process + *******************************************************************************/ + private static QProcessMetaData defineProcessGreetPeople() + { + return new QProcessMetaData() + .withName("greet") + .withTableName("person") + .addFunction(new QFunctionMetaData() + .withName("prepare") + .withCode(new QCodeReference() + .withName("com.kingsrook.qqq.backend.core.interfaces.mock.MockFunctionBody") + .withCodeType(QCodeType.JAVA) + .withCodeUsage(QCodeUsage.FUNCTION)) // todo - needed, or implied in this context? + .withInputData(new QFunctionInputMetaData() + .withRecordListMetaData(new QRecordListMetaData().withTableName("person")) + .withFieldList(List.of( + new QFieldMetaData("greetingPrefix", QFieldType.STRING), + new QFieldMetaData("greetingSuffix", QFieldType.STRING) + ))) + .withOutputMetaData(new QFunctionOutputMetaData() + .withRecordListMetaData(new QRecordListMetaData() + .withTableName("person") + .addField(new QFieldMetaData("fullGreeting", QFieldType.STRING)) + ) + .withFieldList(List.of(new QFieldMetaData("outputMessage", QFieldType.STRING)))) + .withOutputView(new QOutputView() + .withMessageField("outputMessage") + .withRecordListView(new QRecordListView().withFieldNames(List.of("id", "firstName", "lastName", "fullGreeting")))) + ); + } + }