Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions ebean-api/src/main/java/io/ebean/DatabaseBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -723,19 +723,6 @@ default DatabaseBuilder readAuditPrepare(ReadAuditPrepare readAuditPrepare) {
@Deprecated
DatabaseBuilder setReadAuditPrepare(ReadAuditPrepare readAuditPrepare);

/**
* Set the configuration for profiling.
*/
default DatabaseBuilder profilingConfig(ProfilingConfig profilingConfig) {
return setProfilingConfig(profilingConfig);
}

/**
* @deprecated migrate to {@link #profilingConfig(ProfilingConfig)}.
*/
@Deprecated
DatabaseBuilder setProfilingConfig(ProfilingConfig profilingConfig);

/**
* Set the suffix appended to the base table to derive the view that contains the union
* of the base table and the history table in order to support asOf queries.
Expand Down Expand Up @@ -2490,11 +2477,6 @@ interface Settings extends DatabaseBuilder {
*/
TenantCatalogProvider getTenantCatalogProvider();

/**
* Return the configuration for profiling.
*/
ProfilingConfig getProfilingConfig();

/**
* Return the DB schema to use.
*/
Expand Down
14 changes: 0 additions & 14 deletions ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -539,8 +539,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
*/
private SlowQueryListener slowQueryListener;

private ProfilingConfig profilingConfig = new ProfilingConfig();

/**
* The mappingLocations for searching xml mapping.
*/
Expand Down Expand Up @@ -1028,17 +1026,6 @@ public DatabaseConfig setReadAuditPrepare(ReadAuditPrepare readAuditPrepare) {
return this;
}

@Override
public ProfilingConfig getProfilingConfig() {
return profilingConfig;
}

@Override
public DatabaseConfig setProfilingConfig(ProfilingConfig profilingConfig) {
this.profilingConfig = profilingConfig;
return this;
}

@Override
public String getDbSchema() {
return dbSchema;
Expand Down Expand Up @@ -2137,7 +2124,6 @@ protected void loadAutoTuneSettings(PropertiesWrapper p) {
*/
protected void loadSettings(PropertiesWrapper p) {
dbSchema = p.get("dbSchema", dbSchema);
profilingConfig.loadSettings(p, name);
platformConfig.loadSettings(p);
if (platformConfig.isAllQuotedIdentifiers()) {
adjustNamingConventionForAllQuoted();
Expand Down
148 changes: 0 additions & 148 deletions ebean-api/src/main/java/io/ebean/config/ProfilingConfig.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,6 @@
*/
public interface SpiProfileHandler {

/**
* Process the collected transaction profiling information.
* <p>
* Note that profileId and totalMicros are part of the profilingData but passed separately as the handler
* may filter what it processed based on this information (ignore short transactions, only process specific
* profileId transactions etc).
* </p>
*
* @param transactionProfile The transaction profile that has just been collected
*/
void collectTransactionProfile(TransactionProfile transactionProfile);

/**
* Create a profiling stream for this transaction, or return null to not profile this transaction.
* <p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -405,12 +405,7 @@ private SpiProfileHandler profileHandler() {
if (handler != null) {
return plugin(handler);
}

ProfilingConfig profilingConfig = config.getProfilingConfig();
if (!profilingConfig.isEnabled()) {
return new NoopProfileHandler();
}
return plugin(new DefaultProfileHandler(profilingConfig));
return new NoopProfileHandler();
}

/**
Expand Down
Loading
Loading