Skip to content

Commit 965b89a

Browse files
asashourasashour
committed
Revert needed code.
1 parent 369fa53 commit 965b89a

File tree

4 files changed

+78
-64
lines changed

4 files changed

+78
-64
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -232,94 +232,95 @@ private void configureProperties(FluentConfiguration configuration, FlywayProper
232232
.toArray(new String[0]);
233233
configuration.locations(locations);
234234
map.from(properties.isFailOnMissingLocations())
235-
.to(configuration::failOnMissingLocations);
236-
map.from(properties.getEncoding()).to(configuration::encoding);
235+
.to((failOnMissingLocations) -> configuration.failOnMissingLocations(failOnMissingLocations));
236+
map.from(properties.getEncoding()).to((encoding) -> configuration.encoding(encoding));
237237
map.from(properties.getConnectRetries())
238-
.to(configuration::connectRetries);
238+
.to((connectRetries) -> configuration.connectRetries(connectRetries));
239239
map.from(properties.getConnectRetriesInterval())
240240
.as(Duration::getSeconds)
241241
.as(Long::intValue)
242-
.to(configuration::connectRetriesInterval);
242+
.to((connectRetriesInterval) -> configuration.connectRetriesInterval(connectRetriesInterval));
243243
map.from(properties.getLockRetryCount())
244-
.to(configuration::lockRetryCount);
245-
map.from(properties.getDefaultSchema()).to(configuration::defaultSchema);
244+
.to((lockRetryCount) -> configuration.lockRetryCount(lockRetryCount));
245+
map.from(properties.getDefaultSchema()).to((schema) -> configuration.defaultSchema(schema));
246246
map.from(properties.getSchemas())
247247
.as(StringUtils::toStringArray)
248-
.to(configuration::schemas);
249-
map.from(properties.isCreateSchemas()).to(configuration::createSchemas);
250-
map.from(properties.getTable()).to(configuration::table);
251-
map.from(properties.getTablespace()).to(configuration::tablespace);
248+
.to((schemas) -> configuration.schemas(schemas));
249+
map.from(properties.isCreateSchemas()).to((createSchemas) -> configuration.createSchemas(createSchemas));
250+
map.from(properties.getTable()).to((table) -> configuration.table(table));
251+
map.from(properties.getTablespace()).to((tablespace) -> configuration.tablespace(tablespace));
252252
map.from(properties.getBaselineDescription())
253-
.to(configuration::baselineDescription);
253+
.to((baselineDescription) -> configuration.baselineDescription(baselineDescription));
254254
map.from(properties.getBaselineVersion())
255-
.to(configuration::baselineVersion);
256-
map.from(properties.getInstalledBy()).to(configuration::installedBy);
257-
map.from(properties.getPlaceholders()).to(configuration::placeholders);
255+
.to((baselineVersion) -> configuration.baselineVersion(baselineVersion));
256+
map.from(properties.getInstalledBy()).to((installedBy) -> configuration.installedBy(installedBy));
257+
map.from(properties.getPlaceholders()).to((placeholders) -> configuration.placeholders(placeholders));
258258
map.from(properties.getPlaceholderPrefix())
259-
.to(configuration::placeholderPrefix);
259+
.to((placeholderPrefix) -> configuration.placeholderPrefix(placeholderPrefix));
260260
map.from(properties.getPlaceholderSuffix())
261-
.to(configuration::placeholderSuffix);
261+
.to((placeholderSuffix) -> configuration.placeholderSuffix(placeholderSuffix));
262262
map.from(properties.getPlaceholderSeparator())
263-
.to(configuration::placeholderSeparator);
263+
.to((placeHolderSeparator) -> configuration.placeholderSeparator(placeHolderSeparator));
264264
map.from(properties.isPlaceholderReplacement())
265-
.to(configuration::placeholderReplacement);
265+
.to((placeholderReplacement) -> configuration.placeholderReplacement(placeholderReplacement));
266266
map.from(properties.getSqlMigrationPrefix())
267-
.to(configuration::sqlMigrationPrefix);
267+
.to((sqlMigrationPrefix) -> configuration.sqlMigrationPrefix(sqlMigrationPrefix));
268268
map.from(properties.getSqlMigrationSuffixes())
269269
.as(StringUtils::toStringArray)
270-
.to(configuration::sqlMigrationSuffixes);
270+
.to((sqlMigrationSuffixes) -> configuration.sqlMigrationSuffixes(sqlMigrationSuffixes));
271271
map.from(properties.getSqlMigrationSeparator())
272-
.to(configuration::sqlMigrationSeparator);
272+
.to((sqlMigrationSeparator) -> configuration.sqlMigrationSeparator(sqlMigrationSeparator));
273273
map.from(properties.getRepeatableSqlMigrationPrefix())
274-
.to(configuration::repeatableSqlMigrationPrefix);
275-
map.from(properties.getTarget()).to(configuration::target);
274+
.to((repeatableSqlMigrationPrefix) -> configuration
275+
.repeatableSqlMigrationPrefix(repeatableSqlMigrationPrefix));
276+
map.from(properties.getTarget()).to((target) -> configuration.target(target));
276277
map.from(properties.isBaselineOnMigrate())
277-
.to(configuration::baselineOnMigrate);
278-
map.from(properties.isCleanDisabled()).to(configuration::cleanDisabled);
278+
.to((baselineOnMigrate) -> configuration.baselineOnMigrate(baselineOnMigrate));
279+
map.from(properties.isCleanDisabled()).to((cleanDisabled) -> configuration.cleanDisabled(cleanDisabled));
279280
map.from(properties.isCleanOnValidationError())
280-
.to(configuration::cleanOnValidationError);
281-
map.from(properties.isGroup()).to(configuration::group);
282-
map.from(properties.isMixed()).to(configuration::mixed);
283-
map.from(properties.isOutOfOrder()).to(configuration::outOfOrder);
281+
.to((cleanOnValidationError) -> configuration.cleanOnValidationError(cleanOnValidationError));
282+
map.from(properties.isGroup()).to((group) -> configuration.group(group));
283+
map.from(properties.isMixed()).to((mixed) -> configuration.mixed(mixed));
284+
map.from(properties.isOutOfOrder()).to((outOfOrder) -> configuration.outOfOrder(outOfOrder));
284285
map.from(properties.isSkipDefaultCallbacks())
285-
.to(configuration::skipDefaultCallbacks);
286+
.to((skipDefaultCallbacks) -> configuration.skipDefaultCallbacks(skipDefaultCallbacks));
286287
map.from(properties.isSkipDefaultResolvers())
287-
.to(configuration::skipDefaultResolvers);
288+
.to((skipDefaultResolvers) -> configuration.skipDefaultResolvers(skipDefaultResolvers));
288289
map.from(properties.isValidateMigrationNaming())
289-
.to(configuration::validateMigrationNaming);
290+
.to((validateMigrationNaming) -> configuration.validateMigrationNaming(validateMigrationNaming));
290291
map.from(properties.isValidateOnMigrate())
291-
.to(configuration::validateOnMigrate);
292+
.to((validateOnMigrate) -> configuration.validateOnMigrate(validateOnMigrate));
292293
map.from(properties.getInitSqls())
293294
.whenNot(CollectionUtils::isEmpty)
294295
.as((initSqls) -> StringUtils.collectionToDelimitedString(initSqls, "\n"))
295-
.to(configuration::initSql);
296+
.to((initSql) -> configuration.initSql(initSql));
296297
map.from(properties.getScriptPlaceholderPrefix())
297-
.to(configuration::scriptPlaceholderPrefix);
298+
.to((prefix) -> configuration.scriptPlaceholderPrefix(prefix));
298299
map.from(properties.getScriptPlaceholderSuffix())
299-
.to(configuration::scriptPlaceholderSuffix);
300+
.to((suffix) -> configuration.scriptPlaceholderSuffix(suffix));
300301
configureExecuteInTransaction(configuration, properties, map);
301-
map.from(properties::getLoggers).to(configuration::loggers);
302+
map.from(properties::getLoggers).to((loggers) -> configuration.loggers(loggers));
302303
// Flyway Teams properties
303-
map.from(properties.getBatch()).to(configuration::batch);
304-
map.from(properties.getDryRunOutput()).to(configuration::dryRunOutput);
304+
map.from(properties.getBatch()).to((batch) -> configuration.batch(batch));
305+
map.from(properties.getDryRunOutput()).to((dryRunOutput) -> configuration.dryRunOutput(dryRunOutput));
305306
map.from(properties.getErrorOverrides())
306-
.to(configuration::errorOverrides);
307-
map.from(properties.getStream()).to(configuration::stream);
307+
.to((errorOverrides) -> configuration.errorOverrides(errorOverrides));
308+
map.from(properties.getStream()).to((stream) -> configuration.stream(stream));
308309
map.from(properties.getJdbcProperties())
309310
.whenNot(Map::isEmpty)
310-
.to(configuration::jdbcProperties);
311+
.to((jdbcProperties) -> configuration.jdbcProperties(jdbcProperties));
311312
map.from(properties.getKerberosConfigFile())
312-
.to(configuration::kerberosConfigFile);
313+
.to((configFile) -> configuration.kerberosConfigFile(configFile));
313314
map.from(properties.getOutputQueryResults())
314-
.to(configuration::outputQueryResults);
315+
.to((outputQueryResults) -> configuration.outputQueryResults(outputQueryResults));
315316
map.from(properties.getSkipExecutingMigrations())
316-
.to(configuration::skipExecutingMigrations);
317+
.to((skipExecutingMigrations) -> configuration.skipExecutingMigrations(skipExecutingMigrations));
317318
map.from(properties.getIgnoreMigrationPatterns())
318319
.whenNot(List::isEmpty)
319320
.to((ignoreMigrationPatterns) -> configuration
320321
.ignoreMigrationPatterns(ignoreMigrationPatterns.toArray(new String[0])));
321322
map.from(properties.getDetectEncoding())
322-
.to(configuration::detectEncoding);
323+
.to((detectEncoding) -> configuration.detectEncoding(detectEncoding));
323324
}
324325

325326
private void configureExecuteInTransaction(FluentConfiguration configuration, FlywayProperties properties,
@@ -508,13 +509,13 @@ public void customize(FluentConfiguration configuration) {
508509
OracleConfigurationExtension.class, "Oracle");
509510
Oracle properties = this.properties.getOracle();
510511
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
511-
map.from(properties::getSqlplus).to(extension.via(OracleConfigurationExtension::setSqlplus));
512+
map.from(properties::getSqlplus).to(extension.via((ext, sqlplus) -> ext.setSqlplus(sqlplus)));
512513
map.from(properties::getSqlplusWarn)
513-
.to(extension.via(OracleConfigurationExtension::setSqlplusWarn));
514+
.to(extension.via((ext, sqlplusWarn) -> ext.setSqlplusWarn(sqlplusWarn)));
514515
map.from(properties::getWalletLocation)
515-
.to(extension.via(OracleConfigurationExtension::setWalletLocation));
516+
.to(extension.via((ext, walletLocation) -> ext.setWalletLocation(walletLocation)));
516517
map.from(properties::getKerberosCacheFile)
517-
.to(extension.via(OracleConfigurationExtension::setKerberosCacheFile));
518+
.to(extension.via((ext, kerberosCacheFile) -> ext.setKerberosCacheFile(kerberosCacheFile)));
518519
}
519520

520521
}
@@ -535,7 +536,7 @@ public void customize(FluentConfiguration configuration) {
535536
Postgresql properties = this.properties.getPostgresql();
536537
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
537538
map.from(properties::getTransactionalLock)
538-
.to(extension.via(PostgreSQLConfigurationExtension::setTransactionalLock));
539+
.to(extension.via((ext, transactionalLock) -> ext.setTransactionalLock(transactionalLock)));
539540
}
540541

541542
}
@@ -571,7 +572,7 @@ private void setKerberosLoginFile(SQLServerConfigurationExtension configuration,
571572
*/
572573
static class Extension<E extends ConfigurationExtension> {
573574

574-
private final SingletonSupplier<E> extension;
575+
private SingletonSupplier<E> extension;
575576

576577
Extension(FluentConfiguration configuration, Class<E> type, String name) {
577578
this.extension = SingletonSupplier.of(() -> {

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@ public class ArtifactsLibraries implements Libraries {
5050
private static final Map<String, LibraryScope> SCOPES;
5151

5252
static {
53-
SCOPES = Map.of(Artifact.SCOPE_COMPILE, LibraryScope.COMPILE, Artifact.SCOPE_RUNTIME, LibraryScope.RUNTIME, Artifact.SCOPE_PROVIDED, LibraryScope.PROVIDED, Artifact.SCOPE_SYSTEM, LibraryScope.PROVIDED);
53+
Map<String, LibraryScope> libraryScopes = new HashMap<>();
54+
libraryScopes.put(Artifact.SCOPE_COMPILE, LibraryScope.COMPILE);
55+
libraryScopes.put(Artifact.SCOPE_RUNTIME, LibraryScope.RUNTIME);
56+
libraryScopes.put(Artifact.SCOPE_PROVIDED, LibraryScope.PROVIDED);
57+
libraryScopes.put(Artifact.SCOPE_SYSTEM, LibraryScope.PROVIDED);
58+
SCOPES = Collections.unmodifiableMap(libraryScopes);
5459
}
5560

5661
private final Set<Artifact> artifacts;

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiPropertySource.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,16 @@ public class AnsiPropertySource extends PropertySource<AnsiElement> {
4848
private static final Iterable<Mapping> MAPPINGS;
4949

5050
static {
51-
MAPPINGS = List.of(new EnumMapping<>("AnsiStyle.", AnsiStyle.class),
52-
new EnumMapping<>("AnsiColor.", AnsiColor.class),
53-
new Ansi8BitColorMapping("AnsiColor.", Ansi8BitColor::foreground),
54-
new EnumMapping<>("AnsiBackground.", AnsiBackground.class),
55-
new Ansi8BitColorMapping("AnsiBackground.", Ansi8BitColor::background),
56-
new EnumMapping<>("Ansi.", AnsiStyle.class), new EnumMapping<>("Ansi.", AnsiColor.class),
57-
new EnumMapping<>("Ansi.BG_", AnsiBackground.class));
51+
List<Mapping> mappings = new ArrayList<>();
52+
mappings.add(new EnumMapping<>("AnsiStyle.", AnsiStyle.class));
53+
mappings.add(new EnumMapping<>("AnsiColor.", AnsiColor.class));
54+
mappings.add(new Ansi8BitColorMapping("AnsiColor.", Ansi8BitColor::foreground));
55+
mappings.add(new EnumMapping<>("AnsiBackground.", AnsiBackground.class));
56+
mappings.add(new Ansi8BitColorMapping("AnsiBackground.", Ansi8BitColor::background));
57+
mappings.add(new EnumMapping<>("Ansi.", AnsiStyle.class));
58+
mappings.add(new EnumMapping<>("Ansi.", AnsiColor.class));
59+
mappings.add(new EnumMapping<>("Ansi.BG_", AnsiBackground.class));
60+
MAPPINGS = Collections.unmodifiableList(mappings);
5861
}
5962

6063
private final boolean encode;

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/ApplicationPidFileWriter.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,20 @@ public class ApplicationPidFileWriter implements ApplicationListener<SpringAppli
7070
private static final List<Property> FILE_PROPERTIES;
7171

7272
static {
73-
FILE_PROPERTIES = List.of(new SpringProperty("spring.pid.", "file"), new SpringProperty("spring.", "pidfile"),
74-
new SystemProperty("PIDFILE"));
73+
List<Property> properties = new ArrayList<>();
74+
properties.add(new SpringProperty("spring.pid.", "file"));
75+
properties.add(new SpringProperty("spring.", "pidfile"));
76+
properties.add(new SystemProperty("PIDFILE"));
77+
FILE_PROPERTIES = Collections.unmodifiableList(properties);
7578
}
7679

7780
private static final List<Property> FAIL_ON_WRITE_ERROR_PROPERTIES;
7881

7982
static {
80-
FAIL_ON_WRITE_ERROR_PROPERTIES = List.of(new SpringProperty("spring.pid.", "fail-on-write-error"),
81-
new SystemProperty("PID_FAIL_ON_WRITE_ERROR"));
83+
List<Property> properties = new ArrayList<>();
84+
properties.add(new SpringProperty("spring.pid.", "fail-on-write-error"));
85+
properties.add(new SystemProperty("PID_FAIL_ON_WRITE_ERROR"));
86+
FAIL_ON_WRITE_ERROR_PROPERTIES = Collections.unmodifiableList(properties);
8287
}
8388

8489
private static final AtomicBoolean created = new AtomicBoolean();

0 commit comments

Comments
 (0)