Skip to content

[#119] Migrate connector-server-jetty off deprecated org.eclipse.jetty.util.log #121

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.

Sign up for GitHub

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

Merged
vharseko merged 1 commit into from
Jul 21, 2026
Merged

[#119] Migrate connector-server-jetty off deprecated org.eclipse.jetty.util.log #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions ...y/src/main/java/org/forgerock/openicf/framework/server/jetty/OpenICFWebSocketCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
import jakarta.servlet.http.HttpServletResponse;

import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
import org.eclipse.jetty.websocket.server.JettyWebSocketCreator;
Expand All @@ -40,10 +38,11 @@
import org.forgerock.openicf.framework.remote.OpenICFServerAdapter;
import org.forgerock.openicf.framework.remote.rpc.OperationMessageListener;
import org.forgerock.openicf.framework.remote.rpc.WebSocketConnectionGroup;
import org.identityconnectors.common.logging.Log;

public class OpenICFWebSocketCreator implements JettyWebSocketCreator, Closeable {

private static final Logger logger = Log.getLogger(OpenICFWebSocketCreator.class);
private static final Log logger = Log.getLog(OpenICFWebSocketCreator.class);

protected final ConcurrentMap<String, WebSocketConnectionGroup> globalConnectionGroups =
new ConcurrentHashMap<String, WebSocketConnectionGroup>();
Expand Down Expand Up @@ -81,7 +80,9 @@ public OpenICFWebSocketCreator(final ConnectorFramework connectorFramework,


if (null == authenticator) {
logger.info("Creating single 'anonymous' authenticator");
// Framework Log formats through MessageFormat, so single quotes
// must be doubled to survive.
logger.info("Creating single ''anonymous'' authenticator");
this.authenticator = new Authenticator() {
@Override
public void authenticate(JettyServerUpgradeRequest request, JettyServerUpgradeResponse response, NameCallback callback) {
Expand Down
13 changes: 5 additions & 8 deletions ...c/main/java/org/forgerock/openicf/framework/server/jetty/OpenICFWebSocketServletBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.forgerock.openicf.framework.server.jetty;

import java.lang.reflect.Method;
import java.nio.ByteBuffer;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
Expand All @@ -27,9 +26,6 @@
import jakarta.servlet.ServletConfig;
import jakarta.servlet.http.HttpServletRequest;

import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.WebSocketPingPongListener;
import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
import org.eclipse.jetty.websocket.server.JettyWebSocketServlet;
Expand All @@ -39,6 +35,7 @@
import org.forgerock.openicf.framework.remote.ReferenceCountedObject;
import org.forgerock.util.Utils;
import org.identityconnectors.common.StringUtil;
import org.identityconnectors.common.logging.Log;

public class OpenICFWebSocketServletBase extends JettyWebSocketServlet {

Expand All @@ -49,7 +46,7 @@ public class OpenICFWebSocketServletBase extends JettyWebSocketServlet {

private static final long serialVersionUID = 6089858120348026823L;

private static final Logger logger = Log.getLogger(OpenICFWebSocketServletBase.class);
private static final Log logger = Log.getLog(OpenICFWebSocketServletBase.class);

private boolean privateConnectorFramework = false;
private boolean privateExecutorService = false;
Expand Down Expand Up @@ -80,7 +77,7 @@ public void destroy() {
// scheduler and framework go away.
websocketCreator.close();
} catch (Throwable e) {
logger.warn(e);
logger.warn(e, "Failed to close the WebSocket creator");
} finally {
websocketCreator = null;
}
Expand All @@ -91,15 +88,15 @@ public void destroy() {
executorService.shutdown();
executorService = null;
} catch (Throwable e) {
logger.warn(e);
logger.warn(e, "Failed to shut the executor service down");
}
}
if (privateConnectorFramework && connectorFramework != null) {
try {
connectorFramework.release();
connectorFramework = null;
} catch (Exception e) {
logger.warn(e);
logger.warn(e, "Failed to release the connector framework");
}
}
}
Expand Down