QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-19 05:30:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change post-query customizer to be class (that can do list), not function

Browse Source
This commit is contained in:
darin.kelkhoff
2022-12-09 11:52:04 -06:00
parent 14c7fbe370
commit 48cfdeffa1
9 changed files with 136 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QInstanceValidatorTest.java
View File

@ -27,7 +27,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Function;
import com.kingsrook.qqq.backend.core.actions.customizers.AbstractPostQueryCustomizer;
import com.kingsrook.qqq.backend.core.actions.customizers.TableCustomizers;
import com.kingsrook.qqq.backend.core.actions.processes.BackendStep;
import com.kingsrook.qqq.backend.core.exceptions.QException;
@ -387,17 +387,17 @@ class QInstanceValidatorTest
assertValidationFailureReasons((qInstance) -> qInstance.getTable("person").withCustomizer(TableCustomizers.POST_QUERY_RECORD.getRole(), new QCodeReference(CustomizerWithNoVoidConstructor.class, QCodeUsage.CUSTOMIZER)),
"Instance of " + CustomizerWithNoVoidConstructor.class.getSimpleName() + " could not be created");
assertValidationFailureReasons((qInstance) -> qInstance.getTable("person").withCustomizer(TableCustomizers.POST_QUERY_RECORD.getRole(), new QCodeReference(CustomizerThatIsNotAFunction.class, QCodeUsage.CUSTOMIZER)),
assertValidationFailureReasons((qInstance) -> qInstance.getTable("person").withCustomizer(TableCustomizers.POST_QUERY_RECORD.getRole(), new QCodeReference(CustomizerThatIsNotOfTheRightBaseClass.class, QCodeUsage.CUSTOMIZER)),
"CodeReference is not of the expected type");
assertValidationFailureReasons((qInstance) -> qInstance.getTable("person").withCustomizer(TableCustomizers.POST_QUERY_RECORD.getRole(), new QCodeReference(CustomizerFunctionWithIncorrectTypeParameters.class, QCodeUsage.CUSTOMIZER)),
"Error validating customizer type parameters");
assertValidationFailureReasons((qInstance) -> qInstance.getTable("person").withCustomizer(TableCustomizers.POST_QUERY_RECORD.getRole(), new QCodeReference(CustomizerWithOnlyPrivateConstructor.class, QCodeUsage.CUSTOMIZER)),
"it does not have a public parameterless constructor");
assertValidationFailureReasons((qInstance) -> qInstance.getTable("person").withCustomizer(TableCustomizers.POST_QUERY_RECORD.getRole(), new QCodeReference(CustomizerFunctionWithIncorrectTypeParameter1.class, QCodeUsage.CUSTOMIZER)),
"Error validating customizer type parameters");
assertValidationFailureReasons((qInstance) -> qInstance.getTable("person").withCustomizer(TableCustomizers.POST_QUERY_RECORD.getRole(), new QCodeReference(CustomizerFunctionWithIncorrectTypeParameter2.class, QCodeUsage.CUSTOMIZER)),
"Error validating customizer type parameters");
/////////////////////////////////////////////
// this class actually works, so, :shrug:? //
/////////////////////////////////////////////
// assertValidationFailureReasons((qInstance) -> qInstance.getTable("person").withCustomizer(TableCustomizers.POST_QUERY_RECORD.getRole(), new QCodeReference(CustomizerWithPrivateVisibility.class, QCodeUsage.CUSTOMIZER)),
// "it does not have a public parameterless constructor");
assertValidationSuccess((qInstance) -> qInstance.getTable("person").withCustomizer(TableCustomizers.POST_QUERY_RECORD.getRole(), new QCodeReference(CustomizerValid.class, QCodeUsage.CUSTOMIZER)));
}
@ -417,6 +417,30 @@ class QInstanceValidatorTest
/*******************************************************************************
**
*******************************************************************************/
private static class CustomizerWithPrivateVisibility extends AbstractPostQueryCustomizer
{
public CustomizerWithPrivateVisibility()
{
System.out.println("eh?");
}
/*******************************************************************************
**
*******************************************************************************/
@Override
public List<QRecord> apply(List<QRecord> records)
{
return (records);
}
}
/*******************************************************************************
**
*******************************************************************************/
@ -433,7 +457,7 @@ class QInstanceValidatorTest
/*******************************************************************************
**
*******************************************************************************/
public static class CustomizerThatIsNotAFunction
public static class CustomizerThatIsNotOfTheRightBaseClass
{
}
@ -442,54 +466,12 @@ class QInstanceValidatorTest
/*******************************************************************************
**
*******************************************************************************/
public static class CustomizerFunctionWithIncorrectTypeParameters implements Function<String, String>
public static class CustomizerValid extends AbstractPostQueryCustomizer
{
@Override
public String apply(String s)
public List<QRecord> apply(List<QRecord> records)
{
return null;
}
}
/*******************************************************************************
**
*******************************************************************************/
public static class CustomizerFunctionWithIncorrectTypeParameter1 implements Function<String, QRecord>
{
@Override
public QRecord apply(String s)
{
return null;
}
}
/*******************************************************************************
**
*******************************************************************************/
public static class CustomizerFunctionWithIncorrectTypeParameter2 implements Function<QRecord, String>
{
@Override
public String apply(QRecord s)
{
return "Test";
}
}
/*******************************************************************************
**
*******************************************************************************/
public static class CustomizerValid implements Function<QRecord, QRecord>
{
@Override
public QRecord apply(QRecord record)
{
return null;
return (records);
}
}

28
qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/modules/backend/implementations/memory/MemoryBackendModuleTest.java
View File

@ -25,7 +25,7 @@ package com.kingsrook.qqq.backend.core.modules.backend.implementations.memory;
import java.time.LocalDate;
import java.time.Month;
import java.util.List;
import java.util.function.Function;
import com.kingsrook.qqq.backend.core.actions.customizers.AbstractPostQueryCustomizer;
import com.kingsrook.qqq.backend.core.actions.customizers.TableCustomizers;
import com.kingsrook.qqq.backend.core.actions.tables.CountAction;
import com.kingsrook.qqq.backend.core.actions.tables.DeleteAction;
@ -472,13 +472,15 @@ class MemoryBackendModuleTest
///////////////////////////////////////////////////////
// do a query - assert that the customizer did stuff //
///////////////////////////////////////////////////////
ShapeTestCustomizer.executionCount = 0;
ShapeTestCustomizer.invocationCount = 0;
ShapeTestCustomizer.recordsCustomizedCount = 0;
QueryInput queryInput = new QueryInput(qInstance);
queryInput.setSession(session);
queryInput.setTableName(table.getName());
QueryOutput queryOutput = new QueryAction().execute(queryInput);
assertEquals(3, queryOutput.getRecords().size());
assertEquals(3, ShapeTestCustomizer.executionCount);
assertEquals(1, ShapeTestCustomizer.invocationCount);
assertEquals(3, ShapeTestCustomizer.recordsCustomizedCount);
assertTrue(queryOutput.getRecords().stream().anyMatch(r -> r.getValueInteger("id").equals(1) && r.getValueInteger("tenTimesId").equals(10)));
assertTrue(queryOutput.getRecords().stream().anyMatch(r -> r.getValueInteger("id").equals(2) && r.getValueInteger("tenTimesId").equals(20)));
assertTrue(queryOutput.getRecords().stream().anyMatch(r -> r.getValueInteger("id").equals(3) && r.getValueInteger("tenTimesId").equals(30)));
@ -489,18 +491,26 @@ class MemoryBackendModuleTest
/*******************************************************************************
**
*******************************************************************************/
public static class ShapeTestCustomizer implements Function<QRecord, QRecord>
public static class ShapeTestCustomizer extends AbstractPostQueryCustomizer
{
static int executionCount = 0;
static int invocationCount = 0;
static int recordsCustomizedCount = 0;
/*******************************************************************************
**
*******************************************************************************/
@Override
public QRecord apply(QRecord record)
public List<QRecord> apply(List<QRecord> records)
{
executionCount++;
record.setValue("tenTimesId", record.getValueInteger("id") * 10);
return (record);
invocationCount++;
for(QRecord record : records)
{
recordsCustomizedCount++;
record.setValue("tenTimesId", record.getValueInteger("id") * 10);
}
return (records);
}
}
}