fix: Fix some more compilation issues

xpdustry · Jun 3, 2024 · 8c6407c · 8c6407c
1 parent 341c977
commit 8c6407c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/...n-rank/src/main/java/com/xpdustry/distributor/api/permission/rank/LinearEnumRankNode.java b/...n-rank/src/main/java/com/xpdustry/distributor/api/permission/rank/LinearEnumRankNode.java
@@ -18,13 +18,14 @@
  */
 package com.xpdustry.distributor.api.permission.rank;
 
+import java.util.Locale;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 record LinearEnumRankNode<E extends Enum<E>>(E value, String namespace, boolean ascending) implements EnumRankNode<E> {
 
  @Override
  public String getName() {
- return this.namespace + "_" + this.value.name().toLowerCase();
+ return this.namespace + "_" + this.value.name().toLowerCase(Locale.ROOT);
  }
 
  @Override

diff --git a/...nk/src/test/java/com/xpdustry/distributor/api/permission/rank/LinearEnumRankNodeTest.java b/...nk/src/test/java/com/xpdustry/distributor/api/permission/rank/LinearEnumRankNodeTest.java
@@ -18,6 +18,7 @@
  */
 package com.xpdustry.distributor.api.permission.rank;
 
+import com.xpdustry.distributor.api.key.Key;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
@@ -29,7 +30,7 @@ public final class LinearEnumRankNodeTest {
  @ParameterizedTest
  @EnumSource(TestRank.class)
  void test_get_previous_ascending(final TestRank current) {
- final var node = new LinearEnumRankNode<>(current, Enum::name, true);
+ final var node = new LinearEnumRankNode<>(current, Key.DISTRIBUTOR_NAMESPACE, true);
  final var expected = current.ordinal() > 0 ? TestRank.values()[current.ordinal() - 1] : null;
  final var assertion = assertThat(node.getPrevious());
  if (expected == null) {
@@ -42,7 +43,7 @@ void test_get_previous_ascending(final TestRank current) {
  @ParameterizedTest
  @EnumSource(TestRank.class)
  void test_get_previous_descending(final TestRank current) {
- final var node = new LinearEnumRankNode<>(current, Enum::name, false);
+ final var node = new LinearEnumRankNode<>(current, Key.DISTRIBUTOR_NAMESPACE, false);
  final var expected =
  current.ordinal() + 1 < TestRank.values().length ? TestRank.values()[current.ordinal() + 1] : null;
  final var assertion = assertThat(node.getPrevious());

diff --git a/.../src/test/java/com/xpdustry/distributor/api/permission/rank/RankPermissionReaderTest.java b/.../src/test/java/com/xpdustry/distributor/api/permission/rank/RankPermissionReaderTest.java
@@ -20,6 +20,7 @@
 
 import com.xpdustry.distributor.api.Distributor;
 import com.xpdustry.distributor.api.DistributorProvider;
+import com.xpdustry.distributor.api.key.Key;
 import com.xpdustry.distributor.api.permission.MutablePermissionTree;
 import com.xpdustry.distributor.api.plugin.MindustryPlugin;
 import com.xpdustry.distributor.api.service.ServiceManager;
@@ -66,8 +67,8 @@ void teardown() {
 
  @Test
  void test_simple() {
- final var rank1 = EnumRankNode.linear(TestRank.LOW, TestRank::name, true);
- final var rank2 = EnumRankNode.linear(TestRank.HIGH, TestRank::name, true);
+ final var rank1 = EnumRankNode.linear(TestRank.LOW, Key.DISTRIBUTOR_NAMESPACE, true);
+ final var rank2 = EnumRankNode.linear(TestRank.HIGH, Key.DISTRIBUTOR_NAMESPACE, true);
  final var permissions1 = MutablePermissionTree.create();
  permissions1.setPermission("test", false);
  final var permissions2 = MutablePermissionTree.create();

diff --git a/.../test/java/com/xpdustry/distributor/api/permission/rank/YamlRankPermissionSourceTest.java b/.../test/java/com/xpdustry/distributor/api/permission/rank/YamlRankPermissionSourceTest.java
@@ -18,6 +18,7 @@
  */
 package com.xpdustry.distributor.api.permission.rank;
 
+import com.xpdustry.distributor.api.key.Key;
 import com.xpdustry.distributor.api.util.TriState;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -35,10 +36,10 @@ public final class YamlRankPermissionSourceTest {
  """
  version: 1
  ranks:
- low:
+ distributor_low:
  test1.sub: false
  test2: true
- high:
+ distributor_high:
  test1: true
  test2: false
  """;
@@ -59,8 +60,8 @@ public final class YamlRankPermissionSourceTest {
  void test_simple() throws IOException {
  final var source = createSource(TEST_CONFIG_VALID);
  source.reload();
- final var rank1 = EnumRankNode.linear(TestRank.LOW, true);
- final var rank2 = EnumRankNode.linear(TestRank.HIGH, true);
+ final var rank1 = EnumRankNode.linear(TestRank.LOW, Key.DISTRIBUTOR_NAMESPACE, true);
+ final var rank2 = EnumRankNode.linear(TestRank.HIGH, Key.DISTRIBUTOR_NAMESPACE, true);
 
  final var permissions1 = source.getRankPermissions(rank1);
  final var permissions2 = source.getRankPermissions(rank2);