🐛 Fixed annotations being allowed on elements that aren't classes

itsTyrion · Dec 2, 2023 · 10d6f32 · 10d6f32
1 parent 6273bcf
commit 10d6f32
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ repositories {
 }
 
 group 'de.itsTyrion'
-version '1.1.1'
+version '1.1.2'
 
 dependencies {
     implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'

diff --git a/src/main/java/de/itsTyrion/pluginAnnotation/BungeePlugin.java b/src/main/java/de/itsTyrion/pluginAnnotation/BungeePlugin.java
@@ -1,5 +1,9 @@
 package de.itsTyrion.pluginAnnotation;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
 public @interface BungeePlugin {
     String name();
     String[] depends() default {};

diff --git a/src/main/java/de/itsTyrion/pluginAnnotation/Plugin.java b/src/main/java/de/itsTyrion/pluginAnnotation/Plugin.java
@@ -1,5 +1,9 @@
 package de.itsTyrion.pluginAnnotation;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
 public @interface Plugin {
     String name();
     String[] depend() default {};

diff --git a/src/main/java/de/itsTyrion/pluginAnnotation/PluginAnnotationProcessor.java b/src/main/java/de/itsTyrion/pluginAnnotation/PluginAnnotationProcessor.java
@@ -28,30 +28,26 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         }
 
         for (val element : roundEnv.getElementsAnnotatedWith(Plugin.class)) {
-            if (element instanceof TypeElement) {
-                val pluginAnnotation = element.getAnnotation(Plugin.class);
+            val pluginAnnotation = element.getAnnotation(Plugin.class);
 
-                // fully qualified name, required for plugin.yml `main` property
-                val fullyQualifiedName = ((TypeElement) element).getQualifiedName().toString();
+            // fully qualified name, required for plugin.yml `main` property
+            val fullyQualifiedName = ((TypeElement) element).getQualifiedName().toString();
 
-                // `libraries` section of plugin.yml, used by Spigot-based servers to DL dependencies as needed
-                val librariesString = processingEnv.getOptions().get("spigotLibraries");
-                val libraries = librariesString != null ? librariesString.split(";") : new String[0];
+            // `libraries` section of plugin.yml, used by Spigot-based servers to DL dependencies as needed
+            val librariesString = processingEnv.getOptions().get("spigotLibraries");
+            val libraries = librariesString != null ? librariesString.split(";") : new String[0];
 
-                val content = generatePluginYmlContent(pluginAnnotation, fullyQualifiedName, projectVersion, libraries);
-                writeYml("plugin.yml", content, fullyQualifiedName);
-            }
+            val content = generatePluginYmlContent(pluginAnnotation, fullyQualifiedName, projectVersion, libraries);
+            writeYml("plugin.yml", content, fullyQualifiedName);
         }
         for (val element : roundEnv.getElementsAnnotatedWith(BungeePlugin.class)) {
-            if (element instanceof TypeElement) {
-                val pluginAnnotation = element.getAnnotation(BungeePlugin.class);
+            val pluginAnnotation = element.getAnnotation(BungeePlugin.class);
 
-                // fully qualified name, required for bungee.yml `main` property
-                val fullyQualifiedName = ((TypeElement) element).getQualifiedName().toString();
+            // fully qualified name, required for bungee.yml `main` property
+            val fullyQualifiedName = ((TypeElement) element).getQualifiedName().toString();
 
-                val content = generateBungeeYmlContent(pluginAnnotation, fullyQualifiedName, projectVersion);
-                writeYml("bungee.yml", content, fullyQualifiedName);
-            }
+            val content = generateBungeeYmlContent(pluginAnnotation, fullyQualifiedName, projectVersion);
+            writeYml("bungee.yml", content, fullyQualifiedName);
         }
 
         return true;