Merge branch 'client' into AutoExecutor_CI

.gitignore

@@ -1,6 +1,8 @@
+out/
 build/
 out/
 .idea/
 .DS_STORE
 .gradle/
-*.db
+*.db
+build.mk

.gitlab-ci.yml

@@ -22,6 +22,8 @@ before_script:
 
 build:
   stage: build
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   script:
     - "apt-get update && apt-get install zip"
     - "./gradlew buildPlugin"
@@ -33,14 +35,16 @@ build:
       - .gradle
   artifacts:
     untracked: false
-    name: videobug-intellij-plugin.zip
+    name: unlogged-intellij-plugin.zip
     paths:
       - build/distributions/*.zip
     expire_in: 30 days
 
 test:
   stage: build
   script: ./gradlew check --scan --info
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   cache:
     key: "$CI_COMMIT_REF_NAME"
     policy: pull
@@ -54,3 +58,8 @@ test:
     paths:
       - build/reports/tests/test/*
     expire_in: 30 days
+
+scanTest:
+  stage: test
+  script:
+  - "./gradlew clean test --tests com.insidious.plugin.scan.ScanTests --scan --info"

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij' version '1.16.0'
+    id 'org.jetbrains.intellij' version '1.17.3'
     id 'com.palantir.git-version' version '0.14.0'
 }
 
@@ -15,8 +15,8 @@ def getGitHash = { ->
 
 
 group 'org.videobug'
-version '1.18.24-' + getGitHash()
-
+version '2024.2.10-' + getGitHash()
+    
 
 compileJava {
     sourceCompatibility = '11'
@@ -87,8 +87,8 @@ postBuildPlugin.dependsOn buildPlugin
 buildPlugin.finalizedBy postBuildPlugin
 
 dependencies {
-    implementation 'video.bug:common:1.4.4'
-//    implementation files("/Users/artpar/.m2/repository/video/bug/common/1.4.4/common-1.4.4.jar")
+    implementation 'video.bug:common:1.4.7'
+//    implementation files("/Users/artpar/.m2/repository/video/bug/common/1.4.7/common-1.4.7.jar")
     implementation 'org.slf4j:slf4j-api:2.0.3'
     implementation 'net.openhft:chronicle-map:3.22.9'
     implementation 'net.openhft:chronicle-queue:5.22.28'
@@ -99,6 +99,7 @@ dependencies {
     implementation 'org.apache.logging.log4j:log4j-api:2.17.2'
     implementation 'org.apache.logging.log4j:log4j-core:2.17.2'
     implementation 'com.github.javaparser:javaparser-core:3.24.8'
+//    implementation 'com.github.javafaker:javafaker:1.0.2'
     implementation 'io.minio:minio:8.4.3'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
     testImplementation 'org.mockito:mockito-core:4.0.0'
@@ -125,20 +126,21 @@ dependencies {
 
 runPluginVerifier {
     ideVersions = [
-            "IU-2019.3.5",
-            "IU-2020.3.4",
             "IU-2021.3.3",
             "IU-2022.3.3",
             "IU-2023.1.5",
             "IU-2023.2.5",
-            "IU-2023.3.1"
+            "IU-2023.3.1",
+            "IU-2023.3.2",
+            "IU-2023.3.3",
+            "IU-2023.3.4"
     ]
     verificationReportsDir = "verificationReport"
 }
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-    version = '2023.3'
+    version = '2023.2.3'
     plugins = ['com.intellij.java', 'maven', 'gradle', 'org.jetbrains.kotlin']
     updateSinceUntilBuild = false
     sameSinceUntilBuild = true
@@ -150,65 +152,35 @@ intellij {
 patchPluginXml {
     changeNotes = """
 
+<h3 id="release-notes-unlogged-io-s-latest-gem-a-10x-java-developer-s-dream-come-true">Release Notes: Unlogged.io&#39;s Latest Gem 💎 - A 10x Java Developer&#39;s Dream Come True</h3>
+<h4 id="granular-performance-tracking-because-every-millisecond-counts-">Granular Performance Tracking: Because Every Millisecond Counts ⏱️</h4>
+<p>Gone are the days when performance tracking was just a distant, API-level dream. With our newest spectacle, you can now see precisely what time each method takes, down to the most minuscule detail. It&#39;s like having a microscope for your code, but instead of looking at germs, you&#39;re watching your methods dance in real-time. Welcome to the future, where every millisecond is accounted for, and every performance hiccup is spotted faster than you can say &quot;Java&quot;.</p>
+<h4 id="ghost-icon-spookily-simple-mocking-">Ghost Icon: Spookily Simple Mocking 👻</h4>
+<p>Clicking on our ghost icon allows you to mock db calls, API calls, Redis calls, downstream services, and file operations with the recorded data. Yes, you read that right. One click. No more wrestling with bloated containers that eat up your system resources like there&#39;s no tomorrow. It&#39;s so easy, it&#39;s almost scary. Our ghost icon is here to make your developer life a breeze, not to haunt your nightmares.</p>
+<h4 id="save-replays-with-a-snap-auto-magical-assertions-">Save Replays with a Snap: Auto-Magical Assertions ✨</h4>
+<p>Imagine saving replays of all methods at once, with a mere selection. That&#39;s not just imagination now; it&#39;s reality. Unlogged auto-defines assertions for you, because who has the time to manually do that? Not you, busy Java developers. Our platform automatically saves and maps mocks to replays, making your testing workflow smoother than a hot knife through butter.</p>
+<h4 id="integration-or-unit-we-don-t-discriminate-test-your-heart-out-">Integration or Unit, We Don&#39;t Discriminate: Test Your Heart Out ❤️</h4>
+<p>Run your replays in unit or integration mode using mvn test or ./gradlew test. Getting a test report has never been easier. It&#39;s like choosing between chocolate and vanilla — regardless of your pick, the outcome is sweet. With Unlogged, testing becomes less of a chore and more of a choice.</p>
+<h4 id="commit-like-a-pro-replay-tests-at-your-fingertips-">Commit Like a Pro: Replay Tests at Your Fingertips 🏆</h4>
+<p>The replay tests we create reside cozily inside the /test/resources/unlogged folder. This means you can commit and push these tests to your repo with the swagger of a cowboy at high noon. Show off your testing prowess and make your team members green with envy. Or better yet, share the love and let them in on the secret to your success.</p>
+<h4 id="context-reading-because-we-care-about-the-details-">Context Reading: Because We Care About the Details 🔍</h4>
+<p>Unlogged can now read the saved context for authentication and other headers, because we understand that the devil is in the details. No more manual tinkering or guessing games. It&#39;s like we&#39;ve handed you the keys to the kingdom of efficiency.</p>
+<p>Java development can sometimes feel like a battle, but Unlogged.io&#39;s latest release is the cavalry coming over the hill. </p>
+<p>So saddle up, developers! With our tool, you&#39;re not just coding; you&#39;re crafting a masterpiece with the precision of a watchmaker and the vision of an artist. </p>
+<p>Happy coding! 
</p>
 
-
-    <h4>Unlogged.io Empowering Developer Efficiency and Testing Precision</h4>
-
-    <p>Greetings Java Developers! We're thrilled to announce the latest Unlogged.io release, 
-    packed with powerful features designed to supercharge your development workflow and testing capabilities.
-    Let's dive into the exciting updates:</p>
-    
-    <h5>Dynamic Mocks for Comprehensive Testing</h5>
-    
-    <p>Unleash the potential of your testing scenarios with dynamic mocks! Now, developers can effortlessly 
-    create mocks for APIs, database calls, file operations, and downstream services. Tailor your mocks to 
-    simulate real-world situations and enhance the precision of your testing.</p>
-    
-    <h5>Swift Workflow with Saved Mocks</h5>
-    
-    <p>Time is of the essence, and we understand that. With Unlogged.io's latest release, 
-    save your meticulously crafted mocks for future use. Experience an accelerated workflow 
-    as you reuse saved mocks, ensuring consistency and efficiency in your development process.</p>
-    
-    <h5>Permanent Mocking for External Testing</h5>
-    
-    <p>Extend your testing capabilities beyond Unlogged.io. Our new release enables permanent mocking, 
-    allowing developers to seamlessly test their code with external tools like Postman or Swagger. Enjoy 
-    the flexibility of choice without compromising on the precision of your tests.</p>
-    
-    <h5>CI Integration for Automated Replays</h5>
-    
-    <p>Effortlessly integrate Unlogged.io into your CI/CD pipeline with our CI runner, a seamless part of 
-    the Unlogged SDK. Associate your replays with mock definitions by utilizing the unlogged plugin. Your CI 
-    process becomes a breeze as the runner picks up files, ensuring thorough testing with every build.</p>
-    
-    <h5>Enhanced Association with Unlogged Plugin</h5>
-    
-    <p>Take control of your replays and mock definitions with the Unlogged plugin. Easily create associations 
-    between your replays and mock definitions, providing a unified and organized testing environment for your 
-    projects.</p>
-    
-    <p>Upgrade to Unlogged.io's latest release today and revolutionize your development and testing experience. 
-    Stay ahead of the curve, boost efficiency, and ensure the robustness of your code.</p>
-    <br />
-    <p>Happy coding!</p>
-
-
-
-    <h4>Version: 1.18.12</h4>
-    <p><strong>#Unlogged #JavaDevelopers #CodingExcellence #DeveloperTools #Innovation #CodeCoverage #UnitTesting</strong></p>    
     """
 }
 
 publishPlugin {
-    token = "$System.env.JETBRAINS_PUBLISH_TOKEN"
-    channels = ["$System.env.JEBTRAINS_PUBLISH_CHANNEL"]
+    token = "perm:c2hhcmR1bGxhdmVrYXI=.OTItMTAwMzA=.ZtumD3AexEy1NbzN66xWyJppVwMugG"
+    channels = ['stable']
 }
 
 test {
     useJUnitPlatform()
     jvmArgs = [
-            "-Xmx512G"
+            "-Xmx1G"
     ]
 }
 //sourceCompatibility = JavaVersion.VERSION_17

src/main/java/com/insidious/plugin/Constants.java

@@ -1,7 +1,5 @@
 package com.insidious.plugin;
 
-import okhttp3.MediaType;
-
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
 
@@ -17,22 +15,10 @@ private static String getHostname() {
         return defaultHostname;
     }
 
-    public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-    public static final String TOKEN = "token";
-    public static final String PROJECT_URL = "/api/data/projects";
-
     public static final Path HOME_PATH = FileSystems.getDefault()
             .getPath(System.getProperty("user.home"), ".unlogged");
-    public static final String AGENT_JAR_NAME = "unlogged-java-agent.jar";
-    public static final String AGENT_INFO_NAME = "agent.txt";
-    public static final Path AGENT_PATH = FileSystems.getDefault()
-            .getPath(HOME_PATH.toAbsolutePath().toString(), AGENT_JAR_NAME);
-    public static final Path AGENT_INFO_PATH = FileSystems.getDefault()
-            .getPath(HOME_PATH.toAbsolutePath().toString(), AGENT_INFO_NAME);
-    public static final Path SESSIONS_PATH = FileSystems.getDefault()
-            .getPath(HOME_PATH.toAbsolutePath().toString(),"sessions");
     public static final String COMPLETED = "completed";
     public static final String PENDING = "pending";
-    public static final String AGENT_VERSION = "1.14.3";
+    public static final String AGENT_VERSION = "0.6.4";
     public static final String HOSTNAME = getHostname();
 }