lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2026-02-26 05:32:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use Java 17 constructs

Browse Source
This commit is contained in:
Stephane Nicoll
2022-11-08 16:35:59 +09:00
parent d88285934c
commit ec48337dac
20 changed files with 76 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
initializr-metadata/src/main/java/io/spring/initializr/metadata/Dependency.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
package io.spring.initializr.metadata;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
@@ -74,8 +72,8 @@ public class Dependency extends MetadataElement implements Describable {
/**
* All scope types.
*/
public static final List<String> SCOPE_ALL = Collections.unmodifiableList(Arrays.asList(SCOPE_COMPILE,
SCOPE_RUNTIME, SCOPE_COMPILE_ONLY, SCOPE_ANNOTATION_PROCESSOR, SCOPE_PROVIDED, SCOPE_TEST));
public static final List<String> SCOPE_ALL = List.of(SCOPE_COMPILE, SCOPE_RUNTIME, SCOPE_COMPILE_ONLY,
SCOPE_ANNOTATION_PROCESSOR, SCOPE_PROVIDED, SCOPE_TEST);
private List<String> aliases = new ArrayList<>();

14
initializr-metadata/src/main/java/io/spring/initializr/metadata/SingleSelectCapability.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -85,13 +85,11 @@ public class SingleSelectCapability extends ServiceCapability<List<DefaultMetada
@Override
public void merge(List<DefaultMetadataElement> otherContent) {
withWritableContent((content) -> {
otherContent.forEach((it) -> {
if (get(it.getId()) == null) {
this.content.add(it);
}
});
});
withWritableContent((content) -> otherContent.forEach((it) -> {
if (get(it.getId()) == null) {
this.content.add(it);
}
}));
}
private <T> T withReadableContent(Function<List<DefaultMetadataElement>, T> consumer) {

26
initializr-metadata/src/main/java/io/spring/initializr/metadata/support/MetadataBuildItemMapper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -51,21 +51,15 @@ public final class MetadataBuildItemMapper {
}
private static DependencyScope toDependencyScope(String scope) {
switch (scope) {
case Dependency.SCOPE_ANNOTATION_PROCESSOR:
return DependencyScope.ANNOTATION_PROCESSOR;
case Dependency.SCOPE_COMPILE:
return DependencyScope.COMPILE;
case Dependency.SCOPE_RUNTIME:
return DependencyScope.RUNTIME;
case Dependency.SCOPE_COMPILE_ONLY:
return DependencyScope.COMPILE_ONLY;
case Dependency.SCOPE_PROVIDED:
return DependencyScope.PROVIDED_RUNTIME;
case Dependency.SCOPE_TEST:
return DependencyScope.TEST_COMPILE;
}
return null;
return switch (scope) {
case Dependency.SCOPE_ANNOTATION_PROCESSOR -> DependencyScope.ANNOTATION_PROCESSOR;
case Dependency.SCOPE_COMPILE -> DependencyScope.COMPILE;
case Dependency.SCOPE_RUNTIME -> DependencyScope.RUNTIME;
case Dependency.SCOPE_COMPILE_ONLY -> DependencyScope.COMPILE_ONLY;
case Dependency.SCOPE_PROVIDED -> DependencyScope.PROVIDED_RUNTIME;
case Dependency.SCOPE_TEST -> DependencyScope.TEST_COMPILE;
default -> null;
};
}
/**