Skip to content

Commit cb36559

Browse files
committed
1 parent 81d8a9f commit cb36559

File tree

12 files changed

+16
-46
lines changed

12 files changed

+16
-46
lines changed

gravitee-apim-rest-api/gravitee-apim-rest-api-management-v2/gravitee-apim-rest-api-management-v2-rest/src/main/java/io/gravitee/rest/api/management/v2/rest/resource/environment/PortalNavigationItemsResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public PortalNavigationItemsResponse getPortalNavigationItems(
7878
}
7979

8080
@POST
81-
@Permissions({ @Permission(value = RolePermission.ENVIRONMENT_SETTINGS, acls = { RolePermissionAction.UPDATE }) })
81+
@Permissions({ @Permission(value = RolePermission.ENVIRONMENT_PAGE, acls = { RolePermissionAction.UPDATE }) })
8282
@Consumes(MediaType.APPLICATION_JSON)
8383
@Produces(MediaType.APPLICATION_JSON)
8484
public Response createPortalNavigationItem(@Valid @NotNull final BaseCreatePortalNavigationItem createPortalNavigationItem) {

gravitee-apim-rest-api/gravitee-apim-rest-api-model/src/main/java/io/gravitee/rest/api/model/permissions/EnvironmentPermission.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public enum EnvironmentPermission implements Permission {
4949
IDENTITY_PROVIDER_ACTIVATION("IDENTITY_PROVIDER_ACTIVATION", 3700),
5050
INTEGRATION("INTEGRATION", 3800),
5151
SHARED_POLICY_GROUP("SHARED_POLICY_GROUP", 3900),
52-
CLUSTER("CLUSTER", 4000);
52+
CLUSTER("CLUSTER", 4000),
53+
PAGE("PAGE", 4100);
5354

5455
String name;
5556
int mask;

gravitee-apim-rest-api/gravitee-apim-rest-api-model/src/main/java/io/gravitee/rest/api/model/permissions/RolePermission.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ public enum RolePermission {
8888
ENVIRONMENT_INTEGRATION(RoleScope.ENVIRONMENT, EnvironmentPermission.INTEGRATION),
8989
ENVIRONMENT_SHARED_POLICY_GROUP(RoleScope.ENVIRONMENT, EnvironmentPermission.SHARED_POLICY_GROUP),
9090
ENVIRONMENT_CLUSTER(RoleScope.ENVIRONMENT, EnvironmentPermission.CLUSTER),
91+
ENVIRONMENT_PAGE(RoleScope.ENVIRONMENT, EnvironmentPermission.PAGE),
9192

9293
ORGANIZATION_USERS(RoleScope.ORGANIZATION, OrganizationPermission.USER),
9394
ORGANIZATION_USERS_TOKEN(RoleScope.ORGANIZATION, OrganizationPermission.USER_TOKEN),

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/portal_page/exception/HomepageAlreadyExistsException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
public class HomepageAlreadyExistsException extends ValidationDomainException {
2121

22-
public HomepageAlreadyExistsException(String message) {
23-
super(message);
22+
public HomepageAlreadyExistsException() {
23+
super("Homepage already exists");
2424
}
2525
}

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/portal_page/exception/ParentAreaMismatchException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
public class ParentAreaMismatchException extends ValidationDomainException {
2121

22-
public ParentAreaMismatchException(String message) {
23-
super(message);
22+
public ParentAreaMismatchException(String parentId) {
23+
super(String.format("Parent item with id %s belongs to a different area than the child item", parentId));
2424
}
2525
}

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/portal_page/exception/ParentNotFoundException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
public class ParentNotFoundException extends ValidationDomainException {
2121

22-
public ParentNotFoundException(String message) {
23-
super(message);
22+
public ParentNotFoundException(String parentId) {
23+
super(String.format("Parent item with id %s does not exist", parentId));
2424
}
2525
}

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/portal_page/exception/ParentTypeMismatchException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
public class ParentTypeMismatchException extends ValidationDomainException {
2121

22-
public ParentTypeMismatchException(String message) {
23-
super(message);
22+
public ParentTypeMismatchException(String parentId) {
23+
super(String.format("Parent item with id %s is not a folder", parentId));
2424
}
2525
}

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/portal_page/exception/PortalPageSpecificationException.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/portal_page/model/PortalNavigationPage.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package io.gravitee.apim.core.portal_page.model;
1717

1818
import jakarta.annotation.Nonnull;
19-
import jakarta.annotation.Nullable;
2019
import lombok.Getter;
2120
import lombok.Setter;
2221

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/portal_page/use_case/CreatePortalNavigationItemUseCase.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,13 @@ private void validate(PortalNavigationItem item) {
7272
if (parentId != null) {
7373
final var parentItem = portalNavigationItemsQueryService.findByIdAndEnvironmentId(item.getEnvironmentId(), parentId);
7474
if (parentItem == null) {
75-
throw new ParentNotFoundException(String.format("Parent item with id %s does not exist", parentId));
75+
throw new ParentNotFoundException(parentId.toString());
7676
}
7777
if (!parentItem.getClass().equals(PortalNavigationFolder.class)) {
78-
throw new ParentTypeMismatchException(String.format("Parent item with id %s is not a folder", parentId));
78+
throw new ParentTypeMismatchException(parentId.toString());
7979
}
8080
if (!parentItem.getArea().equals(item.getArea())) {
81-
throw new ParentAreaMismatchException(
82-
String.format("Parent item with id %s belongs to a different area than the child item", parentId)
83-
);
81+
throw new ParentAreaMismatchException(parentId.toString());
8482
}
8583
}
8684

@@ -90,7 +88,7 @@ private void validate(PortalNavigationItem item) {
9088
item.getArea()
9189
);
9290
if (!existingHomepage.isEmpty()) {
93-
throw new HomepageAlreadyExistsException("Homepage already exists");
91+
throw new HomepageAlreadyExistsException();
9492
}
9593
}
9694

0 commit comments

Comments
 (0)