avoid pekko option (#709)

* avoid pekko option

* javafmt

* Update SecurityDirectivesExamplesTest.java

Author: pjfanning

docs/src/test/java/docs/http/javadsl/server/directives/SecurityDirectivesExamplesTest.java

@@ -27,12 +27,11 @@
 
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
-import java.util.Optional;
-import org.apache.pekko.japi.Option;
 
 // #authenticateBasic
 import org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
@@ -313,7 +312,7 @@ public void testAuthenticateBasicAsync() {
   @Test
   public void testAuthenticateOrRejectWithChallenge() {
     // #authenticateOrRejectWithChallenge
-    final HttpChallenge challenge = HttpChallenge.create("MyAuth", new Option.Some<>("MyRealm"));
+    final HttpChallenge challenge = HttpChallenge.create("MyAuth", Optional.of("MyRealm"));
 
     // your custom authentication logic:
     final Function<HttpCredentials, Boolean> auth = credentials -> true;

http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpChallenge.java

@@ -15,9 +15,11 @@
 
 import org.apache.pekko.http.impl.util.Util;
 import org.apache.pekko.japi.Option;
+import org.apache.pekko.util.OptionConverters;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 public abstract class HttpChallenge {
   public abstract String scheme();
@@ -27,31 +29,48 @@ public abstract class HttpChallenge {
   public abstract Map<String, String> getParams();
 
   public static HttpChallenge create(String scheme, String realm) {
-    return create(scheme, Option.option(realm));
+    return create(scheme, Optional.of(realm));
   }
 
   public static HttpChallenge create(String scheme, String realm, Map<String, String> params) {
-    return create(scheme, Option.option(realm), params);
+    return create(scheme, Optional.of(realm), params);
   }
 
+  /** @deprecated Use {@link #create(String, Optional)} instead. */
+  @Deprecated // since 1.3.0
   public static HttpChallenge create(String scheme, Option<String> realm) {
     return org.apache.pekko.http.scaladsl.model.headers.HttpChallenge.apply(
         scheme, realm.asScala(), Util.emptyMap);
   }
 
+  /** @since 1.3.0 */
+  public static HttpChallenge create(String scheme, Optional<String> realm) {
+    return org.apache.pekko.http.scaladsl.model.headers.HttpChallenge.apply(
+        scheme, OptionConverters.toScala(realm), Util.emptyMap);
+  }
+
+  /** @deprecated Use {@link #create(String, Optional, Map<String, String>)} instead. */
+  @Deprecated // since 1.3.0
   public static HttpChallenge create(
       String scheme, Option<String> realm, Map<String, String> params) {
     return org.apache.pekko.http.scaladsl.model.headers.HttpChallenge.apply(
         scheme, realm.asScala(), Util.convertMapToScala(params));
   }
 
+  /** @since 1.3.0 */
+  public static HttpChallenge create(
+      String scheme, Optional<String> realm, Map<String, String> params) {
+    return org.apache.pekko.http.scaladsl.model.headers.HttpChallenge.apply(
+        scheme, OptionConverters.toScala(realm), Util.convertMapToScala(params));
+  }
+
   public static HttpChallenge createBasic(String realm) {
     Map<String, String> params = new HashMap<String, String>();
     params.put("charset", "UTF-8");
-    return create("Basic", Option.option(realm), params);
+    return create("Basic", Optional.of(realm), params);
   }
 
   public static HttpChallenge createOAuth2(String realm) {
-    return create("Bearer", Option.option(realm));
+    return create("Bearer", Optional.of(realm));
   }
 }