Skip to content

Commit 9ebec6e

Browse files
Piotr BelkePiotr Belke
Piotr Belke
authored and
Piotr Belke
committed
Merge remote-tracking branch 'origin/IKC-411-data-masking-policy-delete' into IKC-410-data-masking-policy-form
2 parents e6840da + 76287f3 commit 9ebec6e

21 files changed

+158
-105
lines changed

‎kouncil-backend/pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
53
<modelVersion>4.0.0</modelVersion>
64

75
<artifactId>kouncil-backend</artifactId>
@@ -11,7 +9,7 @@
119
<parent>
1210
<groupId>com.consdata</groupId>
1311
<artifactId>kouncil</artifactId>
14-
<version>1.9-SNAPSHOT</version>
12+
<version>1.10-SNAPSHOT</version>
1513
</parent>
1614

1715
<properties>

‎kouncil-backend/src/main/java/com/consdata/kouncil/broker/BrokersController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.consdata.kouncil.config.BrokerConfig;
66
import com.consdata.kouncil.config.KouncilConfiguration;
77
import com.consdata.kouncil.logging.EntryExitLogger;
8-
import com.consdata.kouncil.model.admin.SystemFunctionName.Fields;
8+
import com.consdata.kouncil.model.admin.SystemFunctionNameConstants;
99
import java.io.IOException;
1010
import java.util.ArrayList;
1111
import java.util.Collection;
@@ -39,7 +39,7 @@ public class BrokersController {
3939

4040
private final KouncilConfiguration kouncilConfiguration;
4141

42-
@RolesAllowed(Fields.BROKERS_LIST)
42+
@RolesAllowed(SystemFunctionNameConstants.BROKERS_LIST)
4343
@GetMapping("/api/brokers")
4444
@EntryExitLogger
4545
public BrokersDto getBrokers(@RequestParam("serverId") String serverId) {
@@ -90,6 +90,7 @@ private void loadJmxMetrics(String serverId, List<KafkaBroker> kafkaBrokers) {
9090
}
9191

9292
@GetMapping("/api/configs/{name}")
93+
@RolesAllowed(SystemFunctionNameConstants.BROKER_DETAILS)
9394
@EntryExitLogger
9495
public Collection<KafkaBrokerConfig> getConfigs(@PathVariable("name") String name, @RequestParam("serverId") String serverId) {
9596
try {

‎kouncil-backend/src/main/java/com/consdata/kouncil/clusters/ClusterController.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.consdata.kouncil.clusters;
22

33
import com.consdata.kouncil.clusters.dto.ClusterDto;
4-
import com.consdata.kouncil.model.admin.SystemFunctionName.Fields;
4+
import com.consdata.kouncil.model.admin.SystemFunctionNameConstants;
55
import javax.annotation.security.RolesAllowed;
66
import lombok.AllArgsConstructor;
77
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -20,37 +20,37 @@ public class ClusterController {
2020

2121
private final ClusterService clusterService;
2222

23-
@RolesAllowed({Fields.CLUSTER_UPDATE, Fields.CLUSTER_DETAILS})
23+
@RolesAllowed({SystemFunctionNameConstants.CLUSTER_UPDATE, SystemFunctionNameConstants.CLUSTER_DETAILS})
2424
@GetMapping(path = "/{clusterName}")
2525
public ClusterDto getClusterByName(@PathVariable("clusterName") String clusterName) {
2626
return clusterService.getClusterByName(clusterName);
2727
}
2828

29-
@RolesAllowed(Fields.CLUSTER_CREATE)
29+
@RolesAllowed(SystemFunctionNameConstants.CLUSTER_CREATE)
3030
@PostMapping
3131
public String addNewCluster(@RequestBody ClusterDto cluster) {
3232
return clusterService.saveCluster(cluster);
3333
}
3434

35-
@RolesAllowed(Fields.CLUSTER_UPDATE)
35+
@RolesAllowed(SystemFunctionNameConstants.CLUSTER_UPDATE)
3636
@PutMapping
3737
public String updateCluster(@RequestBody ClusterDto cluster) {
3838
return clusterService.saveCluster(cluster);
3939
}
4040

41-
@RolesAllowed({Fields.CLUSTER_CREATE, Fields.CLUSTER_UPDATE})
41+
@RolesAllowed({SystemFunctionNameConstants.CLUSTER_CREATE, SystemFunctionNameConstants.CLUSTER_UPDATE})
4242
@PostMapping(path = "/testConnection")
4343
public boolean testConnection(@RequestBody ClusterDto cluster) {
4444
return clusterService.testConnection(cluster);
4545
}
4646

47-
@RolesAllowed({Fields.CLUSTER_CREATE, Fields.CLUSTER_UPDATE})
47+
@RolesAllowed({SystemFunctionNameConstants.CLUSTER_CREATE, SystemFunctionNameConstants.CLUSTER_UPDATE})
4848
@GetMapping(path = "/{clusterName}/isClusterNameUnique")
4949
public boolean isClusterNameUnique(@PathVariable("clusterName") String clusterName) {
5050
return clusterService.isClusterNameUnique(clusterName);
5151
}
5252

53-
@RolesAllowed(Fields.CLUSTER_DELETE)
53+
@RolesAllowed(SystemFunctionNameConstants.CLUSTER_DELETE)
5454
@DeleteMapping(path = "/{id}")
5555
public void deleteCluster(@PathVariable("id") Long id) {
5656
clusterService.deleteCluster(id);

‎kouncil-backend/src/main/java/com/consdata/kouncil/clusters/ClustersController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.consdata.kouncil.clusters;
22

33
import com.consdata.kouncil.clusters.dto.ClustersDto;
4-
import com.consdata.kouncil.model.admin.SystemFunctionName.Fields;
4+
import com.consdata.kouncil.model.admin.SystemFunctionNameConstants;
55
import javax.annotation.security.RolesAllowed;
66
import lombok.AllArgsConstructor;
77
import org.springframework.web.bind.annotation.GetMapping;
@@ -13,7 +13,7 @@ public class ClustersController {
1313

1414
private final ClustersService clustersService;
1515

16-
@RolesAllowed({Fields.TOPIC_LIST, Fields.BROKERS_LIST, Fields.CLUSTER_LIST})
16+
@RolesAllowed({SystemFunctionNameConstants.TOPIC_LIST, SystemFunctionNameConstants.BROKERS_LIST, SystemFunctionNameConstants.CLUSTER_LIST})
1717
@GetMapping(path = "/api/clusters")
1818
public ClustersDto getClusters() {
1919
return clustersService.getClusters();

‎kouncil-backend/src/main/java/com/consdata/kouncil/config/KouncilConfigurationController.java

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

33
import com.consdata.kouncil.KouncilRuntimeException;
44
import com.consdata.kouncil.logging.EntryExitLogger;
5-
import com.consdata.kouncil.model.admin.SystemFunctionName.Fields;
5+
import com.consdata.kouncil.model.admin.SystemFunctionNameConstants;
66
import java.util.Map;
77
import java.util.stream.Collectors;
88
import javax.annotation.security.RolesAllowed;
@@ -22,7 +22,7 @@ public class KouncilConfigurationController {
2222
@Value("${kouncil.context-path:}")
2323
private String contextPath;
2424

25-
@RolesAllowed(Fields.LOGIN)
25+
@RolesAllowed(SystemFunctionNameConstants.LOGIN)
2626
@GetMapping("/connection")
2727
@EntryExitLogger
2828
public Map<String, String> getAllConnections() {

‎kouncil-backend/src/main/java/com/consdata/kouncil/consumergroup/ConsumerGroupController.java

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

33
import com.consdata.kouncil.KafkaConnectionService;
44
import com.consdata.kouncil.config.KouncilConfiguration;
5-
import com.consdata.kouncil.model.admin.SystemFunctionName.Fields;
5+
import com.consdata.kouncil.model.admin.SystemFunctionNameConstants;
66
import java.util.ArrayList;
77
import java.util.Collections;
88
import java.util.List;
@@ -35,7 +35,7 @@ public class ConsumerGroupController {
3535

3636
private final KouncilConfiguration kouncilConfiguration;
3737

38-
@RolesAllowed(Fields.CONSUMER_GROUP_LIST)
38+
@RolesAllowed(SystemFunctionNameConstants.CONSUMER_GROUP_LIST)
3939
@GetMapping("/api/consumer-groups")
4040
public ConsumerGroupsResponse getConsumerGroups(@RequestParam("serverId") String serverId) throws ExecutionException, InterruptedException {
4141
ConsumerGroupsResponse result = ConsumerGroupsResponse
@@ -51,7 +51,7 @@ public ConsumerGroupsResponse getConsumerGroups(@RequestParam("serverId") String
5151
return result;
5252
}
5353

54-
@RolesAllowed(Fields.CONSUMER_GROUP_DETAILS)
54+
@RolesAllowed(SystemFunctionNameConstants.CONSUMER_GROUP_DETAILS)
5555
@GetMapping("/api/consumer-group/{groupId}")
5656
public ConsumerGroupResponse getConsumerGroup(
5757
@PathVariable("groupId") String groupId,
@@ -93,7 +93,7 @@ public ConsumerGroupResponse getConsumerGroup(
9393
return result;
9494
}
9595

96-
@RolesAllowed(Fields.CONSUMER_GROUP_DELETE)
96+
@RolesAllowed(SystemFunctionNameConstants.CONSUMER_GROUP_DELETE)
9797
@DeleteMapping("/api/consumer-group/{groupId}")
9898
public void deleteConsumerGroup(
9999
@PathVariable("groupId") String groupId,

‎kouncil-backend/src/main/java/com/consdata/kouncil/datamasking/PoliciesController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.consdata.kouncil.datamasking;
22

33
import com.consdata.kouncil.datamasking.dto.PolicyDto;
4-
import com.consdata.kouncil.model.admin.SystemFunctionName.Fields;
4+
import com.consdata.kouncil.model.admin.SystemFunctionNameConstants;
55
import java.util.List;
66
import javax.annotation.security.RolesAllowed;
77
import lombok.AllArgsConstructor;
@@ -14,7 +14,7 @@ public class PoliciesController {
1414

1515
private final PoliciesService policyService;
1616

17-
@RolesAllowed({Fields.POLICY_LIST})
17+
@RolesAllowed({SystemFunctionNameConstants.POLICY_LIST})
1818
@GetMapping(path = "/api/policies")
1919
public List<PolicyDto> getPolicies() {
2020
return policyService.getPolicies();

‎kouncil-backend/src/main/java/com/consdata/kouncil/datamasking/PolicyController.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.consdata.kouncil.datamasking;
22

33
import com.consdata.kouncil.datamasking.dto.PolicyDto;
4-
import com.consdata.kouncil.model.admin.SystemFunctionName.Fields;
4+
import com.consdata.kouncil.model.admin.SystemFunctionNameConstants;
55
import javax.annotation.security.RolesAllowed;
66
import lombok.AllArgsConstructor;
77
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -21,25 +21,25 @@ public class PolicyController {
2121

2222
private final PolicyService policyService;
2323

24-
@RolesAllowed({Fields.POLICY_DETAILS, Fields.POLICY_UPDATE})
24+
@RolesAllowed({SystemFunctionNameConstants.POLICY_DETAILS, SystemFunctionNameConstants.POLICY_UPDATE})
2525
@GetMapping(path = "/{policyId}")
2626
public PolicyDto getPolicyById(@PathVariable("policyId") Long id) {
2727
return policyService.getPolicyById(id);
2828
}
2929

30-
@RolesAllowed(Fields.POLICY_CREATE)
30+
@RolesAllowed(SystemFunctionNameConstants.POLICY_CREATE)
3131
@PostMapping()
3232
public void addNewPolicy(@RequestBody PolicyDto policyDto) {
3333
policyService.savePolicy(policyDto);
3434
}
3535

36-
@RolesAllowed(Fields.POLICY_UPDATE)
36+
@RolesAllowed(SystemFunctionNameConstants.POLICY_UPDATE)
3737
@PutMapping()
3838
public void updatePolicy(@RequestBody PolicyDto policyDto) {
3939
policyService.savePolicy(policyDto);
4040
}
4141

42-
@RolesAllowed(Fields.POLICY_DELETE)
42+
@RolesAllowed(SystemFunctionNameConstants.POLICY_DELETE)
4343
@DeleteMapping(path = "/{id}")
4444
public void deletePolicy(@PathVariable("id") Long id) {
4545
policyService.deletePolicy(id);

‎kouncil-backend/src/main/java/com/consdata/kouncil/model/admin/SystemFunctionName.java

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,55 @@
11
package com.consdata.kouncil.model.admin;
22

3-
import lombok.experimental.FieldNameConstants;
4-
5-
@FieldNameConstants(onlyExplicitlyIncluded = true)
63
public enum SystemFunctionName {
74

85
//topic
9-
@FieldNameConstants.Include TOPIC_LIST,
10-
@FieldNameConstants.Include TOPIC_CREATE,
11-
@FieldNameConstants.Include TOPIC_UPDATE,
12-
@FieldNameConstants.Include TOPIC_DELETE,
13-
@FieldNameConstants.Include TOPIC_MESSAGES,
14-
@FieldNameConstants.Include TOPIC_SEND_MESSAGE,
15-
@FieldNameConstants.Include TOPIC_RESEND_MESSAGE,
6+
TOPIC_LIST,
7+
TOPIC_CREATE,
8+
TOPIC_UPDATE,
9+
TOPIC_DELETE,
10+
TOPIC_MESSAGES,
11+
TOPIC_SEND_MESSAGE,
12+
TOPIC_RESEND_MESSAGE,
1613

1714
//broker
18-
@FieldNameConstants.Include BROKERS_LIST,
19-
@FieldNameConstants.Include BROKER_DETAILS,
15+
BROKERS_LIST,
16+
BROKER_DETAILS,
2017

2118
//consumer groups
22-
@FieldNameConstants.Include CONSUMER_GROUP_LIST,
23-
@FieldNameConstants.Include CONSUMER_GROUP_DELETE,
24-
@FieldNameConstants.Include CONSUMER_GROUP_DETAILS,
19+
CONSUMER_GROUP_LIST,
20+
CONSUMER_GROUP_DELETE,
21+
CONSUMER_GROUP_DETAILS,
2522

2623
//track
27-
@FieldNameConstants.Include TRACK_LIST,
24+
TRACK_LIST,
2825

2926
//schemas
30-
@FieldNameConstants.Include SCHEMA_LIST,
31-
@FieldNameConstants.Include SCHEMA_DETAILS,
32-
@FieldNameConstants.Include SCHEMA_CREATE,
33-
@FieldNameConstants.Include SCHEMA_UPDATE,
34-
@FieldNameConstants.Include SCHEMA_DELETE,
27+
SCHEMA_LIST,
28+
SCHEMA_DETAILS,
29+
SCHEMA_CREATE,
30+
SCHEMA_UPDATE,
31+
SCHEMA_DELETE,
3532

3633
//clusters
37-
@FieldNameConstants.Include CLUSTER_LIST,
38-
@FieldNameConstants.Include CLUSTER_CREATE,
39-
@FieldNameConstants.Include CLUSTER_UPDATE,
40-
@FieldNameConstants.Include CLUSTER_DETAILS,
41-
@FieldNameConstants.Include CLUSTER_DELETE,
34+
CLUSTER_LIST,
35+
CLUSTER_CREATE,
36+
CLUSTER_UPDATE,
37+
CLUSTER_DETAILS,
38+
CLUSTER_DELETE,
4239

4340
//admin
44-
@FieldNameConstants.Include LOGIN,
45-
@FieldNameConstants.Include USER_GROUPS,
46-
@FieldNameConstants.Include USER_GROUPS_LIST,
47-
@FieldNameConstants.Include USER_GROUP_CREATE,
48-
@FieldNameConstants.Include USER_GROUP_UPDATE,
49-
@FieldNameConstants.Include USER_GROUP_DELETE,
41+
LOGIN,
42+
USER_GROUPS,
43+
USER_GROUPS_LIST,
44+
USER_GROUP_CREATE,
45+
USER_GROUP_UPDATE,
46+
USER_GROUP_DELETE,
5047

5148
//data masking
52-
@FieldNameConstants.Include POLICY_LIST,
53-
@FieldNameConstants.Include POLICY_CREATE,
54-
@FieldNameConstants.Include POLICY_DETAILS,
55-
@FieldNameConstants.Include POLICY_UPDATE,
56-
@FieldNameConstants.Include POLICY_DELETE
49+
POLICY_LIST,
50+
POLICY_CREATE,
51+
POLICY_DETAILS,
52+
POLICY_UPDATE,
53+
POLICY_DELETE
5754

5855
}

‎kouncil-backend/src/main/java/com/consdata/kouncil/model/admin/SystemFunctionNameConstants.java

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
package com.consdata.kouncil.model.admin;
2+
3+
import lombok.AccessLevel;
4+
import lombok.NoArgsConstructor;
5+
6+
@NoArgsConstructor(access = AccessLevel.PRIVATE)
7+
public class SystemFunctionNameConstants {
8+
9+
//topic
10+
public static final String TOPIC_LIST = "TOPIC_LIST";
11+
public static final String TOPIC_CREATE = "TOPIC_CREATE";
12+
public static final String TOPIC_UPDATE = "TOPIC_UPDATE";
13+
public static final String TOPIC_DELETE = "TOPIC_DELETE";
14+
public static final String TOPIC_MESSAGES = "TOPIC_MESSAGES";
15+
public static final String TOPIC_SEND_MESSAGE = "TOPIC_SEND_MESSAGE";
16+
public static final String TOPIC_RESEND_MESSAGE = "TOPIC_RESEND_MESSAGE";
17+
18+
//broker
19+
public static final String BROKERS_LIST = "BROKERS_LIST";
20+
public static final String BROKER_DETAILS = "BROKER_DETAILS";
21+
22+
//consumer groups
23+
public static final String CONSUMER_GROUP_LIST = "CONSUMER_GROUP_LIST";
24+
public static final String CONSUMER_GROUP_DELETE = "CONSUMER_GROUP_DELETE";
25+
public static final String CONSUMER_GROUP_DETAILS = "CONSUMER_GROUP_DETAILS";
26+
27+
//track
28+
public static final String TRACK_LIST = "TRACK_LIST";
29+
30+
//schemas
31+
public static final String SCHEMA_LIST = "SCHEMA_LIST";
32+
public static final String SCHEMA_DETAILS = "SCHEMA_DETAILS";
33+
public static final String SCHEMA_CREATE = "SCHEMA_CREATE";
34+
public static final String SCHEMA_UPDATE = "SCHEMA_UPDATE";
35+
public static final String SCHEMA_DELETE = "SCHEMA_DELETE";
36+
37+
//clusters
38+
public static final String CLUSTER_LIST = "CLUSTER_LIST";
39+
public static final String CLUSTER_CREATE = "CLUSTER_CREATE";
40+
public static final String CLUSTER_UPDATE = "CLUSTER_UPDATE";
41+
public static final String CLUSTER_DETAILS = "CLUSTER_DETAILS";
42+
public static final String CLUSTER_DELETE = "CLUSTER_DELETE";
43+
44+
//admin
45+
public static final String LOGIN = "LOGIN";
46+
public static final String USER_GROUPS = "USER_GROUPS";
47+
public static final String USER_GROUPS_LIST = "USER_GROUPS_LIST";
48+
public static final String USER_GROUP_CREATE = "USER_GROUP_CREATE";
49+
public static final String USER_GROUP_UPDATE = "USER_GROUP_UPDATE";
50+
public static final String USER_GROUP_DELETE = "USER_GROUP_DELETE";
51+
52+
public static final String POLICY_LIST = "POLICY_LIST";
53+
public static final String POLICY_CREATE = "POLICY_CREATE";
54+
public static final String POLICY_DETAILS = "POLICY_DETAILS";
55+
public static final String POLICY_UPDATE = "POLICY_UPDATE";
56+
public static final String POLICY_DELETE = "POLICY_DELETE";
57+
}

0 commit comments

Comments
 (0)