Skip to content

Commit e16516f

Browse files
committed
fix: remove preview
1 parent f9f7e84 commit e16516f

6 files changed

Lines changed: 18 additions & 38 deletions

File tree

‎build-extensions/src/main/kotlin/eu/cloudnetservice/cloudnet/gradle/plugins/CloudNetJavaPlugin.kt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ class CloudNetJavaPlugin : Plugin<Project> {
9090

9191
// We need the jvmArgs to run JVMs in multiple places
9292
private val cloudNetJvmArgs = arrayOf(
93-
"--enable-preview",
9493
"-XX:+EnableDynamicAgentLoading",
9594
"--enable-native-access=ALL-UNNAMED",
9695
"--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",
@@ -157,12 +156,10 @@ private fun Project.configureCompileJava() {
157156

158157
if (project.path != ":launcher:launcher-patcher" && !project.plugins.hasPlugin("cloudnet-java-api")) {
159158
options.compilerArgs.add("-proc:full")
160-
options.compilerArgs.add("--enable-preview")
161159
options.compilerArgs.addAll(
162160
listOf(
163161
"-Xlint:all", // enable all warnings
164-
"-Xlint:-preview", // reduce warning size for the following warning types
165-
"-Xlint:-unchecked",
162+
"-Xlint:-unchecked", // reduce warning size for the following warning types
166163
"-Xlint:-processing",
167164
)
168165
)

‎build-extensions/src/main/kotlin/eu/cloudnetservice/cloudnet/gradle/util/PublishingExtensions.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ fun applyJavadocOptions(options: StandardJavadocDocletOptions) {
156156
options.encoding = "UTF-8"
157157
options.memberLevel = JavadocMemberLevel.PRIVATE
158158
options.addBooleanOption("quiet", true)
159-
options.addBooleanOption("-enable-preview", true)
160159
options.addBooleanOption("Xdoclint:all,-missing", true)
161160
options.addStringOption("-link-modularity-mismatch", "info")
162161
options.jFlags("-Duser.language=en", "-Duser.country=US")

‎launcher/java22/src/main/java/eu/cloudnetservice/launcher/java22/ApplicationBootstrap.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ public static void bootstrap(
8484

8585
// add the arguments supplied to the current process
8686
arguments.addAll(filteredInputArguments);
87-
arguments.add("--enable-preview");
8887

8988
// add the memory options for the node now
9089
arguments.add("-Xmx" + nodeProcessMemory + 'M');

‎node/impl/src/main/java/eu/cloudnetservice/node/impl/service/defaults/JVMService.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ public class JVMService extends AbstractService {
6060

6161
protected static final Logger LOGGER = LoggerFactory.getLogger(JVMService.class);
6262
protected static final Collection<String> DEFAULT_JVM_SYSTEM_PROPERTIES = Arrays.asList(
63-
"--enable-preview",
6463
"-Dfile.encoding=UTF-8",
6564
"-Dlog4j2.formatMsgNoLookups=true",
6665
"-DIReallyKnowWhatIAmDoingISwear=true",

‎wrapper-jvm/impl/src/main/java/eu/cloudnetservice/wrapper/impl/transform/unsafe/FieldAccessor.java‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,19 @@ private FieldAccessor(@NonNull Field field) throws ReflectiveOperationException
5757
var lookup = OpConstants.TRUSTED_LOOKUP.get();
5858
var fieldVh = lookup.unreflectVarHandle(field);
5959
var isStatic = Modifier.isStatic(field.getModifiers());
60-
this.varHandle = switch (isStatic) {
61-
case false -> fieldVh;
62-
case true -> MethodHandles.dropCoordinates(fieldVh, 0, Object.class);
63-
};
60+
this.varHandle = isStatic ? MethodHandles.dropCoordinates(fieldVh, 0, Object.class) : fieldVh;
6461

6562
// resolve field put method handle, only needed when the var handle cannot be used to set the field value
6663
// if present a static field put mh will have a leading dummy object argument for calling convenience
6764
var vhCanSet = this.varHandle.isAccessModeSupported(VarHandle.AccessMode.SET);
68-
this.putMethodHandle = switch (vhCanSet) {
69-
case true -> null; // can do everything with VH
70-
case false -> {
71-
if (isStatic) {
72-
var mh = lookup.findStaticSetter(field.getDeclaringClass(), field.getName(), field.getType());
73-
yield MethodHandles.dropArguments(mh, 0, Object.class);
74-
} else {
75-
yield lookup.findSetter(field.getDeclaringClass(), field.getName(), field.getType());
76-
}
77-
}
78-
};
65+
if (vhCanSet) {
66+
this.putMethodHandle = null; // can do everything with VH
67+
} else if (isStatic) {
68+
var mh = lookup.findStaticSetter(field.getDeclaringClass(), field.getName(), field.getType());
69+
this.putMethodHandle = MethodHandles.dropArguments(mh, 0, Object.class);
70+
} else {
71+
this.putMethodHandle = lookup.findSetter(field.getDeclaringClass(), field.getName(), field.getType());
72+
}
7973
}
8074

8175
/**

‎wrapper-jvm/impl/src/test/java/eu/cloudnetservice/wrapper/impl/transform/unsafe/UnsafeReplacementDelegateTest.java‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -337,18 +337,14 @@ void testEachFieldInClassHasDifferentOffset() {
337337
var fields = ClassWithFields.class.getDeclaredFields();
338338
for (var field : fields) {
339339
var isStatic = Modifier.isStatic(field.getModifiers());
340-
var offset = switch (isStatic) {
341-
case true -> UnsafeReplacementDelegate.unsafeStaticFieldOffset(field);
342-
case false -> UnsafeReplacementDelegate.unsafeObjectFieldOffset(field);
343-
};
340+
var offset = isStatic
341+
? UnsafeReplacementDelegate.unsafeStaticFieldOffset(field)
342+
: UnsafeReplacementDelegate.unsafeObjectFieldOffset(field);
344343
Assertions.assertTrue(offset >= 0);
345344
Assertions.assertTrue(offset <= 25);
346345
Assertions.assertTrue(seenOffsets.add(offset));
347346

348-
var base = switch (isStatic) {
349-
case true -> UnsafeReplacementDelegate.unsafeStaticFieldBase(field);
350-
case false -> inst;
351-
};
347+
var base = isStatic ? UnsafeReplacementDelegate.unsafeStaticFieldBase(field) : inst;
352348
var resolved = FieldOffsetOps.fieldFromOffset(base, offset);
353349
Assertions.assertNotNull(resolved);
354350
Assertions.assertEquals(field, resolved.wrappedField());
@@ -365,18 +361,14 @@ void testEachFieldInClassHierarchyHasDifferentOffset() {
365361
var fields = current.getDeclaredFields();
366362
for (var field : fields) {
367363
var isStatic = Modifier.isStatic(field.getModifiers());
368-
var offset = switch (isStatic) {
369-
case true -> UnsafeReplacementDelegate.unsafeStaticFieldOffset(field);
370-
case false -> UnsafeReplacementDelegate.unsafeObjectFieldOffset(field);
371-
};
364+
var offset = isStatic
365+
? UnsafeReplacementDelegate.unsafeStaticFieldOffset(field)
366+
: UnsafeReplacementDelegate.unsafeObjectFieldOffset(field);
372367
Assertions.assertTrue(offset >= 0);
373368
Assertions.assertTrue(offset <= 250);
374369
Assertions.assertTrue(seenOffsets.add(offset));
375370

376-
var base = switch (isStatic) {
377-
case true -> UnsafeReplacementDelegate.unsafeStaticFieldBase(field);
378-
case false -> inst;
379-
};
371+
var base = isStatic ? UnsafeReplacementDelegate.unsafeStaticFieldBase(field) : inst;
380372
var resolved = FieldOffsetOps.fieldFromOffset(base, offset);
381373
Assertions.assertNotNull(resolved);
382374
Assertions.assertEquals(field, resolved.wrappedField());

0 commit comments

Comments
 (0)