github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor ebean-core internal API - getters -> accessors

Browse Source
This commit is contained in:
Rob Bygrave
2023-06-01 22:05:53 +12:00
parent 2ab7c3529a
commit 2929483b0d
104 changed files with 545 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java
+16 -16
View File
@@ -27,7 +27,7 @@ public class DefaultServer_createOrmQueryRequestTest {
}
OrmQueryDetail detail(Query<Order> query) {
return queryRequest(query).query().getDetail();
return queryRequest(query).query().detail();
}
@Test
@@ -124,7 +124,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.fetch("details");
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("customer", "details");
}
@@ -138,7 +138,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.where().eq("customer.name", "rob").query();
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("details");
}
@@ -152,7 +152,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.fetchQuery("details");
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("customer");
}
@@ -166,7 +166,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.fetchQuery("details");
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("customer");
}
@@ -180,7 +180,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.fetch("details", FetchConfig.ofLazy());
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("customer");
}
@@ -194,7 +194,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.fetchLazy("details");
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("customer");
}
@@ -209,7 +209,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.fetch("details.product");
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("customer");
}
@@ -224,7 +224,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.fetch("customer", "name");
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("details", "details.product", "customer");
}
@@ -239,7 +239,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.fetch("customer", "name");
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("customer");
}
@@ -254,7 +254,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.fetch("customer.contacts"); // second many path
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("details", "details.product", "customer");
}
@@ -270,7 +270,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.fetch("customer.contacts"); // many path
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("customer");
}
@@ -286,7 +286,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.fetch("customer.contacts"); // many path
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("customer");
}
@@ -303,7 +303,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.query();
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("details", "details.product", "customer");
}
@@ -320,7 +320,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.query();
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("customer", "customer.contacts");
}
@@ -337,7 +337,7 @@ public class DefaultServer_createOrmQueryRequestTest {
.query();
OrmQueryRequest<Order> queryRequest = queryRequest(query);
OrmQueryDetail detail = queryRequest.query().getDetail();
OrmQueryDetail detail = queryRequest.query().detail();
assertThat(detail.getFetchPaths()).containsExactly("customer", "customer.contacts");
}
ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java
+7 -7
View File
@@ -25,7 +25,7 @@ public class PrepareDocNestedTest extends BaseTest {
DefaultExpressionList<?> exp = (DefaultExpressionList<?>) where;
PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class));
List<SpiExpression> underlyingList = exp.getUnderlyingList();
List<SpiExpression> underlyingList = exp.underlyingList();
assertEquals(underlyingList.size(), 1);
assertEquals(exp.allDocNestedPath, "details");
}
@@ -43,7 +43,7 @@ public class PrepareDocNestedTest extends BaseTest {
DefaultExpressionList<?> exp = (DefaultExpressionList<?>) where;
PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class));
List<SpiExpression> underlyingList = exp.getUnderlyingList();
List<SpiExpression> underlyingList = exp.underlyingList();
assertEquals(underlyingList.size(), 2);
assertEquals(exp.allDocNestedPath, "details");
}
@@ -62,7 +62,7 @@ public class PrepareDocNestedTest extends BaseTest {
DefaultExpressionList<?> exp = (DefaultExpressionList<?>) where;
PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class));
List<SpiExpression> underlyingList = exp.getUnderlyingList();
List<SpiExpression> underlyingList = exp.underlyingList();
assertEquals(underlyingList.size(), 2);
assertNull(exp.allDocNestedPath);
@@ -84,12 +84,12 @@ public class PrepareDocNestedTest extends BaseTest {
DefaultExpressionList<?> exp = (DefaultExpressionList<?>) where;
PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class));
List<SpiExpression> underlyingList = exp.getUnderlyingList();
List<SpiExpression> underlyingList = exp.underlyingList();
assertEquals(underlyingList.size(), 1);
assertNull(exp.allDocNestedPath);
JunctionExpression<?> junction = (JunctionExpression<?>) underlyingList.get(0);
List<SpiExpression> junctionUnderlying = junction.exprList.getUnderlyingList();
List<SpiExpression> junctionUnderlying = junction.exprList.underlyingList();
JunctionExpression<?> nestedNestedPath = (JunctionExpression<?>) junctionUnderlying.get(1);
assertEquals(nestedNestedPath.exprList.allDocNestedPath, "details");
}
@@ -107,7 +107,7 @@ public class PrepareDocNestedTest extends BaseTest {
DefaultExpressionList<?> exp = (DefaultExpressionList<?>) where;
PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class));
List<SpiExpression> underlyingList = exp.getUnderlyingList();
List<SpiExpression> underlyingList = exp.underlyingList();
assertEquals(underlyingList.size(), 2);
assertNull(exp.allDocNestedPath);
@@ -135,7 +135,7 @@ public class PrepareDocNestedTest extends BaseTest {
DefaultExpressionList<?> exp = (DefaultExpressionList<?>) where;
PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class));
List<SpiExpression> underlyingList = exp.getUnderlyingList();
List<SpiExpression> underlyingList = exp.underlyingList();
assertEquals(underlyingList.size(), 5);
assertNull(exp.allDocNestedPath);
ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java
+3 -3
View File
@@ -20,20 +20,20 @@ public class DefaultOrmQueryTest extends BaseExpressionTest {
DefaultOrmQuery<Customer> q1 = (DefaultOrmQuery<Customer>) DB.find(Customer.class)
.forUpdate().where().eq("id", 42).query();
assertThat(q1.getUseBeanCache()).isSameAs(CacheMode.OFF);
assertThat(q1.beanCacheMode()).isSameAs(CacheMode.OFF);
}
@Test
public void checkForId_when_eqId_then_translatedTo_setId() {
DefaultOrmQuery<Order> q1 = (DefaultOrmQuery<Order>) DB.find(Order.class).where().eq("id", 42).query();
assertThat(q1.getWhereExpressions()).isNotNull();
assertThat(q1.whereExpressions()).isNotNull();
assertThat(q1.getId()).isNull();
assertThat(q1.isFindById()).isTrue();
assertThat(q1.getId()).isEqualTo(42);
assertThat(q1.getWhereExpressions()).isNull();
assertThat(q1.whereExpressions()).isNull();
}
@Test