You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2018/11/06 12:37:14 UTC

qpid-proton-j git commit: NO-JIRA: trivial code cleanups. This closes #18.

Repository: qpid-proton-j
Updated Branches:
  refs/heads/master 0cb8ca03c -> 50b507ff2


NO-JIRA: trivial code cleanups. This closes #18.


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/commit/50b507ff
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/tree/50b507ff
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/diff/50b507ff

Branch: refs/heads/master
Commit: 50b507ff2d93155579dda6c1b6ab5b60bde0beee
Parents: 0cb8ca0
Author: Jiri Danek <jd...@redhat.com>
Authored: Mon Oct 15 11:29:08 2018 +0200
Committer: Robbie Gemmell <ro...@apache.org>
Committed: Tue Nov 6 12:36:43 2018 +0000

----------------------------------------------------------------------
 .../org/apache/qpid/proton/example/reactor/GoodbyeWorld.java   | 2 +-
 .../main/java/org/apache/qpid/proton/codec/BigIntegerType.java | 4 ++--
 .../main/java/org/apache/qpid/proton/engine/EndpointState.java | 2 +-
 .../main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java | 6 +++---
 .../java/org/apache/qpid/proton/engine/impl/TransportImpl.java | 2 +-
 .../qpid/proton/engine/impl/ssl/DefaultSslEngineFacade.java    | 2 +-
 .../qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java    | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/50b507ff/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/GoodbyeWorld.java
----------------------------------------------------------------------
diff --git a/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/GoodbyeWorld.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/GoodbyeWorld.java
index 6a69ba1..8795256 100644
--- a/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/GoodbyeWorld.java
+++ b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/GoodbyeWorld.java
@@ -50,7 +50,7 @@ public class GoodbyeWorld extends BaseHandler {
     // might take.
     @Override
     public void onReactorFinal(Event e) {
-        System.out.println("Goodbye, World!");;
+        System.out.println("Goodbye, World!");
     }
 
     public static void main(String[] args) throws IOException {

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/50b507ff/proton-j/src/main/java/org/apache/qpid/proton/codec/BigIntegerType.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/codec/BigIntegerType.java b/proton-j/src/main/java/org/apache/qpid/proton/codec/BigIntegerType.java
index f74e80b..cdaa535 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/codec/BigIntegerType.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/codec/BigIntegerType.java
@@ -35,8 +35,8 @@ public class BigIntegerType extends AbstractPrimitiveType<BigInteger> {
 
     private static final BigInteger BIG_BYTE_MIN = BigInteger.valueOf(Byte.MIN_VALUE);
     private static final BigInteger BIG_BYTE_MAX = BigInteger.valueOf(Byte.MAX_VALUE);
-    private static final BigInteger BIG_LONG_MIN = BigInteger.valueOf(Long.MIN_VALUE);;
-    private static final BigInteger BIG_LONG_MAX = BigInteger.valueOf(Long.MAX_VALUE);;
+    private static final BigInteger BIG_LONG_MIN = BigInteger.valueOf(Long.MIN_VALUE);
+    private static final BigInteger BIG_LONG_MAX = BigInteger.valueOf(Long.MAX_VALUE);
 
     private BigIntegerEncoding _BigIntegerEncoding;
     private BigIntegerEncoding _smallBigIntegerEncoding;

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/50b507ff/proton-j/src/main/java/org/apache/qpid/proton/engine/EndpointState.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/EndpointState.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/EndpointState.java
index c11da6c..d04feef 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/EndpointState.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/EndpointState.java
@@ -28,5 +28,5 @@ public enum EndpointState
 {
     UNINITIALIZED,
     ACTIVE,
-    CLOSED;
+    CLOSED,
 }

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/50b507ff/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
index ec7bffc..fecf7e6 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
@@ -71,7 +71,7 @@ public class SaslImpl implements Sasl, SaslFrameBody.SaslFrameBodyHandler<Void>,
     private boolean _mechanismsSent;
     private boolean _initSent;
 
-    enum Role { CLIENT, SERVER };
+    enum Role { CLIENT, SERVER }
 
     private SaslOutcome _outcome = SaslOutcome.PN_SASL_NONE;
     private SaslState _state = SaslState.PN_SASL_IDLE;
@@ -89,8 +89,8 @@ public class SaslImpl implements Sasl, SaslFrameBody.SaslFrameBodyHandler<Void>,
 
     /**
      * @param maxFrameSize the size of the input and output buffers
-     * returned by {@link SaslTransportWrapper#getInputBuffer()} and
-     * {@link SaslTransportWrapper#getOutputBuffer()}.
+     * {@link SaslTransportWrapper#_inputBuffer} and
+     * {@link SaslTransportWrapper#_outputBuffer}.
      */
     SaslImpl(TransportImpl transport, int maxFrameSize)
     {

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/50b507ff/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
index e07edbb..1a02cf3 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/50b507ff/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/DefaultSslEngineFacade.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/DefaultSslEngineFacade.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/DefaultSslEngineFacade.java
index 8c38126..1233813 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/DefaultSslEngineFacade.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/DefaultSslEngineFacade.java
@@ -36,7 +36,7 @@ class DefaultSslEngineFacade implements ProtonSslEngine
     /**
      * Our testing has shown that application buffers need to be a bit larger
      * than that provided by {@link SSLSession#getApplicationBufferSize()} otherwise
-     * {@link Status#BUFFER_OVERFLOW} will result on {@link SSLEngine#unwrap()}.
+     * {@link Status#BUFFER_OVERFLOW} will result on {@link SSLEngine#unwrap}.
      * Sun's own example uses 50, so we use the same.
      */
     private static final int APPLICATION_BUFFER_EXTRA = 50;

http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/50b507ff/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
index 6a730df..71788fb 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
@@ -247,7 +247,7 @@ public class SslEngineFacadeFactory
             _logger.log(Level.FINE, mode + " Enabled cipher suites " + Arrays.asList(sslEngine.getEnabledCipherSuites()));
         }
 
-        boolean useClientMode = mode == SslDomain.Mode.CLIENT ? true : false;
+        boolean useClientMode = mode == SslDomain.Mode.CLIENT;
         sslEngine.setUseClientMode(useClientMode);
 
         removeSSLv3Support(sslEngine);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org