fix: fix 3.18.7 merge

gravitee-io · Sep 1, 2022 · fa8678d · fa8678d
1 parent cb4a403
commit fa8678d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 158 deletions.
diff --git a/gravitee-apim-e2e/api-test/src/documentation/documentation.spec.ts b/gravitee-apim-e2e/api-test/src/documentation/documentation.spec.ts
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {afterAll, beforeAll, describe, expect} from '@jest/globals';
-import {ConfigurationApi} from '@gravitee/management-webclient-sdk/src/lib/apis/ConfigurationApi';
+import { afterAll, beforeAll, describe, expect } from '@jest/globals';
+import { ConfigurationApi } from '@gravitee/management-webclient-sdk/src/lib/apis/ConfigurationApi';
 import {
-    forManagementAsAdminUser,
-    forManagementAsApiUser,
-    forPortalAsApplicationFrenchUser,
-    forPortalAsSimpleUser,
+  forManagementAsAdminUser,
+  forManagementAsApiUser,
+  forPortalAsApplicationFrenchUser,
+  forPortalAsSimpleUser,
 } from '@gravitee/utils/configuration';
-import {UsersApi} from '@gravitee/management-webclient-sdk/src/lib/apis/UsersApi';
-import {RoleScope} from '@gravitee/management-webclient-sdk/src/lib/models/RoleScope';
-import {APIsApi} from '@gravitee/management-webclient-sdk/src/lib/apis/APIsApi';
-import {ApisFaker} from '@gravitee/fixtures/management/ApisFaker';
-import {ApiLifecycleState} from '@gravitee/management-webclient-sdk/src/lib/models/ApiLifecycleState';
-import {Visibility} from '@gravitee/management-webclient-sdk/src/lib/models/Visibility';
-import {APIPagesApi} from '@gravitee/management-webclient-sdk/src/lib/apis/APIPagesApi';
-import {created, succeed, unauthorized} from '@lib/jest-utils';
+import { UsersApi } from '@gravitee/management-webclient-sdk/src/lib/apis/UsersApi';
+import { RoleScope } from '@gravitee/management-webclient-sdk/src/lib/models/RoleScope';
+import { APIsApi } from '@gravitee/management-webclient-sdk/src/lib/apis/APIsApi';
+import { ApisFaker } from '@gravitee/fixtures/management/ApisFaker';
+import { ApiLifecycleState } from '@gravitee/management-webclient-sdk/src/lib/models/ApiLifecycleState';
+import { Visibility } from '@gravitee/management-webclient-sdk/src/lib/models/Visibility';
+import { APIPagesApi } from '@gravitee/management-webclient-sdk/src/lib/apis/APIPagesApi';
+import { created, succeed, unauthorized } from '@lib/jest-utils';
 import { PageType } from '@gravitee/management-webclient-sdk/src/lib/models/PageType';
 import { ApiApi, GetPageByApiIdAndPageIdIncludeEnum } from '@gravitee/portal-webclient-sdk/src/lib/apis/ApiApi';
 import { MetadataFormat } from '@gravitee/management-webclient-sdk/src/lib/models/MetadataFormat';

diff --git a/...tee/gateway/handlers/api/policy/security/apikey/ApiKeyPlanBasedAuthenticationHandler.java b/...tee/gateway/handlers/api/policy/security/apikey/ApiKeyPlanBasedAuthenticationHandler.java
diff --git a/.../java/io/gravitee/gateway/handlers/api/security/ApiKeyPlanBasedAuthenticationHandler.java b/.../java/io/gravitee/gateway/handlers/api/security/ApiKeyPlanBasedAuthenticationHandler.java
@@ -16,9 +16,9 @@
 package io.gravitee.gateway.handlers.api.security;
 
 import io.gravitee.definition.model.Plan;
+import io.gravitee.gateway.api.service.ApiKey;
 import io.gravitee.gateway.security.core.AuthenticationContext;
 import io.gravitee.gateway.security.core.AuthenticationHandler;
-import io.gravitee.repository.management.model.ApiKey;
 import java.util.Optional;
 
 /**

diff --git a/...ava/io/gravitee/gateway/handlers/api/security/PlanBasedAuthenticationHandlerEnhancer.java b/...ava/io/gravitee/gateway/handlers/api/security/PlanBasedAuthenticationHandlerEnhancer.java
@@ -16,7 +16,6 @@
 package io.gravitee.gateway.handlers.api.security;
 
 import io.gravitee.definition.model.Api;
-import io.gravitee.gateway.handlers.api.policy.security.apikey.ApiKeyPlanBasedAuthenticationHandler;
 import io.gravitee.gateway.security.core.AuthenticationHandler;
 import io.gravitee.gateway.security.core.AuthenticationHandlerEnhancer;
 import io.gravitee.repository.management.api.SubscriptionRepository;
@@ -25,7 +24,6 @@
 import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author David BRASSELY (david.brassely at graviteesource.com)

diff --git a/...a/io/gravitee/gateway/handlers/api/security/ApiKeyPlanBasedAuthenticationHandlerTest.java b/...a/io/gravitee/gateway/handlers/api/security/ApiKeyPlanBasedAuthenticationHandlerTest.java
@@ -24,7 +24,6 @@
 
 import io.gravitee.definition.model.Plan;
 import io.gravitee.gateway.api.service.ApiKey;
-import io.gravitee.gateway.handlers.api.policy.security.apikey.ApiKeyPlanBasedAuthenticationHandler;
 import io.gravitee.gateway.security.core.AuthenticationContext;
 import io.gravitee.gateway.security.core.AuthenticationHandler;
 import org.junit.Test;

diff --git a/...io/gravitee/gateway/services/sync/cache/repository/SubscriptionRepositoryWrapperTest.java b/...io/gravitee/gateway/services/sync/cache/repository/SubscriptionRepositoryWrapperTest.java