- if (defaultContent.isPresent())
- EditStrategyType.setDefaultStrategy(EditStrategyType.valueOf(defaultContent.get().getTextContent()));
+ if (defaultContent.isPresent()) {
+ String mergeStrategyString = defaultContent.get().getTextContent();
+ logger.trace("Setting merge strategy to {}", mergeStrategyString);
+ EditStrategyType editStrategyType = EditStrategyType.valueOf(mergeStrategyString);
+ // FIXME: thread safety, remove global state
+ EditStrategyType.setDefaultStrategy(editStrategyType);
+ }
+ // FIXME: thread safety, remove global state
+ Set<ObjectName> instancesForFillingServiceRefMapping = Collections.emptySet();
+ if (EditStrategyType.defaultStrategy() == EditStrategyType.merge) {
+ instancesForFillingServiceRefMapping = Datastore.getInstanceQueryStrategy(targetDatastore, transactionProvider)
+ .queryInstances(configRegistryClient);
+ logger.trace("Pre-filling services from following instances: {}", instancesForFillingServiceRefMapping);
+ }