You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/10/08 20:34:09 UTC
qpid-broker-j git commit: QPID-8132: Stop using deprecated constants
from BCEL
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 9dd20fba6 -> 20840e1f1
QPID-8132: Stop using deprecated constants from BCEL
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/20840e1f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/20840e1f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/20840e1f
Branch: refs/heads/master
Commit: 20840e1f19cb524e8317940554e9808bd0d871a2
Parents: 9dd20fb
Author: Alex Rudyy <or...@apache.org>
Authored: Mon Oct 8 21:29:10 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Mon Oct 8 21:32:36 2018 +0100
----------------------------------------------------------------------
.../ldap/LDAPSSLSocketFactoryGenerator.java | 21 ++++++++++----------
.../qpid/server/model/BrokerTestHelper.java | 6 +++---
2 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/20840e1f/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java
----------------------------------------------------------------------
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 java.lang.reflect.Field;
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 @@ public class LDAPSSLSocketFactoryGenerator
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 @@ public class LDAPSSLSocketFactoryGenerator
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());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/20840e1f/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
----------------------------------------------------------------------
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org