diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/pom.xml b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/pom.xml new file mode 100644 index 00000000..2fba39eb --- /dev/null +++ b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/pom.xml @@ -0,0 +1,75 @@ + + + + 4.0.0 + + io.openliberty + demo-servlet-no-diagnostics + 0.0.1-SNAPSHOT + + demo-servlet-no-diagnostics + + http://www.example.com + + + UTF-8 + 1.7 + 1.7 + + + + + junit + junit + 4.11 + test + + + + + + + + + maven-clean-plugin + 3.1.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + maven-surefire-plugin + 2.22.1 + + + maven-jar-plugin + 3.0.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + maven-site-plugin + 3.7.1 + + + maven-project-info-reports-plugin + 3.0.0 + + + + + diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/annotations/GeneratedAnnotation.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/annotations/GeneratedAnnotation.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/annotations/GeneratedAnnotation.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/annotations/GeneratedAnnotation.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/annotations/PostConstructAnnotation.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/annotations/PostConstructAnnotation.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/annotations/PostConstructAnnotation.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/annotations/PostConstructAnnotation.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/annotations/PreDestroyAnnotation.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/annotations/PreDestroyAnnotation.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/annotations/PreDestroyAnnotation.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/annotations/PreDestroyAnnotation.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/annotations/ResourceAnnotation.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/annotations/ResourceAnnotation.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/annotations/ResourceAnnotation.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/annotations/ResourceAnnotation.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/beanvalidation/FieldConstraintValidation.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/beanvalidation/FieldConstraintValidation.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/beanvalidation/FieldConstraintValidation.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/beanvalidation/FieldConstraintValidation.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/beanvalidation/MethodConstraintValidation.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/beanvalidation/MethodConstraintValidation.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/beanvalidation/MethodConstraintValidation.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/beanvalidation/MethodConstraintValidation.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/beanvalidation/ValidConstraints.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/beanvalidation/ValidConstraints.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/beanvalidation/ValidConstraints.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/beanvalidation/ValidConstraints.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/InjectAndDisposesObservesObservesAsync.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/InjectAndDisposesObservesObservesAsync.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/InjectAndDisposesObservesObservesAsync.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/InjectAndDisposesObservesObservesAsync.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/ManagedBean.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/ManagedBean.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/ManagedBean.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/ManagedBean.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/ManagedBeanConstructor.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/ManagedBeanConstructor.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/ManagedBeanConstructor.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/ManagedBeanConstructor.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/MultipleDisposes.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/MultipleDisposes.java similarity index 86% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/MultipleDisposes.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/MultipleDisposes.java index 979d7f4d..32399f70 100644 --- a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/MultipleDisposes.java +++ b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/MultipleDisposes.java @@ -2,7 +2,7 @@ import jakarta.fake.context.ApplicationScoped; -import jakarta.enterprise.inject.Disposes; +import jakarta.fake.inject.Disposes; @ApplicationScoped public class MultipleDisposes { diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/ProducesAndDisposesObservesObservesAsync.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/ProducesAndDisposesObservesObservesAsync.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/ProducesAndDisposesObservesObservesAsync.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/ProducesAndDisposesObservesObservesAsync.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/ProducesAndInjectTogether.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/ProducesAndInjectTogether.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/ProducesAndInjectTogether.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/ProducesAndInjectTogether.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/ScopeDeclaration.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/ScopeDeclaration.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/cdi/ScopeDeclaration.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/cdi/ScopeDeclaration.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/di/Greeting.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/di/Greeting.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/di/Greeting.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/di/Greeting.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/di/MultipleConstructorWithInject.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/di/MultipleConstructorWithInject.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/di/MultipleConstructorWithInject.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/di/MultipleConstructorWithInject.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jax_rs/MultipleEntityParamsResourceMethod.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jax_rs/MultipleEntityParamsResourceMethod.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jax_rs/MultipleEntityParamsResourceMethod.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jax_rs/MultipleEntityParamsResourceMethod.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jax_rs/NoPublicConstructorClass.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jax_rs/NoPublicConstructorClass.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jax_rs/NoPublicConstructorClass.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jax_rs/NoPublicConstructorClass.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jax_rs/NoPublicConstructorProviderClass.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jax_rs/NoPublicConstructorProviderClass.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jax_rs/NoPublicConstructorProviderClass.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jax_rs/NoPublicConstructorProviderClass.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jax_rs/NotPublicResourceMethod.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jax_rs/NotPublicResourceMethod.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jax_rs/NotPublicResourceMethod.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jax_rs/NotPublicResourceMethod.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jax_rs/RootResourceClassConstructorsDiffLen.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jax_rs/RootResourceClassConstructorsDiffLen.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jax_rs/RootResourceClassConstructorsDiffLen.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jax_rs/RootResourceClassConstructorsDiffLen.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jax_rs/RootResourceClassConstructorsEqualLen.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jax_rs/RootResourceClassConstructorsEqualLen.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jax_rs/RootResourceClassConstructorsEqualLen.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jax_rs/RootResourceClassConstructorsEqualLen.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jsonb/ExtraJsonbCreatorAnnotations.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jsonb/ExtraJsonbCreatorAnnotations.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jsonb/ExtraJsonbCreatorAnnotations.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jsonb/ExtraJsonbCreatorAnnotations.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jsonb/JsonbTransientDiagnostic.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jsonb/JsonbTransientDiagnostic.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jsonb/JsonbTransientDiagnostic.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jsonb/JsonbTransientDiagnostic.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jsonp/CreatePointerInvalidTarget.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jsonp/CreatePointerInvalidTarget.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/jsonp/CreatePointerInvalidTarget.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/jsonp/CreatePointerInvalidTarget.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/persistence/EntityMissingConstructor.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/persistence/EntityMissingConstructor.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/persistence/EntityMissingConstructor.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/persistence/EntityMissingConstructor.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/persistence/FinalModifiers.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/persistence/FinalModifiers.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/persistence/FinalModifiers.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/persistence/FinalModifiers.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/persistence/MapKeyAndMapKeyClassTogether.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/persistence/MapKeyAndMapKeyClassTogether.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/persistence/MapKeyAndMapKeyClassTogether.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/persistence/MapKeyAndMapKeyClassTogether.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/persistence/MultipleMapKeyAnnotations.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/persistence/MultipleMapKeyAnnotations.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/persistence/MultipleMapKeyAnnotations.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/persistence/MultipleMapKeyAnnotations.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/servlet/DontExtendHttpServlet.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/servlet/DontExtendHttpServlet.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/servlet/DontExtendHttpServlet.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/servlet/DontExtendHttpServlet.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/servlet/InvalidWebServlet.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/servlet/InvalidWebServlet.java similarity index 87% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/servlet/InvalidWebServlet.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/servlet/InvalidWebServlet.java index 70267c16..209aed39 100644 --- a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/servlet/InvalidWebServlet.java +++ b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/servlet/InvalidWebServlet.java @@ -1,8 +1,8 @@ package io.openliberty.sample.jakarta.servlet; -import jakarta.fake.fakeException; +import jakarta.fake.ServletException; import jakarta.fake.annotation.WebServlet; -import jakarta.fake.http.Httpfake; +import jakarta.fake.http.HttpServlet; import jakarta.fake.http.HttpServletRequest; import jakarta.fake.http.HttpServletResponse; import java.io.IOException; diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websocket/AnnotationTest.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websocket/AnnotationTest.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websocket/AnnotationTest.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websocket/AnnotationTest.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websocket/DuplicateOnMessage.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websocket/DuplicateOnMessage.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websocket/DuplicateOnMessage.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websocket/DuplicateOnMessage.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websocket/InvalidParamType.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websocket/InvalidParamType.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websocket/InvalidParamType.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websocket/InvalidParamType.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointDuplicateVariableURI.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointDuplicateVariableURI.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointDuplicateVariableURI.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointDuplicateVariableURI.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointInvalidTemplateURI.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointInvalidTemplateURI.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointInvalidTemplateURI.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointInvalidTemplateURI.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointNoSlash.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointNoSlash.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointNoSlash.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointNoSlash.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointRelativePathTest.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointRelativePathTest.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointRelativePathTest.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websocket/ServerEndpointRelativePathTest.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websockets/PathParamURIWarningTest.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websockets/PathParamURIWarningTest.java similarity index 100% rename from jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/src/main/java/io/openliberty/sample/jakarta/websockets/PathParamURIWarningTest.java rename to jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/src/main/java/io/openliberty/sample/jakarta/websockets/PathParamURIWarningTest.java diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/pom.xml b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/pom.xml deleted file mode 100755 index 6680d74f..00000000 --- a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-noDiagnostic-sample/pom.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - 4.0.0 - - io.openliberty - jakarta-servlet - 1.0-SNAPSHOT - war - - - 1.8 - 1.8 - UTF-8 - UTF-8 - ${project.artifactId} - - - - - - jakarta.platform - jakarta.jakartaee-api - 9.0.0 - provided - - - org.eclipse.microprofile - microprofile - 3.3 - pom - provided - - - - junit - junit - 4.12 - test - - - org.apache.cxf - cxf-rt-rs-client - 3.2.6 - test - - - org.apache.cxf - cxf-rt-rs-extension-providers - 3.2.6 - test - - - org.glassfish - javax.json - 1.0.4 - test - - - org.hibernate - hibernate-validator - 7.0.0.Final - - - org.glassfish - jakarta.el - 4.0.0 - - - - javax.xml.bind - jaxb-api - 2.3.1 - test - - - - - ${project.artifactId} - - - - - io.openliberty.tools - liberty-maven-plugin - 3.3.4 - - - io.openliberty.beta - openliberty-jakartaee9 - 21.0.0.2-beta - zip - - - - - - org.apache.maven.plugins - maven-war-plugin - 3.2.2 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.22.2 - - - - diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/src/main/java/org/eclipse/lsp4jakarta/jdt/nodiagnostics/NoDiagnosticsTest.java b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/src/main/java/org/eclipse/lsp4jakarta/jdt/nodiagnostics/NoDiagnosticsTest.java index 72c591ef..2d7230c0 100644 --- a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/src/main/java/org/eclipse/lsp4jakarta/jdt/nodiagnostics/NoDiagnosticsTest.java +++ b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/src/main/java/org/eclipse/lsp4jakarta/jdt/nodiagnostics/NoDiagnosticsTest.java @@ -15,7 +15,10 @@ import static org.eclipse.lsp4jakarta.jdt.core.JakartaForJavaAssert.assertJavaDiagnostics; +import java.io.File; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.Path; @@ -42,7 +45,7 @@ public void checkForNoDiagnostics() throws Exception { JDTUtils utils = JDT_UTILS; - IJavaProject javaProject = loadJavaProject("jakarta-noDiagnostic-sample", ""); + IJavaProject javaProject = loadJavaProject("demo-servlet-no-diagnostics", ""); IFile javaFile = javaProject.getProject() .getFile(new Path(filePath)); String uri = javaFile.getLocation().toFile().toURI().toString(); @@ -57,62 +60,29 @@ public void checkForNoDiagnostics() throws Exception { // list of java files in demo-servlet-no-diagnostics. @Parameters - public static String[] projectFileProvider() throws Exception { - - String basePath = "src/main/java/io/openliberty/sample/jakarta/"; - String files[] = { basePath + "annotations/GeneratedAnnotation.java", - basePath + "annotations/PostConstructAnnotation.java", - basePath + "annotations/PreDestroyAnnotation.java", - basePath + "annotations/ResourceAnnotation.java", - - basePath + "beanvalidation/FieldConstraintValidation.java", - basePath + "beanvalidation/MethodConstraintValidation.java", - basePath + "beanvalidation/ValidConstraints.java", - - basePath + "cdi/InjectAndDisposesObservesObservesAsync.java", - basePath + "cdi/ManagedBean.java", - basePath + "cdi/ManagedBeanConstructor.java", - basePath + "cdi/MultipleDisposes.java", - basePath + "cdi/ProducesAndDisposesObservesObservesAsync.java", - basePath + "cdi/ProducesAndInjectTogether.java", - basePath + "cdi/ScopeDeclaration.java", - - basePath + "di/Greeting.java", - basePath + "di/MultipleConstructorWithInject.java", - - basePath + "jax_rs/MultipleEntityParamsResourceMethod.java", - basePath + "jax_rs/NoPublicConstructorClass.java", - basePath + "jax_rs/NoPublicConstructorProviderClass.java", - basePath + "jax_rs/NotPublicResourceMethod.java", - basePath + "jax_rs/RootResourceClassConstructorsDiffLen.java", - basePath + "jax_rs/RootResourceClassConstructorsEqualLen.java", - - basePath + "jsonb/ExtraJsonbCreatorAnnotations.java", - basePath + "jsonb/JsonbTransientDiagnostic.java", - - basePath + "jsonp/CreatePointerInvalidTarget.java", - - basePath + "persistence/EntityMissingConstructor.java", - basePath + "persistence/FinalModifiers.java", - basePath + "persistence/MapKeyAndMapKeyClassTogether.java", - basePath + "persistence/MultipleMapKeyAnnotations.java", - - basePath + "servlet/DontExtendHttpServlet.java", - basePath + "servlet/InvalidWebServlet.java", - - basePath + "websocket/AnnotationTest.java", - basePath + "websocket/DuplicateOnMessage.java", - basePath + "websocket/InvalidParamType.java", - basePath + "websocket/ServerEndpointDuplicateVariableURI.java", - basePath + "websocket/ServerEndpointInvalidTemplateURI.java", - basePath + "websocket/ServerEndpointNoSlash.java", - basePath + "websocket/ServerEndpointRelativePathTest.java", - - basePath + "websockets/PathParamURIWarningTest.java" - }; - - return files; - + public static List projectFileProvider() throws Exception { + + String packagePath = "src/main/java/io/openliberty/sample/jakarta/"; + String basePath = System.getProperty("user.dir") + + "/projects/demo-servlet-no-diagnostics/" + packagePath; + + List results = new ArrayList(); + File[] directories = new File(basePath).listFiles(); + // If this pathname does not denote a directory, then listFiles() returns null. + + for (File directory : directories) { + // Check for directory. + if (directory.isDirectory()) { + File[] files = new File(basePath + "/" + directory.getName() + "/").listFiles(); + for (File file : files) { + if (file.isFile()) { + // Add test file path. + results.add(packagePath + directory.getName() + "/" + file.getName()); + } + } + } + + } + return results; } - }