From b7aa0bb8003b76105207b54411db0452c18126c2 Mon Sep 17 00:00:00 2001 From: Tomas Langer Date: Fri, 8 Jul 2022 13:16:51 +0200 Subject: [PATCH] Removed final from proxied types, these could no longer be proxied. (#4489) Re-enabled MP native image packaging test --- etc/scripts/test-packaging-native.sh | 7 +++---- .../java/io/helidon/health/checks/DeadlockHealthCheck.java | 4 ++-- .../io/helidon/health/checks/DiskSpaceHealthCheck.java | 4 ++-- .../io/helidon/health/checks/HeapMemoryHealthCheck.java | 4 ++-- .../graal/mp/nativeimage/extension/ProxyBean.java | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/etc/scripts/test-packaging-native.sh b/etc/scripts/test-packaging-native.sh index 335a2fcc915..025d931f066 100755 --- a/etc/scripts/test-packaging-native.sh +++ b/etc/scripts/test-packaging-native.sh @@ -54,8 +54,7 @@ mvn ${MAVEN_ARGS} -e clean install # Build native images # mp-2 is too big, waiting for more memory # Only SE is tested as part of the pipeline for now -# readonly native_image_tests="se-1 mp-1 mp-3" -readonly native_image_tests="se-1" +readonly native_image_tests="se-1 mp-1 mp-3" for native_test in ${native_image_tests}; do cd ${WS_DIR}/tests/integration/native-image/${native_test} mvn ${MAVEN_ARGS} -e clean package -Pnative-image @@ -63,5 +62,5 @@ done # Run this one because it has no pre-reqs and self-tests # Uses relative path to read configuration -# cd ${WS_DIR}/tests/integration/native-image/mp-1 -# ${WS_DIR}/tests/integration/native-image/mp-1/target/helidon-tests-native-image-mp-1 || true +cd ${WS_DIR}/tests/integration/native-image/mp-1 +${WS_DIR}/tests/integration/native-image/mp-1/target/helidon-tests-native-image-mp-1 || true diff --git a/health/health-checks/src/main/java/io/helidon/health/checks/DeadlockHealthCheck.java b/health/health-checks/src/main/java/io/helidon/health/checks/DeadlockHealthCheck.java index 2c6b5322b6a..35c2d2ca8a5 100644 --- a/health/health-checks/src/main/java/io/helidon/health/checks/DeadlockHealthCheck.java +++ b/health/health-checks/src/main/java/io/helidon/health/checks/DeadlockHealthCheck.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2021 Oracle and/or its affiliates. + * Copyright (c) 2018, 2022 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ @Liveness @ApplicationScoped // this will be ignored if not within CDI @BuiltInHealthCheck -public final class DeadlockHealthCheck implements HealthCheck { +public class DeadlockHealthCheck implements HealthCheck { private static final Logger LOGGER = Logger.getLogger(DeadlockHealthCheck.class.getName()); private static final String NAME = "deadlock"; diff --git a/health/health-checks/src/main/java/io/helidon/health/checks/DiskSpaceHealthCheck.java b/health/health-checks/src/main/java/io/helidon/health/checks/DiskSpaceHealthCheck.java index 7987fa53426..5c2bc291cd1 100644 --- a/health/health-checks/src/main/java/io/helidon/health/checks/DiskSpaceHealthCheck.java +++ b/health/health-checks/src/main/java/io/helidon/health/checks/DiskSpaceHealthCheck.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2021 Oracle and/or its affiliates. + * Copyright (c) 2018, 2022 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,7 +62,7 @@ @Liveness @ApplicationScoped // this will be ignored if not within CDI @BuiltInHealthCheck -public final class DiskSpaceHealthCheck implements HealthCheck { +public class DiskSpaceHealthCheck implements HealthCheck { /** * Default path on the file system the health check will be executed for. * If you need to check a different path (e.g. application runtime disks are not mounted the same diff --git a/health/health-checks/src/main/java/io/helidon/health/checks/HeapMemoryHealthCheck.java b/health/health-checks/src/main/java/io/helidon/health/checks/HeapMemoryHealthCheck.java index 8bd843b7e02..2d109073a54 100644 --- a/health/health-checks/src/main/java/io/helidon/health/checks/HeapMemoryHealthCheck.java +++ b/health/health-checks/src/main/java/io/helidon/health/checks/HeapMemoryHealthCheck.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2021 Oracle and/or its affiliates. + * Copyright (c) 2018, 2022 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ @Liveness @ApplicationScoped // this will be ignored if not within CDI @BuiltInHealthCheck -public final class HeapMemoryHealthCheck implements HealthCheck { +public class HeapMemoryHealthCheck implements HealthCheck { /** * Default threshold percentage. */ diff --git a/integrations/graal/mp-native-image-extension/src/main/java/io/helidon/integrations/graal/mp/nativeimage/extension/ProxyBean.java b/integrations/graal/mp-native-image-extension/src/main/java/io/helidon/integrations/graal/mp/nativeimage/extension/ProxyBean.java index 8d528f67555..cfc9b7e835b 100644 --- a/integrations/graal/mp-native-image-extension/src/main/java/io/helidon/integrations/graal/mp/nativeimage/extension/ProxyBean.java +++ b/integrations/graal/mp-native-image-extension/src/main/java/io/helidon/integrations/graal/mp/nativeimage/extension/ProxyBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. + * Copyright (c) 2021, 2022 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ final class ProxyBean implements Bean { // this is the bean class (producer class, or the type itself for managed beans) private final Class beanClass; - // the types of the produced bean (or + // the types of the produced bean private final Set types; ProxyBean(Class beanClass, Set types) {