This is an automated email from the ASF dual-hosted git repository.
mmuzaf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 6c01d3e IGNITE-12893: Add support for SimplifyBooleanExpression
checkstyle rule (#7670)
6c01d3e is described below
commit 6c01d3e6895fdb4408938d17f19440a4fb94cc08
Author: Maxim Muzafarov <maxmu...@gmail.com>
AuthorDate: Tue Apr 14 19:25:44 2020 +0300
IGNITE-12893: Add support for SimplifyBooleanExpression checkstyle rule
(#7670)
---
checkstyle/checkstyle.xml | 3 +++
.../java/org/apache/ignite/gridify/hierarchy/Target.java | 4 ++--
.../org/test/gridify/ExternalNonSpringAopSelfTest.java | 2 +-
.../rest/handlers/cache/GridCacheCommandHandler.java | 3 +--
.../redis/key/GridRedisExpireCommandHandler.java | 2 +-
.../redis/server/GridRedisFlushCommandHandler.java | 2 +-
.../ignite/internal/util/io/GridFilenameUtils.java | 4 ++--
.../ignite/internal/util/test/GridTestPrintStream.java | 2 +-
.../ignite/spi/deployment/DeploymentResourceAdapter.java | 4 ++--
.../dht/GridCacheDhtEvictionsDisabledSelfTest.java | 2 +-
.../internal/processors/database/BPlusTreeSelfTest.java | 2 +-
.../apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java | 2 +-
...ridSessionSetFutureAttributeWaitListenerSelfTest.java | 2 +-
.../GridSessionSetJobAttributeWaitListenerSelfTest.java | 2 +-
.../ignite/startup/servlet/GridServletLoaderTest.java | 4 ++--
.../org/apache/ignite/util/mbeans/GridMBeanSelfTest.java | 16 ++++++++--------
.../java/org/apache/ignite/logger/jcl/JclLoggerTest.java | 2 +-
.../ignite/logger/log4j/GridLog4jLoggingFileTest.java | 2 +-
.../spi/deployment/uri/GridUriDeploymentDiscovery.java | 4 ++--
.../spi/deployment/uri/GridUriDeploymentJarVerifier.java | 10 +++++-----
.../spi/deployment/uri/GridUriDeploymentUriParser.java | 2 +-
21 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index dbfcfd0..e832028 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -33,6 +33,9 @@
<module name="NewlineAtEndOfFile"/>
<module name="TreeWalker">
+ <!-- Coding Checks. See:
https://checkstyle.sourceforge.io/config_coding.html -->
+ <module name="SimplifyBooleanExpression"/>
+
<!-- Import Checks. See:
http://checkstyle.sourceforge.net/config_imports.html -->
<module name="RedundantImport"/>
<module name="UnusedImports"/>
diff --git
a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/Target.java
b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/Target.java
index 42e7872..2393fc2 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/Target.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/Target.java
@@ -27,7 +27,7 @@ public class Target extends SuperTarget {
String res = super.methodA();
- assert "SuperTarget.methodA()".equals(res) == true :
+ assert "SuperTarget.methodA()".equals(res) :
"Unexpected SuperTarget.methodA() apply result [res=" + res + ']';
return "Target.MethodA()";
@@ -37,7 +37,7 @@ public class Target extends SuperTarget {
@Override protected String methodB() {
String res = super.methodB();
- assert "SuperTarget.methodC()".equals(res) == true:
+ assert "SuperTarget.methodC()".equals(res) :
"Unexpected SuperTarget.methodB() apply result [res=" + res + ']';
return res;
diff --git
a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
index fee3bb6..65224fe 100644
---
a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
+++
b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
@@ -467,7 +467,7 @@ public class ExternalNonSpringAopSelfTest extends
GridCommonAbstractTest {
stopGrid();
}
- if (isException == false)
+ if (!isException)
fail("@Gridify method gridifyDefaultException(0) does not return
any exception.");
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index ede41d4..088593b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -35,7 +35,6 @@ import javax.cache.processor.EntryProcessor;
import javax.cache.processor.EntryProcessorException;
import javax.cache.processor.EntryProcessorResult;
import javax.cache.processor.MutableEntry;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
@@ -588,7 +587,7 @@ public class GridCacheCommandHandler extends
GridRestCommandHandlerAdapter {
boolean success = true;
for (IgniteInternalFuture<GridCacheRestResponse> f
: cf.futures())
- if ((Boolean)f.get().getResponse() != true)
+ if (!((Boolean)f.get().getResponse()))
success = false;
GridCacheRestResponse resp = new
GridCacheRestResponse();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExpireCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExpireCommandHandler.java
index 5891e96..7b37376 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExpireCommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExpireCommandHandler.java
@@ -97,7 +97,7 @@ public class GridRedisExpireCommandHandler extends
GridRedisRestCommandHandler {
/** {@inheritDoc} */
@Override public ByteBuffer makeResponse(final GridRestResponse restRes,
List<String> params) {
- return ((Boolean)restRes.getResponse() == true ?
GridRedisProtocolParser.toInteger("1")
+ return ((Boolean)restRes.getResponse() ?
GridRedisProtocolParser.toInteger("1")
: GridRedisProtocolParser.toInteger("0"));
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisFlushCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisFlushCommandHandler.java
index d9104d2..8fad2de 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisFlushCommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisFlushCommandHandler.java
@@ -105,7 +105,7 @@ public class GridRedisFlushCommandHandler extends
GridRedisRestCommandHandler {
/** {@inheritDoc} */
@Override public ByteBuffer makeResponse(final GridRestResponse restRes,
List<String> params) {
- return ((Boolean)restRes.getResponse() == true ?
GridRedisProtocolParser.oKString()
+ return ((Boolean)restRes.getResponse() ?
GridRedisProtocolParser.oKString()
: GridRedisProtocolParser.toGenericError("Failed to flush"));
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java
index ddde966..ccdee84 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java
@@ -628,7 +628,7 @@ public class GridFilenameUtils {
if (ch1 == ':') {
ch0 = Character.toUpperCase(ch0);
if (ch0 >= 'A' && ch0 <= 'Z') {
- if (len == 2 || isSeparator(filename.charAt(2)) == false)
+ if (len == 2 || !isSeparator(filename.charAt(2)))
return 2;
return 3;
}
@@ -1322,7 +1322,7 @@ public class GridFilenameUtils {
if (array[i] == '?')
list.add("?");
else if (list.isEmpty() ||
- i > 0 && list.get(list.size() - 1).equals("*") ==
false)
+ i > 0 && !list.get(list.size() - 1).equals("*"))
list.add("*");
} else
buffer.append(array[i]);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStream.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStream.java
index 7f3d685..855f975 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStream.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/test/GridTestPrintStream.java
@@ -79,7 +79,7 @@ public class GridTestPrintStream extends PrintStream {
while (grp != null && grp.getParent() != baseGrp)
grp = grp.getParent();
- out = release == true ? streams.remove(grp) : streams.get(grp);
+ out = release ? streams.remove(grp) : streams.get(grp);
if (out == null) {
if (release)
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentResourceAdapter.java
b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentResourceAdapter.java
index fb4aa78..a060b23 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentResourceAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentResourceAdapter.java
@@ -74,8 +74,8 @@ public class DeploymentResourceAdapter implements
DeploymentResource {
DeploymentResourceAdapter rsrc = (DeploymentResourceAdapter)obj;
- return clsLdr.equals(rsrc.clsLdr) == true && name.equals(rsrc.name) ==
true &&
- rsrcCls.equals(rsrc.rsrcCls) == true;
+ return clsLdr.equals(rsrc.clsLdr) && name.equals(rsrc.name) &&
+ rsrcCls.equals(rsrc.rsrcCls);
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
index 8bd8431..7de226c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
@@ -110,7 +110,7 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends
GridCommonAbstractTes
assertNotNull(v2);
// TODO GG-11148: can do assertSame if on-heap storage is
implemented.
- if (false && affinity(cache).mapKeyToNode(key).isLocal())
+ if (false)
assertSame(v1, v2);
else
assertEquals(v1, v2);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
index 4132e3d..3b1a9c1 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
@@ -65,8 +65,8 @@ import
org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersion
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
import
org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
import
org.apache.ignite.internal.processors.cache.persistence.tree.util.PageLockListener;
-import org.apache.ignite.internal.processors.metric.impl.LongAdderMetric;
import org.apache.ignite.internal.processors.failure.FailureProcessor;
+import org.apache.ignite.internal.processors.metric.impl.LongAdderMetric;
import org.apache.ignite.internal.util.GridConcurrentHashSet;
import org.apache.ignite.internal.util.GridRandom;
import org.apache.ignite.internal.util.GridStripedLock;
diff --git
a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java
index c47ac59..08c25e2 100644
---
a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PRecursionTaskSelfTest.java
@@ -151,7 +151,7 @@ public class GridP2PRecursionTaskSelfTest extends
GridCommonAbstractTest {
for (int i = 0; i < arg; i++) {
// Recycle iterator.
- if (iter.hasNext() == false)
+ if (!iter.hasNext())
iter = subgrid.iterator();
ClusterNode node = iter.next();
diff --git
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
index 635e000..298b668 100644
---
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
@@ -168,7 +168,7 @@ public class
GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommo
startSignal.countDown();
try {
- if (startSignal.await(WAIT_TIME,
TimeUnit.MILLISECONDS) == false)
+ if (!startSignal.await(WAIT_TIME,
TimeUnit.MILLISECONDS))
fail();
synchronized (mux) {
diff --git
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
index 8b477af..a250df6 100644
---
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
@@ -153,7 +153,7 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest
extends GridCommonAb
startSignal.countDown();
try {
- if (startSignal.await(WAIT_TIME,
TimeUnit.MILLISECONDS) == false)
+ if (!startSignal.await(WAIT_TIME,
TimeUnit.MILLISECONDS))
fail();
GridTaskSessionAttributeTestListener lsnr =
diff --git
a/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java
b/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java
index cc14f89..58afa10 100644
---
a/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java
@@ -101,12 +101,12 @@ public class GridServletLoaderTest extends
GridCommonAbstractTest {
int i = 0;
- while (found == false) {
+ while (!found) {
info("Attempt to find GridKernal MBean [num=" + i + ']');
Set<ObjectName> names =
jmx.getMBeanServerConnection().queryNames(queryName, null);
- if (names.isEmpty() == false) {
+ if (!names.isEmpty()) {
for (ObjectName objectName : names) {
info("Found MBean for node: " + objectName);
diff --git
a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
index e43ab50..a8f4ef2 100644
---
a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanSelfTest.java
@@ -46,7 +46,7 @@ public class GridMBeanSelfTest extends GridCommonAbstractTest
{
MBeanInfo info = mbean.getMBeanInfo();
- assert info.getDescription().equals("MBeanDescription.") == true;
+ assert info.getDescription().equals("MBeanDescription.");
assert info.getOperations().length == 2;
@@ -54,29 +54,29 @@ public class GridMBeanSelfTest extends
GridCommonAbstractTest {
if (opInfo.getDescription().equals("MBeanOperation."))
assert opInfo.getSignature().length == 2;
else {
- assert opInfo.getDescription().equals("MBeanSuperOperation.")
== true;
+ assert opInfo.getDescription().equals("MBeanSuperOperation.");
assert opInfo.getSignature().length == 1;
}
}
for (MBeanParameterInfo paramInfo :
info.getOperations()[0].getSignature()) {
if (paramInfo.getName().equals("ignored"))
- assert
paramInfo.getDescription().equals("MBeanOperationParameter1.") == true;
+ assert
paramInfo.getDescription().equals("MBeanOperationParameter1.");
else {
- assert paramInfo.getName().equals("someData") == true;
- assert
paramInfo.getDescription().equals("MBeanOperationParameter2.") == true;
+ assert paramInfo.getName().equals("someData");
+ assert
paramInfo.getDescription().equals("MBeanOperationParameter2.");
}
}
assert info.getAttributes().length == 4 : "Expected 4 attributes but
got " + info.getAttributes().length;
for (MBeanAttributeInfo attrInfo : info.getAttributes()) {
- if (attrInfo.isWritable() == false) {
- assert
(attrInfo.getDescription().equals("MBeanReadonlyGetter.") == true ||
+ if (!attrInfo.isWritable()) {
+ assert
(attrInfo.getDescription().equals("MBeanReadonlyGetter.") ||
attrInfo.getDescription().equals("MBeanROGetter."));
}
else {
- assert
(attrInfo.getDescription().equals("MBeanWritableGetter.") == true ||
+ assert
(attrInfo.getDescription().equals("MBeanWritableGetter.") ||
attrInfo.getDescription().equals("MBeanWritableIsGetter."));
}
}
diff --git
a/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/JclLoggerTest.java
b/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/JclLoggerTest.java
index 0568e0c..9912f5e 100644
--- a/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/JclLoggerTest.java
+++ b/modules/jcl/src/test/java/org/apache/ignite/logger/jcl/JclLoggerTest.java
@@ -36,7 +36,7 @@ public class JclLoggerTest {
public void testLogInitialize() {
log = new JclLogger(LogFactory.getLog(JclLoggerTest.class.getName()));
- assert log.isInfoEnabled() == true;
+ assert log.isInfoEnabled();
log.info("This is 'info' message.");
log.warning("This is 'warning' message.");
diff --git
a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java
b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java
index a6d683e..d609b11 100644
---
a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java
+++
b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jLoggingFileTest.java
@@ -43,7 +43,7 @@ public class GridLog4jLoggingFileTest {
xml =
GridTestUtils.resolveIgnitePath("modules/core/src/test/config/log4j-test.xml");
assert xml != null;
- assert xml.exists() == true;
+ assert xml.exists();
log = new Log4JLogger(xml).getLogger(getClass());
}
diff --git
a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentDiscovery.java
b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentDiscovery.java
index b3c2e0c..d47ec68 100644
---
a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentDiscovery.java
+++
b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentDiscovery.java
@@ -62,7 +62,7 @@ final class GridUriDeploymentDiscovery {
throws IgniteSpiException {
Set<Class<? extends ComputeTask<?, ?>>> rsrcs = new HashSet<>();
- if (file.exists() == false)
+ if (!file.exists())
return rsrcs;
GridUriDeploymentFileResourceLoader fileRsrcLdr = new
GridUriDeploymentFileResourceLoader(clsLdr, file);
@@ -95,7 +95,7 @@ final class GridUriDeploymentDiscovery {
*/
private static void
findResourcesInDirectory(GridUriDeploymentFileResourceLoader clsLdr, File dir,
Set<Class<? extends ComputeTask<?, ?>>> rsrcs) {
- assert dir.isDirectory() == true;
+ assert dir.isDirectory();
for (File file : dir.listFiles()) {
if (file.isDirectory()) {
diff --git
a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentJarVerifier.java
b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentJarVerifier.java
index 4611c43..f8c17ab 100644
---
a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentJarVerifier.java
+++
b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentJarVerifier.java
@@ -175,7 +175,7 @@ final class GridUriDeploymentJarVerifier {
// Will return quietly if no problem.
verifyDigestsImplicitly(jin);
- if (verifyEntry(jarEntry, manifest, pubKey, allSigned, true)
== false)
+ if (!verifyEntry(jarEntry, manifest, pubKey, allSigned, true))
return false;
manifestFiles.remove(jarEntry.getName());
@@ -236,7 +236,7 @@ final class GridUriDeploymentJarVerifier {
// Will return quietly if no problem.
verifyDigestsImplicitly(jarFile.getInputStream(jarEntry));
- if (verifyEntry(jarEntry, manifest, pubKey, allSigned, false)
== false)
+ if (!verifyEntry(jarEntry, manifest, pubKey, allSigned, false))
return false;
manifestFiles.remove(jarEntry.getName());
@@ -285,16 +285,16 @@ final class GridUriDeploymentJarVerifier {
inManifest = true;
// Don't ignore files not listed in manifest and META-INF directory.
- if (allSigned == true && inManifest == false &&
entryName.toUpperCase().startsWith("META-INF/") == false)
+ if (allSigned && !inManifest &&
!entryName.toUpperCase().startsWith("META-INF/"))
return false;
// Looking at entries in manifest file.
if (inManifest) {
- Certificate[] certs = makeCerts == false ?
jarEntry.getCertificates() : getCertificates(jarEntry);
+ Certificate[] certs = !makeCerts ? jarEntry.getCertificates() :
getCertificates(jarEntry);
boolean isSigned = certs != null && certs.length > 0;
- if (isSigned == false || pubKey != null &&
findKeyInCertificates(pubKey, certs) == false)
+ if (!isSigned || pubKey != null && !findKeyInCertificates(pubKey,
certs))
return false;
}
diff --git
a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentUriParser.java
b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentUriParser.java
index 5c95a88..61b32fc 100644
---
a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentUriParser.java
+++
b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentUriParser.java
@@ -66,7 +66,7 @@ class GridUriDeploymentUriParser {
p++; // Skip ':'
if (at(p, n, '/')) {
- if (at(p, n, '/') == true && at(p + 1, n, '/')) {
+ if (at(p, n, '/') && at(p + 1, n, '/')) {
p += 2;
// Seek authority.
