Merge branch 'master' into 4.3.0-kernel-upgrade

Author: npamudika

.github/workflows/main.yml

@@ -60,6 +60,10 @@ jobs:
             segment: group1
           - id: 2
             segment: group2
+          - id: 3
+            segment: group3
+          - id: 4
+            segment: group4
       fail-fast: false
     steps:
       - name: Run hostname

components/apimgt/org.wso2.carbon.apimgt.api/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.29.14-SNAPSHOT</version>
+        <version>9.29.34-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/APIAdmin.java

@@ -484,4 +484,49 @@ boolean isScopeExists(String username, String scopeName)
     Policy[] getPolicies(int tenantId, String level) throws APIManagementException;
 
     Policy getPolicyByNameAndType(int tenantId, String level, String name) throws APIManagementException;
+
+    /**
+     * Update the Api Provider of a given Api Id
+     *
+     * @param apiId Api ID
+     * @param provider New ProviderName/Owner of the Api
+     * @param organisation Organisation
+     * @throws APIManagementException
+     */
+    void updateApiProvider(String apiId, String provider, String organisation) throws APIManagementException;
+
+    /**
+     * Get/Search All Apis in admin portal
+     *
+     * @param searchQuery Api name search query
+     * @param organization organization
+     * @param start
+     * @param end
+     * @return
+     * @throws APIManagementException
+     */
+    Map<String, Object> searchPaginatedApis(String searchQuery, String organization, int start, int end)
+            throws APIManagementException;
+
+    /**
+     * This method used to retrieve global key manager configurations
+     * @return KeyManagerConfigurationDTO list
+     * @throws APIManagementException if error occurred
+     */
+    List<KeyManagerConfigurationDTO> getGlobalKeyManagerConfigurations() throws APIManagementException;
+
+    /**
+     * This method used to retrieve global key manager with Id
+     * @param id uuid of key manager
+     * @return KeyManagerConfigurationDTO for retrieved data
+     * @throws APIManagementException
+     */
+    KeyManagerConfigurationDTO getGlobalKeyManagerConfigurationById(String id) throws APIManagementException;
+
+    /**
+     * This method used to delete global key manager
+     * @param id uuid of key manager
+     * @throws APIManagementException
+     */
+    void deleteGlobalKeyManagerConfigurationById(String id) throws APIManagementException;
 }

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/ExceptionCodes.java

@@ -541,9 +541,13 @@ public enum ExceptionCodes implements ErrorHandler {
     REVISION_ALREADY_DEPLOYED(902005, "Revision deployment state conflicted", 409,
             "Revision deployment request conflicted with the current deployment state of the revision %s. Please try again later", false),
     INVALID_API_ID(902006, "Invalid API ID", 404, "The provided API ID is not found %s", false),
+    INVALID_GATEWAY_TYPE(902007, "Invalid Gateway Type", 400, "Invalid Gateway Type. %s", false),
     INVALID_ENDPOINT_CONFIG(902012, "Endpoint config value(s) is(are) not valid", 400, "Endpoint config value(s) is(are) not valid"),
+    ARTIFACT_SYNC_HTTP_REQUEST_FAILED(903009, "Error while retrieving from remote endpoint", 500, "Error while executing HTTP request to retrieve from remote endpoint"),
     KEY_MANAGER_RESTRICTED_FOR_USER(902013, "Unauthorized Access to Key Manager", 403, "Key Manager is Restricted for this user"),
-    ARTIFACT_SYNC_HTTP_REQUEST_FAILED(903009, "Error while retrieving from remote endpoint", 500, "Error while executing HTTP request to retrieve from remote endpoint");
+    // Admin portal get apis and api provider change related errors
+    CHANGE_API_PROVIDER_FAILED(903011, "Error while changing the API provider", 500, "Error while changing the API provider in the registry or DB"),
+    GET_SEARCH_APIS_IN_ADMIN_FAILED(903012, "Error while getting the apis", 500, "Error while getting/searching the apis from registry");
 
     private final long errorCode;
     private final String errorMessage;

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/ApplicationInfoKeyManager.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.wso2.carbon.apimgt.api.model;
+
+/**
+ * This class represent the minimized view of the Application in api model for Key manager operations in admin REST API.
+ */
+public class ApplicationInfoKeyManager extends ApplicationInfo {
+
+    private String organization;
+
+    public String getOrganization() {
+
+        return organization;
+    }
+
+    public void setOrganization(String organization) {
+
+        this.organization = organization;
+    }
+
+}

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/Environment.java

@@ -52,6 +52,7 @@ public class Environment implements Serializable {
     private boolean isReadOnly;
     private List<VHost> vhosts = new ArrayList<>();
     private String provider;
+    private String gatewayType;
     private Map<String, String> additionalProperties = new HashMap<>();
 
     public boolean isDefault() {
@@ -216,6 +217,14 @@ public void setProvider(String provider) {
         this.provider = provider;
     }
 
+    public String getGatewayType() {
+        return gatewayType;
+    }
+
+    public void setGatewayType(String gatewayType) {
+        this.gatewayType = gatewayType;
+    }
+
     public Map<String, String> getAdditionalProperties() {
         return additionalProperties;
     }

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/OperationPolicy.java

@@ -98,13 +98,13 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass())
             return false;
         OperationPolicy policyObj = (OperationPolicy) o;
-        return policyId == policyObj.policyId && policyName == policyObj.policyName && policyVersion == policyObj.policyVersion
-                && direction.equals(policyObj.direction) && parameters.equals(policyObj.parameters);
+        return Objects.equals(policyName, policyObj.policyName) && Objects.equals(policyVersion,
+                policyObj.policyVersion) && Objects.equals(direction, policyObj.direction) && Objects.equals(
+                parameters, policyObj.parameters) && Objects.equals(policyId, policyObj.policyId);
     }
 
     @Override
     public int hashCode() {
-
         return Objects.hash(policyName, policyVersion, direction, parameters, policyId);
     }
 
@@ -113,4 +113,17 @@ public int compareTo(OperationPolicy o) {
 
         return this.order - o.getOrder();
     }
+
+    @Override
+    public String toString() {
+
+        return "operationPolicies {" +
+                ", policyName ='" + policyName + '\'' +
+                ", policyVersion ='" + policyVersion + '\'' +
+                ", direction ='" + direction + '\'' +
+                ", order ='" + order + '\'' +
+                ", policyId ='" + policyId + '\'' +
+                ", parameters ='" + parameters + '\'' +
+                '}';
+    }
 }

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/subscription/API.java

@@ -18,8 +18,13 @@
 
 package org.wso2.carbon.apimgt.api.model.subscription;
 
+import org.wso2.carbon.apimgt.api.model.OperationPolicy;
+import org.wso2.carbon.apimgt.api.model.policy.APIPolicy;
+
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Entity for keeping API related information.
@@ -39,6 +44,7 @@ public class API implements CacheableEntity<String> {
     private String status;
     private String revision;
     private String organization;
+    private Set<OperationPolicy> apiPolicies = new HashSet<>();
 
     public String getRevision() {
 
@@ -199,4 +205,12 @@ public String getOrganization() {
     public void setOrganization(String organization) {
         this.organization = organization;
     }
+
+    public void setApiPolicy(OperationPolicy apiPolicy) {
+        this.apiPolicies.add(apiPolicy);
+    }
+
+    public Set<OperationPolicy> getApiPolicies() {
+        return apiPolicies;
+    }
 }

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/subscription/URLMapping.java

@@ -18,9 +18,13 @@
 
 package org.wso2.carbon.apimgt.api.model.subscription;
 
+import org.wso2.carbon.apimgt.api.model.OperationPolicy;
+
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 
 public class URLMapping {
 
@@ -29,6 +33,7 @@ public class URLMapping {
     private String httpMethod;
     private String urlPattern;
     private List<String> scopes = new ArrayList<>();
+    private Set<OperationPolicy> operationPolicies = new HashSet<>();
 
 
     public String getHttpMethod() {
@@ -79,6 +84,13 @@ public List<String> getScopes() {
         return scopes;
     }
 
+    public void setOperationPolicies(OperationPolicy operationPolicy){
+        this.operationPolicies.add(operationPolicy);
+    }
+    public Set<OperationPolicy> getOperationPolicies(){
+        return operationPolicies;
+    }
+
     @Override
     public boolean equals(Object o) {
 
@@ -105,6 +117,7 @@ public String toString() {
                 ", authScheme ='" + authScheme + '\'' +
                 ", httpMethod ='" + httpMethod + '\'' +
                 ", urlPattern ='" + urlPattern + '\'' +
+                ", operationPolicies ='" + operationPolicies + '\'' +
                 '}';
     }
 }

components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.29.14-SNAPSHOT</version>
+        <version>9.29.34-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.29.14-SNAPSHOT</version>
+        <version>9.29.34-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.29.14-SNAPSHOT</version>
+        <version>9.29.34-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.29.14-SNAPSHOT</version>
+        <version>9.29.34-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/apimgt/org.wso2.carbon.apimgt.common.analytics/src/main/java/org/wso2/carbon/apimgt/common/analytics/publishers/dto/API.java

@@ -17,6 +17,9 @@
 
 package org.wso2.carbon.apimgt.common.analytics.publishers.dto;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Api attribute in analytics event.
  */
@@ -27,6 +30,8 @@ public class API {
     private String apiVersion;
     private String apiCreator;
     private String apiCreatorTenantDomain;
+    private List<URITemplate> uriTemplates = new ArrayList<>();
+    private List<OperationPolicy> apiPolicies = new ArrayList<>();
 
     public String getApiId() {
         return apiId;
@@ -75,4 +80,20 @@ public String getApiCreatorTenantDomain() {
     public void setApiCreatorTenantDomain(String apiCreatorTenantDomain) {
         this.apiCreatorTenantDomain = apiCreatorTenantDomain;
     }
+
+    public List<URITemplate> getUriTemplates() {
+        return new ArrayList(uriTemplates);
+    }
+
+    public void setUriTemplates(List<URITemplate> uriTemplates) {
+        this.uriTemplates = new ArrayList(uriTemplates);
+    }
+
+    public void setApiPolicies(List<OperationPolicy> apiPolicies) {
+        this.apiPolicies = new ArrayList(apiPolicies);
+    }
+
+    public List<OperationPolicy> getApiPolicies() {
+        return new ArrayList(apiPolicies);
+    }
 }