Skip to content

avoid pekko Java API Option class #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pjfanning merged 3 commits into from
Aug 5, 2025
Merged

avoid pekko Java API Option class #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
390736d
avoid pekko option
pjfanning Aug 4, 2025
4aad49d
javafmt
pjfanning Aug 4, 2025
6acad29
Update SecurityDirectivesExamplesTest.java
pjfanning Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions docs/src/test/java/docs/http/javadsl/server/directives/SecurityDirectivesExamplesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
27 changes: 23 additions & 4 deletions http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpChallenge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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));
}
}
Loading