Remove ineffectual and unnecessary optional wrapping

1 files changed, 14 insertions, 16 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
index 1e3573091f2..6ef0df9f099 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
@@ -274,22 +274,20 @@ public class RoutingController {
             }
 
             // Register names in DNS
-            Optional<Rotation> rotation = rotationRepository.getRotation(assignedRotation.rotationId());
-            if (rotation.isPresent()) {
-                for (var endpoint : rotationEndpoints) {
-                    controller.nameServiceForwarder().createCname(RecordName.from(endpoint.dnsName()),
-                                                                  RecordData.fqdn(rotation.get().name()),
-                                                                  Priority.normal);
-                    List<String> names = List.of(endpoint.dnsName(),
-                                                 // Include rotation ID as a valid name of this container endpoint
-                                                 // (required by global routing health checks)
-                                                 assignedRotation.rotationId().asString());
-                    containerEndpoints.add(new ContainerEndpoint(assignedRotation.clusterId().value(),
-                                                                 asString(Endpoint.Scope.global),
-                                                                 names,
-                                                                 OptionalInt.empty(),
-                                                                 endpoint.routingMethod()));
-                }
+            Rotation rotation = rotationRepository.requireRotation(assignedRotation.rotationId());
+            for (var endpoint : rotationEndpoints) {
+                controller.nameServiceForwarder().createCname(RecordName.from(endpoint.dnsName()),
+                                                              RecordData.fqdn(rotation.name()),
+                                                              Priority.normal);
+                List<String> names = List.of(endpoint.dnsName(),
+                                             // Include rotation ID as a valid name of this container endpoint
+                                             // (required by global routing health checks)
+                                             assignedRotation.rotationId().asString());
+                containerEndpoints.add(new ContainerEndpoint(assignedRotation.clusterId().value(),
+                                                             asString(Endpoint.Scope.global),
+                                                             names,
+                                                             OptionalInt.empty(),
+                                                             endpoint.routingMethod()));
             }
         }
         // Add endpoints not backed by a rotation (i.e. other routing methods so that the config server always knows