Skip to content

Commit e2da861

Browse files
chore: generate libraries at Wed Mar 19 11:09:39 UTC 2025
1 parent 89414d7 commit e2da861

File tree

10 files changed

+49
-32
lines changed

10 files changed

+49
-32
lines changed

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ClientSideStatementValueConverters.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,11 @@ public DirectedReadOptions convert(String value) {
382382
return null;
383383
}
384384
}
385-
386-
/** Converter for converting strings to {@link com.google.spanner.v1.TransactionOptions.IsolationLevel} values. */
385+
386+
/**
387+
* Converter for converting strings to {@link
388+
* com.google.spanner.v1.TransactionOptions.IsolationLevel} values.
389+
*/
387390
static class IsolationLevelConverter
388391
implements ClientSideStatementValueConverter<TransactionOptions.IsolationLevel> {
389392
static final IsolationLevelConverter INSTANCE = new IsolationLevelConverter();

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/Connection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public interface Connection extends AutoCloseable {
219219

220220
/** @return <code>true</code> if this connection is in read-only mode */
221221
boolean isReadOnly();
222-
222+
223223
/** Sets the default isolation level for read/write transactions for this connection. */
224224
void setDefaultIsolationLevel(IsolationLevel isolationLevel);
225225

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionImpl.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,9 +641,11 @@ public boolean isReadOnly() {
641641
@Override
642642
public void setDefaultIsolationLevel(IsolationLevel isolationLevel) {
643643
ConnectionPreconditions.checkState(!isClosed(), CLOSED_ERROR_MSG);
644-
ConnectionPreconditions.checkState(!isBatchActive(), "Cannot default isolation level while in a batch");
645644
ConnectionPreconditions.checkState(
646-
!isTransactionStarted(), "Cannot set default isolation level while a transaction is active");
645+
!isBatchActive(), "Cannot default isolation level while in a batch");
646+
ConnectionPreconditions.checkState(
647+
!isTransactionStarted(),
648+
"Cannot set default isolation level while a transaction is active");
647649
setConnectionPropertyValue(DEFAULT_ISOLATION_LEVEL, isolationLevel);
648650
clearLastTransactionAndSetDefaultTransactionOptions();
649651
}

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionProperties.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,11 +407,15 @@ public class ConnectionProperties {
407407
static final ConnectionProperty<IsolationLevel> DEFAULT_ISOLATION_LEVEL =
408408
create(
409409
"default_isolation_level",
410-
"The transaction isolation level that is used by default for read/write transactions. "
411-
+ "The default is isolation_level_unspecified, which means that the connection will use the "
410+
"The transaction isolation level that is used by default for read/write transactions. "
411+
+ "The default is isolation_level_unspecified, which means that the connection will use the "
412412
+ "default isolation level of the database that it is connected to.",
413413
IsolationLevel.ISOLATION_LEVEL_UNSPECIFIED,
414-
new IsolationLevel[]{IsolationLevel.ISOLATION_LEVEL_UNSPECIFIED, IsolationLevel.SERIALIZABLE, IsolationLevel.REPEATABLE_READ},
414+
new IsolationLevel[] {
415+
IsolationLevel.ISOLATION_LEVEL_UNSPECIFIED,
416+
IsolationLevel.SERIALIZABLE,
417+
IsolationLevel.REPEATABLE_READ
418+
},
415419
IsolationLevelConverter.INSTANCE,
416420
Context.USER);
417421
static final ConnectionProperty<AutocommitDmlMode> AUTOCOMMIT_DML_MODE =

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionState.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,16 +251,17 @@ private <T> void internalSetValue(
251251
newValue.setValue(value, context);
252252
currentProperties.put(property.getKey(), newValue);
253253
}
254-
254+
255255
static <T> void checkValidValue(ConnectionProperty<T> property, T value) {
256256
if (property.getValidValues() == null || property.getValidValues().length == 0) {
257257
return;
258258
}
259-
if (Arrays.stream(property.getValidValues()).noneMatch(validValue -> Objects.equals(validValue, value))) {
259+
if (Arrays.stream(property.getValidValues())
260+
.noneMatch(validValue -> Objects.equals(validValue, value))) {
260261
throw invalidParamValueError(property, value);
261262
}
262263
}
263-
264+
264265
/** Creates an exception for an invalid value for a connection property. */
265266
static <T> SpannerException invalidParamValueError(ConnectionProperty<T> property, T value) {
266267
return SpannerExceptionFactory.newSpannerException(

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ReadWriteTransaction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ Builder setSavepointSupport(SavepointSupport savepointSupport) {
253253
this.savepointSupport = savepointSupport;
254254
return this;
255255
}
256-
256+
257257
Builder setIsolationLevel(IsolationLevel isolationLevel) {
258258
this.isolationLevel = Preconditions.checkNotNull(isolationLevel);
259259
return this;

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/SingleUseTransaction.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,8 @@ private TransactionRunner createWriteTransaction() {
510510
if (connectionState.getValue(MAX_COMMIT_DELAY).getValue() != null) {
511511
numOptions++;
512512
}
513-
if (connectionState.getValue(DEFAULT_ISOLATION_LEVEL).getValue() != IsolationLevel.ISOLATION_LEVEL_UNSPECIFIED) {
513+
if (connectionState.getValue(DEFAULT_ISOLATION_LEVEL).getValue()
514+
!= IsolationLevel.ISOLATION_LEVEL_UNSPECIFIED) {
514515
numOptions++;
515516
}
516517
if (numOptions == 0) {
@@ -531,8 +532,10 @@ private TransactionRunner createWriteTransaction() {
531532
options[index++] =
532533
Options.maxCommitDelay(connectionState.getValue(MAX_COMMIT_DELAY).getValue());
533534
}
534-
if (connectionState.getValue(DEFAULT_ISOLATION_LEVEL).getValue() != IsolationLevel.ISOLATION_LEVEL_UNSPECIFIED) {
535-
options[index++] = Options.isolationLevel(connectionState.getValue(DEFAULT_ISOLATION_LEVEL).getValue());
535+
if (connectionState.getValue(DEFAULT_ISOLATION_LEVEL).getValue()
536+
!= IsolationLevel.ISOLATION_LEVEL_UNSPECIFIED) {
537+
options[index++] =
538+
Options.isolationLevel(connectionState.getValue(DEFAULT_ISOLATION_LEVEL).getValue());
536539
}
537540
return dbClient.readWriteTransaction(options);
538541
}

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/AutoCommitMockServerTest.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,14 @@
3131
import java.util.Collections;
3232
import org.junit.Test;
3333
import org.junit.runner.RunWith;
34-
import org.junit.runners.JUnit4;
3534
import org.junit.runners.Parameterized;
3635
import org.junit.runners.Parameterized.Parameter;
3736
import org.junit.runners.Parameterized.Parameters;
3837

3938
@RunWith(Parameterized.class)
4039
public class AutoCommitMockServerTest extends AbstractMockServerTest {
4140

42-
@Parameter
43-
public IsolationLevel isolationLevel;
41+
@Parameter public IsolationLevel isolationLevel;
4442

4543
@Parameters(name = "isolationLevel = {0}")
4644
public static Object[] data() {
@@ -49,7 +47,10 @@ public static Object[] data() {
4947

5048
@Override
5149
protected ITConnection createConnection() {
52-
return createConnection(Collections.emptyList(), Collections.emptyList(), String.format(";default_isolation_level=%s", isolationLevel));
50+
return createConnection(
51+
Collections.emptyList(),
52+
Collections.emptyList(),
53+
String.format(";default_isolation_level=%s", isolationLevel));
5354
}
5455

5556
@Test
@@ -63,7 +64,9 @@ public void testQuery() {
6364
ExecuteSqlRequest request = mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(0);
6465
assertTrue(request.getTransaction().hasSingleUse());
6566
assertTrue(request.getTransaction().getSingleUse().hasReadOnly());
66-
assertEquals(IsolationLevel.ISOLATION_LEVEL_UNSPECIFIED, request.getTransaction().getSingleUse().getIsolationLevel());
67+
assertEquals(
68+
IsolationLevel.ISOLATION_LEVEL_UNSPECIFIED,
69+
request.getTransaction().getSingleUse().getIsolationLevel());
6770
assertFalse(request.getLastStatement());
6871
}
6972

@@ -128,7 +131,8 @@ public void testPartitionedDml() {
128131
BeginTransactionRequest beginRequest =
129132
mockSpanner.getRequestsOfType(BeginTransactionRequest.class).get(0);
130133
assertTrue(beginRequest.getOptions().hasPartitionedDml());
131-
assertEquals(IsolationLevel.ISOLATION_LEVEL_UNSPECIFIED, beginRequest.getOptions().getIsolationLevel());
134+
assertEquals(
135+
IsolationLevel.ISOLATION_LEVEL_UNSPECIFIED, beginRequest.getOptions().getIsolationLevel());
132136
assertEquals(1, mockSpanner.countRequestsOfType(ExecuteSqlRequest.class));
133137
ExecuteSqlRequest request = mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(0);
134138
assertTrue(request.getTransaction().hasId());

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/RunTransactionMockServerTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,10 @@ public void testRunTransaction() {
5454
}
5555
assertEquals(2, mockSpanner.countRequestsOfType(ExecuteSqlRequest.class));
5656
assertEquals(1, mockSpanner.countRequestsOfType(CommitRequest.class));
57-
TransactionOptions transactionOptions = mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(0).getTransaction().getBegin();
57+
TransactionOptions transactionOptions =
58+
mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(0).getTransaction().getBegin();
5859
assertEquals(isolationLevel, transactionOptions.getIsolationLevel());
59-
60+
6061
mockSpanner.clearRequests();
6162
}
6263
}
@@ -77,7 +78,8 @@ public void testRunTransactionInAutoCommit() {
7778
}
7879
assertEquals(2, mockSpanner.countRequestsOfType(ExecuteSqlRequest.class));
7980
assertEquals(1, mockSpanner.countRequestsOfType(CommitRequest.class));
80-
TransactionOptions transactionOptions = mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(0).getTransaction().getBegin();
81+
TransactionOptions transactionOptions =
82+
mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(0).getTransaction().getBegin();
8183
assertEquals(isolationLevel, transactionOptions.getIsolationLevel());
8284

8385
mockSpanner.clearRequests();

google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/TransactionMockServerTest.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,35 @@
2121
import static org.junit.Assert.assertFalse;
2222
import static org.junit.Assert.assertTrue;
2323

24-
import com.google.cloud.spanner.Dialect;
2524
import com.google.cloud.spanner.ResultSet;
2625
import com.google.cloud.spanner.connection.ITAbstractSpannerTest.ITConnection;
27-
import com.google.spanner.v1.BeginTransactionRequest;
2826
import com.google.spanner.v1.CommitRequest;
2927
import com.google.spanner.v1.ExecuteBatchDmlRequest;
3028
import com.google.spanner.v1.ExecuteSqlRequest;
3129
import com.google.spanner.v1.TransactionOptions.IsolationLevel;
3230
import java.util.Collections;
3331
import org.junit.Test;
3432
import org.junit.runner.RunWith;
35-
import org.junit.runners.JUnit4;
3633
import org.junit.runners.Parameterized;
3734
import org.junit.runners.Parameterized.Parameter;
3835
import org.junit.runners.Parameterized.Parameters;
39-
import org.openjdk.jmh.annotations.Param;
4036

4137
@RunWith(Parameterized.class)
4238
public class TransactionMockServerTest extends AbstractMockServerTest {
4339

44-
@Parameter
45-
public IsolationLevel isolationLevel;
40+
@Parameter public IsolationLevel isolationLevel;
4641

4742
@Parameters(name = "isolationLevel = {0}")
4843
public static Object[] data() {
4944
return DEFAULT_ISOLATION_LEVEL.getValidValues();
5045
}
51-
46+
5247
@Override
5348
protected ITConnection createConnection() {
54-
return createConnection(Collections.emptyList(), Collections.emptyList(), String.format(";default_isolation_level=%s", isolationLevel));
49+
return createConnection(
50+
Collections.emptyList(),
51+
Collections.emptyList(),
52+
String.format(";default_isolation_level=%s", isolationLevel));
5553
}
5654

5755
@Test

0 commit comments

Comments
 (0)