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

Removed final from proxied types, these could no longer be proxied. #4489

Merged
merged 1 commit into from
Jul 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions etc/scripts/test-packaging-native.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,13 @@ 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
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
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -34,7 +34,7 @@
final class ProxyBean implements Bean<Object> {
// 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<Type> types;

ProxyBean(Class<?> beanClass, Set<Type> types) {
Expand Down