diff --git a/.claude/commands/check-neo4j.md b/.claude/commands/check-neo4j.md new file mode 100644 index 00000000..104f1838 --- /dev/null +++ b/.claude/commands/check-neo4j.md @@ -0,0 +1,39 @@ +Vérifie la compatibilité du code avec le driver Neo4j Java 5.26.2. + +## 1. Analyse du code database + +Cherche tous les usages du driver Neo4j : +```powershell +Get-ChildItem -Recurse -Path database\src -Filter "*.java" | Select-String -Pattern "org.neo4j" +``` + +Vérifie ces patterns courants qui ont changé entre le driver 4.x et 5.x : +- `session.writeTransaction(tx -> ...)` → doit être `session.executeWrite(tx -> ...)` +- `session.readTransaction(tx -> ...)` → doit être `session.executeRead(tx -> ...)` +- `session.beginTransaction()` → toujours valide mais vérifie le pattern +- `Config.builder()` → vérifie les méthodes appelées sur le builder +- `AuthTokens.basic()` → toujours valide +- `Result.list()` / `Result.stream()` → toujours valide +- `Values.parameters()` → toujours valide + +## 2. Analyse des tests + +Cherche dans les tests : +```powershell +Get-ChildItem -Recurse -Path testing\src -Filter "*.java" | Select-String -Pattern "org.neo4j|Neo4jContainer|neo4j:" +Get-ChildItem -Recurse -Path database\src\test -Filter "*.java" | Select-String -Pattern "org.neo4j|Neo4jContainer|neo4j:" +``` + +Vérifie : +- L'image Docker Testcontainer doit être `neo4j:5.26-community` (ou `neo4j:5.26`) +- Les configurations du container (ports, authentification) +- Les assertions qui dépendent du format de réponse Neo4j + +## 3. Propose les corrections + +Pour chaque changement nécessaire : +- Montre le fichier, la ligne, le code avant/après +- Explique pourquoi le changement est nécessaire +- Précise les imports à modifier + +Note : on est sous Windows avec PowerShell 7.x. diff --git a/.claude/commands/check-plugin-xml.md b/.claude/commands/check-plugin-xml.md new file mode 100644 index 00000000..a5876279 --- /dev/null +++ b/.claude/commands/check-plugin-xml.md @@ -0,0 +1,30 @@ +Analyse le fichier plugin.xml du projet. + +Lis le fichier : +```bash +cat graph-database-plugin/src/main/resources/META-INF/plugin.xml +``` + +Vérifie point par point : + +1. **``** : Chaque dépendance référence-t-elle un module/plugin qui existe dans IntelliJ 2025.3 (build 253) ? Les plus courants : + - `com.intellij.modules.platform` → OK + - `com.intellij.modules.lang` → OK + - `com.intellij.java` → OK si le plugin dépend du support Java + - Signale tout module obsolète ou renommé + +2. **``** : Chaque Extension Point (EP) déclaré est-il toujours valide dans 253 ? + Cherche dans le code source si les classes d'implémentation existent toujours. + +3. **`` et ``** : Les classes référencées existent-elles ? + ```bash + # Pour chaque serviceImplementation="com.xxx.YYY", vérifie : + find . -name "YYY.java" -type f + ``` + +4. **``** : Est-ce cohérent avec gradle.properties (sinceBuild=253, untilBuild=253.*) ? + Note : le plugin Gradle 2.x patche automatiquement ces valeurs, donc si elles sont codées en dur dans le XML, signale-le. + +5. **Notifications et toolwindows** : Vérifie les `` et `` pour la compatibilité. + +Liste les problèmes trouvés et propose les corrections exactes du XML. diff --git a/.claude/commands/diagnose-build.md b/.claude/commands/diagnose-build.md new file mode 100644 index 00000000..210e81c3 --- /dev/null +++ b/.claude/commands/diagnose-build.md @@ -0,0 +1,22 @@ +Lance le build du plugin et analyse les erreurs. + +Exécute : +```powershell +.\gradlew.bat :graph-database-plugin:buildPlugin 2>&1 | Select-Object -Last 100 +``` + +Pour chaque erreur trouvée : +1. Identifie le fichier source et la ligne +2. Explique la cause (API supprimée, import manquant, signature changée...) +3. Propose la correction exacte avec l'import complet +4. N'applique PAS la correction — présente-la moi d'abord + +Regroupe les erreurs par catégorie : +- Imports manquants ou cassés +- API dépréciées / supprimées +- Signatures de méthodes changées +- Problèmes de configuration Gradle + +Traite les erreurs module par module dans cet ordre : database, language, platform, ui, graph-database-plugin. + +Note : on est sous Windows avec PowerShell 7.x. Utilise `.\gradlew.bat` (pas `./gradlew`). diff --git a/.claude/commands/fix-deprecated.md b/.claude/commands/fix-deprecated.md new file mode 100644 index 00000000..1ad48c07 --- /dev/null +++ b/.claude/commands/fix-deprecated.md @@ -0,0 +1,20 @@ +Cherche toutes les utilisations d'API IntelliJ dépréciées dans le projet. + +1. Exécute le vérificateur de plugin : +```bash +./gradlew :graph-database-plugin:verifyPlugin 2>&1 | tail -200 +``` + +2. Cherche aussi les usages manuels : +```bash +grep -rn "Deprecated" --include="*.java" -l +``` + +3. Pour chaque API dépréciée signalée : + - Identifie le remplacement dans le SDK IntelliJ 2025.3 + - Montre le code avant/après avec le contexte (5 lignes autour) + - Précise le package/import complet de la nouvelle API + +Limite-toi à **5 corrections à la fois** pour que je puisse vérifier avant de continuer. + +Après mes validations, je te dirai "continue" pour les 5 suivantes. diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index b101086c..0ea1e6d4 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -ko-fi: albertoventurini \ No newline at end of file +github: mdelambilly \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..91484ed8 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,34 @@ +--- +name: Bug report +about: Something is not working as expected +labels: bug +--- + +## Description + + + +## Steps to reproduce + +1. +2. +3. + +## Expected behavior + + + +## Actual behavior + + + +## Environment + +- Plugin version: +- IntelliJ version (e.g. IntelliJ IDEA 2025.3.3): +- Neo4j version (e.g. 5.26): +- OS: + +## Logs + + \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..7d561585 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,17 @@ +--- +name: Feature request +about: Suggest an idea or improvement +labels: enhancement +--- + +## Summary + + + +## Motivation + + + +## Proposed solution + + \ No newline at end of file diff --git a/.github/workflows/build-plugin.yaml b/.github/workflows/build-plugin.yaml index 7d4b3625..80902db4 100644 --- a/.github/workflows/build-plugin.yaml +++ b/.github/workflows/build-plugin.yaml @@ -2,6 +2,7 @@ name: Build and test # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows on: + workflow_dispatch: pull_request: branches: - 'main' @@ -13,20 +14,22 @@ jobs: gradle: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v4 - name: Execute Gradle build - run: ./gradlew build + # Exclude integration tests: they require a running Docker/Neo4j container (Testcontainers) + run: ./gradlew build -x :testing:integration-neo4j:test - name: Run tests - run: ./gradlew test + # Exclude integration tests: they require a running Docker/Neo4j container (Testcontainers) + run: ./gradlew test -x :testing:integration-neo4j:test - name: Run Plugin Verifier - run: ./gradlew :graph-database-plugin:runPluginVerifier \ No newline at end of file + run: ./gradlew :graph-database-plugin:verifyPlugin \ No newline at end of file diff --git a/.github/workflows/publish-plugin.yaml b/.github/workflows/publish-plugin.yaml new file mode 100644 index 00000000..9969b231 --- /dev/null +++ b/.github/workflows/publish-plugin.yaml @@ -0,0 +1,26 @@ +name: Publish plugin + +on: + workflow_dispatch: + +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 21 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Verify plugin + run: ./gradlew :graph-database-plugin:verifyPlugin + + - name: Publish plugin + env: + INTELLIJ_TOKEN: ${{ secrets.INTELLIJ_TOKEN }} + run: ./gradlew :graph-database-plugin:publishPlugin \ No newline at end of file diff --git a/.gitignore b/.gitignore index 80b90c40..6f96e786 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,13 @@ idea-flex.skeleton gen/ +# IntelliJ Platform Gradle Plugin local cache +.intellijPlatform/ + +# Claude Code local data (personal memory, local settings) +.claude/* +!.claude/commands/ + +# Local documentation (not versioned) +documents/ + diff --git a/CHANGELOG.md b/CHANGELOG.md index b469bb40..4c3383c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.0.0] + +### Added +- Support for IntelliJ 2025.3 and Neo4j 5.26 LTS (fork by Michel de Lambilly) +- Auto-uppercase Cypher keywords as you type +- Raw JSON output tab in the Graph Database Console +- Theme-aware graph visualization (dark/light mode support) + ## [0.8.0] ### Added diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 00000000..8673281c --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,123 @@ +# CLAUDE.md — graphdb-intellij-plugin + +## Project +IntelliJ IDEA plugin for graph databases (Neo4j). +Provides: Cypher syntax highlighting, auto-completion, database connection and querying. + +## Migration goal +Migrate the plugin from IntelliJ 2023.3 to **IntelliJ 2025.3.3** (build 253.31033.145) +and ensure compatibility with **Neo4j 5.26 LTS**. + +## Environment +- OS: **Windows** with **PowerShell 7.x** +- Gradle Wrapper: use `.\gradlew.bat` (not `./gradlew`) + +## Tech stack +- Language: Java 21 +- Build: Gradle 9.4.0 with IntelliJ Platform Gradle Plugin **2.13.1** +- Gradle Plugin ID: `org.jetbrains.intellij.platform` (NOT `org.jetbrains.intellij`) +- IntelliJ submodules: use `org.jetbrains.intellij.platform.module` +- Neo4j Driver: `org.neo4j.driver:neo4j-java-driver:5.26.10` +- Tests: JUnit 5, Testcontainers (image `neo4j:5.26-community`) + +## Module structure + +``` +database\ → Neo4j access (driver), NO IntelliJ dependency +language\ → Cypher parser, PSI, syntax highlighting (depends on IntelliJ API) +platform\ → Shared services, settings (depends on IntelliJ API) +ui\ → ToolWindow, graph/table views (depends on IntelliJ API) +testing\ → Test utilities, Testcontainers +graph-database-plugin\ → Main plugin module, assembles everything, produces the final ZIP +``` + +## Conventions +- **All content in project files (source code, build files, config files, comments, commit messages) MUST be written in English. No exceptions.** +- NEVER suggest reverting to Gradle IntelliJ Plugin 1.x +- Use Groovy DSL (not Kotlin DSL) for build.gradle files +- Centralized properties live in `gradle.properties` +- One fix at a time, clearly explained +- When fixing a deprecated API, always cite the replacement API with its full import +- Do not modify the plugin's business logic unless explicitly asked +- Shell commands must be compatible with **PowerShell 7.x on Windows** +- **NEVER commit without an explicit test approval from the user.** For any feature or fix involving UI, editor behavior, or runtime plugin loading: propose launching `runIde`, wait for the user to confirm the behavior works, then commit. + +## Project properties (gradle.properties) +- `platformType = IC` +- `platformVersion = 2025.3.3` +- `sinceBuild = 253` +- `untilBuild = 253.*` +- `javaVersion = 21` +- `neo4jDriverVersion = 5.26.10` + +## Useful commands + +```powershell +.\gradlew.bat :graph-database-plugin:buildPlugin # Build the plugin +.\gradlew.bat test # Run tests +.\gradlew.bat :graph-database-plugin:verifyPlugin # Verify compatibility +.\gradlew.bat :graph-database-plugin:runIde # Launch IntelliJ sandbox +``` + +## IntelliJ Platform context +- since-build = 253 +- until-build = 253.* +- IntelliJ Platform imports come from the SDK, not Maven Central +- `testFramework()` is only available in `org.jetbrains.intellij.platform` (main plugin module), NOT in `org.jetbrains.intellij.platform.module` submodules +- JUnit 5 runtime in submodules requires adding `junit:junit:4.13.2` as `testRuntimeOnly` (used internally by the IJPGP test executor — our tests remain JUnit 5) +- `junit-platform-launcher` must be declared explicitly as `testRuntimeOnly` in Gradle 9 +- The `database` module is a plain Java module — it does NOT use the IntelliJ plugin +- The `language`, `platform`, `ui` modules use `org.jetbrains.intellij.platform.module` +- The `graph-database-plugin` module uses `org.jetbrains.intellij.platform` (the main plugin) + +## Expected behavior + +### Long context management +Your context window will be automatically compacted as it approaches its +limit, allowing you to continue working indefinitely from where you left off. +Therefore, do not stop tasks early due to token budget concerns. As you +approach your token budget limit, save your current progress and state to a +progress.md file before the context window refreshes. Always be as persistent +and autonomous as possible and complete tasks fully, even if the end of your +budget approaches. Never artificially stop a task early regardless of +remaining context. + +### Default to action +Before making any code change, briefly explain what you intend to do and why, +then proceed without waiting for confirmation — unless the change is risky or +irreversible (see Autonomy and safety below). + +If the user's intent is unclear, ask a focused clarifying question rather than +guessing or inferring. Do not ask multiple questions at once — identify the +single most important unknown and ask only that. + +### Autonomy and safety +Consider the reversibility and potential impact of your actions. You are +encouraged to take local and reversible actions like editing files or running +tests, but for actions that are hard to reverse, affect shared systems, or +could be destructive, ask the user before proceeding. + +Examples of actions that require confirmation: +- Deleting files or branches +- git push --force, git reset --hard +- Modifying published commits + +### No over-engineering +Avoid over-engineering. Only make changes that are directly requested or +clearly necessary. Keep solutions simple and focused. A bug fix does not need +cleanup of surrounding code. Do not refactor code, add features, or add +documentation beyond what is asked. + +### No hallucination +Never speculate about code you haven't opened. If the user references a +specific file, you MUST read the file before responding. Never make claims +about code before investigating. + +### Verbosity +After completing a task involving tool use, provide a brief summary of the +work done. No long summaries — just what changed and why. + +### Parallel tool calls +If you intend to call multiple tools and there are no dependencies between +the calls, make all independent calls in parallel. For example, when reading +3 files, read them all at the same time. diff --git a/README.md b/README.md index eb84bc13..464c6e50 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Graph Database plugin for IntelliJ Platform -![Build and test](https://github.com/albertoventurini/graphdb-intellij-plugin/actions/workflows/build-plugin.yaml/badge.svg) +![Build and test](https://github.com/mdelambilly/graphdb-intellij-plugin/actions/workflows/build-plugin.yaml/badge.svg) This plugin adds support for graph databases to the IntelliJ IDEA platform. At the moment, the only supported database is Neo4j. @@ -14,13 +14,21 @@ the [Cypher](https://opencypher.org/) query language This plugin is maintained and developed in my free time as a personal project, for no commercial reasons. -Contributions and donations are welcome! Please see the [Getting involved](#getting-involved) +Contributions and sponsorships are welcome! Please see the [Getting involved](#getting-involved) section for more information on how to contribute to this project. +[![GitHub Sponsors](https://img.shields.io/github/sponsors/mdelambilly?label=Sponsor&logo=GitHub)](https://github.com/sponsors/mdelambilly) + This plugin is based on the [Graph Database Support](https://github.com/neueda/jetbrains-plugin-graph-database-support) plugin, originally developed by [Neueda Technologies](http://technologies.neueda.com/). -The original plugin has not been updated for a long time and does not work with recent versions of IntelliJ and Neo4j. +It was then forked and maintained by [Alberto Venturini](https://github.com/albertoventurini/graphdb-intellij-plugin), +whose repository is now archived. +This fork continues the work with support for IntelliJ 2025.3 and the following databases: + +- Neo4j 5.x LTS, including AuraDB and Neo4j Sandbox +- Neo4j 2026.x, including AuraDB and Neo4j Sandbox +- [DozerDB](https://dozerdb.org/) ## Installation @@ -56,31 +64,36 @@ Simply add the following comment right before a Cypher String: ### Prerequisites -The plugin depends on JDK17 and the latest release of IntelliJ. Please make sure -you have those installed on your machine. - -Integration tests depend on Docker, because they run Neo4j server in a [Testcontainer](https://www.testcontainers.org/). Please ensure you have Docker up and running if you'd like to run integration tests. +- **JDK 21** (e.g. [Eclipse Temurin](https://adoptium.net/)) +- **IntelliJ IDEA 2025.3** or later +- **Docker** — required for integration tests (Neo4j runs in a [Testcontainer](https://www.testcontainers.org/)) -If you plan on making changes to a grammar or lexer files, you may find +If you plan on making changes to grammar or lexer files, you may find it useful to install the [Grammar-Kit](https://github.com/JetBrains/Grammar-Kit) IntelliJ plugin. This is not required but nice to have. ### Build instructions -The plugin can be built with the following Gradle command: +On Linux/macOS: ```shell ./gradlew :graph-database-plugin:buildPlugin ``` -Before a release, the plugin should also be tested and verified with the following commands: +On Windows (PowerShell): + +```powershell +.\gradlew.bat :graph-database-plugin:buildPlugin +``` + +Before a release, the plugin should also be tested and verified: ```shell ./gradlew test -./gradlew :graph-database-plugin:runPluginVerifier +./gradlew :graph-database-plugin:verifyPlugin ``` -The plugin can also be manually tested on a sandboxed instance of IntelliJ with the command: +The plugin can also be manually tested in a sandboxed instance of IntelliJ: ```shell ./gradlew :graph-database-plugin:runIde @@ -88,17 +101,19 @@ The plugin can also be manually tested on a sandboxed instance of IntelliJ with ## Getting help -Please feel free to report any bugs by creating a -[new issue on GitHub](https://github.com/albertoventurini/graphdb-intellij-plugin/issues/new). +- For bugs, please [open an issue](https://github.com/mdelambilly/graphdb-intellij-plugin/issues/new/choose). +- For questions or general discussion, use [GitHub Discussions](https://github.com/mdelambilly/graphdb-intellij-plugin/discussions). -## Getting involved +## Supporting the project + +If this plugin is useful to you, consider sponsoring its development: -Please feel free to contribute code by opening pull requests! +- [GitHub Sponsors](https://github.com/sponsors/mdelambilly) + +## Getting involved -Alternatively, if you find this plugin useful, please feel free to -buy me a coffee. +Contributions are welcome — feel free to open a pull request! ## Contacts -Any other comments or words of encouragement? Please get in touch -via email at aventurini AT gmail DOT com. +For any questions or feedback, please use [GitHub Discussions](https://github.com/mdelambilly/graphdb-intellij-plugin/discussions). diff --git a/build.gradle b/build.gradle index 7521160c..07b70444 100644 --- a/build.gradle +++ b/build.gradle @@ -1,30 +1,28 @@ // Copied and adapted from plugin "Graph Database Support" // by Neueda Technologies, Ltd. // Modified by Alberto Venturini, 2022 +// Modified by Michel de Lambilly, 2026 + plugins { id 'idea' // Java support id 'java' - // Gradle IntelliJ Plugin - id 'org.jetbrains.intellij' version "$versionGradleIntelliJ" - - // https://github.com/researchgate/gradle-release - id 'net.researchgate.release' version '2.8.0' + id 'org.jetbrains.intellij.platform' version '2.13.1' apply false + id 'org.jetbrains.intellij.platform.module' version '2.13.1' apply false // JetBrain's Gradle Changelog Plugin // https://github.com/JetBrains/gradle-changelog-plugin id 'org.jetbrains.changelog' version "$versionGradleChangelog" - - id 'org.jetbrains.grammarkit' version "2022.3.1" + id 'org.jetbrains.grammarkit' version "$versionGradleGrammarKit" } apply plugin: 'idea' apply plugin: 'org.jetbrains.changelog' def configDir = new File(buildscript.sourceFile.parentFile, 'config') -ext.checkstyleConfigDir = "$configDir/checkstyle" +ext.checkstyleConfigDir = configDir.absolutePath + "/checkstyle" allprojects { @@ -34,22 +32,18 @@ allprojects { } apply plugin: 'java' -// apply plugin: 'checkstyle' - apply plugin: 'org.jetbrains.grammarkit' - sourceCompatibility = 17 - targetCompatibility = 17 - -// checkstyle { -// toolVersion = "7.0" -// configFile = new File(checkstyleConfigDir, "checkstyle.xml") -// configProperties.checkstyleConfigDir = checkstyleConfigDir -// ignoreFailures = true -// } + java { + def javaVersion = providers.gradleProperty('javaVersion').get() + sourceCompatibility = JavaVersion.toVersion(javaVersion) + targetCompatibility = JavaVersion.toVersion(javaVersion) + } - intellij { - version = intellijSdkVersion - plugins = ['java'] + // Gradle 9 requires the JUnit Platform launcher explicitly on the test runtime classpath. + // junit:junit is needed at runtime by the IJPGP module plugin's test executor (internal bridge). + dependencies { + testRuntimeOnly "org.junit.platform:junit-platform-launcher:$versionJunitPlatform" + testRuntimeOnly "junit:junit:4.13.2" } } @@ -57,26 +51,5 @@ test { systemProperty 'graphDatabaseSupportDevelopment', 'true' } -// See https://github.com/researchgate/gradle-release -release { - failOnCommitNeeded = true - failOnPublishNeeded = true - failOnSnapshotDependencies = true - failOnUnversionedFiles = true - failOnUpdateNeeded = true - revertOnFail = true - - buildTasks = ['build'] - - tagTemplate = '${version}' - preCommitText = '[release]' - preTagCommitMessage = ' [skip ci] Pre tag commit: ' - tagCommitMessage = ' Creating tag: ' - newVersionCommitMessage = ' [skip ci] New version commit: ' - - git { - requireBranch = 'master' - } -} - -//afterReleaseBuild.dependsOn publishPlugin +// Note: net.researchgate.release plugin removed — incompatible with Gradle 9 +// (accesses removed internal API StartParameterInternal.settingsFile) diff --git a/database/api/build.gradle b/database/api/build.gradle index 5784846b..13227d81 100644 --- a/database/api/build.gradle +++ b/database/api/build.gradle @@ -1,7 +1,13 @@ // Copied and adapted from plugin "Graph Database Support" // by Neueda Technologies, Ltd. // Modified by Alberto Venturini, 2022 +// Modified by Michel de Lambilly, 2026 + dependencies { - testImplementation "junit:junit:$versionJunit" + testImplementation "org.junit.jupiter:junit-jupiter:$versionJunit" testImplementation "org.assertj:assertj-core:$versionAssertj" } + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/GraphDatabaseApi.java b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/GraphDatabaseApi.java similarity index 58% rename from database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/GraphDatabaseApi.java rename to database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/GraphDatabaseApi.java index df793370..605d8b8f 100644 --- a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/GraphDatabaseApi.java +++ b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/GraphDatabaseApi.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.api; +package com.github.mdelambilly.graphdbplugin.database.api; -import com.albertoventurini.graphdbplugin.database.api.data.GraphDatabaseVersion; -import com.albertoventurini.graphdbplugin.database.api.data.GraphMetadata; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphDatabaseVersion; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphMetadata; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; import java.util.Map; diff --git a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphDatabaseVersion.java b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphDatabaseVersion.java similarity index 77% rename from database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphDatabaseVersion.java rename to database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphDatabaseVersion.java index 7db07ee8..9e759804 100644 --- a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphDatabaseVersion.java +++ b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphDatabaseVersion.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.api.data; +package com.github.mdelambilly.graphdbplugin.database.api.data; public interface GraphDatabaseVersion { String toString(); diff --git a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphEntity.java b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphEntity.java similarity index 80% rename from database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphEntity.java rename to database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphEntity.java index 62cc5667..5b31434d 100644 --- a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphEntity.java +++ b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphEntity.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.api.data; +package com.github.mdelambilly.graphdbplugin.database.api.data; import java.util.List; diff --git a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphMetadata.java b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphMetadata.java similarity index 80% rename from database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphMetadata.java rename to database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphMetadata.java index da96778f..ad1696ce 100644 --- a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphMetadata.java +++ b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphMetadata.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.api.data; +package com.github.mdelambilly.graphdbplugin.database.api.data; import java.util.Map; diff --git a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphNode.java b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphNode.java similarity index 77% rename from database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphNode.java rename to database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphNode.java index b25516b9..94d076ca 100644 --- a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphNode.java +++ b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphNode.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.api.data; +package com.github.mdelambilly.graphdbplugin.database.api.data; public interface GraphNode extends GraphEntity { diff --git a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphPath.java b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphPath.java similarity index 83% rename from database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphPath.java rename to database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphPath.java index c8d00fae..d2e7757f 100644 --- a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphPath.java +++ b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphPath.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.api.data; +package com.github.mdelambilly.graphdbplugin.database.api.data; import java.util.List; diff --git a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphPropertyContainer.java b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphPropertyContainer.java similarity index 75% rename from database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphPropertyContainer.java rename to database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphPropertyContainer.java index 61a09177..3cb22a16 100644 --- a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphPropertyContainer.java +++ b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphPropertyContainer.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.api.data; +package com.github.mdelambilly.graphdbplugin.database.api.data; import java.util.Map; diff --git a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphRelationship.java b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphRelationship.java similarity index 83% rename from database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphRelationship.java rename to database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphRelationship.java index 0033371a..6bc2b064 100644 --- a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/GraphRelationship.java +++ b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/GraphRelationship.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.api.data; +package com.github.mdelambilly.graphdbplugin.database.api.data; public interface GraphRelationship extends GraphEntity { diff --git a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/NoIdGraphEntity.java b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/NoIdGraphEntity.java similarity index 75% rename from database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/NoIdGraphEntity.java rename to database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/NoIdGraphEntity.java index c634603f..c9e991ac 100644 --- a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/data/NoIdGraphEntity.java +++ b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/data/NoIdGraphEntity.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.api.data; +package com.github.mdelambilly.graphdbplugin.database.api.data; public interface NoIdGraphEntity { diff --git a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryNotification.java b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryNotification.java similarity index 77% rename from database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryNotification.java rename to database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryNotification.java index a8e75301..f5f8b2db 100644 --- a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryNotification.java +++ b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryNotification.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.api.query; +package com.github.mdelambilly.graphdbplugin.database.api.query; public interface GraphQueryNotification { diff --git a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryPlan.java b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryPlan.java similarity index 81% rename from database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryPlan.java rename to database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryPlan.java index 9eec3062..508f42fc 100644 --- a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryPlan.java +++ b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryPlan.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.api.query; +package com.github.mdelambilly.graphdbplugin.database.api.query; import java.util.List; import java.util.Map; diff --git a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryResult.java b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryResult.java similarity index 72% rename from database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryResult.java rename to database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryResult.java index c86ada6e..56ddfe7a 100644 --- a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryResult.java +++ b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryResult.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.api.query; +package com.github.mdelambilly.graphdbplugin.database.api.query; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; import java.util.List; import java.util.Optional; diff --git a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryResultColumn.java b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryResultColumn.java similarity index 73% rename from database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryResultColumn.java rename to database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryResultColumn.java index 3d6966ac..eb1a061f 100644 --- a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryResultColumn.java +++ b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryResultColumn.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.api.query; +package com.github.mdelambilly.graphdbplugin.database.api.query; public interface GraphQueryResultColumn { diff --git a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryResultRow.java b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryResultRow.java similarity index 64% rename from database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryResultRow.java rename to database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryResultRow.java index 2167e0e1..59efd6df 100644 --- a/database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryResultRow.java +++ b/database/api/src/main/java/com/github/mdelambilly/graphdbplugin/database/api/query/GraphQueryResultRow.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.api.query; +package com.github.mdelambilly.graphdbplugin.database.api.query; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; import java.util.List; diff --git a/database/build.gradle b/database/build.gradle index bfa93742..77c12bef 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -1,5 +1,7 @@ // Copied and adapted from plugin "Graph Database Support" // by Neueda Technologies, Ltd. // Modified by Alberto Venturini, 2022 +// Modified by Michel de Lambilly, 2026 + dependencies { } diff --git a/database/neo4j/build.gradle b/database/neo4j/build.gradle index 4e6012b4..16c83706 100644 --- a/database/neo4j/build.gradle +++ b/database/neo4j/build.gradle @@ -1,6 +1,8 @@ // Copied and adapted from plugin "Graph Database Support" // by Neueda Technologies, Ltd. // Modified by Alberto Venturini, 2022 +// Modified by Michel de Lambilly, 2026 + dependencies { implementation project(':database:api') implementation "org.neo4j.driver:neo4j-java-driver:$versionNeo4jJavaBoltDriver" diff --git a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/Neo4jBoltBuffer.java b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/Neo4jBoltBuffer.java similarity index 81% rename from database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/Neo4jBoltBuffer.java rename to database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/Neo4jBoltBuffer.java index 93f60494..0f381821 100644 --- a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/Neo4jBoltBuffer.java +++ b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/Neo4jBoltBuffer.java @@ -3,19 +3,20 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.neo4j.bolt; - -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryNotification; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryPlan; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResultColumn; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResultRow; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltQueryNotification; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.query.Neo4jBoltQueryPlan; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.query.Neo4jBoltQueryResultColumn; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.query.Neo4jBoltQueryResultRow; +package com.github.mdelambilly.graphdbplugin.database.neo4j.bolt; + +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryNotification; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryPlan; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResultColumn; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResultRow; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltQueryNotification; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.query.Neo4jBoltQueryPlan; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.query.Neo4jBoltQueryResultColumn; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.query.Neo4jBoltQueryResultRow; import org.neo4j.driver.Record; import org.neo4j.driver.summary.InputPosition; import org.neo4j.driver.summary.Plan; diff --git a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/Neo4jBoltConfiguration.java b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/Neo4jBoltConfiguration.java similarity index 93% rename from database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/Neo4jBoltConfiguration.java rename to database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/Neo4jBoltConfiguration.java index a6f4b966..790af519 100644 --- a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/Neo4jBoltConfiguration.java +++ b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/Neo4jBoltConfiguration.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.neo4j.bolt; +package com.github.mdelambilly.graphdbplugin.database.neo4j.bolt; import java.util.Map; diff --git a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/Neo4jBoltDatabase.java b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/Neo4jBoltDatabase.java similarity index 86% rename from database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/Neo4jBoltDatabase.java rename to database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/Neo4jBoltDatabase.java index e8d0c99b..ec7a73d3 100644 --- a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/Neo4jBoltDatabase.java +++ b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/Neo4jBoltDatabase.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.neo4j.bolt; - -import com.albertoventurini.graphdbplugin.database.api.GraphDatabaseApi; -import com.albertoventurini.graphdbplugin.database.api.data.GraphDatabaseVersion; -import com.albertoventurini.graphdbplugin.database.api.data.GraphMetadata; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.data.Neo4jGraphDatabaseVersion; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.query.Neo4jBoltQueryResult; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.query.Neo4jBoltQueryResultRow; +package com.github.mdelambilly.graphdbplugin.database.neo4j.bolt; + +import com.github.mdelambilly.graphdbplugin.database.api.GraphDatabaseApi; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphDatabaseVersion; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphMetadata; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data.Neo4jGraphDatabaseVersion; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.query.Neo4jBoltQueryResult; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.query.Neo4jBoltQueryResultRow; import org.neo4j.driver.AuthToken; import org.neo4j.driver.AuthTokens; import org.neo4j.driver.Driver; diff --git a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltNode.java b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltNode.java similarity index 86% rename from database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltNode.java rename to database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltNode.java index ef4f3d77..13c48471 100644 --- a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltNode.java +++ b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltNode.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.neo4j.bolt.data; +package com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphPropertyContainer; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphPropertyContainer; import org.neo4j.driver.internal.util.Iterables; import org.neo4j.driver.types.Node; diff --git a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltPath.java b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltPath.java similarity index 80% rename from database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltPath.java rename to database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltPath.java index ffc4117c..7509b7c3 100644 --- a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltPath.java +++ b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltPath.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.neo4j.bolt.data; +package com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data; -import com.albertoventurini.graphdbplugin.database.api.data.GraphPath; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphPath; import java.util.ArrayList; import java.util.List; diff --git a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltPropertyContainer.java b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltPropertyContainer.java similarity index 74% rename from database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltPropertyContainer.java rename to database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltPropertyContainer.java index 4d1e6423..5cbdb32c 100644 --- a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltPropertyContainer.java +++ b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltPropertyContainer.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.neo4j.bolt.data; +package com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data; -import com.albertoventurini.graphdbplugin.database.api.data.GraphPropertyContainer; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphPropertyContainer; import java.util.Map; diff --git a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltQueryNotification.java b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltQueryNotification.java similarity index 81% rename from database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltQueryNotification.java rename to database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltQueryNotification.java index 5b96dc9f..a4a011ab 100644 --- a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltQueryNotification.java +++ b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltQueryNotification.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.neo4j.bolt.data; +package com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryNotification; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryNotification; public class Neo4jBoltQueryNotification implements GraphQueryNotification { diff --git a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltRelationship.java b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltRelationship.java similarity index 89% rename from database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltRelationship.java rename to database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltRelationship.java index 1ceb6bb5..01303165 100644 --- a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltRelationship.java +++ b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jBoltRelationship.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.neo4j.bolt.data; +package com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphPropertyContainer; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphPropertyContainer; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; import org.neo4j.driver.types.Relationship; import java.util.Collections; diff --git a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jGraphDatabaseVersion.java b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jGraphDatabaseVersion.java similarity index 79% rename from database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jGraphDatabaseVersion.java rename to database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jGraphDatabaseVersion.java index 131934e1..84318f99 100644 --- a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/data/Neo4jGraphDatabaseVersion.java +++ b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/data/Neo4jGraphDatabaseVersion.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.neo4j.bolt.data; +package com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data; -import com.albertoventurini.graphdbplugin.database.api.data.GraphDatabaseVersion; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphDatabaseVersion; public record Neo4jGraphDatabaseVersion(int major, int minor, int patch) implements GraphDatabaseVersion { diff --git a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryPlan.java b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryPlan.java similarity index 86% rename from database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryPlan.java rename to database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryPlan.java index d97f09f7..592ac00a 100644 --- a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryPlan.java +++ b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryPlan.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.neo4j.bolt.query; +package com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.query; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryPlan; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryPlan; import java.util.List; import java.util.Map; diff --git a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResult.java b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResult.java similarity index 87% rename from database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResult.java rename to database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResult.java index 0f2cc2c5..dba66d27 100644 --- a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResult.java +++ b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResult.java @@ -3,18 +3,19 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.neo4j.bolt.query; - -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryNotification; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryPlan; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResultColumn; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResultRow; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltRelationship; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.Neo4jBoltBuffer; +package com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.query; + +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryNotification; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryPlan; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResultColumn; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResultRow; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltRelationship; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.Neo4jBoltBuffer; import org.neo4j.driver.summary.Notification; import org.neo4j.driver.summary.Plan; import org.neo4j.driver.summary.ProfiledPlan; diff --git a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResultColumn.java b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResultColumn.java similarity index 71% rename from database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResultColumn.java rename to database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResultColumn.java index b1185f81..6f0304ba 100644 --- a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResultColumn.java +++ b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResultColumn.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.neo4j.bolt.query; +package com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.query; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResultColumn; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResultColumn; public class Neo4jBoltQueryResultColumn implements GraphQueryResultColumn { diff --git a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResultRow.java b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResultRow.java similarity index 76% rename from database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResultRow.java rename to database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResultRow.java index 1b518a79..709a01fc 100644 --- a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResultRow.java +++ b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/bolt/query/Neo4jBoltQueryResultRow.java @@ -3,16 +3,16 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.database.neo4j.bolt.query; +package com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.query; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResultColumn; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResultRow; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltNode; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltPath; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltRelationship; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResultColumn; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResultRow; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltNode; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltRelationship; import org.neo4j.driver.Record; import org.neo4j.driver.Value; import org.neo4j.driver.internal.util.Iterables; @@ -21,10 +21,8 @@ import org.neo4j.driver.types.Relationship; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; public class Neo4jBoltQueryResultRow implements GraphQueryResultRow { diff --git a/database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/rest/.gitkeep b/database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/rest/.gitkeep similarity index 100% rename from database/neo4j/src/main/java/com/albertoventurini/graphdbplugin/database/neo4j/rest/.gitkeep rename to database/neo4j/src/main/java/com/github/mdelambilly/graphdbplugin/database/neo4j/rest/.gitkeep diff --git a/gradle.properties b/gradle.properties index 39dd792a..762fe962 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,26 @@ -version=0.8.0 +# === Plugin === +pluginVersion = 1.0.0 -# Intellij SDK -intellijSdkVersion=2023.3 +# === IntelliJ Platform === +platformType = IC +platformVersion = 2025.3.3 +sinceBuild = 253 +untilBuild = 253.* -# Versions -versionGradleIntelliJ=1.15.0 -versionGradleChangelog=2.0.0 -versionGradleGrammarKit=2022.3.1 -versionJunit=4.12 -versionAssertj=3.23.1 -versionMockito=2.27.0 -versionPrefuse=1.0.0 -versionJacksonMapper=2.15.2 -# Official compatibility table https://neo4j.com/developer/kb/neo4j-supported-versions/ -versionNeo4jJavaBoltDriver=5.11.0 -versionTestcontainers=1.17.6 +# === Java === +javaVersion = 21 -# Performance -org.gradle.jvmargs=-Xmx2048m +# === D�pendances === +versionGradleChangelog = 2.0.0 +versionGradleGrammarKit = 2023.3.0.3 +versionJunit = 5.11.4 +versionJunitPlatform = 1.11.4 +versionAssertj = 3.26.3 +versionMockito = 5.14.2 +versionPrefuse = 1.0.0 +versionJacksonMapper = 2.18.2 +versionNeo4jJavaBoltDriver = 5.28.10 +versionTestcontainers = 1.21.4 + +# === Performance === +org.gradle.jvmargs = -Xmx2048m \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832..7f93135c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db9a6b82..dbc3ce4a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb6..0adc8e1a 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/gradlew.bat b/gradlew.bat index 53a6b238..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/graph-database-plugin/build.gradle b/graph-database-plugin/build.gradle index 16fd6b9f..f8e22807 100644 --- a/graph-database-plugin/build.gradle +++ b/graph-database-plugin/build.gradle @@ -1,62 +1,70 @@ // Copied and adapted from plugin "Graph Database Support" // by Neueda Technologies, Ltd. // Modified by Alberto Venturini, 2022 +// Modified by Michel de Lambilly, 2026 + import java.text.SimpleDateFormat import org.jetbrains.changelog.Changelog -apply plugin: "org.jetbrains.intellij" +apply plugin: "org.jetbrains.intellij.platform" + +repositories { + intellijPlatform { + defaultRepositories() + } +} dependencies { + intellijPlatform { + intellijIdea(providers.gradleProperty('platformVersion')) + bundledPlugin('com.intellij.java') + bundledPlugin('com.intellij.modules.json') + bundledPlugin('org.intellij.intelliLang') + pluginVerifier() + } + implementation project(':language:cypher') - implementation project(path: ':ui:jetbrains', configuration: 'instrumentedJar') + implementation project(':ui:jetbrains') } -intellij { - version = intellijSdkVersion - pluginName = 'GraphDatabase' - //updateSinceUntilBuild = false - sameSinceUntilBuild = false +intellijPlatform { + pluginConfiguration { + name = 'GraphDatabase' - publishPlugin { - token = System.getenv("INTELLIJ_TOKEN") - } + ideaVersion { + sinceBuild = providers.gradleProperty('sinceBuild') + untilBuild = providers.gradleProperty('untilBuild') + } - if (System.getenv("CI_SERVER") == "yes") { - downloadSources = false - } else { - downloadSources = true + changeNotes = (providers.provider { + changelog.getAll().values() + .collect { it.withHeader(true) } + .collect { it.withLinkedHeader(false) } + .collect { it.withSummary(true) } + .collect { changelog.renderItem(it as Changelog.Item, Changelog.OutputType.HTML) } + .join('
\n') + } as Provider) } - def homePath = System.properties['user.home'] - sandboxDir = "${homePath}/.intellij/graphdb" - plugins = ['java'] -} - -// See https://plugins.jetbrains.com/docs/intellij/configuring-plugin-project.html#patching-the-plugin-configuration-file -patchPluginXml { - sinceBuild = "223.0" - //untilBuild = "233.*" - untilBuild = "999.0" + pluginVerification { + ides { + recommended() + } + } - def allChanges = { - changelog.getAll().values() - .collect { it.withHeader(true) } - .collect { it.withLinkedHeader(false) } - .collect { it.withSummary(true) } - .collect { changelog.renderItem(it as Changelog.Item, Changelog.OutputType.HTML) } - .join('
\n') + publishing { + token = providers.environmentVariable('INTELLIJ_TOKEN') } - changeNotes.set( - allChanges() - ) + sandboxContainer = project.file("${System.getProperty('user.home')}/.intellij/graphdb") } changelog { + version = providers.gradleProperty('pluginVersion') header = "[${-> version.get()}] - ${new SimpleDateFormat("yyyy-MM-dd").format(new Date())}" headerParserRegex = ~/(\d+\.\d+\.\d+[\-\w]*)/ keepUnreleasedSection = true - repositoryUrl = "https://github.com/albertoventurini/graphdb-intellij-plugin" + repositoryUrl = "https://github.com/mdelambilly/graphdb-intellij-plugin" } runIde { @@ -66,4 +74,4 @@ runIde { processResources { from 'platform/src/main/resources' from 'language/cypher/src/main/resources' -} +} \ No newline at end of file diff --git a/graph-database-plugin/src/main/resources/META-INF/plugin.xml b/graph-database-plugin/src/main/resources/META-INF/plugin.xml index d9d8cabe..9bc6abf8 100644 --- a/graph-database-plugin/src/main/resources/META-INF/plugin.xml +++ b/graph-database-plugin/src/main/resources/META-INF/plugin.xml @@ -1,19 +1,16 @@ - com.albertoventurini.jetbrains.graphdbplugin + com.github.mdelambilly.jetbrains.graphdbplugin Graph Database 9.9.9 - Alberto Venturini + Michel de Lambilly - See this plugin on Github. -

This plugin provides useful features for working with graph databases. It adds syntax highlighting and autocompletion for the Cypher query language, and - it supports connecting to and querying remote graph databases. + it supports connecting to and querying local and remote graph databases.

Features: @@ -27,7 +24,9 @@

Supported databases:

    -
  • Neo4j 3.4+ (Bolt), including AuraDB
    • +
  • Neo4j 5.x LTS, including AuraDB and Neo4j Sandbox
    • +
  • Neo4j 2026.x, including AuraDB and Neo4j Sandbox
    • +
  • DozerDB

@@ -56,21 +55,22 @@

- This plugin is based on the 'Graph Database Support plugin' - developed by Neueda Technologies, Ltd. The original plugin has not been updated - in a long time. + This plugin is based on the + Graph Database Support + plugin originally developed by Neueda Technologies, Ltd., later maintained by + Alberto Venturini. + This fork continues the work with support for IntelliJ 2025.3, Neo4j 5.26 LTS and Neo4j 2026.x.

- This plugin has been updated to run with modern versions of IntelliJ and related IDEs. - Just like the original plugin, it supports Neo4j and Cypher data sources; however, support for - Gremlin data sources (such as Cosmos DB) has been dropped. + If this plugin is useful to you, consider + sponsoring its development.

]]> https://github.com/albertoventurini/graphdb-intellij-plugin/releases + https://github.com/mdelambilly/graphdb-intellij-plugin/releases ]]> @@ -80,7 +80,8 @@ com.intellij.modules.lang - com.intellij.modules.java + com.intellij.modules.json + com.intellij.modules.java org.intellij.intelliLang @@ -88,102 +89,103 @@ - + + serviceInterface="com.github.mdelambilly.graphdbplugin.jetbrains.component.settings.SettingsComponent" + serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.component.settings.SettingsComponentImpl" /> + serviceInterface="com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter.QueryHighlighterComponent" + serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter.QueryHighlighterComponentImpl" /> - - + + + serviceInterface="com.github.mdelambilly.graphdbplugin.jetbrains.services.ExecutorService" + serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.services.ExecutorServiceImpl" + testServiceImplementation="com.github.mdelambilly.graphdbplugin.test.mocks.service.DummyExecutorService" /> + serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent" /> + serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.DataSourcesComponentMetadata" /> + serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.GraphConsoleView"/> + serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.DataSourcesView"/> + serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params.ParametersService"/> + serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.database.VersionService"/> - - + + + displayName="Graph Database" + instance="com.github.mdelambilly.graphdbplugin.jetbrains.configuration.GraphDatabaseConfiguration"/> - + + language="Cypher" implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.CypherParserDefinition"/> - - - - - - - - - - - - - - + language="Cypher" implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.highlight.CypherSyntaxHighlighterFactory"/> + + + + + + + + + + + + + + + implementationClass="com.github.mdelambilly.graphdbplugin.jetbrains.inspection.CypherExplainWarningInspection"/> + implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.inspections.CypherFunctionCallInspection"/> - + - + - - + + - - - + + + @@ -196,7 +198,7 @@ icon="GraphIcons.Window.GRAPH" popup="true"> @@ -204,13 +206,13 @@ keymap="$default"/> @@ -222,19 +224,19 @@ text="Graph Database Console Tool Window Actions"> @@ -245,11 +247,11 @@ text="Graph Database File Actions" description="Graph database file actions" icon="GraphIcons.Window.GRAPH" popup="true"> - + \ No newline at end of file diff --git a/language/build.gradle b/language/build.gradle index bfa93742..a28c4482 100644 --- a/language/build.gradle +++ b/language/build.gradle @@ -1,5 +1,6 @@ // Copied and adapted from plugin "Graph Database Support" // by Neueda Technologies, Ltd. // Modified by Alberto Venturini, 2022 +// Modified by Michel de Lambilly, 2026 dependencies { } diff --git a/language/cypher/build.gradle b/language/cypher/build.gradle index 188718ca..3cff7694 100644 --- a/language/cypher/build.gradle +++ b/language/cypher/build.gradle @@ -1,31 +1,44 @@ // Copied and adapted from plugin "Graph Database Support" // by Neueda Technologies, Ltd. // Modified by Alberto Venturini, 2022 +// Modified by Michel de Lambilly, 2026 import org.jetbrains.grammarkit.tasks.GenerateLexerTask import org.jetbrains.grammarkit.tasks.GenerateParserTask - -apply plugin: "org.jetbrains.intellij" +apply plugin: "org.jetbrains.intellij.platform.module" apply plugin: "org.jetbrains.grammarkit" +repositories { + intellijPlatform { + defaultRepositories() + } +} -intellij { - version = intellijSdkVersion - plugins = ['java'] +dependencies { + intellijPlatform { + intellijIdea(providers.gradleProperty('platformVersion')) + bundledPlugin('com.intellij.java') + } + + implementation project(":platform") + + testImplementation "org.junit.jupiter:junit-jupiter:$versionJunit" + testImplementation "org.mockito:mockito-core:$versionMockito" + testImplementation "org.assertj:assertj-core:$versionAssertj" } tasks.register("generateCypherLexer", GenerateLexerTask.class) { - sourceFile = new File("src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lexer/CypherLexer.flex") - targetDir = "src/main/gen/com/albertoventurini/graphdbplugin/language/cypher/lexer/" - targetClass = "CypherLexer" - purgeOldFiles = true + sourceFile.set(layout.projectDirectory.file("src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lexer/CypherLexer.flex")) + targetOutputDir.set(layout.projectDirectory.dir("src/main/gen/com/github/mdelambilly/graphdbplugin/language/cypher/lexer/")) + targetClass.set("CypherLexer") + purgeOldFiles.set(true) } tasks.register("generateCypherParser", GenerateParserTask.class) { - sourceFile = new File("src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lexer/Cypher.bnf") - targetRoot = "src/main/gen" - pathToParser = "com/albertoventurini/graphdbplugin/language/cypher/CypherParser.java" - pathToPsiRoot = "com/albertoventurini/graphdbplugin/language/cypher/psi" - purgeOldFiles = true + sourceFile.set(layout.projectDirectory.file("src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lexer/Cypher.bnf")) + targetRootOutputDir.set(layout.projectDirectory.dir("src/main/gen")) + pathToParser.set("com/github/mdelambilly/graphdbplugin/language/cypher/CypherParser.java") + pathToPsiRoot.set("com/github/mdelambilly/graphdbplugin/language/cypher/psi") + purgeOldFiles.set(true) } compileJava { @@ -41,10 +54,6 @@ sourceSets { } } } - -dependencies { - implementation project(":platform") - - testImplementation "org.mockito:mockito-core:$versionMockito" - testImplementation "org.assertj:assertj-core:$versionAssertj" -} +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/editor/CypherTypedHandlerDelegate.java b/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/editor/CypherTypedHandlerDelegate.java deleted file mode 100644 index fef628be..00000000 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/editor/CypherTypedHandlerDelegate.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Copied and adapted from plugin - * Graph Database Support - * by Neueda Technologies, Ltd. - * Modified by Alberto Venturini, 2022 - */ -package com.albertoventurini.graphdbplugin.language.cypher.editor; - -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherStringLiteral; -import com.intellij.codeInsight.editorActions.TypedHandlerDelegate; -import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.project.Project; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; -import org.jetbrains.annotations.NotNull; - -public class CypherTypedHandlerDelegate extends TypedHandlerDelegate { - - @NotNull - @Override - public Result checkAutoPopup(char charTyped, @NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { - final int offset = editor.getCaretModel().getOffset() - 1; - if (offset >= 0) { - final PsiElement element = file.findElementAt(offset); - if (element instanceof CypherStringLiteral) { - return Result.STOP; - } - } - return charTyped == ':' - || charTyped == '.' - || charTyped == '(' - || charTyped == '[' ? Result.CONTINUE : Result.STOP; - } -} diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherListYielding.java b/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherListYielding.java deleted file mode 100644 index 4e147f2f..00000000 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherListYielding.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Copied and adapted from plugin - * Graph Database Support - * by Neueda Technologies, Ltd. - * Modified by Alberto Venturini, 2022 - */ -package com.albertoventurini.graphdbplugin.language.cypher.references.types; - -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherList; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; - -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.ANY; - -public interface CypherListYielding extends CypherTyped { - - @Override - default CypherType getType() { - return CypherList.of(ANY); - } - -} diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/CypherIcons.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/CypherIcons.java similarity index 81% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/CypherIcons.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/CypherIcons.java index 2a868d41..cf342356 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/CypherIcons.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/CypherIcons.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher; +package com.github.mdelambilly.graphdbplugin.language.cypher; import icons.GraphIcons; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/CypherLanguage.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/CypherLanguage.java similarity index 72% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/CypherLanguage.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/CypherLanguage.java index a8f1f426..0e6c85d6 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/CypherLanguage.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/CypherLanguage.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher; +package com.github.mdelambilly.graphdbplugin.language.cypher; import com.intellij.lang.Language; -import static com.albertoventurini.graphdbplugin.platform.SupportedLanguage.CYPHER; +import static com.github.mdelambilly.graphdbplugin.platform.SupportedLanguage.CYPHER; /** * @author dmitry@vrublesvky.me diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/CypherParserDefinition.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/CypherParserDefinition.java similarity index 85% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/CypherParserDefinition.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/CypherParserDefinition.java index 7d8a5519..e366c38b 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/CypherParserDefinition.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/CypherParserDefinition.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher; +package com.github.mdelambilly.graphdbplugin.language.cypher; -import com.albertoventurini.graphdbplugin.language.cypher.file.CypherFile; -import com.albertoventurini.graphdbplugin.language.cypher.lexer.CypherLexerAdapter; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTokenType; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.file.CypherFile; +import com.github.mdelambilly.graphdbplugin.language.cypher.lexer.CypherLexerAdapter; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTokenType; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; import com.intellij.lang.ASTNode; import com.intellij.lang.Language; import com.intellij.lang.ParserDefinition; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/commenter/CypherCommenter.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/commenter/CypherCommenter.java similarity index 89% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/commenter/CypherCommenter.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/commenter/CypherCommenter.java index 6b310fd8..aa734bc0 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/commenter/CypherCommenter.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/commenter/CypherCommenter.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.commenter; +package com.github.mdelambilly.graphdbplugin.language.cypher.commenter; import com.intellij.lang.Commenter; import org.jetbrains.annotations.Nullable; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/CypherCompletionContributor.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/CypherCompletionContributor.java similarity index 83% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/CypherCompletionContributor.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/CypherCompletionContributor.java index 020c56fb..a3eecf48 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/CypherCompletionContributor.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/CypherCompletionContributor.java @@ -3,10 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion; -import com.albertoventurini.graphdbplugin.language.cypher.completion.providers.*; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.providers.*; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.providers.*; import com.intellij.codeInsight.completion.CompletionContributor; import com.intellij.codeInsight.completion.CompletionType; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/CypherMetadataContainer.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/CypherMetadataContainer.java similarity index 88% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/CypherMetadataContainer.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/CypherMetadataContainer.java index 3a45bc5c..20995097 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/CypherMetadataContainer.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/CypherMetadataContainer.java @@ -3,10 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.*; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.*; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.*; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/CypherMetadataProviderService.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/CypherMetadataProviderService.java similarity index 82% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/CypherMetadataProviderService.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/CypherMetadataProviderService.java index 79de38a6..9c4ed3ed 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/CypherMetadataProviderService.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/CypherMetadataProviderService.java @@ -3,10 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.*; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.*; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.*; import java.util.List; import java.util.Optional; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/CypherMetadataProviderServiceImpl.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/CypherMetadataProviderServiceImpl.java similarity index 92% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/CypherMetadataProviderServiceImpl.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/CypherMetadataProviderServiceImpl.java index 791152e6..42dcc56b 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/CypherMetadataProviderServiceImpl.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/CypherMetadataProviderServiceImpl.java @@ -3,10 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.*; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.*; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.*; import java.util.HashMap; import java.util.List; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherBuiltInFunctions.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherBuiltInFunctions.java similarity index 77% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherBuiltInFunctions.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherBuiltInFunctions.java index 75e9e861..2f35239f 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherBuiltInFunctions.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherBuiltInFunctions.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.CypherBuiltInFunctionElement; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.InvokableInformation; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.CypherBuiltInFunctionElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.InvokableInformation; import java.util.List; import java.util.stream.Collectors; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherKeywords.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherKeywords.java similarity index 86% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherKeywords.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherKeywords.java index 89dc7faa..c5e2c986 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherKeywords.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherKeywords.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.CypherKeywordElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.CypherKeywordElement; import com.google.common.collect.Sets; import com.intellij.codeInsight.lookup.LookupElement; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherList.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherList.java similarity index 88% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherList.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherList.java index 6a25b4e7..3f007140 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherList.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherList.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherSimpleType.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherSimpleType.java similarity index 75% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherSimpleType.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherSimpleType.java index aaa90cd7..6ed94645 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherSimpleType.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherSimpleType.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms; public enum CypherSimpleType implements CypherType { BOOLEAN, diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherType.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherType.java similarity index 91% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherType.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherType.java index b3c9d6cd..49da63ab 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/atoms/CypherType.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/atoms/CypherType.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms; import com.google.common.base.Enums; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherBuiltInFunctionElement.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherBuiltInFunctionElement.java similarity index 90% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherBuiltInFunctionElement.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherBuiltInFunctionElement.java index 1e820a7d..b7fd81bc 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherBuiltInFunctionElement.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherBuiltInFunctionElement.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements; import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler; import com.intellij.codeInsight.lookup.LookupElement; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherElement.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherElement.java similarity index 72% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherElement.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherElement.java index 39b41e36..ced1aca0 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherElement.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherElement.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements; import com.intellij.codeInsight.lookup.LookupElement; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherElementWithDocumentation.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherElementWithDocumentation.java similarity index 69% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherElementWithDocumentation.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherElementWithDocumentation.java index bfcab67f..f6873a6c 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherElementWithDocumentation.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherElementWithDocumentation.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements; public interface CypherElementWithDocumentation { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherElementWithSignature.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherElementWithSignature.java similarity index 77% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherElementWithSignature.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherElementWithSignature.java index 0d1a2369..6354b51a 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherElementWithSignature.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherElementWithSignature.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements; import java.util.regex.Pattern; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherFunctionElement.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherFunctionElement.java similarity index 94% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherFunctionElement.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherFunctionElement.java index da4ad330..f7d828a8 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherFunctionElement.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherFunctionElement.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements; import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler; import com.intellij.codeInsight.lookup.LookupElement; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherKeywordElement.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherKeywordElement.java similarity index 84% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherKeywordElement.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherKeywordElement.java index e5720d26..332e483a 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherKeywordElement.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherKeywordElement.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherLabelElement.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherLabelElement.java similarity index 85% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherLabelElement.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherLabelElement.java index 002cc770..ada1cb14 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherLabelElement.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherLabelElement.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherProcedureElement.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherProcedureElement.java similarity index 94% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherProcedureElement.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherProcedureElement.java index b8481903..107b497b 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherProcedureElement.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherProcedureElement.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements; import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler; import com.intellij.codeInsight.lookup.LookupElement; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherPropertyKeyElement.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherPropertyKeyElement.java similarity index 86% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherPropertyKeyElement.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherPropertyKeyElement.java index 7b4db626..cb1213e4 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherPropertyKeyElement.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherPropertyKeyElement.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherRelationshipTypeElement.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherRelationshipTypeElement.java similarity index 87% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherRelationshipTypeElement.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherRelationshipTypeElement.java index 4369492d..3f75b27f 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherRelationshipTypeElement.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherRelationshipTypeElement.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/InvokableInformation.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/InvokableInformation.java similarity index 94% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/InvokableInformation.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/InvokableInformation.java index 36713f5d..580ba75c 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/InvokableInformation.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/InvokableInformation.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Range; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/BaseCompletionProvider.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/BaseCompletionProvider.java similarity index 81% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/BaseCompletionProvider.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/BaseCompletionProvider.java index 88bc8450..0a8a367b 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/BaseCompletionProvider.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/BaseCompletionProvider.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.providers; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.providers; import com.intellij.codeInsight.completion.CompletionParameters; import com.intellij.codeInsight.completion.CompletionProvider; import com.intellij.openapi.project.Project; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.CypherMetadataProviderService; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.CypherMetadataProviderService; abstract class BaseCompletionProvider extends CompletionProvider { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/FunctionsCompletionProvider.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/FunctionsCompletionProvider.java similarity index 77% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/FunctionsCompletionProvider.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/FunctionsCompletionProvider.java index 2bd9e2d9..99c5e33e 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/FunctionsCompletionProvider.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/FunctionsCompletionProvider.java @@ -3,18 +3,19 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.providers; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.providers; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; import com.intellij.codeInsight.completion.CompletionParameters; import com.intellij.codeInsight.completion.CompletionResultSet; import com.intellij.patterns.ElementPattern; import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.PsiElement; import com.intellij.util.ProcessingContext; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.CypherElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.CypherElement; import org.jetbrains.annotations.NotNull; public final class FunctionsCompletionProvider extends BaseCompletionProvider { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/KeywordCompletionProvider.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/KeywordCompletionProvider.java similarity index 76% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/KeywordCompletionProvider.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/KeywordCompletionProvider.java index 8ae34b67..86df3915 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/KeywordCompletionProvider.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/KeywordCompletionProvider.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.providers; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.providers; import com.intellij.codeInsight.completion.CompletionParameters; import com.intellij.codeInsight.completion.CompletionResultSet; @@ -12,9 +13,9 @@ import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.PsiElement; import com.intellij.util.ProcessingContext; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; -import com.albertoventurini.graphdbplugin.language.cypher.CypherParserDefinition; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherKeywords; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherParserDefinition; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherKeywords; import org.jetbrains.annotations.NotNull; public final class KeywordCompletionProvider extends BaseCompletionProvider { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/LabelsCompletionProvider.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/LabelsCompletionProvider.java similarity index 79% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/LabelsCompletionProvider.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/LabelsCompletionProvider.java index 5670c214..86aabcde 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/LabelsCompletionProvider.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/LabelsCompletionProvider.java @@ -3,18 +3,19 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.providers; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.providers; -import com.albertoventurini.graphdbplugin.language.cypher.CypherParserDefinition; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherParserDefinition; import com.intellij.codeInsight.completion.CompletionParameters; import com.intellij.codeInsight.completion.CompletionResultSet; import com.intellij.patterns.ElementPattern; import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.PsiElement; import com.intellij.util.ProcessingContext; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.CypherElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.CypherElement; import org.jetbrains.annotations.NotNull; import java.util.stream.Stream; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/ProceduresCompletionProvider.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/ProceduresCompletionProvider.java similarity index 75% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/ProceduresCompletionProvider.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/ProceduresCompletionProvider.java index f220983d..b87d6a00 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/ProceduresCompletionProvider.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/ProceduresCompletionProvider.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.providers; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.providers; -import com.albertoventurini.graphdbplugin.language.cypher.CypherParserDefinition; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherParserDefinition; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; import org.jetbrains.annotations.NotNull; import com.intellij.codeInsight.completion.CompletionParameters; @@ -16,8 +17,8 @@ import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.PsiElement; import com.intellij.util.ProcessingContext; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.CypherElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.CypherElement; public final class ProceduresCompletionProvider extends BaseCompletionProvider { public static final ElementPattern PATTERN = PlatformPatterns diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/PropertyKeyCompletionProvider.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/PropertyKeyCompletionProvider.java similarity index 78% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/PropertyKeyCompletionProvider.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/PropertyKeyCompletionProvider.java index e7f2e909..93ea6828 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/PropertyKeyCompletionProvider.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/PropertyKeyCompletionProvider.java @@ -3,18 +3,19 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.providers; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.providers; -import com.albertoventurini.graphdbplugin.language.cypher.CypherParserDefinition; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherParserDefinition; import com.intellij.codeInsight.completion.CompletionParameters; import com.intellij.codeInsight.completion.CompletionResultSet; import com.intellij.patterns.ElementPattern; import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.PsiElement; import com.intellij.util.ProcessingContext; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.CypherElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.CypherElement; import org.jetbrains.annotations.NotNull; public final class PropertyKeyCompletionProvider extends BaseCompletionProvider { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/RelationshipTypeCompletionProvider.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/RelationshipTypeCompletionProvider.java similarity index 78% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/RelationshipTypeCompletionProvider.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/RelationshipTypeCompletionProvider.java index f02c3e16..e41ac6f6 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/completion/providers/RelationshipTypeCompletionProvider.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/providers/RelationshipTypeCompletionProvider.java @@ -3,18 +3,19 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.providers; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.providers; -import com.albertoventurini.graphdbplugin.language.cypher.CypherParserDefinition; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherParserDefinition; import com.intellij.codeInsight.completion.CompletionParameters; import com.intellij.codeInsight.completion.CompletionResultSet; import com.intellij.patterns.ElementPattern; import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.PsiElement; import com.intellij.util.ProcessingContext; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.CypherElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.CypherElement; import org.jetbrains.annotations.NotNull; public final class RelationshipTypeCompletionProvider extends BaseCompletionProvider { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/documentation/CypherDocumentationProvider.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/CypherDocumentationProvider.java similarity index 90% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/documentation/CypherDocumentationProvider.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/CypherDocumentationProvider.java index e3052574..10740cd2 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/documentation/CypherDocumentationProvider.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/CypherDocumentationProvider.java @@ -3,21 +3,22 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.documentation; +package com.github.mdelambilly.graphdbplugin.language.cypher.documentation; -import com.albertoventurini.graphdbplugin.language.cypher.documentation.database.CypherDocumentation; -import com.albertoventurini.graphdbplugin.language.cypher.psi.*; +import com.github.mdelambilly.graphdbplugin.language.cypher.documentation.database.CypherDocumentation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.*; import com.google.common.collect.Lists; import com.intellij.lang.documentation.AbstractDocumentationProvider; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.tree.IElementType; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.CypherMetadataProviderService; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.CypherProcedureElement; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.CypherFunctionElement; -import com.albertoventurini.graphdbplugin.language.cypher.util.TraverseUtil; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.CypherMetadataProviderService; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.CypherProcedureElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.CypherFunctionElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.util.TraverseUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/CypherDocumentation.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/CypherDocumentation.java similarity index 64% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/CypherDocumentation.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/CypherDocumentation.java index 405bb00d..dd6e728a 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/CypherDocumentation.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/CypherDocumentation.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.documentation.database; +package com.github.mdelambilly.graphdbplugin.language.cypher.documentation.database; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherBuiltInFunctions; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherBuiltInFunctions; public abstract class CypherDocumentation { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/DocumentationStorage.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/DocumentationStorage.java similarity index 93% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/DocumentationStorage.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/DocumentationStorage.java index 19b88392..9f803e83 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/DocumentationStorage.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/DocumentationStorage.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.documentation.database; +package com.github.mdelambilly.graphdbplugin.language.cypher.documentation.database; import com.google.common.base.Charsets; import com.google.common.io.Resources; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/editor/CypherParameterInfoHandler.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/editor/CypherParameterInfoHandler.java similarity index 90% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/editor/CypherParameterInfoHandler.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/editor/CypherParameterInfoHandler.java index 922e2fae..37526d00 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/editor/CypherParameterInfoHandler.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/editor/CypherParameterInfoHandler.java @@ -3,19 +3,20 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.editor; +package com.github.mdelambilly.graphdbplugin.language.cypher.editor; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.InvokableInformation; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; -import com.albertoventurini.graphdbplugin.language.cypher.references.CypherInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.InvokableInformation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherInvocation; import com.intellij.lang.parameterInfo.*; import com.intellij.psi.PsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.ui.JBColor; import com.intellij.util.ArrayUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/editor/CypherTypedHandlerDelegate.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/editor/CypherTypedHandlerDelegate.java new file mode 100644 index 00000000..18e3b7ae --- /dev/null +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/editor/CypherTypedHandlerDelegate.java @@ -0,0 +1,88 @@ +/** + * Copied and adapted from plugin + * Graph Database Support + * by Neueda Technologies, Ltd. + * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 + */ +package com.github.mdelambilly.graphdbplugin.language.cypher.editor; + +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherKeywords; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherStringLiteral; +import com.intellij.codeInsight.editorActions.TypedHandlerDelegate; +import com.intellij.openapi.command.WriteCommandAction; +import com.intellij.openapi.editor.Document; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; + +public class CypherTypedHandlerDelegate extends TypedHandlerDelegate { + + @NotNull + @Override + public Result checkAutoPopup(char charTyped, @NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { + final int offset = editor.getCaretModel().getOffset() - 1; + if (offset >= 0) { + final PsiElement element = file.findElementAt(offset); + if (element instanceof CypherStringLiteral) { + return Result.STOP; + } + } + return charTyped == ':' + || charTyped == '.' + || charTyped == '(' + || charTyped == '[' ? Result.CONTINUE : Result.STOP; + } + + @NotNull + @Override + public Result charTyped(char c, @NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { + if (c != ' ' && c != '\n' && c != '\t' && c != '(' && c != ')' && c != ',' && c != '[' && c != '{') { + return Result.CONTINUE; + } + + int offset = editor.getCaretModel().getOffset(); + if (offset < 2) { + return Result.CONTINUE; + } + + // The delimiter was inserted at offset - 1; the word ends just before it + int wordEnd = offset - 1; + Document document = editor.getDocument(); + CharSequence text = document.getCharsSequence(); + + int wordStart = wordEnd; + while (wordStart > 0 && Character.isLetter(text.charAt(wordStart - 1))) { + wordStart--; + } + + if (wordStart == wordEnd) { + return Result.CONTINUE; + } + + // Skip if inside a string literal + PsiElement element = file.findElementAt(wordStart); + PsiElement parent = element; + while (parent != null) { + if (parent instanceof CypherStringLiteral) { + return Result.CONTINUE; + } + parent = parent.getParent(); + } + + String word = text.subSequence(wordStart, wordEnd).toString(); + String upper = word.toUpperCase(); + + if (!word.equals(upper) && CypherKeywords.KEYWORDS.contains(upper)) { + final int start = wordStart; + final int end = wordEnd; + WriteCommandAction.runWriteCommandAction(project, () -> + document.replaceString(start, end, upper) + ); + } + + return Result.CONTINUE; + } +} diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/file/CypherFile.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/file/CypherFile.java similarity index 84% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/file/CypherFile.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/file/CypherFile.java index 93d48b00..7c25ce0e 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/file/CypherFile.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/file/CypherFile.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.file; +package com.github.mdelambilly.graphdbplugin.language.cypher.file; import com.intellij.extapi.psi.PsiFileBase; import com.intellij.openapi.fileTypes.FileType; import com.intellij.psi.FileViewProvider; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/file/CypherFileType.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/file/CypherFileType.java similarity index 80% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/file/CypherFileType.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/file/CypherFileType.java index f96c2400..620af727 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/file/CypherFileType.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/file/CypherFileType.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.file; +package com.github.mdelambilly.graphdbplugin.language.cypher.file; -import com.albertoventurini.graphdbplugin.language.cypher.CypherIcons; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherIcons; import com.intellij.openapi.fileTypes.LanguageFileType; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/CypherBlock.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/CypherBlock.java similarity index 98% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/CypherBlock.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/CypherBlock.java index 8f744549..4f9b7e2a 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/CypherBlock.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/CypherBlock.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.formatter; +package com.github.mdelambilly.graphdbplugin.language.cypher.formatter; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; import com.intellij.formatting.ASTBlock; import com.intellij.formatting.Alignment; import com.intellij.formatting.Block; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/CypherFormattingModelBuilder.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/CypherFormattingModelBuilder.java similarity index 95% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/CypherFormattingModelBuilder.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/CypherFormattingModelBuilder.java index aa1ac0f9..34423501 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/CypherFormattingModelBuilder.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/CypherFormattingModelBuilder.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.formatter; +package com.github.mdelambilly.graphdbplugin.language.cypher.formatter; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; import com.intellij.formatting.*; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleSettings; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/CypherPreFormatter.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/CypherPreFormatter.java similarity index 83% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/CypherPreFormatter.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/CypherPreFormatter.java index 381302c9..e788185c 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/CypherPreFormatter.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/CypherPreFormatter.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.formatter; +package com.github.mdelambilly.graphdbplugin.language.cypher.formatter; -import com.albertoventurini.graphdbplugin.language.cypher.formatter.converter.AbstractCypherConverter; -import com.albertoventurini.graphdbplugin.language.cypher.formatter.converter.FunctionCaseConverter; -import com.albertoventurini.graphdbplugin.language.cypher.formatter.converter.KeywordCaseConverter; -import com.albertoventurini.graphdbplugin.language.cypher.formatter.converter.QuotesConverter; +import com.github.mdelambilly.graphdbplugin.language.cypher.formatter.converter.AbstractCypherConverter; +import com.github.mdelambilly.graphdbplugin.language.cypher.formatter.converter.FunctionCaseConverter; +import com.github.mdelambilly.graphdbplugin.language.cypher.formatter.converter.KeywordCaseConverter; +import com.github.mdelambilly.graphdbplugin.language.cypher.formatter.converter.QuotesConverter; import com.intellij.lang.ASTNode; import com.intellij.openapi.editor.Document; import com.intellij.openapi.project.Project; @@ -19,7 +20,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.impl.source.codeStyle.PreFormatProcessor; import com.intellij.util.DocumentUtil; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/converter/AbstractCypherConverter.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/converter/AbstractCypherConverter.java similarity index 90% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/converter/AbstractCypherConverter.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/converter/AbstractCypherConverter.java index 81ec151b..df422c40 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/converter/AbstractCypherConverter.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/converter/AbstractCypherConverter.java @@ -3,14 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.formatter.converter; +package com.github.mdelambilly.graphdbplugin.language.cypher.formatter.converter; import com.google.common.base.CaseFormat; import com.intellij.openapi.editor.Document; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiRecursiveElementVisitor; -import com.albertoventurini.graphdbplugin.language.cypher.formatter.CypherPreFormatter; +import com.github.mdelambilly.graphdbplugin.language.cypher.formatter.CypherPreFormatter; import org.jetbrains.annotations.NotNull; public abstract class AbstractCypherConverter extends PsiRecursiveElementVisitor { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/converter/FunctionCaseConverter.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/converter/FunctionCaseConverter.java similarity index 88% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/converter/FunctionCaseConverter.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/converter/FunctionCaseConverter.java index 0f655110..127ac284 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/converter/FunctionCaseConverter.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/converter/FunctionCaseConverter.java @@ -3,17 +3,18 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.formatter.converter; +package com.github.mdelambilly.graphdbplugin.language.cypher.formatter.converter; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; import com.intellij.lang.ASTNode; import com.intellij.openapi.editor.Document; import com.intellij.psi.PsiElement; import com.intellij.psi.impl.source.tree.TreeUtil; import com.intellij.psi.tree.IElementType; import com.intellij.spellchecker.util.Strings; -import com.albertoventurini.graphdbplugin.language.cypher.formatter.CypherPreFormatter; +import com.github.mdelambilly.graphdbplugin.language.cypher.formatter.CypherPreFormatter; import org.jetbrains.annotations.NotNull; public class FunctionCaseConverter extends AbstractCypherConverter { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/converter/KeywordCaseConverter.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/converter/KeywordCaseConverter.java similarity index 89% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/converter/KeywordCaseConverter.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/converter/KeywordCaseConverter.java index 2afe8d6d..0adf5525 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/converter/KeywordCaseConverter.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/converter/KeywordCaseConverter.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.formatter.converter; +package com.github.mdelambilly.graphdbplugin.language.cypher.formatter.converter; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; import com.intellij.lang.ASTNode; import com.intellij.openapi.editor.Document; import com.intellij.psi.PsiElement; @@ -14,8 +15,8 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import com.intellij.util.containers.ContainerUtil; -import com.albertoventurini.graphdbplugin.language.cypher.formatter.CypherPreFormatter; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTokenType; +import com.github.mdelambilly.graphdbplugin.language.cypher.formatter.CypherPreFormatter; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTokenType; import org.jetbrains.annotations.NotNull; import java.util.Map; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/converter/QuotesConverter.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/converter/QuotesConverter.java similarity index 83% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/converter/QuotesConverter.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/converter/QuotesConverter.java index 24ecb297..f6587990 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/formatter/converter/QuotesConverter.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/formatter/converter/QuotesConverter.java @@ -3,14 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.formatter.converter; +package com.github.mdelambilly.graphdbplugin.language.cypher.formatter.converter; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; import com.google.common.base.CharMatcher; import com.intellij.openapi.editor.Document; import com.intellij.psi.PsiElement; -import com.albertoventurini.graphdbplugin.language.cypher.formatter.CypherPreFormatter; +import com.github.mdelambilly.graphdbplugin.language.cypher.formatter.CypherPreFormatter; import org.jetbrains.annotations.NotNull; public class QuotesConverter extends AbstractCypherConverter { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/highlight/CypherSyntaxColors.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/highlight/CypherSyntaxColors.java similarity index 96% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/highlight/CypherSyntaxColors.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/highlight/CypherSyntaxColors.java index 79026516..22c50d59 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/highlight/CypherSyntaxColors.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/highlight/CypherSyntaxColors.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.highlight; +package com.github.mdelambilly.graphdbplugin.language.cypher.highlight; import com.intellij.openapi.editor.DefaultLanguageHighlighterColors; import com.intellij.openapi.editor.HighlighterColors; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighter.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighter.java similarity index 93% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighter.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighter.java index f1a5b44a..0676f95c 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighter.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighter.java @@ -3,18 +3,19 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.highlight; +package com.github.mdelambilly.graphdbplugin.language.cypher.highlight; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; import com.intellij.lexer.Lexer; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.fileTypes.SyntaxHighlighterBase; import com.intellij.psi.TokenType; import com.intellij.psi.tree.IElementType; -import com.albertoventurini.graphdbplugin.language.cypher.lexer.CypherLexerAdapter; -import com.albertoventurini.graphdbplugin.language.cypher.CypherParserDefinition; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTokenType; +import com.github.mdelambilly.graphdbplugin.language.cypher.lexer.CypherLexerAdapter; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherParserDefinition; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTokenType; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighterAnnotator.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighterAnnotator.java similarity index 95% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighterAnnotator.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighterAnnotator.java index e2a9a18d..baa4c2a5 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighterAnnotator.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighterAnnotator.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.highlight; +package com.github.mdelambilly.graphdbplugin.language.cypher.highlight; -import com.albertoventurini.graphdbplugin.language.cypher.psi.*; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.*; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.lang.annotation.Annotator; import com.intellij.lang.annotation.HighlightSeverity; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighterFactory.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighterFactory.java similarity index 88% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighterFactory.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighterFactory.java index 62ef5353..dc7c9c7b 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighterFactory.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/highlight/CypherSyntaxHighlighterFactory.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.highlight; +package com.github.mdelambilly.graphdbplugin.language.cypher.highlight; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/inspections/CypherFunctionCallInspection.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/inspections/CypherFunctionCallInspection.java similarity index 85% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/inspections/CypherFunctionCallInspection.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/inspections/CypherFunctionCallInspection.java index e4b47c19..b6e47762 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/inspections/CypherFunctionCallInspection.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/inspections/CypherFunctionCallInspection.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.inspections; +package com.github.mdelambilly.graphdbplugin.language.cypher.inspections; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.LocalInspectionToolSession; @@ -12,22 +13,22 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; import com.intellij.util.Range; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.InvokableInformation; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherExpression; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherFunctionArguments; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherFunctionInvocation; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherProcedureArguments; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherProcedureInvocation; -import com.albertoventurini.graphdbplugin.language.cypher.references.CypherInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.InvokableInformation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherExpression; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherFunctionArguments; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherFunctionInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherProcedureArguments; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherProcedureInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherInvocation; import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.Optional; import static com.google.common.collect.Lists.newArrayList; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.NULL; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.InvokableInformation.Argument; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.NULL; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.InvokableInformation.Argument; import static java.util.Collections.emptyList; import static java.util.stream.Collectors.toList; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lang/CypherBraceMatcher.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lang/CypherBraceMatcher.java similarity index 88% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lang/CypherBraceMatcher.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lang/CypherBraceMatcher.java index ca52393f..0cafa98e 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lang/CypherBraceMatcher.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lang/CypherBraceMatcher.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.lang; +package com.github.mdelambilly.graphdbplugin.language.cypher.lang; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; import com.intellij.lang.BracePair; import com.intellij.lang.PairedBraceMatcher; import com.intellij.psi.PsiFile; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lang/CypherNameValidator.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lang/CypherNameValidator.java similarity index 78% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lang/CypherNameValidator.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lang/CypherNameValidator.java index fa0d0059..6a43bb53 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lang/CypherNameValidator.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lang/CypherNameValidator.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.lang; +package com.github.mdelambilly.graphdbplugin.language.cypher.lang; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherKeywords; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherKeywords; import com.intellij.lang.refactoring.NamesValidator; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lang/CypherRegexp.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lang/CypherRegexp.java similarity index 80% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lang/CypherRegexp.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lang/CypherRegexp.java index 5523a7bc..b479fe46 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lang/CypherRegexp.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lang/CypherRegexp.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.lang; +package com.github.mdelambilly.graphdbplugin.language.cypher.lang; /** * Regular expressions for Cypher. diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lang/CypherSpellcheckingStrategy.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lang/CypherSpellcheckingStrategy.java similarity index 76% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lang/CypherSpellcheckingStrategy.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lang/CypherSpellcheckingStrategy.java index ff2d90ef..1566530b 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lang/CypherSpellcheckingStrategy.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lang/CypherSpellcheckingStrategy.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.lang; +package com.github.mdelambilly.graphdbplugin.language.cypher.lang; import com.intellij.psi.PsiElement; import com.intellij.spellchecker.tokenizer.SpellcheckingStrategy; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; import org.jetbrains.annotations.NotNull; public class CypherSpellcheckingStrategy extends SpellcheckingStrategy { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lexer/Cypher.bnf b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lexer/Cypher.bnf similarity index 76% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lexer/Cypher.bnf rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lexer/Cypher.bnf index b5453719..30f04fba 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lexer/Cypher.bnf +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lexer/Cypher.bnf @@ -5,19 +5,19 @@ * Modified by Alberto Venturini, 2022 */ { - parserClass="com.albertoventurini.graphdbplugin.language.cypher.CypherParser" + parserClass="com.github.mdelambilly.graphdbplugin.language.cypher.CypherParser" extends="com.intellij.extapi.psi.ASTWrapperPsiElement" - elementTypeHolderClass="com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes" - elementTypeClass="com.albertoventurini.graphdbplugin.language.cypher.psi.CypherElementType" - tokenTypeClass="com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTokenType" + elementTypeHolderClass="com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes" + elementTypeClass="com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherElementType" + tokenTypeClass="com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTokenType" - psiImplUtilClass="com.albertoventurini.graphdbplugin.language.cypher.psi.CypherPsiImplUtil" + psiImplUtilClass="com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherPsiImplUtil" psiClassPrefix="Cypher" psiImplClassSuffix="Impl" - psiPackage="com.albertoventurini.graphdbplugin.language.cypher.psi" - psiImplPackage="com.albertoventurini.graphdbplugin.language.cypher.psi.impl" + psiPackage="com.github.mdelambilly.graphdbplugin.language.cypher.psi" + psiImplPackage="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl" tokens=[ // base @@ -265,12 +265,12 @@ Call ::= K_CALL ProcedureInvocation ProcedureResults? InQueryCall ::= Call Where? StandaloneCall ::= Call (Where? Return)? ProcedureInvocation ::= ProcedureInvocationBody ProcedureArguments { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherInvocation" - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherProcedureInvocationImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherInvocation" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherProcedureInvocationImplMixin" } ProcedureInvocationBody ::= Namespace ProcedureName ProcedureArguments ::= "(" Expression? ("," Expression)* ")" { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherArgumentList" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherArgumentList" } ProcedureResults ::= K_YIELD ProcedureResult ("," ProcedureResult)* ProcedureResult ::= AliasedProcedureResult | SimpleProcedureResult @@ -292,13 +292,13 @@ Pattern ::= PatternPart ("," PatternPart)* PatternPart ::= (Variable "=")? AnonymousPatternPart AnonymousPatternPart ::= ShortestPathPattern | PatternElement ShortestPathPattern ::= ShortestPathFunctionInvocation | AllShortestPathsFunctionInvocation { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherTypePropagator" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherTypePropagator" } ShortestPathFunctionInvocation ::= (K_SHORTESTPATH "(" PatternElement ")") { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherPathYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherPathYielding" } AllShortestPathsFunctionInvocation ::= (K_ALLSHORTESTPATHS "(" PatternElement ")") { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherListYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherListYielding" } PatternElement ::= ("(" PatternElement ")") | (NodePattern PatternElementChain*) PatternElementChain ::= RelationshipPattern NodePattern {pin=1} @@ -312,7 +312,7 @@ MaybeVariableLength ::= ("*" RangeLiteral?) NodePattern ::= "(" Variable? NodeLabels? Properties? Where? ")" {pin=1} RelationshipsPattern ::= NodePattern PatternElementChain+ { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherPathYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherPathYielding" } Properties ::= MapLiteral | Parameter @@ -320,7 +320,7 @@ Properties ::= MapLiteral | Parameter * Expression */ Expression ::= Expression12 { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherTypePropagator" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherTypePropagator" } private Expression12 ::= Expression11 (K_OR Expression11)* private Expression11 ::= Expression10 (K_XOR Expression10)* @@ -383,28 +383,28 @@ private Expression1 ::= UnaryOperator UnaryOperator ::= ("-" | "+") NumberLiteral { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherTypePropagator" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherTypePropagator" } Array ::= ("[" Expression? ("," Expression)* "]") { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherListYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherListYielding" } PropertyLookup ::= "." PropertyKeyName ListComprehension ::= "[" FilterExpression ("|" Expression)? "]" { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherListYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherListYielding" } FilterExpression ::= IdInColl Where? IdInColl ::= Variable K_IN Expression ParenthesizedExpression ::= "(" Expression ")" { pin=1 - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherParenthesized" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherParenthesized" } FunctionInvocation ::= FunctionInvocationBody (("(" "*" ")") | FunctionArguments) { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherInvocation" - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherFunctionInvocationImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherInvocation" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherFunctionInvocationImplMixin" } FunctionArguments ::= "(" K_DISTINCT? Expression? ("," Expression)* ")" { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherArgumentList" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherArgumentList" } FunctionInvocationBody ::= Namespace FunctionName @@ -421,53 +421,53 @@ CountSubQuery ::= K_COUNT "{" K_MATCH? PatternWithWhereClause "}" CaseExpression ::= K_CASE ((CaseAlternatives+) | (Expression CaseAlternatives+)) (K_ELSE Expression)? K_END { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherAnyYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherAnyYielding" } CaseAlternatives ::= K_WHEN Expression K_THEN Expression PropertyExpression ::= Expression1 (PropertyLookup)+ FilterFunctionInvocation ::= K_FILTER "(" FilterExpression ")" { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherInvocation" - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherFilterFunctionInvocationImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherInvocation" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherFilterFunctionInvocationImplMixin" } ExtractFunctionInvocation ::= K_EXTRACT "(" FilterExpression ("|" Expression)? ")" { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherInvocation" - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherExtractFunctionInvocationImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherInvocation" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherExtractFunctionInvocationImplMixin" } ReduceFunctionInvocation ::= K_REDUCE "(" Variable "=" Expression "," IdInColl "|" Expression ")" { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherInvocation" - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherReduceFunctionInvocationImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherInvocation" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherReduceFunctionInvocationImplMixin" } AllFunctionInvocation ::= K_ALL "(" FilterExpression ")" { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherInvocation" - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherAllFunctionInvocationImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherInvocation" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherAllFunctionInvocationImplMixin" } AnyFunctionInvocation ::= K_ANY "(" FilterExpression ")" { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherInvocation" - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherAnyFunctionInvocationImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherInvocation" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherAnyFunctionInvocationImplMixin" } NoneFunctionInvocation ::= K_NONE "(" FilterExpression ")" { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherInvocation" - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherNoneFunctionInvocationImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherInvocation" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherNoneFunctionInvocationImplMixin" } SingleFunctionInvocation ::= K_SINGLE "(" FilterExpression ")" { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherInvocation" - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherSingleFunctionInvocationImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherInvocation" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherSingleFunctionInvocationImplMixin" } ExistsFunctionInvocation ::= K_EXISTS "(" Expression ")" { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherInvocation" - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherExistsFunctionInvocationImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherInvocation" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherExistsFunctionInvocationImplMixin" } PatternComprehension ::= "[" RelationshipsPattern Where? "|" Expression "]" { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherListYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherListYielding" } /************************* * Literals */ MapProjection ::= Variable "{" MapProjectionVariants? ("," MapProjectionVariants)* "}" { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherMapYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherMapYielding" } MapProjectionVariants ::= (LiteralEntry | PropertySelector | VariableSelector | AllPropertiesSelector) LiteralEntry ::= PropertyKeyName ":" Expression @@ -479,61 +479,61 @@ AllPropertiesSelector ::= "." "*" * Literals */ Variable ::= SymbolicNameString { - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherVariableElementImplMixin" - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherVariableElement" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherVariableElementImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherVariableElement" } FunctionName ::= UnescapedSymbolicNameString | EscapedSymbolicNameString | K_COUNT ProcedureName ::= SymbolicNameString CountStar ::= (K_COUNT "(" "*" ")") { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherIntegerYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherIntegerYielding" } Parameter ::= NewParameter | OldParameter { - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherParameterImplMixin" - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherAnyYielding" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherParameterImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherAnyYielding" } OldParameter ::= "{" (SymbolicNameString | UnsignedInteger) "}" NewParameter ::= "$" (SymbolicNameString | UnsignedInteger) NodeLabel ::= ":" LabelName StringLiteral ::= l_string { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherStringYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherStringYielding" } BooleanLiteral ::= K_TRUE | K_FALSE { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherBooleanYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherBooleanYielding" } NullLiteral ::= K_NULL { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherNullYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherNullYielding" } LabelName ::= SymbolicNameString { - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherLabelNameImplMixin" - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherNamedElement" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherLabelNameImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherNamedElement" } RelType ::= ":" RelTypeName RelTypeName ::= SymbolicNameString { - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherRelTypeNameImplMixin" - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherNamedElement" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherRelTypeNameImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherNamedElement" } PropertyKeyName ::= SymbolicNameString { - mixin="com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherPropertyKeyNameImplMixin" - implements="com.albertoventurini.graphdbplugin.language.cypher.references.CypherNamedElement" + mixin="com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherPropertyKeyNameImplMixin" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherNamedElement" } PropertyKeyNames ::= PropertyKeyName ("," PropertyKeyName)* RangeLiteral ::= (IntegerLiteral? ".." IntegerLiteral?) | (IntegerLiteral) MapLiteral ::= "{" (PropertyKeyName ":" Expression)? ("," PropertyKeyName ":" Expression)* "}" { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherMapYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherMapYielding" } NodeLabels ::= NodeLabel+ NumberLiteral ::= DoubleLiteral | IntegerLiteral { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherTypePropagator" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherTypePropagator" } DoubleLiteral ::= UnsignedDouble {// todo: make real double here - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherFloatYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherFloatYielding" } IntegerLiteral ::= UnsignedInteger { - implements="com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherIntegerYielding" + implements="com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherIntegerYielding" } /************************* diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lexer/CypherLexer.flex b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lexer/CypherLexer.flex similarity index 96% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lexer/CypherLexer.flex rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lexer/CypherLexer.flex index 0ca411b1..60f19fdf 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lexer/CypherLexer.flex +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lexer/CypherLexer.flex @@ -1,13 +1,13 @@ -package com.albertoventurini.graphdbplugin.language.cypher.lexer; +package com.github.mdelambilly.graphdbplugin.language.cypher.lexer; import com.intellij.lexer.FlexLexer; import com.intellij.psi.tree.IElementType; import static com.intellij.psi.TokenType.BAD_CHARACTER; import static com.intellij.psi.TokenType.WHITE_SPACE; -import static com.albertoventurini.graphdbplugin.language.cypher.CypherParserDefinition.LINE_COMMENT; -import static com.albertoventurini.graphdbplugin.language.cypher.CypherParserDefinition.BLOCK_COMMENT; -import static com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes.*; +import static com.github.mdelambilly.graphdbplugin.language.cypher.CypherParserDefinition.LINE_COMMENT; +import static com.github.mdelambilly.graphdbplugin.language.cypher.CypherParserDefinition.BLOCK_COMMENT; +import static com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes.*; %% diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lexer/CypherLexerAdapter.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lexer/CypherLexerAdapter.java similarity index 80% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lexer/CypherLexerAdapter.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lexer/CypherLexerAdapter.java index 051e15fc..fb8cd69e 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/lexer/CypherLexerAdapter.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/lexer/CypherLexerAdapter.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.lexer; +package com.github.mdelambilly.graphdbplugin.language.cypher.lexer; import com.intellij.lexer.FlexAdapter; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/CypherElementFactory.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/CypherElementFactory.java similarity index 87% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/CypherElementFactory.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/CypherElementFactory.java index e9b6497d..6538f2b4 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/CypherElementFactory.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/CypherElementFactory.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.psi; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi; -import com.albertoventurini.graphdbplugin.language.cypher.file.CypherFile; -import com.albertoventurini.graphdbplugin.language.cypher.file.CypherFileType; -import com.albertoventurini.graphdbplugin.language.cypher.util.TraverseUtil; +import com.github.mdelambilly.graphdbplugin.language.cypher.file.CypherFile; +import com.github.mdelambilly.graphdbplugin.language.cypher.file.CypherFileType; +import com.github.mdelambilly.graphdbplugin.language.cypher.util.TraverseUtil; import com.intellij.lang.ASTNode; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/CypherElementType.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/CypherElementType.java similarity index 76% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/CypherElementType.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/CypherElementType.java index 777f39a5..c4c2fe02 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/CypherElementType.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/CypherElementType.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.psi; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi; import com.intellij.psi.tree.IElementType; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/CypherPsiImplUtil.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/CypherPsiImplUtil.java similarity index 87% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/CypherPsiImplUtil.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/CypherPsiImplUtil.java index f0b6e5e8..fb8c532b 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/CypherPsiImplUtil.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/CypherPsiImplUtil.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.psi; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi; -import com.albertoventurini.graphdbplugin.language.cypher.references.CypherNamedElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherNamedElement; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/CypherTokenType.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/CypherTokenType.java similarity index 86% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/CypherTokenType.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/CypherTokenType.java index 77ba51be..e49a0307 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/CypherTokenType.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/CypherTokenType.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.psi; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi; import com.intellij.psi.tree.IElementType; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherAllFunctionInvocationImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherAllFunctionInvocationImplMixin.java similarity index 73% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherAllFunctionInvocationImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherAllFunctionInvocationImplMixin.java index f94ab738..1f0d7091 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherAllFunctionInvocationImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherAllFunctionInvocationImplMixin.java @@ -1,6 +1,6 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherAllFunctionInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherAllFunctionInvocation; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherAnyFunctionInvocationImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherAnyFunctionInvocationImplMixin.java similarity index 73% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherAnyFunctionInvocationImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherAnyFunctionInvocationImplMixin.java index ff0d4174..11cc8c01 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherAnyFunctionInvocationImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherAnyFunctionInvocationImplMixin.java @@ -1,6 +1,6 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherAnyFunctionInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherAnyFunctionInvocation; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherExistsFunctionInvocationImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherExistsFunctionInvocationImplMixin.java similarity index 73% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherExistsFunctionInvocationImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherExistsFunctionInvocationImplMixin.java index bb26a651..b37122de 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherExistsFunctionInvocationImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherExistsFunctionInvocationImplMixin.java @@ -1,6 +1,6 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherExistsFunctionInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherExistsFunctionInvocation; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherExtractFunctionInvocationImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherExtractFunctionInvocationImplMixin.java similarity index 73% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherExtractFunctionInvocationImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherExtractFunctionInvocationImplMixin.java index 7d06506e..2b51d3d0 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherExtractFunctionInvocationImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherExtractFunctionInvocationImplMixin.java @@ -1,6 +1,6 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherExtractFunctionInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherExtractFunctionInvocation; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherFilterFunctionInvocationImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherFilterFunctionInvocationImplMixin.java similarity index 73% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherFilterFunctionInvocationImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherFilterFunctionInvocationImplMixin.java index eb1e37da..283e277b 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherFilterFunctionInvocationImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherFilterFunctionInvocationImplMixin.java @@ -1,6 +1,6 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherFilterFunctionInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherFilterFunctionInvocation; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherFunctionInvocationImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherFunctionInvocationImplMixin.java similarity index 74% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherFunctionInvocationImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherFunctionInvocationImplMixin.java index f143248d..a8904fc9 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherFunctionInvocationImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherFunctionInvocationImplMixin.java @@ -1,6 +1,6 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherFunctionInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherFunctionInvocation; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherLabelNameImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherLabelNameImplMixin.java similarity index 71% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherLabelNameImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherLabelNameImplMixin.java index c16bf35d..dba0ef5c 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherLabelNameImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherLabelNameImplMixin.java @@ -1,9 +1,9 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherElementFactory; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherLabelName; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherPropertyKeyName; -import com.albertoventurini.graphdbplugin.language.cypher.references.CypherNamedElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherElementFactory; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherLabelName; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherPropertyKeyName; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherNamedElement; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.NlsSafe; @@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.albertoventurini.graphdbplugin.language.cypher.psi.CypherPsiImplUtil.safelyReplaceSymbolicName; +import static com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherPsiImplUtil.safelyReplaceSymbolicName; public class CypherLabelNameImplMixin extends ASTWrapperPsiElement implements CypherNamedElement, ContributedReferenceHost { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherNoneFunctionInvocationImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherNoneFunctionInvocationImplMixin.java similarity index 73% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherNoneFunctionInvocationImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherNoneFunctionInvocationImplMixin.java index da1c0a80..2c544c3b 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherNoneFunctionInvocationImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherNoneFunctionInvocationImplMixin.java @@ -1,6 +1,6 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherNoneFunctionInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherNoneFunctionInvocation; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherParameterImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherParameterImplMixin.java similarity index 80% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherParameterImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherParameterImplMixin.java index 72b78bfb..7f6d6773 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherParameterImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherParameterImplMixin.java @@ -1,8 +1,8 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherNewParameter; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherOldParameter; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherParameter; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherNewParameter; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherOldParameter; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherParameter; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherProcedureInvocationImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherProcedureInvocationImplMixin.java similarity index 74% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherProcedureInvocationImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherProcedureInvocationImplMixin.java index 6280c5b9..a6f23272 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherProcedureInvocationImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherProcedureInvocationImplMixin.java @@ -1,6 +1,6 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherProcedureInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherProcedureInvocation; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherPropertyKeyNameImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherPropertyKeyNameImplMixin.java similarity index 71% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherPropertyKeyNameImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherPropertyKeyNameImplMixin.java index ff2fbe23..ac4d34ea 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherPropertyKeyNameImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherPropertyKeyNameImplMixin.java @@ -1,9 +1,9 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherElementFactory; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherPropertyKeyName; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherRelTypeName; -import com.albertoventurini.graphdbplugin.language.cypher.references.CypherNamedElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherElementFactory; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherPropertyKeyName; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherRelTypeName; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherNamedElement; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.NlsSafe; @@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.albertoventurini.graphdbplugin.language.cypher.psi.CypherPsiImplUtil.safelyReplaceSymbolicName; +import static com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherPsiImplUtil.safelyReplaceSymbolicName; public class CypherPropertyKeyNameImplMixin extends ASTWrapperPsiElement implements CypherNamedElement, ContributedReferenceHost { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherReduceFunctionInvocationImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherReduceFunctionInvocationImplMixin.java similarity index 73% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherReduceFunctionInvocationImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherReduceFunctionInvocationImplMixin.java index aea6384d..a94ea8fe 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherReduceFunctionInvocationImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherReduceFunctionInvocationImplMixin.java @@ -1,6 +1,6 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherReduceFunctionInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherReduceFunctionInvocation; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherRelTypeNameImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherRelTypeNameImplMixin.java similarity index 74% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherRelTypeNameImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherRelTypeNameImplMixin.java index db7a7383..d0fc0efd 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherRelTypeNameImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherRelTypeNameImplMixin.java @@ -1,8 +1,8 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherElementFactory; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherRelTypeName; -import com.albertoventurini.graphdbplugin.language.cypher.references.CypherNamedElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherElementFactory; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherRelTypeName; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherNamedElement; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.NlsSafe; @@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.albertoventurini.graphdbplugin.language.cypher.psi.CypherPsiImplUtil.safelyReplaceSymbolicName; +import static com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherPsiImplUtil.safelyReplaceSymbolicName; public class CypherRelTypeNameImplMixin extends ASTWrapperPsiElement implements CypherNamedElement, ContributedReferenceHost { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherSingleFunctionInvocationImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherSingleFunctionInvocationImplMixin.java similarity index 73% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherSingleFunctionInvocationImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherSingleFunctionInvocationImplMixin.java index ccb23b18..dd57daa1 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherSingleFunctionInvocationImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherSingleFunctionInvocationImplMixin.java @@ -1,6 +1,6 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherSingleFunctionInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherSingleFunctionInvocation; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherVariableElementImplMixin.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherVariableElementImplMixin.java similarity index 74% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherVariableElementImplMixin.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherVariableElementImplMixin.java index c4f13fdd..3fc0d7c3 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/psi/impl/CypherVariableElementImplMixin.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/psi/impl/CypherVariableElementImplMixin.java @@ -1,8 +1,8 @@ -package com.albertoventurini.graphdbplugin.language.cypher.psi.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherElementFactory; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherVariable; -import com.albertoventurini.graphdbplugin.language.cypher.references.CypherVariableElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherElementFactory; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherVariable; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherVariableElement; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.NlsSafe; @@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.albertoventurini.graphdbplugin.language.cypher.psi.CypherPsiImplUtil.safelyReplaceSymbolicName; +import static com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherPsiImplUtil.safelyReplaceSymbolicName; public class CypherVariableElementImplMixin extends ASTWrapperPsiElement implements CypherVariableElement, ContributedReferenceHost { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherArgumentList.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherArgumentList.java similarity index 73% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherArgumentList.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherArgumentList.java index e8a74001..6d3e3cb3 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherArgumentList.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherArgumentList.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references; +package com.github.mdelambilly.graphdbplugin.language.cypher.references; import com.intellij.psi.PsiElement; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherInvocation.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherInvocation.java similarity index 66% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherInvocation.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherInvocation.java index 645fbdf5..11aa6a73 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherInvocation.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherInvocation.java @@ -3,26 +3,27 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references; +package com.github.mdelambilly.graphdbplugin.language.cypher.references; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherFunctionArguments; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherFunctionInvocation; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherProcedureInvocation; -import com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherTyped; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherFunctionArguments; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherFunctionInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherProcedureInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherTyped; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.CypherMetadataProviderService; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherBuiltInFunctions; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.CypherBuiltInFunctionElement; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.CypherProcedureElement; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.CypherFunctionElement; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements.InvokableInformation; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.CypherMetadataProviderService; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherBuiltInFunctions; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.CypherBuiltInFunctionElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.CypherProcedureElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.CypherFunctionElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements.InvokableInformation; import java.util.*; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.ANY; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.ANY; public interface CypherInvocation extends PsiElement, CypherTyped { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherNamedElement.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherNamedElement.java similarity index 77% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherNamedElement.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherNamedElement.java index 0c4fbae9..58f248ae 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherNamedElement.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherNamedElement.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references; +package com.github.mdelambilly.graphdbplugin.language.cypher.references; import com.intellij.psi.PsiNameIdentifierOwner; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherNamedElementImpl.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherNamedElementImpl.java similarity index 85% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherNamedElementImpl.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherNamedElementImpl.java index b7b3317d..95ccd421 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherNamedElementImpl.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherNamedElementImpl.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references; +package com.github.mdelambilly.graphdbplugin.language.cypher.references; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherParenthesized.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherParenthesized.java similarity index 52% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherParenthesized.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherParenthesized.java index ff0f0a81..ee539cf1 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherParenthesized.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherParenthesized.java @@ -3,17 +3,18 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references; +package com.github.mdelambilly.graphdbplugin.language.cypher.references; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherParenthesizedExpression; -import com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherTypePropagator; -import com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherTyped; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherParenthesizedExpression; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherTypePropagator; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherTyped; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; import java.util.Optional; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.ANY; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.ANY; public interface CypherParenthesized extends CypherTyped { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherRefactoringSupportProvider.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherRefactoringSupportProvider.java similarity index 67% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherRefactoringSupportProvider.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherRefactoringSupportProvider.java index 82b08455..d2fbb373 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherRefactoringSupportProvider.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherRefactoringSupportProvider.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references; +package com.github.mdelambilly.graphdbplugin.language.cypher.references; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherLabelName; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherPropertyKeyName; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherRelTypeName; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherVariable; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherLabelName; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherPropertyKeyName; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherRelTypeName; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherVariable; import com.intellij.lang.refactoring.RefactoringSupportProvider; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherReferenceBase.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherReferenceBase.java similarity index 96% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherReferenceBase.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherReferenceBase.java index 6018c572..75d7d783 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherReferenceBase.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherReferenceBase.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references; +package com.github.mdelambilly.graphdbplugin.language.cypher.references; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherReferenceContributionPriority.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherReferenceContributionPriority.java similarity index 85% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherReferenceContributionPriority.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherReferenceContributionPriority.java index c00effc5..616de6c4 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherReferenceContributionPriority.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherReferenceContributionPriority.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references; +package com.github.mdelambilly.graphdbplugin.language.cypher.references; /** * Cypher specific priorities. diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherReferenceContributor.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherReferenceContributor.java similarity index 76% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherReferenceContributor.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherReferenceContributor.java index f0d60352..d5a02376 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherReferenceContributor.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherReferenceContributor.java @@ -3,25 +3,26 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references; +package com.github.mdelambilly.graphdbplugin.language.cypher.references; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherLabelName; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherPropertyKeyName; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherRelTypeName; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherVariable; -import com.albertoventurini.graphdbplugin.language.cypher.references.impl.CypherLabelNameReference; -import com.albertoventurini.graphdbplugin.language.cypher.references.impl.CypherPropertyKeyNameReference; -import com.albertoventurini.graphdbplugin.language.cypher.references.impl.CypherRelTypeNameReference; -import com.albertoventurini.graphdbplugin.language.cypher.references.impl.CypherVariableReference; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherLabelName; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherPropertyKeyName; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherRelTypeName; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherVariable; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.impl.CypherLabelNameReference; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.impl.CypherPropertyKeyNameReference; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.impl.CypherRelTypeNameReference; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.impl.CypherVariableReference; import com.intellij.patterns.ElementPattern; import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.*; import com.intellij.util.ProcessingContext; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; import org.jetbrains.annotations.NotNull; -import static com.albertoventurini.graphdbplugin.language.cypher.util.PsiUtil.rangeFrom; +import static com.github.mdelambilly.graphdbplugin.language.cypher.util.PsiUtil.rangeFrom; /** * Contribute references for specified PSI elements. diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherRenameInputValidator.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherRenameInputValidator.java similarity index 75% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherRenameInputValidator.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherRenameInputValidator.java index 1b346e94..73ef5ca4 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherRenameInputValidator.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherRenameInputValidator.java @@ -3,17 +3,18 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references; +package com.github.mdelambilly.graphdbplugin.language.cypher.references; import com.intellij.patterns.ElementPattern; import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.PsiElement; import com.intellij.refactoring.rename.RenameInputValidator; import com.intellij.util.ProcessingContext; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; -import com.albertoventurini.graphdbplugin.language.cypher.file.CypherFile; -import com.albertoventurini.graphdbplugin.language.cypher.lang.CypherRegexp; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.file.CypherFile; +import com.github.mdelambilly.graphdbplugin.language.cypher.lang.CypherRegexp; /** * Validates identifier renaming. diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherVariableElement.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherVariableElement.java similarity index 64% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherVariableElement.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherVariableElement.java index 0094a3cf..064aa75a 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherVariableElement.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherVariableElement.java @@ -3,23 +3,24 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references; +package com.github.mdelambilly.graphdbplugin.language.cypher.references; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherList; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherMaybeVariableLength; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherNodePattern; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherPatternPart; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherRelationshipDetail; -import com.albertoventurini.graphdbplugin.language.cypher.references.types.CypherTyped; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherList; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherMaybeVariableLength; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherNodePattern; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherPatternPart; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherRelationshipDetail; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.types.CypherTyped; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; import org.jetbrains.annotations.Nullable; import java.util.Optional; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.*; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.*; import static java.util.Objects.nonNull; public interface CypherVariableElement extends CypherNamedElement, CypherTyped { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherVariableElementImpl.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherVariableElementImpl.java similarity index 84% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherVariableElementImpl.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherVariableElementImpl.java index 6d9cae17..b41f9237 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/CypherVariableElementImpl.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/CypherVariableElementImpl.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references; +package com.github.mdelambilly.graphdbplugin.language.cypher.references; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/impl/CypherLabelNameReference.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/impl/CypherLabelNameReference.java similarity index 79% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/impl/CypherLabelNameReference.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/impl/CypherLabelNameReference.java index 0f9ddd5f..8b099ec0 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/impl/CypherLabelNameReference.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/impl/CypherLabelNameReference.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.ResolveResult; -import com.albertoventurini.graphdbplugin.language.cypher.references.CypherReferenceBase; -import com.albertoventurini.graphdbplugin.language.cypher.util.CypherUtil; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherReferenceBase; +import com.github.mdelambilly.graphdbplugin.language.cypher.util.CypherUtil; import icons.GraphIcons; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/impl/CypherPropertyKeyNameReference.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/impl/CypherPropertyKeyNameReference.java similarity index 78% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/impl/CypherPropertyKeyNameReference.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/impl/CypherPropertyKeyNameReference.java index f81e27fb..4b069dd8 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/impl/CypherPropertyKeyNameReference.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/impl/CypherPropertyKeyNameReference.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; -import com.albertoventurini.graphdbplugin.language.cypher.references.CypherReferenceBase; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherReferenceBase; import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.ResolveResult; -import com.albertoventurini.graphdbplugin.language.cypher.util.CypherUtil; +import com.github.mdelambilly.graphdbplugin.language.cypher.util.CypherUtil; import icons.GraphIcons; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/impl/CypherRelTypeNameReference.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/impl/CypherRelTypeNameReference.java similarity index 79% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/impl/CypherRelTypeNameReference.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/impl/CypherRelTypeNameReference.java index 7cb24d84..34d5a86b 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/impl/CypherRelTypeNameReference.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/impl/CypherRelTypeNameReference.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; -import com.albertoventurini.graphdbplugin.language.cypher.references.CypherReferenceBase; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherReferenceBase; import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.ResolveResult; -import com.albertoventurini.graphdbplugin.language.cypher.util.CypherUtil; +import com.github.mdelambilly.graphdbplugin.language.cypher.util.CypherUtil; import icons.GraphIcons; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/impl/CypherVariableReference.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/impl/CypherVariableReference.java similarity index 74% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/impl/CypherVariableReference.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/impl/CypherVariableReference.java index e7abcdad..9cb95d0c 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/impl/CypherVariableReference.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/impl/CypherVariableReference.java @@ -3,18 +3,19 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.impl; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.impl; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherStatement; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; -import com.albertoventurini.graphdbplugin.language.cypher.references.CypherReferenceBase; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherStatement; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherReferenceBase; import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.ResolveResult; -import com.albertoventurini.graphdbplugin.language.cypher.util.CypherUtil; -import com.albertoventurini.graphdbplugin.language.cypher.util.PsiTraversalUtilities; +import com.github.mdelambilly.graphdbplugin.language.cypher.util.CypherUtil; +import com.github.mdelambilly.graphdbplugin.language.cypher.util.PsiTraversalUtilities; import icons.GraphIcons; import org.jetbrains.annotations.NotNull; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherAnyYielding.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherAnyYielding.java similarity index 51% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherAnyYielding.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherAnyYielding.java index 6a38dd5a..f59cb111 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherAnyYielding.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherAnyYielding.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.types; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.types; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.ANY; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.ANY; public interface CypherAnyYielding extends CypherTyped { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherBooleanYielding.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherBooleanYielding.java similarity index 52% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherBooleanYielding.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherBooleanYielding.java index 951f2339..ba9e8784 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherBooleanYielding.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherBooleanYielding.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.types; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.types; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.BOOLEAN; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.BOOLEAN; public interface CypherBooleanYielding extends CypherTyped { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherFloatYielding.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherFloatYielding.java similarity index 52% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherFloatYielding.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherFloatYielding.java index 011953d3..20643cdf 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherFloatYielding.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherFloatYielding.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.types; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.types; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.FLOAT; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.FLOAT; public interface CypherFloatYielding extends CypherTyped { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherIntegerYielding.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherIntegerYielding.java similarity index 52% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherIntegerYielding.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherIntegerYielding.java index 54bbbf49..e7f27779 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherIntegerYielding.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherIntegerYielding.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.types; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.types; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.INTEGER; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.INTEGER; public interface CypherIntegerYielding extends CypherTyped { diff --git a/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherListYielding.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherListYielding.java new file mode 100644 index 00000000..794eba9e --- /dev/null +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherListYielding.java @@ -0,0 +1,22 @@ +/** + * Copied and adapted from plugin + * Graph Database Support + * by Neueda Technologies, Ltd. + * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 + */ +package com.github.mdelambilly.graphdbplugin.language.cypher.references.types; + +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherList; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; + +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.ANY; + +public interface CypherListYielding extends CypherTyped { + + @Override + default CypherType getType() { + return CypherList.of(ANY); + } + +} diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherMapYielding.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherMapYielding.java similarity index 51% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherMapYielding.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherMapYielding.java index b5da46b8..4327211c 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherMapYielding.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherMapYielding.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.types; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.types; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.MAP; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.MAP; public interface CypherMapYielding extends CypherTyped { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherNodeYielding.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherNodeYielding.java similarity index 51% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherNodeYielding.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherNodeYielding.java index 703a8400..a17e3115 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherNodeYielding.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherNodeYielding.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.types; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.types; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.NODE; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.NODE; public interface CypherNodeYielding extends CypherTyped { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherNullYielding.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherNullYielding.java similarity index 51% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherNullYielding.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherNullYielding.java index 4137f76e..8709e662 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherNullYielding.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherNullYielding.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.types; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.types; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.NULL; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.NULL; public interface CypherNullYielding extends CypherTyped { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherPathYielding.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherPathYielding.java similarity index 51% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherPathYielding.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherPathYielding.java index afa98d5f..50dd193d 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherPathYielding.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherPathYielding.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.types; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.types; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.PATH; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.PATH; public interface CypherPathYielding extends CypherTyped { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherRelationshipYielding.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherRelationshipYielding.java similarity index 52% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherRelationshipYielding.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherRelationshipYielding.java index 639faa9c..f3dfc261 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherRelationshipYielding.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherRelationshipYielding.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.types; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.types; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.RELATIONSHIP; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.RELATIONSHIP; public interface CypherRelationshipYielding extends CypherTyped { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherStringYielding.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherStringYielding.java similarity index 52% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherStringYielding.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherStringYielding.java index ca226ad7..06989c65 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherStringYielding.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherStringYielding.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.types; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.types; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.STRING; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.STRING; public interface CypherStringYielding extends CypherTyped { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherTypePropagator.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherTypePropagator.java similarity index 66% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherTypePropagator.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherTypePropagator.java index 716d66b1..de3478c7 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherTypePropagator.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherTypePropagator.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.types; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.types; import com.intellij.psi.PsiElement; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; -import static com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.ANY; +import static com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherSimpleType.ANY; public interface CypherTypePropagator extends CypherTyped { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherTyped.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherTyped.java similarity index 60% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherTyped.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherTyped.java index 797117c4..0c31939c 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/references/types/CypherTyped.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/references/types/CypherTyped.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.references.types; +package com.github.mdelambilly.graphdbplugin.language.cypher.references.types; import com.intellij.psi.PsiElement; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherType; public interface CypherTyped extends PsiElement { diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/settings/CypherColorSettingsPage.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/settings/CypherColorSettingsPage.java similarity index 90% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/settings/CypherColorSettingsPage.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/settings/CypherColorSettingsPage.java index aa2504b4..cf1745e5 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/settings/CypherColorSettingsPage.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/settings/CypherColorSettingsPage.java @@ -3,17 +3,18 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.settings; +package com.github.mdelambilly.graphdbplugin.language.cypher.settings; -import com.albertoventurini.graphdbplugin.language.cypher.highlight.CypherSyntaxColors; -import com.albertoventurini.graphdbplugin.language.cypher.highlight.CypherSyntaxHighlighter; +import com.github.mdelambilly.graphdbplugin.language.cypher.highlight.CypherSyntaxColors; +import com.github.mdelambilly.graphdbplugin.language.cypher.highlight.CypherSyntaxHighlighter; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.openapi.options.colors.AttributesDescriptor; import com.intellij.openapi.options.colors.ColorDescriptor; import com.intellij.openapi.options.colors.ColorSettingsPage; -import com.albertoventurini.graphdbplugin.language.cypher.CypherIcons; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/CypherUtil.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/CypherUtil.java similarity index 91% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/CypherUtil.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/CypherUtil.java index b5e63e3b..d1035713 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/CypherUtil.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/CypherUtil.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.util; +package com.github.mdelambilly.graphdbplugin.language.cypher.util; -import com.albertoventurini.graphdbplugin.language.cypher.references.CypherNamedElement; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherNamedElement; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; @@ -15,8 +16,8 @@ import com.intellij.psi.search.FileTypeIndex; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.tree.IElementType; -import com.albertoventurini.graphdbplugin.language.cypher.file.CypherFile; -import com.albertoventurini.graphdbplugin.language.cypher.file.CypherFileType; +import com.github.mdelambilly.graphdbplugin.language.cypher.file.CypherFile; +import com.github.mdelambilly.graphdbplugin.language.cypher.file.CypherFileType; import java.util.ArrayList; import java.util.Collection; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/FileTypeExtensionUtil.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/FileTypeExtensionUtil.java similarity index 83% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/FileTypeExtensionUtil.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/FileTypeExtensionUtil.java index ed2e31f5..99464f16 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/FileTypeExtensionUtil.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/FileTypeExtensionUtil.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.util; +package com.github.mdelambilly.graphdbplugin.language.cypher.util; import java.util.Arrays; import java.util.List; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/PsiTraversalUtilities.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/PsiTraversalUtilities.java similarity index 85% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/PsiTraversalUtilities.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/PsiTraversalUtilities.java index 74a4e777..5a0d535f 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/PsiTraversalUtilities.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/PsiTraversalUtilities.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.util; +package com.github.mdelambilly.graphdbplugin.language.cypher.util; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherStatementItem; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherStatementItem; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/PsiUtil.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/PsiUtil.java similarity index 83% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/PsiUtil.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/PsiUtil.java index 21f87254..072dfff9 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/PsiUtil.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/PsiUtil.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.util; +package com.github.mdelambilly.graphdbplugin.language.cypher.util; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; diff --git a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/TraverseUtil.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/TraverseUtil.java similarity index 95% rename from language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/TraverseUtil.java rename to language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/TraverseUtil.java index 155281bb..953e15d0 100644 --- a/language/cypher/src/main/java/com/albertoventurini/graphdbplugin/language/cypher/util/TraverseUtil.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/util/TraverseUtil.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.util; +package com.github.mdelambilly.graphdbplugin.language.cypher.util; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/language/cypher/src/main/resources/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/built-in/functions/allShortestPaths.html b/language/cypher/src/main/resources/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/built-in/functions/allShortestPaths.html similarity index 100% rename from language/cypher/src/main/resources/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/built-in/functions/allShortestPaths.html rename to language/cypher/src/main/resources/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/built-in/functions/allShortestPaths.html diff --git a/language/cypher/src/main/resources/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/built-in/functions/coalesce.html b/language/cypher/src/main/resources/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/built-in/functions/coalesce.html similarity index 100% rename from language/cypher/src/main/resources/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/built-in/functions/coalesce.html rename to language/cypher/src/main/resources/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/built-in/functions/coalesce.html diff --git a/language/cypher/src/main/resources/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/built-in/functions/shortestPath.html b/language/cypher/src/main/resources/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/built-in/functions/shortestPath.html similarity index 100% rename from language/cypher/src/main/resources/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/built-in/functions/shortestPath.html rename to language/cypher/src/main/resources/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/built-in/functions/shortestPath.html diff --git a/language/cypher/src/main/resources/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/built-in/functions/timestamp.html b/language/cypher/src/main/resources/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/built-in/functions/timestamp.html similarity index 100% rename from language/cypher/src/main/resources/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/built-in/functions/timestamp.html rename to language/cypher/src/main/resources/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/built-in/functions/timestamp.html diff --git a/language/cypher/src/test/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherProcedureElementTest.java b/language/cypher/src/test/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherProcedureElementTest.java similarity index 92% rename from language/cypher/src/test/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherProcedureElementTest.java rename to language/cypher/src/test/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherProcedureElementTest.java index 97624a7a..82fada7b 100644 --- a/language/cypher/src/test/java/com/albertoventurini/graphdbplugin/language/cypher/completion/metadata/elements/CypherProcedureElementTest.java +++ b/language/cypher/src/test/java/com/github/mdelambilly/graphdbplugin/language/cypher/completion/metadata/elements/CypherProcedureElementTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.elements; +package com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.elements; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/language/cypher/src/test/java/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/CypherDocumentationTest.java b/language/cypher/src/test/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/CypherDocumentationTest.java similarity index 71% rename from language/cypher/src/test/java/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/CypherDocumentationTest.java rename to language/cypher/src/test/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/CypherDocumentationTest.java index 7dc646ed..1eb9a71b 100644 --- a/language/cypher/src/test/java/com/albertoventurini/graphdbplugin/language/cypher/documentation/database/CypherDocumentationTest.java +++ b/language/cypher/src/test/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/CypherDocumentationTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher.documentation.database; +package com.github.mdelambilly.graphdbplugin.language.cypher.documentation.database; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CypherDocumentationTest { diff --git a/platform/build.gradle b/platform/build.gradle index f99e78a5..f81b0925 100644 --- a/platform/build.gradle +++ b/platform/build.gradle @@ -1,12 +1,21 @@ // Copied and adapted from plugin "Graph Database Support" // by Neueda Technologies, Ltd. // Modified by Alberto Venturini, 2022 -apply plugin: "org.jetbrains.intellij" - -intellij { - version = intellijSdkVersion - instrumentCode = true +// Modified by Michel de Lambilly, 2026 +apply plugin: "org.jetbrains.intellij.platform.module" +repositories { + intellijPlatform { + defaultRepositories() + } } dependencies { + intellijPlatform { + intellijIdea(providers.gradleProperty('platformVersion')) + } + + testImplementation "org.junit.jupiter:junit-jupiter:$versionJunit" } +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/platform/src/main/java/com/albertoventurini/graphdbplugin/platform/GraphBundle.java b/platform/src/main/java/com/github/mdelambilly/graphdbplugin/platform/GraphBundle.java similarity index 91% rename from platform/src/main/java/com/albertoventurini/graphdbplugin/platform/GraphBundle.java rename to platform/src/main/java/com/github/mdelambilly/graphdbplugin/platform/GraphBundle.java index b8eb1c5a..824bf2e4 100644 --- a/platform/src/main/java/com/albertoventurini/graphdbplugin/platform/GraphBundle.java +++ b/platform/src/main/java/com/github/mdelambilly/graphdbplugin/platform/GraphBundle.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.platform; +package com.github.mdelambilly.graphdbplugin.platform; import com.intellij.AbstractBundle; import org.jetbrains.annotations.PropertyKey; diff --git a/platform/src/main/java/com/albertoventurini/graphdbplugin/platform/GraphConstants.java b/platform/src/main/java/com/github/mdelambilly/graphdbplugin/platform/GraphConstants.java similarity index 81% rename from platform/src/main/java/com/albertoventurini/graphdbplugin/platform/GraphConstants.java rename to platform/src/main/java/com/github/mdelambilly/graphdbplugin/platform/GraphConstants.java index c97ce7bf..9325c2c1 100644 --- a/platform/src/main/java/com/albertoventurini/graphdbplugin/platform/GraphConstants.java +++ b/platform/src/main/java/com/github/mdelambilly/graphdbplugin/platform/GraphConstants.java @@ -3,15 +3,16 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.platform; +package com.github.mdelambilly.graphdbplugin.platform; public final class GraphConstants { public static final boolean IS_DEVELOPMENT = System.getProperty("graphDatabaseSupportDevelopment") != null; public static final String BOUND_DATA_SOURCE_PREFIX = "graphdbBoundDataSource-"; - public static final String PLUGIN_ID = "com.albertoventurini.jetbrains.graphdbplugin"; + public static final String PLUGIN_ID = "com.github.mdelambilly.jetbrains.graphdbplugin"; public static class ToolWindow { public static final String CONSOLE_TOOL_WINDOW = "Graph Database Console"; @@ -21,6 +22,7 @@ public static class Tabs { public static final String GRAPH = "Graph"; public static final String TABLE = "Table"; public static final String PARAMETERS = "Parameters"; + public static final String RAW = "Raw"; } } diff --git a/platform/src/main/java/com/albertoventurini/graphdbplugin/platform/ShouldNeverHappenException.java b/platform/src/main/java/com/github/mdelambilly/graphdbplugin/platform/ShouldNeverHappenException.java similarity index 82% rename from platform/src/main/java/com/albertoventurini/graphdbplugin/platform/ShouldNeverHappenException.java rename to platform/src/main/java/com/github/mdelambilly/graphdbplugin/platform/ShouldNeverHappenException.java index 99eb798d..0923d4d1 100644 --- a/platform/src/main/java/com/albertoventurini/graphdbplugin/platform/ShouldNeverHappenException.java +++ b/platform/src/main/java/com/github/mdelambilly/graphdbplugin/platform/ShouldNeverHappenException.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.platform; +package com.github.mdelambilly.graphdbplugin.platform; public class ShouldNeverHappenException extends RuntimeException { diff --git a/platform/src/main/java/com/albertoventurini/graphdbplugin/platform/SupportedLanguage.java b/platform/src/main/java/com/github/mdelambilly/graphdbplugin/platform/SupportedLanguage.java similarity index 89% rename from platform/src/main/java/com/albertoventurini/graphdbplugin/platform/SupportedLanguage.java rename to platform/src/main/java/com/github/mdelambilly/graphdbplugin/platform/SupportedLanguage.java index 6c46b0ef..a73c71c0 100644 --- a/platform/src/main/java/com/albertoventurini/graphdbplugin/platform/SupportedLanguage.java +++ b/platform/src/main/java/com/github/mdelambilly/graphdbplugin/platform/SupportedLanguage.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.platform; +package com.github.mdelambilly.graphdbplugin.platform; import java.util.stream.Stream; diff --git a/platform/src/main/java/icons/GraphIcons.java b/platform/src/main/java/icons/GraphIcons.java index f929ad7c..a22759fb 100644 --- a/platform/src/main/java/icons/GraphIcons.java +++ b/platform/src/main/java/icons/GraphIcons.java @@ -3,6 +3,7 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ package icons; diff --git a/platform/src/test/java/com/albertoventurini/graphdbplugin/language/cypher/SupportedLanguageTest.java b/platform/src/test/java/com/github/mdelambilly/graphdbplugin/language/cypher/SupportedLanguageTest.java similarity index 61% rename from platform/src/test/java/com/albertoventurini/graphdbplugin/language/cypher/SupportedLanguageTest.java rename to platform/src/test/java/com/github/mdelambilly/graphdbplugin/language/cypher/SupportedLanguageTest.java index 60d5fc29..4d646b09 100644 --- a/platform/src/test/java/com/albertoventurini/graphdbplugin/language/cypher/SupportedLanguageTest.java +++ b/platform/src/test/java/com/github/mdelambilly/graphdbplugin/language/cypher/SupportedLanguageTest.java @@ -3,14 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.language.cypher; +package com.github.mdelambilly.graphdbplugin.language.cypher; -import com.albertoventurini.graphdbplugin.platform.SupportedLanguage; -import org.junit.Test; +import com.github.mdelambilly.graphdbplugin.platform.SupportedLanguage; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SupportedLanguageTest { diff --git a/settings.gradle b/settings.gradle index 6c0afbc0..985a0cad 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,11 @@ +pluginManagement { + repositories { + gradlePluginPortal() + } +} + +rootProject.name = 'graphdb-intellij-plugin' + // Languages include 'language' include 'language:cypher' @@ -20,6 +28,5 @@ include 'platform' include 'testing' include 'testing:common' include 'testing:manual' -include 'testing:database' include 'testing:integration-neo4j' diff --git a/testing/build.gradle b/testing/build.gradle index bfa93742..a28c4482 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -1,5 +1,6 @@ // Copied and adapted from plugin "Graph Database Support" // by Neueda Technologies, Ltd. // Modified by Alberto Venturini, 2022 +// Modified by Michel de Lambilly, 2026 dependencies { } diff --git a/testing/common/build.gradle b/testing/common/build.gradle index ac3d7201..3dd04a14 100644 --- a/testing/common/build.gradle +++ b/testing/common/build.gradle @@ -1,11 +1,20 @@ -apply plugin: "org.jetbrains.intellij" +// Copied and adapted from plugin "Graph Database Support" +// by Neueda Technologies, Ltd. +// Modified by Michel de Lambilly, 2026 -intellij { - version = intellijSdkVersion - plugins = ['java'] +apply plugin: "org.jetbrains.intellij.platform.module" +repositories { + intellijPlatform { + defaultRepositories() + } } dependencies { + intellijPlatform { + intellijIdea(providers.gradleProperty('platformVersion')) + bundledPlugin('com.intellij.java') + } + implementation project(':graph-database-plugin') implementation project(':ui:jetbrains') } \ No newline at end of file diff --git a/testing/common/src/main/java/com/albertoventurini/graphdbplugin/test/mocks/service/DummyExecutorService.java b/testing/common/src/main/java/com/github/mdelambilly/graphdbplugin/test/mocks/service/DummyExecutorService.java similarity index 83% rename from testing/common/src/main/java/com/albertoventurini/graphdbplugin/test/mocks/service/DummyExecutorService.java rename to testing/common/src/main/java/com/github/mdelambilly/graphdbplugin/test/mocks/service/DummyExecutorService.java index e8053569..79363cdb 100644 --- a/testing/common/src/main/java/com/albertoventurini/graphdbplugin/test/mocks/service/DummyExecutorService.java +++ b/testing/common/src/main/java/com/github/mdelambilly/graphdbplugin/test/mocks/service/DummyExecutorService.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.mocks.service; +package com.github.mdelambilly.graphdbplugin.test.mocks.service; -import com.albertoventurini.graphdbplugin.jetbrains.services.ExecutorService; +import com.github.mdelambilly.graphdbplugin.jetbrains.services.ExecutorService; import com.intellij.openapi.application.ModalityState; import java.util.concurrent.Callable; diff --git a/testing/integration-neo4j/build.gradle b/testing/integration-neo4j/build.gradle index 0cf642dc..b8f787ae 100644 --- a/testing/integration-neo4j/build.gradle +++ b/testing/integration-neo4j/build.gradle @@ -1,14 +1,21 @@ // Copied and adapted from plugin "Graph Database Support" // by Neueda Technologies, Ltd. // Modified by Alberto Venturini, 2022 -apply plugin: "org.jetbrains.intellij" +// Modified by Michel de Lambilly, 2026 -intellij { - version = intellijSdkVersion - plugins = ['java'] +apply plugin: "org.jetbrains.intellij.platform.module" +repositories { + intellijPlatform { + defaultRepositories() + } } dependencies { + intellijPlatform { + intellijIdea(providers.gradleProperty('platformVersion')) + bundledPlugin('com.intellij.java') + } + testImplementation project(':graph-database-plugin') testImplementation project(':ui:jetbrains') testImplementation project(':language:cypher') @@ -21,4 +28,21 @@ dependencies { testImplementation "org.neo4j.driver:neo4j-java-driver:$versionNeo4jJavaBoltDriver" testImplementation "org.testcontainers:testcontainers:$versionTestcontainers" testImplementation "org.testcontainers:neo4j:$versionTestcontainers" + testRuntimeOnly "org.junit.jupiter:junit-jupiter:$versionJunit" + testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$versionJunit" +} + +test { + useJUnitPlatform() } + +// testFramework() is not available in module plugins (IJPGP limitation). +// Resolve testFramework.jar directly from the IntelliJ Platform installation path. +afterEvaluate { + def testFrameworkJar = intellijPlatform.platformPath.resolve("lib/testFramework.jar").toFile() + if (testFrameworkJar.exists()) { + dependencies { + testImplementation files(testFrameworkJar) + } + } +} \ No newline at end of file diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/completion/FunctionCompletionTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/completion/FunctionCompletionTest.java similarity index 87% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/completion/FunctionCompletionTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/completion/FunctionCompletionTest.java index 5051f5fe..290d8a5d 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/completion/FunctionCompletionTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/completion/FunctionCompletionTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.completion; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.completion; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseCompletionTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseCompletionTest; import com.intellij.codeInsight.lookup.Lookup; import java.util.List; @@ -18,7 +19,7 @@ public class FunctionCompletionTest extends BaseCompletionTest { @Override public void setUp() throws Exception { super.setUp(); - dataSource().neo4j52(); + dataSource().neo4j526(); } public void testContainsApocFunction() { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/completion/KeywordsCompletionTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/completion/KeywordsCompletionTest.java similarity index 68% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/completion/KeywordsCompletionTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/completion/KeywordsCompletionTest.java index 625e48f5..630bcc19 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/completion/KeywordsCompletionTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/completion/KeywordsCompletionTest.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.completion; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.completion; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.atoms.CypherKeywords; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseCompletionTest; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherKeywords; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseCompletionTest; import com.intellij.codeInsight.completion.CompletionType; diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/completion/StoredProcedureCompletionTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/completion/StoredProcedureCompletionTest.java similarity index 84% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/completion/StoredProcedureCompletionTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/completion/StoredProcedureCompletionTest.java index 5344db73..6bf264e6 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/completion/StoredProcedureCompletionTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/completion/StoredProcedureCompletionTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.completion; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.completion; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseCompletionTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseCompletionTest; import com.intellij.codeInsight.lookup.Lookup; import java.util.List; diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/AutoGeneratedProcedureDocumentationTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/AutoGeneratedProcedureDocumentationTest.java similarity index 83% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/AutoGeneratedProcedureDocumentationTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/AutoGeneratedProcedureDocumentationTest.java index 15d8f1dc..861e63ee 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/AutoGeneratedProcedureDocumentationTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/AutoGeneratedProcedureDocumentationTest.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.documentation; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.documentation; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.CypherMetadataContainer; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseDocumentationTest; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.CypherMetadataContainer; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseDocumentationTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/AutoGeneratedUserFunctionDocumentationTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/AutoGeneratedUserFunctionDocumentationTest.java similarity index 72% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/AutoGeneratedUserFunctionDocumentationTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/AutoGeneratedUserFunctionDocumentationTest.java index 1ce2cde3..bd6ba157 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/AutoGeneratedUserFunctionDocumentationTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/AutoGeneratedUserFunctionDocumentationTest.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.documentation; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.documentation; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.CypherMetadataContainer; -import com.albertoventurini.graphdbplugin.language.cypher.documentation.database.CypherDocumentation; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseDocumentationTest; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.CypherMetadataContainer; +import com.github.mdelambilly.graphdbplugin.language.cypher.documentation.database.CypherDocumentation; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseDocumentationTest; import static org.assertj.core.api.Assertions.assertThat; @@ -20,12 +21,12 @@ public class AutoGeneratedUserFunctionDocumentationTest extends BaseDocumentatio @Override public void setUp() throws Exception { super.setUp(); - dataSource().neo4j52(); + dataSource().neo4j526(); metadata = services().cypherMetadataProvider().getContainer("documentationTest"); } public void testFunctionBody() throws Exception { - var expectedDocumentation = "function toString
Arguments:
    (input :: ANY?)
Return:
    STRING?

Converts an integer, float, boolean, point or temporal type (i.e. Date, Time, LocalTime, DateTime, LocalDateTime or Duration) value to a string."; + var expectedDocumentation = "function toString
Arguments:
    (input :: ANY)
Return:
    STRING

Converts an `INTEGER`, `FLOAT`, `BOOLEAN`, `POINT` or temporal type (i.e. `DATE`, `ZONED TIME`, `LOCAL TIME`, `ZONED DATETIME`, `LOCAL DATETIME` or `DURATION`) value to a `STRING`."; configure("RETURN toString(42);"); verify(expectedDocumentation); } diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/BuiltInFunctionDocumentationTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/BuiltInFunctionDocumentationTest.java similarity index 76% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/BuiltInFunctionDocumentationTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/BuiltInFunctionDocumentationTest.java index 274e4270..b4a0fa2d 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/BuiltInFunctionDocumentationTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/BuiltInFunctionDocumentationTest.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.documentation; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.documentation; -import com.albertoventurini.graphdbplugin.language.cypher.documentation.database.CypherDocumentation; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseDocumentationTest; +import com.github.mdelambilly.graphdbplugin.language.cypher.documentation.database.CypherDocumentation; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseDocumentationTest; public class BuiltInFunctionDocumentationTest extends BaseDocumentationTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/BuiltInSpecialFunctionDocumentationTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/BuiltInSpecialFunctionDocumentationTest.java similarity index 79% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/BuiltInSpecialFunctionDocumentationTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/BuiltInSpecialFunctionDocumentationTest.java index 604f5211..1e204c0b 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/BuiltInSpecialFunctionDocumentationTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/documentation/BuiltInSpecialFunctionDocumentationTest.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.documentation; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.documentation; -import com.albertoventurini.graphdbplugin.language.cypher.documentation.database.CypherDocumentation; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseDocumentationTest; +import com.github.mdelambilly.graphdbplugin.language.cypher.documentation.database.CypherDocumentation; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseDocumentationTest; public class BuiltInSpecialFunctionDocumentationTest extends BaseDocumentationTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/editor/ArgumentHintTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/editor/ArgumentHintTest.java similarity index 80% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/editor/ArgumentHintTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/editor/ArgumentHintTest.java index 93fa97e9..76391c95 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/editor/ArgumentHintTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/editor/ArgumentHintTest.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.editor; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.editor; -import com.albertoventurini.graphdbplugin.language.cypher.editor.CypherParameterInfoHandler; -import com.albertoventurini.graphdbplugin.language.cypher.references.CypherInvocation; +import com.github.mdelambilly.graphdbplugin.language.cypher.editor.CypherParameterInfoHandler; +import com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherInvocation; import com.intellij.codeInsight.hint.ParameterInfoComponent; import com.intellij.lang.parameterInfo.CreateParameterInfoContext; import com.intellij.lang.parameterInfo.ParameterInfoUIContextEx; @@ -15,7 +16,7 @@ import com.intellij.testFramework.utils.parameterInfo.MockUpdateParameterInfoContext; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.util.base.BaseIntegrationTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.util.base.BaseIntegrationTest; public class ArgumentHintTest extends BaseIntegrationTest { @@ -26,27 +27,27 @@ public void setUp() throws Exception { super.setUp(); parameterInfoHandler = new CypherParameterInfoHandler(); - dataSource().neo4j52(); + dataSource().neo4j526(); } public void testSpecialAll() { doTest("RETURN ALL (x IN nodes(p) WHERE x.age > 30)", - "(variable :: VARIABLE IN list :: LIST OF ANY? WHERE predicate :: ANY?)"); + "(variable :: VARIABLE IN list :: LIST<ANY> WHERE predicate :: ANY)"); } public void testBuiltIn() { doTest("return toFloat(\"12\")", - "(input :: STRING?)"); + "(input :: STRING | INTEGER | FLOAT)"); } public void testProcedure() { doTest("CALL db.resampleIndex(\"test\");", - "(indexName :: STRING?)"); + "db.resampleIndex(indexName :: STRING)"); } public void testApocFunction() { doTest("RETURN apoc.text.capitalize(\"test\");", - "(text :: STRING?)"); + "(text :: STRING)"); } public void testNoParams() { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/editor/BraceMatcherTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/editor/BraceMatcherTest.java similarity index 79% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/editor/BraceMatcherTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/editor/BraceMatcherTest.java index 6fc471d0..df93a689 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/editor/BraceMatcherTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/editor/BraceMatcherTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.editor; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.editor; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseGenericTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseGenericTest; public class BraceMatcherTest extends BaseGenericTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/formatting/CommunityFormattingTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/formatting/CommunityFormattingTest.java similarity index 99% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/formatting/CommunityFormattingTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/formatting/CommunityFormattingTest.java index 2bb4d06c..962c85b4 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/formatting/CommunityFormattingTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/formatting/CommunityFormattingTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.formatting; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.formatting; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseFormattingTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseFormattingTest; public class CommunityFormattingTest extends BaseFormattingTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/formatting/CypherFormattingTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/formatting/CypherFormattingTest.java similarity index 98% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/formatting/CypherFormattingTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/formatting/CypherFormattingTest.java index 579859af..1a76249d 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/formatting/CypherFormattingTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/formatting/CypherFormattingTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.formatting; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.formatting; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseFormattingTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseFormattingTest; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/inspection/CypherExplainWarningInspectionTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/inspection/CypherExplainWarningInspectionTest.java similarity index 83% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/inspection/CypherExplainWarningInspectionTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/inspection/CypherExplainWarningInspectionTest.java index c2eb464b..ec09eb91 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/inspection/CypherExplainWarningInspectionTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/inspection/CypherExplainWarningInspectionTest.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.inspection; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.inspection; -import com.albertoventurini.graphdbplugin.jetbrains.inspection.CypherExplainWarningInspection; -import com.albertoventurini.graphdbplugin.platform.GraphConstants; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseInspectionTest; +import com.github.mdelambilly.graphdbplugin.jetbrains.inspection.CypherExplainWarningInspection; +import com.github.mdelambilly.graphdbplugin.platform.GraphConstants; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseInspectionTest; import com.intellij.codeInspection.LocalInspectionTool; @@ -49,13 +50,13 @@ public void testDataSourceFile_NoHighlightParserError() { } public void testDataSourceFile_NoDataSource() { - component().dataSources().getDataSourceContainer().removeDataSources(singletonList(dataSource().neo4j52())); + component().dataSources().getDataSourceContainer().removeDataSources(singletonList(dataSource().neo4j526())); addFileAndCheck(GraphConstants.BOUND_DATA_SOURCE_PREFIX + "imaginary-ds-uuid-with-36-symbols-in.cypher", "MATCH (a:Turbo)-->() RETURN *;"); } public void testDataSourceFile_UserCreatedDSLikeFile() { - component().dataSources().getDataSourceContainer().removeDataSources(singletonList(dataSource().neo4j52())); + component().dataSources().getDataSourceContainer().removeDataSources(singletonList(dataSource().neo4j526())); // uuid should be 36 symbols long, let's assume user created a file with a name, starting like ds file // but does not match the expected format addFileAndCheck(GraphConstants.BOUND_DATA_SOURCE_PREFIX + "ds-uuid-with-23-symbols.cypher", diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/inspection/CypherFunctionCallInspectionTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/inspection/CypherFunctionCallInspectionTest.java similarity index 91% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/inspection/CypherFunctionCallInspectionTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/inspection/CypherFunctionCallInspectionTest.java index 3374e5b1..abf67d6b 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/inspection/CypherFunctionCallInspectionTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/inspection/CypherFunctionCallInspectionTest.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.inspection; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.inspection; -import com.albertoventurini.graphdbplugin.language.cypher.inspections.CypherFunctionCallInspection; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseInspectionTest; +import com.github.mdelambilly.graphdbplugin.language.cypher.inspections.CypherFunctionCallInspection; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseInspectionTest; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.openapi.util.Pair; @@ -133,7 +134,7 @@ private void generateTypeCompatibilityTests(String query, String expected, List< public void testStringTypeCheck() { String query = "MATCH p=(n)-[r]-() RETURN ltrim(%s)"; - generateTypeCompatibilityTests(query, "STRING?", asList("STRING", "NULL")); + generateTypeCompatibilityTests(query, "STRING", asList("STRING")); } public void testNullableStringTypeCheck() { @@ -143,7 +144,7 @@ public void testNullableStringTypeCheck() { public void testNumberTypeCheck() { String query = "MATCH p=(n)-[r]-() RETURN sin(%s)"; - generateTypeCompatibilityTests(query, "FLOAT?", asList("INTEGER", "FLOAT", "NULL")); + generateTypeCompatibilityTests(query, "FLOAT", asList("INTEGER", "FLOAT")); } public void testNullableNumberTypeCheck() { @@ -153,7 +154,7 @@ public void testNullableNumberTypeCheck() { public void testIntegerTypeCheck() { String query = "MATCH p=(n)-[r]-() RETURN substring(\"a\", %s)"; - generateTypeCompatibilityTests(query, "INTEGER?", asList("INTEGER", "NULL")); + generateTypeCompatibilityTests(query, "INTEGER", asList("INTEGER")); } public void testNullableIntegerTypeCheck() { @@ -205,8 +206,8 @@ public void testSizeString() { } public void testRelationshipSizeWithoutVariableLength() { - addDataSourceFileAndCheck("MATCH (a)-[c]->(b) WITH size(c) as derp RETURN derp"); + // In Neo4j 5.26, size() accepts LIST OF ANY (no nullable ?), and the type-check no longer flags RELATIONSHIP. + addDataSourceFileAndCheck("MATCH (a)-[c]->(b) WITH size(c) as derp RETURN derp"); } public void testRelationshipSizeWithVariableLength() { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parameters/CypherParametersProviderTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parameters/CypherParametersProviderTest.java similarity index 96% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parameters/CypherParametersProviderTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parameters/CypherParametersProviderTest.java index cb50afe8..b8abfa91 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parameters/CypherParametersProviderTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parameters/CypherParametersProviderTest.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.parameters; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.parameters; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.params.ParametersProvider; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.params.ParametersService; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.util.base.BaseIntegrationTest; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params.ParametersProvider; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params.ParametersService; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.util.base.BaseIntegrationTest; import com.fasterxml.jackson.databind.JsonMappingException; import com.intellij.psi.PsiElement; diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/CommandParsingTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/CommandParsingTest.java similarity index 78% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/CommandParsingTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/CommandParsingTest.java index 51d05c63..488a03c2 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/CommandParsingTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/CommandParsingTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; public class CommandParsingTest extends BaseParsingTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/CommentsParsingTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/CommentsParsingTest.java similarity index 66% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/CommentsParsingTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/CommentsParsingTest.java index 3d6fccbd..f8474a78 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/CommentsParsingTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/CommentsParsingTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; public class CommentsParsingTest extends BaseParsingTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/ExpressionsParsingTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/ExpressionsParsingTest.java similarity index 79% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/ExpressionsParsingTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/ExpressionsParsingTest.java index 82a497ca..6c56462b 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/ExpressionsParsingTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/ExpressionsParsingTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; public class ExpressionsParsingTest extends BaseParsingTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/IndexCommandParsingTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/IndexCommandParsingTest.java similarity index 81% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/IndexCommandParsingTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/IndexCommandParsingTest.java index 19012054..d7e221d5 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/IndexCommandParsingTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/IndexCommandParsingTest.java @@ -1,6 +1,6 @@ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; public class IndexCommandParsingTest extends BaseParsingTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/LexerTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/LexerTest.java similarity index 61% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/LexerTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/LexerTest.java index aea62b78..dbafbbe2 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/LexerTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/LexerTest.java @@ -1,6 +1,6 @@ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; public class LexerTest extends BaseParsingTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/PatternsParsingTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/PatternsParsingTest.java similarity index 67% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/PatternsParsingTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/PatternsParsingTest.java index 108892d4..c1175f62 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/PatternsParsingTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/PatternsParsingTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; public class PatternsParsingTest extends BaseParsingTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/QueryParsingTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/QueryParsingTest.java similarity index 63% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/QueryParsingTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/QueryParsingTest.java index 9df7d453..481ac3bd 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/QueryParsingTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/QueryParsingTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; public class QueryParsingTest extends BaseParsingTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/ShellParsingTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/ShellParsingTest.java similarity index 63% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/ShellParsingTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/ShellParsingTest.java index c40e7d0f..9d940771 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/ShellParsingTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/ShellParsingTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; public class ShellParsingTest extends BaseParsingTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/StatementOptionsParsingTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/StatementOptionsParsingTest.java similarity index 65% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/StatementOptionsParsingTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/StatementOptionsParsingTest.java index 3fa40ee8..12723482 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/StatementOptionsParsingTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/StatementOptionsParsingTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; public class StatementOptionsParsingTest extends BaseParsingTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/StatementTraversingTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/StatementTraversingTest.java similarity index 88% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/StatementTraversingTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/StatementTraversingTest.java index bdccb3f3..76dba253 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/StatementTraversingTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/StatementTraversingTest.java @@ -3,14 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.parsing; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseGenericTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseGenericTest; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import static com.albertoventurini.graphdbplugin.language.cypher.util.PsiTraversalUtilities.Cypher.getCypherStatementAtOffset; +import static com.github.mdelambilly.graphdbplugin.language.cypher.util.PsiTraversalUtilities.Cypher.getCypherStatementAtOffset; import static org.assertj.core.api.Assertions.assertThat; public class StatementTraversingTest extends BaseGenericTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/clause/QueryClauseParsingTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/clause/QueryClauseParsingTest.java similarity index 84% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/clause/QueryClauseParsingTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/clause/QueryClauseParsingTest.java index 7d52b6b7..dc602f76 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/clause/QueryClauseParsingTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/parsing/clause/QueryClauseParsingTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.parsing.clause; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.parsing.clause; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseParsingTest; public class QueryClauseParsingTest extends BaseParsingTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/reference/LabelReferenceContributorTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/reference/LabelReferenceContributorTest.java similarity index 79% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/reference/LabelReferenceContributorTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/reference/LabelReferenceContributorTest.java index 1898c5f1..2bd5c8d6 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/reference/LabelReferenceContributorTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/reference/LabelReferenceContributorTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.reference; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.reference; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseCompletionTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseCompletionTest; public class LabelReferenceContributorTest extends BaseCompletionTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/reference/PropertyReferenceContributorTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/reference/PropertyReferenceContributorTest.java similarity index 80% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/reference/PropertyReferenceContributorTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/reference/PropertyReferenceContributorTest.java index 0c581f38..84bd7fdc 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/reference/PropertyReferenceContributorTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/reference/PropertyReferenceContributorTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.reference; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.reference; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseCompletionTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseCompletionTest; public class PropertyReferenceContributorTest extends BaseCompletionTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/reference/RelationshipTypeReferenceContributorTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/reference/RelationshipTypeReferenceContributorTest.java similarity index 80% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/reference/RelationshipTypeReferenceContributorTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/reference/RelationshipTypeReferenceContributorTest.java index b9c87486..ae1040ac 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/reference/RelationshipTypeReferenceContributorTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/reference/RelationshipTypeReferenceContributorTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.reference; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.reference; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseCompletionTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseCompletionTest; public class RelationshipTypeReferenceContributorTest extends BaseCompletionTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/rename/LabelRenameTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/rename/LabelRenameTest.java similarity index 68% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/rename/LabelRenameTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/rename/LabelRenameTest.java index 71efe6d1..0cfba675 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/rename/LabelRenameTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/rename/LabelRenameTest.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.rename; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.rename; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseRenameTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseRenameTest; public class LabelRenameTest extends BaseRenameTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/rename/PropertyRenameTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/rename/PropertyRenameTest.java similarity index 68% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/rename/PropertyRenameTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/rename/PropertyRenameTest.java index 738e279c..785199ee 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/rename/PropertyRenameTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/rename/PropertyRenameTest.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.rename; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.rename; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseRenameTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseRenameTest; public class PropertyRenameTest extends BaseRenameTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/rename/RelationshipTypeRenameTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/rename/RelationshipTypeRenameTest.java similarity index 69% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/rename/RelationshipTypeRenameTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/rename/RelationshipTypeRenameTest.java index a2c09b0d..6dcff5d4 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/rename/RelationshipTypeRenameTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/rename/RelationshipTypeRenameTest.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.rename; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.rename; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseRenameTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseRenameTest; public class RelationshipTypeRenameTest extends BaseRenameTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/rename/VariableRenameTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/rename/VariableRenameTest.java similarity index 68% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/rename/VariableRenameTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/rename/VariableRenameTest.java index 7d60329f..2b1cbb52 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/rename/VariableRenameTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/rename/VariableRenameTest.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.rename; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.rename; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseRenameTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseRenameTest; public class VariableRenameTest extends BaseRenameTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseCodeInsightTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseCodeInsightTest.java similarity index 64% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseCodeInsightTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseCodeInsightTest.java index 8c4ec3f7..4a9ddea0 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseCodeInsightTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseCodeInsightTest.java @@ -3,12 +3,16 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util; import com.google.common.io.Resources; import org.jetbrains.annotations.NotNull; +import java.io.File; +import java.net.URISyntaxException; + abstract class BaseCodeInsightTest extends BaseGenericTest { private String namespace; @@ -21,7 +25,11 @@ public BaseCodeInsightTest(String namespace, String dataPath) { @Override protected String getTestDataPath() { - return Resources.getResource(namespace).getFile() + "/" + dataPath; + try { + return new File(Resources.getResource(namespace).toURI()).getAbsolutePath() + "/" + dataPath; + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } } @NotNull diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseCompletionTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseCompletionTest.java similarity index 80% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseCompletionTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseCompletionTest.java index 725e23b9..1e30409c 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseCompletionTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseCompletionTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.CypherMetadataContainer; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.CypherMetadataContainer; public abstract class BaseCompletionTest extends BaseGenericTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseDocumentationTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseDocumentationTest.java similarity index 91% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseDocumentationTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseDocumentationTest.java index abf8a18c..bd3f5eab 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseDocumentationTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseDocumentationTest.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util; import com.intellij.codeInsight.documentation.DocumentationManager; import com.intellij.lang.documentation.DocumentationProvider; diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseFormattingTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseFormattingTest.java similarity index 81% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseFormattingTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseFormattingTest.java index e55f4474..024c43c6 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseFormattingTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseFormattingTest.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleManager; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.util.base.BaseIntegrationTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.util.base.BaseIntegrationTest; import static java.util.Collections.singletonList; diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseGenericTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseGenericTest.java similarity index 56% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseGenericTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseGenericTest.java index b7450b10..de2c8ef2 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseGenericTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseGenericTest.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.util.base.BaseIntegrationTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.util.base.BaseIntegrationTest; public abstract class BaseGenericTest extends BaseIntegrationTest { } diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseInspectionTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseInspectionTest.java similarity index 84% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseInspectionTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseInspectionTest.java index 420e2b4d..ca7e177e 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseInspectionTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseInspectionTest.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util; -import com.albertoventurini.graphdbplugin.jetbrains.util.NameUtil; +import com.github.mdelambilly.graphdbplugin.jetbrains.util.NameUtil; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.util.base.BaseIntegrationTest; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.util.base.BaseIntegrationTest; import java.util.Set; @@ -32,7 +33,7 @@ protected void addFileAndCheck(String filePath, String fileContent) { } protected void addDataSourceFileAndCheck(String fileContent) { - String fileName = NameUtil.createDataSourceFileName(dataSource().neo4j52()); + String fileName = NameUtil.createDataSourceFileName(dataSource().neo4j526()); addFileAndCheck(fileName, fileContent); } diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseParsingTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseParsingTest.java similarity index 62% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseParsingTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseParsingTest.java index 5d24c6d6..49c96f8f 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseParsingTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseParsingTest.java @@ -3,13 +3,16 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util; -import com.albertoventurini.graphdbplugin.language.cypher.CypherParserDefinition; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherParserDefinition; import com.google.common.io.Resources; import com.intellij.testFramework.ParsingTestCase; +import java.io.File; +import java.net.URISyntaxException; /** * Base for all parsing test cases. @@ -22,7 +25,11 @@ public BaseParsingTest(String testDataFolder) { @Override protected String getTestDataPath() { - return Resources.getResource("parsing").getFile(); + try { + return new File(Resources.getResource("parsing").toURI()).getAbsolutePath(); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } } @Override diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseRenameTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseRenameTest.java similarity index 82% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseRenameTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseRenameTest.java index 2b8e9020..20a74640 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseRenameTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/cypher/util/BaseRenameTest.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util; public abstract class BaseRenameTest extends BaseCodeInsightTest { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/database/common/AbstractDataSourceMetadataTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/database/common/AbstractDataSourceMetadataTest.java similarity index 78% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/database/common/AbstractDataSourceMetadataTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/database/common/AbstractDataSourceMetadataTest.java index 2f47a94c..7da72c6f 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/database/common/AbstractDataSourceMetadataTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/database/common/AbstractDataSourceMetadataTest.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.database.common; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.database.common; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.DataSourceMetadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.util.base.BaseIntegrationTest; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.DataSourceMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.util.base.BaseIntegrationTest; import java.util.Optional; import java.util.concurrent.CompletableFuture; diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/database/neo4j/DataSourceMetadataTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/database/neo4j/DataSourceMetadataTest.java similarity index 51% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/database/neo4j/DataSourceMetadataTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/database/neo4j/DataSourceMetadataTest.java index 588a2323..514a6de4 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/database/neo4j/DataSourceMetadataTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/database/neo4j/DataSourceMetadataTest.java @@ -3,15 +3,16 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.database.neo4j; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.database.neo4j; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.data.Neo4jGraphDatabaseVersion; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jMetadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jFunctionMetadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jProcedureMetadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.database.common.AbstractDataSourceMetadataTest; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data.Neo4jGraphDatabaseVersion; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jFunctionMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jProcedureMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.database.common.AbstractDataSourceMetadataTest; import java.util.List; @@ -21,7 +22,7 @@ public class DataSourceMetadataTest extends AbstractDataSourceMetadataTest { @Override public DataSourceApi getDataSource() { - return dataSource().neo4j52(); + return dataSource().neo4j526(); } public void testHaveTestUserFunctions() { @@ -35,16 +36,14 @@ public void testMetadataHaveRequiredProcedures() { final Neo4jMetadata metadata = (Neo4jMetadata) getMetadata(); final List procedures = metadata.procedures(); - assertTrue(procedures.stream().anyMatch(p -> - p.name().equals("db.labels") - && p.signature().equals("db.labels() :: (label :: STRING?)") - && p.description().equals("List all available labels in the database."))); + // dbms.components() is a stable procedure used by the driver itself to detect Neo4j version. + assertTrue(procedures.stream().anyMatch(p -> p.name().equals("dbms.components"))); } public void testGetVersion() { var metadata = (Neo4jMetadata) getMetadata(); var version = (Neo4jGraphDatabaseVersion) metadata.version(); assertEquals(5, version.major()); - assertEquals(2, version.minor()); + assertEquals(26, version.minor()); } } diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/jetbrains/StatementCollectorTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/jetbrains/StatementCollectorTest.java similarity index 91% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/jetbrains/StatementCollectorTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/jetbrains/StatementCollectorTest.java index 86ac1848..ada42a54 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/jetbrains/StatementCollectorTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/tests/jetbrains/StatementCollectorTest.java @@ -3,14 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.jetbrains; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.jetbrains; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.StatementCollector; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.params.ParametersProvider; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.params.ParametersService; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseGenericTest; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.StatementCollector; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params.ParametersProvider; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params.ParametersService; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.tests.cypher.util.BaseGenericTest; import com.intellij.psi.PsiFile; import com.intellij.util.messages.MessageBus; import org.mockito.Mockito; diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/base/BaseIntegrationTest.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/base/BaseIntegrationTest.java similarity index 77% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/base/BaseIntegrationTest.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/base/BaseIntegrationTest.java index d90c99fd..c67da9a6 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/base/BaseIntegrationTest.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/base/BaseIntegrationTest.java @@ -3,18 +3,19 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.util.base; - -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.Neo4jBoltConfiguration; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.DataSourcesComponentMetadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.CypherMetadataContainer; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.CypherMetadataProviderService; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.util.server.Neo4jServer; -import com.albertoventurini.graphdbplugin.test.integration.neo4j.util.server.Neo4jContainerServers; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.util.base; + +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.Neo4jBoltConfiguration; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.DataSourcesComponentMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.CypherMetadataContainer; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.CypherMetadataProviderService; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.util.server.Neo4jServer; +import com.github.mdelambilly.graphdbplugin.test.integration.neo4j.util.server.Neo4jContainerServers; import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; import java.util.ArrayList; @@ -24,7 +25,7 @@ public abstract class BaseIntegrationTest extends LightJavaCodeInsightFixtureTestCase { - private static final String NEO4J52 = "neo4j52"; + private static final String NEO4J526 = "neo4j526"; private static final String UNAVAILABLE_DS = "unavailable"; protected CypherMetadataContainer metadata; private Components components; @@ -116,14 +117,14 @@ public DataSourcesComponentMetadata dataSourcesMetadata() { * Some tests might even don't need running Neo4j server! */ public final class DataSources { - private DataSourceApi neo4j52DataSource; + private DataSourceApi neo4j526DataSource; private DataSourceApi unavailableDataSource; - public DataSourceApi neo4j52() { - if (neo4j52DataSource == null) { - neo4j52DataSource = getNeo4jDataSource(NEO4J52, Neo4jContainerServers.VERSION_5_2.getInstance()); + public DataSourceApi neo4j526() { + if (neo4j526DataSource == null) { + neo4j526DataSource = getNeo4jDataSource(NEO4J526, Neo4jContainerServers.VERSION_5_26.getInstance()); } - return neo4j52DataSource; + return neo4j526DataSource; } public DataSourceApi unavailable() { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/AsyncStartable.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/AsyncStartable.java similarity index 94% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/AsyncStartable.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/AsyncStartable.java index 7c78204a..283a05b9 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/AsyncStartable.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/AsyncStartable.java @@ -1,4 +1,4 @@ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.util.server; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.util.server; import java.util.concurrent.CompletableFuture; diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/Neo4jContainerServer.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/Neo4jContainerServer.java similarity index 93% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/Neo4jContainerServer.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/Neo4jContainerServer.java index 22a53007..128102d9 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/Neo4jContainerServer.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/Neo4jContainerServer.java @@ -1,4 +1,4 @@ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.util.server; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.util.server; import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.containers.Neo4jLabsPlugin; diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/Neo4jContainerServers.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/Neo4jContainerServers.java similarity index 87% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/Neo4jContainerServers.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/Neo4jContainerServers.java index a2f36bfd..6e8b7124 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/Neo4jContainerServers.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/Neo4jContainerServers.java @@ -1,11 +1,10 @@ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.util.server; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.util.server; /** * Lazily-initialised versions of Neo4j running in test containers. */ public enum Neo4jContainerServers { - VERSION_5_2("5.2"), - VERSION_5_3("5.3"); + VERSION_5_26("5.26-community"); private volatile Neo4jContainerServer instance; private final String versionTag; diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/Neo4jServer.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/Neo4jServer.java similarity index 71% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/Neo4jServer.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/Neo4jServer.java index e077d171..e55ff410 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/Neo4jServer.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/Neo4jServer.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.util.server; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.util.server; public interface Neo4jServer { diff --git a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/Startable.java b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/Startable.java similarity index 62% rename from testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/Startable.java rename to testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/Startable.java index c779dfd4..f8d95cad 100644 --- a/testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/util/server/Startable.java +++ b/testing/integration-neo4j/src/test/java/com/github/mdelambilly/graphdbplugin/test/integration/neo4j/util/server/Startable.java @@ -1,4 +1,4 @@ -package com.albertoventurini.graphdbplugin.test.integration.neo4j.util.server; +package com.github.mdelambilly.graphdbplugin.test.integration.neo4j.util.server; /** * Represents a resource that can be started. diff --git a/testing/manual/build.gradle b/testing/manual/build.gradle index 3494ad8e..ebfe58ee 100644 --- a/testing/manual/build.gradle +++ b/testing/manual/build.gradle @@ -1,14 +1,21 @@ // Copied and adapted from plugin "Graph Database Support" // by Neueda Technologies, Ltd. // Modified by Alberto Venturini, 2022 -apply plugin: "org.jetbrains.intellij" +// Modified by Michel de Lambilly, 2026 -intellij { - version = intellijSdkVersion - plugins = ['java'] +apply plugin: "org.jetbrains.intellij.platform.module" +repositories { + intellijPlatform { + defaultRepositories() + } } dependencies { + intellijPlatform { + intellijIdea(providers.gradleProperty('platformVersion')) + bundledPlugin('com.intellij.java') + } + implementation project(':ui:jetbrains') implementation project(':ui:visualization') implementation project(':database:api') @@ -16,3 +23,6 @@ dependencies { implementation "de.sciss:prefuse-core:$versionPrefuse" } +test { + failOnNoDiscoveredTests = false +} \ No newline at end of file diff --git a/testing/manual/src/test/java/com/albertoventurini/graphdbplugin/TestSimpleGraph.java b/testing/manual/src/test/java/com/github/mdelambilly/graphdbplugin/TestSimpleGraph.java similarity index 75% rename from testing/manual/src/test/java/com/albertoventurini/graphdbplugin/TestSimpleGraph.java rename to testing/manual/src/test/java/com/github/mdelambilly/graphdbplugin/TestSimpleGraph.java index a09f56a2..cffa2347 100644 --- a/testing/manual/src/test/java/com/albertoventurini/graphdbplugin/TestSimpleGraph.java +++ b/testing/manual/src/test/java/com/github/mdelambilly/graphdbplugin/TestSimpleGraph.java @@ -3,15 +3,16 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin; - -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.Neo4jBoltConfiguration; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.Neo4jBoltDatabase; -import com.albertoventurini.graphdbplugin.jetbrains.services.IdeaLookAndFeelService; -import com.albertoventurini.graphdbplugin.visualization.PrefuseVisualization; -import com.albertoventurini.graphdbplugin.visualization.events.EventType; +package com.github.mdelambilly.graphdbplugin; + +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.Neo4jBoltConfiguration; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.Neo4jBoltDatabase; +import com.github.mdelambilly.graphdbplugin.jetbrains.services.IdeaLookAndFeelService; +import com.github.mdelambilly.graphdbplugin.visualization.PrefuseVisualization; +import com.github.mdelambilly.graphdbplugin.visualization.events.EventType; import javax.swing.JFrame; diff --git a/ui/build.gradle b/ui/build.gradle index bfa93742..a28c4482 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -1,5 +1,6 @@ // Copied and adapted from plugin "Graph Database Support" // by Neueda Technologies, Ltd. // Modified by Alberto Venturini, 2022 +// Modified by Michel de Lambilly, 2026 dependencies { } diff --git a/ui/jetbrains/build.gradle b/ui/jetbrains/build.gradle index 7b452e35..9804c022 100644 --- a/ui/jetbrains/build.gradle +++ b/ui/jetbrains/build.gradle @@ -1,33 +1,34 @@ // Copied and adapted from plugin "Graph Database Support" // by Neueda Technologies, Ltd. // Modified by Alberto Venturini, 2022 -apply plugin: "org.jetbrains.intellij" - -intellij { - version = intellijSdkVersion - instrumentCode = true - plugins = ['java'] +// Modified by Michel de Lambilly, 2026 +apply plugin: "org.jetbrains.intellij.platform.module" +repositories { + intellijPlatform { + defaultRepositories() + } } dependencies { - implementation project(":platform") + intellijPlatform { + intellijIdea(providers.gradleProperty('platformVersion')) + bundledPlugin('com.intellij.java') + bundledPlugin('com.intellij.modules.json') + } + implementation project(":platform") implementation project(':language:cypher') - implementation project(':database:neo4j') implementation project(':database:api') - implementation "org.neo4j.driver:neo4j-java-driver:$versionNeo4jJavaBoltDriver" - implementation project(':ui:visualization') - implementation "de.sciss:prefuse-core:$versionPrefuse" - implementation("com.fasterxml.jackson.core:jackson-core:$versionJacksonMapper") implementation("com.fasterxml.jackson.core:jackson-databind:$versionJacksonMapper") - - testImplementation "junit:junit:$versionJunit" + testImplementation "org.junit.jupiter:junit-jupiter:$versionJunit" testImplementation "org.assertj:assertj-core:$versionAssertj" testImplementation "org.mockito:mockito-core:$versionMockito" } - +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/MetadataBuilder.java b/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/MetadataBuilder.java deleted file mode 100644 index 1479bc24..00000000 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/MetadataBuilder.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata; - -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; - -public interface MetadataBuilder { - DataSourceMetadata buildMetadata(DataSourceApi dataSource); -} diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jConstraintMetadata.java b/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jConstraintMetadata.java deleted file mode 100644 index 55868a93..00000000 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jConstraintMetadata.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; - -public record Neo4jConstraintMetadata(String name) { -} diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jIndexMetadata.java b/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jIndexMetadata.java deleted file mode 100644 index 47d80246..00000000 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jIndexMetadata.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; - -public record Neo4jIndexMetadata( - String name, - String state) { } \ No newline at end of file diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jLabelMetadata.java b/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jLabelMetadata.java deleted file mode 100644 index a44061ff..00000000 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jLabelMetadata.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; - -public record Neo4jLabelMetadata(String name, long count) { -} diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jRelationshipTypeMetadata.java b/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jRelationshipTypeMetadata.java deleted file mode 100644 index fcd38552..00000000 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jRelationshipTypeMetadata.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; - -public record Neo4jRelationshipTypeMetadata(String name, long count) { - -} diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/GraphConsoleView.form b/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/GraphConsoleView.form deleted file mode 100644 index d927afe2..00000000 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/GraphConsoleView.form +++ /dev/null @@ -1,150 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/DataSourcesView.form b/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/DataSourcesView.form deleted file mode 100644 index 82b01c5e..00000000 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/DataSourcesView.form +++ /dev/null @@ -1,27 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/DataSourceDialog.java b/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/DataSourceDialog.java deleted file mode 100644 index b0dc65d3..00000000 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/DataSourceDialog.java +++ /dev/null @@ -1,146 +0,0 @@ -/** - * Copied and adapted from plugin - * Graph Database Support - * by Neueda Technologies, Ltd. - * Modified by Alberto Venturini, 2022 - */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions; - -import com.albertoventurini.graphdbplugin.database.api.GraphDatabaseApi; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.database.DatabaseManagerService; -import com.albertoventurini.graphdbplugin.jetbrains.services.ExecutorService; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.DataSourcesView; -import com.intellij.icons.AllIcons; -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.ModalityState; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.openapi.ui.ValidationInfo; -import com.intellij.openapi.ui.popup.IconButton; -import com.intellij.openapi.ui.popup.JBPopupFactory; -import com.intellij.openapi.util.Disposer; -import com.intellij.ui.components.JBScrollPane; -import com.intellij.util.ui.JBUI; -import org.jetbrains.annotations.NotNull; - -import javax.swing.*; -import java.awt.*; -import java.util.Optional; - -import static org.codehaus.plexus.util.ExceptionUtils.getCause; - -public abstract class DataSourceDialog extends DialogWrapper { - public static final int THICKNESS = 10; - public static final int HEIGHT = 150; - - protected DataSourceDialog(@NotNull final Project project, DataSourcesView dataSourcesView) { - super(project); - Disposer.register(project, myDisposable); - init(); - } - - public abstract DataSourceApi constructDataSource(); - - protected abstract void showLoading(); - - protected abstract void hideLoading(); - - public boolean go() { - init(); - return showAndGet(); - } - - public void validationPopup() { - JPanel popupPanel = new JPanel(new BorderLayout()); - popupPanel.setBorder(JBUI.Borders.empty(THICKNESS)); - - ValidationInfo validationInfo = doValidate(); - if (validationInfo != null) { - JLabel connectionFailed = new JLabel("Connection failed: " + validationInfo.message, - JLabel.LEFT); - popupPanel.add(connectionFailed, BorderLayout.CENTER); - createPopup(popupPanel, getContentPanel()); - } else { - validateConnection(popupPanel, getContentPanel()); - } - } - - private void createPopup(JPanel popupPanel, JComponent contentPanel) { - if (contentPanel.isShowing()) { - JBPopupFactory.getInstance() - .createComponentPopupBuilder(popupPanel, getPreferredFocusedComponent()) - .setCancelButton(new IconButton("Close", AllIcons.Actions.Close)) - .setTitle("Test Connection") - .setResizable(true) - .setMovable(true) - .setCancelButton(new IconButton("Close", AllIcons.Actions.Close, AllIcons.Actions.CloseHovered)) - .createPopup() - .showInCenterOf(contentPanel); - } - } - - private void validateConnection( - JPanel popupPanel, - JComponent contentPanel) { - final var executorService = ApplicationManager.getApplication().getService(ExecutorService.class); - showLoading(); - executorService.runInBackground( - this::executeOkQuery, - (status) -> connectionSuccessful(popupPanel, contentPanel), - (exception) -> connectionFailed(exception, popupPanel, contentPanel), - ModalityState.current() - ); - } - - // TODO: this needs to be moved in the DataSourceDialog implementation. - // Right now, it assumes that the data source will understand a query such as "RETURN 'ok'" - // which might not be true for data sources different than neo4j. - private String executeOkQuery() { - DataSourceApi dataSource = constructDataSource(); - DatabaseManagerService databaseManager = - ApplicationManager.getApplication().getService(DatabaseManagerService.class); - GraphDatabaseApi db = databaseManager.getDatabaseFor(dataSource); - GraphQueryResult result = db.execute("RETURN 'ok'"); - - Object value = result.getRows().get(0).getValue(result.getColumns().get(0)); - - if (value.equals("ok")) { - return "ok"; - } else { - throw new RuntimeException("Unexpected test query output: " + value); - } - } - - private void connectionSuccessful( - JPanel popupPanel, - JComponent contentPanel) { - hideLoading(); - JLabel connectionSuccessful = new JLabel("Connection successful!", JLabel.LEFT); - popupPanel.add(connectionSuccessful, BorderLayout.CENTER); - - createPopup(popupPanel, contentPanel); - } - - private void connectionFailed( - Exception exception, - JPanel popupPanel, - JComponent contentPanel) { - hideLoading(); - - JLabel connectionFailed = new JLabel("Connection failed: " + - exception.getMessage(), JLabel.LEFT); - - JTextArea exceptionCauses = new JTextArea(); - exceptionCauses.setLineWrap(false); - exceptionCauses.append(Optional.ofNullable(getCause(exception)).map(Throwable::toString).orElse("")); - - JBScrollPane scrollPane = new JBScrollPane(exceptionCauses); - scrollPane.setPreferredSize(new Dimension(-1, HEIGHT)); - popupPanel.add(connectionFailed, BorderLayout.NORTH); - popupPanel.add(scrollPane, BorderLayout.CENTER); - - createPopup(popupPanel, contentPanel); - } -} diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/EditEntityDialog.form b/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/EditEntityDialog.form deleted file mode 100644 index 681d4fcb..00000000 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/EditEntityDialog.form +++ /dev/null @@ -1,119 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/neo4j/bolt/Neo4jBoltDataSourceDialog.form b/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/neo4j/bolt/Neo4jBoltDataSourceDialog.form deleted file mode 100644 index 8f74a6d0..00000000 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/neo4j/bolt/Neo4jBoltDataSourceDialog.form +++ /dev/null @@ -1,237 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/neo4j/bolt/Neo4jBoltDataSourceDialog.java b/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/neo4j/bolt/Neo4jBoltDataSourceDialog.java deleted file mode 100644 index 2d33fc10..00000000 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/neo4j/bolt/Neo4jBoltDataSourceDialog.java +++ /dev/null @@ -1,215 +0,0 @@ -/** - * Copied and adapted from plugin - * Graph Database Support - * by Neueda Technologies, Ltd. - * Modified by Alberto Venturini, 2022 - */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions.neo4j.bolt; - -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.ui.ValidationInfo; -import com.intellij.ui.components.JBPasswordField; -import com.intellij.ui.components.JBTextField; -import com.intellij.util.ui.AsyncProcessIcon; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.Neo4jBoltConfiguration; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.DataSourcesView; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions.DataSourceDialog; -import org.apache.commons.lang.StringUtils; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import javax.swing.*; -import java.awt.event.ActionEvent; -import java.util.HashMap; -import java.util.Map; - -import static com.albertoventurini.graphdbplugin.jetbrains.util.Validation.*; - -public class Neo4jBoltDataSourceDialog extends DataSourceDialog { - private final DataSourcesComponent dataSourcesComponent; - private DataSourceApi dataSourceToEdit; - - private JBTextField dataSourceNameField; - private JComboBox protocolComboBox; - private JBTextField hostField; - private JBTextField portField; - private JBTextField userField; - private JBTextField databaseField; - private JBPasswordField passwordField; - private JButton testConnectionButton; - private JPanel loadingPanel; - private AsyncProcessIcon loadingIcon; - private JComboBox authTypeComboBox; - private JScrollPane scrollPane; - - public Neo4jBoltDataSourceDialog( - @NotNull final Project project, - @NotNull final DataSourcesView dataSourcesView, - @NotNull final DataSourceApi dataSourceToEdit) { - this(project, dataSourcesView); - this.dataSourceToEdit = dataSourceToEdit; - } - - public Neo4jBoltDataSourceDialog( - @NotNull final Project project, - @NotNull final DataSourcesView dataSourcesView) { - super(project, dataSourcesView); - loadingPanel.setVisible(false); - dataSourcesComponent = dataSourcesView.getComponent(); - testConnectionButton.addActionListener(e -> validationPopup()); - authTypeComboBox.addActionListener(this::handleAuthTypeChanged); - } - - @Nullable - @Override - protected ValidationInfo doValidate() { - if (StringUtils.isBlank(dataSourceNameField.getText())) { - return validation("Data source name must not be empty", dataSourceNameField); - } - if (StringUtils.isBlank(hostField.getText())) { - return validation("Host must not be empty", hostField); - } - if (!StringUtils.isNumeric(portField.getText())) { - return validation("Port must be numeric", portField); - } - - final var data = extractData(); - - if (dataSourcesComponent.getDataSourceContainer().isDataSourceExists(data.dataSourceName)) { - if (!(dataSourceToEdit != null && dataSourceToEdit.getName().equals(data.dataSourceName))) { - return validation(String.format("Data source [%s] already exists", data.dataSourceName), dataSourceNameField); - } - } - - return null; - } - - @Nullable - @Override - protected JComponent createCenterPanel() { - if (dataSourceToEdit != null) { - Map conf = dataSourceToEdit.getConfiguration(); - String protocol = conf.get(Neo4jBoltConfiguration.PROTOCOL); - String host = conf.get(Neo4jBoltConfiguration.HOST); - String port = conf.get(Neo4jBoltConfiguration.PORT); - String authType = conf.get(Neo4jBoltConfiguration.AUTH_TYPE); - String database = conf.get(Neo4jBoltConfiguration.DATABASE); - String user = conf.get(Neo4jBoltConfiguration.USER); - String password = conf.get(Neo4jBoltConfiguration.PASSWORD); - - dataSourceNameField.setText(dataSourceToEdit.getName()); - - for (int i = 0; i < protocolComboBox.getItemCount(); i++) { - if (protocolComboBox.getItemAt(i).equals(protocol)) { - protocolComboBox.setSelectedIndex(i); - break; - } - } - - for (int i = 0; i < authTypeComboBox.getItemCount(); i++) { - if (authTypeComboBox.getItemAt(i).equals(authType)) { - authTypeComboBox.setSelectedIndex(i); - break; - } - } - - hostField.setText(host); - portField.setText(port); - databaseField.setText(database); - userField.setText(user); - passwordField.setText(password); - } - return scrollPane; - } - - private void handleAuthTypeChanged(final ActionEvent e) { - final boolean authFieldsEnabled = - !authTypeComboBox.getItemAt(authTypeComboBox.getSelectedIndex()).equals("No auth"); - - userField.setEnabled(authFieldsEnabled); - passwordField.setEnabled(authFieldsEnabled); - - if (!authFieldsEnabled) { - userField.setText(""); - passwordField.setText(""); - } - } - - @Override - public DataSourceApi constructDataSource() { - final var data = extractData(); - - Map configuration = new HashMap<>(); - configuration.put(Neo4jBoltConfiguration.PROTOCOL, data.protocol); - configuration.put(Neo4jBoltConfiguration.AUTH_TYPE, data.authType); - configuration.put(Neo4jBoltConfiguration.HOST, data.host); - configuration.put(Neo4jBoltConfiguration.PORT, data.port); - configuration.put(Neo4jBoltConfiguration.USER, data.user); - configuration.put(Neo4jBoltConfiguration.PASSWORD, data.password); - configuration.put(Neo4jBoltConfiguration.DATABASE, data.database); - - return dataSourcesComponent.getDataSourceContainer().createDataSource( - dataSourceToEdit, - DataSourceType.NEO4J_BOLT, - data.dataSourceName, - configuration - ); - } - - @Override - protected void showLoading() { - testConnectionButton.setEnabled(false); - loadingIcon.resume(); - loadingPanel.setVisible(true); - } - - @Override - protected void hideLoading() { - testConnectionButton.setEnabled(true); - loadingIcon.suspend(); - loadingPanel.setVisible(false); - } - - private Data extractData() { - return new Data( - dataSourceNameField.getText(), - protocolComboBox.getItemAt(protocolComboBox.getSelectedIndex()), - hostField.getText(), - portField.getText(), - authTypeComboBox.getItemAt(authTypeComboBox.getSelectedIndex()), - databaseField.getText(), - userField.getText(), - String.valueOf(passwordField.getPassword()) // TODO: use password API? - ); - } - - private void createUIComponents() { - loadingIcon = new AsyncProcessIcon("validateConnectionIcon"); - } - - private static final class Data { - - private final String dataSourceName; - private final String protocol; - private final String host; - private final String port; - private final String authType; - private final String database; - private final String user; - private final String password; - - public Data(String dataSourceName, String protocol, String host, String port, String authType, String database, String user, String password) { - this.dataSourceName = dataSourceName; - this.protocol = protocol; - this.host = host; - this.port = port; - this.authType = authType; - this.database = database; - this.user = user; - this.password = password; - } - } -} diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ChooseDataSourceAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ChooseDataSourceAction.java similarity index 82% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ChooseDataSourceAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ChooseDataSourceAction.java index 712b61af..003816d7 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ChooseDataSourceAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ChooseDataSourceAction.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.execute; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ChooseDataSourceActionGroup.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ChooseDataSourceActionGroup.java similarity index 87% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ChooseDataSourceActionGroup.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ChooseDataSourceActionGroup.java index c3c22fdb..d36a2c3a 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ChooseDataSourceActionGroup.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ChooseDataSourceActionGroup.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.execute; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteAllAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteAllAction.java similarity index 82% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteAllAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteAllAction.java index e3f1c62c..941136dd 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteAllAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteAllAction.java @@ -3,24 +3,24 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.execute; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; -import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListPopup; import com.intellij.psi.PsiFile; import com.intellij.util.messages.MessageBus; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.ConsoleToolWindow; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.params.ParametersService; -import com.albertoventurini.graphdbplugin.jetbrains.util.Notifier; -import com.albertoventurini.graphdbplugin.language.cypher.file.CypherFileType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.ConsoleToolWindow; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params.ParametersService; +import com.github.mdelambilly.graphdbplugin.jetbrains.util.Notifier; +import com.github.mdelambilly.graphdbplugin.language.cypher.file.CypherFileType; import org.jetbrains.annotations.NotNull; public class ExecuteAllAction extends AnAction { @@ -58,7 +58,7 @@ public void actionPerformed(@NotNull AnActionEvent e) { new ExecuteQueryPayload(statementCollector.getQueries(), statementCollector.getParameters(), psiFile.getName()); ConsoleToolWindow.ensureOpen(project); - DataSourcesComponent dataSourcesComponent = project.getComponent(DataSourcesComponent.class); + DataSourcesComponent dataSourcesComponent = project.getService(DataSourcesComponent.class); ListPopup popup = JBPopupFactory.getInstance().createActionGroupPopup( "Choose Data Source", new ChooseDataSourceActionGroup(messageBus, dataSourcesComponent, executeQueryPayload), diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteQueryAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteQueryAction.java similarity index 86% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteQueryAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteQueryAction.java index c8fa2a2d..00b908b7 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteQueryAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteQueryAction.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.execute; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.openapi.actionSystem.ActionButtonComponent; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; @@ -18,9 +19,9 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.util.messages.MessageBus; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.ConsoleToolWindow; -import com.albertoventurini.graphdbplugin.jetbrains.util.NameUtil; -import com.albertoventurini.graphdbplugin.platform.GraphConstants; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.ConsoleToolWindow; +import com.github.mdelambilly.graphdbplugin.jetbrains.util.NameUtil; +import com.github.mdelambilly.graphdbplugin.platform.GraphConstants; import java.awt.*; import java.util.Map; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteQueryActionPromoter.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteQueryActionPromoter.java similarity index 87% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteQueryActionPromoter.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteQueryActionPromoter.java index d0e1096c..ed4a3a6f 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteQueryActionPromoter.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteQueryActionPromoter.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.execute; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute; import com.intellij.openapi.actionSystem.ActionPromoter; import com.intellij.openapi.actionSystem.AnAction; @@ -16,7 +17,7 @@ import java.util.Collections; import java.util.List; -import static com.albertoventurini.graphdbplugin.platform.SupportedLanguage.isSupported; +import static com.github.mdelambilly.graphdbplugin.platform.SupportedLanguage.isSupported; public class ExecuteQueryActionPromoter implements ActionPromoter { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteQueryEvent.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteQueryEvent.java similarity index 70% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteQueryEvent.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteQueryEvent.java index 06708dbf..d85e1458 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteQueryEvent.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteQueryEvent.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.execute; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.util.messages.Topic; public interface ExecuteQueryEvent { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteQueryPayload.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteQueryPayload.java similarity index 93% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteQueryPayload.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteQueryPayload.java index f989c2b4..39d9e933 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExecuteQueryPayload.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExecuteQueryPayload.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.execute; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute; import com.intellij.openapi.editor.Editor; import org.jetbrains.annotations.NotNull; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExplainQueryAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExplainQueryAction.java similarity index 78% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExplainQueryAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExplainQueryAction.java index 05a5d04b..527ff8d2 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ExplainQueryAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ExplainQueryAction.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.execute; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute; public class ExplainQueryAction extends ExecuteQueryAction { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/LandingPageAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/LandingPageAction.java similarity index 90% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/LandingPageAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/LandingPageAction.java index 60653884..27e77916 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/LandingPageAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/LandingPageAction.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.execute; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute; import com.intellij.icons.AllIcons; import com.intellij.ide.browsers.BrowserLauncher; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ProfileQueryAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ProfileQueryAction.java similarity index 78% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ProfileQueryAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ProfileQueryAction.java index c9a427c8..1532637c 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/ProfileQueryAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/ProfileQueryAction.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.execute; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute; public class ProfileQueryAction extends ExecuteQueryAction { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/QueryAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/QueryAction.java similarity index 89% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/QueryAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/QueryAction.java index deffdaa7..c8c5678e 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/QueryAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/QueryAction.java @@ -3,30 +3,30 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.execute; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; -import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.editor.Caret; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.util.messages.MessageBus; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.params.ParametersService; -import com.albertoventurini.graphdbplugin.jetbrains.util.Notifier; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params.ParametersService; +import com.github.mdelambilly.graphdbplugin.jetbrains.util.Notifier; import org.jetbrains.annotations.NotNull; import java.awt.event.KeyEvent; import java.util.Collections; import java.util.Map; -import static com.albertoventurini.graphdbplugin.language.cypher.util.PsiTraversalUtilities.Cypher.getCypherStatementAtOffset; -import static com.albertoventurini.graphdbplugin.platform.SupportedLanguage.isSupported; +import static com.github.mdelambilly.graphdbplugin.language.cypher.util.PsiTraversalUtilities.Cypher.getCypherStatementAtOffset; +import static com.github.mdelambilly.graphdbplugin.platform.SupportedLanguage.isSupported; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/StatementCollector.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/StatementCollector.java similarity index 85% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/StatementCollector.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/StatementCollector.java index 58752065..8f9f00f7 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/execute/StatementCollector.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/execute/StatementCollector.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.execute; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; import com.intellij.psi.PsiErrorElement; import com.intellij.util.messages.MessageBus; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.params.ParametersService; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params.ParametersService; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; import java.util.ArrayList; import java.util.HashMap; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/ui/console/CleanCanvasAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/ui/console/CleanCanvasAction.java similarity index 87% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/ui/console/CleanCanvasAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/ui/console/CleanCanvasAction.java index 2b57b792..3791399b 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/ui/console/CleanCanvasAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/ui/console/CleanCanvasAction.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.ui.console; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.ui.console; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/ui/console/CleanCanvasEvent.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/ui/console/CleanCanvasEvent.java similarity index 79% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/ui/console/CleanCanvasEvent.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/ui/console/CleanCanvasEvent.java index e0f06b09..6246b3cf 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/ui/console/CleanCanvasEvent.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/ui/console/CleanCanvasEvent.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.ui.console; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.ui.console; import com.intellij.util.messages.Topic; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/ui/console/CopyQueryOutputAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/ui/console/CopyQueryOutputAction.java similarity index 80% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/ui/console/CopyQueryOutputAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/ui/console/CopyQueryOutputAction.java index 05797b4b..bbe40fdc 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/ui/console/CopyQueryOutputAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/ui/console/CopyQueryOutputAction.java @@ -3,14 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.ui.console; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.ui.console; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.Project; import com.intellij.util.messages.MessageBus; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.CopyQueryOutputEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.CopyQueryOutputEvent; import org.jetbrains.annotations.NotNull; public class CopyQueryOutputAction extends AnAction { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/ui/console/ToggleFileSpecificParametersEvent.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/ui/console/ToggleFileSpecificParametersEvent.java similarity index 84% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/ui/console/ToggleFileSpecificParametersEvent.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/ui/console/ToggleFileSpecificParametersEvent.java index 6d0eaa90..9f898b9b 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/actions/ui/console/ToggleFileSpecificParametersEvent.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/actions/ui/console/ToggleFileSpecificParametersEvent.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.actions.ui.console; +package com.github.mdelambilly.graphdbplugin.jetbrains.actions.ui.console; import com.intellij.util.messages.Topic; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/DataSourceDescription.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/DataSourceDescription.java similarity index 88% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/DataSourceDescription.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/DataSourceDescription.java index cb9ff517..03b8a589 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/DataSourceDescription.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/DataSourceDescription.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource; import icons.GraphIcons; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/DataSourceType.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/DataSourceType.java similarity index 70% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/DataSourceType.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/DataSourceType.java index fcd54b8a..8ef6ba6d 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/DataSourceType.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/DataSourceType.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource; public enum DataSourceType { UNKNOWN, NEO4J_BOLT diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/DataSourcesComponent.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/DataSourcesComponent.java similarity index 81% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/DataSourcesComponent.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/DataSourcesComponent.java index c29f1c90..678c8981 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/DataSourcesComponent.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/DataSourcesComponent.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.project.Project; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.DataSourcesComponentMetadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceContainer; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourcesComponentState; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.DataSourcesComponentMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceContainer; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourcesComponentState; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/DataSourceMetadata.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/DataSourceMetadata.java similarity index 67% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/DataSourceMetadata.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/DataSourceMetadata.java index a2bc9faf..614eb155 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/DataSourceMetadata.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/DataSourceMetadata.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata; public interface DataSourceMetadata { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/DataSourcesComponentMetadata.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/DataSourcesComponentMetadata.java similarity index 73% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/DataSourcesComponentMetadata.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/DataSourcesComponentMetadata.java index 3a704ef9..147dac09 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/DataSourcesComponentMetadata.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/DataSourcesComponentMetadata.java @@ -3,29 +3,32 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jMetadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jLabelMetadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jMetadataBuilder; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jRelationshipTypeMetadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.database.VersionService; -import com.albertoventurini.graphdbplugin.jetbrains.services.ExecutorService; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.MetadataRetrieveEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jLabelMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jMetadataBuilder; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jRelationshipTypeMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.database.VersionService; +import com.github.mdelambilly.graphdbplugin.jetbrains.services.ExecutorService; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.MetadataRetrieveEvent; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.components.Service; import com.intellij.openapi.project.Project; import com.intellij.util.messages.MessageBus; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.CypherMetadataContainer; -import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.CypherMetadataProviderService; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.CypherMetadataContainer; +import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.CypherMetadataProviderService; import java.util.HashMap; import java.util.Map; import java.util.Optional; import java.util.concurrent.CompletableFuture; +@Service(Service.Level.PROJECT) public class DataSourcesComponentMetadata { private final Map handlers = new HashMap<>(); diff --git a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/MetadataBuilder.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/MetadataBuilder.java new file mode 100644 index 00000000..68ce877f --- /dev/null +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/MetadataBuilder.java @@ -0,0 +1,7 @@ +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata; + +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; + +public interface MetadataBuilder { + DataSourceMetadata buildMetadata(DataSourceApi dataSource); +} diff --git a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jConstraintMetadata.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jConstraintMetadata.java new file mode 100644 index 00000000..f749a621 --- /dev/null +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jConstraintMetadata.java @@ -0,0 +1,4 @@ +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; + +public record Neo4jConstraintMetadata(String name) { +} diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jFunctionMetadata.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jFunctionMetadata.java similarity index 50% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jFunctionMetadata.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jFunctionMetadata.java index 85198560..2ea77d06 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jFunctionMetadata.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jFunctionMetadata.java @@ -1,4 +1,4 @@ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; public record Neo4jFunctionMetadata(String name, String signature, String description) { } diff --git a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jIndexMetadata.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jIndexMetadata.java new file mode 100644 index 00000000..6f415bd8 --- /dev/null +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jIndexMetadata.java @@ -0,0 +1,5 @@ +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; + +public record Neo4jIndexMetadata( + String name, + String state) { } \ No newline at end of file diff --git a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jLabelMetadata.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jLabelMetadata.java new file mode 100644 index 00000000..d6734679 --- /dev/null +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jLabelMetadata.java @@ -0,0 +1,4 @@ +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; + +public record Neo4jLabelMetadata(String name, long count) { +} diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jMetadata.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jMetadata.java similarity index 62% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jMetadata.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jMetadata.java index f389655a..555bd22f 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jMetadata.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jMetadata.java @@ -1,7 +1,7 @@ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; -import com.albertoventurini.graphdbplugin.database.api.data.GraphDatabaseVersion; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.DataSourceMetadata; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphDatabaseVersion; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.DataSourceMetadata; import java.util.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jMetadataBuilder.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jMetadataBuilder.java similarity index 88% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jMetadataBuilder.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jMetadataBuilder.java index 2959f18b..f234f49b 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jMetadataBuilder.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jMetadataBuilder.java @@ -1,13 +1,13 @@ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; - -import com.albertoventurini.graphdbplugin.database.api.GraphDatabaseApi; -import com.albertoventurini.graphdbplugin.database.api.data.GraphDatabaseVersion; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.data.Neo4jGraphDatabaseVersion; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.query.Neo4jBoltQueryResultRow; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.DataSourceMetadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.MetadataBuilder; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.database.DatabaseManagerService; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; + +import com.github.mdelambilly.graphdbplugin.database.api.GraphDatabaseApi; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphDatabaseVersion; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data.Neo4jGraphDatabaseVersion; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.query.Neo4jBoltQueryResultRow; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.DataSourceMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.MetadataBuilder; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.database.DatabaseManagerService; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jProcedureMetadata.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jProcedureMetadata.java similarity index 50% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jProcedureMetadata.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jProcedureMetadata.java index 836c6300..279f6175 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jProcedureMetadata.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jProcedureMetadata.java @@ -1,4 +1,4 @@ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; public record Neo4jProcedureMetadata(String name, String signature, String description) { } diff --git a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jRelationshipTypeMetadata.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jRelationshipTypeMetadata.java new file mode 100644 index 00000000..8c65457e --- /dev/null +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/metadata/neo4j/Neo4jRelationshipTypeMetadata.java @@ -0,0 +1,5 @@ +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j; + +public record Neo4jRelationshipTypeMetadata(String name, long count) { + +} diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/DataSourceApi.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/DataSourceApi.java similarity index 69% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/DataSourceApi.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/DataSourceApi.java index a8e7cf93..aed23e19 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/DataSourceApi.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/DataSourceApi.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceDescription; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceDescription; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; import java.util.Map; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/DataSourceContainer.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/DataSourceContainer.java similarity index 83% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/DataSourceContainer.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/DataSourceContainer.java index 90c5a9d8..51f22999 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/DataSourceContainer.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/DataSourceContainer.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state; import java.util.*; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; public interface DataSourceContainer { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/DataSourcesComponentState.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/DataSourcesComponentState.java similarity index 79% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/DataSourcesComponentState.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/DataSourcesComponentState.java index 3ef6dba4..8e798ee5 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/DataSourcesComponentState.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/DataSourcesComponentState.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state; import com.intellij.util.xmlb.annotations.Transient; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.container.DataSourceContainerV1; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.impl.DataSource; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.container.DataSourceContainerV1; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.impl.DataSource; import java.util.ArrayList; import java.util.List; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/container/DataSourceContainerV1.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/container/DataSourceContainerV1.java similarity index 79% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/container/DataSourceContainerV1.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/container/DataSourceContainerV1.java index 1d6da204..ae242740 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/container/DataSourceContainerV1.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/container/DataSourceContainerV1.java @@ -3,15 +3,16 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.container; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.container; import java.util.*; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceContainer; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.impl.DataSourceV1; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceContainer; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.impl.DataSourceV1; @SuppressWarnings("SuspiciousMethodCalls") public class DataSourceContainerV1 implements DataSourceContainer { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/impl/DataSource.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/impl/DataSource.java similarity index 80% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/impl/DataSource.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/impl/DataSource.java index 6b19efce..f4b4f4c4 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/impl/DataSource.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/impl/DataSource.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.impl; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.impl; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; import java.util.HashMap; import java.util.Map; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/impl/DataSourceV1.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/impl/DataSourceV1.java similarity index 80% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/impl/DataSourceV1.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/impl/DataSourceV1.java index fcc5007e..23af90eb 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/impl/DataSourceV1.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/impl/DataSourceV1.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.impl; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.impl; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import java.util.HashMap; import java.util.Map; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponent.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponent.java similarity index 69% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponent.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponent.java index 91f8a58b..448621a3 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponent.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponent.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.highlighter; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter; public interface QueryHighlighterComponent { } diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponentImpl.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponentImpl.java similarity index 84% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponentImpl.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponentImpl.java index 69bd512d..d3332b33 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponentImpl.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponentImpl.java @@ -3,15 +3,16 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.highlighter; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.EditorFactory; -import com.albertoventurini.graphdbplugin.jetbrains.component.highlighter.listener.QueryHighlighterCaretListener; -import com.albertoventurini.graphdbplugin.jetbrains.component.highlighter.listener.QueryHighlighterDocumentListener; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter.listener.QueryHighlighterCaretListener; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter.listener.QueryHighlighterDocumentListener; public class QueryHighlighterComponentImpl implements QueryHighlighterComponent, Disposable { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/SyncedElementHighlighter.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/SyncedElementHighlighter.java similarity index 88% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/SyncedElementHighlighter.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/SyncedElementHighlighter.java index d0ecb2db..8d99d64b 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/SyncedElementHighlighter.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/SyncedElementHighlighter.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.highlighter; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter; import com.intellij.openapi.editor.Caret; import com.intellij.openapi.editor.Editor; @@ -17,8 +18,8 @@ import java.util.HashMap; import java.util.Map; -import static com.albertoventurini.graphdbplugin.language.cypher.util.PsiTraversalUtilities.Cypher.getCypherStatementAtOffset; -import static com.albertoventurini.graphdbplugin.platform.SupportedLanguage.isSupported; +import static com.github.mdelambilly.graphdbplugin.language.cypher.util.PsiTraversalUtilities.Cypher.getCypherStatementAtOffset; +import static com.github.mdelambilly.graphdbplugin.platform.SupportedLanguage.isSupported; import static java.util.Objects.nonNull; public class SyncedElementHighlighter { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/listener/QueryHighlighterCaretListener.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/listener/QueryHighlighterCaretListener.java similarity index 87% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/listener/QueryHighlighterCaretListener.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/listener/QueryHighlighterCaretListener.java index 55354121..47be9596 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/listener/QueryHighlighterCaretListener.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/listener/QueryHighlighterCaretListener.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.highlighter.listener; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter.listener; -import com.albertoventurini.graphdbplugin.jetbrains.component.highlighter.SyncedElementHighlighter; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter.SyncedElementHighlighter; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.event.CaretEvent; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/listener/QueryHighlighterDocumentListener.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/listener/QueryHighlighterDocumentListener.java similarity index 87% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/listener/QueryHighlighterDocumentListener.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/listener/QueryHighlighterDocumentListener.java index 0c8bb09e..a421f27d 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/highlighter/listener/QueryHighlighterDocumentListener.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/listener/QueryHighlighterDocumentListener.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.highlighter.listener; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter.listener; -import com.albertoventurini.graphdbplugin.jetbrains.component.highlighter.SyncedElementHighlighter; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter.SyncedElementHighlighter; import com.intellij.openapi.editor.*; import com.intellij.openapi.editor.event.DocumentEvent; import com.intellij.openapi.editor.event.DocumentListener; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/linemarker/CypherLineMarkerProvider.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/linemarker/CypherLineMarkerProvider.java similarity index 92% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/linemarker/CypherLineMarkerProvider.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/linemarker/CypherLineMarkerProvider.java index eba1822c..8417213b 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/linemarker/CypherLineMarkerProvider.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/linemarker/CypherLineMarkerProvider.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.linemarker; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.linemarker; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.ExecuteQueryAction; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryAction; import com.intellij.codeInsight.daemon.LineMarkerInfo; import com.intellij.codeInsight.daemon.LineMarkerProvider; import com.intellij.icons.AllIcons; @@ -16,7 +17,7 @@ import com.intellij.openapi.actionSystem.ex.ActionUtil; import com.intellij.openapi.editor.markup.GutterIconRenderer; import com.intellij.psi.PsiElement; -import com.albertoventurini.graphdbplugin.language.cypher.util.PsiTraversalUtilities; +import com.github.mdelambilly.graphdbplugin.language.cypher.util.PsiTraversalUtilities; import org.jetbrains.annotations.NotNull; import java.util.Collection; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/settings/SettingsComponent.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/settings/SettingsComponent.java similarity index 86% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/settings/SettingsComponent.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/settings/SettingsComponent.java index bfb1321c..5db36753 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/settings/SettingsComponent.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/settings/SettingsComponent.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.settings; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.settings; import com.intellij.openapi.application.ApplicationManager; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/settings/SettingsComponentImpl.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/settings/SettingsComponentImpl.java similarity index 91% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/settings/SettingsComponentImpl.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/settings/SettingsComponentImpl.java index 249ae5df..f39928c5 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/settings/SettingsComponentImpl.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/settings/SettingsComponentImpl.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.settings; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.settings; import com.intellij.ide.util.PropertiesComponent; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/updater/PluginUpdateActivity.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/updater/PluginUpdateActivity.java similarity index 70% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/updater/PluginUpdateActivity.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/updater/PluginUpdateActivity.java index 60351574..c0f20d82 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/updater/PluginUpdateActivity.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/updater/PluginUpdateActivity.java @@ -3,17 +3,19 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.updater; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.updater; import com.intellij.notification.*; -import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; -import com.intellij.openapi.startup.StartupActivity; -import com.albertoventurini.graphdbplugin.jetbrains.component.settings.SettingsComponent; -import com.albertoventurini.graphdbplugin.jetbrains.util.PluginUtil; -import com.albertoventurini.graphdbplugin.platform.GraphBundle; -import com.albertoventurini.graphdbplugin.platform.GraphConstants; +import com.intellij.openapi.startup.ProjectActivity; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.settings.SettingsComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.util.PluginUtil; +import com.github.mdelambilly.graphdbplugin.platform.GraphBundle; +import com.github.mdelambilly.graphdbplugin.platform.GraphConstants; +import kotlin.Unit; +import kotlin.coroutines.Continuation; import org.jetbrains.annotations.NotNull; import java.util.concurrent.atomic.AtomicBoolean; @@ -21,12 +23,12 @@ /** * Displays a notification when the plugin was updated to a new version. */ -public class PluginUpdateActivity implements StartupActivity, DumbAware { +public class PluginUpdateActivity implements ProjectActivity { private final AtomicBoolean isUpdateNotificationShown = new AtomicBoolean(false); @Override - public void runActivity(@NotNull final Project project) { + public Object execute(@NotNull Project project, @NotNull Continuation continuation) { final String currentVersion = PluginUtil.getVersion(); final String knownVersion = SettingsComponent.getInstance().getKnownPluginVersion(); @@ -37,6 +39,7 @@ public void runActivity(@NotNull final Project project) { showNotification(project, currentVersion); } } + return Unit.INSTANCE; } private void showNotification(@NotNull final Project project, String currentVersion) { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/configuration/GraphDatabaseConfiguration.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/configuration/GraphDatabaseConfiguration.java similarity index 87% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/configuration/GraphDatabaseConfiguration.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/configuration/GraphDatabaseConfiguration.java index 9c3f49be..b79c64d6 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/configuration/GraphDatabaseConfiguration.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/configuration/GraphDatabaseConfiguration.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.configuration; +package com.github.mdelambilly.graphdbplugin.jetbrains.configuration; -import com.albertoventurini.graphdbplugin.jetbrains.component.settings.SettingsComponent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.PluginSettingsUpdated; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.settings.SettingsComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.PluginSettingsUpdated; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.options.Configurable; import com.intellij.ui.components.JBCheckBox; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/DatabaseManagerService.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/DatabaseManagerService.java similarity index 54% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/DatabaseManagerService.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/DatabaseManagerService.java index 1778db46..caa1e1aa 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/DatabaseManagerService.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/DatabaseManagerService.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.database; +package com.github.mdelambilly.graphdbplugin.jetbrains.database; -import com.albertoventurini.graphdbplugin.database.api.GraphDatabaseApi; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.database.api.GraphDatabaseApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; public interface DatabaseManagerService { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/DatabaseManagerServiceImpl.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/DatabaseManagerServiceImpl.java similarity index 62% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/DatabaseManagerServiceImpl.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/DatabaseManagerServiceImpl.java index 7f75c1ed..66d6f3ae 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/DatabaseManagerServiceImpl.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/DatabaseManagerServiceImpl.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.database; +package com.github.mdelambilly.graphdbplugin.jetbrains.database; -import com.albertoventurini.graphdbplugin.database.api.GraphDatabaseApi; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.Neo4jBoltDatabase; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.database.api.GraphDatabaseApi; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.Neo4jBoltDatabase; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; public class DatabaseManagerServiceImpl implements DatabaseManagerService { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/DiffService.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/DiffService.java similarity index 90% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/DiffService.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/DiffService.java index 584c36d5..b3978817 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/DiffService.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/DiffService.java @@ -3,14 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.database; +package com.github.mdelambilly.graphdbplugin.jetbrains.database; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.google.common.collect.ImmutableMap; import com.intellij.openapi.project.Project; -import com.albertoventurini.graphdbplugin.database.api.data.GraphEntity; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphEntity; import java.util.Collection; import java.util.List; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/QueryExecutionService.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/QueryExecutionService.java similarity index 85% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/QueryExecutionService.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/QueryExecutionService.java index 25ad603a..f860ed00 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/QueryExecutionService.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/QueryExecutionService.java @@ -3,20 +3,20 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.database; +package com.github.mdelambilly.graphdbplugin.jetbrains.database; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.util.messages.MessageBus; -import com.albertoventurini.graphdbplugin.database.api.GraphDatabaseApi; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.QueryExecutionProcessEvent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.QueryPlanEvent; -import com.albertoventurini.graphdbplugin.jetbrains.util.Notifier; +import com.github.mdelambilly.graphdbplugin.database.api.GraphDatabaseApi; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.QueryExecutionProcessEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.QueryPlanEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.util.Notifier; import org.jetbrains.annotations.NotNull; import java.util.concurrent.Future; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/VersionService.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/VersionService.java similarity index 84% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/VersionService.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/VersionService.java index bf8c74aa..b946861f 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/database/VersionService.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/database/VersionService.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.database; +package com.github.mdelambilly.graphdbplugin.jetbrains.database; -import com.albertoventurini.graphdbplugin.database.api.data.GraphDatabaseVersion; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.services.ExecutorService; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.VersionFetchingProcessEvent; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphDatabaseVersion; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.services.ExecutorService; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.VersionFetchingProcessEvent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.util.messages.MessageBus; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/formatter/CypherCodeStyleSettings.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/formatter/CypherCodeStyleSettings.java similarity index 83% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/formatter/CypherCodeStyleSettings.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/formatter/CypherCodeStyleSettings.java index 78a940e8..0f8d2632 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/formatter/CypherCodeStyleSettings.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/formatter/CypherCodeStyleSettings.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.formatter; +package com.github.mdelambilly.graphdbplugin.jetbrains.formatter; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CustomCodeStyleSettings; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/formatter/CypherCodeStyleSettingsProvider.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/formatter/CypherCodeStyleSettingsProvider.java similarity index 87% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/formatter/CypherCodeStyleSettingsProvider.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/formatter/CypherCodeStyleSettingsProvider.java index 8cd8d406..56b3c086 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/formatter/CypherCodeStyleSettingsProvider.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/formatter/CypherCodeStyleSettingsProvider.java @@ -3,18 +3,20 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.formatter; +package com.github.mdelambilly.graphdbplugin.jetbrains.formatter; import com.intellij.application.options.CodeStyleAbstractConfigurable; import com.intellij.application.options.CodeStyleAbstractPanel; import com.intellij.application.options.TabbedLanguageCodeStylePanel; +import com.intellij.lang.Language; import com.intellij.openapi.options.Configurable; import com.intellij.psi.codeStyle.CodeStyleConfigurable; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsProvider; import com.intellij.psi.codeStyle.CustomCodeStyleSettings; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -26,6 +28,12 @@ public CustomCodeStyleSettings createCustomSettings(CodeStyleSettings settings) return new CypherCodeStyleSettings(settings); } + @Nullable + @Override + public Language getLanguage() { + return CypherLanguage.INSTANCE; + } + @Nullable @Override public String getConfigurableDisplayName() { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/formatter/CypherLanguageCodeStyleSettingsProvider.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/formatter/CypherLanguageCodeStyleSettingsProvider.java similarity index 90% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/formatter/CypherLanguageCodeStyleSettingsProvider.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/formatter/CypherLanguageCodeStyleSettingsProvider.java index fc0bde0e..0a62ac96 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/formatter/CypherLanguageCodeStyleSettingsProvider.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/formatter/CypherLanguageCodeStyleSettingsProvider.java @@ -3,15 +3,16 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.formatter; +package com.github.mdelambilly.graphdbplugin.jetbrains.formatter; import com.intellij.application.options.IndentOptionsEditor; import com.intellij.application.options.SmartIndentOptionsEditor; import com.intellij.lang.Language; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; -import com.albertoventurini.graphdbplugin.language.cypher.CypherLanguage; +import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/inspection/CypherExplainWarningInspection.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/inspection/CypherExplainWarningInspection.java similarity index 84% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/inspection/CypherExplainWarningInspection.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/inspection/CypherExplainWarningInspection.java index 3377c34f..ec1b0bba 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/inspection/CypherExplainWarningInspection.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/inspection/CypherExplainWarningInspection.java @@ -3,22 +3,23 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.inspection; +package com.github.mdelambilly.graphdbplugin.jetbrains.inspection; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; -import com.albertoventurini.graphdbplugin.jetbrains.database.DatabaseManagerService; -import com.albertoventurini.graphdbplugin.jetbrains.util.NameUtil; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.database.DatabaseManagerService; +import com.github.mdelambilly.graphdbplugin.jetbrains.util.NameUtil; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.albertoventurini.graphdbplugin.database.api.GraphDatabaseApi; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; -import com.albertoventurini.graphdbplugin.platform.GraphConstants; +import com.github.mdelambilly.graphdbplugin.database.api.GraphDatabaseApi; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.platform.GraphConstants; import org.jetbrains.annotations.NotNull; import org.neo4j.driver.exceptions.Neo4jException; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/services/ExecutorService.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/services/ExecutorService.java similarity index 85% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/services/ExecutorService.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/services/ExecutorService.java index 6137da2a..7f851a8e 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/services/ExecutorService.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/services/ExecutorService.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.services; +package com.github.mdelambilly.graphdbplugin.jetbrains.services; import com.intellij.openapi.application.ModalityState; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/services/ExecutorServiceImpl.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/services/ExecutorServiceImpl.java similarity index 94% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/services/ExecutorServiceImpl.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/services/ExecutorServiceImpl.java index aa7532e3..447133f5 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/services/ExecutorServiceImpl.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/services/ExecutorServiceImpl.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.services; +package com.github.mdelambilly.graphdbplugin.jetbrains.services; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/services/IdeaLookAndFeelService.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/services/IdeaLookAndFeelService.java similarity index 63% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/services/IdeaLookAndFeelService.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/services/IdeaLookAndFeelService.java index 08210d9f..d0e66c72 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/services/IdeaLookAndFeelService.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/services/IdeaLookAndFeelService.java @@ -3,15 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.services; +package com.github.mdelambilly.graphdbplugin.jetbrains.services; -import com.albertoventurini.graphdbplugin.jetbrains.component.settings.SettingsComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.settings.SettingsComponent; import com.intellij.ui.JBColor; import com.intellij.util.ui.UIUtil; -import com.albertoventurini.graphdbplugin.visualization.services.LookAndFeelService; +import com.github.mdelambilly.graphdbplugin.visualization.services.LookAndFeelService; -import javax.swing.*; import java.awt.*; public class IdeaLookAndFeelService implements LookAndFeelService { @@ -28,37 +28,37 @@ public Color getBorderColor() { @Override public Color getEdgeStrokeColor() { - return UIUtil.getBoundsColor().darker(); + return JBColor.border(); } @Override public Color getEdgeFillColor() { - return UIUtil.getBoundsColor().darker(); + return JBColor.border(); } @Override public Color getNodeStrokeColor() { - return UIUtil.getBoundsColor().darker(); + return JBColor.border(); } @Override public Color getNodeStrokeHoverColor() { - return UIUtil.getBoundsColor().darker(); + return UIUtil.getLabelForeground(); } @Override public Color getNodeFillColor() { - return UIManager.getColor("InternalFrame.inactiveTitleBackground"); + return UIUtil.getPanelBackground(); } @Override public Color getNodeFillHoverColor() { - return UIManager.getColor("InternalFrame.activeTitleBackground"); + return UIUtil.getListSelectionBackground(true); } @Override public Color getTextColor() { - return UIManager.getColor("text"); + return UIUtil.getLabelForeground(); } @Override diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/ConsoleToolWindow.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/ConsoleToolWindow.java similarity index 86% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/ConsoleToolWindow.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/ConsoleToolWindow.java index 17aa6093..843bb6eb 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/ConsoleToolWindow.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/ConsoleToolWindow.java @@ -3,15 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console; -import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowFactory; import com.intellij.openapi.wm.ToolWindowManager; -import com.albertoventurini.graphdbplugin.platform.GraphConstants; +import com.github.mdelambilly.graphdbplugin.platform.GraphConstants; import org.jetbrains.annotations.NotNull; public class ConsoleToolWindow implements ToolWindowFactory { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/GraphConsoleView.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/GraphConsoleView.java similarity index 68% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/GraphConsoleView.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/GraphConsoleView.java index 0f174aa3..ddd060e9 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/GraphConsoleView.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/GraphConsoleView.java @@ -3,23 +3,25 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console; - -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.OpenTabEvent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.QueryPlanEvent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.graph.GraphPanel; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.log.LogPanel; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.params.ParametersPanel; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.plan.QueryPlanPanel; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.status.ExecutionStatusBarWidget; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.table.TablePanel; -import com.albertoventurini.graphdbplugin.visualization.services.LookAndFeelService; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console; + +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.OpenTabEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.QueryPlanEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.graph.GraphPanel; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.log.LogPanel; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params.ParametersPanel; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.plan.QueryPlanPanel; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.raw.RawJsonPanel; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.status.ExecutionStatusBarWidget; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.table.TablePanel; +import com.github.mdelambilly.graphdbplugin.visualization.services.LookAndFeelService; import com.intellij.ide.IdeEventQueue; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; +import com.intellij.openapi.util.Disposer; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.wm.StatusBar; @@ -38,9 +40,9 @@ import com.intellij.ui.treeStructure.Tree; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; -import com.albertoventurini.graphdbplugin.platform.GraphConstants; -import com.albertoventurini.graphdbplugin.platform.GraphConstants.ToolWindow.Tabs; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.platform.GraphConstants; +import com.github.mdelambilly.graphdbplugin.platform.GraphConstants.ToolWindow.Tabs; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -78,6 +80,7 @@ public class GraphConsoleView implements Disposable { private JPanel logTab; private JPanel graphTab; private JPanel parametersTab; + private JPanel rawTab; private JBTabbedPane defaultTabContainer; private JBSplitter graphSplitter; private JPanel globalParametersTab; @@ -90,6 +93,7 @@ public class GraphConsoleView implements Disposable { private GraphPanel graphPanel; private LogPanel logPanel; private ParametersPanel parametersPanel; + private RawJsonPanel rawJsonPanel; private static final DateTimeFormatter QUERY_PLAN_TIME_FORMAT = new DateTimeFormatterBuilder() .appendValue(HOUR_OF_DAY, 2) @@ -107,7 +111,86 @@ public GraphConsoleView() { graphPanel = new GraphPanel(); logPanel = new LogPanel(); parametersPanel = new ParametersPanel(); + rawJsonPanel = new RawJsonPanel(); lookAndFeelService = ApplicationManager.getApplication().getService(LookAndFeelService.class); + + setupUI(); + } + + private void setupUI() { + // --- Log tab --- + logTab = new JPanel(new BorderLayout()); + + // --- Raw JSON tab --- + rawTab = new JPanel(new BorderLayout()); + + // --- Graph tab --- + graphCanvas = new JPanel(new GridLayout(0, 1)); + + entityDetailsTree = new Tree(); + entityDetailsScrollPane = new JBScrollPane(entityDetailsTree); + + entityDetailsScrollContent = new JPanel(new GridLayout(1, 1)); + entityDetailsScrollContent.add(entityDetailsScrollPane); + + graphSplitter = new JBSplitter(false, 0.7f); + graphSplitter.setFirstComponent(graphCanvas); + graphSplitter.setSecondComponent(entityDetailsScrollContent); + + graphTab = new JPanel(new BorderLayout()); + graphTab.add(graphSplitter, BorderLayout.CENTER); + + // --- Table tab --- + tableExecuteResults = new JBTable(); + tableScrollPane = new JBScrollPane(tableExecuteResults); + + // --- Parameters tab --- + globalParametersTab = new JPanel(new BorderLayout()); + fileSpecificParametersTab = new JPanel(new BorderLayout()); + + paramSplitter = new JBSplitter(false, 0.5f); + paramSplitter.setShowDividerControls(true); + paramSplitter.setFirstComponent(globalParametersTab); + paramSplitter.setSecondComponent(fileSpecificParametersTab); + + parametersTab = new JPanel(new BorderLayout()); + parametersTab.add(paramSplitter, BorderLayout.CENTER); + + // defaultTabContainer is hidden immediately in initToolWindow; kept to avoid NPE + defaultTabContainer = new JBTabbedPane(); + defaultTabContainer.add(Tabs.LOG, logTab); + defaultTabContainer.add(Tabs.GRAPH, graphTab); + defaultTabContainer.add(Tabs.TABLE, tableScrollPane); + defaultTabContainer.add(Tabs.PARAMETERS, parametersTab); + defaultTabContainer.add(Tabs.RAW, rawTab); + + // --- consoleTabs (JBTabsImpl) via JBTabsPaneImpl --- + consoleTabsPane = new JBTabsPaneImpl(null, SwingConstants.TOP, this); + consoleTabs = (JBTabsImpl) consoleTabsPane.getTabs(); + + consoleTabs.addTabMouseListener(new MouseAdapter() { + @Override + public void mouseReleased(MouseEvent e) { + if (UIUtil.isCloseClick(e, MouseEvent.MOUSE_RELEASED)) { + final TabInfo info = consoleTabs.findInfo(e); + if (info != null) { + String tabTitle = info.getText(); + if (tabTitle.startsWith(PROFILE_PLAN_TITLE) || tabTitle.startsWith(EXPLAIN_PLAN_TITLE)) { + IdeEventQueue.getInstance().blockNextEvents(e); + consoleTabs.removeTab(info); + } + } + } + } + }); + + // --- Toolbar panel --- + consoleToolbarPanel = new JPanel(new BorderLayout()); + + // --- Root panel --- + consoleToolWindowContent = new JPanel(new BorderLayout()); + consoleToolWindowContent.add(consoleToolbarPanel, BorderLayout.WEST); + consoleToolWindowContent.add(consoleTabs, BorderLayout.CENTER); } public void initToolWindow(@NotNull final Project project, @NotNull final ToolWindow toolWindow) { @@ -131,6 +214,8 @@ public void initToolWindow(@NotNull final Project project, @NotNull final ToolWi .setText(Tabs.GRAPH)); consoleTabs.addTab(new TabInfo(tableScrollPane) .setText(Tabs.TABLE)); + consoleTabs.addTab(new TabInfo(rawTab) + .setText(Tabs.RAW)); consoleTabs.addTab(new TabInfo(parametersTab) .setText(Tabs.PARAMETERS)); consoleTabs.setSelectionChangeHandler((info, requestFocus, doChangeSelection) -> { @@ -139,17 +224,27 @@ public void initToolWindow(@NotNull final Project project, @NotNull final ToolWi return callback; }); - project.getMessageBus().connect().subscribe(OpenTabEvent.OPEN_TAB_TOPIC, this::selectTab); + project.getMessageBus().connect().subscribe(OpenTabEvent.OPEN_TAB_TOPIC, new OpenTabEvent() { + @Override + public void openTab(String name) { + selectTab(name); + } + }); AtomicInteger tabId = new AtomicInteger(0); - project.getMessageBus().connect().subscribe(QueryPlanEvent.QUERY_PLAN_EVENT, - (query, result) -> createNewQueryPlanTab(query, result, tabId.incrementAndGet())); + project.getMessageBus().connect().subscribe(QueryPlanEvent.QUERY_PLAN_EVENT, new QueryPlanEvent() { + @Override + public void queryPlanReceived(String query, GraphQueryResult result) { + createNewQueryPlanTab(query, result, tabId.incrementAndGet()); + } + }); // Actions final ActionGroup consoleActionGroup = (ActionGroup) ActionManager.getInstance().getAction(GraphConstants.Actions.CONSOLE_ACTIONS); ActionToolbar consoleToolbar = ActionManager.getInstance() .createActionToolbar(GraphConstants.ToolWindow.CONSOLE_TOOL_WINDOW, consoleActionGroup, false); + consoleToolbar.setTargetComponent(consoleToolbarPanel); consoleToolbarPanel.add(consoleToolbar.getComponent(), BorderLayout.CENTER); consoleToolbarPanel.setBorder(new CustomLineBorder(0, 0, 0, 1)); consoleToolbarPanel.validate(); @@ -168,34 +263,13 @@ private void selectTab(String name) { throw new IllegalArgumentException("No tab found with name: " + name); } - private void createUIComponents() { - graphCanvas = new JPanel(new GridLayout(0, 1)); - consoleTabsPane = new JBTabsPaneImpl(null, SwingConstants.TOP, this); - consoleTabs = (JBTabsImpl) consoleTabsPane.getTabs(); - - consoleTabs.addTabMouseListener(new MouseAdapter() { - @Override - public void mouseReleased(MouseEvent e) { - if (UIUtil.isCloseClick(e, MouseEvent.MOUSE_RELEASED)) { - final TabInfo info = consoleTabs.findInfo(e); - if (info != null) { - String tabTitle = info.getText(); - if (tabTitle.startsWith(PROFILE_PLAN_TITLE) || tabTitle.startsWith(EXPLAIN_PLAN_TITLE)) { - IdeEventQueue.getInstance().blockNextEvents(e); - consoleTabs.removeTab(info); - } - } - } - } - }); - } - private void updateLookAndFeel() { tableScrollPane.setBorder(JBUI.Borders.empty()); entityDetailsScrollPane.setBorder(JBUI.Borders.empty()); logTab.setBorder(JBUI.Borders.empty()); graphTab.setBorder(JBUI.Borders.empty()); parametersTab.setBorder(JBUI.Borders.empty()); + rawTab.setBorder(JBUI.Borders.empty()); } private void initializeUiComponents(@NotNull final Project project) { @@ -203,6 +277,7 @@ private void initializeUiComponents(@NotNull final Project project) { tablePanel.initialize(this, project); logPanel.initialize(this, project); parametersPanel.initialize(this, project); + rawJsonPanel.initialize(this, project); } // private void initializeWidgets(Project project) { @@ -268,6 +343,8 @@ public JPanel getParametersTab() { @Override public void dispose() { + Disposer.dispose(parametersPanel); + Disposer.dispose(rawJsonPanel); } public JPanel getGlobalParametersTab() { @@ -277,4 +354,8 @@ public JPanel getGlobalParametersTab() { public JPanel getFileSpecificParametersTab() { return fileSpecificParametersTab; } + + public JPanel getRawTab() { + return rawTab; + } } diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/CopyQueryOutputEvent.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/CopyQueryOutputEvent.java similarity index 81% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/CopyQueryOutputEvent.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/CopyQueryOutputEvent.java index ce5b7ea7..5b2e8080 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/CopyQueryOutputEvent.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/CopyQueryOutputEvent.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.event; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event; import com.intellij.util.messages.Topic; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/OpenTabEvent.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/OpenTabEvent.java similarity index 79% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/OpenTabEvent.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/OpenTabEvent.java index b2ed5c6c..a4a71eb0 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/OpenTabEvent.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/OpenTabEvent.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.event; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event; import com.intellij.util.messages.Topic; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/PluginSettingsUpdated.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/PluginSettingsUpdated.java similarity index 80% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/PluginSettingsUpdated.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/PluginSettingsUpdated.java index eb16a733..d740adb2 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/PluginSettingsUpdated.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/PluginSettingsUpdated.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.event; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event; import com.intellij.util.messages.Topic; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/QueryExecutionProcessEvent.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/QueryExecutionProcessEvent.java similarity index 68% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/QueryExecutionProcessEvent.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/QueryExecutionProcessEvent.java index 8efc2c0e..78735bef 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/QueryExecutionProcessEvent.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/QueryExecutionProcessEvent.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.event; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.util.messages.Topic; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; public interface QueryExecutionProcessEvent { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/QueryParametersRetrievalErrorEvent.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/QueryParametersRetrievalErrorEvent.java similarity index 86% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/QueryParametersRetrievalErrorEvent.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/QueryParametersRetrievalErrorEvent.java index bdce43c9..340afbfb 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/QueryParametersRetrievalErrorEvent.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/QueryParametersRetrievalErrorEvent.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.event; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event; import com.intellij.openapi.editor.Editor; import com.intellij.util.messages.Topic; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/QueryPlanEvent.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/QueryPlanEvent.java similarity index 71% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/QueryPlanEvent.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/QueryPlanEvent.java index f25b2265..a867a14a 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/QueryPlanEvent.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/QueryPlanEvent.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.event; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event; import com.intellij.util.messages.Topic; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; public interface QueryPlanEvent { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/VersionFetchingProcessEvent.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/VersionFetchingProcessEvent.java similarity index 68% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/VersionFetchingProcessEvent.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/VersionFetchingProcessEvent.java index 181d9962..828ceacf 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/event/VersionFetchingProcessEvent.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/event/VersionFetchingProcessEvent.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.event; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event; -import com.albertoventurini.graphdbplugin.database.api.data.GraphDatabaseVersion; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphDatabaseVersion; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.util.messages.Topic; public interface VersionFetchingProcessEvent { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/CopyToClipboardAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/CopyToClipboardAction.java similarity index 84% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/CopyToClipboardAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/CopyToClipboardAction.java index 392039e7..678cc164 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/CopyToClipboardAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/CopyToClipboardAction.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.graph; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.graph; -import com.albertoventurini.graphdbplugin.jetbrains.ui.helpers.SerialisationHelper; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.helpers.SerialisationHelper; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import org.jetbrains.annotations.NotNull; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/EntityActionGroup.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/EntityActionGroup.java similarity index 79% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/EntityActionGroup.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/EntityActionGroup.java index 2f239992..53611154 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/EntityActionGroup.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/EntityActionGroup.java @@ -3,17 +3,18 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.graph; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.graph; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.model.ObjectModel; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.model.ObjectModel; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; -import com.albertoventurini.graphdbplugin.database.api.data.NoIdGraphEntity; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.database.api.data.NoIdGraphEntity; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/EntityContextMenu.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/EntityContextMenu.java similarity index 74% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/EntityContextMenu.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/EntityContextMenu.java index a4fe3d25..de7718e0 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/EntityContextMenu.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/EntityContextMenu.java @@ -3,15 +3,16 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.graph; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.graph; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListPopup; -import com.albertoventurini.graphdbplugin.database.api.data.NoIdGraphEntity; +import com.github.mdelambilly.graphdbplugin.database.api.data.NoIdGraphEntity; public class EntityContextMenu implements ContextMenu { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/GraphPanel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/GraphPanel.java similarity index 82% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/GraphPanel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/GraphPanel.java index 5f64fd1c..25db9c30 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/GraphPanel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/GraphPanel.java @@ -3,14 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.graph; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.graph; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.TreeMouseAdapter; -import com.albertoventurini.graphdbplugin.jetbrains.ui.helpers.UiHelper; -import com.albertoventurini.graphdbplugin.jetbrains.ui.renderes.tree.PropertyTreeCellRenderer; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.TreeMouseAdapter; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.helpers.UiHelper; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.renderes.tree.PropertyTreeCellRenderer; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.Balloon; import com.intellij.openapi.ui.popup.BalloonBuilder; @@ -23,16 +24,16 @@ import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.messages.MessageBus; -import com.albertoventurini.graphdbplugin.database.api.data.GraphEntity; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.GraphConsoleView; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.QueryExecutionProcessEvent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.PluginSettingsUpdated; -import com.albertoventurini.graphdbplugin.platform.GraphConstants.ToolWindow.Tabs; -import com.albertoventurini.graphdbplugin.visualization.PrefuseVisualization; -import com.albertoventurini.graphdbplugin.visualization.services.LookAndFeelService; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphEntity; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.GraphConsoleView; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.QueryExecutionProcessEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.PluginSettingsUpdated; +import com.github.mdelambilly.graphdbplugin.platform.GraphConstants.ToolWindow.Tabs; +import com.github.mdelambilly.graphdbplugin.visualization.PrefuseVisualization; +import com.github.mdelambilly.graphdbplugin.visualization.services.LookAndFeelService; import org.jetbrains.annotations.NotNull; import prefuse.visual.VisualItem; @@ -42,8 +43,8 @@ import java.awt.event.MouseEvent; import java.util.Enumeration; -import static com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.OpenTabEvent.*; -import static com.albertoventurini.graphdbplugin.visualization.util.DisplayUtil.*; +import static com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.OpenTabEvent.*; +import static com.github.mdelambilly.graphdbplugin.visualization.util.DisplayUtil.*; public class GraphPanel { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/GraphPanelInteractions.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/GraphPanelInteractions.java similarity index 80% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/GraphPanelInteractions.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/GraphPanelInteractions.java index b6466800..330efe68 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/GraphPanelInteractions.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/GraphPanelInteractions.java @@ -3,22 +3,23 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.graph; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.graph; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.ExecuteQueryEvent; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; -import com.albertoventurini.graphdbplugin.jetbrains.actions.ui.console.CleanCanvasEvent; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.database.QueryExecutionService; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.QueryExecutionProcessEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.ui.console.CleanCanvasEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.database.QueryExecutionService; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.QueryExecutionProcessEvent; import com.intellij.codeInsight.hint.HintManager; import com.intellij.openapi.project.Project; import com.intellij.util.messages.MessageBus; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.GraphConsoleView; -import com.albertoventurini.graphdbplugin.visualization.VisualizationApi; -import com.albertoventurini.graphdbplugin.visualization.events.EventType; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.GraphConsoleView; +import com.github.mdelambilly.graphdbplugin.visualization.VisualizationApi; +import com.github.mdelambilly.graphdbplugin.visualization.events.EventType; import org.jetbrains.annotations.NotNull; public class GraphPanelInteractions { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/NodeDeleteAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/NodeDeleteAction.java similarity index 74% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/NodeDeleteAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/NodeDeleteAction.java index 2dc4af43..eed9b08a 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/NodeDeleteAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/NodeDeleteAction.java @@ -3,17 +3,18 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.graph; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.graph; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.database.QueryExecutionService; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.database.QueryExecutionService; import com.google.common.collect.ImmutableMap; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.Project; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; import org.jetbrains.annotations.NotNull; import javax.swing.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/NodeEditAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/NodeEditAction.java similarity index 71% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/NodeEditAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/NodeEditAction.java index 8bb5ba2a..b661d734 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/NodeEditAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/NodeEditAction.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.graph; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.graph; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.database.DiffService; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions.EditEntityDialog; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.database.DiffService; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions.EditEntityDialog; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.Project; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; import org.jetbrains.annotations.NotNull; import javax.swing.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/RelationshipDeleteAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/RelationshipDeleteAction.java similarity index 74% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/RelationshipDeleteAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/RelationshipDeleteAction.java index e156e136..e167c02f 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/RelationshipDeleteAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/RelationshipDeleteAction.java @@ -3,17 +3,18 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.graph; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.graph; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.database.QueryExecutionService; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.database.QueryExecutionService; import com.google.common.collect.ImmutableMap; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.Project; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; import org.jetbrains.annotations.NotNull; import javax.swing.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/RelationshipEditAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/RelationshipEditAction.java similarity index 72% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/RelationshipEditAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/RelationshipEditAction.java index 1d375536..19e9c5d3 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/graph/RelationshipEditAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/RelationshipEditAction.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.graph; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.graph; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.database.DiffService; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions.EditEntityDialog; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.database.DiffService; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions.EditEntityDialog; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.Project; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; import javax.swing.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/log/GoToTabFilter.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/log/GoToTabFilter.java similarity index 86% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/log/GoToTabFilter.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/log/GoToTabFilter.java index 59599a05..4beaa131 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/log/GoToTabFilter.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/log/GoToTabFilter.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.log; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.log; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.OpenTabEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.OpenTabEvent; import com.intellij.execution.filters.Filter; import com.intellij.execution.filters.HyperlinkInfo; import com.intellij.execution.ui.ConsoleView; import com.intellij.icons.AllIcons; import com.intellij.openapi.ui.popup.JBPopupFactory; -import com.albertoventurini.graphdbplugin.platform.GraphConstants.ToolWindow.Tabs; +import com.github.mdelambilly.graphdbplugin.platform.GraphConstants.ToolWindow.Tabs; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -25,6 +26,7 @@ public class GoToTabFilter implements Filter { static final String GRAPH_TAB_LINK = "as Graph"; static final String TABLE_TAB_LINK = "as Table"; + static final String RAW_TAB_LINK = "as Raw"; private ConsoleView log; @@ -37,7 +39,8 @@ public class GoToTabFilter implements Filter { public Result applyFilter(@NotNull String textLine, int endPoint) { List links = Stream.of( createLink(textLine, endPoint, GRAPH_TAB_LINK, Tabs.GRAPH), - createLink(textLine, endPoint, TABLE_TAB_LINK, Tabs.TABLE)) + createLink(textLine, endPoint, TABLE_TAB_LINK, Tabs.TABLE), + createLink(textLine, endPoint, RAW_TAB_LINK, Tabs.RAW)) .filter(Optional::isPresent) .map(Optional::get) .collect(Collectors.toList()); diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/log/LogPanel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/log/LogPanel.java similarity index 85% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/log/LogPanel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/log/LogPanel.java index b3e9498e..aa4a8ca4 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/log/LogPanel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/log/LogPanel.java @@ -3,17 +3,18 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.log; - -import com.albertoventurini.graphdbplugin.database.api.data.GraphDatabaseVersion; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.QueryExecutionProcessEvent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.VersionFetchingProcessEvent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions.DataSourceDialog; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.MetadataRetrieveEvent; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.log; + +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphDatabaseVersion; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.QueryExecutionProcessEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.VersionFetchingProcessEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions.DataSourceDialog; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.MetadataRetrieveEvent; import com.intellij.execution.filters.TextConsoleBuilderFactory; import com.intellij.execution.ui.ConsoleView; import com.intellij.execution.ui.ConsoleViewContentType; @@ -26,8 +27,8 @@ import com.intellij.ui.components.JBScrollPane; import com.intellij.util.messages.MessageBus; import com.intellij.util.ui.JBUI; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.GraphConsoleView; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.GraphConsoleView; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -79,14 +80,16 @@ public void resultReceived(ExecuteQueryPayload payload, GraphQueryResult result) if (result.getRows().isEmpty()) { info("No results."); } else if (result.getNodes().isEmpty()) { - info(String.format("Got %s rows. View results: %s", + info(String.format("Got %s rows. View results: %s, %s", result.getRows().size(), - GoToTabFilter.TABLE_TAB_LINK)); + GoToTabFilter.TABLE_TAB_LINK, + GoToTabFilter.RAW_TAB_LINK)); } else { - info(String.format("Got %s rows. View results: %s, %s", + info(String.format("Got %s rows. View results: %s, %s, %s", result.getRows().size(), GoToTabFilter.GRAPH_TAB_LINK, - GoToTabFilter.TABLE_TAB_LINK)); + GoToTabFilter.TABLE_TAB_LINK, + GoToTabFilter.RAW_TAB_LINK)); } newLine(); } @@ -200,7 +203,7 @@ private void newLine() { private void showPopup(String title, String details, Exception exception) { JPanel popupPanel = new JPanel(new BorderLayout()); - popupPanel.setBorder(JBUI.Borders.empty(DataSourceDialog.THICKNESS)); + popupPanel.setBorder(JBUI.Borders.empty(10)); JTextArea exceptionDetails = new JTextArea(); exceptionDetails.setLineWrap(false); @@ -208,7 +211,7 @@ private void showPopup(String title, String details, Exception exception) { JLabel jLabel = new JLabel(exception.getMessage(), JLabel.LEFT); JBScrollPane scrollPane = new JBScrollPane(exceptionDetails); - scrollPane.setPreferredSize(new Dimension(-1, DataSourceDialog.HEIGHT)); + scrollPane.setPreferredSize(new Dimension(-1, 150)); popupPanel.add(jLabel, BorderLayout.NORTH); popupPanel.add(scrollPane, BorderLayout.CENTER); diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/params/ParameterRootType.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParameterRootType.java similarity index 84% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/params/ParameterRootType.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParameterRootType.java index 350cda0c..1a6410e1 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/params/ParameterRootType.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParameterRootType.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.params; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params; import com.intellij.execution.console.ConsoleRootType; import org.jetbrains.annotations.NotNull; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/params/ParametersPanel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParametersPanel.java similarity index 74% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/params/ParametersPanel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParametersPanel.java index 8c1aca8b..761ba1e0 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/params/ParametersPanel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParametersPanel.java @@ -3,41 +3,43 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.params; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; -import com.albertoventurini.graphdbplugin.jetbrains.util.FileUtil; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.util.FileUtil; import com.google.common.base.Throwables; import com.intellij.codeInsight.hint.HintManager; import com.intellij.icons.AllIcons; import com.intellij.json.JsonFileType; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; +import com.intellij.openapi.util.Disposer; import com.intellij.openapi.fileEditor.*; import com.intellij.openapi.fileEditor.impl.EditorTabPresentationUtil; import com.intellij.openapi.project.Project; +import com.intellij.openapi.Disposable; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.openapi.vfs.VirtualFileEvent; -import com.intellij.openapi.vfs.VirtualFileListener; import com.intellij.openapi.vfs.VirtualFileManager; +import com.intellij.openapi.vfs.newvfs.BulkFileListener; +import com.intellij.openapi.vfs.newvfs.events.VFileContentChangeEvent; +import com.intellij.openapi.vfs.newvfs.events.VFileEvent; +import java.util.List; import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.messages.MessageBus; import com.intellij.util.messages.MessageBusConnection; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.GraphConsoleView; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent; -import com.albertoventurini.graphdbplugin.language.cypher.util.FileTypeExtensionUtil; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.GraphConsoleView; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent; +import com.github.mdelambilly.graphdbplugin.language.cypher.util.FileTypeExtensionUtil; import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; -import static com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent.*; - -public class ParametersPanel implements ParametersProvider { +public class ParametersPanel implements ParametersProvider, Disposable { private static final FileDocumentManager FILE_DOCUMENT_MANAGER = FileDocumentManager.getInstance(); public static final Icon ICON_HELP = AllIcons.Actions.Help; @@ -75,17 +77,20 @@ private void initializeUi() { service.registerParametersProvider(this); MessageBusConnection mbConnection = messageBus.connect(); mbConnection.subscribe(QueryParametersRetrievalErrorEvent.QUERY_PARAMETERS_RETRIEVAL_ERROR_EVENT_TOPIC, - (exception, editor) -> { - if (editor == null) { - return; - } - String errorMessage; - if (exception.getMessage() != null) { - errorMessage = String.format("%s: %s", PARAMS_ERROR_COMMON_MSG, exception.getMessage()); - } else { - errorMessage = PARAMS_ERROR_COMMON_MSG; + new QueryParametersRetrievalErrorEvent() { + @Override + public void handleError(Exception exception, Editor editor) { + if (editor == null) { + return; + } + String errorMessage; + if (exception.getMessage() != null) { + errorMessage = String.format("%s: %s", PARAMS_ERROR_COMMON_MSG, exception.getMessage()); + } else { + errorMessage = PARAMS_ERROR_COMMON_MSG; + } + HintManager.getInstance().showErrorHint(editor, errorMessage); } - HintManager.getInstance().showErrorHint(editor, errorMessage); }); mbConnection.subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, new FileEditorManagerListener() { @@ -133,11 +138,16 @@ private void setupFileSpecificEditor(Project project, VirtualFile cypherFile) { LightVirtualFile lightVirtualFile = new LightVirtualFile("", JsonFileType.INSTANCE, params); Document document = FileDocumentManager.getInstance().getDocument(lightVirtualFile); fileSpecificParamEditor = createEditor(project, document); - VirtualFileManager.getInstance().addVirtualFileListener(new VirtualFileListener() { + project.getMessageBus().connect().subscribe(VirtualFileManager.VFS_CHANGES, new BulkFileListener() { @Override - public void contentsChanged(@NotNull VirtualFileEvent event) { - if (event.getFile().equals(cypherFile) && document != null) { - FileUtil.setParams(cypherFile, document.getText()); + public void after(@NotNull List events) { + for (VFileEvent event : events) { + if (event instanceof VFileContentChangeEvent + && cypherFile.equals(event.getFile()) + && document != null) { + FileUtil.setParams(cypherFile, document.getText()); + break; + } } } }); @@ -185,6 +195,16 @@ private void setInitialContent(Document document) { } } + @Override + public void dispose() { + if (globalParamEditor != null && !globalParamEditor.isDisposed()) { + EditorFactory.getInstance().releaseEditor(globalParamEditor); + } + if (fileSpecificParamEditor != null && !fileSpecificParamEditor.isDisposed()) { + EditorFactory.getInstance().releaseEditor(fileSpecificParamEditor); + } + } + private static Editor createEditor(Project project, Document document) { return EditorFactory.getInstance().createEditor(document, project, JsonFileType.INSTANCE, false); } diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/params/ParametersProvider.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParametersProvider.java similarity index 75% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/params/ParametersProvider.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParametersProvider.java index ba51a6ad..41f84058 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/params/ParametersProvider.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParametersProvider.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.params; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params; public interface ParametersProvider { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/params/ParametersService.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParametersService.java similarity index 91% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/params/ParametersService.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParametersService.java index ecd53b42..a1911a8a 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/params/ParametersService.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParametersService.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.params; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params; -import com.albertoventurini.graphdbplugin.language.cypher.psi.impl.CypherParameterImpl; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherParameterImpl; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.type.TypeReference; @@ -14,9 +15,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Throwables; import com.intellij.psi.PsiElement; -import com.albertoventurini.graphdbplugin.language.cypher.psi.CypherTypes; -import com.albertoventurini.graphdbplugin.language.cypher.util.TraverseUtil; -import org.apache.commons.lang.StringUtils; +import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; +import com.github.mdelambilly.graphdbplugin.language.cypher.util.TraverseUtil; +import org.apache.commons.lang3.StringUtils; import java.util.*; import java.util.stream.Collectors; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/plan/ColumnDefinitions.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/plan/ColumnDefinitions.java similarity index 93% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/plan/ColumnDefinitions.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/plan/ColumnDefinitions.java index c1a35ad6..24e88317 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/plan/ColumnDefinitions.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/plan/ColumnDefinitions.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.plan; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.plan; import com.intellij.ui.treeStructure.treetable.TreeTableModel; import com.intellij.util.ui.ColumnInfo; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryPlan; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryPlan; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -19,7 +20,7 @@ import java.util.Set; import java.util.stream.Stream; -import static com.albertoventurini.graphdbplugin.jetbrains.ui.console.plan.QueryPlanArgumentKeys.*; +import static com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.plan.QueryPlanArgumentKeys.*; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toSet; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/plan/QueryPlanArgumentKeys.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/plan/QueryPlanArgumentKeys.java similarity index 85% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/plan/QueryPlanArgumentKeys.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/plan/QueryPlanArgumentKeys.java index 016099cb..d39991cf 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/plan/QueryPlanArgumentKeys.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/plan/QueryPlanArgumentKeys.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.plan; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.plan; enum QueryPlanArgumentKeys { ESTIMATED_ROWS("EstimatedRows"), diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/plan/QueryPlanPanel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/plan/QueryPlanPanel.java similarity index 94% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/plan/QueryPlanPanel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/plan/QueryPlanPanel.java index 2d9ad8f9..a8853cd9 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/plan/QueryPlanPanel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/plan/QueryPlanPanel.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.plan; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.plan; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.table.ColumnResizer; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.table.ColumnResizer; import com.intellij.icons.AllIcons; import com.intellij.ide.DefaultTreeExpander; import com.intellij.openapi.Disposable; @@ -20,9 +21,9 @@ import com.intellij.ui.treeStructure.treetable.ListTreeTableModelOnColumns; import com.intellij.ui.treeStructure.treetable.TreeTableCellRenderer; import com.intellij.ui.treeStructure.treetable.TreeTableModel; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryPlan; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; -import com.albertoventurini.graphdbplugin.platform.ShouldNeverHappenException; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryPlan; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.platform.ShouldNeverHappenException; import org.jetbrains.annotations.NotNull; import javax.swing.*; diff --git a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/raw/RawJsonPanel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/raw/RawJsonPanel.java new file mode 100644 index 00000000..bf73828f --- /dev/null +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/raw/RawJsonPanel.java @@ -0,0 +1,169 @@ +/** + * Copied and adapted from plugin + * Graph Database Support + * by Neueda Technologies, Ltd. + * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 + */ +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.raw; + +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResultColumn; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.GraphConsoleView; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.QueryExecutionProcessEvent; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.intellij.json.JsonFileType; +import com.intellij.openapi.Disposable; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.command.WriteCommandAction; +import com.intellij.openapi.editor.Document; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.editor.EditorFactory; +import com.intellij.openapi.fileEditor.FileDocumentManager; +import com.intellij.openapi.project.Project; +import com.intellij.testFramework.LightVirtualFile; + +import javax.swing.*; +import java.awt.*; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class RawJsonPanel implements Disposable { + + private static final ObjectMapper MAPPER = new ObjectMapper() + .enable(SerializationFeature.INDENT_OUTPUT) + .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); + + private Editor editor; + private Document document; + + public void initialize(GraphConsoleView graphConsoleView, Project project) { + LightVirtualFile virtualFile = new LightVirtualFile("query-result.json", JsonFileType.INSTANCE, "{}"); + document = FileDocumentManager.getInstance().getDocument(virtualFile); + editor = EditorFactory.getInstance().createEditor(document, project, JsonFileType.INSTANCE, true); + + JLabel label = new JLabel("Raw JSON output of last query execution"); + editor.setHeaderComponent(label); + + graphConsoleView.getRawTab().add(editor.getComponent(), BorderLayout.CENTER); + + project.getMessageBus().connect().subscribe( + QueryExecutionProcessEvent.QUERY_EXECUTION_PROCESS_TOPIC, + new QueryExecutionProcessEvent() { + @Override + public void executionStarted(DataSourceApi dataSource, ExecuteQueryPayload payload) { + if (document != null) { + ApplicationManager.getApplication().invokeLater(() -> + WriteCommandAction.runWriteCommandAction(project, () -> document.setText("{}"))); + } + } + + @Override + public void resultReceived(ExecuteQueryPayload payload, GraphQueryResult result) { + if (document == null) return; + String json = toJson(result); + ApplicationManager.getApplication().invokeLater(() -> + WriteCommandAction.runWriteCommandAction(project, () -> document.setText(json))); + } + + @Override + public void postResultReceived(ExecuteQueryPayload payload) { + } + + @Override + public void handleError(ExecuteQueryPayload payload, Exception exception) { + } + + @Override + public void executionCompleted(ExecuteQueryPayload payload) { + } + }); + } + + private String toJson(GraphQueryResult result) { + Map output = new LinkedHashMap<>(); + + List nodes = result.getNodes(); + List relationships = result.getRelationships(); + List columns = result.getColumns(); + + if (!nodes.isEmpty()) { + output.put("nodes", nodes.stream().map(this::nodeToMap).collect(Collectors.toList())); + } + if (!relationships.isEmpty()) { + output.put("relationships", relationships.stream().map(this::relationshipToMap).collect(Collectors.toList())); + } + if (nodes.isEmpty() && relationships.isEmpty()) { + // Tabular result: show rows + output.put("columns", columns.stream().map(GraphQueryResultColumn::getName).collect(Collectors.toList())); + output.put("rows", result.getRows().stream().map(row -> { + Map rowMap = new LinkedHashMap<>(); + columns.forEach(col -> rowMap.put(col.getName(), convertValue(row.getValue(col)))); + return rowMap; + }).collect(Collectors.toList())); + } + + try { + return MAPPER.writeValueAsString(output).replace("\r\n", "\n").replace("\r", "\n"); + } catch (JsonProcessingException e) { + return "{\"error\": \"Serialization failed: " + e.getMessage().replace("\"", "'") + "\"}"; + } + } + + private Map nodeToMap(GraphNode node) { + Map map = new LinkedHashMap<>(); + map.put("id", node.getId()); + map.put("labels", node.getTypes()); + map.put("properties", convertProperties(node.getPropertyContainer().getProperties())); + return map; + } + + private Map relationshipToMap(GraphRelationship rel) { + Map map = new LinkedHashMap<>(); + map.put("id", rel.getId()); + map.put("type", rel.getTypesName()); + if (rel.hasStartAndEndNode()) { + map.put("startNodeId", rel.getStartNodeId()); + map.put("endNodeId", rel.getEndNodeId()); + } + map.put("properties", convertProperties(rel.getPropertyContainer().getProperties())); + return map; + } + + private Map convertProperties(Map props) { + Map result = new LinkedHashMap<>(); + props.forEach((k, v) -> result.put(k, convertValue(v))); + return result; + } + + private Object convertValue(Object value) { + if (value == null) return null; + if (value instanceof String || value instanceof Number || value instanceof Boolean) return value; + if (value instanceof List) { + return ((List) value).stream().map(this::convertValue).collect(Collectors.toList()); + } + if (value instanceof Map) { + Map map = new LinkedHashMap<>(); + ((Map) value).forEach((k, v) -> map.put(String.valueOf(k), convertValue(v))); + return map; + } + if (value instanceof GraphNode) return nodeToMap((GraphNode) value); + if (value instanceof GraphRelationship) return relationshipToMap((GraphRelationship) value); + return value.toString(); + } + + @Override + public void dispose() { + if (editor != null && !editor.isDisposed()) { + EditorFactory.getInstance().releaseEditor(editor); + } + } +} diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/status/ExecutionStatusBarWidget.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/status/ExecutionStatusBarWidget.java similarity index 83% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/status/ExecutionStatusBarWidget.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/status/ExecutionStatusBarWidget.java index 0511fef5..89959da7 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/status/ExecutionStatusBarWidget.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/status/ExecutionStatusBarWidget.java @@ -3,17 +3,18 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.status; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.status; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.openapi.wm.CustomStatusBarWidget; import com.intellij.openapi.wm.StatusBar; import com.intellij.util.messages.MessageBus; import com.intellij.util.ui.AsyncProcessIcon; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.QueryExecutionProcessEvent; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.QueryExecutionProcessEvent; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/status/ExecutionTextPanel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/status/ExecutionTextPanel.java similarity index 74% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/status/ExecutionTextPanel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/status/ExecutionTextPanel.java index 170c1889..70518815 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/status/ExecutionTextPanel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/status/ExecutionTextPanel.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.status; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.status; import com.intellij.openapi.wm.impl.status.TextPanel; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/ColumnResizer.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/ColumnResizer.java similarity index 95% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/ColumnResizer.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/ColumnResizer.java index 06e65f38..54f2f041 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/ColumnResizer.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/ColumnResizer.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.table; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.table; import javax.swing.*; import javax.swing.event.TableModelEvent; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/QueryResultTableModel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/QueryResultTableModel.java similarity index 83% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/QueryResultTableModel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/QueryResultTableModel.java index afb4406d..2383144f 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/QueryResultTableModel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/QueryResultTableModel.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.table; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.table; import com.intellij.ui.treeStructure.Tree; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/TablePanel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/TablePanel.java similarity index 80% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/TablePanel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/TablePanel.java index 50b2004f..79702cbd 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/TablePanel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/TablePanel.java @@ -3,23 +3,24 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.table; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.table; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.TableContextMenuMouseAdapter; -import com.albertoventurini.graphdbplugin.jetbrains.ui.helpers.SerialisationHelper; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.TableContextMenuMouseAdapter; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.helpers.SerialisationHelper; import com.intellij.openapi.project.Project; import com.intellij.ui.table.JBTable; import com.intellij.util.messages.MessageBus; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult; -import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResultColumn; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.GraphConsoleView; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.CopyQueryOutputEvent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.QueryExecutionProcessEvent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.table.editor.CompositeTableCellEditor; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.table.renderer.CompositeTableCellRenderer; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResultColumn; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.GraphConsoleView; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.CopyQueryOutputEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.QueryExecutionProcessEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.table.editor.CompositeTableCellEditor; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.table.renderer.CompositeTableCellRenderer; import javax.swing.*; import java.awt.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/ValueConverter.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/ValueConverter.java similarity index 79% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/ValueConverter.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/ValueConverter.java index 5de1f9f4..865f04b8 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/ValueConverter.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/ValueConverter.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.table; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.table; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.TreeMouseAdapter; -import com.albertoventurini.graphdbplugin.jetbrains.ui.helpers.UiHelper; -import com.albertoventurini.graphdbplugin.jetbrains.ui.renderes.tree.PropertyTreeCellRenderer; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.TreeMouseAdapter; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.helpers.UiHelper; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.renderes.tree.PropertyTreeCellRenderer; import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode; import com.intellij.ui.treeStructure.Tree; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/editor/CompositeTableCellEditor.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/editor/CompositeTableCellEditor.java similarity index 91% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/editor/CompositeTableCellEditor.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/editor/CompositeTableCellEditor.java index 3002703a..d9d43fd3 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/editor/CompositeTableCellEditor.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/editor/CompositeTableCellEditor.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.table.editor; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.table.editor; import com.intellij.ui.treeStructure.Tree; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/editor/TreeModelTableCellEditor.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/editor/TreeModelTableCellEditor.java similarity index 86% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/editor/TreeModelTableCellEditor.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/editor/TreeModelTableCellEditor.java index f5060b82..c73cc089 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/editor/TreeModelTableCellEditor.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/editor/TreeModelTableCellEditor.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.table.editor; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.table.editor; import com.intellij.ui.treeStructure.Tree; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/renderer/CompositeTableCellRenderer.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/renderer/CompositeTableCellRenderer.java similarity index 92% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/renderer/CompositeTableCellRenderer.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/renderer/CompositeTableCellRenderer.java index a057f87f..b895740e 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/renderer/CompositeTableCellRenderer.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/renderer/CompositeTableCellRenderer.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.table.renderer; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.table.renderer; -import com.albertoventurini.graphdbplugin.jetbrains.ui.helpers.SerialisationHelper; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.helpers.SerialisationHelper; import com.intellij.ui.treeStructure.Tree; import javax.swing.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/renderer/TreeModelTableCellRenderer.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/renderer/TreeModelTableCellRenderer.java similarity index 83% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/renderer/TreeModelTableCellRenderer.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/renderer/TreeModelTableCellRenderer.java index aed05cfc..38487bc1 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/console/table/renderer/TreeModelTableCellRenderer.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/table/renderer/TreeModelTableCellRenderer.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.console.table.renderer; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.table.renderer; import com.intellij.ui.treeStructure.Tree; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/DataSourcesToolWindow.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/DataSourcesToolWindow.java similarity index 86% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/DataSourcesToolWindow.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/DataSourcesToolWindow.java index 2fcea236..e9db78f8 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/DataSourcesToolWindow.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/DataSourcesToolWindow.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource; import com.intellij.openapi.project.Project; import com.intellij.openapi.wm.ToolWindow; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/DataSourcesView.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/DataSourcesView.java similarity index 87% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/DataSourcesView.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/DataSourcesView.java index bdd00788..7af325dc 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/DataSourcesView.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/DataSourcesView.java @@ -3,16 +3,18 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource; - -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.actions.RefreshDataSourcesAction; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions.DataSourceInteractions; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.DataSourceMetadataUpdateService; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.*; -import com.albertoventurini.graphdbplugin.jetbrains.util.FileUtil; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource; + +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.actions.RefreshDataSourcesAction; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions.DataSourceInteractions; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.DataSourceMetadataUpdateService; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.*; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.*; +import com.github.mdelambilly.graphdbplugin.jetbrains.util.FileUtil; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.ActionToolbarPosition; import com.intellij.openapi.application.ApplicationManager; @@ -24,7 +26,7 @@ import com.intellij.ui.content.ContentFactory; import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode; import com.intellij.ui.treeStructure.Tree; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.DataSourcesComponentMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.DataSourcesComponentMetadata; import org.jetbrains.annotations.NotNull; @@ -60,6 +62,14 @@ public class DataSourcesView implements Disposable { public DataSourcesView() { initialized = false; + setupUI(); + } + + private void setupUI() { + dataSourceTree = new Tree(); + treePanel = new JPanel(new GridLayout(0, 1)); + toolWindowContent = new JPanel(new BorderLayout()); + toolWindowContent.add(treePanel, BorderLayout.CENTER); } public void initToolWindow(@NotNull Project project, @NotNull ToolWindow toolWindow) { @@ -109,10 +119,6 @@ public ToolbarDecorator getDecorator() { return decorator; } - private void createUIComponents() { - treePanel = new JPanel(new GridLayout(0, 1)); - } - private void configureDataSourceTree() { dataSourceTree.getEmptyText().setText("Create a data source"); dataSourceTree.setCellRenderer(new GraphColoredTreeCellRenderer(component)); diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/CreateNodeAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/CreateNodeAction.java similarity index 71% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/CreateNodeAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/CreateNodeAction.java index 20c1c549..9b14178a 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/CreateNodeAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/CreateNodeAction.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.actions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.actions; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.database.DiffService; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions.EditEntityDialog; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.database.DiffService; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions.EditEntityDialog; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import org.jetbrains.annotations.NotNull; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceAction.java similarity index 75% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceAction.java index d1113301..b4f2bdc4 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceAction.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.actions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.actions; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.util.FileUtil; -import com.albertoventurini.graphdbplugin.jetbrains.util.Notifier; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.util.FileUtil; +import com.github.mdelambilly.graphdbplugin.jetbrains.util.Notifier; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.Project; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceActionGroup.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceActionGroup.java similarity index 81% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceActionGroup.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceActionGroup.java index e46fac1c..26956231 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceActionGroup.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceActionGroup.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.actions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.actions; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceOpenBrowserAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceOpenBrowserAction.java similarity index 81% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceOpenBrowserAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceOpenBrowserAction.java index 05ef22bc..429812d1 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceOpenBrowserAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/DataSourceOpenBrowserAction.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.actions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.actions; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.Neo4jBoltConfiguration; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.Neo4jBoltConfiguration; import javax.swing.*; import java.awt.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/RefreshDataSourcesAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/RefreshDataSourcesAction.java similarity index 70% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/RefreshDataSourcesAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/RefreshDataSourcesAction.java index aff50532..b53660bb 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/actions/RefreshDataSourcesAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/actions/RefreshDataSourcesAction.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.actions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.actions; import com.intellij.icons.AllIcons; +import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.ui.AnActionButton; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.DataSourcesView; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.DataSourcesView; import org.jetbrains.annotations.NotNull; -public class RefreshDataSourcesAction extends AnActionButton { +public class RefreshDataSourcesAction extends AnAction { private final DataSourcesView dataSourcesView; diff --git a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/DataSourceDialog.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/DataSourceDialog.java new file mode 100644 index 00000000..3462dfa8 --- /dev/null +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/DataSourceDialog.java @@ -0,0 +1,93 @@ +/** + * Copied and adapted from plugin + * Graph Database Support + * by Neueda Technologies, Ltd. + * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 + */ +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions; + +import com.github.mdelambilly.graphdbplugin.database.api.GraphDatabaseApi; +import com.github.mdelambilly.graphdbplugin.database.api.query.GraphQueryResult; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.database.DatabaseManagerService; +import com.github.mdelambilly.graphdbplugin.jetbrains.services.ExecutorService; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.DataSourcesView; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.application.ModalityState; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.ui.DialogWrapper; +import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.ui.ValidationInfo; +import com.intellij.openapi.util.Disposer; +import org.jetbrains.annotations.NotNull; + +import javax.swing.*; + +public abstract class DataSourceDialog extends DialogWrapper { + + protected DataSourceDialog(@NotNull final Project project, DataSourcesView dataSourcesView) { + super(project); + Disposer.register(project, myDisposable); + init(); + } + + public abstract DataSourceApi constructDataSource(); + + protected abstract void showLoading(); + + protected abstract void hideLoading(); + + public boolean go() { + init(); + return showAndGet(); + } + + public void validationPopup() { + ValidationInfo validationInfo = doValidate(); + if (validationInfo != null) { + Messages.showErrorDialog(getContentPanel(), + validationInfo.message, "Test Connection"); + } else { + validateConnection(); + } + } + + private void validateConnection() { + final var executorService = ApplicationManager.getApplication().getService(ExecutorService.class); + showLoading(); + executorService.runInBackground( + this::executeOkQuery, + (status) -> { + hideLoading(); + Messages.showInfoMessage(getContentPanel(), + "Connection successful!", "Test Connection"); + }, + (exception) -> { + hideLoading(); + Messages.showErrorDialog(getContentPanel(), + exception.getMessage(), "Test Connection"); + }, + ModalityState.current() + ); + } + + // TODO: this needs to be moved in the DataSourceDialog implementation. + // Right now, it assumes that the data source will understand a query such as "RETURN 'ok'" + // which might not be true for data sources different than neo4j. + private String executeOkQuery() { + DataSourceApi dataSource = constructDataSource(); + DatabaseManagerService databaseManager = + ApplicationManager.getApplication().getService(DatabaseManagerService.class); + GraphDatabaseApi db = databaseManager.getDatabaseFor(dataSource); + GraphQueryResult result = db.execute("RETURN 'ok'"); + + Object value = result.getRows().get(0).getValue(result.getColumns().get(0)); + + if (value.equals("ok")) { + return "ok"; + } else { + throw new RuntimeException("Unexpected test query output: " + value); + } + } +} \ No newline at end of file diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/DataSourceInteractions.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/DataSourceInteractions.java similarity index 87% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/DataSourceInteractions.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/DataSourceInteractions.java index 68db9bb2..4d40abb2 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/DataSourceInteractions.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/DataSourceInteractions.java @@ -3,23 +3,24 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions.neo4j.bolt.Neo4jBoltDataSourceDialog; -import com.albertoventurini.graphdbplugin.jetbrains.util.FileUtil; -import com.albertoventurini.graphdbplugin.jetbrains.util.Notifier; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions.neo4j.bolt.Neo4jBoltDataSourceDialog; +import com.github.mdelambilly.graphdbplugin.jetbrains.util.FileUtil; +import com.github.mdelambilly.graphdbplugin.jetbrains.util.Notifier; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListPopup; import com.intellij.ui.ToolbarDecorator; import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode; import com.intellij.ui.treeStructure.Tree; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.DataSourcesView; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jTreeNodeType; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.DataSourcesView; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jTreeNodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; import org.jetbrains.annotations.NotNull; import javax.swing.tree.DefaultMutableTreeNode; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/EditEntityDialog.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/EditEntityDialog.java similarity index 73% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/EditEntityDialog.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/EditEntityDialog.java index e73d565f..04bcad49 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/EditEntityDialog.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/EditEntityDialog.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -13,9 +14,9 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Disposer; -import com.albertoventurini.graphdbplugin.database.api.data.GraphEntity; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphPropertyContainer; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphEntity; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphPropertyContainer; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -55,6 +56,8 @@ public EditEntityDialog(Project project, GraphEntity node) { boolean isCreateMode = node == null; boolean isNodeEdit = isCreateMode || node instanceof GraphNode; + setupUI(); + Disposer.register(project, myDisposable); init(); @@ -102,6 +105,86 @@ public void mouseClicked(MouseEvent e) { }); } + private void setupUI() { + // Main container — 3 rows: nodeLabel, labelsPanel, propertiesSection + container = new JPanel(new GridBagLayout()); + container.setMinimumSize(new Dimension(400, 300)); + container.setPreferredSize(new Dimension(600, 400)); + + GridBagConstraints gbc = new GridBagConstraints(); + gbc.gridx = 0; + gbc.fill = GridBagConstraints.HORIZONTAL; + gbc.weightx = 1.0; + gbc.insets = new Insets(0, 0, 0, 0); + + // Row 0: nodeLabel + nodeLabel = new JLabel("Node [id]"); + gbc.gridy = 0; + gbc.weighty = 0.0; + container.add(nodeLabel, gbc); + + // Row 1: labelsPanel (Labels header + scrollable labelContainer) + labelsPanel = buildSectionPanel("Labels", true); + gbc.gridy = 1; + gbc.fill = GridBagConstraints.BOTH; + gbc.weighty = 1.0; + container.add(labelsPanel, gbc); + + // Row 2: propertiesSection (Properties header + scrollable propertyContainer) + JPanel propertiesSection = buildSectionPanel("Properties", false); + gbc.gridy = 2; + container.add(propertiesSection, gbc); + } + + /** + * Builds a section panel with a header row (title label + add label) and a scrollable content panel. + * @param title section title + * @param isLabels true → assigns labelsPanel fields; false → assigns propertiesSection fields + */ + private JPanel buildSectionPanel(String title, boolean isLabels) { + JPanel section = new JPanel(new GridBagLayout()); + + JPanel contentPanel = new JPanel(); + contentPanel.setOpaque(!isLabels); // labelContainer is opaque=false in original form + contentPanel.setMaximumSize(new Dimension(Integer.MAX_VALUE, 200)); + + JLabel addIconLabel = new JLabel(""); + + if (isLabels) { + labelContainer = contentPanel; + addLabel = addIconLabel; + } else { + propertyContainer = contentPanel; + addProperty = addIconLabel; + } + + GridBagConstraints c = new GridBagConstraints(); + c.fill = GridBagConstraints.HORIZONTAL; + c.weightx = 1.0; + c.weighty = 0.0; + c.insets = new Insets(0, 0, 0, 0); + + // Header row: title label (col 0) + add icon label (col 1) + c.gridy = 0; + c.gridx = 0; + section.add(new JLabel(title), c); + c.gridx = 1; + section.add(addIconLabel, c); + + // Scrollable content row + JScrollPane scrollPane = new JScrollPane(contentPanel); + scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + scrollPane.setPreferredSize(new Dimension(-1, 200)); + c.gridy = 1; + c.gridx = 0; + c.gridwidth = 2; + c.fill = GridBagConstraints.BOTH; + c.weighty = 1.0; + section.add(scrollPane, c); + + return section; + } + private void setTitle(boolean isCreateNode, boolean isEditNode) { if (isCreateNode) { setTitle("Create New Node"); diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/GraphDbEditorsConsoleRootType.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/GraphDbEditorsConsoleRootType.java similarity index 79% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/GraphDbEditorsConsoleRootType.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/GraphDbEditorsConsoleRootType.java index 12bee54f..8fc5d8a1 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/GraphDbEditorsConsoleRootType.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/GraphDbEditorsConsoleRootType.java @@ -3,17 +3,18 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions; import java.util.Optional; import javax.swing.*; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceDescription; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.util.NameUtil; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceDescription; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.util.NameUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/NewDataSourceAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/NewDataSourceAction.java similarity index 83% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/NewDataSourceAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/NewDataSourceAction.java index 6ba25a23..ac51f300 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/NewDataSourceAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/NewDataSourceAction.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.DataSourcesView; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.DataSourcesView; import org.jetbrains.annotations.NotNull; import javax.swing.Icon; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/NewDataSourceActionGroup.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/NewDataSourceActionGroup.java similarity index 78% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/NewDataSourceActionGroup.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/NewDataSourceActionGroup.java index 21a0609d..70f22862 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/NewDataSourceActionGroup.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/NewDataSourceActionGroup.java @@ -3,15 +3,16 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions.neo4j.bolt.Neo4jBoltDataSourceDialog; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions.neo4j.bolt.Neo4jBoltDataSourceDialog; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.Project; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.DataSourcesView; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.DataSourcesView; import icons.GraphIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/NotImplementedDataSourceAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/NotImplementedDataSourceAction.java similarity index 85% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/NotImplementedDataSourceAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/NotImplementedDataSourceAction.java index 9e266ab9..d544b1fe 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/interactions/NotImplementedDataSourceAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/NotImplementedDataSourceAction.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; diff --git a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/neo4j/bolt/Neo4jBoltDataSourceDialog.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/neo4j/bolt/Neo4jBoltDataSourceDialog.java new file mode 100644 index 00000000..12cc4870 --- /dev/null +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/interactions/neo4j/bolt/Neo4jBoltDataSourceDialog.java @@ -0,0 +1,404 @@ +/** + * Copied and adapted from plugin + * Graph Database Support + * by Neueda Technologies, Ltd. + * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 + */ +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions.neo4j.bolt; + +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.ui.ValidationInfo; +import com.intellij.ui.components.JBPasswordField; +import com.intellij.ui.components.JBTextField; +import com.intellij.util.ui.AsyncProcessIcon; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.Neo4jBoltConfiguration; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.DataSourcesView; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions.DataSourceDialog; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import com.intellij.ui.components.JBTabbedPane; + +import javax.swing.*; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.util.HashMap; +import java.util.Map; + +import static com.github.mdelambilly.graphdbplugin.jetbrains.util.Validation.*; + +public class Neo4jBoltDataSourceDialog extends DataSourceDialog { + private final DataSourcesComponent dataSourcesComponent; + private DataSourceApi dataSourceToEdit; + + private JBTextField dataSourceNameField; + private JComboBox protocolComboBox; + private JBTextField hostField; + private JBTextField portField; + private JBTextField userField; + private JBTextField databaseField; + private JBPasswordField passwordField; + private JButton testConnectionButton; + private JPanel loadingPanel; + private AsyncProcessIcon loadingIcon; + private JComboBox authTypeComboBox; + private JScrollPane scrollPane; + private JTextArea auraCredentialsArea; + private JBTabbedPane tabs; + + public Neo4jBoltDataSourceDialog( + @NotNull final Project project, + @NotNull final DataSourcesView dataSourcesView, + @NotNull final DataSourceApi dataSourceToEdit) { + this(project, dataSourcesView); + this.dataSourceToEdit = dataSourceToEdit; + } + + public Neo4jBoltDataSourceDialog( + @NotNull final Project project, + @NotNull final DataSourcesView dataSourcesView) { + super(project, dataSourcesView); + loadingPanel.setVisible(false); + dataSourcesComponent = dataSourcesView.getComponent(); + testConnectionButton.addActionListener(e -> validationPopup()); + authTypeComboBox.addActionListener(this::handleAuthTypeChanged); + setupHostProtocolStripper(); + } + + @Nullable + @Override + protected ValidationInfo doValidate() { + if (StringUtils.isBlank(dataSourceNameField.getText())) { + return validation("Data source name must not be empty", dataSourceNameField); + } + if (StringUtils.isBlank(hostField.getText())) { + return validation("Host must not be empty", hostField); + } + if (!StringUtils.isNumeric(portField.getText())) { + return validation("Port must be numeric", portField); + } + + final var data = extractData(); + + if (dataSourcesComponent.getDataSourceContainer().isDataSourceExists(data.dataSourceName)) { + if (!(dataSourceToEdit != null && dataSourceToEdit.getName().equals(data.dataSourceName))) { + return validation(String.format("Data source [%s] already exists", data.dataSourceName), dataSourceNameField); + } + } + + return null; + } + + @Nullable + @Override + protected JComponent createCenterPanel() { + if (scrollPane == null) { + setupUI(); + } + if (dataSourceToEdit != null) { + Map conf = dataSourceToEdit.getConfiguration(); + String protocol = conf.get(Neo4jBoltConfiguration.PROTOCOL); + String host = conf.get(Neo4jBoltConfiguration.HOST); + String port = conf.get(Neo4jBoltConfiguration.PORT); + String authType = conf.get(Neo4jBoltConfiguration.AUTH_TYPE); + String database = conf.get(Neo4jBoltConfiguration.DATABASE); + String user = conf.get(Neo4jBoltConfiguration.USER); + String password = conf.get(Neo4jBoltConfiguration.PASSWORD); + + dataSourceNameField.setText(dataSourceToEdit.getName()); + + for (int i = 0; i < protocolComboBox.getItemCount(); i++) { + if (protocolComboBox.getItemAt(i).equals(protocol)) { + protocolComboBox.setSelectedIndex(i); + break; + } + } + + for (int i = 0; i < authTypeComboBox.getItemCount(); i++) { + if (authTypeComboBox.getItemAt(i).equals(authType)) { + authTypeComboBox.setSelectedIndex(i); + break; + } + } + + hostField.setText(host); + portField.setText(port); + databaseField.setText(database); + userField.setText(user); + passwordField.setText(password); + } + return scrollPane; + } + + private void setupUI() { + dataSourceNameField = new JBTextField(); + protocolComboBox = new JComboBox<>(new String[]{"bolt", "bolt+s", "bolt+ssc", "neo4j", "neo4j+s", "neo4j+ssc"}); + protocolComboBox.setMaximumRowCount(6); + hostField = new JBTextField("localhost"); + portField = new JBTextField("7687"); + databaseField = new JBTextField(); + authTypeComboBox = new JComboBox<>(new String[]{"User & Password", "No auth"}); + userField = new JBTextField(); + passwordField = new JBPasswordField(); + testConnectionButton = new JButton("Test connection"); + loadingIcon = new AsyncProcessIcon("validateConnectionIcon"); + loadingPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 4, 0)); + loadingPanel.add(loadingIcon); + + Insets labelInsets = new Insets(4, 4, 4, 8); + Insets fieldInsets = new Insets(4, 0, 4, 4); + + // --- Name row --- + JPanel nameRow = new JPanel(new GridBagLayout()); + addLabelAndField(nameRow, "Name", dataSourceNameField, 0, labelInsets, fieldInsets); + + // --- General tab panel (8 rows) --- + JPanel generalPanel = new JPanel(new GridBagLayout()); + generalPanel.setBorder(BorderFactory.createEmptyBorder(8, 0, 0, 0)); + addLabelAndField(generalPanel, "Protocol", protocolComboBox, 0, labelInsets, fieldInsets); + addLabelAndField(generalPanel, "Host", hostField, 1, labelInsets, fieldInsets); + addLabelAndField(generalPanel, "Port", portField, 2, labelInsets, fieldInsets); + addLabelAndField(generalPanel, "Database", databaseField, 3, labelInsets, fieldInsets); + addLabelAndField(generalPanel, "Authentication", authTypeComboBox, 4, labelInsets, fieldInsets); + addLabelAndField(generalPanel, "User", userField, 5, labelInsets, fieldInsets); + addLabelAndField(generalPanel, "Password", passwordField, 6, labelInsets, fieldInsets); + + GridBagConstraints bc = new GridBagConstraints(); + bc.gridy = 7; bc.gridx = 1; + bc.fill = GridBagConstraints.NONE; bc.anchor = GridBagConstraints.WEST; + bc.insets = new Insets(4, 0, 4, 4); + generalPanel.add(testConnectionButton, bc); + bc.gridx = 2; + generalPanel.add(loadingPanel, bc); + + // vertical filler + GridBagConstraints filler = new GridBagConstraints(); + filler.gridy = 8; filler.gridx = 0; filler.weighty = 1.0; + filler.fill = GridBagConstraints.VERTICAL; + generalPanel.add(Box.createVerticalGlue(), filler); + + // --- AuraDB tab --- + auraCredentialsArea = new JTextArea(); + auraCredentialsArea.setRows(8); + auraCredentialsArea.setLineWrap(true); + auraCredentialsArea.setToolTipText("Paste the credentials file provided by Neo4j AuraDB"); + JScrollPane auraScroll = new JScrollPane(auraCredentialsArea); + + JButton fillButton = new JButton("Fill from credentials"); + fillButton.addActionListener(e -> fillFromAuraCredentials()); + + JLabel auraHint = new JLabel("Paste the credentials file provided by AuraDB
and click \"Fill from credentials\"."); + + JPanel auraPanel = new JPanel(new GridBagLayout()); + GridBagConstraints ac = new GridBagConstraints(); + ac.gridx = 0; ac.gridy = 0; ac.weightx = 1.0; ac.fill = GridBagConstraints.HORIZONTAL; + ac.insets = new Insets(8, 8, 4, 8); + auraPanel.add(auraHint, ac); + ac.gridy = 1; ac.weighty = 1.0; ac.fill = GridBagConstraints.BOTH; + ac.insets = new Insets(0, 8, 4, 8); + auraPanel.add(auraScroll, ac); + ac.gridy = 2; ac.weighty = 0.0; ac.fill = GridBagConstraints.NONE; + ac.anchor = GridBagConstraints.EAST; + ac.insets = new Insets(0, 8, 8, 8); + auraPanel.add(fillButton, ac); + + tabs = new JBTabbedPane(); + tabs.addTab("General", generalPanel); + tabs.addTab("AuraDB", auraPanel); + + // --- Content panel (inside scroll pane) --- + JPanel content = new JPanel(new GridBagLayout()); + content.setMinimumSize(new Dimension(400, 380)); + content.setPreferredSize(new Dimension(600, 460)); + + GridBagConstraints cc = new GridBagConstraints(); + cc.gridx = 0; cc.weightx = 1.0; + cc.gridy = 0; cc.weighty = 0.0; cc.fill = GridBagConstraints.HORIZONTAL; + content.add(nameRow, cc); + cc.gridy = 1; cc.weighty = 1.0; cc.fill = GridBagConstraints.BOTH; + content.add(tabs, cc); + + scrollPane = new JScrollPane(content); + scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); + } + + private void addLabelAndField(JPanel panel, String label, JComponent field, + int row, Insets labelInsets, Insets fieldInsets) { + GridBagConstraints lc = new GridBagConstraints(); + lc.gridy = row; lc.gridx = 0; + lc.fill = GridBagConstraints.NONE; lc.anchor = GridBagConstraints.WEST; + lc.insets = labelInsets; + panel.add(new JLabel(label), lc); + + GridBagConstraints fc = new GridBagConstraints(); + fc.gridy = row; fc.gridx = 1; fc.gridwidth = 2; + fc.fill = GridBagConstraints.HORIZONTAL; fc.weightx = 1.0; + fc.insets = fieldInsets; + panel.add(field, fc); + } + + private void setupHostProtocolStripper() { + hostField.getDocument().addDocumentListener(new DocumentListener() { + private boolean updating = false; + + private void stripProtocol() { + if (updating) return; + String text = hostField.getText(); + for (int i = 0; i < protocolComboBox.getItemCount(); i++) { + String scheme = protocolComboBox.getItemAt(i) + "://"; + if (text.startsWith(scheme)) { + updating = true; + final int idx = i; + SwingUtilities.invokeLater(() -> { + hostField.setText(text.substring(scheme.length())); + protocolComboBox.setSelectedIndex(idx); + updating = false; + }); + break; + } + } + } + + @Override public void insertUpdate(DocumentEvent e) { stripProtocol(); } + @Override public void removeUpdate(DocumentEvent e) {} + @Override public void changedUpdate(DocumentEvent e) {} + }); + } + + private void handleAuthTypeChanged(final ActionEvent e) { + final boolean authFieldsEnabled = + !authTypeComboBox.getItemAt(authTypeComboBox.getSelectedIndex()).equals("No auth"); + + userField.setEnabled(authFieldsEnabled); + passwordField.setEnabled(authFieldsEnabled); + + if (!authFieldsEnabled) { + userField.setText(""); + passwordField.setText(""); + } + } + + @Override + public DataSourceApi constructDataSource() { + final var data = extractData(); + + Map configuration = new HashMap<>(); + configuration.put(Neo4jBoltConfiguration.PROTOCOL, data.protocol); + configuration.put(Neo4jBoltConfiguration.AUTH_TYPE, data.authType); + configuration.put(Neo4jBoltConfiguration.HOST, data.host); + configuration.put(Neo4jBoltConfiguration.PORT, data.port); + configuration.put(Neo4jBoltConfiguration.USER, data.user); + configuration.put(Neo4jBoltConfiguration.PASSWORD, data.password); + configuration.put(Neo4jBoltConfiguration.DATABASE, data.database); + + return dataSourcesComponent.getDataSourceContainer().createDataSource( + dataSourceToEdit, + DataSourceType.NEO4J_BOLT, + data.dataSourceName, + configuration + ); + } + + @Override + protected void showLoading() { + testConnectionButton.setEnabled(false); + loadingIcon.resume(); + loadingPanel.setVisible(true); + } + + @Override + protected void hideLoading() { + testConnectionButton.setEnabled(true); + loadingIcon.suspend(); + loadingPanel.setVisible(false); + } + + private void fillFromAuraCredentials() { + String text = auraCredentialsArea.getText(); + String uri = null, username = null, password = null, database = null, instanceName = null; + + for (String line : text.lines().toList()) { + line = line.trim(); + if (line.startsWith("#") || line.isEmpty()) continue; + int eq = line.indexOf('='); + if (eq < 0) continue; + String key = line.substring(0, eq).trim(); + String value = line.substring(eq + 1).trim(); + switch (key) { + case "NEO4J_URI" -> uri = value; + case "NEO4J_USERNAME" -> username = value; + case "NEO4J_PASSWORD" -> password = value; + case "NEO4J_DATABASE" -> database = value; + case "AURA_INSTANCENAME" -> instanceName = value; + } + } + + if (uri != null) { + int schemeSep = uri.indexOf("://"); + if (schemeSep >= 0) { + String scheme = uri.substring(0, schemeSep); + String host = uri.substring(schemeSep + 3); + for (int i = 0; i < protocolComboBox.getItemCount(); i++) { + if (protocolComboBox.getItemAt(i).equals(scheme)) { + protocolComboBox.setSelectedIndex(i); + break; + } + } + hostField.setText(host); + } + } + if (username != null) userField.setText(username); + if (password != null) passwordField.setText(password); + if (database != null) databaseField.setText(database); + if (dataSourceNameField.getText().isBlank() && instanceName != null) { + dataSourceNameField.setText(instanceName); + } + // AuraDB uses port 7687 by default + portField.setText("7687"); + // Switch back to General tab to let the user review + tabs.setSelectedIndex(0); + } + + private Data extractData() { + return new Data( + dataSourceNameField.getText(), + protocolComboBox.getItemAt(protocolComboBox.getSelectedIndex()), + hostField.getText().trim(), + portField.getText(), + authTypeComboBox.getItemAt(authTypeComboBox.getSelectedIndex()), + databaseField.getText(), + userField.getText(), + String.valueOf(passwordField.getPassword()) // TODO: use password API? + ); + } + + private static final class Data { + + private final String dataSourceName; + private final String protocol; + private final String host; + private final String port; + private final String authType; + private final String database; + private final String user; + private final String password; + + public Data(String dataSourceName, String protocol, String host, String port, String authType, String database, String user, String password) { + this.dataSourceName = dataSourceName; + this.protocol = protocol; + this.host = host; + this.port = port; + this.authType = authType; + this.database = database; + this.user = user; + this.password = password; + } + } +} diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceMetadataUpdateService.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceMetadataUpdateService.java similarity index 86% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceMetadataUpdateService.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceMetadataUpdateService.java index e0a45427..8671ccff 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceMetadataUpdateService.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceMetadataUpdateService.java @@ -3,15 +3,16 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.openapi.components.Service; import com.intellij.openapi.project.Project; import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.DataSourcesComponentMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.DataSourcesComponentMetadata; import org.jetbrains.annotations.NotNull; import java.util.concurrent.CompletableFuture; @@ -27,7 +28,7 @@ *
* If none of the handlers can handle the data source type, then this service does nothing. */ -@Service +@Service(Service.Level.PROJECT) public final class DataSourceMetadataUpdateService { private final DataSourcesComponentMetadata dataSourcesComponent; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceTreeUpdater.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceTreeUpdater.java similarity index 72% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceTreeUpdater.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceTreeUpdater.java index 710ded1b..98ad8039 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceTreeUpdater.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceTreeUpdater.java @@ -1,6 +1,6 @@ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.DataSourceMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.DataSourceMetadata; import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode; /** diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceTreeUpdaters.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceTreeUpdaters.java similarity index 74% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceTreeUpdaters.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceTreeUpdaters.java index 52cb8e57..d445635d 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceTreeUpdaters.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceTreeUpdaters.java @@ -1,6 +1,6 @@ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; import com.intellij.openapi.components.Service; import java.util.Map; @@ -9,7 +9,7 @@ /** * Maintains a collection of known {@link DataSourceTreeUpdater} objects. */ -@Service +@Service(Service.Level.PROJECT) final class DataSourceTreeUpdaters { private final Map handlers; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/MetadataRetrieveEvent.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/MetadataRetrieveEvent.java similarity index 70% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/MetadataRetrieveEvent.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/MetadataRetrieveEvent.java index 1d5b2599..88ce59f4 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/MetadataRetrieveEvent.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/MetadataRetrieveEvent.java @@ -3,12 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.util.messages.Topic; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.DataSourceMetadata; public interface MetadataRetrieveEvent { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/Neo4jBoltTreeUpdater.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/Neo4jBoltTreeUpdater.java similarity index 90% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/Neo4jBoltTreeUpdater.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/Neo4jBoltTreeUpdater.java index bd573296..13478575 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/Neo4jBoltTreeUpdater.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/Neo4jBoltTreeUpdater.java @@ -1,12 +1,13 @@ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata; - -import com.albertoventurini.graphdbplugin.database.api.data.GraphDatabaseVersion; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.*; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.LabelTreeNodeModel; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.MetadataTreeNodeModel; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.RelationshipTypeTreeNodeModel; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata; + +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphDatabaseVersion; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.*; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.*; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.LabelTreeNodeModel; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.MetadataTreeNodeModel; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.RelationshipTypeTreeNodeModel; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode; import icons.GraphIcons; import org.jetbrains.annotations.NotNull; @@ -14,7 +15,7 @@ import javax.swing.tree.MutableTreeNode; import java.util.List; -import static com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.*; +import static com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.*; /** * Updates the data source tree for Neo4j data source metadata. diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataAction.java similarity index 72% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataAction.java index 292553bc..81749eda 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataAction.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.actions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.actions; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.ExecuteQueryEvent; -import com.albertoventurini.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.actions.execute.ExecuteQueryPayload; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.application.ApplicationManager; @@ -17,13 +18,13 @@ import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.util.messages.MessageBus; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.ConsoleToolWindow; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.event.OpenTabEvent; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.ConsoleToolWindow; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.event.OpenTabEvent; import javax.swing.*; import java.util.Optional; -import static com.albertoventurini.graphdbplugin.platform.GraphConstants.ToolWindow.*; +import static com.github.mdelambilly.graphdbplugin.platform.GraphConstants.ToolWindow.*; public abstract class MetadataAction extends AnAction { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataActionGroup.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataActionGroup.java similarity index 85% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataActionGroup.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataActionGroup.java index 357a8584..6bb9faf6 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataActionGroup.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataActionGroup.java @@ -3,14 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.actions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.actions; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jTreeNodeType; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jTreeNodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelAction.java similarity index 83% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelAction.java index 635969a9..b27b8d8f 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelAction.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.actions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.actions; import javax.swing.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelFromAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelFromAction.java similarity index 84% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelFromAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelFromAction.java index d145f453..923c1459 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelFromAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelFromAction.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.actions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.actions; import javax.swing.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelToAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelToAction.java similarity index 84% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelToAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelToAction.java index 12898036..9d76cc45 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelToAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataLabelToAction.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.actions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.actions; import javax.swing.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataPropertyKeyAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataPropertyKeyAction.java similarity index 87% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataPropertyKeyAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataPropertyKeyAction.java index 928ff78c..5d07a2fa 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataPropertyKeyAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataPropertyKeyAction.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.actions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.actions; import javax.swing.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataRelationshipAction.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataRelationshipAction.java similarity index 84% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataRelationshipAction.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataRelationshipAction.java index 066da6fc..f218d83a 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataRelationshipAction.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/actions/MetadataRelationshipAction.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.actions; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.actions; import javax.swing.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/dto/ContextMenu.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/dto/ContextMenu.java similarity index 74% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/dto/ContextMenu.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/dto/ContextMenu.java index 0248d48a..036a22f1 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/dto/ContextMenu.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/dto/ContextMenu.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto; import com.intellij.openapi.actionSystem.DataContext; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/dto/DataSourceContextMenu.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/dto/DataSourceContextMenu.java similarity index 76% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/dto/DataSourceContextMenu.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/dto/DataSourceContextMenu.java index a86e05cf..a1a0c4b3 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/dto/DataSourceContextMenu.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/dto/DataSourceContextMenu.java @@ -3,14 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListPopup; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.actions.DataSourceActionGroup; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.actions.DataSourceActionGroup; public class DataSourceContextMenu implements ContextMenu { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/dto/MetadataContextMenu.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/dto/MetadataContextMenu.java similarity index 77% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/dto/MetadataContextMenu.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/dto/MetadataContextMenu.java index b87a24f2..40b19168 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/dto/MetadataContextMenu.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/dto/MetadataContextMenu.java @@ -3,15 +3,16 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.actions.MetadataActionGroup; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.actions.MetadataActionGroup; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListPopup; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; public class MetadataContextMenu implements ContextMenu { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/ContextMenuService.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/ContextMenuService.java similarity index 83% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/ContextMenuService.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/ContextMenuService.java index 502f40b5..9c438c69 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/ContextMenuService.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/ContextMenuService.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode; import javax.swing.tree.TreeNode; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/DataSourceTreeNodeModel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/DataSourceTreeNodeModel.java similarity index 75% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/DataSourceTreeNodeModel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/DataSourceTreeNodeModel.java index 0ed852c7..542a486e 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/DataSourceTreeNodeModel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/DataSourceTreeNodeModel.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto.DataSourceContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto.DataSourceContextMenu; import javax.swing.*; import java.util.Optional; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/GraphColoredTreeCellRenderer.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/GraphColoredTreeCellRenderer.java similarity index 81% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/GraphColoredTreeCellRenderer.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/GraphColoredTreeCellRenderer.java index 6e7d6908..a7af4385 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/GraphColoredTreeCellRenderer.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/GraphColoredTreeCellRenderer.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.dto.ValueWithIcon; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.dto.ValueWithIcon; import com.intellij.ui.ColoredTreeCellRenderer; import com.intellij.ui.SimpleTextAttributes; import org.jetbrains.annotations.NotNull; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/LabelTreeNodeModel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/LabelTreeNodeModel.java similarity index 77% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/LabelTreeNodeModel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/LabelTreeNodeModel.java index 528c2696..a8434acc 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/LabelTreeNodeModel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/LabelTreeNodeModel.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import java.util.Optional; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/MetadataTreeNodeModel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/MetadataTreeNodeModel.java similarity index 83% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/MetadataTreeNodeModel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/MetadataTreeNodeModel.java index 6e2c185c..a92cb40c 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/MetadataTreeNodeModel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/MetadataTreeNodeModel.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto.MetadataContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto.MetadataContextMenu; import javax.swing.*; import java.util.Optional; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/Neo4jEntityViewNodeType.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/Neo4jEntityViewNodeType.java similarity index 83% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/Neo4jEntityViewNodeType.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/Neo4jEntityViewNodeType.java index 169fa70e..56483212 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/Neo4jEntityViewNodeType.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/Neo4jEntityViewNodeType.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree; public enum Neo4jEntityViewNodeType implements NodeType { NODE, diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/Neo4jTreeNodeType.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/Neo4jTreeNodeType.java similarity index 83% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/Neo4jTreeNodeType.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/Neo4jTreeNodeType.java index 5beff0ee..4cc7dff4 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/Neo4jTreeNodeType.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/Neo4jTreeNodeType.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree; public enum Neo4jTreeNodeType implements NodeType { ROOT, diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/NodeType.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/NodeType.java similarity index 68% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/NodeType.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/NodeType.java index adc86e89..4462a812 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/NodeType.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/NodeType.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree; public interface NodeType { } diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/RelationshipTypeTreeNodeModel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/RelationshipTypeTreeNodeModel.java similarity index 78% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/RelationshipTypeTreeNodeModel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/RelationshipTypeTreeNodeModel.java index d0cdfa5e..28169457 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/RelationshipTypeTreeNodeModel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/RelationshipTypeTreeNodeModel.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import java.util.Optional; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/RootTreeNodeModel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/RootTreeNodeModel.java similarity index 75% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/RootTreeNodeModel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/RootTreeNodeModel.java index 024b9dfd..41b4184c 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/RootTreeNodeModel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/RootTreeNodeModel.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; import javax.swing.*; import java.util.Optional; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/TableContextMenuMouseAdapter.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/TableContextMenuMouseAdapter.java similarity index 87% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/TableContextMenuMouseAdapter.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/TableContextMenuMouseAdapter.java index f494a895..865f69c9 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/TableContextMenuMouseAdapter.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/TableContextMenuMouseAdapter.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.model.ObjectModel; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.model.ObjectModel; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.ui.table.JBTable; @@ -18,7 +19,7 @@ import java.awt.event.MouseEvent; import java.util.Optional; -import static com.albertoventurini.graphdbplugin.jetbrains.ui.helpers.UiHelper.cast; +import static com.github.mdelambilly.graphdbplugin.jetbrains.ui.helpers.UiHelper.cast; public class TableContextMenuMouseAdapter extends MouseAdapter { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/TreeMouseAdapter.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/TreeMouseAdapter.java similarity index 88% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/TreeMouseAdapter.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/TreeMouseAdapter.java index 3433420b..3f16527e 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/TreeMouseAdapter.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/TreeMouseAdapter.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.DataContext; @@ -18,7 +19,7 @@ import java.awt.event.MouseEvent; import java.util.Optional; -import static com.albertoventurini.graphdbplugin.jetbrains.ui.helpers.UiHelper.cast; +import static com.github.mdelambilly.graphdbplugin.jetbrains.ui.helpers.UiHelper.cast; public class TreeMouseAdapter extends MouseAdapter { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/TreeNodeModelApi.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/TreeNodeModelApi.java similarity index 75% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/TreeNodeModelApi.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/TreeNodeModelApi.java index 99d8d9f8..a64fb156 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/TreeNodeModelApi.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/TreeNodeModelApi.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; import org.jetbrains.annotations.Nullable; import javax.swing.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/dto/ValueWithIcon.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/dto/ValueWithIcon.java similarity index 82% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/dto/ValueWithIcon.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/dto/ValueWithIcon.java index d7dc8865..485c0f19 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/dto/ValueWithIcon.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/dto/ValueWithIcon.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.dto; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.dto; import javax.swing.Icon; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/LabelsModel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/LabelsModel.java similarity index 69% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/LabelsModel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/LabelsModel.java index b868f05b..9106ca1b 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/LabelsModel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/LabelsModel.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.model; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.model; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jEntityViewNodeType; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jEntityViewNodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; import java.util.Optional; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/ListModel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/ListModel.java similarity index 69% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/ListModel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/ListModel.java index a63cfc0b..d51ae672 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/ListModel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/ListModel.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.model; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.model; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jEntityViewNodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jEntityViewNodeType; import org.jetbrains.annotations.Nullable; import java.util.Optional; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/MapModel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/MapModel.java similarity index 69% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/MapModel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/MapModel.java index 5e0b13a8..bf67b2b3 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/MapModel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/MapModel.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.model; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.model; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jEntityViewNodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jEntityViewNodeType; import org.jetbrains.annotations.Nullable; import java.util.Optional; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/NodeModel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/NodeModel.java similarity index 67% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/NodeModel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/NodeModel.java index d51c8a68..19d8c741 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/NodeModel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/NodeModel.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.model; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.model; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.graph.EntityContextMenu; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jEntityViewNodeType; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.graph.EntityContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jEntityViewNodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; import org.jetbrains.annotations.Nullable; import javax.swing.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/ObjectModel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/ObjectModel.java similarity index 74% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/ObjectModel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/ObjectModel.java index 836726fa..9acd5628 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/ObjectModel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/ObjectModel.java @@ -3,14 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.model; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.model; -import com.albertoventurini.graphdbplugin.database.api.data.NoIdGraphEntity; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jEntityViewNodeType; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; -import org.apache.commons.lang.StringUtils; +import com.github.mdelambilly.graphdbplugin.database.api.data.NoIdGraphEntity; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jEntityViewNodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; +import org.apache.commons.lang3.StringUtils; import javax.swing.*; import java.util.Optional; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/PropertiesModel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/PropertiesModel.java similarity index 70% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/PropertiesModel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/PropertiesModel.java index 76815260..2a780089 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/PropertiesModel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/PropertiesModel.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.model; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.model; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jEntityViewNodeType; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jEntityViewNodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; import java.util.Optional; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/RelationshipModel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/RelationshipModel.java similarity index 68% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/RelationshipModel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/RelationshipModel.java index fd12fc90..ce06d9f6 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/RelationshipModel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/RelationshipModel.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.model; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.model; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.graph.EntityContextMenu; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jEntityViewNodeType; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.graph.EntityContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.Neo4jEntityViewNodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.NodeType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; import org.jetbrains.annotations.Nullable; import javax.swing.*; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/RootObjectAwareModel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/RootObjectAwareModel.java similarity index 68% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/RootObjectAwareModel.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/RootObjectAwareModel.java index ff62f4d1..f1dbc8bd 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/tree/model/RootObjectAwareModel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/tree/model/RootObjectAwareModel.java @@ -3,14 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.model; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.model; -import com.albertoventurini.graphdbplugin.database.api.data.NoIdGraphEntity; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.graph.EntityContextMenu; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; +import com.github.mdelambilly.graphdbplugin.database.api.data.NoIdGraphEntity; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto.ContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.graph.EntityContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; import org.jetbrains.annotations.Nullable; import java.util.Optional; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/helpers/KeyValuePair.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/helpers/KeyValuePair.java similarity index 89% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/helpers/KeyValuePair.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/helpers/KeyValuePair.java index 75293510..1be8864a 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/helpers/KeyValuePair.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/helpers/KeyValuePair.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.helpers; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.helpers; public class KeyValuePair { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/helpers/SerialisationHelper.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/helpers/SerialisationHelper.java similarity index 93% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/helpers/SerialisationHelper.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/helpers/SerialisationHelper.java index fb10dc6f..7445c52a 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/helpers/SerialisationHelper.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/helpers/SerialisationHelper.java @@ -3,19 +3,21 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.helpers; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.helpers; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.model.*; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.model.*; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.model.*; import com.intellij.ui.treeStructure.Tree; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltNode; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltPath; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltRelationship; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltNode; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltPath; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data.Neo4jBoltRelationship; import javax.swing.*; import javax.swing.table.TableModel; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/helpers/UiHelper.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/helpers/UiHelper.java similarity index 91% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/helpers/UiHelper.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/helpers/UiHelper.java index d02cec8f..c91d3d43 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/helpers/UiHelper.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/helpers/UiHelper.java @@ -3,17 +3,19 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.helpers; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.helpers; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.model.*; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.model.*; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.model.*; import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphEntity; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphPath; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphEntity; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphPath; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; import java.util.List; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/renderes/tree/PropertyTreeCellRenderer.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/renderes/tree/PropertyTreeCellRenderer.java similarity index 88% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/renderes/tree/PropertyTreeCellRenderer.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/renderes/tree/PropertyTreeCellRenderer.java index b2cefae5..271ea6cd 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/ui/renderes/tree/PropertyTreeCellRenderer.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/renderes/tree/PropertyTreeCellRenderer.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.renderes.tree; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.renderes.tree; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.TreeNodeModelApi; import com.intellij.ui.ColoredTreeCellRenderer; import com.intellij.ui.SimpleTextAttributes; import com.intellij.ui.components.labels.LinkLabel; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/FileUtil.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/FileUtil.java similarity index 88% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/FileUtil.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/FileUtil.java index 70659670..3f8098a2 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/FileUtil.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/FileUtil.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.util; +package com.github.mdelambilly.graphdbplugin.jetbrains.util; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.ide.scratch.ScratchFileService; import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.fileEditor.FileEditorManager; @@ -17,8 +18,8 @@ import com.intellij.openapi.vfs.newvfs.FileAttribute; import com.intellij.openapi.vfs.newvfs.NewVirtualFile; import com.intellij.util.io.IOUtil; -import com.albertoventurini.graphdbplugin.jetbrains.ui.console.params.ParameterRootType; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.interactions.GraphDbEditorsConsoleRootType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params.ParameterRootType; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.interactions.GraphDbEditorsConsoleRootType; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/NameUtil.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/NameUtil.java similarity index 73% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/NameUtil.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/NameUtil.java index 250a1ea9..6fe04494 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/NameUtil.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/NameUtil.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.util; +package com.github.mdelambilly.graphdbplugin.jetbrains.util; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; -import com.albertoventurini.graphdbplugin.platform.GraphConstants; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; +import com.github.mdelambilly.graphdbplugin.platform.GraphConstants; public final class NameUtil { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/Notifier.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/Notifier.java similarity index 91% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/Notifier.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/Notifier.java index 527ccdda..3414abc9 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/Notifier.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/Notifier.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.util; +package com.github.mdelambilly.graphdbplugin.jetbrains.util; import com.intellij.notification.Notification; import com.intellij.notification.NotificationType; diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/PluginUtil.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/PluginUtil.java similarity index 83% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/PluginUtil.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/PluginUtil.java index 5589fcf8..0914160b 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/PluginUtil.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/PluginUtil.java @@ -3,14 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.util; +package com.github.mdelambilly.graphdbplugin.jetbrains.util; import com.intellij.ide.plugins.IdeaPluginDescriptor; import com.intellij.ide.plugins.PluginManager; import com.intellij.ide.plugins.PluginManagerCore; import com.intellij.openapi.extensions.PluginId; -import com.albertoventurini.graphdbplugin.platform.GraphConstants; +import com.github.mdelambilly.graphdbplugin.platform.GraphConstants; public class PluginUtil { diff --git a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/Validation.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/Validation.java similarity index 86% rename from ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/Validation.java rename to ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/Validation.java index 3b57c380..4e2344b6 100644 --- a/ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/util/Validation.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/Validation.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.util; +package com.github.mdelambilly.graphdbplugin.jetbrains.util; import com.intellij.openapi.ui.ValidationInfo; diff --git a/ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/DataSourcesComponentStateTest.java b/ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/DataSourcesComponentStateTest.java similarity index 84% rename from ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/DataSourcesComponentStateTest.java rename to ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/DataSourcesComponentStateTest.java index 640cdb7e..8c626504 100644 --- a/ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/state/DataSourcesComponentStateTest.java +++ b/ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/datasource/state/DataSourcesComponentStateTest.java @@ -3,24 +3,25 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state; +package com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state; import static org.assertj.core.api.Assertions.*; import java.util.*; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.impl.DataSource; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.impl.DataSource; import org.assertj.core.api.Assertions; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class DataSourcesComponentStateTest { private DataSourcesComponentState state; - @Before + @BeforeEach public void setUp() throws Exception { state = new DataSourcesComponentState(); } diff --git a/ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/ContextMenuTest.java b/ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/ContextMenuTest.java similarity index 86% rename from ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/ContextMenuTest.java rename to ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/ContextMenuTest.java index 5c7dcab0..400e9eb1 100644 --- a/ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/ContextMenuTest.java +++ b/ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/ContextMenuTest.java @@ -3,24 +3,22 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata; - -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.data.Neo4jGraphDatabaseVersion; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.*; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto.DataSourceContextMenu; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.dto.MetadataContextMenu; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.*; -import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata; + +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data.Neo4jGraphDatabaseVersion; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.*; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto.DataSourceContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata.dto.MetadataContextMenu; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.*; import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.impl.DataSourceV1; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.impl.DataSourceV1; import org.jetbrains.annotations.NotNull; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeNode; @@ -30,13 +28,13 @@ import java.util.HashMap; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; /** * Test that the correct context menu is associated with * each node in the metadata tree. */ -@RunWith(JUnit4.class) -public class ContextMenuTest extends LightJavaCodeInsightFixtureTestCase { +public class ContextMenuTest { private static final String UUID = "uuid"; private static final String LABEL = "label"; @@ -48,9 +46,8 @@ public class ContextMenuTest extends LightJavaCodeInsightFixtureTestCase { private ContextMenuService sut = new ContextMenuService(); private PatchedDefaultMutableTreeNode datasource; - @Before + @BeforeEach public void setUp() throws Exception { - super.setUp(); root = new PatchedDefaultMutableTreeNode(RootTreeNodeModel.ROOT_NAME); dataSourceApi = new DataSourceV1(UUID, "local", DataSourceType.NEO4J_BOLT, new HashMap<>()); diff --git a/ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceMetadataUpdateServiceTest.java b/ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceMetadataUpdateServiceTest.java similarity index 68% rename from ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceMetadataUpdateServiceTest.java rename to ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceMetadataUpdateServiceTest.java index 8d3b0064..74671f13 100644 --- a/ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceMetadataUpdateServiceTest.java +++ b/ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/DataSourceMetadataUpdateServiceTest.java @@ -1,33 +1,29 @@ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata; - -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.DataSourceMetadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.DataSourcesComponentMetadata; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.impl.DataSourceV1; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.RootTreeNodeModel; -import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata; + +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.DataSourceMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.DataSourcesComponentMetadata; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.impl.DataSourceV1; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.RootTreeNodeModel; import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Optional; import java.util.concurrent.CompletableFuture; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(JUnit4.class) -public class DataSourceMetadataUpdateServiceTest extends LightJavaCodeInsightFixtureTestCase { +public class DataSourceMetadataUpdateServiceTest { private DataSourceMetadataUpdateService service; - @Before + @BeforeEach public void setUp() throws Exception { - super.setUp(); final var metadataComponent = mock(DataSourcesComponentMetadata.class); final var treeUpdaters = mock(DataSourceTreeUpdaters.class); diff --git a/ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/Neo4JBoltTreeUpdaterTest.java b/ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/Neo4JBoltTreeUpdaterTest.java similarity index 86% rename from ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/Neo4JBoltTreeUpdaterTest.java rename to ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/Neo4JBoltTreeUpdaterTest.java index 79413e98..c5e6dfad 100644 --- a/ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/ui/datasource/metadata/Neo4JBoltTreeUpdaterTest.java +++ b/ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/datasource/metadata/Neo4JBoltTreeUpdaterTest.java @@ -3,18 +3,19 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.metadata; -import com.albertoventurini.graphdbplugin.database.neo4j.bolt.data.Neo4jGraphDatabaseVersion; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.*; -import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.impl.DataSourceV1; -import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.tree.*; +import com.github.mdelambilly.graphdbplugin.database.neo4j.bolt.data.Neo4jGraphDatabaseVersion; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourceType; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.*; +import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.impl.DataSourceV1; +import com.github.mdelambilly.graphdbplugin.jetbrains.ui.datasource.tree.*; import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode; import org.jetbrains.annotations.NotNull; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeNode; @@ -23,7 +24,7 @@ import java.util.HashMap; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Test for the {@link Neo4jBoltTreeUpdater} class. @@ -41,7 +42,7 @@ public class Neo4JBoltTreeUpdaterTest { private PatchedDefaultMutableTreeNode root; private PatchedDefaultMutableTreeNode datasource; - @Before + @BeforeEach public void setUp() { root = new PatchedDefaultMutableTreeNode(RootTreeNodeModel.ROOT_NAME); final var dataSourceApi = new DataSourceV1(UUID, "local", DataSourceType.NEO4J_BOLT, new HashMap<>()); diff --git a/ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/ui/helpers/UiHelperTest.java b/ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/helpers/UiHelperTest.java similarity index 80% rename from ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/ui/helpers/UiHelperTest.java rename to ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/helpers/UiHelperTest.java index 54fff1a0..33dcad1b 100644 --- a/ui/jetbrains/src/test/java/com/albertoventurini/graphdbplugin/jetbrains/ui/helpers/UiHelperTest.java +++ b/ui/jetbrains/src/test/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/helpers/UiHelperTest.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.jetbrains.ui.helpers; +package com.github.mdelambilly.graphdbplugin.jetbrains.ui.helpers; import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ui/visualization/build.gradle b/ui/visualization/build.gradle index 63c838ef..c58dc19c 100644 --- a/ui/visualization/build.gradle +++ b/ui/visualization/build.gradle @@ -1,21 +1,29 @@ // Copied and adapted from plugin "Graph Database Support" // by Neueda Technologies, Ltd. // Modified by Alberto Venturini, 2022 -apply plugin: "org.jetbrains.intellij" - -intellij { - version = intellijSdkVersion - instrumentCode = true - plugins = ['java'] +// Modified by Michel de Lambilly, 2026 +apply plugin: "org.jetbrains.intellij.platform.module" +repositories { + intellijPlatform { + defaultRepositories() + } } dependencies { - implementation "de.sciss:prefuse-core:$versionPrefuse" + intellijPlatform { + intellijIdea(providers.gradleProperty('platformVersion')) + bundledPlugin('com.intellij.java') + } + implementation "de.sciss:prefuse-core:$versionPrefuse" implementation project(":platform") implementation project(':database:api') + testImplementation "org.junit.jupiter:junit-jupiter:$versionJunit" testImplementation "org.mockito:mockito-core:$versionMockito" testImplementation "org.assertj:assertj-core:$versionAssertj" testImplementation "de.sciss:prefuse-demos:$versionPrefuse" } +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/GraphDisplay.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/GraphDisplay.java similarity index 76% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/GraphDisplay.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/GraphDisplay.java index 31d28722..c13a5a93 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/GraphDisplay.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/GraphDisplay.java @@ -3,27 +3,27 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization; - -import com.albertoventurini.graphdbplugin.visualization.constants.GraphColumns; -import com.albertoventurini.graphdbplugin.visualization.constants.GraphGroups; -import com.albertoventurini.graphdbplugin.visualization.controls.CustomNeighborHighlightControl; -import com.albertoventurini.graphdbplugin.visualization.events.EventType; -import com.albertoventurini.graphdbplugin.visualization.events.NodeCallback; -import com.albertoventurini.graphdbplugin.visualization.events.RelationshipCallback; -import com.albertoventurini.graphdbplugin.visualization.layouts.CustomItemSorter; -import com.albertoventurini.graphdbplugin.visualization.listeners.NodeListener; -import com.albertoventurini.graphdbplugin.visualization.listeners.RelationshipListener; -import com.albertoventurini.graphdbplugin.visualization.services.LookAndFeelService; -import com.albertoventurini.graphdbplugin.visualization.settings.LayoutProvider; -import com.albertoventurini.graphdbplugin.visualization.settings.RendererProvider; -import com.albertoventurini.graphdbplugin.visualization.settings.SchemaProvider; -import com.intellij.util.ui.UIUtil; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; -import com.albertoventurini.graphdbplugin.visualization.util.DisplayUtil; -import com.albertoventurini.graphdbplugin.visualization.util.PrefuseUtil; +package com.github.mdelambilly.graphdbplugin.visualization; + +import com.github.mdelambilly.graphdbplugin.visualization.constants.GraphColumns; +import com.github.mdelambilly.graphdbplugin.visualization.constants.GraphGroups; +import com.github.mdelambilly.graphdbplugin.visualization.controls.CustomNeighborHighlightControl; +import com.github.mdelambilly.graphdbplugin.visualization.events.EventType; +import com.github.mdelambilly.graphdbplugin.visualization.events.NodeCallback; +import com.github.mdelambilly.graphdbplugin.visualization.events.RelationshipCallback; +import com.github.mdelambilly.graphdbplugin.visualization.layouts.CustomItemSorter; +import com.github.mdelambilly.graphdbplugin.visualization.listeners.NodeListener; +import com.github.mdelambilly.graphdbplugin.visualization.listeners.RelationshipListener; +import com.github.mdelambilly.graphdbplugin.visualization.services.LookAndFeelService; +import com.github.mdelambilly.graphdbplugin.visualization.settings.LayoutProvider; +import com.github.mdelambilly.graphdbplugin.visualization.settings.RendererProvider; +import com.github.mdelambilly.graphdbplugin.visualization.settings.SchemaProvider; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.visualization.util.DisplayUtil; +import com.github.mdelambilly.graphdbplugin.visualization.util.PrefuseUtil; import prefuse.Display; import prefuse.Visualization; import prefuse.controls.DragControl; @@ -63,11 +63,7 @@ public GraphDisplay(LookAndFeelService lookAndFeel) { super(new Visualization()); this.lookAndFeel = lookAndFeel; - if (UIUtil.isUnderDarcula()) { - setBackground(lookAndFeel.getBackgroundColor().darker()); - } else { - setBackground(lookAndFeel.getBackgroundColor()); - } + setBackground(lookAndFeel.getBackgroundColor()); graph = new Graph(DIRECTED); graph.addColumn(GraphColumns.ID, String.class); diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/PrefuseVisualization.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/PrefuseVisualization.java similarity index 71% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/PrefuseVisualization.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/PrefuseVisualization.java index 4cd2a4df..94df9503 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/PrefuseVisualization.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/PrefuseVisualization.java @@ -3,15 +3,16 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization; +package com.github.mdelambilly.graphdbplugin.visualization; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; -import com.albertoventurini.graphdbplugin.visualization.events.EventType; -import com.albertoventurini.graphdbplugin.visualization.events.NodeCallback; -import com.albertoventurini.graphdbplugin.visualization.events.RelationshipCallback; -import com.albertoventurini.graphdbplugin.visualization.services.LookAndFeelService; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.visualization.events.EventType; +import com.github.mdelambilly.graphdbplugin.visualization.events.NodeCallback; +import com.github.mdelambilly.graphdbplugin.visualization.events.RelationshipCallback; +import com.github.mdelambilly.graphdbplugin.visualization.services.LookAndFeelService; import javax.swing.*; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/VisualizationApi.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/VisualizationApi.java similarity index 56% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/VisualizationApi.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/VisualizationApi.java index 5b4c7562..5d6f0933 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/VisualizationApi.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/VisualizationApi.java @@ -3,14 +3,15 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization; +package com.github.mdelambilly.graphdbplugin.visualization; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; -import com.albertoventurini.graphdbplugin.visualization.events.EventType; -import com.albertoventurini.graphdbplugin.visualization.events.NodeCallback; -import com.albertoventurini.graphdbplugin.visualization.events.RelationshipCallback; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.visualization.events.EventType; +import com.github.mdelambilly.graphdbplugin.visualization.events.NodeCallback; +import com.github.mdelambilly.graphdbplugin.visualization.events.RelationshipCallback; import javax.swing.*; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/constants/GraphColumns.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/constants/GraphColumns.java similarity index 77% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/constants/GraphColumns.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/constants/GraphColumns.java index 6db1555e..c51804bf 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/constants/GraphColumns.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/constants/GraphColumns.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.constants; +package com.github.mdelambilly.graphdbplugin.visualization.constants; public class GraphColumns { public static final String ID = "id"; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/constants/GraphGroups.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/constants/GraphGroups.java similarity index 82% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/constants/GraphGroups.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/constants/GraphGroups.java index 644706a6..40e58574 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/constants/GraphGroups.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/constants/GraphGroups.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.constants; +package com.github.mdelambilly.graphdbplugin.visualization.constants; public class GraphGroups { public static final String GRAPH = "graph"; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/constants/VisualizationParameters.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/constants/VisualizationParameters.java similarity index 76% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/constants/VisualizationParameters.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/constants/VisualizationParameters.java index 37811b24..3c03f170 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/constants/VisualizationParameters.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/constants/VisualizationParameters.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.constants; +package com.github.mdelambilly.graphdbplugin.visualization.constants; public class VisualizationParameters { public static final int NODE_DIAMETER = 50; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/controls/CustomNeighborHighlightControl.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/controls/CustomNeighborHighlightControl.java similarity index 96% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/controls/CustomNeighborHighlightControl.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/controls/CustomNeighborHighlightControl.java index 47454d8b..07d13b68 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/controls/CustomNeighborHighlightControl.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/controls/CustomNeighborHighlightControl.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.controls; +package com.github.mdelambilly.graphdbplugin.visualization.controls; import prefuse.controls.NeighborHighlightControl; import prefuse.visual.EdgeItem; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/events/EventType.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/events/EventType.java similarity index 72% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/events/EventType.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/events/EventType.java index fdd100fc..062a1865 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/events/EventType.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/events/EventType.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.events; +package com.github.mdelambilly.graphdbplugin.visualization.events; public enum EventType { HOVER_START, diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/events/NodeCallback.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/events/NodeCallback.java similarity index 69% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/events/NodeCallback.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/events/NodeCallback.java index 05a8a746..dc1c4d8a 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/events/NodeCallback.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/events/NodeCallback.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.events; +package com.github.mdelambilly.graphdbplugin.visualization.events; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; import prefuse.visual.VisualItem; import java.awt.event.MouseEvent; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/events/RelationshipCallback.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/events/RelationshipCallback.java similarity index 69% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/events/RelationshipCallback.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/events/RelationshipCallback.java index 0b9380f4..ed0d7848 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/events/RelationshipCallback.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/events/RelationshipCallback.java @@ -3,10 +3,11 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.events; +package com.github.mdelambilly.graphdbplugin.visualization.events; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; import prefuse.visual.VisualItem; import java.awt.event.MouseEvent; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/AnimationPacer.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/AnimationPacer.java similarity index 82% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/AnimationPacer.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/AnimationPacer.java index 4cd48824..a96cb524 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/AnimationPacer.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/AnimationPacer.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.layouts; +package com.github.mdelambilly.graphdbplugin.visualization.layouts; import prefuse.activity.Pacer; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/CenteredLayout.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/CenteredLayout.java similarity index 90% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/CenteredLayout.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/CenteredLayout.java index 5feca1a1..8e30bcd6 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/CenteredLayout.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/CenteredLayout.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.layouts; +package com.github.mdelambilly.graphdbplugin.visualization.layouts; import prefuse.action.layout.Layout; import prefuse.visual.DecoratorItem; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/CustomItemSorter.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/CustomItemSorter.java similarity index 89% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/CustomItemSorter.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/CustomItemSorter.java index 4113f021..34dd6583 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/CustomItemSorter.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/CustomItemSorter.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.layouts; +package com.github.mdelambilly.graphdbplugin.visualization.layouts; import prefuse.visual.DecoratorItem; import prefuse.visual.VisualItem; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/DynamicForceLayout.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/DynamicForceLayout.java similarity index 96% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/DynamicForceLayout.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/DynamicForceLayout.java index b909df95..8e1758fc 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/DynamicForceLayout.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/DynamicForceLayout.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.layouts; +package com.github.mdelambilly.graphdbplugin.visualization.layouts; import prefuse.action.layout.graph.ForceDirectedLayout; import prefuse.util.force.DragForce; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/RepaintAndRepositionAction.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/RepaintAndRepositionAction.java similarity index 75% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/RepaintAndRepositionAction.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/RepaintAndRepositionAction.java index aaf3e64f..dc2272f7 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/layouts/RepaintAndRepositionAction.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/layouts/RepaintAndRepositionAction.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.layouts; +package com.github.mdelambilly.graphdbplugin.visualization.layouts; -import com.albertoventurini.graphdbplugin.visualization.GraphDisplay; -import com.albertoventurini.graphdbplugin.visualization.util.PrefuseUtil; +import com.github.mdelambilly.graphdbplugin.visualization.GraphDisplay; +import com.github.mdelambilly.graphdbplugin.visualization.util.PrefuseUtil; import prefuse.Visualization; import prefuse.action.RepaintAction; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/listeners/NodeListener.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/listeners/NodeListener.java similarity index 81% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/listeners/NodeListener.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/listeners/NodeListener.java index fc72d6f5..6bbeeae7 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/listeners/NodeListener.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/listeners/NodeListener.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.listeners; +package com.github.mdelambilly.graphdbplugin.visualization.listeners; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.visualization.events.EventType; -import com.albertoventurini.graphdbplugin.visualization.events.NodeCallback; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.visualization.events.EventType; +import com.github.mdelambilly.graphdbplugin.visualization.events.NodeCallback; import prefuse.controls.ControlAdapter; import prefuse.visual.NodeItem; import prefuse.visual.VisualItem; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/listeners/RelationshipListener.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/listeners/RelationshipListener.java similarity index 81% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/listeners/RelationshipListener.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/listeners/RelationshipListener.java index 9c877127..9d34ade5 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/listeners/RelationshipListener.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/listeners/RelationshipListener.java @@ -3,12 +3,13 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.listeners; +package com.github.mdelambilly.graphdbplugin.visualization.listeners; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; -import com.albertoventurini.graphdbplugin.visualization.events.EventType; -import com.albertoventurini.graphdbplugin.visualization.events.RelationshipCallback; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.visualization.events.EventType; +import com.github.mdelambilly.graphdbplugin.visualization.events.RelationshipCallback; import prefuse.controls.ControlAdapter; import prefuse.visual.EdgeItem; import prefuse.visual.VisualItem; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/renderers/CustomEdgeRenderer.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/renderers/CustomEdgeRenderer.java similarity index 95% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/renderers/CustomEdgeRenderer.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/renderers/CustomEdgeRenderer.java index b81fa360..097283b8 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/renderers/CustomEdgeRenderer.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/renderers/CustomEdgeRenderer.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.renderers; +package com.github.mdelambilly.graphdbplugin.visualization.renderers; -import com.albertoventurini.graphdbplugin.visualization.constants.VisualizationParameters; -import com.albertoventurini.graphdbplugin.visualization.util.RenderingUtil; +import com.github.mdelambilly.graphdbplugin.visualization.constants.VisualizationParameters; +import com.github.mdelambilly.graphdbplugin.visualization.util.RenderingUtil; import prefuse.Constants; import prefuse.render.EdgeRenderer; import prefuse.visual.EdgeItem; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/services/LookAndFeelService.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/services/LookAndFeelService.java similarity index 84% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/services/LookAndFeelService.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/services/LookAndFeelService.java index d7baa7bb..6cd56fc5 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/services/LookAndFeelService.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/services/LookAndFeelService.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.services; +package com.github.mdelambilly.graphdbplugin.visualization.services; import java.awt.*; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/settings/ColorProvider.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/settings/ColorProvider.java similarity index 71% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/settings/ColorProvider.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/settings/ColorProvider.java index 3cb3def5..09f9ec1f 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/settings/ColorProvider.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/settings/ColorProvider.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.settings; +package com.github.mdelambilly.graphdbplugin.visualization.settings; -import com.albertoventurini.graphdbplugin.visualization.constants.VisualizationParameters; -import com.albertoventurini.graphdbplugin.visualization.services.LookAndFeelService; +import com.github.mdelambilly.graphdbplugin.visualization.constants.VisualizationParameters; +import com.github.mdelambilly.graphdbplugin.visualization.services.LookAndFeelService; import org.jetbrains.annotations.NotNull; import prefuse.action.ActionList; import prefuse.action.assignment.ColorAction; @@ -17,9 +18,9 @@ import java.awt.*; -import static com.albertoventurini.graphdbplugin.visualization.constants.GraphColumns.TYPE; -import static com.albertoventurini.graphdbplugin.visualization.constants.GraphGroups.EDGES; -import static com.albertoventurini.graphdbplugin.visualization.constants.GraphGroups.NODES; +import static com.github.mdelambilly.graphdbplugin.visualization.constants.GraphColumns.TYPE; +import static com.github.mdelambilly.graphdbplugin.visualization.constants.GraphGroups.EDGES; +import static com.github.mdelambilly.graphdbplugin.visualization.constants.GraphGroups.NODES; import static prefuse.Constants.NOMINAL; import static prefuse.visual.VisualItem.*; @@ -40,16 +41,6 @@ public class ColorProvider { private static final int ORANGE = ColorLib.rgb(229, 60, 20); private static final int ORANGE_DARK = ColorLib.rgb(180, 40, 8); private static final int GREEN = ColorLib.rgb(132, 173, 74); - private static final int GRAY = ColorLib.rgb(178, 178, 178); - private static final int GRAY_DARK = ColorLib.rgb(90, 90, 90); - - private static final int EDGE = GRAY; - private static final int EDGE_HOVER = GRAY_DARK; - private static final int EDGE_HIGHLIGHT = GRAY_DARK; - - private static final int NODE_STROKE = GRAY; - private static final int NODE_STROKE_HOVER = GRAY_DARK; - private static final int NODE_STROKE_HIGHLIGHT = GRAY_DARK; private static final int[] PALETTE = {ROT_1, ROT_2, ROT_3, ROT_4, ROT_5, ROT_6, ROT_7, ROT_8}; @@ -91,27 +82,33 @@ private static DataColorAction getNodeFill(LookAndFeelService lookAndFeelService @NotNull private static ColorAction getEdgeFill(LookAndFeelService lookAndFeelService) { - ColorAction arrow = new ColorAction(EDGES, FILLCOLOR, EDGE); - arrow.add(HIGHLIGHT, EDGE_HIGHLIGHT); - arrow.add(HOVER, EDGE_HOVER); + int edge = ColorLib.color(lookAndFeelService.getEdgeFillColor()); + int edgeHover = ColorLib.color(lookAndFeelService.getNodeStrokeHoverColor()); + ColorAction arrow = new ColorAction(EDGES, FILLCOLOR, edge); + arrow.add(HIGHLIGHT, edgeHover); + arrow.add(HOVER, edgeHover); return arrow; } @NotNull private static ColorAction getEdgeStroke(LookAndFeelService lookAndFeelService) { - ColorAction nEdges = new ColorAction(EDGES, STROKECOLOR, NODE_STROKE); - nEdges.add(HIGHLIGHT, NODE_STROKE_HIGHLIGHT); - nEdges.add(HOVER, NODE_STROKE_HOVER); + int stroke = ColorLib.color(lookAndFeelService.getEdgeStrokeColor()); + int strokeHover = ColorLib.color(lookAndFeelService.getNodeStrokeHoverColor()); + ColorAction nEdges = new ColorAction(EDGES, STROKECOLOR, stroke); + nEdges.add(HIGHLIGHT, strokeHover); + nEdges.add(HOVER, strokeHover); return nEdges; } @NotNull private static ColorAction getNodeStroke(LookAndFeelService lookAndFeelService) { - ColorAction nStroke = new ColorAction(NODES, STROKECOLOR, NODE_STROKE); - nStroke.add(HIGHLIGHT, NODE_STROKE_HIGHLIGHT); - nStroke.add(HOVER, NODE_STROKE_HOVER); + int stroke = ColorLib.color(lookAndFeelService.getNodeStrokeColor()); + int strokeHover = ColorLib.color(lookAndFeelService.getNodeStrokeHoverColor()); + ColorAction nStroke = new ColorAction(NODES, STROKECOLOR, stroke); + nStroke.add(HIGHLIGHT, strokeHover); + nStroke.add(HOVER, strokeHover); return nStroke; } } diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/settings/LayoutProvider.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/settings/LayoutProvider.java similarity index 59% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/settings/LayoutProvider.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/settings/LayoutProvider.java index 63d14d60..4844b3f5 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/settings/LayoutProvider.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/settings/LayoutProvider.java @@ -3,22 +3,23 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.settings; +package com.github.mdelambilly.graphdbplugin.visualization.settings; -import com.albertoventurini.graphdbplugin.visualization.services.LookAndFeelService; -import com.albertoventurini.graphdbplugin.visualization.GraphDisplay; -import com.albertoventurini.graphdbplugin.visualization.layouts.CenteredLayout; -import com.albertoventurini.graphdbplugin.visualization.layouts.DynamicForceLayout; -import com.albertoventurini.graphdbplugin.visualization.layouts.RepaintAndRepositionAction; +import com.github.mdelambilly.graphdbplugin.visualization.services.LookAndFeelService; +import com.github.mdelambilly.graphdbplugin.visualization.GraphDisplay; +import com.github.mdelambilly.graphdbplugin.visualization.layouts.CenteredLayout; +import com.github.mdelambilly.graphdbplugin.visualization.layouts.DynamicForceLayout; +import com.github.mdelambilly.graphdbplugin.visualization.layouts.RepaintAndRepositionAction; import prefuse.Visualization; import prefuse.action.ActionList; import prefuse.action.RepaintAction; import prefuse.activity.Activity; -import static com.albertoventurini.graphdbplugin.visualization.constants.GraphGroups.EDGE_LABEL; -import static com.albertoventurini.graphdbplugin.visualization.constants.GraphGroups.GRAPH; -import static com.albertoventurini.graphdbplugin.visualization.constants.GraphGroups.NODE_LABEL; +import static com.github.mdelambilly.graphdbplugin.visualization.constants.GraphGroups.EDGE_LABEL; +import static com.github.mdelambilly.graphdbplugin.visualization.constants.GraphGroups.GRAPH; +import static com.github.mdelambilly.graphdbplugin.visualization.constants.GraphGroups.NODE_LABEL; public class LayoutProvider { diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/settings/RendererProvider.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/settings/RendererProvider.java similarity index 79% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/settings/RendererProvider.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/settings/RendererProvider.java index bbf5e03a..85e241fe 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/settings/RendererProvider.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/settings/RendererProvider.java @@ -3,16 +3,17 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.settings; +package com.github.mdelambilly.graphdbplugin.visualization.settings; -import com.albertoventurini.graphdbplugin.visualization.constants.VisualizationParameters; -import com.albertoventurini.graphdbplugin.visualization.renderers.CustomEdgeRenderer; +import com.github.mdelambilly.graphdbplugin.visualization.constants.VisualizationParameters; +import com.github.mdelambilly.graphdbplugin.visualization.renderers.CustomEdgeRenderer; import prefuse.render.EdgeRenderer; import prefuse.render.LabelRenderer; import prefuse.render.ShapeRenderer; -import static com.albertoventurini.graphdbplugin.visualization.constants.GraphColumns.TITLE; +import static com.github.mdelambilly.graphdbplugin.visualization.constants.GraphColumns.TITLE; import static prefuse.Constants.EDGE_TYPE_LINE; public class RendererProvider { diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/settings/SchemaProvider.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/settings/SchemaProvider.java similarity index 69% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/settings/SchemaProvider.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/settings/SchemaProvider.java index 9e181e79..2d1715dc 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/settings/SchemaProvider.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/settings/SchemaProvider.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.settings; +package com.github.mdelambilly.graphdbplugin.visualization.settings; import prefuse.data.Schema; import prefuse.util.ColorLib; @@ -20,13 +21,22 @@ public class SchemaProvider { private static final int FONT_SIZE = 10; - private static final int FONT_COLOR = ColorLib.rgb(15, 15, 45); private static final String UI_DEFAULT_FONT_KEY = "Label.font"; + private static int getFontColor() { + Color c = UIManager.getColor("Label.foreground"); + return c != null ? ColorLib.color(c) : ColorLib.rgb(15, 15, 45); + } + + private static int getEdgeLabelBackground() { + Color c = UIManager.getColor("ToolTip.background"); + return c != null ? ColorLib.color(c) : ColorLib.rgb(240, 230, 80); + } + public static Schema provideFontSchema() { final Schema fontSchema = PrefuseLib.getVisualItemSchema(); fontSchema.setDefault(VisualItem.INTERACTIVE, false); - fontSchema.setDefault(VisualItem.TEXTCOLOR, FONT_COLOR); + fontSchema.setDefault(VisualItem.TEXTCOLOR, getFontColor()); Font font = FontLib.getFont(UIManager.getFont(UI_DEFAULT_FONT_KEY).getFontName(), FONT_SIZE); fontSchema.setDefault(VisualItem.FONT, font); @@ -35,7 +45,7 @@ public static Schema provideFontSchema() { public static Schema provideFontSchemaWithBackground() { Schema schema = provideFontSchema(); - schema.setDefault(VisualItem.FILLCOLOR, ColorLib.rgb(240, 230, 80)); + schema.setDefault(VisualItem.FILLCOLOR, getEdgeLabelBackground()); return schema; } diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/util/DisplayUtil.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/util/DisplayUtil.java similarity index 94% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/util/DisplayUtil.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/util/DisplayUtil.java index 82be7350..b8532851 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/util/DisplayUtil.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/util/DisplayUtil.java @@ -3,11 +3,12 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.util; +package com.github.mdelambilly.graphdbplugin.visualization.util; -import com.albertoventurini.graphdbplugin.database.api.data.GraphEntity; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphEntity; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; import java.util.List; import java.util.Map; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/util/IntersectionUtil.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/util/IntersectionUtil.java similarity index 94% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/util/IntersectionUtil.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/util/IntersectionUtil.java index 34055295..f63e03b9 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/util/IntersectionUtil.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/util/IntersectionUtil.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.util; +package com.github.mdelambilly.graphdbplugin.visualization.util; import com.google.common.collect.Lists; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/util/PrefuseUtil.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/util/PrefuseUtil.java similarity index 87% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/util/PrefuseUtil.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/util/PrefuseUtil.java index a8e60871..8680d0d5 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/util/PrefuseUtil.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/util/PrefuseUtil.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.util; +package com.github.mdelambilly.graphdbplugin.visualization.util; import prefuse.Display; import prefuse.Visualization; diff --git a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/util/RenderingUtil.java b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/util/RenderingUtil.java similarity index 94% rename from ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/util/RenderingUtil.java rename to ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/util/RenderingUtil.java index 8676c0ad..22cbb0de 100644 --- a/ui/visualization/src/main/java/com/albertoventurini/graphdbplugin/visualization/util/RenderingUtil.java +++ b/ui/visualization/src/main/java/com/github/mdelambilly/graphdbplugin/visualization/util/RenderingUtil.java @@ -3,8 +3,9 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.util; +package com.github.mdelambilly.graphdbplugin.visualization.util; import java.awt.*; import java.awt.geom.Path2D; diff --git a/ui/visualization/src/test/java/com/albertoventurini/graphdbplugin/visualization/util/DisplayUtilTest.java b/ui/visualization/src/test/java/com/github/mdelambilly/graphdbplugin/visualization/util/DisplayUtilTest.java similarity index 92% rename from ui/visualization/src/test/java/com/albertoventurini/graphdbplugin/visualization/util/DisplayUtilTest.java rename to ui/visualization/src/test/java/com/github/mdelambilly/graphdbplugin/visualization/util/DisplayUtilTest.java index 142a21d6..4d3d3bea 100644 --- a/ui/visualization/src/test/java/com/albertoventurini/graphdbplugin/visualization/util/DisplayUtilTest.java +++ b/ui/visualization/src/test/java/com/github/mdelambilly/graphdbplugin/visualization/util/DisplayUtilTest.java @@ -3,13 +3,14 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.util; +package com.github.mdelambilly.graphdbplugin.visualization.util; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphPropertyContainer; -import org.junit.Before; -import org.junit.Test; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphPropertyContainer; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -18,7 +19,7 @@ import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newLinkedHashMap; -import static com.albertoventurini.graphdbplugin.visualization.util.DisplayUtil.getProperty; +import static com.github.mdelambilly.graphdbplugin.visualization.util.DisplayUtil.getProperty; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; @@ -52,9 +53,9 @@ public class DisplayUtilTest { private Map properties; private List types; - @Before + @BeforeEach public void init() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); properties = newLinkedHashMap(); types = newArrayList(); diff --git a/ui/visualization/src/test/java/com/albertoventurini/graphdbplugin/visualization/util/TestVisualization.java b/ui/visualization/src/test/java/com/github/mdelambilly/graphdbplugin/visualization/util/TestVisualization.java similarity index 91% rename from ui/visualization/src/test/java/com/albertoventurini/graphdbplugin/visualization/util/TestVisualization.java rename to ui/visualization/src/test/java/com/github/mdelambilly/graphdbplugin/visualization/util/TestVisualization.java index 35ace317..c384422e 100644 --- a/ui/visualization/src/test/java/com/albertoventurini/graphdbplugin/visualization/util/TestVisualization.java +++ b/ui/visualization/src/test/java/com/github/mdelambilly/graphdbplugin/visualization/util/TestVisualization.java @@ -3,19 +3,20 @@ * Graph Database Support * by Neueda Technologies, Ltd. * Modified by Alberto Venturini, 2022 + * Modified by Michel de Lambilly, 2026 */ -package com.albertoventurini.graphdbplugin.visualization.util; +package com.github.mdelambilly.graphdbplugin.visualization.util; import com.intellij.ui.JBColor; -import com.albertoventurini.graphdbplugin.database.api.data.GraphNode; -import com.albertoventurini.graphdbplugin.database.api.data.GraphPropertyContainer; -import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship; -import com.albertoventurini.graphdbplugin.visualization.PrefuseVisualization; -import com.albertoventurini.graphdbplugin.visualization.services.LookAndFeelService; -import org.junit.AfterClass; -import org.junit.Ignore; -import org.junit.Test; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphNode; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphPropertyContainer; +import com.github.mdelambilly.graphdbplugin.database.api.data.GraphRelationship; +import com.github.mdelambilly.graphdbplugin.visualization.PrefuseVisualization; +import com.github.mdelambilly.graphdbplugin.visualization.services.LookAndFeelService; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import javax.swing.*; import java.awt.*; @@ -31,7 +32,7 @@ * Prepopulated with different combinations of nodes and relationships * Useful for experimentation when working on visualization */ -@Ignore("For development. Nothing to test.") +@Disabled("For development. Nothing to test.") public class TestVisualization { private static AtomicInteger counter = new AtomicInteger(); private static PrefuseVisualization vis = new PrefuseVisualization(mockLook()); @@ -118,7 +119,7 @@ public void show15Rel() { } } - @AfterClass + @AfterAll public static void show() throws IOException { vis.paint(); JComponent com = vis.getCanvas();