sunxi92 commented on a change in pull request #3761:
URL: https://github.com/apache/rocketmq/pull/3761#discussion_r790222796
##########
File path:
acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
##########
@@ -91,37 +125,51 @@ public void load() {
for (PlainAccessConfig plainAccessConfig : plainAccessConfigList) {
PlainAccessResource plainAccessResource =
buildPlainAccessResource(plainAccessConfig);
plainAccessResourceMap.put(plainAccessResource.getAccessKey(),
plainAccessResource);
+ this.accessKeyTable.put(plainAccessResource.getAccessKey(),
aclFilePath);
}
}
// For loading dataversion part just
JSONArray tempDataVersion =
plainAclConfData.getJSONArray(AclConstants.CONFIG_DATA_VERSION);
+ DataVersion dataVersion = new DataVersion();
if (tempDataVersion != null && !tempDataVersion.isEmpty()) {
- List<DataVersion> dataVersion =
tempDataVersion.toJavaList(DataVersion.class);
- DataVersion firstElement = dataVersion.get(0);
- this.dataVersion.assignNewOne(firstElement);
+ List<DataVersion> dataVersions =
tempDataVersion.toJavaList(DataVersion.class);
+ DataVersion firstElement = dataVersions.get(0);
+ dataVersion.assignNewOne(firstElement);
}
this.globalWhiteRemoteAddressStrategy =
globalWhiteRemoteAddressStrategy;
- this.plainAccessResourceMap = plainAccessResourceMap;
+ this.aclPlainAccessResourceMap.put(aclFilePath,
plainAccessResourceMap);
+ this.dataVersionMap.put(aclFilePath, dataVersion);
}
- public String getAclConfigDataVersion() {
- return this.dataVersion.toJson();
+ public Map<String, DataVersion> getAclConfigDataVersion() {
+ return this.dataVersionMap;
}
- private Map<String, Object> updateAclConfigFileVersion(Map<String, Object>
updateAclConfigMap) {
+ public Map<String, Object> updateAclConfigFileVersion(Map<String, Object>
updateAclConfigMap) {
+ Object dataVersions =
updateAclConfigMap.get(AclConstants.CONFIG_DATA_VERSION);
+ DataVersion dataVersion = new DataVersion();
+ List<Map<String, Object>> dataVersionList = new ArrayList<Map<String,
Object>>();
Review comment:
done
##########
File path:
acl/src/main/java/org/apache/rocketmq/acl/plain/PlainPermissionManager.java
##########
@@ -91,37 +125,51 @@ public void load() {
for (PlainAccessConfig plainAccessConfig : plainAccessConfigList) {
PlainAccessResource plainAccessResource =
buildPlainAccessResource(plainAccessConfig);
plainAccessResourceMap.put(plainAccessResource.getAccessKey(),
plainAccessResource);
+ this.accessKeyTable.put(plainAccessResource.getAccessKey(),
aclFilePath);
}
}
// For loading dataversion part just
JSONArray tempDataVersion =
plainAclConfData.getJSONArray(AclConstants.CONFIG_DATA_VERSION);
+ DataVersion dataVersion = new DataVersion();
if (tempDataVersion != null && !tempDataVersion.isEmpty()) {
- List<DataVersion> dataVersion =
tempDataVersion.toJavaList(DataVersion.class);
- DataVersion firstElement = dataVersion.get(0);
- this.dataVersion.assignNewOne(firstElement);
+ List<DataVersion> dataVersions =
tempDataVersion.toJavaList(DataVersion.class);
+ DataVersion firstElement = dataVersions.get(0);
+ dataVersion.assignNewOne(firstElement);
}
this.globalWhiteRemoteAddressStrategy =
globalWhiteRemoteAddressStrategy;
- this.plainAccessResourceMap = plainAccessResourceMap;
+ this.aclPlainAccessResourceMap.put(aclFilePath,
plainAccessResourceMap);
+ this.dataVersionMap.put(aclFilePath, dataVersion);
}
- public String getAclConfigDataVersion() {
- return this.dataVersion.toJson();
+ public Map<String, DataVersion> getAclConfigDataVersion() {
+ return this.dataVersionMap;
}
- private Map<String, Object> updateAclConfigFileVersion(Map<String, Object>
updateAclConfigMap) {
+ public Map<String, Object> updateAclConfigFileVersion(Map<String, Object>
updateAclConfigMap) {
+ Object dataVersions =
updateAclConfigMap.get(AclConstants.CONFIG_DATA_VERSION);
+ DataVersion dataVersion = new DataVersion();
+ List<Map<String, Object>> dataVersionList = new ArrayList<Map<String,
Object>>();
+ if (dataVersions != null) {
+ dataVersionList = (List<Map<String, Object>>) dataVersions;
+ dataVersion.setTimestamp((long)
dataVersionList.get(0).get("timestamp"));
Review comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
