Skip to content

Cleaned up validation of rowsHandle in RowBatcherImpl #1552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 31, 2023
Merged

Cleaned up validation of rowsHandle in RowBatcherImpl #1552

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions ...logic-client-api/src/main/java/com/marklogic/client/datamovement/impl/RowBatcherImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,34 +67,42 @@ class RowBatcherImpl<T> extends BatcherImpl implements RowBatcher<T> {
private final AtomicLong serverTimestamp = new AtomicLong(-1);

private final ContentHandle<T> rowsHandle;
private final Class<T> rowsClass;
private final RowManager defaultRowManager;

RowBatcherImpl(DataMovementManagerImpl moveMgr, ContentHandle<T> rowsHandle) {
super(moveMgr);
if (rowsHandle == null)
throw new IllegalArgumentException("Cannot create RowBatcher with null rows manager");
if (!(rowsHandle instanceof StructureReadHandle))
throw new IllegalArgumentException("Rows handle must also be StructureReadHandle");
if (!(rowsHandle instanceof BaseHandle))
throw new IllegalArgumentException("Rows handle must also be BaseHandle");
if (((BaseHandle) rowsHandle).getFormat() == Format.UNKNOWN)
throw new IllegalArgumentException("Rows handle must specify a format");
validateRowsHandle(rowsHandle);
this.rowsHandle = rowsHandle;
this.rowsClass = rowsHandle.getContentClass();
if (this.rowsClass == null)
throw new IllegalArgumentException("Rows handle cannot have a null content class");
if (!DatabaseClientFactory.getHandleRegistry().isRegistered(this.rowsClass))
throw new IllegalArgumentException(
"Rows handle must be registered with DatabaseClientFactory.HandleFactoryRegistry"
);
defaultRowManager = getPrimaryClient().newRowManager();

defaultRowManager = getPrimaryClient().newRowManager();
super.withBatchSize(DEFAULT_BATCH_SIZE);
if (moveMgr.getConnectionType() == DatabaseClient.ConnectionType.DIRECT) {
withForestConfig(moveMgr.getForestConfig());
}
}

private void validateRowsHandle(ContentHandle<T> rowsHandle) {
if (rowsHandle == null) {
throw new IllegalArgumentException("Cannot create RowBatcher with null rows manager");
}
if (!(rowsHandle instanceof StructureReadHandle)) {
throw new IllegalArgumentException("Rows handle must also be StructureReadHandle");
}
if (!(rowsHandle instanceof BaseHandle)) {
throw new IllegalArgumentException("Rows handle must also be BaseHandle");
}
if (((BaseHandle) rowsHandle).getFormat() == Format.UNKNOWN) {
throw new IllegalArgumentException("Rows handle must specify a format");
}

Class<T> rowsClass = rowsHandle.getContentClass();
if (rowsClass == null) {
throw new IllegalArgumentException("Rows handle cannot have a null content class");
} else if (!DatabaseClientFactory.getHandleRegistry().isRegistered(rowsClass)) {
throw new IllegalArgumentException("Rows handle must be registered with DatabaseClientFactory.HandleFactoryRegistry");
}
}

@Override
public RowManager getRowManager() {
return defaultRowManager;
Expand Down