diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 0000000..8488a4f
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1,10 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
\ No newline at end of file
diff --git a/config/checkstyle.xml b/config/checkstyle.xml
new file mode 100644
index 0000000..985f500
--- /dev/null
+++ b/config/checkstyle.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 371aa91..a522fd6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -11,7 +11,7 @@
org.opencds.cqf.cql.ls
cql-ls
- 3.0.0-SNAPSHOT
+ 3.0.0
diff --git a/debug/server/pom.xml b/debug/server/pom.xml
index 5270864..78e20eb 100644
--- a/debug/server/pom.xml
+++ b/debug/server/pom.xml
@@ -11,7 +11,7 @@
org.opencds.cqf.cql.ls
cql-ls
- 3.0.0-SNAPSHOT
+ 3.0.0
../../pom.xml
@@ -19,7 +19,7 @@
org.opencds.cqf.cql.ls
cql-ls-core
- 3.0.0-SNAPSHOT
+ 3.0.0
org.eclipse.lsp4j
diff --git a/debug/service/pom.xml b/debug/service/pom.xml
index 7f3caf7..33befbf 100644
--- a/debug/service/pom.xml
+++ b/debug/service/pom.xml
@@ -10,7 +10,7 @@
org.opencds.cqf.cql.ls
cql-ls
- 3.0.0-SNAPSHOT
+ 3.0.0
../../pom.xml
@@ -18,7 +18,7 @@
org.opencds.cqf.cql.debug
cql-debug-server
- 3.0.0-SNAPSHOT
+ 3.0.0
org.springframework.boot
diff --git a/ls/server/pom.xml b/ls/server/pom.xml
index 65bcadc..39a0aa2 100644
--- a/ls/server/pom.xml
+++ b/ls/server/pom.xml
@@ -11,7 +11,7 @@
org.opencds.cqf.cql.ls
cql-ls
- 3.0.0-SNAPSHOT
+ 3.0.0
../../pom.xml
@@ -29,7 +29,7 @@
org.opencds.cqf.cql.ls
cql-ls-core
- 3.0.0-SNAPSHOT
+ 3.0.0
diff --git a/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/Event.java b/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/BaseEvent.java
similarity index 71%
rename from ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/Event.java
rename to ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/BaseEvent.java
index 16e8b5d..ff61e34 100644
--- a/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/Event.java
+++ b/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/BaseEvent.java
@@ -1,10 +1,10 @@
package org.opencds.cqf.cql.ls.server.event;
-abstract class Event {
+abstract class BaseEvent {
private T params;
- protected Event(T params) {
+ protected BaseEvent(T params) {
this.params = params;
}
diff --git a/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidChangeTextDocumentEvent.java b/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidChangeTextDocumentEvent.java
index d4a38ab..7d1fc47 100644
--- a/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidChangeTextDocumentEvent.java
+++ b/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidChangeTextDocumentEvent.java
@@ -2,7 +2,7 @@
import org.eclipse.lsp4j.DidChangeTextDocumentParams;
-public class DidChangeTextDocumentEvent extends Event {
+public class DidChangeTextDocumentEvent extends BaseEvent {
public DidChangeTextDocumentEvent(DidChangeTextDocumentParams params) {
super(params);
}
diff --git a/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidChangeWatchedFilesEvent.java b/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidChangeWatchedFilesEvent.java
index 028d0ab..9b9cf2d 100644
--- a/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidChangeWatchedFilesEvent.java
+++ b/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidChangeWatchedFilesEvent.java
@@ -2,7 +2,7 @@
import org.eclipse.lsp4j.DidChangeWatchedFilesParams;
-public class DidChangeWatchedFilesEvent extends Event {
+public class DidChangeWatchedFilesEvent extends BaseEvent {
public DidChangeWatchedFilesEvent(DidChangeWatchedFilesParams params) {
super(params);
}
diff --git a/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidCloseTextDocumentEvent.java b/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidCloseTextDocumentEvent.java
index 57511d7..00ceaa1 100644
--- a/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidCloseTextDocumentEvent.java
+++ b/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidCloseTextDocumentEvent.java
@@ -2,7 +2,7 @@
import org.eclipse.lsp4j.DidCloseTextDocumentParams;
-public class DidCloseTextDocumentEvent extends Event {
+public class DidCloseTextDocumentEvent extends BaseEvent {
public DidCloseTextDocumentEvent(DidCloseTextDocumentParams params) {
super(params);
}
diff --git a/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidOpenTextDocumentEvent.java b/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidOpenTextDocumentEvent.java
index 8e33639..2e718fa 100644
--- a/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidOpenTextDocumentEvent.java
+++ b/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidOpenTextDocumentEvent.java
@@ -2,7 +2,7 @@
import org.eclipse.lsp4j.DidOpenTextDocumentParams;
-public class DidOpenTextDocumentEvent extends Event {
+public class DidOpenTextDocumentEvent extends BaseEvent {
public DidOpenTextDocumentEvent(DidOpenTextDocumentParams params) {
super(params);
}
diff --git a/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidSaveTextDocumentEvent.java b/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidSaveTextDocumentEvent.java
index 8d177a6..571e9a2 100644
--- a/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidSaveTextDocumentEvent.java
+++ b/ls/server/src/main/java/org/opencds/cqf/cql/ls/server/event/DidSaveTextDocumentEvent.java
@@ -2,7 +2,7 @@
import org.eclipse.lsp4j.DidSaveTextDocumentParams;
-public class DidSaveTextDocumentEvent extends Event {
+public class DidSaveTextDocumentEvent extends BaseEvent {
public DidSaveTextDocumentEvent(DidSaveTextDocumentParams params) {
super(params);
}
diff --git a/ls/service/pom.xml b/ls/service/pom.xml
index 08cf5a6..03bc855 100644
--- a/ls/service/pom.xml
+++ b/ls/service/pom.xml
@@ -9,7 +9,7 @@
org.opencds.cqf.cql.ls
cql-ls
- 3.0.0-SNAPSHOT
+ 3.0.0
../../pom.xml
@@ -17,7 +17,7 @@
org.opencds.cqf.cql.ls
cql-ls-server
- 3.0.0-SNAPSHOT
+ 3.0.0
org.springframework.boot
diff --git a/plugin/debug/pom.xml b/plugin/debug/pom.xml
index 59cc32e..befde99 100644
--- a/plugin/debug/pom.xml
+++ b/plugin/debug/pom.xml
@@ -11,7 +11,7 @@
org.opencds.cqf.cql.ls
cql-ls
- 3.0.0-SNAPSHOT
+ 3.0.0
../..
@@ -19,13 +19,13 @@
org.opencds.cqf.cql.ls
cql-ls-server
- 3.0.0-SNAPSHOT
+ 3.0.0
provided
org.opencds.cqf.cql.debug
cql-debug-server
- 3.0.0-SNAPSHOT
+ 3.0.0
org.eclipse.lsp4j
diff --git a/plugin/debug/src/main/java/org/opencds/cqf/cql/ls/plugin/debug/DebugCommandContribution.java b/plugin/debug/src/main/java/org/opencds/cqf/cql/ls/plugin/debug/DebugCommandContribution.java
index 1e6f2e0..a6c128a 100644
--- a/plugin/debug/src/main/java/org/opencds/cqf/cql/ls/plugin/debug/DebugCommandContribution.java
+++ b/plugin/debug/src/main/java/org/opencds/cqf/cql/ls/plugin/debug/DebugCommandContribution.java
@@ -19,9 +19,6 @@ public class DebugCommandContribution implements CommandContribution {
public DebugCommandContribution(CqlCompilationManager cqlCompilationManager) {
this.cqlCompilationManager = cqlCompilationManager;
-
- // Temporary hack for unused variable
- this.cqlCompilationManager.hashCode();
}
@Override
diff --git a/pom.xml b/pom.xml
index 8dac735..79a8044 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.opencds.cqf.cql.ls
cql-ls
pom
- 3.0.0-SNAPSHOT
+ 3.0.0
CQL Language Server
A Language Server for CQL implementing the LSP
@@ -15,13 +15,16 @@
UTF-8
UTF-8
- 3.1.0-SNAPSHOT
+ 11
+ 3.1.0
1.1.1
1.7.36
2.7.18
4.6.1
2.16.1
2.16.0
+ 2.24.1
+ 10.12.7
@@ -209,8 +212,34 @@
+ package
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ 3.3.1
+
+ true
+ config/checkstyle.xml
+
+
+
+ com.puppycrawl.tools
+ checkstyle
+ ${checkstyle.version}
+
+
+
+
+ validate
+
+ check
+
+
+
+
org.springframework.boot
spring-boot-maven-plugin
@@ -219,19 +248,14 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.10.0
+ 3.11.0
- 11
- 11
- 11
- true
true
true
- -Xlint:all
- -Xlint:-processing
- -Werror
- -implicit:none
+ -XDcompilePolicy=simple
+
+ -Xplugin:ErrorProne -XepDisableAllWarnings
@@ -239,9 +263,33 @@
auto-service
${auto-service.version}
+
+ com.google.errorprone
+ error_prone_core
+ ${error-prone.version}
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ 0.8.11
+
+
+
+ prepare-agent
+
+
+
+ report
+ prepare-package
+
+ report
+
+
+
+
com.diffplug.spotless
spotless-maven-plugin
@@ -377,15 +425,15 @@
org.apache.maven.plugins
- maven-surefire-plugin
+ maven-checkstyle-plugin
org.apache.maven.plugins
- maven-source-plugin
+ maven-compiler-plugin
org.apache.maven.plugins
- maven-javadoc-plugin
+ maven-surefire-plugin
org.apache.maven.plugins
@@ -394,10 +442,41 @@
+
+ package
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+
+ org.jacoco
+ jacoco-maven-plugin
+
+
+
+
release
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+
+ org.jacoco
+ jacoco-maven-plugin
+
org.apache.maven.plugins
maven-enforcer-plugin