refactor

wso2 · Dec 14, 2023 · ef80da6 · ef80da6
1 parent e8e7c6c
commit ef80da6
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 4 deletions.
diff --git a/...src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/AuthenticationContext.java b/...src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/AuthenticationContext.java
@@ -42,6 +42,7 @@ public class AuthenticationContext {
     private String subscriber;
     private List<String> throttlingDataList;
     private int spikeArrestLimit;
+    private int applicationSpikesArrestLimit;
     private String subscriberTenantDomain;
     private String spikeArrestUnit;
     private boolean stopOnQuotaReach;
@@ -180,8 +181,6 @@ public void setConsumerKey(String consumerKey) {
         this.consumerKey = consumerKey;
     }
 
-    private int applicationSpikesArrestLimit;
-
     public String getApplicationSpikesArrestUnit() {
         return applicationSpikesArrestUnit;
     }

diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mssql.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mssql.sql
@@ -2050,6 +2050,8 @@ CREATE TABLE AM_POLICY_APPLICATION (
             TIME_UNIT VARCHAR(25) NOT NULL,
             IS_DEPLOYED BIT NOT NULL DEFAULT 0,
 			CUSTOM_ATTRIBUTES VARBINARY(MAX) DEFAULT NULL,
+			RATE_LIMIT_COUNT INTEGER NULL DEFAULT 0,
+            RATE_LIMIT_TIME_UNIT VARCHAR(25) NULL DEFAULT NULL,
 			      UUID VARCHAR(256),
             PRIMARY KEY (POLICY_ID),
             UNIQUE  (NAME, TENANT_ID),

diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql.sql
@@ -1784,8 +1784,10 @@ CREATE TABLE IF NOT EXISTS AM_POLICY_APPLICATION (
             UNIT_TIME INT(11) NOT NULL,
             TIME_UNIT VARCHAR(25) NOT NULL,
             IS_DEPLOYED TINYINT(1) NOT NULL DEFAULT 0,
-	    CUSTOM_ATTRIBUTES BLOB DEFAULT NULL,
-	          UUID VARCHAR(256),
+	        CUSTOM_ATTRIBUTES BLOB DEFAULT NULL,
+            RATE_LIMIT_COUNT INT(11) NULL DEFAULT 0,
+            RATE_LIMIT_TIME_UNIT VARCHAR(25) NULL DEFAULT NULL,
+	        UUID VARCHAR(256),
             PRIMARY KEY (POLICY_ID),
             UNIQUE INDEX APP_NAME_TENANT (NAME, TENANT_ID),
             UNIQUE (UUID)

diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql_cluster.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql_cluster.sql
@@ -1970,6 +1970,8 @@ CREATE TABLE IF NOT EXISTS AM_POLICY_APPLICATION (
             TIME_UNIT VARCHAR(25) NOT NULL,
             IS_DEPLOYED TINYINT(1) NOT NULL DEFAULT 0,
 	    CUSTOM_ATTRIBUTES BLOB DEFAULT NULL,
+	        RATE_LIMIT_COUNT INT(11) NULL DEFAULT 0,
+            RATE_LIMIT_TIME_UNIT VARCHAR(25) NULL DEFAULT NULL,
 	          UUID VARCHAR(254),
             PRIMARY KEY (POLICY_ID),
             UNIQUE INDEX APP_NAME_TENANT (NAME, TENANT_ID),

diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle.sql
@@ -2945,6 +2945,8 @@ CREATE TABLE AM_POLICY_APPLICATION (
             TIME_UNIT VARCHAR2(25) NOT NULL,
             IS_DEPLOYED INTEGER DEFAULT 0 NOT NULL,
 			CUSTOM_ATTRIBUTES BLOB DEFAULT NULL,
+			RATE_LIMIT_COUNT INTEGER NULL DEFAULT 0,
+            RATE_LIMIT_TIME_UNIT VARCHAR(25) DEFAULT NULL NULL,
 			      UUID VARCHAR2(256),
             PRIMARY KEY (POLICY_ID),
             CONSTRAINT AM_POLICY_APP_NAME_TENANT UNIQUE (NAME, TENANT_ID),

diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_rac.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_rac.sql
@@ -2919,6 +2919,8 @@ CREATE TABLE AM_POLICY_APPLICATION (
             TIME_UNIT VARCHAR2(25) NOT NULL,
             IS_DEPLOYED INTEGER DEFAULT 0 NOT NULL,
 			CUSTOM_ATTRIBUTES BLOB DEFAULT NULL,
+			RATE_LIMIT_COUNT INTEGER NULL DEFAULT 0,
+           RATE_LIMIT_TIME_UNIT VARCHAR(25) DEFAULT NULL NULL,
 			      UUID VARCHAR2(256),
             PRIMARY KEY (POLICY_ID),
             CONSTRAINT AM_POLICY_APP_NAME_TENANT UNIQUE (NAME, TENANT_ID),

diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/postgresql.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/postgresql.sql
@@ -2140,6 +2140,8 @@ CREATE TABLE IF NOT EXISTS AM_POLICY_APPLICATION (
             TIME_UNIT VARCHAR(25) NOT NULL,
             IS_DEPLOYED BOOLEAN NOT NULL DEFAULT '0',
 			CUSTOM_ATTRIBUTES BYTEA DEFAULT NULL,
+			RATE_LIMIT_COUNT INTEGER NULL DEFAULT 0,
+            RATE_LIMIT_TIME_UNIT VARCHAR(25) NULL DEFAULT NULL,
 			      UUID VARCHAR(256),
             PRIMARY KEY (POLICY_ID),
             UNIQUE  (NAME, TENANT_ID),