Skip to content

Commit

Permalink
Remove older deprecated methods and types. (#7728)
Browse files Browse the repository at this point in the history
  • Loading branch information
tomas-langer authored Oct 6, 2023
1 parent 537dfb7 commit b286561
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 162 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* <p>
* {@link Config#resolve() HOCON resolving substitutions support} is by default enabled.
* {@link ConfigResolveOptions#defaults()} is used to resolve loaded configuration.
* It is possible to {@link #disableResolving() disable resolving} feature
* It is possible to {@link #resolvingEnabled(boolean)}} to disable this feature
* or specify custom {@link #resolveOptions(ConfigResolveOptions) ConfigResolveOptions} instance.
*/
public final class HoconConfigParserBuilder implements Builder<HoconConfigParserBuilder, ConfigParser> {
Expand All @@ -46,18 +46,6 @@ public final class HoconConfigParserBuilder implements Builder<HoconConfigParser
parseOptions = ConfigParseOptions.defaults();
}

/**
* Disables HOCON resolving substitutions support. Default is {@code false}.
*
* @return modified builder instance
* @see #resolvingEnabled
*/
@Deprecated(since = "2.5.1", forRemoval = true)
public HoconConfigParserBuilder disableResolving() {
resolvingEnabled = false;
return this;
}

/**
* Enables/disables HOCON resolving substitutions support. Default is {@code false}.
* <p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public Builder name(String name) {
* @return updated builder instance
* @deprecated use {@link #timeout(Duration)} instead
*/
@Deprecated(since = "4.0.0")
@Deprecated(since = "4.0.0", forRemoval = true)
public Builder timeout(long duration, TimeUnit timeUnit) {
this.timeoutDuration = duration;
this.timeoutUnit = timeUnit;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, 2022 Oracle and/or its affiliates.
* Copyright (c) 2021, 2023 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 @@ -249,20 +249,6 @@ public void unsubscribe(String name) throws JMSException {
ShimUtil.run(() -> delegate.unsubscribe(name));
}

/**
* Unwrap the underlying instance of javax session.
*
* @param type class to unwrap to
* @param <S> type to unwrap to
* @return unwrapped session
* @deprecated since 3.0.3, use {@link io.helidon.messaging.connectors.jms.shim.JakartaSession#unwrap()} instead.
* @throws java.lang.ClassCastException in case the underlying instance is not compatible with the requested type
*/
@Deprecated(forRemoval = true, since = "3.0.3")
public <S extends javax.jms.Session> S unwrap(Class<S> type) {
return type.cast(delegate);
}

@Override
public T unwrap() {
return delegate;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2022 Oracle and/or its affiliates.
* Copyright (c) 2020, 2023 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 All @@ -18,7 +18,6 @@

import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
Expand Down Expand Up @@ -61,35 +60,11 @@ public class MessagingCdiExtension implements Extension {

private final ChannelRouter channelRouter = new ChannelRouter();
private final Set<Consumer<AfterBeanDiscovery>> aotBeanRegistrations = new HashSet<>();
private final FormerHealthProbe formerHealthProbe = new FormerHealthProbe();

/**
* Initialize messaging CDI extension.
*/
public MessagingCdiExtension() {
channelRouter.getChannelProcessors().register(formerHealthProbe);
}

/**
* Get names of all channels accompanied by boolean if cancel or onError signal has been intercepted in it.
*
* @return map of channels
* @deprecated Implement {@link MessagingChannelProcessor} as a bean instead, which can peak to any messaging channel.
*/
@Deprecated(since = "3.0.0", forRemoval = true)
public Map<String, Boolean> channelsLiveness() {
return formerHealthProbe.getLiveChannels();
}

/**
* Get names of all channels accompanied by boolean if onSubscribe signal has been intercepted in it.
*
* @return map of channels
* @deprecated Implement {@link MessagingChannelProcessor} as a bean instead, which can peak to any messaging channel.
*/
@Deprecated(since = "3.0.0", forRemoval = true)
public Map<String, Boolean> channelsReadiness() {
return formerHealthProbe.getReadyChannels();
}

private void registerChannelMethods(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -637,44 +637,6 @@ public Duration tokenRefreshSkew() {
return tokenRefreshSkew;
}

/**
* Cookie name.
*
* @return name of the cookie to use
* @see OidcConfig.Builder#cookieName(String)
* @deprecated use {@link #tokenCookieHandler()} instead
*/
@Deprecated(forRemoval = true, since = "2.4.0")
public String cookieName() {
return tokenCookieHandler().cookieName();
}

/**
* Additional options of the cookie to use.
*
* @return cookie options to use in cookie string
* @see OidcConfig.Builder#cookieHttpOnly(Boolean)
* @see OidcConfig.Builder#cookieDomain(String)
* @deprecated please use {@link #tokenCookieHandler()} instead
*/
@Deprecated(forRemoval = true, since = "2.4.0")
public String cookieOptions() {
return tokenCookieHandler().createCookieOptions();
}

/**
* Prefix of a cookie header formed by name and "=".
*
* @return prefix of cookie value
* @see OidcConfig.Builder#cookieName(String)
* @deprecated use {@link io.helidon.security.providers.oidc.common.OidcCookieHandler} instead, this method
* will no longer be avilable
*/
@Deprecated(forRemoval = true, since = "2.4.0")
public String cookieValuePrefix() {
return tokenCookieHandler().cookieValuePrefix();
}

/**
* Determines whether to force the use of relative URIs in all requests,
* regardless of the presence or absence of proxies or no-proxy lists.
Expand Down

0 comments on commit b286561

Please sign in to comment.