QPID-8132: Stop using deprecated constants from BCEL
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java
index 6aa900c..e1e0d5e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java
@@ -20,10 +20,12 @@
*/
package org.apache.qpid.server.security.auth.manager.ldap;
-import static org.apache.bcel.Constants.ACC_PRIVATE;
-import static org.apache.bcel.Constants.ACC_PUBLIC;
-import static org.apache.bcel.Constants.ACC_STATIC;
-import static org.apache.bcel.Constants.ACC_SUPER;
+import static org.apache.bcel.Const.ACC_PRIVATE;
+import static org.apache.bcel.Const.ACC_PROTECTED;
+import static org.apache.bcel.Const.ACC_PUBLIC;
+import static org.apache.bcel.Const.ACC_STATIC;
+import static org.apache.bcel.Const.ACC_SUPER;
+import static org.apache.bcel.Const.INVOKESPECIAL;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -32,12 +34,11 @@
import javax.net.SocketFactory;
import javax.net.ssl.SSLSocketFactory;
-import org.apache.bcel.Constants;
import org.apache.bcel.classfile.JavaClass;
import org.apache.bcel.generic.ClassGen;
import org.apache.bcel.generic.ConstantPoolGen;
import org.apache.bcel.generic.FieldGen;
-import org.apache.bcel.generic.InstructionConstants;
+import org.apache.bcel.generic.InstructionConst;
import org.apache.bcel.generic.InstructionFactory;
import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.MethodGen;
@@ -107,7 +108,7 @@
createSslContextStaticField(classGen, constantPoolGen);
createGetDefaultStaticMethod(classGen, constantPoolGen, factory);
- classGen.addEmptyConstructor(Constants.ACC_PROTECTED);
+ classGen.addEmptyConstructor(ACC_PROTECTED);
JavaClass javaClass = classGen.getJavaClass();
ByteArrayOutputStream out = null;
@@ -167,13 +168,13 @@
constantPoolGen);
il.append(instructionFactory.createNew(classGen.getClassName()));
- il.append(InstructionConstants.DUP);
+ il.append(InstructionConst.DUP);
il.append(instructionFactory.createInvoke(classGen.getClassName(), "<init>", Type.VOID,
new Type[] {},
- Constants.INVOKESPECIAL));
+ INVOKESPECIAL));
- il.append(InstructionConstants.ARETURN);
+ il.append(InstructionConst.ARETURN);
mg.setMaxStack();
classGen.addMethod(mg.getMethod());
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
index e6ed0ef..b6f52d1 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
@@ -20,9 +20,9 @@
*/
package org.apache.qpid.server.model;
-import static org.apache.bcel.Constants.ACC_INTERFACE;
-import static org.apache.bcel.Constants.ACC_PUBLIC;
-import static org.apache.bcel.Constants.ACC_SUPER;
+import static org.apache.bcel.Const.ACC_INTERFACE;
+import static org.apache.bcel.Const.ACC_PUBLIC;
+import static org.apache.bcel.Const.ACC_SUPER;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
