File tree Expand file tree Collapse file tree 3 files changed +5
-21
lines changed
main/java/org/apache/seatunnel/api/configuration
test/java/org/apache/seatunnel/api/configuration
seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/config Expand file tree Collapse file tree 3 files changed +5
-21
lines changed Original file line number Diff line number Diff line change @@ -106,7 +106,7 @@ public <T> Optional<T> getOptional(Option<T> option) {
106106 }
107107 }
108108 if (value == null ) {
109- return Optional .ofNullable ( option . defaultValue () );
109+ return Optional .empty ( );
110110 }
111111 return Optional .of (convertValue (value , option ));
112112 }
Original file line number Diff line number Diff line change 3434import java .util .HashMap ;
3535import java .util .List ;
3636import java .util .Map ;
37- import java .util .Optional ;
3837
3938@ SuppressWarnings ("checkstyle:StaticVariableName" )
4039public class ReadableConfigTest {
@@ -299,18 +298,4 @@ public void testFallbackKey() {
299298 readonlyConfig = ReadonlyConfig .fromMap (map );
300299 Assertions .assertEquals ("ark" , readonlyConfig .get (usernameOption ));
301300 }
302-
303- @ Test
304- public void testOptional () {
305- Optional <String > notDefaultVal =
306- ReadonlyConfig .fromMap (new HashMap <>())
307- .getOptional (Options .key ("option.not-exist" ).stringType ().noDefaultValue ());
308- Assertions .assertFalse (notDefaultVal .isPresent ());
309- Optional <String > defaultVal =
310- ReadonlyConfig .fromMap (new HashMap <>())
311- .getOptional (
312- Options .key ("option.exist" ).stringType ().defaultValue ("default" ));
313- Assertions .assertTrue (defaultVal .isPresent ());
314- Assertions .assertEquals ("default" , defaultVal .get ());
315- }
316301}
Original file line number Diff line number Diff line change @@ -51,11 +51,10 @@ public static JdbcSinkConfig of(ReadonlyConfig config) {
5151 config .getOptional (JdbcOptions .PRIMARY_KEYS ).ifPresent (builder ::primaryKeys );
5252 config .getOptional (JdbcOptions .DATABASE ).ifPresent (builder ::database );
5353 config .getOptional (JdbcOptions .TABLE ).ifPresent (builder ::table );
54- config .getOptional (ENABLE_UPSERT ).ifPresent (builder ::enableUpsert );
55- config .getOptional (IS_PRIMARY_KEY_UPDATED ).ifPresent (builder ::isPrimaryKeyUpdated );
56- config .getOptional (SUPPORT_UPSERT_BY_INSERT_ONLY )
57- .ifPresent (builder ::supportUpsertByInsertOnly );
58- config .getOptional (JdbcOptions .QUERY ).ifPresent (builder ::simpleSql );
54+ builder .enableUpsert (config .get (ENABLE_UPSERT ));
55+ builder .isPrimaryKeyUpdated (config .get (IS_PRIMARY_KEY_UPDATED ));
56+ builder .supportUpsertByInsertOnly (config .get (SUPPORT_UPSERT_BY_INSERT_ONLY ));
57+ builder .simpleSql (config .get (JdbcOptions .QUERY ));
5958 return builder .build ();
6059 }
6160}
You can’t perform that action at this time.
0 commit comments