zhouxy108/plusone-commons
1
0
Fork 0
forked from plusone/plusone-commons
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	pom.xml
#	src/main/java/xyz/zhouxy/plusone/commons/util/ArrayUtil.java
#	src/main/java/xyz/zhouxy/plusone/commons/util/Enumeration.java
#	src/main/java/xyz/zhouxy/plusone/commons/util/RestfulResult.java
#	src/test/java/xyz/zhouxy/plusone/commons/EnumerationTests.java
#	src/test/java/xyz/zhouxy/plusone/commons/util/RestfulResultTest.java
This commit is contained in:
ZhouXY108
2023-04-15 21:52:15 +08:00
parent 96784e1263 1959d1b2cb
commit 728fab165e
9 changed files with 312 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/xyz/zhouxy/plusone/commons/util/Enumeration.java
View File

@@ -21,6 +21,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
/**
@@ -40,7 +41,6 @@ public abstract class Enumeration<T extends Enumeration<T>> implements Comparabl
return id;
}
@Nonnull
public final String getName() {
return name;
}
@@ -68,7 +68,6 @@ public abstract class Enumeration<T extends Enumeration<T>> implements Comparabl
}
@Override
@Nonnull
public final String toString() {
return getClass().getSimpleName() + '(' + id + ":" + name + ')';
}
@@ -87,14 +86,13 @@ public abstract class Enumeration<T extends Enumeration<T>> implements Comparabl
this.values.put(value.getId(), value);
}
@Nonnull
@CheckForNull
public T get(final int id) {
return Objects.requireNonNull(this.values.get(id));
return this.values.get(id);
}
@Nonnull
public Collection<T> getValues() {
return Objects.requireNonNull(this.values.values());
return this.values.values();
}
}
}