zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

Add short component

Browse source
This commit is contained in:
Alexander Söderberg 2020-09-12 19:11:28 +02:00
parent c37749ee78
commit 80af88b8e8
No known key found for this signature in database
GPG key ID: C0207FF7EA146678
2 changed files with 238 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cloud-core/src/main/java/com/intellectualsites/commands/components/standard/LongComponent.java
View file

@ -30,8 +30,8 @@ import com.intellectualsites.commands.context.CommandContext;
import com.intellectualsites.commands.exceptions.parsing.NumberParseException;
import com.intellectualsites.commands.sender.CommandSender;
import java.util.Queue;
import javax.annotation.Nonnull;
import java.util.Queue;
@SuppressWarnings("unused")
public final class LongComponent<C extends CommandSender> extends CommandComponent<C, Long> {
@ -95,7 +95,7 @@ public final class LongComponent<C extends CommandSender> extends CommandCompone
*/
@Nonnull
public static <C extends CommandSender> CommandComponent<C, Long> optional(@Nonnull final String name,
final int defaultNum) {
final long defaultNum) {
return LongComponent.<C>newBuilder(name).asOptionalWithDefault(Long.toString(defaultNum)).build();
}
@ -116,7 +116,7 @@ public final class LongComponent<C extends CommandSender> extends CommandCompone
* @return Builder instance
*/
@Nonnull
public Builder<C> withMin(final int min) {
public Builder<C> withMin(final long min) {
this.min = min;
return this;
}
@ -128,7 +128,7 @@ public final class LongComponent<C extends CommandSender> extends CommandCompone
* @return Builder instance
*/
@Nonnull
public Builder<C> withMax(final int max) {
public Builder<C> withMax(final long max) {
this.max = max;
return this;
}

234
cloud-core/src/main/java/com/intellectualsites/commands/components/standard/ShortComponent.java Normal file
View file

@ -0,0 +1,234 @@
//
// MIT License
//
// Copyright (c) 2020 Alexander Söderberg
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//
package com.intellectualsites.commands.components.standard;
import com.intellectualsites.commands.components.CommandComponent;
import com.intellectualsites.commands.components.parser.ComponentParseResult;
import com.intellectualsites.commands.components.parser.ComponentParser;
import com.intellectualsites.commands.context.CommandContext;
import com.intellectualsites.commands.exceptions.parsing.NumberParseException;
import com.intellectualsites.commands.sender.CommandSender;
import javax.annotation.Nonnull;
import java.util.Queue;
@SuppressWarnings("unused")
public final class ShortComponent<C extends CommandSender> extends CommandComponent<C, Short> {
private final short min;
private final short max;
private ShortComponent(final boolean required,
@Nonnull final String name,
final short min,
final short max,
final String defaultValue) {
super(required, name, new ShortParser<>(min, max), defaultValue);
this.min = min;
this.max = max;
}
/**
* Create a new builder
*
* @param name Name of the component
* @param <C> Command sender type
* @return Created builder
*/
@Nonnull
public static <C extends CommandSender> ShortComponent.Builder<C> newBuilder(@Nonnull final String name) {
return new Builder<>(name);
}
/**
* Create a new required command component
*
* @param name Component name
* @param <C> Command sender type
* @return Created component
*/
@Nonnull
public static <C extends CommandSender> CommandComponent<C, Short> required(@Nonnull final String name) {
return ShortComponent.<C>newBuilder(name).asRequired().build();
}
/**
* Create a new optional command component
*
* @param name Component name
* @param <C> Command sender type
* @return Created component
*/
@Nonnull
public static <C extends CommandSender> CommandComponent<C, Short> optional(@Nonnull final String name) {
return ShortComponent.<C>newBuilder(name).asOptional().build();
}
/**
* Create a new required command component with a default value
*
* @param name Component name
* @param defaultNum Default num
* @param <C> Command sender type
* @return Created component
*/
@Nonnull
public static <C extends CommandSender> CommandComponent<C, Short> optional(@Nonnull final String name,
final short defaultNum) {
return ShortComponent.<C>newBuilder(name).asOptionalWithDefault(Short.toString(defaultNum)).build();
}
public static final class Builder<C extends CommandSender> extends CommandComponent.Builder<C, Short> {
private short min = Short.MIN_VALUE;
private short max = Short.MAX_VALUE;
protected Builder(@Nonnull final String name) {
super(name);
}
/**
* Set a minimum value
*
* @param min Minimum value
* @return Builder instance
*/
@Nonnull
public Builder<C> withMin(final short min) {
this.min = min;
return this;
}
/**
* Set a maximum value
*
* @param max Maximum value
* @return Builder instance
*/
@Nonnull
public Builder<C> withMax(final short max) {
this.max = max;
return this;
}
/**
* Builder a new short component
*
* @return Constructed component
*/
@Nonnull
@Override
public ShortComponent<C> build() {
return new ShortComponent<>(this.isRequired(), this.getName(), this.min, this.max, this.getDefaultValue());
}
}
/**
* Get the minimum accepted short that could have been parsed
*
* @return Minimum short
*/
public short getMin() {
return this.min;
}
/**
* Get the maximum accepted short that could have been parsed
*
* @return Maximum short
*/
public short getMax() {
return this.max;
}
private static final class ShortParser<C extends CommandSender> implements ComponentParser<C, Short> {
private final short min;
private final short max;
private ShortParser(final short min, final short max) {
this.min = min;
this.max = max;
}
@Nonnull
@Override
public ComponentParseResult<Short> parse(
@Nonnull final CommandContext<C> commandContext,
@Nonnull final Queue<String> inputQueue) {
final String input = inputQueue.peek();
if (input == null) {
return ComponentParseResult.failure(new NullPointerException("No input was provided"));
}
try {
final short value = Short.parseShort(input);
if (value < this.min || value > this.max) {
return ComponentParseResult.failure(new ShortParseException(input, this.min, this.max));
}
inputQueue.remove();
return ComponentParseResult.success(value);
} catch (final Exception e) {
return ComponentParseResult.failure(new ShortParseException(input, this.min, this.max));
}
}
}
public static final class ShortParseException extends NumberParseException {
/**
* Construct a new short parse exception
*
* @param input String input
* @param min Minimum value
* @param max Maximum value
*/
public ShortParseException(@Nonnull final String input, final short min, final short max) {
super(input, min, max);
}
@Override
public boolean hasMin() {
return this.getMin().shortValue() != Short.MIN_VALUE;
}
@Override
public boolean hasMax() {
return this.getMax().shortValue() != Short.MAX_VALUE;
}
@Override
@Nonnull
public String getNumberType() {
return "short";
}
}
}