From 23cd9b6a93d95264485d1636050ee965d8521f27 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 14 Jul 2019 15:21:55 +1200
Subject: [PATCH] Remove use of agent-loader

Enhancement always done via maven plugin or Ebean IDE plugin (javaagent)
---
 pom.xml                                            | 14 --------------
 src/test/java/io/ebean/BaseTestCase.java           |  5 -----
 .../TransactionNotTerminatedAfterRollback.java     |  9 ---------
 .../java/org/tests/unitinternal/HelloMain.java     |  8 --------
 4 files changed, 36 deletions(-)

diff --git a/pom.xml b/pom.xml
index 145b98823..e91d11e58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,20 +240,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-agentloader</artifactId>
-      <version>3.0.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-agent</artifactId>
-      <version>11.41.2</version>
-      <scope>test</scope>
-    </dependency>
-
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
          and not require a separate module for it -->
     <dependency>
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index c03988613..b53b095ec 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -16,7 +16,6 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
 import io.ebeaninternal.server.transaction.TransactionScopeManager;
-import org.avaje.agentloader.AgentLoader;
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.rules.TestName;
@@ -68,10 +67,6 @@ public abstract class BaseTestCase {
     } else {
       DB_CLOCK_DELTA = 100;
     }
-    logger.debug("... preStart");
-    if (!AgentLoader.loadAgentByMainClass("io.ebean.enhance.Transformer", "debug=1")) {
-      logger.info("avaje-ebeanorm-agent not found in classpath - not dynamically loaded");
-    }
     try {
       // First try, if we get the default server. If this fails, all tests will fail.
       Ebean.getDefaultServer();
diff --git a/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java b/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java
index 1645b0259..eb693ca48 100644
--- a/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java
+++ b/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java
@@ -2,8 +2,6 @@ package org.tests.transaction;
 
 import io.ebean.Ebean;
 import io.ebean.annotation.Transactional;
-import org.avaje.agentloader.AgentLoader;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,13 +21,6 @@ import static org.junit.Assert.fail;
 public class TransactionNotTerminatedAfterRollback {
   private static final Logger LOG = LoggerFactory.getLogger(TransactionNotTerminatedAfterRollback.class);
 
-  @BeforeClass
-  public static void preStart() {
-    LOG.debug("... preStart");
-    // display the log message to see if the UserService is enhanced
-    AgentLoader.loadAgentFromClasspath("avaje-ebeanorm-agent", "debug=1");
-  }
-
   @Test
   public void test() {
     try {
diff --git a/src/test/java/org/tests/unitinternal/HelloMain.java b/src/test/java/org/tests/unitinternal/HelloMain.java
index ca43af917..3ca929553 100644
--- a/src/test/java/org/tests/unitinternal/HelloMain.java
+++ b/src/test/java/org/tests/unitinternal/HelloMain.java
@@ -4,7 +4,6 @@ import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
 import io.ebean.config.ServerConfig;
 import io.ebean.datasource.DataSourceConfig;
-import org.avaje.agentloader.AgentLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tests.model.basic.TOne;
@@ -15,13 +14,6 @@ public class HelloMain {
 
   protected static Logger logger = LoggerFactory.getLogger(HelloMain.class);
 
-  static {
-    logger.debug("... preStart");
-    if (!AgentLoader.loadAgentFromClasspath("avaje-ebeanorm-agent", "debug=1;packages=com.avaje.tests.**")) {
-      logger.info("avaje-ebeanorm-agent not found in classpath - not dynamically loaded");
-    }
-  }
-
   public static void main(String[] args) {
     // ### Configuration Objects ###
     ServerConfig serverConfig = new ServerConfig();