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

Replace deprecated backend.setVariantOptions properties with VariantsConfig

Browse Source
This commit is contained in:
darin.kelkhoff
2025-07-15 08:29:10 -05:00
parent f7ca485e6e
commit dd67ed317c
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtilTest.java
View File

@ -59,6 +59,7 @@ 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.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
import com.kingsrook.qqq.backend.core.model.metadata.tables.UniqueKey; import com.kingsrook.qqq.backend.core.model.metadata.tables.UniqueKey;
import com.kingsrook.qqq.backend.core.model.metadata.variants.BackendVariantsConfig;
import com.kingsrook.qqq.backend.core.utils.CollectionUtils; import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
import com.kingsrook.qqq.backend.core.utils.SleepUtils; import com.kingsrook.qqq.backend.core.utils.SleepUtils;
import com.kingsrook.qqq.backend.core.utils.lambdas.UnsafeConsumer; import com.kingsrook.qqq.backend.core.utils.lambdas.UnsafeConsumer;
@ -71,6 +72,7 @@ import com.kingsrook.qqq.backend.module.api.model.AuthorizationType;
import com.kingsrook.qqq.backend.module.api.model.OutboundAPILog; import com.kingsrook.qqq.backend.module.api.model.OutboundAPILog;
import com.kingsrook.qqq.backend.module.api.model.OutboundAPILogMetaDataProvider; import com.kingsrook.qqq.backend.module.api.model.OutboundAPILogMetaDataProvider;
import com.kingsrook.qqq.backend.module.api.model.metadata.APIBackendMetaData; import com.kingsrook.qqq.backend.module.api.model.metadata.APIBackendMetaData;
import com.kingsrook.qqq.backend.module.api.model.metadata.APIBackendVariantSetting;
import org.apache.http.Header; import org.apache.http.Header;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
@ -684,10 +686,11 @@ class BaseAPIActionUtilTest extends BaseTest
APIBackendMetaData backend = (APIBackendMetaData) QContext.getQInstance().getBackend(TestUtils.MOCK_BACKEND_NAME); APIBackendMetaData backend = (APIBackendMetaData) QContext.getQInstance().getBackend(TestUtils.MOCK_BACKEND_NAME);
backend.setAuthorizationType(AuthorizationType.API_KEY_HEADER); backend.setAuthorizationType(AuthorizationType.API_KEY_HEADER);
backend.setUsesVariants(true); backend.setUsesVariants(true);
backend.setVariantOptionsTableName("variant"); backend.setBackendVariantsConfig(new BackendVariantsConfig()
backend.setVariantOptionsTableIdField("id"); .withOptionsTableName("variant")
backend.setVariantOptionsTableApiKeyField("apiKey"); .withVariantTypeKey("API_KEY_TYPE")
backend.setVariantOptionsTableTypeValue("API_KEY_TYPE"); .withBackendSettingSourceFieldName(APIBackendVariantSetting.API_KEY, "apiKey")
);
InsertInput insertInput = new InsertInput(); InsertInput insertInput = new InsertInput();
insertInput.setTableName("variant"); insertInput.setTableName("variant");
@ -716,11 +719,12 @@ class BaseAPIActionUtilTest extends BaseTest
APIBackendMetaData backend = (APIBackendMetaData) QContext.getQInstance().getBackend(TestUtils.MOCK_BACKEND_NAME); APIBackendMetaData backend = (APIBackendMetaData) QContext.getQInstance().getBackend(TestUtils.MOCK_BACKEND_NAME);
backend.setAuthorizationType(AuthorizationType.BASIC_AUTH_USERNAME_PASSWORD); backend.setAuthorizationType(AuthorizationType.BASIC_AUTH_USERNAME_PASSWORD);
backend.setUsesVariants(true); backend.setUsesVariants(true);
backend.setVariantOptionsTableName("variant"); backend.setBackendVariantsConfig(new BackendVariantsConfig()
backend.setVariantOptionsTableIdField("id"); .withOptionsTableName("variant")
backend.setVariantOptionsTableUsernameField("username"); .withVariantTypeKey("USER_PASS")
backend.setVariantOptionsTablePasswordField("password"); .withBackendSettingSourceFieldName(APIBackendVariantSetting.USERNAME, "username")
backend.setVariantOptionsTableTypeValue("USER_PASS"); .withBackendSettingSourceFieldName(APIBackendVariantSetting.PASSWORD, "password")
);
InsertInput insertInput = new InsertInput(); InsertInput insertInput = new InsertInput();
insertInput.setTableName("variant"); insertInput.setTableName("variant");
@ -736,7 +740,7 @@ class BaseAPIActionUtilTest extends BaseTest
util.setBackendMetaData(backend); util.setBackendMetaData(backend);
util.setupAuthorizationInRequest(httpGet); util.setupAuthorizationInRequest(httpGet);
Header authHeader = httpGet.getFirstHeader("Authorization"); Header authHeader = httpGet.getFirstHeader("Authorization");
assertTrue(authHeader.getValue().equals(util.getBasicAuthenticationHeader("user", "pass"))); assertEquals(authHeader.getValue(), util.getBasicAuthenticationHeader("user", "pass"));
} }