Skip to content

Commit

Permalink
Remove unused parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
pzygielo committed Sep 22, 2022
1 parent 2987f97 commit 0ba416b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 16 deletions.
Expand Up @@ -69,7 +69,7 @@ public void authenticate(String username, String password, boolean logout) throw
String[] args = { authType, hd.getType(), hd.getClass().getName() };
throw new BrokerException(Globals.getBrokerResources().getKString(BrokerResources.X_AUTHTYPE_MISMATCH, args));
}
hd.init(username, password, null /* props */);
hd.init(username, password);

int seq = 0;
byte[] req = ac.getChallenge(seq, new Properties(), getAuthCacheData().getCacheData(), null /* overrideType */);
Expand Down
Expand Up @@ -878,7 +878,6 @@ private void authenticate(ReadOnlyPacket authRequest, String name, String passwo
byte[] reqData, resData;
ReadWritePacket response;
Hashtable properties;
Hashtable authProperties = connection.getConfiguration();
AuthenticationProtocolHandler hd = null;
ReadWritePacket request = (ReadWritePacket) authRequest;

Expand All @@ -890,7 +889,7 @@ private void authenticate(ReadOnlyPacket authRequest, String name, String passwo
if (chanllenge != null && chanllenge.booleanValue()) {
checkAdminKeyAuth(authType);
hd = getAuthHandlerInstance(authType);
hd.init(name, password, authProperties);
hd.init(name, password);
connection.setAuthenticationHandler(hd);
} else {
hd = connection.getAuthenticationHandler();
Expand Down
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021 Contributors to the Eclipse Foundation
* Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -18,7 +18,6 @@
package com.sun.messaging.jmq.jmsclient.auth;

import java.io.*;
import java.util.Hashtable;
import javax.security.auth.login.LoginException;
import com.sun.messaging.AdministeredObject;
import com.sun.messaging.jmq.auth.api.client.*;
Expand All @@ -43,7 +42,7 @@ public String getType() {
* values (if not passed in createConnection() call, they are assigned default values).
*/
@Override
public void init(String username, String password, Hashtable authProperties) {
public void init(String username, String password) {
this.username = username;
this.password = password;
}
Expand Down
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021 Contributors to the Eclipse Foundation
* Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -17,7 +17,6 @@

package com.sun.messaging.jmq.auth.api.client;

import java.util.Hashtable;
import javax.security.auth.login.LoginException;

/**
Expand All @@ -36,13 +35,12 @@ public interface AuthenticationProtocolHandler {
*
* @param username the user name passed from createConnection()
* @param password the password passed from createConnection()
* @param authProperties not defined yet
*
* Currently for JMQ2.0, username/password always have values (if not passed in createConnection() call, they are
* assigned default values).
*
*/
void init(String username, String password, Hashtable authProperties) throws LoginException;
void init(String username, String password);

/**
* This method is called to handle a authentication request.
Expand Down
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
* Copyright 2021 Contributors to the Eclipse Foundation
* Copyright 2021, 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -18,7 +18,6 @@
package com.sun.messaging.jmq.auth.handlers;

import java.io.*;
import java.util.Hashtable;
import javax.security.auth.login.LoginException;
import com.sun.messaging.jmq.auth.api.client.*;
import com.sun.messaging.jmq.util.BASE64Encoder;
Expand All @@ -38,7 +37,7 @@ public String getType() {
}

@Override
public void init(String username, String password, Hashtable authProperties) throws LoginException {
public void init(String username, String password) {
this.username = username;
this.password = password;
}
Expand Down
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
* Copyright 2021 Contributors to the Eclipse Foundation
* Copyright 2021, 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -18,7 +18,6 @@
package com.sun.messaging.jmq.auth.handlers;

import java.io.*;
import java.util.Hashtable;
import javax.security.auth.login.LoginException;
import com.sun.messaging.jmq.auth.api.client.*;
import com.sun.messaging.jmq.util.MD5;
Expand All @@ -42,7 +41,7 @@ public String getType() {
* values (if not passed in createConnection() call, they are assigned default values).
*/
@Override
public void init(String username, String password, Hashtable authProperties) throws LoginException {
public void init(String username, String password) {
this.username = username;
this.password = password;
}
Expand Down

0 comments on commit 0ba416b

Please sign in to comment.