Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Draft] Native image #174

Closed
wants to merge 35 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
3e35e44
Add prompt to use native image
agilob Aug 27, 2020
fc511fa
Add maven config for native image
agilob Aug 27, 2020
4fa8784
Fix package.classname generation
agilob Aug 27, 2020
3fd9bd5
Generate docker native-image compilation MN-way
agilob Aug 28, 2020
bd7da41
Add micronaut native-image building files
agilob Aug 28, 2020
4880a50
Re-add jib-maven-plugin
agilob Aug 28, 2020
52a90e3
Remove redundant native-image properties
agilob Aug 28, 2020
184b753
Move gradle micronaut-registry dependency next to micrometer
agilob Aug 28, 2020
38d26dc
Bump graal vm to 20.2.0
agilob Sep 3, 2020
0347e66
Remove --no-server
agilob Sep 3, 2020
a9bd031
Add reflection and resource config
agilob Sep 3, 2020
15ae0af
Add reflect and resources files
agilob Sep 3, 2020
86d0b63
Remove micronaut reflection tags, fix liquibase startup issue
agilob Sep 15, 2020
be670d1
Merge branch 'master' of github.com:jhipster/generator-jhipster-micro…
agilob Sep 25, 2020
d84bbd3
Merge branch 'master' of github.com:jhipster/generator-jhipster-micro…
agilob Oct 1, 2020
48396e4
Merge branch 'master' of github.com:agilob/generator-jhipster-microna…
agilob Oct 14, 2020
244151b
Remove docker files that will be replaced by micronaut-gradle-plugin
agilob Oct 14, 2020
88b08ca
Move native-image.properties to docker.gradle
agilob Oct 14, 2020
ad60533
Remove native image from maven
agilob Oct 14, 2020
0bf0316
Rename reflect -> reflection
agilob Oct 16, 2020
3792d62
Fix accessing reflection and resource graal files
agilob Oct 16, 2020
5d74b07
Copy resources to native image and increase memory limits
agilob Oct 17, 2020
a9c5ae5
Bump micronaut gradle plugin
agilob Oct 17, 2020
85d97ba
Remove /home/app from native-image resource location
agilob Oct 17, 2020
306aee6
Merge branch 'main' of github.com:jhipster/generator-jhipster-microna…
agilob Dec 2, 2020
2e6bac0
Bump oracle graalvm image to 20.3.0-java11
agilob Dec 3, 2020
12dcd13
Fix generation of docker.gradle.ejs for location of native image files
agilob Dec 3, 2020
3a19057
Enable --report-unsupported-elements-at-runtime
agilob Dec 3, 2020
0fdf128
Add more native-image compilation flags, solves hikaru connection issue
agilob Jan 19, 2021
7baeebb
Merge branch 'main' of github.com:jhipster/generator-jhipster-microna…
agilob Jan 19, 2021
a956d70
Merge branch 'main' of github.com:jhipster/generator-jhipster-microna…
agilob Mar 13, 2021
6204d6e
Bump org.graalvm.nativeimage:svm to 21.0.0.2
agilob Mar 13, 2021
bbf3941
Update location of graal-ce docker image
agilob Mar 13, 2021
7686b9a
Remove liquibase reflect configuration
agilob Mar 13, 2021
2f59100
Bump micronaut liquibase to 3.0.2
agilob Mar 13, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions generators/server/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -381,11 +381,6 @@ const serverFiles = {
renameTo: generator => `${generator.javaDir}config/package-info.java`,
useBluePrint: true,
},
{
file: 'package/config/SnakeCasePhysicalNamingStrategy.java',
renameTo: generator => `${generator.javaDir}config/SnakeCasePhysicalNamingStrategy.java`,
useBluePrint: true,
},
{
file: 'package/config/metric/JHipsterMetricsEndpoint.java',
renameTo: generator => `${generator.javaDir}config/metric/JHipsterMetricsEndpoint.java`,
Expand Down Expand Up @@ -990,7 +985,21 @@ const serverFiles = {
],
serverBuild: [
{
templates: [{ file: 'checkstyle.xml', options: { interpolate: INTERPOLATE_REGEX } }],
templates: [
{ file: 'checkstyle.xml', options: { interpolate: INTERPOLATE_REGEX } },
{
file: 'resources.json',
renameTo: generator =>
`src/main/resources/META-INF/native-image/${generator.packageName}/${generator.dasherizedBaseName}-${generator.mainClass}/resources.json`,
useBluePrint: true,
},
{
file: 'reflection.json',
renameTo: generator =>
`src/main/resources/META-INF/native-image/${generator.packageName}/${generator.dasherizedBaseName}-${generator.mainClass}/reflection.json`,
useBluePrint: true,
},
],
},
{
condition: generator => generator.buildTool === 'gradle',
Expand Down
7 changes: 5 additions & 2 deletions generators/server/templates/build.gradle.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ dependencies {

annotationProcessor "io.micronaut:micronaut-inject-java"
annotationProcessor "io.micronaut:micronaut-validation"
compileOnly("org.graalvm.nativeimage:svm:21.0.0.2")
annotationProcessor("io.micronaut:micronaut-graal")
<%_ if (databaseType === 'sql') { _%>
annotationProcessor "io.micronaut.data:micronaut-data-processor:$micronaut_data_version"
<%_ } _%>
Expand All @@ -297,7 +299,6 @@ dependencies {
implementation "ch.qos.logback:logback-classic:$logback_version"
implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
implementation "io.dropwizard.metrics:metrics-core"
implementation "io.micrometer:micrometer-registry-prometheus"
implementation "net.logstash.logback:logstash-logback-encoder"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
Expand Down Expand Up @@ -404,9 +405,11 @@ dependencies {

compileOnly "org.graalvm.nativeimage:svm"

implementation "io.micronaut.liquibase:micronaut-liquibase"
implementation "io.micronaut.liquibase:micronaut-liquibase:3.0.2"
implementation "io.micronaut.sql:micronaut-jdbc-hikari"
implementation "io.micronaut.jmx:micronaut-jmx"

implementation "io.micrometer:micrometer-registry-prometheus"
implementation "io.micronaut.micrometer:micronaut-micrometer-core"
implementation "io.micronaut.micrometer:micronaut-micrometer-registry-prometheus"
implementation "io.micronaut.data:micronaut-data-runtime:$micronaut_data_version"
Expand Down
22 changes: 19 additions & 3 deletions generators/server/templates/gradle/docker.gradle.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,29 @@ task copyIntoLayers (type: Copy) {
}

dockerBuild.dependsOn copyIntoLayers
dockerBuildNative.dependsOn copyIntoLayers

dockerfileNative {
baseImage = "oracle/graalvm-ce:20.3.0-java11"
args("-Xmx64m")
baseImage = "ghcr.io/graalvm/graalvm-ce:java11-21.0.0.2"
args("-Xmx128m")
}
nativeImage {
args('--static')
args('--static',
'-H:Name=<%= dasherizedBaseName %>',
'-H:Class=<%=packageName%>.<%=mainClass%>',
'--no-fallback',
'-H:+ReportExceptionStackTraces',
'-H:IncludeResourceBundles=liquibase/i18n/liquibase-core',
'-H:ReflectionConfigurationFiles=resources/META-INF/native-image/<%=packageName%>/<%=dasherizedBaseName%>-<%=mainClass%>/reflection.json',
'-H:ResourceConfigurationFiles=resources/META-INF/native-image/<%=packageName%>/<%=dasherizedBaseName%>-<%=mainClass%>/resources.json',
'--report-unsupported-elements-at-runtime',
'--enable-all-security-services',
'-H:+AllowVMInspection',
'-H:+ReportUnsupportedElementsAtRuntime',
'-H:+JNI',
'-H:-SpawnIsolates'

)
}
dockerBuildNative {
images = ["<%= baseName %>:$project.version"]
Expand Down
9 changes: 4 additions & 5 deletions generators/server/templates/pom.xml.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,10 @@ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand All @@ -692,10 +696,6 @@ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%>
<artifactId>liquibase-maven-plugin</artifactId>
<version>${liquibase.version}</version>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
Expand Down Expand Up @@ -852,7 +852,6 @@ if (devDatabaseType === 'postgresql' || prodDatabaseType === 'postgresql') { _%>
<defaultSchemaName></defaultSchemaName>
<username><%= baseName %></username>
<password></password>
<referenceUrl>hibernate:spring:<%=packageName%>.domain?dialect=&amp;hibernate.physical_naming_strategy=<%=packageName%>.config.SnakeCasePhysicalNamingStrategy</referenceUrl>
<verbose>true</verbose>
<logging>debug</logging>
<contexts>!test</contexts>
Expand Down
225 changes: 225 additions & 0 deletions generators/server/templates/reflection.json.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,225 @@
[
{
"name":"ch.qos.logback.classic.Logger"
},
{
"name": "io.github.jhipster.domain.util.FixedPostgreSQL10Dialect",
"allPublicMethods": true,
"methods": [{ "name": "<init>", "parameterTypes": [] }]
},
{
"name":"ch.qos.logback.classic.encoder.PatternLayoutEncoder",
"allPublicMethods":true,
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"name":"ch.qos.logback.classic.jul.LevelChangePropagator",
"allPublicMethods":true,
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"name":"ch.qos.logback.classic.pattern.DateConverter",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"name":"ch.qos.logback.classic.pattern.LevelConverter",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"name":"ch.qos.logback.classic.pattern.LineSeparatorConverter",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"name":"ch.qos.logback.classic.pattern.LoggerConverter",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"name":"ch.qos.logback.classic.pattern.MessageConverter",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"name":"ch.qos.logback.classic.pattern.ThreadConverter",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"name":"ch.qos.logback.core.ConsoleAppender",
"allPublicMethods":true,
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"name":"io.reactivex.Completable"
},
{
"name":"io.reactivex.Maybe"
},
{
"name":"io.reactivex.Observable"
},
{
"name":"io.reactivex.Single"
},
{
"name":"java.io.FilePermission"
},
{
"name":"java.lang.RuntimePermission"
},
{
"name":"java.lang.String[]"
},
{
"name":"java.lang.Throwable",
"methods":[{"name":"getSuppressed","parameterTypes":[] }]
},
{
"name":"java.lang.management.ManagementFactory",
"methods":[{"name":"getRuntimeMXBean","parameterTypes":[] }]
},
{
"name":"java.lang.management.RuntimeMXBean",
"methods":[{"name":"getInputArguments","parameterTypes":[] }]
},
{
"name":"java.net.NetPermission"
},
{
"name":"java.net.SocketPermission"
},
{
"name":"java.net.URLPermission",
"methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }]
},
{
"name":"java.nio.Bits",
"fields":[{"name":"UNALIGNED"}]
},
{
"name":"java.nio.Buffer",
"fields":[{"name":"address", "allowUnsafeAccess":true}]
},
{
"name":"java.nio.DirectByteBuffer",
"methods":[{"name":"<init>","parameterTypes":["long","int"] }]
},
{
"name":"java.security.AllPermission"
},
{
"name":"java.security.SecurityPermission"
},
{
"name":"java.sql.Date"
},
{
"name":"java.sql.Timestamp"
},
{
"name":"java.util.PropertyPermission"
},
{
"name":"java.util.ServiceLoader",
"methods":[{"name":"stream","parameterTypes":[] }]
},
{
"name":"java.util.ServiceLoader$Provider",
"methods":[{"name":"type","parameterTypes":[] }]
},
{
"name":"javax.management.ObjectName"
},
{
"name":"jdk.internal.misc.Unsafe",
"methods":[{"name":"getUnsafe","parameterTypes":[] }]
},
{
"name":"org.hibernate.internal.CoreMessageLogger_$logger",
"methods":[{"name":"<init>","parameterTypes":["org.jboss.logging.Logger"] }]
},
{
"name":"org.postgresql.Driver",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"name":"org.postgresql.PGProperty",
"fields":[
{"name":"ALLOW_ENCODING_CHANGES"},
{"name":"APPLICATION_NAME"},
{"name":"ASSUME_MIN_SERVER_VERSION"},
{"name":"AUTOSAVE"},
{"name":"BINARY_TRANSFER"},
{"name":"BINARY_TRANSFER_DISABLE"},
{"name":"BINARY_TRANSFER_ENABLE"},
{"name":"CANCEL_SIGNAL_TIMEOUT"},
{"name":"CLEANUP_SAVEPOINTS"},
{"name":"CONNECT_TIMEOUT"},
{"name":"CURRENT_SCHEMA"},
{"name":"DATABASE_METADATA_CACHE_FIELDS"},
{"name":"DATABASE_METADATA_CACHE_FIELDS_MIB"},
{"name":"DEFAULT_ROW_FETCH_SIZE"},
{"name":"DISABLE_COLUMN_SANITISER"},
{"name":"ESCAPE_SYNTAX_CALL_MODE"},
{"name":"GSS_LIB"},
{"name":"HIDE_UNPRIVILEGED_OBJECTS"},
{"name":"HOST_RECHECK_SECONDS"},
{"name":"JAAS_APPLICATION_NAME"},
{"name":"JAAS_LOGIN"},
{"name":"KERBEROS_SERVER_NAME"},
{"name":"LOAD_BALANCE_HOSTS"},
{"name":"LOGGER_FILE"},
{"name":"LOGGER_LEVEL"},
{"name":"LOGIN_TIMEOUT"},
{"name":"LOG_SERVER_ERROR_DETAIL"},
{"name":"LOG_UNCLOSED_CONNECTIONS"},
{"name":"MAX_RESULT_BUFFER"},
{"name":"OPTIONS"},
{"name":"PASSWORD"},
{"name":"PG_DBNAME"},
{"name":"PG_HOST"},
{"name":"PG_PORT"},
{"name":"PREFER_QUERY_MODE"},
{"name":"PREPARED_STATEMENT_CACHE_QUERIES"},
{"name":"PREPARED_STATEMENT_CACHE_SIZE_MIB"},
{"name":"PREPARE_THRESHOLD"},
{"name":"PROTOCOL_VERSION"},
{"name":"READ_ONLY"},
{"name":"READ_ONLY_MODE"},
{"name":"RECEIVE_BUFFER_SIZE"},
{"name":"REPLICATION"},
{"name":"REWRITE_BATCHED_INSERTS"},
{"name":"SEND_BUFFER_SIZE"},
{"name":"SOCKET_FACTORY"},
{"name":"SOCKET_FACTORY_ARG"},
{"name":"SOCKET_TIMEOUT"},
{"name":"SSL"},
{"name":"SSL_CERT"},
{"name":"SSL_FACTORY"},
{"name":"SSL_FACTORY_ARG"},
{"name":"SSL_HOSTNAME_VERIFIER"},
{"name":"SSL_KEY"},
{"name":"SSL_MODE"},
{"name":"SSL_PASSWORD"},
{"name":"SSL_PASSWORD_CALLBACK"},
{"name":"SSL_ROOT_CERT"},
{"name":"SSPI_SERVICE_CLASS"},
{"name":"STRING_TYPE"},
{"name":"TARGET_SERVER_TYPE"},
{"name":"TCP_KEEP_ALIVE"},
{"name":"UNKNOWN_LENGTH"},
{"name":"USER"},
{"name":"USE_SPNEGO"},
{"name":"XML_FACTORY_FACTORY"}
]
},
{
"name":"org.slf4j.spi.LocationAwareLogger",
"allDeclaredMethods":true
},
{
"name":"sun.misc.Unsafe",
"fields":[{"name":"theUnsafe"}],
"methods":[
{"name":"copyMemory","parameterTypes":["java.lang.Object","long","java.lang.Object","long","long"] },
{"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }
]
}
]
18 changes: 18 additions & 0 deletions generators/server/templates/resources.json.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"resources":[
{"pattern":"\\Q\\E"},
{"pattern":"\\Qapplication-prod.yml\\E"},
{"pattern":"\\Qapplication.yml\\E"},
{"pattern":".*/*.*xml$"},
{"pattern":".*/*.*ico$"},
{"pattern":".*/*.*js$"},
{"pattern":".*/*.*html$"},
{"pattern":".*/*.*svg$"},
{"pattern":".*/*.*json$"},
{"pattern":".*/*.*css$"},
{"pattern":".*/*.*png$"}
],
"bundles":[
{"name":"i18n.messages"}
]
}
10 changes: 10 additions & 0 deletions generators/server/templates/src/main/java/package/App.java.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import io.github.jhipster.config.JHipsterConstants;
import io.micronaut.context.ApplicationContext;
import io.micronaut.context.env.Environment;
import io.micronaut.core.cli.CommandLine;
import io.micronaut.core.annotation.TypeHint;
import io.micronaut.runtime.ApplicationConfiguration;
import io.micronaut.runtime.Micronaut;
import io.micronaut.runtime.server.EmbeddedServer;
Expand All @@ -27,6 +28,15 @@ import java.util.*;
description = "<%= baseName %> API"
)
)
@TypeHint(value = {
org.HdrHistogram.Histogram.class, org.HdrHistogram.ConcurrentHistogram.class,
},
accessType = {
TypeHint.AccessType.ALL_DECLARED_CONSTRUCTORS,
TypeHint.AccessType.ALL_DECLARED_FIELDS,
TypeHint.AccessType.ALL_DECLARED_METHODS
}
)
public class <%= mainClass %> {

private static final Logger log = LoggerFactory.getLogger(<%= mainClass %>.class);
Expand Down
Loading