Refactor rename methods on SpiExpressionRequest, DeployParser etc

ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java

@@ -15,7 +15,7 @@ public class BetweenExpressionTest extends BaseExpressionTest {
     BetweenExpression exp = new BetweenExpression("startDate", 1, 2);
     exp.addSql(expReq);
 
-    assertThat(expReq.getSql()).isEqualTo("startDate between ? and ?");
+    assertThat(expReq.sql()).isEqualTo("startDate between ? and ?");
   }
 
   @Test

ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java

@@ -15,7 +15,7 @@ public class BetweenPropertyExpressionTest extends BaseExpressionTest {
   public void sqlExpression() {
     TDSpiExpressionRequest request = new TDSpiExpressionRequest(null);
     exp("a", "b", 10).addSql(request);
-    Assertions.assertThat(request.getSql()).isEqualTo(" ? between a and b");
+    Assertions.assertThat(request.sql()).isEqualTo(" ? between a and b");
   }
 
   @Test

ebean-core/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java

@@ -15,7 +15,7 @@ public class InRangeExpressionTest extends BaseExpressionTest {
     InRangeExpression exp = new InRangeExpression("startDate", 1, 2);
     exp.addSql(expReq);
 
-    assertThat(expReq.getSql()).isEqualTo("(startDate >= ? and startDate < ?)");
+    assertThat(expReq.sql()).isEqualTo("(startDate >= ? and startDate < ?)");
   }
 
   @Test

ebean-core/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java

@@ -29,7 +29,7 @@ public class LogicExpressionTest extends BaseExpressionTest {
     LogicExpression and = and(eq("a", 10), eq("b", 10));
     and.addSql(expReq);
 
-    assertThat(expReq.getSql()).isEqualTo("(a = ? and b = ?)");
+    assertThat(expReq.sql()).isEqualTo("(a = ? and b = ?)");
   }
 
   @Test

ebean-core/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java

@@ -22,7 +22,7 @@ public class NullExpressionTest extends BaseExpressionTest {
 
     nullExp("id", true).addSql(expReq);
 
-    assertThat(expReq.getSql()).isEqualTo("id is not null");
+    assertThat(expReq.sql()).isEqualTo("id is not null");
   }
 
   @Test
@@ -32,7 +32,7 @@ public class NullExpressionTest extends BaseExpressionTest {
 
     nullExp("id", false).addSql(expReq);
 
-    assertThat(expReq.getSql()).isEqualTo("id is null");
+    assertThat(expReq.sql()).isEqualTo("id is null");
   }
 
   @Test
@@ -42,7 +42,7 @@ public class NullExpressionTest extends BaseExpressionTest {
 
     nullExp("customer", true).addSql(expReq);
 
-    assertThat(expReq.getSql()).isEqualTo("customer.id is not null");
+    assertThat(expReq.sql()).isEqualTo("customer.id is not null");
   }
 
   @Test
@@ -52,7 +52,7 @@ public class NullExpressionTest extends BaseExpressionTest {
 
     nullExp("customer", false).addSql(expReq);
 
-    assertThat(expReq.getSql()).isEqualTo("customer.id is null");
+    assertThat(expReq.sql()).isEqualTo("customer.id is null");
   }
 
   @Test

ebean-core/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java

@@ -24,7 +24,7 @@ public class TDSpiExpressionRequest implements SpiExpressionRequest {
   }
 
   @Override
-  public DbExpressionHandler getDbPlatformHandler() {
+  public DbExpressionHandler platformHandler() {
     return null;
   }
 
@@ -34,12 +34,12 @@ public class TDSpiExpressionRequest implements SpiExpressionRequest {
   }
 
   @Override
-  public BeanDescriptor<?> getBeanDescriptor() {
+  public BeanDescriptor<?> descriptor() {
     return descriptor;
   }
 
   @Override
-  public SpiOrmQueryRequest<?> getQueryRequest() {
+  public SpiOrmQueryRequest<?> queryRequest() {
     return null;
   }
 
@@ -72,12 +72,12 @@ public class TDSpiExpressionRequest implements SpiExpressionRequest {
   }
 
   @Override
-  public String getSql() {
+  public String sql() {
     return sql.toString();
   }
 
   @Override
-  public ArrayList<Object> getBindValues() {
+  public ArrayList<Object> bindValues() {
     return null;
   }
 

ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java

@@ -15,7 +15,7 @@ public class HanaDbExpressionTest {
     SpiExpressionRequest request = new DefaultExpressionRequest(null);
     expression.arrayContains(request, "arrayproperty", true, "v1", "v2", "v3");
     assertEquals("(? member of arrayproperty) and (? member of arrayproperty) and (? member of arrayproperty)",
-        request.getSql());
+        request.sql());
   }
 
   @Test
@@ -24,28 +24,28 @@ public class HanaDbExpressionTest {
     expression.arrayContains(request, "arrayproperty", false, "v1", "v2", "v3");
     assertEquals(
         "(? not  member of arrayproperty) and (? not  member of arrayproperty) and (? not  member of arrayproperty)",
-        request.getSql());
+        request.sql());
   }
 
   @Test
   public void testArrayContainsEmpty() {
     SpiExpressionRequest request = new DefaultExpressionRequest(null);
     expression.arrayContains(request, "arrayproperty", true);
-    assertEquals("", request.getSql());
+    assertEquals("", request.sql());
   }
 
   @Test
   public void testArrayIsEmpty() {
     SpiExpressionRequest request = new DefaultExpressionRequest(null);
     expression.arrayIsEmpty(request, "arrayproperty", true);
-    assertEquals("cardinality(arrayproperty) = 0", request.getSql());
+    assertEquals("cardinality(arrayproperty) = 0", request.sql());
   }
 
   @Test
   public void testArrayIsNotEmpty() {
     SpiExpressionRequest request = new DefaultExpressionRequest(null);
     expression.arrayIsEmpty(request, "arrayproperty", false);
-    assertEquals("cardinality(arrayproperty) <> 0", request.getSql());
+    assertEquals("cardinality(arrayproperty) <> 0", request.sql());
   }
 
   @Test
@@ -64,6 +64,6 @@ public class HanaDbExpressionTest {
   public void testJson() {
     SpiExpressionRequest request = new DefaultExpressionRequest(null);
     expression.json(request, "jsonproperty", "path", Op.EQ, "val");
-    assertEquals("json_value(jsonproperty, '$.path') = ?", request.getSql());
+    assertEquals("json_value(jsonproperty, '$.path') = ?", request.sql());
   }
 }

ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java

@@ -15,6 +15,6 @@ public class MySqlDbExpressionTest {
   public void testJson() {
     SpiExpressionRequest request = new DefaultExpressionRequest(null);
     expression.json(request, "jsonproperty", "path", Op.EQ, "val");
-    assertEquals("(jsonproperty ->> '$.path') = ?", request.getSql());
+    assertEquals("(jsonproperty ->> '$.path') = ?", request.sql());
   }
 }