diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/queues/QQueueMetaData.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/queues/QQueueMetaData.java index e0822b0d..07e6bf6e 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/queues/QQueueMetaData.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/queues/QQueueMetaData.java @@ -22,6 +22,8 @@ package com.kingsrook.qqq.backend.core.model.metadata.queues; +import com.kingsrook.qqq.backend.core.model.metadata.QInstance; +import com.kingsrook.qqq.backend.core.model.metadata.TopLevelMetaDataInterface; import com.kingsrook.qqq.backend.core.model.metadata.scheduleing.QScheduleMetaData; @@ -34,7 +36,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.scheduleing.QScheduleMetaDa ** The processName is the code that runs for messages found on the queue. ** The schedule may not be used by all provider types, but defines when the queue is polled. *******************************************************************************/ -public class QQueueMetaData +public class QQueueMetaData implements TopLevelMetaDataInterface { private String name; private String providerName; @@ -213,4 +215,15 @@ public class QQueueMetaData return (this); } + + + /******************************************************************************* + ** + *******************************************************************************/ + @Override + public void addSelfToInstance(QInstance qInstance) + { + qInstance.addQueue(this); + } + } diff --git a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java index 3856bd6b..4f7ec617 100644 --- a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java +++ b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java @@ -681,23 +681,13 @@ public class BaseAPIActionUtil /////////////////////////////////////////////////////////////////////////////////////////// switch(backendMetaData.getAuthorizationType()) { - case BASIC_AUTH_API_KEY: - request.addHeader("Authorization", getBasicAuthenticationHeader(backendMetaData.getApiKey())); - break; - - case BASIC_AUTH_USERNAME_PASSWORD: - request.addHeader("Authorization", getBasicAuthenticationHeader(backendMetaData.getUsername(), backendMetaData.getPassword())); - break; - - case API_KEY_HEADER: - request.addHeader("API-Key", backendMetaData.getApiKey()); - break; - - case OAUTH2: - request.setHeader("Authorization", "Bearer " + getOAuth2Token()); - break; - - case API_KEY_QUERY_PARAM: + case BASIC_AUTH_API_KEY -> request.addHeader("Authorization", getBasicAuthenticationHeader(backendMetaData.getApiKey())); + case BASIC_AUTH_USERNAME_PASSWORD -> request.addHeader("Authorization", getBasicAuthenticationHeader(backendMetaData.getUsername(), backendMetaData.getPassword())); + case API_KEY_HEADER -> request.addHeader("API-Key", backendMetaData.getApiKey()); + case API_TOKEN -> request.addHeader("Authorization", "Token " + backendMetaData.getApiKey()); + case OAUTH2 -> request.setHeader("Authorization", "Bearer " + getOAuth2Token()); + case API_KEY_QUERY_PARAM -> + { try { String uri = request.getURI().toString(); @@ -709,10 +699,8 @@ public class BaseAPIActionUtil { throw (new QException("Error setting authorization query parameter", e)); } - break; - - default: - throw new IllegalArgumentException("Unexpected authorization type: " + backendMetaData.getAuthorizationType()); + } + default -> throw new IllegalArgumentException("Unexpected authorization type: " + backendMetaData.getAuthorizationType()); } } diff --git a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/model/AuthorizationType.java b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/model/AuthorizationType.java index 61497df4..7e8060f3 100644 --- a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/model/AuthorizationType.java +++ b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/model/AuthorizationType.java @@ -28,6 +28,7 @@ package com.kingsrook.qqq.backend.module.api.model; public enum AuthorizationType { API_KEY_HEADER, + API_TOKEN, BASIC_AUTH_API_KEY, BASIC_AUTH_USERNAME_PASSWORD, OAUTH2,