diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-09-10 12:42:39 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-09-10 12:42:39 +0200 |
| commit | dd399fbae6ba29d1aab616fe4c82b5af6c87b7dd (patch) | |
| tree | 9d5898402a543d05b81f11d18479297c7b4c39fc /controller-server | |
| parent | 792ecacdd9eac0a0c7bbe05f28d598f6e0f8f70a (diff) | |
Simplify
Diffstat (limited to 'controller-server')
2 files changed, 2 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java index 302c7863d92..97810b9de80 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageDiff.java @@ -81,9 +81,7 @@ public class ApplicationPackageDiff { private static List<String> lines(byte[] data) { List<String> lines = new ArrayList<>(Math.min(16, data.length / 100)); - try (ByteArrayInputStream stream = new ByteArrayInputStream(data); - InputStreamReader streamReader = new InputStreamReader(stream, StandardCharsets.UTF_8); - BufferedReader bufferedReader = new BufferedReader(streamReader)) { + try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data), StandardCharsets.UTF_8))) { String line; while ((line = bufferedReader.readLine()) != null) { lines.add(line); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java index 122db567a61..da5282d8e93 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java @@ -441,8 +441,7 @@ public class JobController { revision.map(SourceRevision::commit), false)); byte[] diff = application.get().latestVersion() - .map(ApplicationVersion::buildNumber) - .flatMap(build -> build.isPresent() ? Optional.of(build.getAsLong()) : Optional.empty()) + .map(v -> v.buildNumber().getAsLong()) .flatMap(prevBuild -> controller.applications().applicationStore().find(id.tenant(), id.application(), prevBuild)) .map(prevApplication -> ApplicationPackageDiff.diff(new ApplicationPackage(prevApplication), applicationPackage)) .orElseGet(() -> ApplicationPackageDiff.diffAgainstEmpty(applicationPackage)); |