Refactor move package - server.type.DataBind to server.bind, server.text.json -> server.json

The DataBind classes don't need to be in with server.type anymore.
The server.text.json package can just reduce package nesting.
This commit is contained in:
Rob Bygrave committed 2022-08-26 14:51:19 +12:00
1 parent 100719ac1f
commit 4c13a3a779
44 files changed
+47 -44

No files matched your search

@@ -1,6 +1,6 @@
package io.ebeaninternal.api; package io.ebeaninternal.api;
import io.ebeaninternal.server.type.bindcapture.BindCapture; import io.ebeaninternal.server.bind.capture.BindCapture;
final class NoopQueryBindCapture implements SpiQueryBindCapture { final class NoopQueryBindCapture implements SpiQueryBindCapture {
@@ -1,6 +1,6 @@
package io.ebeaninternal.api; package io.ebeaninternal.api;
import io.ebeaninternal.server.type.bindcapture.BindCapture; import io.ebeaninternal.server.bind.capture.BindCapture;
/** /**
* Capture query bind values and with those actual database query plans. * Capture query bind values and with those actual database query plans.
@@ -1,4 +1,4 @@
package io.ebeaninternal.server.type; package io.ebeaninternal.server.bind;
import io.ebean.core.type.DataBinder; import io.ebean.core.type.DataBinder;
import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.api.CoreLog;
@@ -1,8 +1,8 @@
package io.ebeaninternal.server.type; package io.ebeaninternal.server.bind;
import io.ebeaninternal.server.core.timezone.DataTimeZone; import io.ebeaninternal.server.core.timezone.DataTimeZone;
import io.ebeaninternal.server.type.bindcapture.BindCapture; import io.ebeaninternal.server.bind.capture.BindCapture;
import io.ebeaninternal.server.type.bindcapture.BindCaptureStatement; import io.ebeaninternal.server.bind.capture.BindCaptureStatement;
/** /**
* Special DataBind used to capture bind values for obtaining explain plans. * Special DataBind used to capture bind values for obtaining explain plans.
@@ -1,4 +1,4 @@
package io.ebeaninternal.server.type.bindcapture; package io.ebeaninternal.server.bind.capture;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@@ -1,4 +1,4 @@
package io.ebeaninternal.server.type.bindcapture; package io.ebeaninternal.server.bind.capture;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@@ -1,4 +1,4 @@
package io.ebeaninternal.server.type.bindcapture; package io.ebeaninternal.server.bind.capture;
import java.io.InputStream; import java.io.InputStream;
import java.io.Reader; import java.io.Reader;
@@ -1,4 +1,4 @@
package io.ebeaninternal.server.type.bindcapture; package io.ebeaninternal.server.bind.capture;
import java.io.InputStream; import java.io.InputStream;
import java.io.Reader; import java.io.Reader;
@@ -1,4 +1,4 @@
package io.ebeaninternal.server.type.bindcapture; package io.ebeaninternal.server.bind.capture;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.StringReader; import java.io.StringReader;
@@ -46,7 +46,7 @@ import io.ebeaninternal.server.persist.platform.PostgresMultiValueBind;
import io.ebeaninternal.server.query.*; import io.ebeaninternal.server.query.*;
import io.ebeaninternal.server.readaudit.DefaultReadAuditLogger; import io.ebeaninternal.server.readaudit.DefaultReadAuditLogger;
import io.ebeaninternal.server.readaudit.DefaultReadAuditPrepare; import io.ebeaninternal.server.readaudit.DefaultReadAuditPrepare;
import io.ebeaninternal.server.text.json.DJsonContext; import io.ebeaninternal.server.json.DJsonContext;
import io.ebeaninternal.server.transaction.*; import io.ebeaninternal.server.transaction.*;
import io.ebeaninternal.server.type.DefaultTypeManager; import io.ebeaninternal.server.type.DefaultTypeManager;
import io.ebeaninternal.server.type.TypeManager; import io.ebeaninternal.server.type.TypeManager;
@@ -45,7 +45,7 @@ import io.ebeaninternal.server.querydefn.DefaultOrmQuery;
import io.ebeaninternal.server.querydefn.OrmQueryDetail; import io.ebeaninternal.server.querydefn.OrmQueryDetail;
import io.ebeaninternal.server.querydefn.OrmQueryProperties; import io.ebeaninternal.server.querydefn.OrmQueryProperties;
import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.rawsql.SpiRawSql;
import io.ebeaninternal.server.type.DataBind; import io.ebeaninternal.server.bind.DataBind;
import io.ebeaninternal.util.SortByClause; import io.ebeaninternal.util.SortByClause;
import io.ebeaninternal.util.SortByClauseParser; import io.ebeaninternal.util.SortByClauseParser;
import io.ebeanservice.docstore.api.DocStoreBeanAdapter; import io.ebeanservice.docstore.api.DocStoreBeanAdapter;
@@ -22,6 +22,7 @@ import io.ebeaninternal.api.json.SpiJsonReader;
import io.ebeaninternal.api.json.SpiJsonWriter; import io.ebeaninternal.api.json.SpiJsonWriter;
import io.ebeaninternal.server.core.EncryptAlias; import io.ebeaninternal.server.core.EncryptAlias;
import io.ebeaninternal.server.core.InternString; import io.ebeaninternal.server.core.InternString;
import io.ebeaninternal.server.bind.DataBind;
import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
import io.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenCreated; import io.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenCreated;
import io.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenModified; import io.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenModified;
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.deploy.DbReadContext; import io.ebeaninternal.server.deploy.DbReadContext;
import io.ebeaninternal.server.deploy.DbSqlContext; import io.ebeaninternal.server.deploy.DbSqlContext;
import io.ebeaninternal.server.query.STreeProperty; import io.ebeaninternal.server.query.STreeProperty;
import io.ebeaninternal.server.type.DataBind; import io.ebeaninternal.server.bind.DataBind;
import java.io.DataInput; import java.io.DataInput;
import java.io.DataOutput; import java.io.DataOutput;
@@ -9,7 +9,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
import io.ebeaninternal.server.deploy.DbReadContext; import io.ebeaninternal.server.deploy.DbReadContext;
import io.ebeaninternal.server.deploy.DbSqlContext; import io.ebeaninternal.server.deploy.DbSqlContext;
import io.ebeaninternal.server.type.DataBind; import io.ebeaninternal.server.bind.DataBind;
import java.io.DataInput; import java.io.DataInput;
import java.io.DataOutput; import java.io.DataOutput;
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.core.DefaultSqlUpdate;
import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.deploy.DbReadContext; import io.ebeaninternal.server.deploy.DbReadContext;
import io.ebeaninternal.server.deploy.DbSqlContext; import io.ebeaninternal.server.deploy.DbSqlContext;
import io.ebeaninternal.server.type.DataBind; import io.ebeaninternal.server.bind.DataBind;
import java.io.DataInput; import java.io.DataInput;
import java.io.DataOutput; import java.io.DataOutput;
@@ -10,7 +10,7 @@ import io.ebeaninternal.server.deploy.DbReadContext;
import io.ebeaninternal.server.deploy.DbSqlContext; import io.ebeaninternal.server.deploy.DbSqlContext;
import io.ebeaninternal.server.persist.MultiValueWrapper; import io.ebeaninternal.server.persist.MultiValueWrapper;
import io.ebeaninternal.server.persist.platform.MultiValueBind; import io.ebeaninternal.server.persist.platform.MultiValueBind;
import io.ebeaninternal.server.type.DataBind; import io.ebeaninternal.server.bind.DataBind;
import java.io.DataInput; import java.io.DataInput;
import java.io.DataOutput; import java.io.DataOutput;
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.server.deploy.DeployParser; import io.ebeaninternal.server.deploy.DeployParser;
import io.ebeaninternal.server.expression.platform.DbExpressionHandler; import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
import io.ebeaninternal.server.persist.Binder; import io.ebeaninternal.server.persist.Binder;
import io.ebeaninternal.server.type.DataBind; import io.ebeaninternal.server.bind.DataBind;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
@@ -1,4 +1,4 @@
package io.ebeaninternal.server.text.json; package io.ebeaninternal.server.json;
import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonParser;
import io.ebean.PersistenceIOException; import io.ebean.PersistenceIOException;
@@ -1,4 +1,4 @@
package io.ebeaninternal.server.text.json; package io.ebeaninternal.server.json;
import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
@@ -1,4 +1,4 @@
package io.ebeaninternal.server.text.json; package io.ebeaninternal.server.json;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
import io.ebean.core.type.ScalarType; import io.ebean.core.type.ScalarType;
@@ -1,4 +1,4 @@
package io.ebeaninternal.server.text.json; package io.ebeaninternal.server.json;
import io.ebeaninternal.server.util.ArrayStack; import io.ebeaninternal.server.util.ArrayStack;
@@ -1,4 +1,4 @@
package io.ebeaninternal.server.text.json; package io.ebeaninternal.server.json;
import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.core.JsonToken;
@@ -1,4 +1,4 @@
package io.ebeaninternal.server.text.json; package io.ebeaninternal.server.json;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
@@ -7,6 +7,7 @@ import io.ebeaninternal.api.BindParams;
import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.api.CoreLog;
import io.ebeaninternal.api.SpiLogManager; import io.ebeaninternal.api.SpiLogManager;
import io.ebeaninternal.server.core.timezone.DataTimeZone; import io.ebeaninternal.server.core.timezone.DataTimeZone;
import io.ebeaninternal.server.bind.DataBind;
import io.ebeaninternal.server.expression.platform.DbExpressionHandler; import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
import io.ebeaninternal.server.persist.platform.MultiValueBind; import io.ebeaninternal.server.persist.platform.MultiValueBind;
import io.ebeaninternal.server.type.*; import io.ebeaninternal.server.type.*;
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.persist.BatchedPstmt; import io.ebeaninternal.server.persist.BatchedPstmt;
import io.ebeaninternal.server.persist.BatchedPstmtHolder; import io.ebeaninternal.server.persist.BatchedPstmtHolder;
import io.ebeaninternal.server.persist.dmlbind.BindableRequest; import io.ebeaninternal.server.persist.dmlbind.BindableRequest;
import io.ebeaninternal.server.type.DataBind; import io.ebeaninternal.server.bind.DataBind;
import io.ebeaninternal.server.util.Str; import io.ebeaninternal.server.util.Str;
import javax.persistence.OptimisticLockException; import javax.persistence.OptimisticLockException;
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.persist.platform;
import io.ebean.config.dbplatform.ExtraDbTypes; import io.ebean.config.dbplatform.ExtraDbTypes;
import io.ebean.core.type.ScalarType; import io.ebean.core.type.ScalarType;
import io.ebeaninternal.server.type.DataBind; import io.ebeaninternal.server.bind.DataBind;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Collection; import java.util.Collection;
@@ -1,7 +1,7 @@
package io.ebeaninternal.server.persist.platform; package io.ebeaninternal.server.persist.platform;
import io.ebean.core.type.ScalarType; import io.ebean.core.type.ScalarType;
import io.ebeaninternal.server.type.DataBind; import io.ebeaninternal.server.bind.DataBind;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Collection; import java.util.Collection;
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.query;
import io.ebeaninternal.api.SpiDbQueryPlan; import io.ebeaninternal.api.SpiDbQueryPlan;
import io.ebeaninternal.api.SpiQueryBindCapture; import io.ebeaninternal.api.SpiQueryBindCapture;
import io.ebeaninternal.api.SpiQueryPlan; import io.ebeaninternal.api.SpiQueryPlan;
import io.ebeaninternal.server.type.bindcapture.BindCapture; import io.ebeaninternal.server.bind.capture.BindCapture;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
@@ -11,8 +11,8 @@ import io.ebeaninternal.api.*;
import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.core.OrmQueryRequest;
import io.ebeaninternal.server.core.timezone.DataTimeZone; import io.ebeaninternal.server.core.timezone.DataTimeZone;
import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot; import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot;
import io.ebeaninternal.server.type.DataBind; import io.ebeaninternal.server.bind.DataBind;
import io.ebeaninternal.server.type.DataBindCapture; import io.ebeaninternal.server.bind.DataBindCapture;
import io.ebeaninternal.server.type.RsetDataReader; import io.ebeaninternal.server.type.RsetDataReader;
import io.ebeaninternal.server.util.Md5; import io.ebeaninternal.server.util.Md5;
import io.ebeaninternal.server.util.Str; import io.ebeaninternal.server.util.Str;
@@ -5,7 +5,7 @@ import io.ebean.meta.QueryPlanRequest;
import io.ebean.metric.TimedMetric; import io.ebean.metric.TimedMetric;
import io.ebeaninternal.api.*; import io.ebeaninternal.api.*;
import io.ebeaninternal.server.transaction.TransactionManager; import io.ebeaninternal.server.transaction.TransactionManager;
import io.ebeaninternal.server.type.bindcapture.BindCapture; import io.ebeaninternal.server.bind.capture.BindCapture;
import java.sql.Connection; import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
@@ -14,7 +14,7 @@ import io.ebeaninternal.server.persist.Binder;
import io.ebeaninternal.server.querydefn.OrmQueryProperties; import io.ebeaninternal.server.querydefn.OrmQueryProperties;
import io.ebeaninternal.server.querydefn.OrmUpdateProperties; import io.ebeaninternal.server.querydefn.OrmUpdateProperties;
import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.rawsql.SpiRawSql;
import io.ebeaninternal.server.type.DataBind; import io.ebeaninternal.server.bind.DataBind;
import io.ebeaninternal.server.util.BindParamsParser; import io.ebeaninternal.server.util.BindParamsParser;
import java.sql.Connection; import java.sql.Connection;
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.query;
import io.ebeaninternal.api.SpiDbQueryPlan; import io.ebeaninternal.api.SpiDbQueryPlan;
import io.ebeaninternal.api.SpiQueryPlan; import io.ebeaninternal.api.SpiQueryPlan;
import io.ebeaninternal.server.type.bindcapture.BindCapture; import io.ebeaninternal.server.bind.capture.BindCapture;
import java.sql.Connection; import java.sql.Connection;
import java.sql.ResultSet; import java.sql.ResultSet;
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.query;
import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.api.CoreLog;
import io.ebeaninternal.api.SpiDbQueryPlan; import io.ebeaninternal.api.SpiDbQueryPlan;
import io.ebeaninternal.api.SpiQueryPlan; import io.ebeaninternal.api.SpiQueryPlan;
import io.ebeaninternal.server.type.bindcapture.BindCapture; import io.ebeaninternal.server.bind.capture.BindCapture;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@@ -4,7 +4,7 @@ package io.ebeaninternal.server.query;
import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.api.CoreLog;
import io.ebeaninternal.api.SpiDbQueryPlan; import io.ebeaninternal.api.SpiDbQueryPlan;
import io.ebeaninternal.api.SpiQueryPlan; import io.ebeaninternal.api.SpiQueryPlan;
import io.ebeaninternal.server.type.bindcapture.BindCapture; import io.ebeaninternal.server.bind.capture.BindCapture;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.query;
import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.api.CoreLog;
import io.ebeaninternal.api.SpiDbQueryPlan; import io.ebeaninternal.api.SpiDbQueryPlan;
import io.ebeaninternal.api.SpiQueryPlan; import io.ebeaninternal.api.SpiQueryPlan;
import io.ebeaninternal.server.type.bindcapture.BindCapture; import io.ebeaninternal.server.bind.capture.BindCapture;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.query;
import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.api.CoreLog;
import io.ebeaninternal.api.SpiDbQueryPlan; import io.ebeaninternal.api.SpiDbQueryPlan;
import io.ebeaninternal.api.SpiQueryPlan; import io.ebeaninternal.api.SpiQueryPlan;
import io.ebeaninternal.server.type.bindcapture.BindCapture; import io.ebeaninternal.server.bind.capture.BindCapture;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.querydefn;
import io.ebean.core.type.ScalarType; import io.ebean.core.type.ScalarType;
import io.ebeaninternal.server.deploy.DeployParser; import io.ebeaninternal.server.deploy.DeployParser;
import io.ebeaninternal.server.persist.Binder; import io.ebeaninternal.server.persist.Binder;
import io.ebeaninternal.server.type.DataBind; import io.ebeaninternal.server.bind.DataBind;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@@ -1,6 +1,6 @@
package io.ebeanservice.docstore.api.mapping; package io.ebeanservice.docstore.api.mapping;
import io.ebeaninternal.server.text.json.PathStack; import io.ebeaninternal.server.json.PathStack;
/** /**
* Adapter for DocPropertyVisitor that does not do anything. * Adapter for DocPropertyVisitor that does not do anything.
+1 -1
View File
@@ -66,7 +66,7 @@ module io.ebean.core {
exports io.ebeaninternal.server.query to io.ebean.test; exports io.ebeaninternal.server.query to io.ebean.test;
exports io.ebeaninternal.server.querydefn to io.ebean.autotune, io.ebean.querybean, io.ebean.test, io.ebean.elastic; exports io.ebeaninternal.server.querydefn to io.ebean.autotune, io.ebean.querybean, io.ebean.test, io.ebean.elastic;
exports io.ebeaninternal.server.rawsql to io.ebean.test; exports io.ebeaninternal.server.rawsql to io.ebean.test;
exports io.ebeaninternal.server.text.json to io.ebean.test, io.ebean.elastic; exports io.ebeaninternal.server.json to io.ebean.test, io.ebean.elastic;
exports io.ebeaninternal.server.type to io.ebean.postgis, io.ebean.test; exports io.ebeaninternal.server.type to io.ebean.postgis, io.ebean.test;
exports io.ebeaninternal.server.transaction to io.ebean.test, io.ebean.elastic, io.ebean.spring.txn, io.ebean.k8scache; exports io.ebeaninternal.server.transaction to io.ebean.test, io.ebean.elastic, io.ebean.spring.txn, io.ebean.k8scache;
exports io.ebeaninternal.server.util to io.ebean.querybean; exports io.ebeaninternal.server.util to io.ebean.querybean;
@@ -1,6 +1,7 @@
package io.ebeaninternal.server.type; package io.ebeaninternal.server.type;
import io.ebean.core.type.ScalarType; import io.ebean.core.type.ScalarType;
import io.ebeaninternal.server.bind.DataBind;
import org.postgresql.util.PGobject; import org.postgresql.util.PGobject;
import java.sql.SQLException; import java.sql.SQLException;
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.core.JsonToken;
import io.ebean.config.JsonConfig; import io.ebean.config.JsonConfig;
import io.ebean.core.type.ScalarType; import io.ebean.core.type.ScalarType;
import io.ebeaninternal.server.text.json.WriteJson; import io.ebeaninternal.server.json.WriteJson;
import java.io.IOException; import java.io.IOException;
import java.io.StringWriter; import java.io.StringWriter;
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
import io.ebean.config.DatabaseConfig; import io.ebean.config.DatabaseConfig;
import io.ebean.platform.h2.H2Platform; import io.ebean.platform.h2.H2Platform;
import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.core.bootup.BootupClasses;
import io.ebeaninternal.server.text.json.DJsonScalar; import io.ebeaninternal.server.json.DJsonScalar;
import io.ebeaninternal.server.type.DefaultTypeManager; import io.ebeaninternal.server.type.DefaultTypeManager;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -6,7 +6,7 @@ import io.ebean.DB;
import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBean;
import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.server.text.json.WriteJson; import io.ebeaninternal.server.json.WriteJson;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Customer; import org.tests.model.basic.Customer;
import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.ResetBasicData;
@@ -7,7 +7,7 @@ import io.ebean.xtest.BaseTestCase;
import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.api.json.SpiJsonReader; import io.ebeaninternal.api.json.SpiJsonReader;
import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.server.text.json.ReadJson; import io.ebeaninternal.server.json.ReadJson;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;