various changes over the past few months

KyoriPowered · Jan 27, 2020 · 5334373 · 5334373
1 parent 94b508f
commit 5334373
Show file tree

Hide file tree

Showing 24 changed files with 113 additions and 186 deletions.
diff --git a/build.gradle b/build.gradle
@@ -32,7 +32,7 @@ repositories {
 }
 
 dependencies {
-  api 'net.kyori:component:1.0.0-SNAPSHOT'
+  api 'net.kyori:feature:1.0.0-SNAPSHOT'
   api 'net.kyori:examination-api:1.0.0-SNAPSHOT'
   api 'org.checkerframework:checker-qual:2.8.2'
   testImplementation 'com.google.guava:guava-testlib:28.0-jre'
@@ -60,6 +60,7 @@ publishing {
 
       pom {
         name = project.name
+        url = 'https://github.com/KyoriPowered/filter'
         description = project.description
 
         developers {
@@ -91,6 +92,6 @@ publishing {
 }
 
 signing {
-  required { project.hasProperty('signing.keyId') && gradle.taskGraph.hasTask(':publish') && project.version.endsWith('-SNAPSHOT') }
+  required { project.hasProperty('signing.keyId') && gradle.taskGraph.hasTask(':publish') && !project.version.endsWith('-SNAPSHOT') }
   sign publishing.publications.maven
 }
diff --git a/header.txt b/header.txt
@@ -1,6 +1,6 @@
 This file is part of filter, licensed under the MIT License.
 
-Copyright (c) 2018-2019 KyoriPowered
+Copyright (c) 2018-2020 KyoriPowered
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/license.txt b/license.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2019 KyoriPowered
+Copyright (c) 2018-2020 KyoriPowered
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/net/kyori/filter/AllFilter.java b/src/main/java/net/kyori/filter/AllFilter.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,11 +30,12 @@
  * A filter that responds with {@link FilterResponse#ALLOW} if all of its children also respond with {@link FilterResponse#ALLOW}.
  */
 public final class AllFilter extends MultiFilter {
-  protected AllFilter(final @NonNull Iterable<? extends Filter> filters) {
+  AllFilter(final @NonNull Iterable<? extends Filter> filters) {
     super(filters);
   }
 
   @Override
+  @SuppressWarnings("ForLoopReplaceableByForEach")
   public @NonNull FilterResponse query(final @NonNull FilterQuery query) {
     FilterResponse response = FilterResponse.ABSTAIN;
     final List<? extends Filter> filters = this.filters;

diff --git a/src/main/java/net/kyori/filter/AnyFilter.java b/src/main/java/net/kyori/filter/AnyFilter.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,11 +30,12 @@
  * A filter that responds with {@link FilterResponse#ALLOW} if any of its children respond with {@link FilterResponse#ALLOW}.
  */
 public final class AnyFilter extends MultiFilter {
-  protected AnyFilter(final @NonNull Iterable<? extends Filter> filters) {
+  AnyFilter(final @NonNull Iterable<? extends Filter> filters) {
     super(filters);
   }
 
   @Override
+  @SuppressWarnings("ForLoopReplaceableByForEach")
   public @NonNull FilterResponse query(final @NonNull FilterQuery query) {
     FilterResponse response = FilterResponse.ABSTAIN;
     final List<? extends Filter> filters = this.filters;

diff --git a/src/main/java/net/kyori/filter/Filter.java b/src/main/java/net/kyori/filter/Filter.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,13 +23,13 @@
  */
 package net.kyori.filter;
 
-import net.kyori.component.Component;
+import net.kyori.feature.Feature;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * A filter.
  */
-public interface Filter extends Component {
+public interface Filter extends Feature {
   /**
    * Query this filter for a response.
    *

diff --git a/src/main/java/net/kyori/filter/FilterQuery.java b/src/main/java/net/kyori/filter/FilterQuery.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/net/kyori/filter/FilterResponse.java b/src/main/java/net/kyori/filter/FilterResponse.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/net/kyori/filter/Filters.java b/src/main/java/net/kyori/filter/Filters.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/net/kyori/filter/MultiFilter.java b/src/main/java/net/kyori/filter/MultiFilter.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,9 +27,9 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
-import net.kyori.component.Component;
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
+import net.kyori.feature.Feature;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -51,7 +51,7 @@ protected MultiFilter(final @NonNull Iterable<? extends Filter> filters) {
   }
 
   @Override
-  public @NonNull Stream<? extends Component> dependencies() {
+  public @NonNull Stream<? extends Feature> dependencies() {
     return this.filters.stream();
   }
 

diff --git a/src/main/java/net/kyori/filter/NotFilter.java b/src/main/java/net/kyori/filter/NotFilter.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/net/kyori/filter/SingleFilter.java b/src/main/java/net/kyori/filter/SingleFilter.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,9 +25,9 @@
 
 import java.util.Objects;
 import java.util.stream.Stream;
-import net.kyori.component.Component;
 import net.kyori.examination.Examinable;
 import net.kyori.examination.ExaminableProperty;
+import net.kyori.feature.Feature;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -42,7 +42,7 @@ protected SingleFilter(final @NonNull Filter filter) {
   }
 
   @Override
-  public @NonNull Stream<? extends Component> dependencies() {
+  public @NonNull Stream<? extends Feature> dependencies() {
     return Stream.of(this.filter);
   }
 

diff --git a/src/main/java/net/kyori/filter/StaticFilter.java b/src/main/java/net/kyori/filter/StaticFilter.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -47,7 +47,7 @@ public final class StaticFilter implements Examinable, Filter {
   static final StaticFilter DENY = new StaticFilter(FilterResponse.DENY);
   private final FilterResponse response;
 
-  protected StaticFilter(final @NonNull FilterResponse response) {
+  private StaticFilter(final @NonNull FilterResponse response) {
     this.response = response;
   }
 

diff --git a/src/main/java/net/kyori/filter/TypedFilter.java b/src/main/java/net/kyori/filter/TypedFilter.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/test/java/net/kyori/filter/AllFilterTest.java b/src/test/java/net/kyori/filter/AllFilterTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,8 +24,6 @@
 package net.kyori.filter;
 
 import com.google.common.testing.EqualsTester;
-import net.kyori.filter.data.TestFilter;
-import net.kyori.filter.data.TestQuery1;
 import org.junit.jupiter.api.Test;
 
 import static com.google.common.truth.Truth8.assertThat;
@@ -34,8 +32,8 @@
 class AllFilterTest {
   @Test
   void testQuery() {
-    assertTrue(Filters.all(new TestFilter(10), new TestFilter(10)).allows(TestQuery1.of(10)));
-    assertTrue(Filters.all(new TestFilter(10), new TestFilter(20)).denies(TestQuery1.of(10)));
+    assertTrue(Filters.all(new TestFilter(10), new TestFilter(10)).allows(TestFilter.Query.of(10)));
+    assertTrue(Filters.all(new TestFilter(10), new TestFilter(20)).denies(TestFilter.Query.of(10)));
   }
 
   @Test

diff --git a/src/test/java/net/kyori/filter/AnyFilterTest.java b/src/test/java/net/kyori/filter/AnyFilterTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,8 +24,6 @@
 package net.kyori.filter;
 
 import com.google.common.testing.EqualsTester;
-import net.kyori.filter.data.TestFilter;
-import net.kyori.filter.data.TestQuery1;
 import org.junit.jupiter.api.Test;
 
 import static com.google.common.truth.Truth8.assertThat;
@@ -35,9 +33,9 @@ class AnyFilterTest {
   @Test
   void testQuery() {
     final AnyFilter filter = Filters.any(new TestFilter(10), new TestFilter(20));
-    assertTrue(filter.allows(TestQuery1.of(10)));
-    assertTrue(filter.denies(TestQuery1.of(15)));
-    assertTrue(filter.allows(TestQuery1.of(20)));
+    assertTrue(filter.allows(TestFilter.Query.of(10)));
+    assertTrue(filter.denies(TestFilter.Query.of(15)));
+    assertTrue(filter.allows(TestFilter.Query.of(20)));
   }
 
   @Test

diff --git a/src/test/java/net/kyori/filter/FilterResponseTest.java b/src/test/java/net/kyori/filter/FilterResponseTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/test/java/net/kyori/filter/FilterTest.java b/src/test/java/net/kyori/filter/FilterTest.java
diff --git a/src/test/java/net/kyori/filter/NotFilterTest.java b/src/test/java/net/kyori/filter/NotFilterTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of filter, licensed under the MIT License.
  *
- * Copyright (c) 2018-2019 KyoriPowered
+ * Copyright (c) 2018-2020 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,8 +24,6 @@
 package net.kyori.filter;
 
 import com.google.common.testing.EqualsTester;
-import net.kyori.filter.data.TestFilter;
-import net.kyori.filter.data.TestQuery1;
 import org.junit.jupiter.api.Test;
 
 import static com.google.common.truth.Truth8.assertThat;
@@ -35,9 +33,9 @@ class NotFilterTest {
   @Test
   void testQuery() {
     final Filter filter = Filters.not(new TestFilter(20));
-    assertTrue(filter.allows(TestQuery1.of(10)));
-    assertTrue(filter.allows(TestQuery1.of(15)));
-    assertTrue(filter.denies(TestQuery1.of(20)));
+    assertTrue(filter.allows(TestFilter.Query.of(10)));
+    assertTrue(filter.allows(TestFilter.Query.of(15)));
+    assertTrue(filter.denies(TestFilter.Query.of(20)));
   }
 
   @Test