Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Boot 3.x

Browse Source 
- For now port spring-native to framework config.
- 3rd party configs should go somewhere else.
- Fix changes from javax to jakarta.
- Change java settings as we now require jdk 17.
- Fixes #385
This commit is contained in:
Janne Valkealahti
2022-07-24 08:07:14 +01:00
parent 218abd7095
commit e193ca1d24
41 changed files with 589 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/ci-pr.yml vendored
View File

@@ -11,15 +11,9 @@ jobs:
fail-fast: false
matrix:
include:
- nickname: linux jdk8
java: 8
disable-samples: true
- nickname: linux jdk11
java: 11
disable-samples: false
- nickname: linux jdk17
java: 17
disable-samples: false
disable-samples: true
name: CI PR ${{ matrix.nickname }}
steps:
- uses: actions/checkout@v2

2
.github/workflows/ci-publish.yml vendored
View File

@@ -18,7 +18,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 8
java-version: 17
- uses: jfrog/setup-jfrog-cli@v2
with:
version: 2.13.0

8
.github/workflows/ci.yml vendored
View File

@@ -13,15 +13,9 @@ jobs:
fail-fast: false
matrix:
include:
- nickname: linux jdk8
java: 8
disable-samples: true
- nickname: linux jdk11
java: 11
disable-samples: false
- nickname: linux jdk17
java: 17
disable-samples: false
disable-samples: true
name: CI Build ${{ matrix.nickname }}
steps:
- uses: actions/checkout@v2

4
.github/workflows/e2e.yml vendored
View File

@@ -27,12 +27,12 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
java-version: 17
cache: maven
- uses: graalvm/setup-graalvm@v1
with:
version: ${{ matrix.graal }}
java-version: 11
java-version: 17
components: native-image
set-java-home: false
github-token: ${{ secrets.GITHUB_TOKEN }}

11
.github/workflows/manual.yml vendored
View File

@@ -22,20 +22,15 @@ jobs:
name: Build ${{ matrix.nickname }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
cache: maven
- uses: graalvm/setup-graalvm@v1
with:
version: ${{ matrix.graal }}
java-version: 11
java-version: 17
components: native-image
set-java-home: false
set-java-home: true
github-token: ${{ secrets.GITHUB_TOKEN }}
- run: |
./mvnw clean package -Pnative
./mvnw clean package -Pnativex
- uses: actions/upload-artifact@v2
with:
name: spring-shell-samples-${{ matrix.nickname }}

2
.github/workflows/next-dev-version.yml vendored
View File

@@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 17
- uses: jvalkeal/setup-maven@v1
with:
maven-version: 3.8.4

2
.github/workflows/release-ga.yml vendored
View File

@@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 17
- uses: jvalkeal/setup-maven@v1
with:
maven-version: 3.8.4

2
.github/workflows/release-milestone.yml vendored
View File

@@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 17
- uses: jvalkeal/setup-maven@v1
with:
maven-version: 3.8.4

4
e2e/spring-shell-e2e-tests/src/utils.ts
View File

@@ -7,8 +7,8 @@ export const cliPathRelative = isWindows
? '..\\..\\spring-shell-samples\\target\\spring-shell-samples.exe'
: '../../spring-shell-samples/target/spring-shell-samples';
export const jarPathRelative = isWindows
? '..\\..\\spring-shell-samples\\target\\spring-shell-samples-2.1.0-SNAPSHOT-exec.jar'
: '../../spring-shell-samples/target/spring-shell-samples-2.1.0-SNAPSHOT-exec.jar';
? '..\\..\\spring-shell-samples\\target\\spring-shell-samples-3.0.0-SNAPSHOT-exec.jar'
: '../../spring-shell-samples/target/spring-shell-samples-3.0.0-SNAPSHOT-exec.jar';
export const cliPath = path.resolve(cliPathRelative);
export const jarPath = path.resolve(jarPathRelative);
export const nativeDesc = 'native';

11
pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.2</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath />
</parent>
<scm>
@@ -22,6 +22,7 @@
</scm>
<properties>
<java.version>17</java.version>
<jline.version>3.21.0</jline.version>
<antlr-st4.version>4.3.1</antlr-st4.version>
<jimfs.version>1.2</jimfs.version>
@@ -107,14 +108,6 @@
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

32
spring-shell-core/src/main/java/org/springframework/shell/CoreResourcesRuntimeHints.java Normal file
View File

@@ -0,0 +1,32 @@
/*
* Copyright 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.shell;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
/**
* {@link RuntimeHintsRegistrar} for Shell Core resources.
*
* @author Janne Valkealahti
*/
class CoreResourcesRuntimeHints implements RuntimeHintsRegistrar {
@Override
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
hints.resources().registerPattern("org/springframework/shell/component/*.stg");
}
}

3
spring-shell-core/src/main/java/org/springframework/shell/ParameterValidationException.java
View File

@@ -15,9 +15,10 @@
*/
package org.springframework.shell;
import javax.validation.ConstraintViolation;
import java.util.Set;
import jakarta.validation.ConstraintViolation;
/**
* Thrown when one or more parameters fail bean validation constraints.
*

4
spring-shell-core/src/main/java/org/springframework/shell/Shell.java
View File

@@ -24,8 +24,8 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
import jakarta.validation.Validator;
import jakarta.validation.ValidatorFactory;
import org.jline.terminal.Terminal;
import org.jline.utils.Signals;

6
spring-shell-core/src/main/java/org/springframework/shell/Utils.java
View File

@@ -28,9 +28,9 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
import javax.validation.Validation;
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
import jakarta.validation.Validation;
import jakarta.validation.Validator;
import jakarta.validation.ValidatorFactory;
import org.springframework.core.DefaultParameterNameDiscoverer;
import org.springframework.core.MethodParameter;

2
spring-shell-core/src/main/java/org/springframework/shell/command/CommandExecution.java
View File

@@ -19,7 +19,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.validation.Validator;
import jakarta.validation.Validator;
import org.jline.terminal.Terminal;

4
spring-shell-core/src/main/java/org/springframework/shell/command/invocation/InvocableShellMethod.java
View File

@@ -24,8 +24,8 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.Validator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

9
spring-shell-core/src/main/resources/META-INF/native-image/resource-config.json
View File

@@ -1,9 +0,0 @@
{
"resources": {
"includes": [
{
"pattern": "org/springframework/shell/component/.*.stg"
}
]
}
}

2
spring-shell-core/src/main/resources/META-INF/spring/aot.factories Normal file
View File

@@ -0,0 +1,2 @@
org.springframework.aot.hint.RuntimeHintsRegistrar=\
org.springframework.shell.CoreResourcesRuntimeHints

2
spring-shell-docs/src/test/java/org/springframework/shell/docs/CommandContextSnippets.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.shell.docs;
import javax.validation.constraints.Null;
import jakarta.validation.constraints.Null;
import org.springframework.shell.command.CommandContext;

95
spring-shell-samples/pom.xml
View File

@@ -14,10 +14,6 @@
<description>Examples of using Spring Shell 2</description>
<properties>
<spring-native.version>0.12.0</spring-native.version>
</properties>
<build>
<plugins>
<plugin>
@@ -44,10 +40,9 @@
<artifactId>spring-shell-starter-jna</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.experimental</groupId>
<artifactId>spring-aot</artifactId>
<version>${spring-native.version}</version>
<optional>true</optional>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -64,14 +59,9 @@
<profiles>
<profile>
<id>native</id>
<id>nativex</id>
<!-- needs GRAALVM_HOME to point to graal tools -->
<dependencies>
<dependency>
<groupId>org.springframework.experimental</groupId>
<artifactId>spring-native</artifactId>
<version>${spring-native.version}</version>
</dependency>
<!-- Required with Maven Surefire 2.x -->
<dependency>
<groupId>org.junit.platform</groupId>
@@ -81,52 +71,37 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.experimental</groupId>
<artifactId>spring-aot-maven-plugin</artifactId>
<version>${spring-native.version}</version>
<executions>
<execution>
<id>generate</id>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
<version>0.9.9</version>
<extensions>true</extensions>
<executions>
<execution>
<id>build-native</id>
<goals>
<goal>build</goal>
</goals>
<phase>package</phase>
</execution>
<execution>
<id>test-native</id>
<goals>
<goal>test</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
<configuration>
<!-- ... -->
</configuration>
</plugin>
<!-- Avoid a clash between Spring Boot repackaging and native-maven-plugin -->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<classifier>exec</classifier>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<id>aot-generate</id>
<goals>
<goal>aot-generate</goal>
</goals>
</execution>
<execution>
<id>repackage</id>
<configuration>
<classifier>exec</classifier>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
<executions>
<execution>
<id>build-native</id>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<pluginRepositories>

7
spring-shell-samples/src/main/java/org/springframework/shell/samples/SpringShellSample.java
View File

@@ -19,6 +19,7 @@ import org.jline.utils.AttributedString;
import org.jline.utils.AttributedStyle;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.Banner.Mode;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.shell.jline.PromptProvider;
@@ -35,7 +36,11 @@ import org.springframework.shell.jline.PromptProvider;
public class SpringShellSample {
public static void main(String[] args) throws Exception {
SpringApplication.run(SpringShellSample.class, args);
SpringApplication application = new SpringApplication(SpringShellSample.class);
application.setBannerMode(Mode.OFF);
application.run(args);
// TODO: follow up with boot why spring.main.banner-mode=off doesn't work
// SpringApplication.run(SpringShellSample.class, args);
}
@Bean

99
spring-shell-samples/src/main/java/org/springframework/shell/samples/config/SamplesRuntimeHints.java Normal file
View File

@@ -0,0 +1,99 @@
/*
* Copyright 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.shell.samples.config;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.ProxyHints;
import org.springframework.aot.hint.ReflectionHints;
import org.springframework.aot.hint.ResourceHints;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.aot.hint.TypeReference;
import org.springframework.util.ClassUtils;
public class SamplesRuntimeHints implements RuntimeHintsRegistrar {
@Override
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
ResourceHints resource = hints.resources();
ProxyHints proxy = hints.proxies();
ReflectionHints reflection = hints.reflection();
// should go graalvm-reachability-metadata
registerResources(resource);
// should go graalvm-reachability-metadata
registerProxies(proxy, "com.sun.jna.Library", "com.sun.jna.Callback",
"org.jline.terminal.impl.jna.win.Kernel32", "org.jline.terminal.impl.jna.linux.CLibrary");
// should go graalvm-reachability-metadata
registerForMostReflection(reflection, "com.sun.jna.CallbackReference", "com.sun.jna.Native",
"com.sun.jna.NativeLong", "com.sun.jna.Pointer", "com.sun.jna.Structure",
"com.sun.jna.ptr.IntByReference", "com.sun.jna.ptr.PointerByReference", "com.sun.jna.Klass",
"com.sun.jna.Structure$FFIType", "com.sun.jna.Structure$FFIType$size_t");
// should go graalvm-reachability-metadata
registerForMostReflection(reflection, "org.jline.terminal.impl.jna.win.Kernel32$CHAR_INFO",
"org.jline.terminal.impl.jna.win.Kernel32$CONSOLE_CURSOR_INFO",
"org.jline.terminal.impl.jna.win.Kernel32$CONSOLE_SCREEN_BUFFER_INFO",
"org.jline.terminal.impl.jna.win.Kernel32$COORD",
"org.jline.terminal.impl.jna.win.Kernel32$INPUT_RECORD",
"org.jline.terminal.impl.jna.win.Kernel32$INPUT_RECORD$EventUnion",
"org.jline.terminal.impl.jna.win.Kernel32$KEY_EVENT_RECORD",
"org.jline.terminal.impl.jna.win.Kernel32$MOUSE_EVENT_RECORD",
"org.jline.terminal.impl.jna.win.Kernel32$WINDOW_BUFFER_SIZE_RECORD",
"org.jline.terminal.impl.jna.win.Kernel32$MENU_EVENT_RECORD",
"org.jline.terminal.impl.jna.win.Kernel32$FOCUS_EVENT_RECORD",
"org.jline.terminal.impl.jna.win.Kernel32$SMALL_RECT",
"org.jline.terminal.impl.jna.win.Kernel32$UnionChar");
// from spring-native sb-3.0.x branch
registerHibernateValidatorHints(hints, classLoader);
}
private void registerHibernateValidatorHints(RuntimeHints hints, ClassLoader classLoader) {
if (!ClassUtils.isPresent("org.hibernate.validator.HibernateValidator", classLoader)) {
return;
}
hints.reflection().registerType(TypeReference.of("org.hibernate.validator.internal.util.logging.Log_$logger"),
hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS));
hints.reflection().registerType(
TypeReference.of("org.hibernate.validator.internal.util.logging.Messages_$bundle"),
hint -> hint.withField("INSTANCE", fieldHint -> {
}));
}
private void registerResources(ResourceHints resource) {
resource.registerPattern("com/sun/jna/win32-x86-64/jnidispatch.dll");
}
private void registerProxies(ProxyHints proxy, String... classNames) {
typeReferences(classNames)
.forEach(tr -> proxy.registerJdkProxy(jdkProxyHint -> jdkProxyHint.proxiedInterfaces(tr)));
}
private void registerForMostReflection(ReflectionHints reflection, String... classNames) {
reflection.registerTypes(typeReferences(classNames),
hint -> {
hint.withMembers(MemberCategory.DECLARED_CLASSES, MemberCategory.DECLARED_FIELDS,
MemberCategory.PUBLIC_CLASSES, MemberCategory.PUBLIC_FIELDS,
MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_PUBLIC_METHODS);
});
}
private Iterable<TypeReference> typeReferences(String... classNames) {
return Stream.of(classNames).map(TypeReference::of).collect(Collectors.toList());
}
}

332
spring-shell-samples/src/main/java/org/springframework/shell/samples/config/SpringShellNativeConfiguration.java
View File

@@ -15,172 +15,172 @@
*/
package org.springframework.shell.samples.config;
import com.sun.jna.CallbackReference;
import com.sun.jna.Native;
import com.sun.jna.NativeLong;
import com.sun.jna.Pointer;
import com.sun.jna.Structure;
import com.sun.jna.ptr.IntByReference;
import com.sun.jna.ptr.PointerByReference;
// import com.sun.jna.CallbackReference;
// import com.sun.jna.Native;
// import com.sun.jna.NativeLong;
// import com.sun.jna.Pointer;
// import com.sun.jna.Structure;
// import com.sun.jna.ptr.IntByReference;
// import com.sun.jna.ptr.PointerByReference;
import org.springframework.nativex.hint.FieldHint;
import org.springframework.nativex.hint.JdkProxyHint;
import org.springframework.nativex.hint.MethodHint;
import org.springframework.nativex.hint.NativeHint;
import org.springframework.nativex.hint.ResourceHint;
import org.springframework.nativex.hint.TypeAccess;
import org.springframework.nativex.hint.TypeHint;
import org.springframework.nativex.type.NativeConfiguration;
// import org.springframework.nativex.hint.FieldHint;
// import org.springframework.nativex.hint.JdkProxyHint;
// import org.springframework.nativex.hint.MethodHint;
// import org.springframework.nativex.hint.NativeHint;
// import org.springframework.nativex.hint.ResourceHint;
// import org.springframework.nativex.hint.TypeAccess;
// import org.springframework.nativex.hint.TypeHint;
// import org.springframework.nativex.type.NativeConfiguration;
@NativeHint(
resources = {
@ResourceHint(
patterns = {
"com/sun/jna/win32-x86-64/jnidispatch.dll"
}
),
},
types = {
@TypeHint(
types = {
CallbackReference.class, Native.class, NativeLong.class, PointerByReference.class, IntByReference.class
},
typeNames = { "com.sun.jna.Klass" },
access = {
TypeAccess.PUBLIC_CLASSES, TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.PUBLIC_FIELDS,
TypeAccess.PUBLIC_METHODS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
types = Structure.class,
fields = {
@FieldHint( name = "memory", allowWrite = true),
@FieldHint( name = "typeInfo")
},
methods = {
@MethodHint( name = "newInstance", parameterTypes = { Class.class, Pointer.class }),
@MethodHint( name = "newInstance", parameterTypes = { Class.class, long.class }),
@MethodHint( name = "newInstance", parameterTypes = { Class.class })
},
access = {
TypeAccess.PUBLIC_CLASSES, TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.PUBLIC_FIELDS,
TypeAccess.PUBLIC_METHODS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "com.sun.jna.Structure$FFIType",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "com.sun.jna.Structure$FFIType$size_t",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "org.jline.terminal.impl.jna.win.Kernel32$CHAR_INFO",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "org.jline.terminal.impl.jna.win.Kernel32$CONSOLE_CURSOR_INFO",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "org.jline.terminal.impl.jna.win.Kernel32$CONSOLE_SCREEN_BUFFER_INFO",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "org.jline.terminal.impl.jna.win.Kernel32$COORD",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "org.jline.terminal.impl.jna.win.Kernel32$INPUT_RECORD",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "org.jline.terminal.impl.jna.win.Kernel32$INPUT_RECORD$EventUnion",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "org.jline.terminal.impl.jna.win.Kernel32$KEY_EVENT_RECORD",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "org.jline.terminal.impl.jna.win.Kernel32$MOUSE_EVENT_RECORD",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "org.jline.terminal.impl.jna.win.Kernel32$WINDOW_BUFFER_SIZE_RECORD",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "org.jline.terminal.impl.jna.win.Kernel32$MENU_EVENT_RECORD",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "org.jline.terminal.impl.jna.win.Kernel32$FOCUS_EVENT_RECORD",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "org.jline.terminal.impl.jna.win.Kernel32$SMALL_RECT",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
),
@TypeHint(
typeNames = "org.jline.terminal.impl.jna.win.Kernel32$UnionChar",
access = {
TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
}
)
},
jdkProxies = {
@JdkProxyHint( typeNames = { "com.sun.jna.Library" }),
@JdkProxyHint( typeNames = { "com.sun.jna.Callback" }),
@JdkProxyHint( typeNames = { "org.jline.terminal.impl.jna.win.Kernel32" }),
@JdkProxyHint( typeNames = { "org.jline.terminal.impl.jna.linux.CLibrary" })
}
)
public class SpringShellNativeConfiguration implements NativeConfiguration {
// @NativeHint(
// resources = {
// @ResourceHint(
// patterns = {
// "com/sun/jna/win32-x86-64/jnidispatch.dll"
// }
// ),
// },
// types = {
// @TypeHint(
// types = {
// CallbackReference.class, Native.class, NativeLong.class, PointerByReference.class, IntByReference.class
// },
// typeNames = { "com.sun.jna.Klass" },
// access = {
// TypeAccess.PUBLIC_CLASSES, TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.PUBLIC_FIELDS,
// TypeAccess.PUBLIC_METHODS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// types = Structure.class,
// fields = {
// @FieldHint( name = "memory", allowWrite = true),
// @FieldHint( name = "typeInfo")
// },
// methods = {
// @MethodHint( name = "newInstance", parameterTypes = { Class.class, Pointer.class }),
// @MethodHint( name = "newInstance", parameterTypes = { Class.class, long.class }),
// @MethodHint( name = "newInstance", parameterTypes = { Class.class })
// },
// access = {
// TypeAccess.PUBLIC_CLASSES, TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.PUBLIC_FIELDS,
// TypeAccess.PUBLIC_METHODS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "com.sun.jna.Structure$FFIType",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "com.sun.jna.Structure$FFIType$size_t",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "org.jline.terminal.impl.jna.win.Kernel32$CHAR_INFO",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "org.jline.terminal.impl.jna.win.Kernel32$CONSOLE_CURSOR_INFO",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "org.jline.terminal.impl.jna.win.Kernel32$CONSOLE_SCREEN_BUFFER_INFO",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "org.jline.terminal.impl.jna.win.Kernel32$COORD",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "org.jline.terminal.impl.jna.win.Kernel32$INPUT_RECORD",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "org.jline.terminal.impl.jna.win.Kernel32$INPUT_RECORD$EventUnion",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "org.jline.terminal.impl.jna.win.Kernel32$KEY_EVENT_RECORD",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "org.jline.terminal.impl.jna.win.Kernel32$MOUSE_EVENT_RECORD",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "org.jline.terminal.impl.jna.win.Kernel32$WINDOW_BUFFER_SIZE_RECORD",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "org.jline.terminal.impl.jna.win.Kernel32$MENU_EVENT_RECORD",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "org.jline.terminal.impl.jna.win.Kernel32$FOCUS_EVENT_RECORD",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "org.jline.terminal.impl.jna.win.Kernel32$SMALL_RECT",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// ),
// @TypeHint(
// typeNames = "org.jline.terminal.impl.jna.win.Kernel32$UnionChar",
// access = {
// TypeAccess.PUBLIC_CONSTRUCTORS, TypeAccess.DECLARED_CLASSES, TypeAccess.DECLARED_CONSTRUCTORS,
// TypeAccess.DECLARED_FIELDS, TypeAccess.DECLARED_METHODS
// }
// )
// },
// jdkProxies = {
// @JdkProxyHint( typeNames = { "com.sun.jna.Library" }),
// @JdkProxyHint( typeNames = { "com.sun.jna.Callback" }),
// @JdkProxyHint( typeNames = { "org.jline.terminal.impl.jna.win.Kernel32" }),
// @JdkProxyHint( typeNames = { "org.jline.terminal.impl.jna.linux.CLibrary" })
// }
// )
public class SpringShellNativeConfiguration /*implements NativeConfiguration*/ {
}

2
spring-shell-samples/src/main/java/org/springframework/shell/samples/standard/Commands.java
View File

@@ -21,7 +21,7 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import javax.validation.constraints.Size;
import jakarta.validation.constraints.Size;
import org.springframework.shell.standard.ShellComponent;
import org.springframework.shell.standard.ShellMethod;

512
spring-shell-samples/src/main/resources/META-INF/native-image/jni-config.json
View File

@@ -1,512 +0,0 @@
[
{
"name" : "com.sun.jna.Native",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "java.lang.Class",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "java.lang.reflect.Method",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "java.lang.String",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "java.nio.Buffer",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "java.nio.ByteBuffer",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "java.nio.CharBuffer",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "java.nio.ShortBuffer",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "java.nio.IntBuffer",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "java.nio.LongBuffer",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "java.nio.FloatBuffer",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "java.nio.DoubleBuffer",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "java.lang.Void",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "TYPE" }
]
},
{
"name" : "java.lang.Boolean",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "value", "allowWrite" : true },
{ "name" : "TYPE" }
]
},
{
"name" : "java.lang.Byte",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "value", "allowWrite" : true },
{ "name" : "TYPE" }
]
},
{
"name" : "java.lang.Character",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "value", "allowWrite" : true },
{ "name" : "TYPE" }
]
},
{
"name" : "java.lang.Short",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "value", "allowWrite" : true },
{ "name" : "TYPE" }
]
},
{
"name" : "java.lang.Integer",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "value", "allowWrite" : true },
{ "name" : "TYPE" }
]
},
{
"name" : "java.lang.Long",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "value", "allowWrite" : true },
{ "name" : "TYPE" }
]
},
{
"name" : "java.lang.Float",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "value", "allowWrite" : true },
{ "name" : "TYPE" }
]
},
{
"name" : "java.lang.Double",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "value", "allowWrite" : true },
{ "name" : "TYPE" }
]
},
{
"name" : "com.sun.jna.Pointer",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "peer", "allowWrite" : true }
]
},
{
"name" : "com.sun.jna.Structure$ByValue",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "com.sun.jna.WString",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "com.sun.jna.NativeMapped",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "com.sun.jna.IntegerType",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "com.sun.jna.PointerType",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "com.sun.jna.JNIEnv",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "com.sun.jna.Native$ffi_callback",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "com.sun.jna.FromNativeConverter",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "com.sun.jna.Structure",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "memory", "allowWrite" : true },
{ "name" : "typeInfo", "allowWrite" : true }
],
"methods" : [
{ "name" : "newInstance", "parameterTypes" : ["java.lang.Class","com.sun.jna.Pointer"] },
{ "name" : "newInstance", "parameterTypes" : ["java.lang.Class", "long"] },
{ "name" : "newInstance", "parameterTypes" : ["java.lang.Class"] },
{ "name" : "getTypeInfo", "parameterTypes": ["java.lang.Object"] }
]
},
{
"name" : "com.sun.jna.Callback",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "com.sun.jna.CallbackReference$AttachOptions",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "com.sun.jna.CallbackReference",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "com.sun.jna.IntegerType",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "value", "allowWrite" : true }
]
},
{
"name" : "com.sun.jna.PointerType",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "pointer", "allowWrite" : true }
]
},
{
"name" : "com.sun.jna.Structure$FFIType",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "com.sun.jna.Structure$FFIType$size_t",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "com.sun.jna.Structure$FFIType$FFITypes",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "ffi_type_void", "allowWrite" : true },
{ "name" : "ffi_type_float", "allowWrite" : true },
{ "name" : "ffi_type_double", "allowWrite" : true },
{ "name" : "ffi_type_longdouble", "allowWrite" : true },
{ "name" : "ffi_type_uint8", "allowWrite" : true },
{ "name" : "ffi_type_sint8", "allowWrite" : true },
{ "name" : "ffi_type_uint16", "allowWrite" : true },
{ "name" : "ffi_type_sint16", "allowWrite" : true },
{ "name" : "ffi_type_uint32", "allowWrite" : true },
{ "name" : "ffi_type_sint32", "allowWrite" : true },
{ "name" : "ffi_type_uint64", "allowWrite" : true },
{ "name" : "ffi_type_sint64", "allowWrite" : true },
{ "name" : "ffi_type_pointer", "allowWrite" : true }
]
},
{
"name" : "com.sun.jna.NativeLong",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "com.sun.jna.ptr.PointerByReference",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true
},
{
"name" : "org.jline.terminal.impl.jna.win.Kernel32$CHAR_INFO",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "uChar", "allowWrite" : true },
{ "name" : "Attributes", "allowWrite" : true }
]
},
{
"name" : "org.jline.terminal.impl.jna.win.Kernel32$CONSOLE_CURSOR_INFO",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "dwSize", "allowWrite" : true },
{ "name" : "bVisible", "allowWrite" : true }
]
},
{
"name" : "org.jline.terminal.impl.jna.win.Kernel32$CONSOLE_SCREEN_BUFFER_INFO",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "dwSize", "allowWrite" : true },
{ "name" : "dwCursorPosition", "allowWrite" : true },
{ "name" : "wAttributes", "allowWrite" : true },
{ "name" : "srWindow", "allowWrite" : true },
{ "name" : "dwMaximumWindowSize", "allowWrite" : true }
]
},
{
"name" : "org.jline.terminal.impl.jna.win.Kernel32$COORD",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "X", "allowWrite" : true },
{ "name" : "Y", "allowWrite" : true }
]
},
{
"name" : "org.jline.terminal.impl.jna.win.Kernel32$INPUT_RECORD",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "EventType", "allowWrite" : true },
{ "name" : "Event", "allowWrite" : true }
]
},
{
"name" : "org.jline.terminal.impl.jna.win.Kernel32$INPUT_RECORD$EventUnion",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "KeyEvent", "allowWrite" : true },
{ "name" : "MouseEvent", "allowWrite" : true },
{ "name" : "WindowBufferSizeEvent", "allowWrite" : true },
{ "name" : "MenuEvent", "allowWrite" : true },
{ "name" : "FocusEvent", "allowWrite" : true }
]
},
{
"name" : "org.jline.terminal.impl.jna.win.Kernel32$KEY_EVENT_RECORD",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "bKeyDown", "allowWrite" : true },
{ "name" : "wRepeatCount", "allowWrite" : true },
{ "name" : "wVirtualKeyCode", "allowWrite" : true },
{ "name" : "wVirtualScanCode", "allowWrite" : true },
{ "name" : "uChar", "allowWrite" : true },
{ "name" : "dwControlKeyState", "allowWrite" : true }
]
},
{
"name" : "org.jline.terminal.impl.jna.win.Kernel32$MOUSE_EVENT_RECORD",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "dwMousePosition", "allowWrite" : true },
{ "name" : "dwButtonState", "allowWrite" : true },
{ "name" : "dwControlKeyState", "allowWrite" : true },
{ "name" : "dwEventFlags", "allowWrite" : true }
]
},
{
"name" : "org.jline.terminal.impl.jna.win.Kernel32$WINDOW_BUFFER_SIZE_RECORD",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "dwSize", "allowWrite" : true }
]
},
{
"name" : "org.jline.terminal.impl.jna.win.Kernel32$MENU_EVENT_RECORD",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "dwCommandId", "allowWrite" : true }
]
},
{
"name" : "org.jline.terminal.impl.jna.win.Kernel32$FOCUS_EVENT_RECORD",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "bSetFocus", "allowWrite" : true }
]
},
{
"name" : "org.jline.terminal.impl.jna.win.Kernel32$SMALL_RECT",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "Left", "allowWrite" : true },
{ "name" : "Top", "allowWrite" : true },
{ "name" : "Right", "allowWrite" : true },
{ "name" : "Bottom", "allowWrite" : true }
]
},
{
"name" : "org.jline.terminal.impl.jna.win.Kernel32$UnionChar",
"allDeclaredConstructors" : true,
"allPublicConstructors" : true,
"allDeclaredMethods" : true,
"allPublicMethods" : true,
"fields" : [
{ "name" : "UnicodeChar", "allowWrite" : true },
{ "name" : "AsciiChar", "allowWrite" : true }
]
}
]

2
spring-shell-samples/src/main/resources/META-INF/spring.factories
View File

@@ -1,2 +0,0 @@
org.springframework.nativex.type.NativeConfiguration=\
org.springframework.shell.samples.config.SpringShellNativeConfiguration

2
spring-shell-samples/src/main/resources/META-INF/spring/aot.factories Normal file
View File

@@ -0,0 +1,2 @@
org.springframework.aot.hint.RuntimeHintsRegistrar=\
org.springframework.shell.samples.config.SamplesRuntimeHints

45
spring-shell-samples/src/test/java/org/springframework/shell/samples/config/SamplesRuntimeHintsTests.java Normal file
View File

@@ -0,0 +1,45 @@
package org.springframework.shell.samples.config;
import java.util.Arrays;
import java.util.Set;
import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.ReflectionHints;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.TypeHint;
import org.springframework.aot.hint.TypeReference;
import static org.assertj.core.api.Assertions.assertThat;
public class SamplesRuntimeHintsTests {
@Test
void test() {
String[] classNames = Arrays.asList("com.sun.jna.CallbackReference", "com.sun.jna.Native",
"com.sun.jna.NativeLong", "com.sun.jna.Pointer", "com.sun.jna.Structure",
"com.sun.jna.ptr.IntByReference", "com.sun.jna.ptr.PointerByReference", "com.sun.jna.Klass",
"com.sun.jna.Structure$FFIType", "com.sun.jna.Structure$FFIType$size_t").toArray(new String[0]);
ReflectionHints hints = registerHints();
typeReferences(classNames).forEach(typeReference -> {
TypeHint typeHint = hints.getTypeHint(typeReference);
assertThat(typeHint).withFailMessage(() -> "No hints found for typeReference " + typeReference).isNotNull();
Set<MemberCategory> memberCategories = typeHint.getMemberCategories();
assertThat(memberCategories).containsExactlyInAnyOrder(MemberCategory.DECLARED_CLASSES,
MemberCategory.DECLARED_FIELDS, MemberCategory.PUBLIC_CLASSES, MemberCategory.PUBLIC_FIELDS,
MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_PUBLIC_METHODS);
});
}
private ReflectionHints registerHints() {
RuntimeHints hints = new RuntimeHints();
new SamplesRuntimeHints().registerHints(hints, getClass().getClassLoader());
return hints.reflection();
}
private Stream<TypeReference> typeReferences(String... classNames) {
return Stream.of(classNames).map(TypeReference::of);
}
}

49
spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/StandardCommandsModelsRuntimeHints.java Normal file
View File

@@ -0,0 +1,49 @@
/*
* Copyright 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.shell.standard.commands;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.ReflectionHints;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.aot.hint.TypeReference;
/**
* {@link RuntimeHintsRegistrar} for Shell Standard Commands temlate model classes.
*
* @author Janne Valkealahti
*/
class StandardCommandsModelsRuntimeHints implements RuntimeHintsRegistrar {
@Override
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
ReflectionHints reflection = hints.reflection();
registerForDeclaredMethodsInvocation(reflection, CommandAvailabilityInfoModel.class, CommandInfoModel.class,
CommandParameterInfoModel.class, GroupCommandInfoModel.class, GroupsInfoModel.class);
}
private void registerForDeclaredMethodsInvocation(ReflectionHints reflection, Class<?>... classes) {
reflection.registerTypes(typeReferences(classes),
hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS));
}
private Iterable<TypeReference> typeReferences(Class<?>... classes) {
return Stream.of(classes).map(TypeReference::of).collect(Collectors.toList());
}
}

34
spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/StandardCommandsResourcesRuntimeHints.java Normal file
View File

@@ -0,0 +1,34 @@
/*
* Copyright 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.shell.standard.commands;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
/**
* {@link RuntimeHintsRegistrar} for Shell Standard Commands resources.
*
* @author Janne Valkealahti
*/
class StandardCommandsResourcesRuntimeHints implements RuntimeHintsRegistrar {
@Override
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
hints.resources()
.registerPattern("template/*.st")
.registerPattern("template/*.stg");
}
}

26
spring-shell-standard-commands/src/main/resources/META-INF/native-image/reflect-config.json
View File

@@ -1,26 +0,0 @@
[
{
"name": "org.springframework.shell.standard.commands.CommandInfoModel",
"allDeclaredMethods": true
},
{
"name": "org.springframework.shell.standard.commands.CommandParameterInfoModel",
"allDeclaredMethods": true
},
{
"name": "org.springframework.shell.standard.commands.GroupCommandInfoModel",
"allDeclaredMethods": true
},
{
"name": "org.springframework.shell.standard.commands.GroupsInfoModel",
"allDeclaredMethods": true
},
{
"name": "org.springframework.shell.standard.commands.CommandParameterInfoModel",
"allDeclaredMethods": true
},
{
"name": "org.springframework.shell.standard.commands.CommandAvailabilityInfoModel",
"allDeclaredMethods": true
}
]

12
spring-shell-standard-commands/src/main/resources/META-INF/native-image/resource-config.json
View File

@@ -1,12 +0,0 @@
{
"resources": {
"includes": [
{
"pattern": "template/.*.st"
},
{
"pattern": "template/.*.stg"
}
]
}
}

3
spring-shell-standard-commands/src/main/resources/META-INF/spring/aot.factories Normal file
View File

@@ -0,0 +1,3 @@
org.springframework.aot.hint.RuntimeHintsRegistrar=\
org.springframework.shell.standard.commands.StandardCommandsResourcesRuntimeHints,\
org.springframework.shell.standard.commands.StandardCommandsModelsRuntimeHints

2
spring-shell-standard-commands/src/test/java/org/springframework/shell/standard/commands/HelpTests.java
View File

@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.Locale;
import java.util.Optional;
import javax.validation.constraints.Max;
import jakarta.validation.constraints.Max;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;

2
spring-shell-standard/src/main/java/org/springframework/shell/standard/ShellMethod.java
View File

@@ -21,6 +21,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.aot.hint.annotation.Reflective;
import org.springframework.shell.context.InteractionMode;
/**
@@ -32,6 +33,7 @@ import org.springframework.shell.context.InteractionMode;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD})
@Documented
@Reflective
public @interface ShellMethod {
/**

1
spring-shell-standard/src/main/java/org/springframework/shell/standard/StandardMethodTargetRegistrar.java
View File

@@ -75,6 +75,7 @@ public class StandardMethodTargetRegistrar implements MethodTargetRegistrar, App
@Override
public void register(CommandCatalog registry) {
Map<String, Object> commandBeans = applicationContext.getBeansWithAnnotation(ShellComponent.class);
log.debug("Found commandBeans to register {}", commandBeans);
for (Object bean : commandBeans.values()) {
Class<?> clazz = bean.getClass();
ReflectionUtils.doWithMethods(clazz, method -> {

32
spring-shell-standard/src/main/java/org/springframework/shell/standard/StandardResourcesRuntimeHints.java Normal file
View File

@@ -0,0 +1,32 @@
/*
* Copyright 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.shell.standard;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
/**
* {@link RuntimeHintsRegistrar} for Shell Standard resources.
*
* @author Janne Valkealahti
*/
class StandardResourcesRuntimeHints implements RuntimeHintsRegistrar {
@Override
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
hints.resources().registerPattern("org/springframework/shell/component/*.stg");
}
}

50
spring-shell-standard/src/main/java/org/springframework/shell/standard/completion/StandardCompletionModelsRuntimeHints.java Normal file
View File

@@ -0,0 +1,50 @@
/*
* Copyright 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.shell.standard.completion;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.ReflectionHints;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.aot.hint.TypeReference;
/**
* {@link RuntimeHintsRegistrar} for Shell Standard completion temlate model classes.
*
* @author Janne Valkealahti
*/
class StandardCompletionModelsRuntimeHints implements RuntimeHintsRegistrar {
@Override
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
ReflectionHints reflection = hints.reflection();
registerForDeclaredMethodsInvocation(reflection, AbstractCompletions.DefaultCommandModel.class,
AbstractCompletions.DefaultCommandModelCommand.class,
AbstractCompletions.DefaultCommandModelOption.class);
}
private void registerForDeclaredMethodsInvocation(ReflectionHints reflection, Class<?>... classes) {
reflection.registerTypes(typeReferences(classes),
hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_METHODS));
}
private Iterable<TypeReference> typeReferences(Class<?>... classes) {
return Stream.of(classes).map(TypeReference::of).collect(Collectors.toList());
}
}

10
spring-shell-standard/src/main/resources/META-INF/native-image/reflect-config.json
View File

@@ -1,10 +0,0 @@
[
{
"name": "org.springframework.shell.standard.completion.AbstractCompletions$DefaultCommandModel",
"allDeclaredMethods": true
},
{
"name": "org.springframework.shell.standard.completion.AbstractCompletions$DefaultCommandModelCommand",
"allDeclaredMethods": true
}
]

9
spring-shell-standard/src/main/resources/META-INF/native-image/resource-config.json
View File

@@ -1,9 +0,0 @@
{
"resources": {
"includes": [
{
"pattern": "completion/.*"
}
]
}
}

3
spring-shell-standard/src/main/resources/META-INF/spring/aot.factories Normal file
View File

@@ -0,0 +1,3 @@
org.springframework.aot.hint.RuntimeHintsRegistrar=\
org.springframework.shell.standard.StandardResourcesRuntimeHints,\
org.springframework.shell.standard.completion.StandardCompletionModelsRuntimeHints