diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java index f334208f9..170a3a406 100644 --- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java +++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java @@ -46,7 +46,6 @@ public class ProfileManager implements ProfilingListener { @Override public boolean isProfileRequest(ObjectGraphNode origin, SpiQuery> query) { - ProfileOrigin profileOrigin = profileMap.get(origin.getOriginQueryPoint().getKey()); if (profileOrigin == null) { profileMap.put(origin.getOriginQueryPoint().getKey(), createProfileOrigin(origin, query)); @@ -61,12 +60,11 @@ public class ProfileManager implements ProfilingListener { *
* For new profiling entries it is useful to compare the profiling against the current * query detail that is specified in the code (as the query might already be manually optimised). - *
*/ private ProfileOrigin createProfileOrigin(ObjectGraphNode origin, SpiQuery> query) { ProfileOrigin profileOrigin = new ProfileOrigin(origin.getOriginQueryPoint(), queryTuningAddVersion, profilingBase, profilingRate); // set the current query detail (fetch group) so that we can compare against profiling for new entries - profileOrigin.setOriginalQuery(query.getDetail().toString()); + profileOrigin.setOriginalQuery(query.getDetail().asString()); return profileOrigin; } @@ -77,7 +75,6 @@ public class ProfileManager implements ProfilingListener { */ @Override public void collectQueryInfo(ObjectGraphNode node, long beans, long micros) { - if (node != null) { ObjectGraphOrigin origin = node.getOriginQueryPoint(); if (origin != null) { @@ -92,11 +89,9 @@ public class ProfileManager implements ProfilingListener { ** This is sent to use from a EntityBeanIntercept when the finalise method * is called on the bean. - *
*/ @Override public void collectNodeUsage(NodeUsageCollector usageCollector) { - ProfileOrigin profileOrigin = getProfileOrigin(usageCollector.getNode().getOriginQueryPoint()); profileOrigin.collectUsageInfo(usageCollector); } @@ -114,16 +109,13 @@ public class ProfileManager implements ProfilingListener { * Collect all the profiling information. */ public AutoTuneCollection profilingCollection(boolean reset) { - AutoTuneCollection req = new AutoTuneCollection(); - for (ProfileOrigin origin : profileMap.values()) { BeanDescriptor> desc = server.getBeanDescriptorById(origin.getOrigin().getBeanType()); if (desc != null) { origin.profilingCollection(desc, req, reset); } } - return req; } diff --git a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java b/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java index c3995d215..b1f982024 100644 --- a/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java +++ b/ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java @@ -27,7 +27,7 @@ public class ProfileOriginTest extends BaseTestCase { OrmQueryDetail detail = po.buildDetail(desc); - assertThat(detail.asStringDebug().trim()).isEqualTo("fetch customer (name)"); + assertThat(detail.asString().trim()).isEqualTo("fetch customer (name)"); } @Test @@ -46,7 +46,7 @@ public class ProfileOriginTest extends BaseTestCase { OrmQueryDetail detail = po.buildDetail(desc); - assertThat(detail.asStringDebug()).isEqualTo("select (orderDate) fetch customer (name)"); + assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (name)"); } @Test @@ -64,7 +64,7 @@ public class ProfileOriginTest extends BaseTestCase { OrmQueryDetail detail = po.buildDetail(desc); - assertThat(detail.asStringDebug().trim()).isEqualTo("select (orderDate,customer)"); + assertThat(detail.asString().trim()).isEqualTo("select (orderDate,customer)"); } @Test @@ -87,7 +87,7 @@ public class ProfileOriginTest extends BaseTestCase { OrmQueryDetail detail = po.buildDetail(desc); - assertThat(detail.asStringDebug()).isEqualTo("select (orderDate) fetch customer (billingAddress)"); + assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (billingAddress)"); } @@ -116,7 +116,7 @@ public class ProfileOriginTest extends BaseTestCase { po.collectUsageInfo(c); OrmQueryDetail detail = po.buildDetail(desc); - assertThat(detail.asStringDebug()).isEqualTo("fetch customer (name,note) fetch customer.billingAddress (line1)"); + assertThat(detail.asString()).isEqualTo("fetch customer (name,note) fetch customer.billingAddress (line1)"); } private NodeUsageCollector node(String path) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java index 6646746eb..2fabfdd79 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -100,7 +100,7 @@ public class OrmQueryDetail implements Serializable { /** * Return the detail in string form. */ - public String asStringDebug() { + public String asString() { StringBuilder sb = new StringBuilder(); if (baseProps.hasProperties()) { baseProps.asStringDebug("select ", sb);