Skip to content

Commit

Permalink
WHACK-23: Drop deprecated Log interface
Browse files Browse the repository at this point in the history
Instead of using `org.xmpp.component.Log`, an SLF4j provided Logger should be used.
  • Loading branch information
guusdk committed Nov 20, 2024
1 parent df270f7 commit b2ae4c3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 201 deletions.
71 changes: 1 addition & 70 deletions source/java/org/jivesoftware/whack/ExternalComponentManager.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
/**
* $RCSfile$
* $Revision$
* $Date$
*
* Copyright 2005 Jive Software.
* Copyright 2005 Jive Software, 2024 Ignite Realtime Foundation.
*
* All rights reserved. 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 @@ -33,7 +29,6 @@
import org.xmpp.component.ComponentManager;
import org.xmpp.component.ComponentManagerFactory;
import org.xmpp.component.IQResultListener;
import org.xmpp.component.Log;
import org.xmpp.packet.IQ;
import org.xmpp.packet.JID;
import org.xmpp.packet.Packet;
Expand Down Expand Up @@ -103,9 +98,6 @@ public class ExternalComponentManager implements ComponentManager {
*/
private Map<Component, ExternalComponent> components = new Hashtable<Component,ExternalComponent>();

@Deprecated
private Log oldLogger;

/**
* Constructs a new ExternalComponentManager that will make connections
* to the specified XMPP server on the default external component port (5275).
Expand All @@ -131,8 +123,6 @@ public ExternalComponentManager(String host, int port) {
this.host = host;
this.port = port;

createDummyLogger();

// Set this ComponentManager as the current component manager
ComponentManagerFactory.setComponentManager(this);
}
Expand All @@ -145,8 +135,6 @@ public ExternalComponentManager(String host, int port, boolean startEncrypted) {
this.port = port;
this.startEncrypted = startEncrypted;

createDummyLogger();

// Set this ComponentManager as the current component manager
ComponentManagerFactory.setComponentManager(this);
}
Expand Down Expand Up @@ -360,61 +348,4 @@ public void setConnectTimeout(int connectTimeout) {
public boolean isExternalMode() {
return true;
}

@Deprecated
public Log getLog() {
return oldLogger;
}

private void createDummyLogger() {
this.oldLogger = new Log() {
public void error(String message) {
Logger.error(message);
}

public void error(String message, Throwable throwable) {
Logger.error(message, throwable);
}

public void error(Throwable throwable) {
Logger.error("", throwable);
}

public void warn(String message) {
Logger.warn(message);
}

public void warn(String message, Throwable throwable) {
Logger.warn(message, throwable);
}

public void warn(Throwable throwable) {
Logger.warn("", throwable);
}

public void info(String message) {
Logger.info(message);
}

public void info(String message, Throwable throwable) {
Logger.info(message, throwable);
}

public void info(Throwable throwable) {
Logger.info("", throwable);
}

public void debug(String message) {
Logger.debug(message);
}

public void debug(String message, Throwable throwable) {
Logger.debug(message, throwable);
}

public void debug(Throwable throwable) {
Logger.debug("", throwable);
}
};
}
}
131 changes: 0 additions & 131 deletions source/java/org/xmpp/component/Log.java

This file was deleted.

0 comments on commit b2ae4c3

Please sign in to comment.