Skip to content

Commit a1af0c5

Browse files
biharitomischfeca75
authored andcommitted
CLOUD-91823 fix hdp/hdf version in stack response
1 parent db6922b commit a1af0c5

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

core/src/main/java/com/sequenceiq/cloudbreak/converter/StackToStackResponseConverter.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.springframework.core.convert.ConversionService;
1616
import org.springframework.core.convert.TypeDescriptor;
1717
import org.springframework.stereotype.Component;
18+
import org.springframework.util.StringUtils;
1819

1920
import com.google.common.collect.Maps;
2021
import com.sequenceiq.cloudbreak.api.model.CloudbreakDetailsJson;
@@ -207,14 +208,11 @@ private StackResponse convertComponentConfig(StackResponse stackJson, Stack sour
207208
if (source.getCluster() != null) {
208209
StackRepoDetails stackRepoDetails = clusterComponentConfigProvider.getHDPRepo(source.getCluster().getId());
209210
if (stackRepoDetails != null && stackRepoDetails.getStack() != null) {
210-
for (String key : stackRepoDetails.getStack().keySet()) {
211-
if (!"repoid".equals(key)) {
212-
String[] split = stackRepoDetails.getStack().get(key).split("/");
213-
stackJson.setHdpVersion(split[split.length - 1]);
214-
break;
215-
}
216-
}
217-
if (stackJson.getHdpVersion() == null) {
211+
212+
String repositoryVersion = stackRepoDetails.getStack().get(StackRepoDetails.REPOSITORY_VERSION);
213+
if (!StringUtils.isEmpty(repositoryVersion)) {
214+
stackJson.setHdpVersion(repositoryVersion);
215+
} else {
218216
stackJson.setHdpVersion(stackRepoDetails.getHdpVersion());
219217
}
220218
}

0 commit comments

Comments
 (0)