Skip to content

Commit 87013c9

Browse files
author
Alexander Furer
committed
enforce 1.8 language level,closes #218
1 parent 6b20e31 commit 87013c9

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ subprojects {
4444

4545
sourceCompatibility = 1.8
4646
targetCompatibility = 1.8
47+
tasks.withType(JavaCompile,{
48+
options.compilerArgs.addAll(["--release", "8"])
49+
})
4750

4851
test {
4952
// forkEvery = 1

grpc-spring-boot-starter/src/main/java/org/lognet/springboot/grpc/autoconfigure/NettyServerBuilderSelector.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ public String[] selectImports(AnnotationMetadata importingClassMetadata) {
3939
.orElse(true);
4040
imports.add(preferShadedNetty ? shadedNettyConfig : pureNettyConfig);
4141
}else {
42-
Optional
43-
.ofNullable(shadedNettyConfig)
44-
.or(()->Optional.ofNullable(pureNettyConfig))
42+
final String cfg = Optional.ofNullable(shadedNettyConfig)
43+
.orElse(Optional.ofNullable(pureNettyConfig).orElse(null));
44+
Optional.ofNullable(cfg)
4545
.ifPresent(imports::add);
4646
}
4747

0 commit comments

Comments
 (0)