You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2016/06/30 00:02:28 UTC
[1/2] commons-crypto git commit: Unnecessary semicolon.
Repository: commons-crypto
Updated Branches:
refs/heads/master 7c544f698 -> 9faf04e47
Unnecessary semicolon.
Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/69b40ed6
Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/69b40ed6
Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/69b40ed6
Branch: refs/heads/master
Commit: 69b40ed68eb6622c1161c3e6172b67f12cd96280
Parents: 7c544f6
Author: Gary Gregory <gg...@apache.org>
Authored: Wed Jun 29 17:00:41 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Wed Jun 29 17:00:41 2016 -0700
----------------------------------------------------------------------
.../apache/commons/crypto/NativeCodeLoader.java | 2 +-
.../crypto/random/OpensslCryptoRandom.java | 2 +-
.../crypto/stream/CryptoInputStream.java | 1 -
.../apache/commons/crypto/utils/IOUtils.java | 200 +++++++++----------
4 files changed, 102 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/69b40ed6/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java b/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
index 6a89a6f..3dee22c 100644
--- a/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
+++ b/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
@@ -60,7 +60,7 @@ final class NativeCodeLoader {
// Loaded the native library
nativeLoaded = true;
} catch (Throwable t) {
- ;// NOPMD: Ignore failure to load
+ // NOPMD: Ignore failure to load
}
nativeCodeLoaded = nativeLoaded;
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/69b40ed6/src/main/java/org/apache/commons/crypto/random/OpensslCryptoRandom.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/crypto/random/OpensslCryptoRandom.java b/src/main/java/org/apache/commons/crypto/random/OpensslCryptoRandom.java
index 23ab482..0728d52 100644
--- a/src/main/java/org/apache/commons/crypto/random/OpensslCryptoRandom.java
+++ b/src/main/java/org/apache/commons/crypto/random/OpensslCryptoRandom.java
@@ -55,7 +55,7 @@ class OpensslCryptoRandom extends Random implements CryptoRandom {
OpensslCryptoRandomNative.initSR();
opensslLoaded = true;
} catch (Throwable t) {
- ; // NOPMD
+ // NOPMD
}
}
nativeEnabled = opensslLoaded;
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/69b40ed6/src/main/java/org/apache/commons/crypto/stream/CryptoInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/crypto/stream/CryptoInputStream.java b/src/main/java/org/apache/commons/crypto/stream/CryptoInputStream.java
index f2d3680..dbd6d18 100644
--- a/src/main/java/org/apache/commons/crypto/stream/CryptoInputStream.java
+++ b/src/main/java/org/apache/commons/crypto/stream/CryptoInputStream.java
@@ -207,7 +207,6 @@ public class CryptoInputStream extends InputStream implements
int n;
while ((n = read(oneByteBuf, 0, 1)) == 0) {
/* no op */
- ;
}
return (n == -1) ? -1 : oneByteBuf[0] & 0xff;
}
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/69b40ed6/src/main/java/org/apache/commons/crypto/utils/IOUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/crypto/utils/IOUtils.java b/src/main/java/org/apache/commons/crypto/utils/IOUtils.java
index 521bdf2..a29c03d 100644
--- a/src/main/java/org/apache/commons/crypto/utils/IOUtils.java
+++ b/src/main/java/org/apache/commons/crypto/utils/IOUtils.java
@@ -1,100 +1,100 @@
-/**
- * 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. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.crypto.utils;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.commons.crypto.stream.input.Input;
-
-/**
- * General utility methods for working with IO.
- */
-public final class IOUtils {
-
- /**
- * Teh private constructor of {@Link IOUtils}.
- */
- private IOUtils() {
- }
-
- /**
- * Does the readFully based on the Input read.
- *
- * @param in the input stream of bytes.
- * @param buf the buffer to be read.
- * @param off the start offset in array buffer.
- * @param len the maximum number of bytes to read.
- * @throws IOException if an I/O error occurs.
- */
- public static void readFully(InputStream in, byte buf[], int off, int len)
- throws IOException {
- int toRead = len;
- while (toRead > 0) {
- int ret = in.read(buf, off, toRead);
- if (ret < 0) {
- throw new IOException("Premature EOF from inputStream");
- }
- toRead -= ret;
- off += ret;
- }
- }
-
- /**
- * Does the readFully based on Input's positioned read. This does not change
- * the current offset of the stream and is thread-safe.
- *
- * @param in the input source.
- * @param position the given position.
- * @param buffer the buffer to be read.
- * @param length the maximum number of bytes to read.
- * @param offset the start offset in array buffer.
- * @throws IOException if an I/O error occurs.
- */
- public static void readFully(Input in, long position, byte[] buffer,
- int offset, int length) throws IOException {
- int nread = 0;
- while (nread < length) {
- int nbytes = in.read(position + nread, buffer, offset + nread,
- length - nread);
- if (nbytes < 0) {
- throw new IOException(
- "End of stream reached before reading fully.");
- }
- nread += nbytes;
- }
- }
-
- /**
- * Closes the Closeable objects and <b>ignore</b> any {@link IOException} or
- * null pointers. Must only be used for cleanup in exception handlers.
- *
- * @param closeables the objects to close.
- */
- public static void cleanup(java.io.Closeable... closeables) {
- for (java.io.Closeable c : closeables) {
- if (c != null) {
- try {
- c.close();
- } catch (Throwable e) {
- ; // NOPMD
- }
- }
- }
- }
-}
+/**
+ * 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. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.crypto.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.commons.crypto.stream.input.Input;
+
+/**
+ * General utility methods for working with IO.
+ */
+public final class IOUtils {
+
+ /**
+ * Teh private constructor of {@Link IOUtils}.
+ */
+ private IOUtils() {
+ }
+
+ /**
+ * Does the readFully based on the Input read.
+ *
+ * @param in the input stream of bytes.
+ * @param buf the buffer to be read.
+ * @param off the start offset in array buffer.
+ * @param len the maximum number of bytes to read.
+ * @throws IOException if an I/O error occurs.
+ */
+ public static void readFully(InputStream in, byte buf[], int off, int len)
+ throws IOException {
+ int toRead = len;
+ while (toRead > 0) {
+ int ret = in.read(buf, off, toRead);
+ if (ret < 0) {
+ throw new IOException("Premature EOF from inputStream");
+ }
+ toRead -= ret;
+ off += ret;
+ }
+ }
+
+ /**
+ * Does the readFully based on Input's positioned read. This does not change
+ * the current offset of the stream and is thread-safe.
+ *
+ * @param in the input source.
+ * @param position the given position.
+ * @param buffer the buffer to be read.
+ * @param length the maximum number of bytes to read.
+ * @param offset the start offset in array buffer.
+ * @throws IOException if an I/O error occurs.
+ */
+ public static void readFully(Input in, long position, byte[] buffer,
+ int offset, int length) throws IOException {
+ int nread = 0;
+ while (nread < length) {
+ int nbytes = in.read(position + nread, buffer, offset + nread,
+ length - nread);
+ if (nbytes < 0) {
+ throw new IOException(
+ "End of stream reached before reading fully.");
+ }
+ nread += nbytes;
+ }
+ }
+
+ /**
+ * Closes the Closeable objects and <b>ignore</b> any {@link IOException} or
+ * null pointers. Must only be used for cleanup in exception handlers.
+ *
+ * @param closeables the objects to close.
+ */
+ public static void cleanup(java.io.Closeable... closeables) {
+ for (java.io.Closeable c : closeables) {
+ if (c != null) {
+ try {
+ c.close();
+ } catch (Throwable e) {
+ // NOPMD
+ }
+ }
+ }
+ }
+}
[2/2] commons-crypto git commit: Statement unnecessarily nested
within else clause.
Posted by gg...@apache.org.
Statement unnecessarily nested within else clause.
Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/9faf04e4
Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/9faf04e4
Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/9faf04e4
Branch: refs/heads/master
Commit: 9faf04e47dc66afc667abe85e0345565574efa09
Parents: 69b40ed
Author: Gary Gregory <gg...@apache.org>
Authored: Wed Jun 29 17:02:14 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Wed Jun 29 17:02:14 2016 -0700
----------------------------------------------------------------------
.../commons/crypto/cipher/CryptoCipherFactory.java | 13 ++++++-------
.../commons/crypto/random/CryptoRandomFactory.java | 9 ++++-----
2 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/9faf04e4/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java b/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java
index d6f908a..52c013d 100644
--- a/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java
+++ b/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java
@@ -133,14 +133,13 @@ public class CryptoCipherFactory {
if (cipher != null) {
return cipher;
- } else {
- if (errorMessage.length() == 0) {
- throw new IllegalArgumentException("No classname(s) provided");
- }
- errorMessage.append(" is not available or transformation " +
- transformation + " is not supported.");
- throw new GeneralSecurityException(errorMessage.toString());
}
+ if (errorMessage.length() == 0) {
+ throw new IllegalArgumentException("No classname(s) provided");
+ }
+ errorMessage.append(" is not available or transformation " +
+ transformation + " is not supported.");
+ throw new GeneralSecurityException(errorMessage.toString());
}
/**
http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/9faf04e4/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java b/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java
index ef20536..7319c7e 100644
--- a/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java
+++ b/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java
@@ -149,12 +149,11 @@ public class CryptoRandomFactory {
if (random != null) {
return random;
- } else {
- if (errorMessage.length() == 0) {
- throw new IllegalArgumentException("No classname(s) provided");
- }
- throw new GeneralSecurityException(errorMessage.toString());
}
+ if (errorMessage.length() == 0) {
+ throw new IllegalArgumentException("No classname(s) provided");
+ }
+ throw new GeneralSecurityException(errorMessage.toString());
}
/**