diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/MavenLemminxExtension.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/MavenLemminxExtension.java index 63da2b90..0a39badd 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/MavenLemminxExtension.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/MavenLemminxExtension.java @@ -90,8 +90,12 @@ import org.eclipse.lemminx.extensions.maven.participants.diagnostics.MavenDiagnosticParticipant; import org.eclipse.lemminx.extensions.maven.participants.hover.MavenHoverParticipant; import org.eclipse.lemminx.extensions.maven.participants.rename.MavenPropertyRenameParticipant; +import org.eclipse.lemminx.extensions.maven.project.LoadedMavenProject; +import org.eclipse.lemminx.extensions.maven.project.MavenProjectCache; import org.eclipse.lemminx.extensions.maven.searcher.LocalRepositorySearcher; import org.eclipse.lemminx.extensions.maven.searcher.RemoteCentralRepositorySearcher; +import org.eclipse.lemminx.extensions.maven.settings.XMLMavenGeneralSettings; +import org.eclipse.lemminx.extensions.maven.settings.XMLMavenSettings; import org.eclipse.lemminx.extensions.maven.utils.DOMUtils; import org.eclipse.lemminx.extensions.maven.utils.MavenParseUtils; import org.eclipse.lemminx.services.IXMLDocumentProvider; diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/codeaction/MavenIdPartRemovalCodeAction.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/codeaction/MavenIdPartRemovalCodeAction.java index 5373745e..923343aa 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/codeaction/MavenIdPartRemovalCodeAction.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/codeaction/MavenIdPartRemovalCodeAction.java @@ -22,7 +22,7 @@ import org.eclipse.lemminx.commons.TextDocument; import org.eclipse.lemminx.dom.DOMDocument; import org.eclipse.lemminx.dom.DOMElement; -import org.eclipse.lemminx.extensions.maven.MavenSyntaxErrorCode; +import org.eclipse.lemminx.extensions.maven.participants.diagnostics.MavenSyntaxErrorCode; import org.eclipse.lemminx.extensions.maven.utils.DOMUtils; import org.eclipse.lemminx.extensions.maven.utils.ParticipantUtils; import org.eclipse.lemminx.services.extensions.codeaction.ICodeActionParticipant; diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/codeaction/MavenManagedVersionRemovalCodeAction.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/codeaction/MavenManagedVersionRemovalCodeAction.java index 9242c4fb..e310551d 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/codeaction/MavenManagedVersionRemovalCodeAction.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/codeaction/MavenManagedVersionRemovalCodeAction.java @@ -24,7 +24,7 @@ import org.eclipse.lemminx.commons.TextDocument; import org.eclipse.lemminx.dom.DOMDocument; import org.eclipse.lemminx.dom.DOMNode; -import org.eclipse.lemminx.extensions.maven.MavenSyntaxErrorCode; +import org.eclipse.lemminx.extensions.maven.participants.diagnostics.MavenSyntaxErrorCode; import org.eclipse.lemminx.extensions.maven.participants.diagnostics.ProjectValidator; import org.eclipse.lemminx.extensions.maven.utils.ParticipantUtils; import org.eclipse.lemminx.services.extensions.codeaction.ICodeActionParticipant; diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/DependencyScope.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/completion/DependencyScope.java similarity index 96% rename from lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/DependencyScope.java rename to lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/completion/DependencyScope.java index d918f463..4aeb9993 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/DependencyScope.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/completion/DependencyScope.java @@ -6,7 +6,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.lemminx.extensions.maven; +package org.eclipse.lemminx.extensions.maven.participants.completion; /** * diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/completion/MavenCompletionParticipant.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/completion/MavenCompletionParticipant.java index 2eb09c98..85eda717 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/completion/MavenCompletionParticipant.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/completion/MavenCompletionParticipant.java @@ -97,12 +97,10 @@ import org.eclipse.lemminx.dom.DOMElement; import org.eclipse.lemminx.dom.DOMNode; import org.eclipse.lemminx.extensions.maven.DOMConstants; -import org.eclipse.lemminx.extensions.maven.DependencyScope; import org.eclipse.lemminx.extensions.maven.MavenInitializationException; import org.eclipse.lemminx.extensions.maven.MavenLemminxExtension; import org.eclipse.lemminx.extensions.maven.MavenModelOutOfDatedException; import org.eclipse.lemminx.extensions.maven.MojoParameter; -import org.eclipse.lemminx.extensions.maven.Phase; import org.eclipse.lemminx.extensions.maven.participants.ArtifactWithDescription; import org.eclipse.lemminx.extensions.maven.searcher.RemoteCentralRepositorySearcher.OngoingOperationException; import org.eclipse.lemminx.extensions.maven.utils.DOMUtils; diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/Phase.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/completion/Phase.java similarity index 98% rename from lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/Phase.java rename to lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/completion/Phase.java index 7666a8ed..a63780d9 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/Phase.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/completion/Phase.java @@ -6,7 +6,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.lemminx.extensions.maven; +package org.eclipse.lemminx.extensions.maven.participants.completion; import java.util.Objects; diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/diagnostics/MavenDiagnosticParticipant.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/diagnostics/MavenDiagnosticParticipant.java index 532d53b4..1d5dee6e 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/diagnostics/MavenDiagnosticParticipant.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/diagnostics/MavenDiagnosticParticipant.java @@ -37,10 +37,10 @@ import org.eclipse.lemminx.dom.DOMElement; import org.eclipse.lemminx.dom.DOMNode; import org.eclipse.lemminx.extensions.contentmodel.settings.XMLValidationSettings; -import org.eclipse.lemminx.extensions.maven.LoadedMavenProject; import org.eclipse.lemminx.extensions.maven.MavenInitializationException; import org.eclipse.lemminx.extensions.maven.MavenLemminxExtension; import org.eclipse.lemminx.extensions.maven.MavenModelOutOfDatedException; +import org.eclipse.lemminx.extensions.maven.project.LoadedMavenProject; import org.eclipse.lemminx.services.extensions.diagnostics.IDiagnosticsParticipant; import org.eclipse.lemminx.utils.XMLPositionUtility; import org.eclipse.lsp4j.Diagnostic; diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/MavenSyntaxErrorCode.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/diagnostics/MavenSyntaxErrorCode.java similarity index 94% rename from lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/MavenSyntaxErrorCode.java rename to lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/diagnostics/MavenSyntaxErrorCode.java index 84f66296..c98bf56c 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/MavenSyntaxErrorCode.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/diagnostics/MavenSyntaxErrorCode.java @@ -6,7 +6,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.lemminx.extensions.maven; +package org.eclipse.lemminx.extensions.maven.participants.diagnostics; import java.util.HashMap; import java.util.Map; diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/diagnostics/ProjectValidator.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/diagnostics/ProjectValidator.java index aec2d347..9f555dce 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/diagnostics/ProjectValidator.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/participants/diagnostics/ProjectValidator.java @@ -48,7 +48,6 @@ import org.eclipse.lemminx.dom.DOMElement; import org.eclipse.lemminx.dom.DOMNode; import org.eclipse.lemminx.extensions.maven.MavenLemminxExtension; -import org.eclipse.lemminx.extensions.maven.MavenSyntaxErrorCode; import org.eclipse.lemminx.extensions.maven.utils.DOMUtils; import org.eclipse.lemminx.extensions.maven.utils.MavenParseUtils; import org.eclipse.lemminx.utils.XMLPositionUtility; diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/LoadedMavenProject.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/project/LoadedMavenProject.java similarity index 94% rename from lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/LoadedMavenProject.java rename to lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/project/LoadedMavenProject.java index 64bfb47d..56fb0e93 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/LoadedMavenProject.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/project/LoadedMavenProject.java @@ -6,7 +6,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.lemminx.extensions.maven; +package org.eclipse.lemminx.extensions.maven.project; import java.util.Collection; diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/LoadedMavenProjectProvider.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/project/LoadedMavenProjectProvider.java similarity index 96% rename from lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/LoadedMavenProjectProvider.java rename to lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/project/LoadedMavenProjectProvider.java index b7b63a0c..72257e69 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/LoadedMavenProjectProvider.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/project/LoadedMavenProjectProvider.java @@ -6,7 +6,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.lemminx.extensions.maven; +package org.eclipse.lemminx.extensions.maven.project; import java.util.concurrent.CompletableFuture; import java.util.logging.Level; @@ -14,9 +14,8 @@ import org.apache.maven.model.building.FileModelSource; import org.eclipse.lemminx.dom.DOMDocument; +import org.eclipse.lemminx.extensions.maven.project.MavenProjectCache.ProjectBuildManager; import org.eclipse.lemminx.extensions.maven.utils.DOMModelSource; -import org.eclipse.lemminx.extensions.maven.MavenProjectCache.ProjectBuildManager; - import org.eclipse.lemminx.services.IXMLDocumentProvider; import org.eclipse.lemminx.utils.FilesUtils; diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/MavenProjectCache.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/project/MavenProjectCache.java similarity index 99% rename from lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/MavenProjectCache.java rename to lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/project/MavenProjectCache.java index 35eb525a..d88e5551 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/MavenProjectCache.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/project/MavenProjectCache.java @@ -6,7 +6,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.lemminx.extensions.maven; +package org.eclipse.lemminx.extensions.maven.project; import static org.eclipse.lemminx.extensions.maven.utils.URIUtils.toURIKey; import static org.eclipse.lemminx.extensions.maven.utils.URIUtils.toURIString; diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/XMLMavenCentralSettings.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/settings/XMLMavenCentralSettings.java similarity index 94% rename from lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/XMLMavenCentralSettings.java rename to lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/settings/XMLMavenCentralSettings.java index 53721ccb..7220f1ab 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/XMLMavenCentralSettings.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/settings/XMLMavenCentralSettings.java @@ -9,7 +9,7 @@ * Contributors: * Red Hat Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.lemminx.extensions.maven; +package org.eclipse.lemminx.extensions.maven.settings; import java.util.Objects; diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/XMLMavenGeneralSettings.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/settings/XMLMavenGeneralSettings.java similarity index 95% rename from lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/XMLMavenGeneralSettings.java rename to lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/settings/XMLMavenGeneralSettings.java index cce3aa70..61849b87 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/XMLMavenGeneralSettings.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/settings/XMLMavenGeneralSettings.java @@ -9,7 +9,7 @@ * Contributors: * Red Hat Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.lemminx.extensions.maven; +package org.eclipse.lemminx.extensions.maven.settings; import org.eclipse.lemminx.settings.XMLGeneralClientSettings; import org.eclipse.lemminx.utils.JSONUtility; diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/XMLMavenRepoSettings.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/settings/XMLMavenRepoSettings.java similarity index 95% rename from lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/XMLMavenRepoSettings.java rename to lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/settings/XMLMavenRepoSettings.java index 3994db4e..6f9036cd 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/XMLMavenRepoSettings.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/settings/XMLMavenRepoSettings.java @@ -9,7 +9,7 @@ * Contributors: * Red Hat Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.lemminx.extensions.maven; +package org.eclipse.lemminx.extensions.maven.settings; import java.util.Objects; diff --git a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/XMLMavenSettings.java b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/settings/XMLMavenSettings.java similarity index 97% rename from lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/XMLMavenSettings.java rename to lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/settings/XMLMavenSettings.java index da6102fb..6b3d6759 100644 --- a/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/XMLMavenSettings.java +++ b/lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/settings/XMLMavenSettings.java @@ -9,7 +9,7 @@ * Contributors: * Red Hat Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.lemminx.extensions.maven; +package org.eclipse.lemminx.extensions.maven.settings; import java.util.Objects; diff --git a/lemminx-maven/src/test/java/org/eclipse/lemminx/extensions/maven/participants/codeaction/MavenCodeActionParticipantTest.java b/lemminx-maven/src/test/java/org/eclipse/lemminx/extensions/maven/participants/codeaction/MavenCodeActionParticipantTest.java index 92330b99..66331f86 100644 --- a/lemminx-maven/src/test/java/org/eclipse/lemminx/extensions/maven/participants/codeaction/MavenCodeActionParticipantTest.java +++ b/lemminx-maven/src/test/java/org/eclipse/lemminx/extensions/maven/participants/codeaction/MavenCodeActionParticipantTest.java @@ -36,8 +36,8 @@ import org.eclipse.lemminx.extensions.contentmodel.settings.ContentModelSettings; import org.eclipse.lemminx.extensions.contentmodel.settings.XMLValidationRootSettings; import org.eclipse.lemminx.extensions.maven.MavenLanguageService; -import org.eclipse.lemminx.extensions.maven.MavenSyntaxErrorCode; import org.eclipse.lemminx.extensions.maven.NoMavenCentralExtension; +import org.eclipse.lemminx.extensions.maven.participants.diagnostics.MavenSyntaxErrorCode; import org.eclipse.lemminx.services.XMLLanguageService; import org.eclipse.lemminx.settings.SharedSettings; import org.eclipse.lemminx.utils.StringUtils; diff --git a/lemminx-maven/src/test/java/org/eclipse/lemminx/extensions/maven/MavenProjectCacheTest.java b/lemminx-maven/src/test/java/org/eclipse/lemminx/extensions/maven/project/MavenProjectCacheTest.java similarity index 97% rename from lemminx-maven/src/test/java/org/eclipse/lemminx/extensions/maven/MavenProjectCacheTest.java rename to lemminx-maven/src/test/java/org/eclipse/lemminx/extensions/maven/project/MavenProjectCacheTest.java index cda56f5a..d74edd23 100644 --- a/lemminx-maven/src/test/java/org/eclipse/lemminx/extensions/maven/MavenProjectCacheTest.java +++ b/lemminx-maven/src/test/java/org/eclipse/lemminx/extensions/maven/project/MavenProjectCacheTest.java @@ -6,7 +6,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.lemminx.extensions.maven; +package org.eclipse.lemminx.extensions.maven.project; import static org.eclipse.lemminx.extensions.maven.utils.MavenLemminxTestsUtils.createDOMDocument; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -29,6 +29,10 @@ import org.eclipse.lemminx.commons.TextDocument; import org.eclipse.lemminx.dom.DOMDocument; import org.eclipse.lemminx.extensions.contentmodel.settings.XMLValidationSettings; +import org.eclipse.lemminx.extensions.maven.MavenLanguageService; +import org.eclipse.lemminx.extensions.maven.MavenLemminxExtension; +import org.eclipse.lemminx.extensions.maven.MavenWorkspaceService; +import org.eclipse.lemminx.extensions.maven.NoMavenCentralExtension; import org.eclipse.lemminx.services.extensions.IWorkspaceServiceParticipant; import org.eclipse.lsp4j.Diagnostic; import org.eclipse.lsp4j.DidChangeWorkspaceFoldersParams; diff --git a/lemminx-maven/src/test/java/org/eclipse/lemminx/extensions/maven/utils/ParticipantUtilsTest.java b/lemminx-maven/src/test/java/org/eclipse/lemminx/extensions/maven/utils/ParticipantUtilsTest.java index a239e4e1..b1b8f751 100644 --- a/lemminx-maven/src/test/java/org/eclipse/lemminx/extensions/maven/utils/ParticipantUtilsTest.java +++ b/lemminx-maven/src/test/java/org/eclipse/lemminx/extensions/maven/utils/ParticipantUtilsTest.java @@ -28,8 +28,8 @@ import org.eclipse.lemminx.dom.DOMNode; import org.eclipse.lemminx.extensions.maven.MavenLanguageService; import org.eclipse.lemminx.extensions.maven.MavenLemminxExtension; -import org.eclipse.lemminx.extensions.maven.MavenProjectCache; import org.eclipse.lemminx.extensions.maven.NoMavenCentralExtension; +import org.eclipse.lemminx.extensions.maven.project.MavenProjectCache; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;