This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/aries.git
commit f9dc4dc14bd68ba573699b7aee09846f52107118 Author: Dominik Przybysz <[email protected]> AuthorDate: Wed Mar 26 20:52:14 2025 +0100 [MAINTENANCE] Simplify triple negation usage --- .../ext/AbstractPropertyPlaceholderExt.java | 8 ++++---- .../aries/blueprint/utils/ReflectionUtils.java | 6 +++--- .../blueprint/ext/AbstractPropertyPlaceholder.java | 6 +++--- .../apache/aries/jmx/core/whiteboard/Activator.java | 2 +- .../org/apache/aries/jndi/startup/Activator.java | 2 +- .../aries/proxy/impl/AbstractProxyManager.java | 2 +- .../org/apache/aries/proxy/impl/AsmProxyManager.java | 6 +++--- .../org/apache/aries/proxy/impl/JdkProxyManager.java | 2 +- .../proxy/impl/common/MethodCopyingClassAdapter.java | 6 +++--- .../proxy/impl/common/OSGiFriendlyClassWriter.java | 4 ++-- .../proxy/impl/interfaces/ProxyClassLoader.java | 2 +- .../impl/weaving/SyntheticSerialVerUIDAdder.java | 2 +- .../aries/proxy/impl/weaving/WovenProxyAdapter.java | 2 +- .../aries/blueprint/proxy/AbstractProxyTest.java | 2 +- .../blueprint/proxy/WovenProxyGeneratorTest.java | 2 +- .../apache/aries/proxy/itests/WeavingProxyTest.java | 4 ++-- .../spifly/dynamic/OSGiFriendlyClassWriter.java | 4 ++-- .../org/apache/aries/mocks/BundleContextMock.java | 2 +- .../main/java/org/apache/aries/mocks/BundleMock.java | 2 +- .../org/apache/aries/util/AriesFrameworkUtil.java | 2 +- .../java/org/apache/aries/util/FragmentBuilder.java | 8 ++++---- .../java/org/apache/aries/util/VersionRange.java | 4 ++-- .../util/filesystem/impl/NestedZipDirectory.java | 6 +++--- .../aries/util/filesystem/impl/NestedZipFile.java | 4 ++-- .../aries/util/filesystem/impl/ZipDirectory.java | 6 +++--- .../aries/util/filesystem/impl/ZipFileImpl.java | 2 +- .../main/java/org/apache/aries/util/io/IOUtils.java | 4 ++-- .../aries/util/manifest/ManifestHeaderProcessor.java | 8 ++++---- .../util/tracker/InternalRecursiveBundleTracker.java | 2 +- .../aries/util/tracker/SingleServiceTracker.java | 2 +- .../apache/aries/util/filesystem/FileSystemTest.java | 2 +- .../aries/versioning/check/BundleCompatibility.java | 20 ++++++++++---------- .../versioning/check/SemanticVersioningChecker.java | 2 +- .../aries/versioning/utils/ClassDeclaration.java | 14 +++++++------- .../versioning/utils/SemanticVersioningUtils.java | 6 +++--- .../aries/web/converter/impl/JSPImportParser.java | 2 +- .../apache/aries/web/url/WAR_URLServiceHandler.java | 2 +- 37 files changed, 81 insertions(+), 81 deletions(-) diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholderExt.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholderExt.java index 03725e1ec..531fcda60 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholderExt.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholderExt.java @@ -204,7 +204,7 @@ public abstract class AbstractPropertyPlaceholderExt extends PropertyPlaceholder } List<MapEntry> entries = new ArrayList<MapEntry>(component.getServiceProperties()); - if(!!! entries.isEmpty()) { + if(! entries.isEmpty()) { try { if(component instanceof MutableServiceMetadata) { @@ -284,7 +284,7 @@ public abstract class AbstractPropertyPlaceholderExt extends PropertyPlaceholder protected Metadata processPropsMetadata(PropsMetadata metadata) { List<MapEntry> entries = new ArrayList<MapEntry>(metadata.getEntries()); - if(!!! entries.isEmpty()) { + if(! entries.isEmpty()) { try { if(metadata instanceof MutablePropsMetadata) { @@ -311,7 +311,7 @@ public abstract class AbstractPropertyPlaceholderExt extends PropertyPlaceholder protected Metadata processMapMetadata(MapMetadata metadata) { List<MapEntry> entries = new ArrayList<MapEntry>(metadata.getEntries()); - if(!!! entries.isEmpty()) { + if(! entries.isEmpty()) { try { if(metadata instanceof MutableMapMetadata) { @@ -359,7 +359,7 @@ public abstract class AbstractPropertyPlaceholderExt extends PropertyPlaceholder protected Metadata processCollectionMetadata(CollectionMetadata metadata) { List<Metadata> values = new ArrayList<Metadata>(metadata.getValues()); - if(!!! values.isEmpty()) { + if(! values.isEmpty()) { try { if(metadata instanceof MutableCollectionMetadata) { diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ReflectionUtils.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ReflectionUtils.java index 3d3df9414..f24d69659 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ReflectionUtils.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/ReflectionUtils.java @@ -292,7 +292,7 @@ public class ReflectionUtils { if (allowFieldInjection) { for (Class cl = clazz; cl != null && cl != Object.class; cl = cl.getSuperclass()) { for (Field field : cl.getDeclaredFields()) { - if (!!!Modifier.isStatic(field.getModifiers())) { + if (!Modifier.isStatic(field.getModifiers())) { String name = decapitalize(field.getName()); PropertyDescriptor desc = props.get(name); if (desc == null) { @@ -311,7 +311,7 @@ public class ReflectionUtils { List<PropertyDescriptor> result = new ArrayList<PropertyDescriptor>(); for (PropertyDescriptor prop : props.values()) { - if (!!!illegalProperties.contains(prop.getName())) result.add(prop); + if (!illegalProperties.contains(prop.getName())) result.add(prop); } properties[index] = result.toArray(new PropertyDescriptor[result.size()]); @@ -536,7 +536,7 @@ public class ReflectionUtils { return Boolean.FALSE; } }); - if(!!!wasSet) { + if(!wasSet) { doInternalSet(container, instance, value); } } catch (PrivilegedActionException pae) { diff --git a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java index 10728499f..e0096d913 100644 --- a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java +++ b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java @@ -198,7 +198,7 @@ public abstract class AbstractPropertyPlaceholder implements ComponentDefinition protected Metadata processPropsMetadata(PropsMetadata metadata) { List<MapEntry> entries = new ArrayList<MapEntry>(metadata.getEntries()); - if(!!! entries.isEmpty()) { + if(! entries.isEmpty()) { try { if(metadata instanceof MutablePropsMetadata) { @@ -225,7 +225,7 @@ public abstract class AbstractPropertyPlaceholder implements ComponentDefinition protected Metadata processMapMetadata(MapMetadata metadata) { List<MapEntry> entries = new ArrayList<MapEntry>(metadata.getEntries()); - if(!!! entries.isEmpty()) { + if(! entries.isEmpty()) { try { if(metadata instanceof MutableMapMetadata) { @@ -273,7 +273,7 @@ public abstract class AbstractPropertyPlaceholder implements ComponentDefinition protected Metadata processCollectionMetadata(CollectionMetadata metadata) { List<Metadata> values = new ArrayList<Metadata>(metadata.getValues()); - if(!!! values.isEmpty()) { + if(! values.isEmpty()) { try { if(metadata instanceof MutableCollectionMetadata) { diff --git a/jmx/jmx-core-whiteboard/src/main/java/org/apache/aries/jmx/core/whiteboard/Activator.java b/jmx/jmx-core-whiteboard/src/main/java/org/apache/aries/jmx/core/whiteboard/Activator.java index 6ab19ac7e..dec8cd5c4 100644 --- a/jmx/jmx-core-whiteboard/src/main/java/org/apache/aries/jmx/core/whiteboard/Activator.java +++ b/jmx/jmx-core-whiteboard/src/main/java/org/apache/aries/jmx/core/whiteboard/Activator.java @@ -220,7 +220,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer synchronized (result) { ServiceRegistration reg = registerAnMbean(type, factory, objectName); - if (!!!result.compareAndSet(null, reg)) { + if (!result.compareAndSet(null, reg)) { reg.unregister(); } } diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/startup/Activator.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/startup/Activator.java index 4d195eecd..d74014038 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/startup/Activator.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/startup/Activator.java @@ -231,7 +231,7 @@ public class Activator implements BundleActivator { if (null != value) return true; Object revision = context.getBundle().adapt(BundleRevision.class); // in a unit test adapt() may return an incompatible object - if (!!! (revision instanceof BundleRevision)) return false; + if (! (revision instanceof BundleRevision)) return false; final BundleRevision bundleRevision = (BundleRevision) revision; return bundleRevision.getDeclaredCapabilities(key).size() > 0; } diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AbstractProxyManager.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AbstractProxyManager.java index c84c97688..e432dbac6 100644 --- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AbstractProxyManager.java +++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AbstractProxyManager.java @@ -153,7 +153,7 @@ public abstract class AbstractProxyManager implements ProxyManager classToProxy = classes.iterator().next(); - if(!!!isProxyClass(classToProxy)) + if(!isProxyClass(classToProxy)) classToProxy = null; } diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AsmProxyManager.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AsmProxyManager.java index 48b91f2e5..05ae6c958 100644 --- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AsmProxyManager.java +++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/AsmProxyManager.java @@ -64,7 +64,7 @@ public final class AsmProxyManager extends AbstractProxyManager implements Proxy Set<Class<?>> interfaces = new HashSet<Class<?>>(); for (Class<?> clazz : classes) { - if (!!!clazz.isInterface()) { + if (!clazz.isInterface()) { notInterfaces.add(clazz); } else { interfaces.add(clazz); @@ -224,7 +224,7 @@ public final class AsmProxyManager extends AbstractProxyManager implements Proxy //potential can be widened to classToProxy, and is therefore //a lower subclass classToProxy = potential; - } else if (!!!potential.isAssignableFrom(classToProxy)){ + } else if (!potential.isAssignableFrom(classToProxy)){ //classToProxy is not a subclass of potential - This is //an error, we can't be part of two hierarchies at once! throw new UnableToProxyException(classToProxy, "The requested classes " @@ -242,7 +242,7 @@ public final class AsmProxyManager extends AbstractProxyManager implements Proxy private boolean implementsAll(Class<?> classToProxy, Set<Class<?>> interfaces) { //If we can't widen to one of the interfaces then we need to do some more work for(Class<?> iface : interfaces) { - if(!!!iface.isAssignableFrom(classToProxy)) + if(!iface.isAssignableFrom(classToProxy)) return false; } return true; diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/JdkProxyManager.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/JdkProxyManager.java index e580edb46..a18027b99 100644 --- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/JdkProxyManager.java +++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/JdkProxyManager.java @@ -39,7 +39,7 @@ public final class JdkProxyManager extends AbstractProxyManager implements Proxy private static final Class<?>[] getInterfaces(Collection<Class<?>> classes) throws UnableToProxyException { for (Class<?> clazz : classes) { - if (!!!clazz.isInterface()) { + if (!clazz.isInterface()) { throw new UnableToProxyException(clazz, String.format("The class %s is not an interface and therefore a proxy cannot be generated.", clazz.getName())); } } diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java index 4d14254fe..7c1234ba7 100644 --- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java +++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java @@ -98,14 +98,14 @@ final class MethodCopyingClassAdapter extends ClassVisitor implements Opcodes { MethodVisitor mv = null; //As in WovenProxyAdapter, we only care about "real" methods, but also not //abstract ones!. - if (!!!name.equals("<init>") && !!!name.equals("<clinit>") + if (!name.equals("<init>") && !name.equals("<clinit>") && (access & (ACC_STATIC | ACC_PRIVATE | ACC_SYNTHETIC | ACC_ABSTRACT | ACC_NATIVE | ACC_BRIDGE)) == 0) { // identify the target method parameters and return type Method currentTransformMethod = new Method(name, desc); // We don't want to duplicate a method we already overrode! - if(!!!knownMethods.add(currentTransformMethod)) + if(!knownMethods.add(currentTransformMethod)) return null; // found a method we should weave @@ -116,7 +116,7 @@ final class MethodCopyingClassAdapter extends ClassVisitor implements Opcodes { // We can't call up to a default access method if we aren't in the same // package if((access & (ACC_PUBLIC | ACC_PROTECTED | ACC_PRIVATE)) == 0) { - if(!!!samePackage) { + if(!samePackage) { methodHiddenException(name); } } diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassWriter.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassWriter.java index 5037430da..903033075 100644 --- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassWriter.java +++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassWriter.java @@ -85,7 +85,7 @@ public final class OSGiFriendlyClassWriter extends ClassWriter { return OBJECT_INTERNAL_NAME; //arg0 is an interface } aRunning = false; //old arg00 was java.lang.Object - } else if(!!!names.add(arg00)) { + } else if(!names.add(arg00)) { return arg00; } } else { @@ -104,7 +104,7 @@ public final class OSGiFriendlyClassWriter extends ClassWriter { return OBJECT_INTERNAL_NAME; //arg1 is an interface } bRunning = false; //old arg11 was java.lang.Object - } else if(!!!names.add(arg11)) { + } else if(!names.add(arg11)) { return arg11; } } else { diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/ProxyClassLoader.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/ProxyClassLoader.java index 8bd07e57a..2eb2b811d 100644 --- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/ProxyClassLoader.java +++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/ProxyClassLoader.java @@ -114,7 +114,7 @@ final class ProxyClassLoader extends ClassLoader { for (Class<?> iface : createSet) { try { Class<?> newIFace = Class.forName(iface.getName(), false, this); - if (!!!newIFace.equals(iface)) return true; + if (!newIFace.equals(iface)) return true; } catch (ClassNotFoundException cnfe) { return true; } diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java index e1b61cdd5..f54cdbc76 100644 --- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java +++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java @@ -83,7 +83,7 @@ class SyntheticSerialVerUIDAdder extends SerialVersionUIDAdder { @Override public void visitEnd() { - wpa.setSVUIDGenerated(!!!hasSVUID); + wpa.setSVUIDGenerated(!hasSVUID); super.visitEnd(); } } diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/WovenProxyAdapter.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/WovenProxyAdapter.java index 64efb3cff..62f62cd73 100644 --- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/WovenProxyAdapter.java +++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/WovenProxyAdapter.java @@ -66,7 +66,7 @@ final class WovenProxyAdapter extends AbstractWovenProxyAdapter { if(sVUIDGenerated && "serialVersionUID".equals(name)) { //If we aren't a serializable class then don't add a generated sVUID - if(!!!isSerializable) { + if(!isSerializable) { return null; } diff --git a/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/AbstractProxyTest.java b/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/AbstractProxyTest.java index 2d9d000c5..a8c55c4ca 100644 --- a/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/AbstractProxyTest.java +++ b/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/AbstractProxyTest.java @@ -327,7 +327,7 @@ public abstract class AbstractProxyTest { m.invoke(obj); fail("Should throw an exception"); } catch (InvocationTargetException re) { - if(!!!re.getTargetException().getClass().equals(RuntimeException.class)) + if(!re.getTargetException().getClass().equals(RuntimeException.class)) throw re.getTargetException(); assertCalled(tl, true, false, true); } diff --git a/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/WovenProxyGeneratorTest.java b/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/WovenProxyGeneratorTest.java index d29d296c7..be9043705 100644 --- a/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/WovenProxyGeneratorTest.java +++ b/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/WovenProxyGeneratorTest.java @@ -103,7 +103,7 @@ public class WovenProxyGeneratorTest extends AbstractProxyTest } public Class<?> loadClass(String className, boolean b) throws ClassNotFoundException { - if (!!!className.startsWith("org.apache.aries.blueprint.proxy.ProxyTest")){ + if (!className.startsWith("org.apache.aries.blueprint.proxy.ProxyTest")){ return Class.forName(className); } diff --git a/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java b/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java index 104814bd5..e5506d601 100644 --- a/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java +++ b/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java @@ -66,7 +66,7 @@ public class WeavingProxyTest extends AbstractProxyTest @SuppressWarnings("unchecked") Callable<Object> o = (Callable<Object>) mgr.createDelegatingProxy(b, classes, dispatcher, template); - if(!!!(o instanceof WovenProxy)) + if(!(o instanceof WovenProxy)) fail("Proxy should be woven!"); Object inner = new Integer(3); @@ -91,7 +91,7 @@ public class WeavingProxyTest extends AbstractProxyTest }; classes.add(r.getClass()); Object o = mgr.createDelegatingProxy(b, classes, c, r); - if(!!!(o instanceof WovenProxy)) + if(!(o instanceof WovenProxy)) fail("Proxy should be woven!"); } diff --git a/spi-fly/spi-fly-dynamic-bundle/src/main/java/org/apache/aries/spifly/dynamic/OSGiFriendlyClassWriter.java b/spi-fly/spi-fly-dynamic-bundle/src/main/java/org/apache/aries/spifly/dynamic/OSGiFriendlyClassWriter.java index 7d62a6b1b..d824f4b99 100644 --- a/spi-fly/spi-fly-dynamic-bundle/src/main/java/org/apache/aries/spifly/dynamic/OSGiFriendlyClassWriter.java +++ b/spi-fly/spi-fly-dynamic-bundle/src/main/java/org/apache/aries/spifly/dynamic/OSGiFriendlyClassWriter.java @@ -88,7 +88,7 @@ public final class OSGiFriendlyClassWriter extends ClassWriter { return OBJECT_INTERNAL_NAME; //arg0 is an interface } aRunning = false; //old arg00 was java.lang.Object - } else if(!!!names.add(arg00)) { + } else if(!names.add(arg00)) { return arg00; } } else { @@ -106,7 +106,7 @@ public final class OSGiFriendlyClassWriter extends ClassWriter { return OBJECT_INTERNAL_NAME; //arg1 is an interface } bRunning = false; //old arg11 was java.lang.Object - } else if(!!!names.add(arg11)) { + } else if(!names.add(arg11)) { return arg11; } } else { diff --git a/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/BundleContextMock.java b/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/BundleContextMock.java index c6955b77c..4fc11d9a0 100644 --- a/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/BundleContextMock.java +++ b/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/BundleContextMock.java @@ -404,7 +404,7 @@ public class BundleContextMock try { Class<?> clazz = Class.forName(interFace, false, service.getClass().getClassLoader()); - if (!!!clazz.isInstance(service) && !!!(service instanceof ServiceFactory)) { + if (!clazz.isInstance(service) && !(service instanceof ServiceFactory)) { throw new AssertionFailedError("The service " + service + " does not implement " + interFace); } } catch (ClassNotFoundException e) { diff --git a/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/BundleMock.java b/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/BundleMock.java index 9e796d193..e659e2811 100644 --- a/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/BundleMock.java +++ b/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/BundleMock.java @@ -175,7 +175,7 @@ public class BundleMock public Object handle(MethodCall call, Skeleton parent) { File privateStorage = new File(location.getAbsolutePath(), "_private"); - if (!!!privateStorage.exists()) + if (!privateStorage.exists()) privateStorage.mkdirs(); return new File(privateStorage, (String) call.getArguments()[0]); diff --git a/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java b/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java index e2ccc07c3..f1148c7cd 100644 --- a/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java +++ b/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java @@ -39,7 +39,7 @@ public final class AriesFrameworkUtil worker = new FelixWorker(); } - if (worker == null || !!!worker.isValid()) worker = new DefaultWorker(); + if (worker == null || !worker.isValid()) worker = new DefaultWorker(); } diff --git a/util/src/main/java/org/apache/aries/util/FragmentBuilder.java b/util/src/main/java/org/apache/aries/util/FragmentBuilder.java index cf244f868..57fb65259 100644 --- a/util/src/main/java/org/apache/aries/util/FragmentBuilder.java +++ b/util/src/main/java/org/apache/aries/util/FragmentBuilder.java @@ -56,7 +56,7 @@ public class FragmentBuilder { bundleNameExtension = bundleNameSuffix; // make sure we have an initial '.' - if (!!!nameExtension.startsWith(".")) { + if (!nameExtension.startsWith(".")) { nameExtension = "." + nameExtension; } } @@ -108,7 +108,7 @@ public class FragmentBuilder { // and checks whether this is part of ':=' // in this way we will not be fooled by attributes like // a="something:=strange" - if (!!!(pos > 0 && fragment.charAt(pos - 1) == ':')) { + if (!(pos > 0 && fragment.charAt(pos - 1) == ':')) { result.append(fragment); result.append(';'); } @@ -194,11 +194,11 @@ public class FragmentBuilder { } private void addImportsAndExports(Attributes attrs) { - if (!!!importPackages.isEmpty()) { + if (!importPackages.isEmpty()) { attrs.putValue(Constants.IMPORT_PACKAGE, joinStrings(importPackages, ',')); } - if (!!!exportPackages.isEmpty()) { + if (!exportPackages.isEmpty()) { attrs.putValue(Constants.EXPORT_PACKAGE, joinStrings(exportPackages, ',')); } } diff --git a/util/src/main/java/org/apache/aries/util/VersionRange.java b/util/src/main/java/org/apache/aries/util/VersionRange.java index 1c3f773f6..ea9a973ab 100644 --- a/util/src/main/java/org/apache/aries/util/VersionRange.java +++ b/util/src/main/java/org/apache/aries/util/VersionRange.java @@ -217,7 +217,7 @@ public final class VersionRange { throw new IllegalArgumentException(MessageUtil.getMessage("UTIL0011E", version)); } - if (!!!isExactVersion()) { + if (!isExactVersion()) { throw new IllegalArgumentException(MessageUtil.getMessage("UTIL0009E", version)); } @@ -366,7 +366,7 @@ public final class VersionRange { */ public boolean isExactVersion() { return minimumVersion.equals(maximumVersion) && minimumExclusive == maximumExclusive - && !!!minimumExclusive; + && !minimumExclusive; } /** diff --git a/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java b/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java index 66681c2fe..951614b2d 100644 --- a/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java +++ b/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java @@ -89,7 +89,7 @@ public class NestedZipDirectory extends NestedZipFile implements IDirectory { } private List<? extends ZipEntry> getAllEntries() { - if (cache != null && !!!cache.isClosed()) { + if (cache != null && !cache.isClosed()) { return Collections.list(cache.getZipFile().entries()); } else { ZipInputStream zis = null; @@ -140,7 +140,7 @@ public class NestedZipDirectory extends NestedZipFile implements IDirectory { Map<String,ZipEntry> entries = new HashMap<String, ZipEntry>(); ZipEntry ze; - if (cache != null && !!!cache.isClosed()) { + if (cache != null && !cache.isClosed()) { ZipFile zip = cache.getZipFile(); String[] segments = name.split("/"); @@ -161,7 +161,7 @@ public class NestedZipDirectory extends NestedZipFile implements IDirectory { ze = zis.getNextEntry(); - while (ze != null && !!!ze.getName().equals(name)) { + while (ze != null && !ze.getName().equals(name)) { if (name.startsWith(ze.getName())) entries.put(ze.getName(), ze); ze = zis.getNextEntry(); diff --git a/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java b/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java index fcf9216f4..6c521aab6 100644 --- a/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java +++ b/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java @@ -128,7 +128,7 @@ public class NestedZipFile implements IFile { } public InputStream open() throws IOException, UnsupportedOperationException { - if (cache != null && !!!cache.isClosed()) { + if (cache != null && !cache.isClosed()) { ZipFile zip = cache.getZipFile(); ZipEntry ze = zip.getEntry(nameInZip); @@ -138,7 +138,7 @@ public class NestedZipFile implements IFile { final ZipInputStream zis = new ZipInputStream(archive.open()); ZipEntry entry = zis.getNextEntry(); - while (entry != null && !!!entry.getName().equals(nameInZip)) { + while (entry != null && !entry.getName().equals(nameInZip)) { entry = zis.getNextEntry(); } diff --git a/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java b/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java index a0bdf9ba7..9fc0e9a56 100644 --- a/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java +++ b/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java @@ -86,7 +86,7 @@ public class ZipDirectory extends ZipFileImpl implements IDirectory ZipEntry entryFile = getEntry(entryName); if (entryFile != null) { - if (!!!entryFile.isDirectory()) { + if (!entryFile.isDirectory()) { result = new ZipFileImpl(zip, entryFile, buildParent(entryFile), cache); } else { result = new ZipDirectory(zip, entryFile, buildParent(entryFile), cache); @@ -112,7 +112,7 @@ public class ZipDirectory extends ZipFileImpl implements IDirectory StringBuilder baseBuilderCrapThingToGetRoundFindBugs = new StringBuilder(getNameInZip()); - if (!!!isZipRoot()) baseBuilderCrapThingToGetRoundFindBugs.append('/'); + if (!isZipRoot()) baseBuilderCrapThingToGetRoundFindBugs.append('/'); // Build 'result' as a chain of ZipDirectories. This will only work if java.util.ZipFile recognises every // directory in the chain as being a ZipEntry in its own right. outer: if (paths != null && paths.length > 1) { @@ -183,7 +183,7 @@ public class ZipDirectory extends ZipFileImpl implements IDirectory boolean result; String name = possibleEntry.getName(); if (name.endsWith("/")) name = name.substring(0, name.length() - 1); - result = (name.startsWith(parentDir) && !!!name.equals(parentDir) && (allowSubDirs || name.substring(parentDir.length() + 1).indexOf('/') == -1)); + result = (name.startsWith(parentDir) && !name.equals(parentDir) && (allowSubDirs || name.substring(parentDir.length() + 1).indexOf('/') == -1)); return result; } diff --git a/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java b/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java index a0ebef5b4..713cadf87 100644 --- a/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java +++ b/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java @@ -241,7 +241,7 @@ public class ZipFileImpl implements IFile ZipFile openZipFile(){ ZipFile z = null; - if (cache != null && !!!cache.isClosed()) { + if (cache != null && !cache.isClosed()) { z = cache.getZipFile(); } else { try { diff --git a/util/src/main/java/org/apache/aries/util/io/IOUtils.java b/util/src/main/java/org/apache/aries/util/io/IOUtils.java index 00b948591..c21492d98 100644 --- a/util/src/main/java/org/apache/aries/util/io/IOUtils.java +++ b/util/src/main/java/org/apache/aries/util/io/IOUtils.java @@ -105,7 +105,7 @@ public class IOUtils outputDirectory = new File(outputDir, dirName); - if (!!!outputDirectory.exists() && !!!outputDirectory.mkdirs()) + if (!outputDirectory.exists() && !outputDirectory.mkdirs()) throw new IOException(MessageUtil.getMessage("UTIL0015E", relativePath)); } else @@ -236,7 +236,7 @@ public class IOUtils */ public static boolean deleteRecursive(File root) { - if (!!!root.exists()) + if (!root.exists()) return false; else if (root.isFile()) return root.delete(); diff --git a/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java b/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java index 0f5766d53..55a2c1de1 100644 --- a/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java +++ b/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java @@ -243,13 +243,13 @@ public class ManifestHeaderProcessor for (String part : tailParts) { // if it is not a parameter and no parameter appears in front of it, it must a package - if (!!!(part.contains("="))) { + if (!(part.contains("="))) { // Need to make sure no parameter appears before the package, otherwise ignore this string // as this syntax is invalid - if (!!!(firstParameter)) + if (!(firstParameter)) pkgs.add(part); } else { - if (!!!(firstParameter)) + if (!(firstParameter)) firstParameter = true; parameters.append(part + ";"); @@ -584,7 +584,7 @@ public class ManifestHeaderProcessor // store all attributes in order to build up the mandatory // filter and separate them with ", " // skip bundle-symbolic-name in the mandatory directive query - if (!!!Constants.BUNDLE_SYMBOLICNAME_ATTRIBUTE + if (!Constants.BUNDLE_SYMBOLICNAME_ATTRIBUTE .equals(attribName)) { realAttribs.append(attribName); realAttribs.append(", "); diff --git a/util/src/main/java/org/apache/aries/util/tracker/InternalRecursiveBundleTracker.java b/util/src/main/java/org/apache/aries/util/tracker/InternalRecursiveBundleTracker.java index 96418dad1..4d29cb41f 100644 --- a/util/src/main/java/org/apache/aries/util/tracker/InternalRecursiveBundleTracker.java +++ b/util/src/main/java/org/apache/aries/util/tracker/InternalRecursiveBundleTracker.java @@ -123,7 +123,7 @@ public class InternalRecursiveBundleTracker extends BundleTracker // bundle is already active and there is no event associated // this can happen when bundle is first time added to the tracker // or when the tracker is being closed. - if (event == null && !!!removing) { + if (event == null && !removing) { if (cb.getState() == Bundle.INSTALLED || cb.getState() == Bundle.RESOLVED || cb.getState() == Bundle.STARTING || cb.getState() == Bundle.ACTIVE) { openTracker(btc, cb, bundleScope, mask); } diff --git a/util/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java b/util/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java index fc1670576..68f1b046b 100644 --- a/util/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java +++ b/util/src/main/java/org/apache/aries/util/tracker/SingleServiceTracker.java @@ -129,7 +129,7 @@ public final class SingleServiceTracker<T> clear = false; // We do the unget out of the lock so we don't exit this class while holding a lock. - if (!!!update(original, ref, service)) { + if (!update(original, ref, service)) { ctx.ungetService(ref); } } diff --git a/util/src/test/java/org/apache/aries/util/filesystem/FileSystemTest.java b/util/src/test/java/org/apache/aries/util/filesystem/FileSystemTest.java index b1275cd63..f2af27c40 100644 --- a/util/src/test/java/org/apache/aries/util/filesystem/FileSystemTest.java +++ b/util/src/test/java/org/apache/aries/util/filesystem/FileSystemTest.java @@ -346,7 +346,7 @@ public class FileSystemTest out.close(); - if (!!!zipFile.renameTo(new File("fileSystemTest/outer.zip"))) throw new IOException("Rename failed"); + if (!zipFile.renameTo(new File("fileSystemTest/outer.zip"))) throw new IOException("Rename failed"); } private static File getTestResourceDir() { diff --git a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/BundleCompatibility.java b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/BundleCompatibility.java index 4a0682109..c695ac66f 100644 --- a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/BundleCompatibility.java +++ b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/BundleCompatibility.java @@ -134,7 +134,7 @@ public class BundleCompatibility { boolean pkg_major_change = false; boolean pkg_minor_change = false; String fatal_package = null; - if (!!!currBundleExpPkgContents.isEmpty()) { + if (!currBundleExpPkgContents.isEmpty()) { baseBundleExpPkgContents = getAllExportedPkgContents(baseBundle); // compare each class right now for (Map.Entry<String, PackageContent> pkg : baseBundleExpPkgContents.entrySet()) { @@ -157,12 +157,12 @@ public class BundleCompatibility { // check all classes to see whether there are minor or major changes visitPackage(pkgName, baseClazz, curClazz, majorChange, minorChange); // If there is no binary compatibility changes, check whether xsd files have been added, changed or deleted - if (!!!majorChange.isChange()) { + if (!majorChange.isChange()) { checkXsdChangesInPkg(pkgName, baseXsds, curXsds, majorChange); // If everything is ok with the existing classes. Need to find out whether there are more API (abstract classes) in the current bundle. // loop through curClazz and visit it and find out whether one of them is abstract. // check whether there are more xsd or abstract classes added - if (!!!(majorChange.isChange() || minorChange.isChange())) { + if (!(majorChange.isChange() || minorChange.isChange())) { checkAdditionalClassOrXsds(pkgName, curClazz, curXsds, minorChange); } } @@ -170,18 +170,18 @@ public class BundleCompatibility { // if (majorChange.isChange() || minorChange.isChange()) { String oldVersion = pkg.getValue().getPackageVersion(); String newVersion = currPkgContents.getPackageVersion(); - if (majorChange.isChange() && !!!ignoreChange(majorChange.getReason())) { + if (majorChange.isChange() && !ignoreChange(majorChange.getReason())) { packageChanges.put(pkgName, new VersionChange(VERSION_CHANGE_TYPE.MAJOR_CHANGE, oldVersion, newVersion)); pkg_major_change = true; fatal_package = pkgName; - if (!!!isVersionCorrect(VERSION_CHANGE_TYPE.MAJOR_CHANGE, oldVersion, newVersion)) { + if (!isVersionCorrect(VERSION_CHANGE_TYPE.MAJOR_CHANGE, oldVersion, newVersion)) { pkgElementsList.add(getPkgStatusText(pkgName, VERSION_CHANGE_TYPE.MAJOR_CHANGE, oldVersion, newVersion, majorChange.getReason(), majorChange.getChangeClass())); } - } else if (minorChange.isChange() && !!!ignoreChange(minorChange.getReason())) { + } else if (minorChange.isChange() && !ignoreChange(minorChange.getReason())) { packageChanges.put(pkgName, new VersionChange(VERSION_CHANGE_TYPE.MINOR_CHANGE, oldVersion, newVersion)); pkg_minor_change = true; if (fatal_package == null) fatal_package = pkgName; - if (!!!isVersionCorrect(VERSION_CHANGE_TYPE.MINOR_CHANGE, oldVersion, newVersion)) { + if (!isVersionCorrect(VERSION_CHANGE_TYPE.MINOR_CHANGE, oldVersion, newVersion)) { pkgElementsList.add(getPkgStatusText(pkgName, VERSION_CHANGE_TYPE.MINOR_CHANGE, pkg.getValue().getPackageVersion(), currPkgContents.getPackageVersion(), minorChange.getReason(), minorChange.getChangeClass())); } } else { @@ -228,7 +228,7 @@ public class BundleCompatibility { List<ManifestHeaderProcessor.NameValuePair> exportPackageLists = ManifestHeaderProcessor.parseExportString(packageExports); // only perform validation if there are some packages exported. Otherwise, not interested. Map<String, PackageContent> exportedPackages = new HashMap<String, PackageContent>(); - if (!!!exportPackageLists.isEmpty()) { + if (!exportPackageLists.isEmpty()) { File bundleFile = currentBundle.getBundle(); IDirectory bundleDir = FileSystem.getFSRoot(bundleFile); for (ManifestHeaderProcessor.NameValuePair exportedPackage : exportPackageLists) { @@ -437,7 +437,7 @@ public class BundleCompatibility { curXsds.remove(file.getKey()); String curFileContent = readXsdFile(curXsd.open()); String oldFileContent = readXsdFile(file.getValue().open()); - if (!!!(curFileContent.equals(oldFileContent))) { + if (!(curFileContent.equals(oldFileContent))) { reason = "In the package " + pkgName + ", The schema file has been updated: " + file.getKey() + "."; majorChange.update(reason, changeClass, false); @@ -474,7 +474,7 @@ public class BundleCompatibility { } } } - if (!!!(minorChange.isChange() || curXsds.isEmpty())) { + if (!(minorChange.isChange() || curXsds.isEmpty())) { /// a new xsd file was added, it is a minor change IFile firstXsd = null; Iterator<IFile> xsdIterator = curXsds.values().iterator(); diff --git a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/SemanticVersioningChecker.java b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/SemanticVersioningChecker.java index 8c0864246..92b00675b 100644 --- a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/SemanticVersioningChecker.java +++ b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/SemanticVersioningChecker.java @@ -116,7 +116,7 @@ public class SemanticVersioningChecker { pkgElements = bundleCompatibility.getPkgElements(); } // Need to write bundle element and then package elements - if ((!!!bundleVersionCorrect) || ((pkgElements.length() > 0))) { + if ((!bundleVersionCorrect) || ((pkgElements.length() > 0))) { writeRecordToWriter(versionStatusFileWriter, bundleElement); writeRecordToWriter(versionStatusFileWriter, pkgElements.toString()); writeRecordToWriter(versionStatusFileWriter, "</bundle>"); diff --git a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/ClassDeclaration.java b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/ClassDeclaration.java index 505e6b50a..320ecd290 100644 --- a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/ClassDeclaration.java +++ b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/ClassDeclaration.java @@ -308,13 +308,13 @@ public class ClassDeclaration extends GenericDeclaration { // not final changed to final // public changed to non-public String prefix = " The class " + getName(); - if (!!!originalClass.isAbstract() && isAbstract()) { + if (!originalClass.isAbstract() && isAbstract()) { reasons.add(prefix + " was not abstract but is changed to be abstract."); } - if (!!!originalClass.isFinal() && isFinal()) { + if (!originalClass.isFinal() && isFinal()) { reasons.add(prefix + " was not final but is changed to be final."); } - if (originalClass.isPublic() && !!!isPublic()) { + if (originalClass.isPublic() && !isPublic()) { reasons.add(prefix + " was public but is changed to be non-public."); } } @@ -354,7 +354,7 @@ public class ClassDeclaration extends GenericDeclaration { compatible = false; } else { - if ((!!!bef_fd.isFinal()) && (cur_fd.isFinal())) { + if ((!bef_fd.isFinal()) && (cur_fd.isFinal())) { // make sure it has not been changed to final reasons.add(prefix + " was not final but has been changed to be final."); compatible = false; @@ -475,7 +475,7 @@ public class ClassDeclaration extends GenericDeclaration { // If the old method is static but the new one is non static // If the old method is not abstract but the new is - if (!!!Modifier.isFinal(md.getAccess()) && !!!Modifier.isStatic(md.getAccess()) && Modifier.isFinal(new_md.getAccess())) { + if (!Modifier.isFinal(md.getAccess()) && !Modifier.isStatic(md.getAccess()) && Modifier.isFinal(new_md.getAccess())) { compatible = false; reasons.add(prefix + " was not final but has been changed to be final."); } @@ -593,7 +593,7 @@ public class ClassDeclaration extends GenericDeclaration { if (overloaddingMethods != null) { for (MethodDeclaration value : overloaddingMethods) { // method signature and name same and also the method should not be less accessible - if (md.equals(value) && (!!!SemanticVersioningUtils.isLessAccessible(md, value)) && (value.isStatic() == md.isStatic())) { + if (md.equals(value) && (!SemanticVersioningUtils.isLessAccessible(md, value)) && (value.isStatic() == md.isStatic())) { return true; } } @@ -646,7 +646,7 @@ public class ClassDeclaration extends GenericDeclaration { private void getAllSuperPresentStatus(ClassDeclaration old, List<String> reasons) { Collection<String> oldSupers = old.getAllSupers(); boolean containsAll = getAllSupers().containsAll(oldSupers); - if (!!!containsAll) { + if (!containsAll) { oldSupers.removeAll(getAllSupers()); reasons.add("The superclasses or superinterfaces have stopped being super: " + oldSupers.toString() + "."); } diff --git a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SemanticVersioningUtils.java b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SemanticVersioningUtils.java index 4358f786d..bba2b6761 100644 --- a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SemanticVersioningUtils.java +++ b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SemanticVersioningUtils.java @@ -55,15 +55,15 @@ public class SemanticVersioningUtils { } //When it reaches here, the two access are different. Let's make sure the whether the after field has less access than the before field. if (before.isPublic()) { - if (!!!after.isPublic()) { + if (!after.isPublic()) { return true; } } else if (before.isProtected()) { - if (!!!(after.isPublic() || after.isProtected())) { + if (!(after.isPublic() || after.isProtected())) { return true; } } else { - if (!!!before.isPrivate()) { + if (!before.isPrivate()) { // the field is package level. if (after.isPrivate()) { return true; diff --git a/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/JSPImportParser.java b/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/JSPImportParser.java index b6f14a0d5..84ac58a50 100644 --- a/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/JSPImportParser.java +++ b/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/JSPImportParser.java @@ -83,7 +83,7 @@ public class JSPImportParser { for (String p : imports) { String thisPackage = p.substring(0,p.lastIndexOf('.')).trim(); - if (!!!thisPackage.startsWith("java.")) + if (!thisPackage.startsWith("java.")) packagesFound.add(thisPackage); } } diff --git a/web/web-urlhandler/src/main/java/org/apache/aries/web/url/WAR_URLServiceHandler.java b/web/web-urlhandler/src/main/java/org/apache/aries/web/url/WAR_URLServiceHandler.java index 52c4e076c..5e3440212 100644 --- a/web/web-urlhandler/src/main/java/org/apache/aries/web/url/WAR_URLServiceHandler.java +++ b/web/web-urlhandler/src/main/java/org/apache/aries/web/url/WAR_URLServiceHandler.java @@ -65,7 +65,7 @@ public class WAR_URLServiceHandler extends AbstractURLStreamHandlerService imple // set. Property pairs are seperated by the '&' symbol. The tokenizer // will include this symbol in the token so we need to return it from // all property names except the first. - if (!!!firstProperty) + if (!firstProperty) name = name.substring(1); String value = tok.nextToken("&").substring(1); properties.put(name, value);
