Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(apollo-biz): simplify the code of ReleaseService #4502

Merged
merged 1 commit into from
Aug 6, 2022
Merged

refactor(apollo-biz): simplify the code of ReleaseService #4502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.ctrip.framework.apollo.common.utils.GrayReleaseRuleItemTransformer;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
Expand Down Expand Up @@ -61,7 +62,7 @@ public class ReleaseService {
.newHashSet(ReleaseOperation.GRAY_RELEASE, ReleaseOperation.MASTER_NORMAL_RELEASE_MERGE_TO_GRAY,
ReleaseOperation.MATER_ROLLBACK_MERGE_TO_GRAY);
private static final Pageable FIRST_ITEM = PageRequest.of(0, 1);
private static final Type OPERATION_CONTEXT_TYPE_REFERENCE = new TypeToken<Map<String, Object>>() { }.getType();
private static final Type OPERATION_CONTEXT_TYPE_REFERENCE = new TypeToken<Map<String, Collection<String>>>() { }.getType();

private final ReleaseRepository releaseRepository;
private final ItemService itemService;
Expand Down Expand Up @@ -322,14 +323,20 @@ private Collection<String> getBranchReleaseKeys(long releaseId) {
return null;
}

Map<String, Object> operationContext = GSON
.fromJson(releaseHistories.getContent().get(0).getOperationContext(), OPERATION_CONTEXT_TYPE_REFERENCE);
String operationContextJson = releaseHistories.getContent().get(0).getOperationContext();
if (Strings.isNullOrEmpty(operationContextJson)
|| !operationContextJson.contains(ReleaseOperationContext.BRANCH_RELEASE_KEYS)) {
return null;
}

if (operationContext == null || !operationContext.containsKey(ReleaseOperationContext.BRANCH_RELEASE_KEYS)) {
Map<String, Collection<String>> operationContext = GSON
.fromJson(operationContextJson, OPERATION_CONTEXT_TYPE_REFERENCE);

if (operationContext == null) {
return null;
}

return (Collection<String>) operationContext.get(ReleaseOperationContext.BRANCH_RELEASE_KEYS);
return operationContext.get(ReleaseOperationContext.BRANCH_RELEASE_KEYS);
}

private Release publishBranchNamespace(Namespace parentNamespace, Namespace childNamespace,
Expand Down Expand Up @@ -396,21 +403,18 @@ private Release branchRelease(Namespace parentNamespace, Namespace childNamespac

private Map<String, String> mergeConfiguration(Map<String, String> baseConfigurations,
Map<String, String> coverConfigurations) {
Map<String, String> result = new LinkedHashMap<>();
int expectedSize = baseConfigurations.size() + coverConfigurations.size();
Map<String, String> result = Maps.newLinkedHashMapWithExpectedSize(expectedSize);

//copy base configuration
for (Map.Entry<String, String> entry : baseConfigurations.entrySet()) {
result.put(entry.getKey(), entry.getValue());
}
result.putAll(baseConfigurations);

//update and publish
for (Map.Entry<String, String> entry : coverConfigurations.entrySet()) {
result.put(entry.getKey(), entry.getValue());
}
result.putAll(coverConfigurations);

return result;
}


private Map<String, String> getNamespaceItems(Namespace namespace) {
List<Item> items = itemService.findItemsWithOrdered(namespace.getId());
Map<String, String> configurations = new LinkedHashMap<>();
Expand Down