Apim 4251 handle create license

gravitee-apim-console-webui/build.json

@@ -1,3 +1,3 @@
 {
-  "version": "3.20.2"
+  "version": "4.3.0-alpha.2-SNAPSHOT"
 }

gravitee-apim-console-webui/src/components/user-autocomplete/user-autocomplete.html

@@ -16,6 +16,7 @@
 
 -->
 <md-autocomplete
+  md-no-cache="true"
   md-selected-item="selectedItem"
   md-search-text="$ctrl.searchText"
   md-selected-item-change="$ctrl.selectUser(user)"

gravitee-apim-console-webui/src/management/api/api-navigation/api-navigation.component.spec.ts

@@ -210,7 +210,7 @@ describe('ApiNavigationComponent', () => {
             'Audit Logs',
             'Entrypoints',
             'Response Templates',
-            'Cors',
+            'CORS',
             'Endpoints',
             'Endpoints',
             'Consumers',

gravitee-apim-console-webui/src/management/api/api-navigation/api-v4-menu.service.ts

@@ -142,7 +142,7 @@ export class ApiV4MenuService implements ApiMenuService {
 
     if (!hasTcpListeners) {
       tabs.push({
-        displayName: 'Cors',
+        displayName: 'CORS',
         routerLink: 'v4/cors',
       });
     }

gravitee-apim-console-webui/src/management/api/endpoints-v4/endpoint-group/configuration/api-endpoint-group-configuration.component.html

@@ -17,10 +17,6 @@
 -->
 <form *ngIf="!!configurationForm" [formGroup]="configurationForm">
   <ng-container *ngIf="sharedConfigurationSchema">
-    <gio-form-json-schema
-      formControlName="groupConfiguration"
-      [jsonSchema]="sharedConfigurationSchema"
-      (ready)="onSchemaFormReady()"
-    ></gio-form-json-schema>
+    <gio-form-json-schema formControlName="groupConfiguration" [jsonSchema]="sharedConfigurationSchema"></gio-form-json-schema>
   </ng-container>
 </form>

gravitee-apim-console-webui/src/management/api/endpoints-v4/endpoint-group/configuration/api-endpoint-group-configuration.component.ts

@@ -53,10 +53,4 @@ export class ApiEndpointGroupConfigurationComponent implements OnInit, OnDestroy
     this.unsubscribe$.next(true);
     this.unsubscribe$.complete();
   }
-
-  onSchemaFormReady() {
-    // schema-form component is overriding the form with all the fields from the schema.
-    // We set back the initial value to avoid sending invalid data to the backend
-    this.configurationForm.setValue(this.initialValues, { emitEvent: false });
-  }
 }

gravitee-apim-console-webui/src/management/application/details/subscribe/application-subscribe.controller.ts

@@ -15,7 +15,7 @@
  */
 import { IHttpPromise } from 'angular';
 
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { filter, find, forEach, groupBy, includes, join, map, merge, noop } from 'lodash';
 
 import { ApiService } from '../../../../services/api.service';
@@ -45,6 +45,7 @@ class ApplicationSubscribeController {
     private ApplicationService: ApplicationService,
     private NotificationService: NotificationService,
     private $mdDialog,
+    private ngRouter: Router,
   ) {}
 
   async $onInit() {
@@ -121,7 +122,7 @@ class ApplicationSubscribeController {
 
     this.ApplicationService.subscribe(this.application.id, plan.id, message, apikeyMode).then(() => {
       this.NotificationService.show('Subscription to application ' + this.application.name + ' has been successfully created');
-      this.$onInit();
+      this.ngRouter.navigate(['../'], { relativeTo: this.activatedRoute, queryParamsHandling: 'preserve' });
     });
   }
 
@@ -200,6 +201,6 @@ class ApplicationSubscribeController {
     );
   }
 }
-ApplicationSubscribeController.$inject = ['ApiService', 'Constants', 'ApplicationService', 'NotificationService', '$mdDialog'];
+ApplicationSubscribeController.$inject = ['ApiService', 'Constants', 'ApplicationService', 'NotificationService', '$mdDialog', 'ngRouter'];
 
 export default ApplicationSubscribeController;

gravitee-apim-definition/gravitee-apim-definition-model/pom.xml

@@ -43,6 +43,10 @@
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.gravitee.node</groupId>
+            <artifactId>gravitee-node-vertx</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/v4/http/HttpClientOptions.java

@@ -15,8 +15,14 @@
  */
 package io.gravitee.definition.model.v4.http;
 
+import static io.gravitee.node.vertx.client.http.VertxHttpClientOptions.*;
+
+import java.io.Serial;
 import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 /**
@@ -25,50 +31,49 @@
  */
 @Getter
 @Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class HttpClientOptions implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -7061411805967594667L;
 
-    public static final long DEFAULT_IDLE_TIMEOUT = 60000;
-    public static final long DEFAULT_CONNECT_TIMEOUT = 5000;
-    public static final long DEFAULT_READ_TIMEOUT = 10000;
-    public static final int DEFAULT_MAX_CONCURRENT_CONNECTIONS = 100;
-    public static final boolean DEFAULT_KEEP_ALIVE = true;
-    public static final boolean DEFAULT_PIPELINING = false;
-    public static final boolean DEFAULT_USE_COMPRESSION = true;
-    public static final boolean DEFAULT_PROPAGATE_CLIENT_ACCEPT_ENCODING = false;
-    public static final boolean DEFAULT_FOLLOW_REDIRECTS = false;
-    public static final boolean DEFAULT_CLEAR_TEXT_UPGRADE = true;
-    public static final ProtocolVersion DEFAULT_PROTOCOL_VERSION = ProtocolVersion.HTTP_1_1;
-
+    @Builder.Default
     private long idleTimeout = DEFAULT_IDLE_TIMEOUT;
 
+    @Builder.Default
     private long connectTimeout = DEFAULT_CONNECT_TIMEOUT;
 
+    @Builder.Default
     private boolean keepAlive = DEFAULT_KEEP_ALIVE;
 
+    @Builder.Default
     private long readTimeout = DEFAULT_READ_TIMEOUT;
 
+    @Builder.Default
     private boolean pipelining = DEFAULT_PIPELINING;
 
+    @Builder.Default
     private int maxConcurrentConnections = DEFAULT_MAX_CONCURRENT_CONNECTIONS;
 
+    @Builder.Default
     private boolean useCompression = DEFAULT_USE_COMPRESSION;
 
+    @Builder.Default
     private boolean propagateClientAcceptEncoding = DEFAULT_PROPAGATE_CLIENT_ACCEPT_ENCODING;
 
+    @Builder.Default
     private boolean followRedirects = DEFAULT_FOLLOW_REDIRECTS;
 
+    @Builder.Default
     private boolean clearTextUpgrade = DEFAULT_CLEAR_TEXT_UPGRADE;
 
-    private ProtocolVersion version = DEFAULT_PROTOCOL_VERSION;
+    @Builder.Default
+    private ProtocolVersion version = ProtocolVersion.valueOf(DEFAULT_PROTOCOL_VERSION.name());
 
     public boolean isPropagateClientAcceptEncoding() {
         // Propagate Accept-Encoding can only be made if useCompression is disabled.
         return !useCompression && propagateClientAcceptEncoding;
     }
-
-    public void setPropagateClientAcceptEncoding(boolean propagateClientAcceptEncoding) {
-        this.propagateClientAcceptEncoding = propagateClientAcceptEncoding;
-    }
 }

gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/v4/http/HttpProxyOptions.java

@@ -15,9 +15,12 @@
  */
 package io.gravitee.definition.model.v4.http;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serial;
 import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 /**
@@ -26,21 +29,21 @@
  */
 @Getter
 @Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class HttpProxyOptions implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -1133018497662951240L;
 
     private boolean enabled;
-
     private boolean useSystemProxy;
-
     private String host;
-
     private int port;
-
     private String username;
-
     private String password;
 
+    @Builder.Default
     private HttpProxyType type = HttpProxyType.HTTP;
 }

gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/v4/ssl/KeyStore.java

@@ -21,6 +21,7 @@
 import io.gravitee.definition.model.v4.ssl.none.NoneKeyStore;
 import io.gravitee.definition.model.v4.ssl.pem.PEMKeyStore;
 import io.gravitee.definition.model.v4.ssl.pkcs12.PKCS12KeyStore;
+import java.io.Serial;
 import java.io.Serializable;
 import lombok.Getter;
 
@@ -40,11 +41,12 @@
 @Getter
 public abstract class KeyStore implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -917896495926741784L;
 
     private final KeyStoreType type;
 
-    public KeyStore(KeyStoreType type) {
+    protected KeyStore(KeyStoreType type) {
         this.type = type;
     }
 }

gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/v4/ssl/SslOptions.java

@@ -15,6 +15,7 @@
  */
 package io.gravitee.definition.model.v4.ssl;
 
+import java.io.Serial;
 import java.io.Serializable;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -33,10 +34,12 @@
 @AllArgsConstructor
 public class SslOptions implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 5578794192878572915L;
 
     private boolean trustAll;
 
+    @Builder.Default
     private boolean hostnameVerifier = true;
 
     private TrustStore trustStore;

gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/v4/ssl/TrustStore.java

@@ -21,6 +21,7 @@
 import io.gravitee.definition.model.v4.ssl.none.NoneTrustStore;
 import io.gravitee.definition.model.v4.ssl.pem.PEMTrustStore;
 import io.gravitee.definition.model.v4.ssl.pkcs12.PKCS12TrustStore;
+import java.io.Serial;
 import java.io.Serializable;
 import lombok.Getter;
 
@@ -45,6 +46,7 @@
 @Getter
 public abstract class TrustStore implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -9209765483153309314L;
 
     private final TrustStoreType type;

gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/v4/ssl/jks/JKSKeyStore.java

@@ -17,6 +17,7 @@
 
 import io.gravitee.definition.model.v4.ssl.KeyStore;
 import io.gravitee.definition.model.v4.ssl.KeyStoreType;
+import java.io.Serial;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -30,16 +31,13 @@
 @Builder
 public class JKSKeyStore extends KeyStore {
 
+    @Serial
     private static final long serialVersionUID = -4687804681763799542L;
 
     private String path;
-
     private String content;
-
     private String password;
-
     private String alias;
-
     private String keyPassword;
 
     public JKSKeyStore() {

gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/v4/ssl/jks/JKSTrustStore.java

@@ -17,6 +17,7 @@
 
 import io.gravitee.definition.model.v4.ssl.TrustStore;
 import io.gravitee.definition.model.v4.ssl.TrustStoreType;
+import java.io.Serial;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -30,14 +31,12 @@
 @Builder
 public class JKSTrustStore extends TrustStore {
 
+    @Serial
     private static final long serialVersionUID = -6603840868190194763L;
 
     private String path;
-
     private String content;
-
     private String password;
-
     private String alias;
 
     public JKSTrustStore() {

gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/v4/ssl/none/NoneKeyStore.java

@@ -17,6 +17,7 @@
 
 import io.gravitee.definition.model.v4.ssl.KeyStore;
 import io.gravitee.definition.model.v4.ssl.KeyStoreType;
+import java.io.Serial;
 import lombok.Builder;
 
 /**
@@ -26,6 +27,7 @@
 @Builder
 public class NoneKeyStore extends KeyStore {
 
+    @Serial
     private static final long serialVersionUID = -2540354913966457704L;
 
     public NoneKeyStore() {

gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/v4/ssl/none/NoneTrustStore.java

@@ -17,6 +17,7 @@
 
 import io.gravitee.definition.model.v4.ssl.TrustStore;
 import io.gravitee.definition.model.v4.ssl.TrustStoreType;
+import java.io.Serial;
 import lombok.Builder;
 
 /**
@@ -26,6 +27,7 @@
 @Builder
 public class NoneTrustStore extends TrustStore {
 
+    @Serial
     private static final long serialVersionUID = -6013813999148592319L;
 
     public NoneTrustStore() {

gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/v4/ssl/pem/PEMKeyStore.java

@@ -17,6 +17,7 @@
 
 import io.gravitee.definition.model.v4.ssl.KeyStore;
 import io.gravitee.definition.model.v4.ssl.KeyStoreType;
+import java.io.Serial;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -30,14 +31,12 @@
 @Builder
 public class PEMKeyStore extends KeyStore {
 
+    @Serial
     private static final long serialVersionUID = 1051430527272519608L;
 
     private String keyPath;
-
     private String keyContent;
-
     private String certPath;
-
     private String certContent;
 
     public PEMKeyStore() {