Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,20 @@
import java.util.Collection;
import java.util.concurrent.CompletableFuture;

/**
* @deprecated {@link BooleanArgumentType}
*/
@Deprecated
public class BoolArgumentType implements ArgumentType<Boolean> {
private static final Collection<String> EXAMPLES = Arrays.asList("true", "false");

private BoolArgumentType() {
}

/**
* @deprecated {@link BooleanArgumentType#booleanArg()}
*/
@Deprecated
public static BoolArgumentType bool() {
return new BoolArgumentType();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license.

package com.mojang.brigadier.arguments;

import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.mojang.brigadier.suggestion.Suggestions;
import com.mojang.brigadier.suggestion.SuggestionsBuilder;

import java.util.Arrays;
import java.util.Collection;
import java.util.concurrent.CompletableFuture;

public class BooleanArgumentType implements ArgumentType<Boolean> {
private static final Collection<String> EXAMPLES = Arrays.asList("true", "false");

private BooleanArgumentType() {
}

public static BooleanArgumentType booleanArg() {
return new BooleanArgumentType();
}

public static boolean getBoolean(final CommandContext<?> context, final String name) {
return context.getArgument(name, Boolean.class);
}

@Override
public Boolean parse(final StringReader reader) throws CommandSyntaxException {
return reader.readBoolean();
}

@Override
public <S> CompletableFuture<Suggestions> listSuggestions(final CommandContext<S> context, final SuggestionsBuilder builder) {
if ("true".startsWith(builder.getRemainingLowerCase())) {
builder.suggest("true");
}
if ("false".startsWith(builder.getRemainingLowerCase())) {
builder.suggest("false");
}
return builder.buildFuture();
}

@Override
public Collection<String> getExamples() {
return EXAMPLES;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;

import static com.mojang.brigadier.arguments.BoolArgumentType.bool;
import static com.mojang.brigadier.arguments.BooleanArgumentType.booleanArg;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

@RunWith(MockitoJUnitRunner.class)
public class BoolArgumentTypeTest {
private BoolArgumentType type;
public class BooleanArgumentTypeTest {
private BooleanArgumentType type;
@Mock
private CommandContextBuilder<Object> context;

@Before
public void setUp() throws Exception {
type = bool();
type = booleanArg();
}

@Test
Expand Down