mirror of
https://github.com/Kingsrook/qqq.git
synced 2025-07-17 20:50:44 +00:00
Remove withBackendType(String), to encourage usage instead of with/set method that takes the module class, so the module will be init'ed and registered
This commit is contained in:
@ -155,18 +155,6 @@ public class QBackendMetaData implements TopLevelMetaDataInterface
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*******************************************************************************
|
|
||||||
** Fluent setter, returning generically, to help sub-class fluent flows
|
|
||||||
*******************************************************************************/
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
public <T extends QBackendMetaData> T withBackendType(String backendType)
|
|
||||||
{
|
|
||||||
this.backendType = backendType;
|
|
||||||
return (T) this;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
**
|
**
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
|
@ -89,7 +89,7 @@ class EnumerationCountActionTest extends BaseTest
|
|||||||
QInstance instance = QContext.getQInstance();
|
QInstance instance = QContext.getQInstance();
|
||||||
instance.addBackend(new QBackendMetaData()
|
instance.addBackend(new QBackendMetaData()
|
||||||
.withName("enum")
|
.withName("enum")
|
||||||
.withBackendType("enum")
|
.withBackendType(EnumerationBackendModule.class)
|
||||||
);
|
);
|
||||||
|
|
||||||
instance.addTable(new QTableMetaData()
|
instance.addTable(new QTableMetaData()
|
||||||
|
@ -167,7 +167,7 @@ class EnumerationQueryActionTest extends BaseTest
|
|||||||
QInstance instance = QContext.getQInstance();
|
QInstance instance = QContext.getQInstance();
|
||||||
instance.addBackend(new QBackendMetaData()
|
instance.addBackend(new QBackendMetaData()
|
||||||
.withName("enum")
|
.withName("enum")
|
||||||
.withBackendType("enum")
|
.withBackendType(EnumerationBackendModule.class)
|
||||||
);
|
);
|
||||||
|
|
||||||
instance.addTable(new QTableMetaData()
|
instance.addTable(new QTableMetaData()
|
||||||
|
@ -31,6 +31,7 @@ import com.kingsrook.qqq.backend.core.actions.interfaces.UpdateInterface;
|
|||||||
import com.kingsrook.qqq.backend.core.logging.QLogger;
|
import com.kingsrook.qqq.backend.core.logging.QLogger;
|
||||||
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.tables.QTableBackendDetails;
|
import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableBackendDetails;
|
||||||
|
import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleDispatcher;
|
||||||
import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleInterface;
|
import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleInterface;
|
||||||
import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemBackendModuleInterface;
|
import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemBackendModuleInterface;
|
||||||
import com.kingsrook.qqq.backend.module.filesystem.base.actions.AbstractBaseFilesystemAction;
|
import com.kingsrook.qqq.backend.module.filesystem.base.actions.AbstractBaseFilesystemAction;
|
||||||
@ -53,6 +54,10 @@ public class FilesystemBackendModule implements QBackendModuleInterface, Filesys
|
|||||||
|
|
||||||
public static final String BACKEND_TYPE = "filesystem";
|
public static final String BACKEND_TYPE = "filesystem";
|
||||||
|
|
||||||
|
static
|
||||||
|
{
|
||||||
|
QBackendModuleDispatcher.registerBackendModule(new FilesystemBackendModule());
|
||||||
|
}
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
** For filesystem backends, get the module-specific action base-class, that helps
|
** For filesystem backends, get the module-specific action base-class, that helps
|
||||||
|
@ -50,19 +50,6 @@ public class S3BackendMetaData extends AbstractFilesystemBackendMetaData
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*******************************************************************************
|
|
||||||
** Fluent setter for backendType
|
|
||||||
**
|
|
||||||
*******************************************************************************/
|
|
||||||
@Override
|
|
||||||
public S3BackendMetaData withBackendType(String backendType)
|
|
||||||
{
|
|
||||||
setBackendType(backendType);
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
** Getter for bucketName
|
** Getter for bucketName
|
||||||
**
|
**
|
||||||
|
@ -40,6 +40,7 @@ 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.authentication.implementations.MockAuthenticationModule;
|
import com.kingsrook.qqq.backend.core.modules.authentication.implementations.MockAuthenticationModule;
|
||||||
import com.kingsrook.qqq.backend.core.modules.backend.implementations.memory.MemoryBackendModule;
|
import com.kingsrook.qqq.backend.core.modules.backend.implementations.memory.MemoryBackendModule;
|
||||||
|
import com.kingsrook.qqq.backend.core.modules.backend.implementations.mock.MockBackendModule;
|
||||||
import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamed.StreamedETLProcess;
|
import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamed.StreamedETLProcess;
|
||||||
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;
|
||||||
@ -63,16 +64,16 @@ public class TestUtils
|
|||||||
public static final String BACKEND_NAME_S3 = "s3";
|
public static final String BACKEND_NAME_S3 = "s3";
|
||||||
public static final String BACKEND_NAME_S3_SANS_PREFIX = "s3sansPrefix";
|
public static final String BACKEND_NAME_S3_SANS_PREFIX = "s3sansPrefix";
|
||||||
public static final String BACKEND_NAME_MOCK = "mock";
|
public static final String BACKEND_NAME_MOCK = "mock";
|
||||||
public static final String BACKEND_NAME_MEMORY = "memory";
|
public static final String BACKEND_NAME_MEMORY = "memory";
|
||||||
|
|
||||||
public static final String TABLE_NAME_PERSON_LOCAL_FS_JSON = "person-local-json";
|
public static final String TABLE_NAME_PERSON_LOCAL_FS_JSON = "person-local-json";
|
||||||
public static final String TABLE_NAME_PERSON_LOCAL_FS_CSV = "person-local-csv";
|
public static final String TABLE_NAME_PERSON_LOCAL_FS_CSV = "person-local-csv";
|
||||||
public static final String TABLE_NAME_BLOB_LOCAL_FS = "local-blob";
|
public static final String TABLE_NAME_BLOB_LOCAL_FS = "local-blob";
|
||||||
public static final String TABLE_NAME_ARCHIVE_LOCAL_FS = "local-archive";
|
public static final String TABLE_NAME_ARCHIVE_LOCAL_FS = "local-archive";
|
||||||
public static final String TABLE_NAME_PERSON_S3 = "person-s3";
|
public static final String TABLE_NAME_PERSON_S3 = "person-s3";
|
||||||
public static final String TABLE_NAME_BLOB_S3 = "s3-blob";
|
public static final String TABLE_NAME_BLOB_S3 = "s3-blob";
|
||||||
public static final String TABLE_NAME_PERSON_MOCK = "person-mock";
|
public static final String TABLE_NAME_PERSON_MOCK = "person-mock";
|
||||||
public static final String TABLE_NAME_BLOB_S3_SANS_PREFIX = "s3-blob-sans-prefix";
|
public static final String TABLE_NAME_BLOB_S3_SANS_PREFIX = "s3-blob-sans-prefix";
|
||||||
|
|
||||||
public static final String PROCESS_NAME_STREAMED_ETL = "etl.streamed";
|
public static final String PROCESS_NAME_STREAMED_ETL = "etl.streamed";
|
||||||
public static final String LOCAL_PERSON_CSV_FILE_IMPORTER_PROCESS_NAME = "localPersonCsvFileImporter";
|
public static final String LOCAL_PERSON_CSV_FILE_IMPORTER_PROCESS_NAME = "localPersonCsvFileImporter";
|
||||||
@ -403,7 +404,7 @@ public class TestUtils
|
|||||||
public static QBackendMetaData defineMockBackend()
|
public static QBackendMetaData defineMockBackend()
|
||||||
{
|
{
|
||||||
return (new QBackendMetaData()
|
return (new QBackendMetaData()
|
||||||
.withBackendType("mock")
|
.withBackendType(MockBackendModule.class)
|
||||||
.withName(BACKEND_NAME_MOCK));
|
.withName(BACKEND_NAME_MOCK));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -29,6 +29,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.authentication.QAuthenticat
|
|||||||
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
|
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
|
||||||
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType;
|
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType;
|
||||||
import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
|
import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
|
||||||
|
import com.kingsrook.qqq.backend.core.modules.backend.implementations.memory.MemoryBackendModule;
|
||||||
|
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
@ -74,7 +75,7 @@ public class TestUtils
|
|||||||
{
|
{
|
||||||
return (new QBackendMetaData()
|
return (new QBackendMetaData()
|
||||||
.withName(DEFAULT_BACKEND_NAME)
|
.withName(DEFAULT_BACKEND_NAME)
|
||||||
.withBackendType("memory"));
|
.withBackendType(MemoryBackendModule.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -39,6 +39,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
|
|||||||
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
|
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
|
||||||
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType;
|
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType;
|
||||||
import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
|
import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
|
||||||
|
import com.kingsrook.qqq.backend.core.modules.backend.implementations.mock.MockBackendModule;
|
||||||
import com.kingsrook.qqq.backend.core.utils.JsonUtils;
|
import com.kingsrook.qqq.backend.core.utils.JsonUtils;
|
||||||
import com.kingsrook.qqq.backend.core.utils.SleepUtils;
|
import com.kingsrook.qqq.backend.core.utils.SleepUtils;
|
||||||
import kong.unirest.HttpResponse;
|
import kong.unirest.HttpResponse;
|
||||||
@ -964,7 +965,7 @@ class QJavalinImplementationTest extends QJavalinTestBase
|
|||||||
Function<String, QInstance> makeNewInstanceWithBackendName = (backendName) ->
|
Function<String, QInstance> makeNewInstanceWithBackendName = (backendName) ->
|
||||||
{
|
{
|
||||||
QInstance newInstance = new QInstance();
|
QInstance newInstance = new QInstance();
|
||||||
newInstance.addBackend(new QBackendMetaData().withName(backendName).withBackendType("mock"));
|
newInstance.addBackend(new QBackendMetaData().withName(backendName).withBackendType(MockBackendModule.class));
|
||||||
|
|
||||||
if(!"invalid".equals(backendName))
|
if(!"invalid".equals(backendName))
|
||||||
{
|
{
|
||||||
|
@ -74,6 +74,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
|
|||||||
import com.kingsrook.qqq.backend.core.model.savedviews.SavedViewsMetaDataProvider;
|
import com.kingsrook.qqq.backend.core.model.savedviews.SavedViewsMetaDataProvider;
|
||||||
import com.kingsrook.qqq.backend.core.model.scripts.ScriptsMetaDataProvider;
|
import com.kingsrook.qqq.backend.core.model.scripts.ScriptsMetaDataProvider;
|
||||||
import com.kingsrook.qqq.backend.core.model.statusmessages.QWarningMessage;
|
import com.kingsrook.qqq.backend.core.model.statusmessages.QWarningMessage;
|
||||||
|
import com.kingsrook.qqq.backend.core.modules.backend.implementations.memory.MemoryBackendModule;
|
||||||
import com.kingsrook.qqq.backend.core.processes.implementations.mock.MockBackendStep;
|
import com.kingsrook.qqq.backend.core.processes.implementations.mock.MockBackendStep;
|
||||||
import com.kingsrook.qqq.backend.module.rdbms.jdbc.ConnectionManager;
|
import com.kingsrook.qqq.backend.module.rdbms.jdbc.ConnectionManager;
|
||||||
import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager;
|
import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager;
|
||||||
@ -226,7 +227,7 @@ public class TestUtils
|
|||||||
public static QBackendMetaData defineMemoryBackend()
|
public static QBackendMetaData defineMemoryBackend()
|
||||||
{
|
{
|
||||||
return new QBackendMetaData()
|
return new QBackendMetaData()
|
||||||
.withBackendType("memory")
|
.withBackendType(MemoryBackendModule.class)
|
||||||
.withName(BACKEND_NAME_MEMORY);
|
.withName(BACKEND_NAME_MEMORY);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -274,6 +275,7 @@ public class TestUtils
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
**
|
**
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
|
Reference in New Issue
Block a user