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

Merge branch 'feature/sprint-8-qqq-support-updates' into feature/sprint-8

Browse Source
This commit is contained in:
darin.kelkhoff
2022-08-05 08:10:09 -05:00
parent 36d1a75ce6 68af236738
commit ee0c03677b
4 changed files with 91 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/data/QRecordEntityField.java
View File

@ -27,6 +27,7 @@ import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalTime;
import com.kingsrook.qqq.backend.core.exceptions.QValueException;
import com.kingsrook.qqq.backend.core.utils.ValueUtils;
@ -159,6 +160,11 @@ public class QRecordEntityField
{
return (ValueUtils.getValueAsInstant(value));
}
if(type.equals(LocalTime.class))
{
return (ValueUtils.getValueAsLocalTime(value));
}
}
catch(Exception e)
{

17
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/basic/BasicETLLoadFunction.java
View File

@ -46,6 +46,7 @@ public class BasicETLLoadFunction implements BackendStep
private static final Logger LOG = LogManager.getLogger(BasicETLLoadFunction.class);
private QBackendTransaction transaction;
private boolean returnStoredRecords = false;
@ -93,7 +94,11 @@ public class BasicETLLoadFunction implements BackendStep
InsertAction insertAction = new InsertAction();
InsertOutput insertOutput = insertAction.execute(insertInput);
// todo - this is to avoid garbage leak in state provider... outputRecords.addAll(insertOutput.getRecords());
if(returnStoredRecords)
{
outputRecords.addAll(insertOutput.getRecords());
}
recordsInserted += insertOutput.getRecords().size();
}
@ -112,4 +117,14 @@ public class BasicETLLoadFunction implements BackendStep
this.transaction = transaction;
}
/*******************************************************************************
** Setter for returnStoredRecords
**
*******************************************************************************/
public void setReturnStoredRecords(boolean returnStoredRecords)
{
this.returnStoredRecords = returnStoredRecords;
}
}

43
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/ValueUtils.java
View File

@ -22,10 +22,12 @@
package com.kingsrook.qqq.backend.core.utils;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
@ -415,4 +417,45 @@ public class ValueUtils
throw (new QValueException("Value [" + value + "] could not be converted to a Instant.", e));
}
}
/*******************************************************************************
**
*******************************************************************************/
public static Object getValueAsLocalTime(Serializable value)
{
try
{
if(value == null)
{
return (null);
}
else if(value instanceof LocalTime lt)
{
return (lt);
}
else if(value instanceof String s)
{
if(!StringUtils.hasContent(s))
{
return (null);
}
return LocalTime.parse(s);
}
else
{
throw (new QValueException("Unsupported class " + value.getClass().getName() + " for converting to LocalTime."));
}
}
catch(QValueException qve)
{
throw (qve);
}
catch(Exception e)
{
throw (new QValueException("Value [" + value + "] could not be converted to a LocalTime.", e));
}
}
}

28
qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/ValueUtilsTest.java
View File

@ -27,14 +27,18 @@ import java.math.MathContext;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.Month;
import java.time.ZoneOffset;
import java.util.Calendar;
import java.util.GregorianCalendar;
import com.kingsrook.qqq.backend.core.exceptions.QValueException;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
/*******************************************************************************
@ -226,4 +230,24 @@ class ValueUtilsTest
}
/*******************************************************************************
**
*******************************************************************************/
@Test
void testGetValueAsLocalTime() throws QValueException
{
assertNull(ValueUtils.getValueAsInstant(null));
assertNull(ValueUtils.getValueAsInstant(""));
assertNull(ValueUtils.getValueAsInstant(" "));
assertEquals(LocalTime.of(10, 42), ValueUtils.getValueAsLocalTime(LocalTime.of(10, 42)));
assertEquals(LocalTime.of(10, 42, 59), ValueUtils.getValueAsLocalTime(LocalTime.of(10, 42, 59)));
assertEquals(LocalTime.of(10, 42), ValueUtils.getValueAsLocalTime("10:42"));
assertEquals(LocalTime.of(10, 42, 59), ValueUtils.getValueAsLocalTime("10:42:59"));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsInstant("a"));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsInstant("a,b"));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsInstant("1980/05/31"));
assertThat(assertThrows(QValueException.class, () -> ValueUtils.getValueAsInstant(new Object())).getMessage()).contains("Unsupported class");
}
}