Moving Idempotency Validation to consent management component

wso2 · Mar 4, 2024 · 506ff87 · 506ff87
1 parent b26b4db
commit 506ff87
Show file tree

Hide file tree

Showing 26 changed files with 473 additions and 1,825 deletions.
diff --git a/...-apim/carbon-home/repository/resources/conf/templates/repository/conf/open-banking.xml.j2 b/...-apim/carbon-home/repository/resources/conf/templates/repository/conf/open-banking.xml.j2
@@ -66,13 +66,6 @@
                     <CacheModifiedExpiry>{{open_banking.gateway.cache.cache_modified_expiry_minutes}}</CacheModifiedExpiry>
                 {% endif %}
             </GatewayCache>
-            <IdempotencyValidationCache>
-                {% if open_banking.gateway.cache.idempotency_validation_cache.cache_time_to_live is defined %}
-                    <CacheTimeToLive>{{open_banking.gateway.cache.idempotency_validation_cache.cache_time_to_live}}</CacheTimeToLive>
-                {% else %}
-                    <CacheTimeToLive>1440</CacheTimeToLive>
-                {% endif %}
-            </IdempotencyValidationCache>
         </Cache>
 
         <CertificateManagement>
@@ -210,26 +203,6 @@
             	</AllowedScopes>
 
             </TPPManagement>
-
-        <Idempotency>
-            {% if open_banking.gateway.idempotency.enabled is defined %}
-                <IsEnabled>{{open_banking.gateway.idempotency.enabled}}</IsEnabled>
-            {% else %}
-                <IsEnabled>false</IsEnabled>
-            {% endif %}
-
-            {% if open_banking.gateway.idempotency.allowed_time_duration is defined %}
-                <AllowedTimeDuration>{{open_banking.gateway.idempotency.allowed_time_duration}}</AllowedTimeDuration>
-            {% else %}
-                <AllowedTimeDuration>1440</AllowedTimeDuration>
-            {% endif %}
-
-            {% if open_banking.gateway.idempotency.idempotency_key_header is defined %}
-                <IdempotencyKeyHeader>{{open_banking.gateway.idempotency.idempotency_key_header}}</IdempotencyKeyHeader>
-            {% else %}
-                <IdempotencyKeyHeader>x-idempotency-key</IdempotencyKeyHeader>
-            {% endif %}
-        </Idempotency>
     </Gateway>
     <DCR>
         <APIMRESTEndPoints>

diff --git a/...ob-is/carbon-home/repository/resources/conf/templates/repository/conf/open-banking.xml.j2 b/...ob-is/carbon-home/repository/resources/conf/templates/repository/conf/open-banking.xml.j2
@@ -390,6 +390,19 @@
                 {% endif %}
             </Params>
         </Portal>
+        <Idempotency>
+            {% if open_banking.gateway.idempotency.enabled is defined %}
+                <IsEnabled>{{open_banking.gateway.idempotency.enabled}}</IsEnabled>
+            {% else %}
+                <IsEnabled>false</IsEnabled>
+            {% endif %}
+
+            {% if open_banking.gateway.idempotency.allowed_time_duration is defined %}
+                <AllowedTimeDuration>{{open_banking.gateway.idempotency.allowed_time_duration}}</AllowedTimeDuration>
+            {% else %}
+                <AllowedTimeDuration>1440</AllowedTimeDuration>
+            {% endif %}
+        </Idempotency>
     </Consent>
     <DCR>
         {% if open_banking.dcr.validator is defined %}

diff --git a/open-banking-accelerator/components/com.wso2.openbanking.accelerator.common/pom.xml b/open-banking-accelerator/components/com.wso2.openbanking.accelerator.common/pom.xml
@@ -33,10 +33,6 @@
     <packaging>bundle</packaging>
     <name>WSO2 Open Banking - Common component</name>
     <dependencies>
-        <dependency>
-            <groupId>com.hazelcast</groupId>
-            <artifactId>hazelcast</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.axiom.wso2</groupId>
             <artifactId>axiom</artifactId>
@@ -275,10 +271,7 @@
                         </Private-Package>
                         <Import-Package>
                             org.osgi.framework;version="${osgi.framework.imp.pkg.version.range}",
-                            org.osgi.service.component;version="${osgi.service.component.imp.pkg.version.range}",
-                            com.hazelcast.config; version="${com.hazelcast.hazelcast.version}",
-                            com.hazelcast.core; version="${com.hazelcast.hazelcast.version}",
-                            com.hazelcast.map; version="${com.hazelcast.hazelcast.version}"
+                            org.osgi.service.component;version="${osgi.service.component.imp.pkg.version.range}"
                         </Import-Package>
                         <Export-Package>
                             !com.wso2.openbanking.accelerator.common.internal,

diff --git a/.../wso2/openbanking/accelerator/common/distributed/caching/OpenBankingDistributedCache.java b/.../wso2/openbanking/accelerator/common/distributed/caching/OpenBankingDistributedCache.java
diff --git a/...nbanking/accelerator/common/distributed/caching/OpenBankingDistributedCacheConstants.java b/...nbanking/accelerator/common/distributed/caching/OpenBankingDistributedCacheConstants.java
diff --git a/...o2/openbanking/accelerator/common/distributed/caching/OpenBankingDistributedCacheKey.java b/...o2/openbanking/accelerator/common/distributed/caching/OpenBankingDistributedCacheKey.java