1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129
|
Description: Disables BlocHound integration (missing dependency)
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/common/src/main/java/io/netty/util/internal/Hidden.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2019 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package io.netty.util.internal;
-
-import io.netty.util.concurrent.FastThreadLocalThread;
-import reactor.blockhound.BlockHound;
-import reactor.blockhound.integration.BlockHoundIntegration;
-
-import java.util.function.Function;
-import java.util.function.Predicate;
-
-/**
- * Contains classes that must be have public visibility but are not public API.
- */
-class Hidden {
-
- /**
- * This class integrates Netty with BlockHound.
- * <p>
- * It is public but only because of the ServiceLoader's limitations
- * and SHOULD NOT be considered a public API.
- */
- @UnstableApi
- @SuppressJava6Requirement(reason = "BlockHound is Java 8+, but this class is only loaded by it's SPI")
- public static final class NettyBlockHoundIntegration implements BlockHoundIntegration {
-
- @Override
- public void applyTo(BlockHound.Builder builder) {
- builder.allowBlockingCallsInside(
- "io.netty.channel.nio.NioEventLoop",
- "handleLoopException"
- );
-
- builder.allowBlockingCallsInside(
- "io.netty.channel.kqueue.KQueueEventLoop",
- "handleLoopException"
- );
-
- builder.allowBlockingCallsInside(
- "io.netty.channel.epoll.EpollEventLoop",
- "handleLoopException"
- );
-
- builder.allowBlockingCallsInside(
- "io.netty.util.HashedWheelTimer$Worker",
- "waitForNextTick"
- );
-
- builder.allowBlockingCallsInside(
- "io.netty.util.concurrent.SingleThreadEventExecutor",
- "confirmShutdown"
- );
-
- builder.allowBlockingCallsInside(
- "io.netty.handler.ssl.SslHandler",
- "handshake"
- );
-
- builder.allowBlockingCallsInside(
- "io.netty.handler.ssl.SslHandler",
- "runAllDelegatedTasks"
- );
-
- builder.allowBlockingCallsInside(
- "io.netty.util.concurrent.GlobalEventExecutor",
- "takeTask");
-
- builder.allowBlockingCallsInside(
- "io.netty.util.concurrent.SingleThreadEventExecutor",
- "takeTask");
-
- builder.nonBlockingThreadPredicate(new Function<Predicate<Thread>, Predicate<Thread>>() {
- @Override
- public Predicate<Thread> apply(final Predicate<Thread> p) {
- return new Predicate<Thread>() {
- @Override
- @SuppressJava6Requirement(reason = "Predicate#test")
- public boolean test(Thread thread) {
- return p.test(thread) || thread instanceof FastThreadLocalThread;
- }
- };
- }
- });
- }
-
- @Override
- public int compareTo(BlockHoundIntegration o) {
- return 0;
- }
- }
-}
--- a/common/src/main/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2019 The Netty Project
-#
-# The Netty Project licenses this file to you under the Apache License,
-# version 2.0 (the "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-io.netty.util.internal.Hidden$NettyBlockHoundIntegration
\ No newline at end of file
|