#1168: Add camel-jq language validation

Author: davsclaus

src/main/java/com/github/cameltooling/idea/annotator/CamelJSonPathAnnotator.java renamed to src/main/java/com/github/cameltooling/idea/annotator/CamelLanguageAnnotator.java

@@ -33,9 +33,9 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Validate JSonPath expression and annotated the specific jsonpath expression to highlight the error in the editor
+ * Validate language expression such as JSonPath/JQ to highlight the error in the editor
  */
-public class CamelJSonPathAnnotator extends AbstractCamelAnnotator {
+public class CamelLanguageAnnotator extends AbstractCamelAnnotator {
 
     private static final Logger LOG = Logger.getInstance(CamelEndpointAnnotator.class);
 
@@ -45,29 +45,27 @@ boolean isEnabled() {
     }
 
     /**
-     * Validate jsonpath expression. eg jsonpath("$.store.book[?(@.price < 10)]")
+     * Validate language expression, such as jsonpath("$.store.book[?(@.price < 10)]")
      * if the expression is not valid an error annotation is created and highlight the invalid value.
      */
     void validateText(@NotNull PsiElement element, @NotNull AnnotationHolder holder, @NotNull String text) {
-
         final CamelIdeaUtils camelIdeaUtils = CamelIdeaUtils.getService();
-        // only validate if the element is jsonpath element
+
         boolean json = CamelPreferenceService.getService().isRealTimeJSonPathValidation() && camelIdeaUtils.isCamelExpression(element, "jsonpath");
         boolean jq = CamelPreferenceService.getService().isRealTimeJQValidation() && camelIdeaUtils.isCamelExpression(element, "jq");
         if (json || jq) {
             Project project = element.getProject();
             CamelCatalog catalogService = project.getService(CamelCatalogService.class).get();
             CamelService camelService = project.getService(CamelService.class);
 
-            // must have camel-json library
+            // must have the supporting library
             String lib = json ? "camel-jsonpath" : "camel-jq";
-            String lan = json ? "jsonpath" : "jq";
-            boolean jsonLib = camelService.containsLibrary(lib, false);
-            if (!jsonLib) {
-                camelService.showMissingJSonPathJarNotification(lib);
+            if (!camelService.containsLibrary(lib, false)) {
+                camelService.showMissingLanguageJarNotification(lib);
                 return;
             }
 
+            String lan = json ? "jsonpath" : "jq";
             try {
                 // need to use the classloader that can load classes from the project
                 ClassLoader loader = camelService.getProjectClassloader();

src/main/java/com/github/cameltooling/idea/service/CamelService.java

@@ -87,7 +87,7 @@ public class CamelService implements Disposable {
     private volatile boolean camelPresent;
     private volatile Notification camelVersionNotification;
     private volatile Notification camelMissingJSonSchemaNotification;
-    private volatile Notification camelMissingJSonPathJarNotification;
+    private volatile Notification camelMissingLanguageJarNotification;
 
     /**
      * The project in which the service is registered.
@@ -118,9 +118,9 @@ public synchronized void dispose() {
             camelMissingJSonSchemaNotification.expire();
             camelMissingJSonSchemaNotification = null;
         }
-        if (camelMissingJSonPathJarNotification != null) {
-            camelMissingJSonPathJarNotification.expire();
-            camelMissingJSonPathJarNotification = null;
+        if (camelMissingLanguageJarNotification != null) {
+            camelMissingLanguageJarNotification.expire();
+            camelMissingLanguageJarNotification = null;
         }
         if (camelCoreClassloader != null) {
             try {
@@ -345,12 +345,12 @@ synchronized ClassLoader getProjectCompleteClassloader() {
         return projectCompleteClassloader;
     }
 
-    public void showMissingJSonPathJarNotification(String lib) {
-        if (camelMissingJSonPathJarNotification == null) {
+    public void showMissingLanguageJarNotification(String lib) {
+        if (camelMissingLanguageJarNotification == null) {
             Icon icon = CamelPreferenceService.getService().getCamelIcon();
-            camelMissingJSonPathJarNotification = CAMEL_NOTIFICATION_GROUP.createNotification(lib + " is not on classpath. Cannot perform real time validation.",
+            camelMissingLanguageJarNotification = CAMEL_NOTIFICATION_GROUP.createNotification(lib + " is not on classpath. Cannot perform real time validation.",
                     NotificationType.WARNING).setImportant(true).setIcon(icon);
-            camelMissingJSonPathJarNotification.notify(project);
+            camelMissingLanguageJarNotification.notify(project);
         }
     }
 

src/main/resources/META-INF/plugin.xml

@@ -124,10 +124,10 @@
     <annotator language="JAVA" implementationClass="com.github.cameltooling.idea.annotator.CamelSimpleAnnotator"/>
     <annotator language="XML" implementationClass="com.github.cameltooling.idea.annotator.CamelSimpleAnnotator"/>
     <annotator language="yaml" implementationClass="com.github.cameltooling.idea.annotator.CamelSimpleAnnotator"/>
-    <!-- annotator to validate jsonpath language -->
-    <annotator language="JAVA" implementationClass="com.github.cameltooling.idea.annotator.CamelJSonPathAnnotator"/>
-    <annotator language="XML" implementationClass="com.github.cameltooling.idea.annotator.CamelJSonPathAnnotator"/>
-    <annotator language="yaml" implementationClass="com.github.cameltooling.idea.annotator.CamelJSonPathAnnotator"/>
+    <!-- annotator to validate json/jq language(s) -->
+    <annotator language="JAVA" implementationClass="com.github.cameltooling.idea.annotator.CamelLanguageAnnotator"/>
+    <annotator language="XML" implementationClass="com.github.cameltooling.idea.annotator.CamelLanguageAnnotator"/>
+    <annotator language="yaml" implementationClass="com.github.cameltooling.idea.annotator.CamelLanguageAnnotator"/>
     <!-- annotator to validate bean references by type -->
     <annotator language="JAVA" implementationClass="com.github.cameltooling.idea.annotator.BeanReferenceTypeAnnotator"/>
     <annotator language="XML" implementationClass="com.github.cameltooling.idea.annotator.BeanReferenceTypeAnnotator"/>