Merge pull request #177 from jvitrifork/spring-pr

Ease setting environment configuration values
This commit is contained in:
James Agnew
2020-12-04 17:11:24 -05:00
committed by GitHub
4 changed files with 35 additions and 42 deletions

View File

@@ -40,10 +40,7 @@ import org.springframework.http.HttpHeaders;
import org.springframework.web.cors.CorsConfiguration;
import javax.servlet.ServletException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.*;
import java.util.stream.Collectors;
public class BaseJpaRestfulServer extends RestfulServer {
@@ -351,12 +348,12 @@ public class BaseJpaRestfulServer extends RestfulServer {
}
if (appProperties.getImplementationGuides() != null) {
List<AppProperties.ImplementationGuide> guides = appProperties.getImplementationGuides();
for (AppProperties.ImplementationGuide guide : guides) {
Map<String, AppProperties.ImplementationGuide> guides = appProperties.getImplementationGuides();
for (Map.Entry<String, AppProperties.ImplementationGuide> guide : guides.entrySet()) {
packageInstallerSvc.install(new PackageInstallationSpec()
.setPackageUrl(guide.getUrl())
.setName(guide.getName())
.setVersion(guide.getVersion())
.setPackageUrl(guide.getValue().getUrl())
.setName(guide.getValue().getName())
.setVersion(guide.getValue().getVersion())
.setInstallMode(PackageInstallationSpec.InstallModeEnum.STORE_AND_INSTALL));
}
}