summaryrefslogtreecommitdiffstats
path: root/application-preprocessor
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2017-12-08 16:07:50 +0100
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2017-12-08 16:07:50 +0100
commitbfcf0064501b526e6e57e459f72a46d5ba7d086d (patch)
tree9b5cd9cbe29d5cee22179204638fb4ddea02e451 /application-preprocessor
parent6b818dccd5460d785d5452a6a961bb637501c574 (diff)
Replaced inheritance with delegation
Diffstat (limited to 'application-preprocessor')
-rw-r--r--application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java b/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java
index e879acef3bb..303ce3e8d29 100644
--- a/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java
+++ b/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java
@@ -39,9 +39,9 @@ public class ApplicationPreprocessor {
FilesApplicationPackage.Builder applicationPackageBuilder = new FilesApplicationPackage.Builder(applicationDir);
outputDir.ifPresent(applicationPackageBuilder::preprocessedDir);
ApplicationPackage preprocessed = applicationPackageBuilder.build().preprocess(
- new Zone(environment.orElse(Environment.defaultEnvironment()), region.orElse(RegionName.defaultName())),
- (a, b) -> {
- }, logger);
+ ZoneId.from(environment.orElse(Environment.defaultEnvironment()), region.orElse(RegionName.defaultName())),
+ (a, b) -> { },
+ logger);
preprocessed.validateXML();
}