From 2c24cc659342d39d144b404b4866cb9439dd2b8c Mon Sep 17 00:00:00 2001 From: LuckyPickleZZ Date: Thu, 18 Jul 2024 10:30:08 +0800 Subject: [PATCH] rename class to Lazy --- .../odc/common/util/{LazyInitObject.java => Lazy.java} | 4 ++-- .../util/{LazyInitObjectTest.java => LazyTest.java} | 4 ++-- .../com/oceanbase/odc/service/dml/BaseDMLBuilder.java | 8 ++++---- .../com/oceanbase/odc/service/dml/MySQLDMLBuilder.java | 4 ++-- .../com/oceanbase/odc/service/dml/OracleDMLBuilder.java | 4 ++-- .../com/oceanbase/odc/service/dml/TableDataService.java | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) rename server/odc-common/src/main/java/com/oceanbase/odc/common/util/{LazyInitObject.java => Lazy.java} (92%) rename server/odc-common/src/test/java/com/oceanbase/odc/common/util/{LazyInitObjectTest.java => LazyTest.java} (92%) diff --git a/server/odc-common/src/main/java/com/oceanbase/odc/common/util/LazyInitObject.java b/server/odc-common/src/main/java/com/oceanbase/odc/common/util/Lazy.java similarity index 92% rename from server/odc-common/src/main/java/com/oceanbase/odc/common/util/LazyInitObject.java rename to server/odc-common/src/main/java/com/oceanbase/odc/common/util/Lazy.java index 610db039f2..c68eb17312 100644 --- a/server/odc-common/src/main/java/com/oceanbase/odc/common/util/LazyInitObject.java +++ b/server/odc-common/src/main/java/com/oceanbase/odc/common/util/Lazy.java @@ -23,13 +23,13 @@ * @author: liuyizhuo.lyz * @date: 2024/7/11 */ -public class LazyInitObject { +public class Lazy { private static final Object NO_INIT = new Object(); private volatile T target; private final Supplier supplier; - public LazyInitObject(@NonNull Supplier supplier) { + public Lazy(@NonNull Supplier supplier) { target = (T) NO_INIT; this.supplier = supplier; } diff --git a/server/odc-common/src/test/java/com/oceanbase/odc/common/util/LazyInitObjectTest.java b/server/odc-common/src/test/java/com/oceanbase/odc/common/util/LazyTest.java similarity index 92% rename from server/odc-common/src/test/java/com/oceanbase/odc/common/util/LazyInitObjectTest.java rename to server/odc-common/src/test/java/com/oceanbase/odc/common/util/LazyTest.java index 83e5a72a47..76c758f386 100644 --- a/server/odc-common/src/test/java/com/oceanbase/odc/common/util/LazyInitObjectTest.java +++ b/server/odc-common/src/test/java/com/oceanbase/odc/common/util/LazyTest.java @@ -22,13 +22,13 @@ * @author: liuyizhuo.lyz * @date: 2024/7/11 */ -public class LazyInitObjectTest { +public class LazyTest { @Test public void test_LazyInitialize_Get_Success() { DummyCounter counter = new DummyCounter(); Assert.assertEquals(0, counter.cnt); - LazyInitObject o = new LazyInitObject<>(() -> { + Lazy o = new Lazy<>(() -> { counter.count(); return counter; }); diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/BaseDMLBuilder.java b/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/BaseDMLBuilder.java index e36ec54c5d..b99dadf91a 100644 --- a/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/BaseDMLBuilder.java +++ b/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/BaseDMLBuilder.java @@ -27,7 +27,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import com.oceanbase.odc.common.util.LazyInitObject; +import com.oceanbase.odc.common.util.Lazy; import com.oceanbase.odc.core.session.ConnectionSession; import com.oceanbase.odc.core.session.ConnectionSessionUtil; import com.oceanbase.odc.service.db.browser.DBSchemaAccessors; @@ -53,12 +53,12 @@ abstract class BaseDMLBuilder implements DMLBuilder { private final String tableName; private final String schema; private final List modifyUnits; - private final LazyInitObject> constraints; + private final Lazy> constraints; private final List whereColumns; protected final ConnectionSession connectionSession; public BaseDMLBuilder(@NonNull List modifyUnits, List whereColumns, - @NonNull ConnectionSession connectionSession, LazyInitObject> constraints) { + @NonNull ConnectionSession connectionSession, Lazy> constraints) { Set schemas = modifyUnits.stream() .map(DataModifyUnit::getSchemaName) .filter(Objects::nonNull).collect(Collectors.toSet()); @@ -80,7 +80,7 @@ public BaseDMLBuilder(@NonNull List modifyUnits, List wh } this.connectionSession = connectionSession; this.constraints = - constraints == null ? new LazyInitObject<>(() -> getConstraints(schema, tableName, connectionSession)) + constraints == null ? new Lazy<>(() -> getConstraints(schema, tableName, connectionSession)) : constraints; this.whereColumns = whereColumns; } diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/MySQLDMLBuilder.java b/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/MySQLDMLBuilder.java index a69f314a4a..808a8dbd7f 100644 --- a/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/MySQLDMLBuilder.java +++ b/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/MySQLDMLBuilder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Set; -import com.oceanbase.odc.common.util.LazyInitObject; +import com.oceanbase.odc.common.util.Lazy; import com.oceanbase.odc.core.session.ConnectionSession; import com.oceanbase.odc.service.dml.model.DataModifyUnit; import com.oceanbase.tools.dbbrowser.model.DBTableConstraint; @@ -40,7 +40,7 @@ public class MySQLDMLBuilder extends BaseDMLBuilder { public MySQLDMLBuilder(@NonNull List modifyUnits, List whereColumns, - ConnectionSession connectionSession, LazyInitObject> constraints) { + ConnectionSession connectionSession, Lazy> constraints) { super(modifyUnits, whereColumns, connectionSession, constraints); } diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/OracleDMLBuilder.java b/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/OracleDMLBuilder.java index 2f79378168..36f162abb8 100644 --- a/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/OracleDMLBuilder.java +++ b/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/OracleDMLBuilder.java @@ -21,7 +21,7 @@ import java.util.Objects; import java.util.Set; -import com.oceanbase.odc.common.util.LazyInitObject; +import com.oceanbase.odc.common.util.Lazy; import com.oceanbase.odc.core.session.ConnectionSession; import com.oceanbase.odc.core.shared.constant.OdcConstants; import com.oceanbase.odc.service.dml.model.DataModifyUnit; @@ -42,7 +42,7 @@ public class OracleDMLBuilder extends BaseDMLBuilder { public OracleDMLBuilder(@NonNull List modifyUnits, List whereColumns, - ConnectionSession connectionSession, LazyInitObject> constraints) { + ConnectionSession connectionSession, Lazy> constraints) { super(modifyUnits, whereColumns, connectionSession, constraints); } diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/TableDataService.java b/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/TableDataService.java index 007a753bfa..1d41f631e1 100644 --- a/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/TableDataService.java +++ b/server/odc-service/src/main/java/com/oceanbase/odc/service/dml/TableDataService.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; -import com.oceanbase.odc.common.util.LazyInitObject; +import com.oceanbase.odc.common.util.Lazy; import com.oceanbase.odc.common.util.StringUtils; import com.oceanbase.odc.core.authority.util.SkipAuthorize; import com.oceanbase.odc.core.session.ConnectionSession; @@ -74,7 +74,7 @@ public BatchDataModifyResp batchGetModifySql(@NotNull ConnectionSession connecti BatchDataModifyResp resp = new BatchDataModifyResp(); resp.setTableName(tableName); resp.setSchemaName(schemaName); - LazyInitObject> constraints = new LazyInitObject<>( + Lazy> constraints = new Lazy<>( () -> BaseDMLBuilder.getConstraints(schemaName, tableName, connectionSession)); Map columnName2Column = getColumnName2Column(connectionSession, schemaName, tableName); StringBuilder sqlBuilder = new StringBuilder();