diff --git a/async/async-api/src/main/java/org/osgi/service/async/delegate/AsyncDelegate.java b/async/async-api/src/main/java/org/osgi/service/async/delegate/AsyncDelegate.java index b8fd610e09..9769d8a822 100644 --- a/async/async-api/src/main/java/org/osgi/service/async/delegate/AsyncDelegate.java +++ b/async/async-api/src/main/java/org/osgi/service/async/delegate/AsyncDelegate.java @@ -16,6 +16,7 @@ package org.osgi.service.async.delegate; import java.lang.reflect.Method; + import org.osgi.annotation.versioning.ConsumerType; import org.osgi.util.promise.Promise; diff --git a/async/promise-api/src/main/java/org/apache/aries/async/promise/PromiseImpl.java b/async/promise-api/src/main/java/org/apache/aries/async/promise/PromiseImpl.java index 8bb078a231..dcd885d0a7 100644 --- a/async/promise-api/src/main/java/org/apache/aries/async/promise/PromiseImpl.java +++ b/async/promise-api/src/main/java/org/apache/aries/async/promise/PromiseImpl.java @@ -29,7 +29,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; import org.osgi.util.function.Callback; import org.osgi.util.function.Function; diff --git a/async/promise-api/src/test/java/org/apache/aries/async/promise/test/CallbackTest.java b/async/promise-api/src/test/java/org/apache/aries/async/promise/test/CallbackTest.java index 1e70bdd988..ed791fabc0 100644 --- a/async/promise-api/src/test/java/org/apache/aries/async/promise/test/CallbackTest.java +++ b/async/promise-api/src/test/java/org/apache/aries/async/promise/test/CallbackTest.java @@ -18,15 +18,15 @@ */ package org.apache.aries.async.promise.test; -import org.osgi.util.promise.Deferred; -import org.osgi.util.promise.Promise; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.junit.Test; +import org.osgi.util.promise.Deferred; +import org.osgi.util.promise.Promise; public class CallbackTest { diff --git a/async/promise-api/src/test/java/org/apache/aries/async/promise/test/ChainTest.java b/async/promise-api/src/test/java/org/apache/aries/async/promise/test/ChainTest.java index 18fed7cbf6..011095fd27 100644 --- a/async/promise-api/src/test/java/org/apache/aries/async/promise/test/ChainTest.java +++ b/async/promise-api/src/test/java/org/apache/aries/async/promise/test/ChainTest.java @@ -28,7 +28,6 @@ import static org.junit.Assert.assertTrue; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; diff --git a/async/promise-api/src/test/java/org/apache/aries/async/promise/test/DeferredTest.java b/async/promise-api/src/test/java/org/apache/aries/async/promise/test/DeferredTest.java index 5e7f157ce7..12422b45f9 100644 --- a/async/promise-api/src/test/java/org/apache/aries/async/promise/test/DeferredTest.java +++ b/async/promise-api/src/test/java/org/apache/aries/async/promise/test/DeferredTest.java @@ -18,13 +18,18 @@ */ package org.apache.aries.async.promise.test; -import org.osgi.util.promise.Deferred; -import org.osgi.util.promise.Promise; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.lang.reflect.InvocationTargetException; -import static org.junit.Assert.*; +import org.junit.Test; +import org.osgi.util.promise.Deferred; +import org.osgi.util.promise.Promise; public class DeferredTest { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceHandler.java index c5ce542487..ffc0603090 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceHandler.java @@ -18,17 +18,17 @@ */ package org.apache.aries.blueprint.plugin.handlers.paxcdi; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + import org.apache.aries.blueprint.plugin.spi.ContextEnricher; import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler; import org.apache.aries.blueprint.plugin.spi.XmlWriter; import org.ops4j.pax.cdi.api.OsgiService; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - public class OsgiServiceHandler implements CustomDependencyAnnotationHandler { @Override public Class getAnnotation() { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceProviderHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceProviderHandler.java index 5c1ce0fbe8..2d7c5b98dd 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceProviderHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceProviderHandler.java @@ -18,8 +18,13 @@ */ package org.apache.aries.blueprint.plugin.handlers.paxcdi; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; +import java.lang.reflect.AnnotatedElement; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler; import org.apache.aries.blueprint.plugin.spi.BeanEnricher; import org.apache.aries.blueprint.plugin.spi.ContextEnricher; @@ -28,12 +33,8 @@ import org.ops4j.pax.cdi.api.Properties; import org.ops4j.pax.cdi.api.Property; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; -import java.lang.reflect.AnnotatedElement; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; public class OsgiServiceProviderHandler implements BeanAnnotationHandler { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/ServiceProperty.java b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/ServiceProperty.java index ea1c0aebe8..498fab144c 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/ServiceProperty.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/ServiceProperty.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin.handlers.paxcdi; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; import java.util.Arrays; import java.util.List; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; class ServiceProperty { final String name; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CollectionDependencyAnnotationHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CollectionDependencyAnnotationHandler.java index 6be8f8ec67..c723e63a74 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CollectionDependencyAnnotationHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CollectionDependencyAnnotationHandler.java @@ -19,7 +19,6 @@ package org.apache.aries.blueprint.plugin.spi; import java.lang.annotation.Annotation; -import java.lang.reflect.AnnotatedElement; /** * Annotation A on constructor, setter or field adds inject collection (array, list, set) of beans into annotated element. diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentAsNamed.java b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentAsNamed.java index 5169556645..800523536a 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentAsNamed.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentAsNamed.java @@ -18,11 +18,11 @@ */ package org.apache.aries.blueprint.plugin.handlers.spring; +import java.lang.reflect.AnnotatedElement; + import org.apache.aries.blueprint.plugin.spi.NamedLikeHandler; import org.springframework.stereotype.Component; -import java.lang.reflect.AnnotatedElement; - public class ComponentAsNamed implements NamedLikeHandler { @Override public Class getAnnotation() { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/DependsOnAttributeResolver.java b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/DependsOnAttributeResolver.java index 10826a3634..24603b7137 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/DependsOnAttributeResolver.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/DependsOnAttributeResolver.java @@ -18,14 +18,14 @@ */ package org.apache.aries.blueprint.plugin.handlers.spring; +import java.lang.reflect.AnnotatedElement; + import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler; import org.apache.aries.blueprint.plugin.spi.BeanEnricher; import org.apache.aries.blueprint.plugin.spi.ContextEnricher; import org.apache.commons.lang.StringUtils; import org.springframework.context.annotation.DependsOn; -import java.lang.reflect.AnnotatedElement; - public class DependsOnAttributeResolver implements BeanAnnotationHandler { @Override public Class getAnnotation() { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/LazyAttributeResolver.java b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/LazyAttributeResolver.java index 3e188e607e..74753c175a 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/LazyAttributeResolver.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/LazyAttributeResolver.java @@ -18,13 +18,13 @@ */ package org.apache.aries.blueprint.plugin.handlers.spring; +import java.lang.reflect.AnnotatedElement; + import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler; import org.apache.aries.blueprint.plugin.spi.BeanEnricher; import org.apache.aries.blueprint.plugin.spi.ContextEnricher; import org.springframework.context.annotation.Lazy; -import java.lang.reflect.AnnotatedElement; - public class LazyAttributeResolver implements BeanAnnotationHandler { @Override public Class getAnnotation() { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/QualifierAsNamed.java b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/QualifierAsNamed.java index 9eefec9bf8..daf0f86d5b 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/QualifierAsNamed.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/QualifierAsNamed.java @@ -18,11 +18,11 @@ */ package org.apache.aries.blueprint.plugin.handlers.spring; +import java.lang.reflect.AnnotatedElement; + import org.apache.aries.blueprint.plugin.spi.NamedLikeHandler; import org.springframework.beans.factory.annotation.Qualifier; -import java.lang.reflect.AnnotatedElement; - public class QualifierAsNamed implements NamedLikeHandler { @Override public Class getAnnotation() { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/SpringTransactionalFactory.java b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/SpringTransactionalFactory.java index b1798aa2b9..d18367858e 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/SpringTransactionalFactory.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/SpringTransactionalFactory.java @@ -18,7 +18,12 @@ */ package org.apache.aries.blueprint.plugin.handlers.spring; -import com.google.common.base.CaseFormat; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Method; +import java.util.List; +import java.util.Set; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler; import org.apache.aries.blueprint.plugin.spi.BeanEnricher; @@ -29,13 +34,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; - -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Method; -import java.util.List; -import java.util.Set; +import com.google.common.base.CaseFormat; public class SpringTransactionalFactory implements BeanAnnotationHandler, MethodAnnotationHandler { private static final String PATTERN_NS_TX1 = "http\\:\\/\\/aries\\.apache\\.org\\/xmlns\\/transactions\\/v1\\.(.)\\.(.)"; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ArtifactFilter.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ArtifactFilter.java index 5317d6528c..3f039d24dd 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ArtifactFilter.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ArtifactFilter.java @@ -18,12 +18,12 @@ */ package org.apache.aries.blueprint.plugin; -import org.apache.maven.artifact.Artifact; - import java.util.HashSet; import java.util.Set; import java.util.regex.Pattern; +import org.apache.maven.artifact.Artifact; + class ArtifactFilter { private final Set includeArtifactPatterns; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java index 952026e530..578f725ba2 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java @@ -18,16 +18,16 @@ */ package org.apache.aries.blueprint.plugin; -import org.apache.aries.blueprint.plugin.spi.Activation; -import org.apache.aries.blueprint.plugin.spi.Availability; -import org.apache.aries.blueprint.plugin.spi.BlueprintConfiguration; - import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.apache.aries.blueprint.plugin.spi.Activation; +import org.apache.aries.blueprint.plugin.spi.Availability; +import org.apache.aries.blueprint.plugin.spi.BlueprintConfiguration; + public class BlueprintConfigurationImpl implements BlueprintConfiguration { private static final String NS_TX2 = "http://aries.apache.org/xmlns/transactions/v2.0.0"; private static final String NS_JPA2 = "http://aries.apache.org/xmlns/jpa/v2.0.0"; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintFileWriter.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintFileWriter.java index 46d0aacc0d..3badca5c14 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintFileWriter.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintFileWriter.java @@ -18,8 +18,9 @@ */ package org.apache.aries.blueprint.plugin; -import org.apache.aries.blueprint.plugin.model.Blueprint; - +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; @@ -29,9 +30,8 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.OutputStream; + +import org.apache.aries.blueprint.plugin.model.Blueprint; class BlueprintFileWriter { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/FilteredClassFinder.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/FilteredClassFinder.java index ff204d029b..88943ceadc 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/FilteredClassFinder.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/FilteredClassFinder.java @@ -18,14 +18,14 @@ */ package org.apache.aries.blueprint.plugin; -import org.apache.aries.blueprint.plugin.handlers.Handlers; -import org.apache.xbean.finder.ClassFinder; - import java.lang.annotation.Annotation; import java.util.Collection; import java.util.HashSet; import java.util.Set; +import org.apache.aries.blueprint.plugin.handlers.Handlers; +import org.apache.xbean.finder.ClassFinder; + class FilteredClassFinder { @SuppressWarnings("unchecked") diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java index 3d74817d11..3fb357b3ba 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java @@ -18,7 +18,17 @@ */ package org.apache.aries.blueprint.plugin; +import java.io.File; +import java.io.OutputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import javax.inject.Inject; + import org.apache.aries.blueprint.plugin.model.Blueprint; import org.apache.aries.blueprint.plugin.model.ConflictDetected; import org.apache.aries.blueprint.plugin.spi.Activation; @@ -37,16 +47,6 @@ import org.codehaus.plexus.classworlds.ClassWorld; import org.codehaus.plexus.classworlds.realm.ClassRealm; -import java.io.File; -import java.io.OutputStream; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Generates blueprint from CDI annotations */ diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/Handlers.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/Handlers.java index 3d6e874455..b5adeea29a 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/Handlers.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/Handlers.java @@ -18,6 +18,11 @@ */ package org.apache.aries.blueprint.plugin.handlers; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.List; +import java.util.ServiceLoader; + import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler; import org.apache.aries.blueprint.plugin.spi.BeanFinder; import org.apache.aries.blueprint.plugin.spi.CollectionDependencyAnnotationHandler; @@ -31,11 +36,6 @@ import org.apache.aries.blueprint.plugin.spi.QualifingAnnotationFinder; import org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler; -import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.List; -import java.util.ServiceLoader; - public class Handlers { public static final List> BEAN_MARKING_ANNOTATION_CLASSES = new ArrayList<>(); public static final List> SINGLETONS = new ArrayList<>(); diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/bean/BeanHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/bean/BeanHandler.java index 28b1f19ce9..dd15069c4b 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/bean/BeanHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/bean/BeanHandler.java @@ -18,6 +18,8 @@ */ package org.apache.aries.blueprint.plugin.handlers.blueprint.bean; +import java.lang.reflect.AnnotatedElement; + import org.apache.aries.blueprint.annotation.bean.Activation; import org.apache.aries.blueprint.annotation.bean.Bean; import org.apache.aries.blueprint.annotation.bean.Scope; @@ -28,8 +30,6 @@ import org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder; import org.apache.aries.blueprint.plugin.spi.NamedLikeHandler; -import java.lang.reflect.AnnotatedElement; - public class BeanHandler implements BeanFinder, FactoryMethodFinder, diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/collection/CollectionInjectHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/collection/CollectionInjectHandler.java index fc403588b4..7daba4cad6 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/collection/CollectionInjectHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/collection/CollectionInjectHandler.java @@ -18,11 +18,11 @@ */ package org.apache.aries.blueprint.plugin.handlers.blueprint.collection; +import java.lang.annotation.Annotation; + import org.apache.aries.blueprint.annotation.collection.CollectionInject; import org.apache.aries.blueprint.plugin.spi.CollectionDependencyAnnotationHandler; -import java.lang.annotation.Annotation; - public class CollectionInjectHandler implements CollectionDependencyAnnotationHandler { @Override public Class getAnnotation() { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigPropertiesHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigPropertiesHandler.java index 510cf7574b..e60e64ce76 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigPropertiesHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigPropertiesHandler.java @@ -18,16 +18,16 @@ */ package org.apache.aries.blueprint.plugin.handlers.blueprint.config; +import java.lang.reflect.AnnotatedElement; +import java.util.Properties; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + import org.apache.aries.blueprint.annotation.config.ConfigProperties; import org.apache.aries.blueprint.plugin.spi.ContextEnricher; import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler; import org.apache.aries.blueprint.plugin.spi.XmlWriter; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; -import java.lang.reflect.AnnotatedElement; -import java.util.Properties; - public class ConfigPropertiesHandler implements CustomDependencyAnnotationHandler { @Override public String handleDependencyAnnotation(AnnotatedElement annotatedElement, String name, ContextEnricher contextEnricher) { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigWriter.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigWriter.java index 58edb48a5b..7ed99c9e78 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigWriter.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigWriter.java @@ -18,13 +18,13 @@ */ package org.apache.aries.blueprint.plugin.handlers.blueprint.config; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + import org.apache.aries.blueprint.annotation.config.Config; import org.apache.aries.blueprint.annotation.config.DefaultProperty; import org.apache.aries.blueprint.plugin.spi.XmlWriter; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; - class ConfigWriter implements XmlWriter { private static final String CONFIG_NS = "http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/referencelistener/ReferenceListenerHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/referencelistener/ReferenceListenerHandler.java index 604fe62949..e937daa04a 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/referencelistener/ReferenceListenerHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/referencelistener/ReferenceListenerHandler.java @@ -18,6 +18,12 @@ */ package org.apache.aries.blueprint.plugin.handlers.blueprint.referencelistener; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Method; +import java.util.List; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + import org.apache.aries.blueprint.annotation.referencelistener.Bind; import org.apache.aries.blueprint.annotation.referencelistener.Cardinality; import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener; @@ -27,12 +33,6 @@ import org.apache.aries.blueprint.plugin.spi.ContextEnricher; import org.apache.aries.blueprint.plugin.spi.XmlWriter; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Method; -import java.util.List; - public class ReferenceListenerHandler implements BeanAnnotationHandler { @Override public void handleBeanAnnotation(AnnotatedElement annotatedElement, String id, ContextEnricher contextEnricher, BeanEnricher beanEnricher) { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceHandler.java index 3b3d038cb6..938c0f316f 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceHandler.java @@ -18,19 +18,19 @@ */ package org.apache.aries.blueprint.plugin.handlers.blueprint.service; -import org.apache.aries.blueprint.annotation.service.Reference; -import org.apache.aries.blueprint.plugin.spi.ContextEnricher; -import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler; -import org.apache.aries.blueprint.plugin.spi.XmlWriter; +import static org.apache.aries.blueprint.plugin.handlers.blueprint.service.ReferenceParameters.needAvailability; +import static org.apache.aries.blueprint.plugin.handlers.blueprint.service.ReferenceParameters.needTimeout; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; import java.lang.reflect.Method; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; -import static org.apache.aries.blueprint.plugin.handlers.blueprint.service.ReferenceParameters.needAvailability; -import static org.apache.aries.blueprint.plugin.handlers.blueprint.service.ReferenceParameters.needTimeout; +import org.apache.aries.blueprint.annotation.service.Reference; +import org.apache.aries.blueprint.plugin.spi.ContextEnricher; +import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler; +import org.apache.aries.blueprint.plugin.spi.XmlWriter; public class ReferenceHandler implements CustomDependencyAnnotationHandler { @Override diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceId.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceId.java index e155828118..3ae05a4e55 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceId.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceId.java @@ -18,15 +18,15 @@ */ package org.apache.aries.blueprint.plugin.handlers.blueprint.service; +import static org.apache.aries.blueprint.plugin.handlers.blueprint.service.ReferenceParameters.needAvailability; +import static org.apache.aries.blueprint.plugin.handlers.blueprint.service.ReferenceParameters.needTimeout; + import org.apache.aries.blueprint.annotation.service.Availability; import org.apache.aries.blueprint.annotation.service.MemberType; import org.apache.aries.blueprint.annotation.service.Reference; import org.apache.aries.blueprint.annotation.service.ReferenceList; import org.apache.aries.blueprint.plugin.spi.ContextEnricher; -import static org.apache.aries.blueprint.plugin.handlers.blueprint.service.ReferenceParameters.needAvailability; -import static org.apache.aries.blueprint.plugin.handlers.blueprint.service.ReferenceParameters.needTimeout; - class ReferenceId { static String generateReferenceId(Class clazz, Reference reference, ContextEnricher contextEnricher) { StringBuilder sb = new StringBuilder(); diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceListHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceListHandler.java index 1fe179cfc8..250721e425 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceListHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceListHandler.java @@ -18,20 +18,20 @@ */ package org.apache.aries.blueprint.plugin.handlers.blueprint.service; -import org.apache.aries.blueprint.annotation.service.MemberType; -import org.apache.aries.blueprint.annotation.service.ReferenceList; -import org.apache.aries.blueprint.plugin.spi.ContextEnricher; -import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler; -import org.apache.aries.blueprint.plugin.spi.XmlWriter; +import static org.apache.aries.blueprint.plugin.handlers.blueprint.service.ReferenceParameters.needAvailability; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.List; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; -import static org.apache.aries.blueprint.plugin.handlers.blueprint.service.ReferenceParameters.needAvailability; +import org.apache.aries.blueprint.annotation.service.MemberType; +import org.apache.aries.blueprint.annotation.service.ReferenceList; +import org.apache.aries.blueprint.plugin.spi.ContextEnricher; +import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler; +import org.apache.aries.blueprint.plugin.spi.XmlWriter; public class ReferenceListHandler implements CustomDependencyAnnotationHandler { @Override diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServiceHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServiceHandler.java index aa6c03716c..2cf0b1036b 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServiceHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServiceHandler.java @@ -18,6 +18,10 @@ */ package org.apache.aries.blueprint.plugin.handlers.blueprint.service; +import java.lang.reflect.AnnotatedElement; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + import org.apache.aries.blueprint.annotation.service.AutoExport; import org.apache.aries.blueprint.annotation.service.Service; import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler; @@ -25,10 +29,6 @@ import org.apache.aries.blueprint.plugin.spi.ContextEnricher; import org.apache.aries.blueprint.plugin.spi.XmlWriter; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; -import java.lang.reflect.AnnotatedElement; - public class ServiceHandler implements BeanAnnotationHandler { @Override public Class getAnnotation() { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServicePropertyWriter.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServicePropertyWriter.java index 4cc717397e..f7a3a338d8 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServicePropertyWriter.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServicePropertyWriter.java @@ -18,12 +18,12 @@ */ package org.apache.aries.blueprint.plugin.handlers.blueprint.service; -import org.apache.aries.blueprint.annotation.service.ServiceProperty; - -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; import java.util.ArrayList; import java.util.List; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + +import org.apache.aries.blueprint.annotation.service.ServiceProperty; class ServicePropertyWriter { private final List serviceProperties; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/common/AbstractPersistenceContextHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/common/AbstractPersistenceContextHandler.java index e169b40cbc..bdf1fb200d 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/common/AbstractPersistenceContextHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/common/AbstractPersistenceContextHandler.java @@ -18,17 +18,17 @@ */ package org.apache.aries.blueprint.plugin.handlers.common; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.util.List; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + import org.apache.aries.blueprint.plugin.spi.BeanEnricher; import org.apache.aries.blueprint.plugin.spi.ContextEnricher; import org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler; import org.apache.aries.blueprint.plugin.spi.XmlWriter; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.util.List; - public abstract class AbstractPersistenceContextHandler implements FieldAnnotationHandler { protected abstract String getUnitName(Field field); diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/common/AbstractPersistenceUnitHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/common/AbstractPersistenceUnitHandler.java index 2b25c5a9bd..493bb42e99 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/common/AbstractPersistenceUnitHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/common/AbstractPersistenceUnitHandler.java @@ -18,20 +18,20 @@ */ package org.apache.aries.blueprint.plugin.handlers.common; -import org.apache.aries.blueprint.plugin.spi.BeanEnricher; -import org.apache.aries.blueprint.plugin.spi.ContextEnricher; -import org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler; -import org.apache.aries.blueprint.plugin.spi.XmlWriter; +import static org.apache.aries.blueprint.plugin.handlers.common.Namespaces.PATTERN_NS_JPA1; +import static org.apache.aries.blueprint.plugin.handlers.common.Namespaces.PATTERN_NS_JPA2; +import static org.apache.aries.blueprint.plugin.handlers.common.Namespaces.getNamespaceByPattern; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.util.List; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; -import static org.apache.aries.blueprint.plugin.handlers.common.Namespaces.PATTERN_NS_JPA1; -import static org.apache.aries.blueprint.plugin.handlers.common.Namespaces.PATTERN_NS_JPA2; -import static org.apache.aries.blueprint.plugin.handlers.common.Namespaces.getNamespaceByPattern; +import org.apache.aries.blueprint.plugin.spi.BeanEnricher; +import org.apache.aries.blueprint.plugin.spi.ContextEnricher; +import org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler; +import org.apache.aries.blueprint.plugin.spi.XmlWriter; public abstract class AbstractPersistenceUnitHandler implements FieldAnnotationHandler { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/common/AbstractTransactionFactory.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/common/AbstractTransactionFactory.java index bbe2c705a3..d3ffb827ac 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/common/AbstractTransactionFactory.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/common/AbstractTransactionFactory.java @@ -18,6 +18,13 @@ */ package org.apache.aries.blueprint.plugin.handlers.common; +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Method; +import java.util.List; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler; import org.apache.aries.blueprint.plugin.spi.BeanEnricher; import org.apache.aries.blueprint.plugin.spi.BlueprintConfiguration; @@ -25,13 +32,6 @@ import org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler; import org.apache.aries.blueprint.plugin.spi.XmlWriter; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; -import java.lang.annotation.Annotation; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Method; -import java.util.List; - public abstract class AbstractTransactionFactory implements BeanAnnotationHandler, MethodAnnotationHandler { protected abstract String getTransactionTypeName(AnnotatedElement annotatedElement); diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/InjectHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/InjectHandler.java index 12ca3546fc..69c51fb384 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/InjectHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/InjectHandler.java @@ -18,9 +18,10 @@ */ package org.apache.aries.blueprint.plugin.handlers.jakarta; -import jakarta.inject.Inject; import org.apache.aries.blueprint.plugin.spi.InjectLikeHandler; +import jakarta.inject.Inject; + public class InjectHandler implements InjectLikeHandler { @Override public Class getAnnotation() { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/JakartaTransactionFactory.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/JakartaTransactionFactory.java index afb75cce49..d0cf3265cc 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/JakartaTransactionFactory.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/JakartaTransactionFactory.java @@ -18,11 +18,12 @@ */ package org.apache.aries.blueprint.plugin.handlers.jakarta; -import com.google.common.base.CaseFormat; -import jakarta.transaction.Transactional; +import java.lang.reflect.AnnotatedElement; + import org.apache.aries.blueprint.plugin.handlers.common.AbstractTransactionFactory; -import java.lang.reflect.AnnotatedElement; +import com.google.common.base.CaseFormat; +import jakarta.transaction.Transactional; public class JakartaTransactionFactory extends AbstractTransactionFactory { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/NamedHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/NamedHandler.java index 7e66a63c3d..767971786c 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/NamedHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/NamedHandler.java @@ -20,9 +20,10 @@ import java.lang.reflect.AnnotatedElement; -import jakarta.inject.Named; import org.apache.aries.blueprint.plugin.spi.NamedLikeHandler; +import jakarta.inject.Named; + public class NamedHandler implements NamedLikeHandler { @Override public Class getAnnotation() { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PersistenceContextHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PersistenceContextHandler.java index 6a09ca4e39..df8490f8c0 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PersistenceContextHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PersistenceContextHandler.java @@ -18,10 +18,11 @@ */ package org.apache.aries.blueprint.plugin.handlers.jakarta; -import jakarta.persistence.PersistenceContext; +import java.lang.reflect.Field; + import org.apache.aries.blueprint.plugin.handlers.common.AbstractPersistenceContextHandler; -import java.lang.reflect.Field; +import jakarta.persistence.PersistenceContext; public class PersistenceContextHandler extends AbstractPersistenceContextHandler { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PersistenceUnitHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PersistenceUnitHandler.java index 15e92c34c7..0f88eb05d1 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PersistenceUnitHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PersistenceUnitHandler.java @@ -18,10 +18,11 @@ */ package org.apache.aries.blueprint.plugin.handlers.jakarta; -import jakarta.persistence.PersistenceUnit; +import java.lang.reflect.Field; + import org.apache.aries.blueprint.plugin.handlers.common.AbstractPersistenceUnitHandler; -import java.lang.reflect.Field; +import jakarta.persistence.PersistenceUnit; public class PersistenceUnitHandler extends AbstractPersistenceUnitHandler { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PostConstructHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PostConstructHandler.java index caeffe84f7..e0b6780ad8 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PostConstructHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PostConstructHandler.java @@ -18,13 +18,14 @@ */ package org.apache.aries.blueprint.plugin.handlers.jakarta; -import jakarta.annotation.PostConstruct; +import java.lang.reflect.Method; +import java.util.List; + import org.apache.aries.blueprint.plugin.spi.BeanEnricher; import org.apache.aries.blueprint.plugin.spi.ContextEnricher; import org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler; -import java.lang.reflect.Method; -import java.util.List; +import jakarta.annotation.PostConstruct; public class PostConstructHandler implements MethodAnnotationHandler { @Override diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PreDestroyHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PreDestroyHandler.java index 7767770186..9a1f0820f9 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PreDestroyHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/PreDestroyHandler.java @@ -18,13 +18,14 @@ */ package org.apache.aries.blueprint.plugin.handlers.jakarta; -import jakarta.annotation.PreDestroy; +import java.lang.reflect.Method; +import java.util.List; + import org.apache.aries.blueprint.plugin.spi.BeanEnricher; import org.apache.aries.blueprint.plugin.spi.ContextEnricher; import org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler; -import java.lang.reflect.Method; -import java.util.List; +import jakarta.annotation.PreDestroy; public class PreDestroyHandler implements MethodAnnotationHandler { @Override diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/ProducesHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/ProducesHandler.java index 78579e8fd5..4a8c0cdf63 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/ProducesHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/ProducesHandler.java @@ -18,9 +18,10 @@ */ package org.apache.aries.blueprint.plugin.handlers.jakarta; -import jakarta.enterprise.inject.Produces; import org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder; +import jakarta.enterprise.inject.Produces; + public class ProducesHandler implements FactoryMethodFinder { @Override public Class getAnnotation() { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/QualifierHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/QualifierHandler.java index c59eca4e09..546ee0f608 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/QualifierHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/jakarta/QualifierHandler.java @@ -18,9 +18,10 @@ */ package org.apache.aries.blueprint.plugin.handlers.jakarta; -import jakarta.inject.Qualifier; import org.apache.aries.blueprint.plugin.spi.QualifingAnnotationFinder; +import jakarta.inject.Qualifier; + public class QualifierHandler implements QualifingAnnotationFinder { @Override public Class getAnnotation() { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/CdiTransactionFactory.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/CdiTransactionFactory.java index b5bb1a4359..21548678c1 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/CdiTransactionFactory.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/CdiTransactionFactory.java @@ -18,11 +18,12 @@ */ package org.apache.aries.blueprint.plugin.handlers.javax; -import com.google.common.base.CaseFormat; +import java.lang.reflect.AnnotatedElement; +import javax.transaction.cdi.Transactional; + import org.apache.aries.blueprint.plugin.handlers.common.AbstractTransactionFactory; -import javax.transaction.cdi.Transactional; -import java.lang.reflect.AnnotatedElement; +import com.google.common.base.CaseFormat; public class CdiTransactionFactory extends AbstractTransactionFactory { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java index 7839f4cb1e..181ee9312a 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java @@ -18,11 +18,12 @@ */ package org.apache.aries.blueprint.plugin.handlers.javax; -import com.google.common.base.CaseFormat; +import java.lang.reflect.AnnotatedElement; +import javax.transaction.Transactional; + import org.apache.aries.blueprint.plugin.handlers.common.AbstractTransactionFactory; -import javax.transaction.Transactional; -import java.lang.reflect.AnnotatedElement; +import com.google.common.base.CaseFormat; public class JavaxTransactionFactory extends AbstractTransactionFactory { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/NamedHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/NamedHandler.java index 534061be1b..3b81b0cec7 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/NamedHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/NamedHandler.java @@ -18,8 +18,8 @@ */ package org.apache.aries.blueprint.plugin.handlers.javax; -import javax.inject.Named; import java.lang.reflect.AnnotatedElement; +import javax.inject.Named; import org.apache.aries.blueprint.plugin.spi.NamedLikeHandler; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceContextHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceContextHandler.java index 531b5f2175..261b6f338b 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceContextHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceContextHandler.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin.handlers.javax; -import org.apache.aries.blueprint.plugin.handlers.common.AbstractPersistenceContextHandler; - -import javax.persistence.PersistenceContext; import java.lang.reflect.Field; +import javax.persistence.PersistenceContext; + +import org.apache.aries.blueprint.plugin.handlers.common.AbstractPersistenceContextHandler; public class PersistenceContextHandler extends AbstractPersistenceContextHandler { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceUnitHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceUnitHandler.java index bb89137c92..74dc991c7d 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceUnitHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceUnitHandler.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin.handlers.javax; -import org.apache.aries.blueprint.plugin.handlers.common.AbstractPersistenceUnitHandler; - -import javax.persistence.PersistenceUnit; import java.lang.reflect.Field; +import javax.persistence.PersistenceUnit; + +import org.apache.aries.blueprint.plugin.handlers.common.AbstractPersistenceUnitHandler; public class PersistenceUnitHandler extends AbstractPersistenceUnitHandler { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PostConstructHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PostConstructHandler.java index 363929a7cd..39355702dc 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PostConstructHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PostConstructHandler.java @@ -18,14 +18,14 @@ */ package org.apache.aries.blueprint.plugin.handlers.javax; +import java.lang.reflect.Method; +import java.util.List; +import javax.annotation.PostConstruct; + import org.apache.aries.blueprint.plugin.spi.BeanEnricher; import org.apache.aries.blueprint.plugin.spi.ContextEnricher; import org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler; -import javax.annotation.PostConstruct; -import java.lang.reflect.Method; -import java.util.List; - public class PostConstructHandler implements MethodAnnotationHandler { @Override public Class getAnnotation() { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PreDestroyHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PreDestroyHandler.java index 3e1c7b9db7..76a83e3700 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PreDestroyHandler.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PreDestroyHandler.java @@ -18,14 +18,14 @@ */ package org.apache.aries.blueprint.plugin.handlers.javax; +import java.lang.reflect.Method; +import java.util.List; +import javax.annotation.PreDestroy; + import org.apache.aries.blueprint.plugin.spi.BeanEnricher; import org.apache.aries.blueprint.plugin.spi.ContextEnricher; import org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler; -import javax.annotation.PreDestroy; -import java.lang.reflect.Method; -import java.util.List; - public class PreDestroyHandler implements MethodAnnotationHandler { @Override public Class getAnnotation() { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/AnnotationHelper.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/AnnotationHelper.java index 1efdb0270f..67bc312769 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/AnnotationHelper.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/AnnotationHelper.java @@ -18,16 +18,16 @@ */ package org.apache.aries.blueprint.plugin.model; +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.List; + import org.apache.aries.blueprint.plugin.handlers.Handlers; import org.apache.aries.blueprint.plugin.spi.CollectionDependencyAnnotationHandler; import org.apache.aries.blueprint.plugin.spi.InjectLikeHandler; import org.apache.aries.blueprint.plugin.spi.NamedLikeHandler; import org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler; -import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.List; - class AnnotationHelper { static Class[] injectDependencyAnnotations = findInjectDependencyAnnotations(); diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java index a7af80c0d4..1e93f0b3f3 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java @@ -18,17 +18,17 @@ */ package org.apache.aries.blueprint.plugin.model; -import org.apache.aries.blueprint.plugin.handlers.Handlers; -import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler; -import org.apache.aries.blueprint.plugin.spi.XmlWriter; +import static org.apache.aries.blueprint.plugin.model.AnnotationHelper.findName; +import static org.apache.aries.blueprint.plugin.model.AnnotationHelper.findValue; +import static org.apache.aries.blueprint.plugin.model.NamingHelper.getBeanName; +import java.lang.annotation.Annotation; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import java.lang.annotation.Annotation; -import static org.apache.aries.blueprint.plugin.model.AnnotationHelper.findName; -import static org.apache.aries.blueprint.plugin.model.AnnotationHelper.findValue; -import static org.apache.aries.blueprint.plugin.model.NamingHelper.getBeanName; +import org.apache.aries.blueprint.plugin.handlers.Handlers; +import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler; +import org.apache.aries.blueprint.plugin.spi.XmlWriter; class Argument implements XmlWriter { private final String ref; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java index 751b3e19cd..9c4fa474d1 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java @@ -18,17 +18,9 @@ */ package org.apache.aries.blueprint.plugin.model; -import org.apache.aries.blueprint.plugin.handlers.Handlers; -import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler; -import org.apache.aries.blueprint.plugin.spi.BeanEnricher; -import org.apache.aries.blueprint.plugin.spi.ContextEnricher; -import org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler; -import org.apache.aries.blueprint.plugin.spi.InjectLikeHandler; -import org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler; -import org.apache.aries.blueprint.plugin.spi.XmlWriter; +import static org.apache.aries.blueprint.plugin.model.AnnotationHelper.findSingleton; +import static org.apache.aries.blueprint.plugin.model.NamingHelper.getBeanName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Constructor; @@ -41,9 +33,17 @@ import java.util.Map; import java.util.SortedSet; import java.util.TreeSet; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; -import static org.apache.aries.blueprint.plugin.model.AnnotationHelper.findSingleton; -import static org.apache.aries.blueprint.plugin.model.NamingHelper.getBeanName; +import org.apache.aries.blueprint.plugin.handlers.Handlers; +import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler; +import org.apache.aries.blueprint.plugin.spi.BeanEnricher; +import org.apache.aries.blueprint.plugin.spi.ContextEnricher; +import org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler; +import org.apache.aries.blueprint.plugin.spi.InjectLikeHandler; +import org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler; +import org.apache.aries.blueprint.plugin.spi.XmlWriter; class Bean implements BeanEnricher, XmlWriter, Comparable { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java index b126c7ad2d..ee2bbbafb6 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java @@ -19,12 +19,12 @@ package org.apache.aries.blueprint.plugin.model; +import java.lang.reflect.Method; + import org.apache.aries.blueprint.plugin.handlers.Handlers; import org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler; import org.apache.aries.blueprint.plugin.spi.ContextEnricher; -import java.lang.reflect.Method; - class BeanFromFactory extends Bean { private static final String BLUEPRINT_BEAN_FROM_FACTORY_NAME_PROPERTY = "blueprint.beanFromFactory.nameFromFactoryMethodName"; private final Method producingMethod; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java index 8a07f15ef3..a86d9d5333 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java @@ -18,14 +18,6 @@ */ package org.apache.aries.blueprint.plugin.model; -import org.apache.aries.blueprint.plugin.handlers.Handlers; -import org.apache.aries.blueprint.plugin.spi.BlueprintConfiguration; -import org.apache.aries.blueprint.plugin.spi.ContextEnricher; -import org.apache.aries.blueprint.plugin.spi.ContextInitializationHandler; -import org.apache.aries.blueprint.plugin.spi.XmlWriter; - -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.ArrayList; @@ -35,6 +27,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + +import org.apache.aries.blueprint.plugin.handlers.Handlers; +import org.apache.aries.blueprint.plugin.spi.BlueprintConfiguration; +import org.apache.aries.blueprint.plugin.spi.ContextEnricher; +import org.apache.aries.blueprint.plugin.spi.ContextInitializationHandler; +import org.apache.aries.blueprint.plugin.spi.XmlWriter; public class Blueprint implements BlueprintRegistry, ContextEnricher, XmlWriter { private static final String NS_BLUEPRINT = "http://www.osgi.org/xmlns/blueprint/v1.0.0"; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintRegistry.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintRegistry.java index 448884ae9b..77e5140e61 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintRegistry.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintRegistry.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin.model; -import org.apache.aries.blueprint.plugin.spi.ContextEnricher; - import java.util.List; +import org.apache.aries.blueprint.plugin.spi.ContextEnricher; + interface BlueprintRegistry extends ContextEnricher { BeanRef getMatching(BeanTemplate template); diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/CustomTypeConverterWriter.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/CustomTypeConverterWriter.java index 14d1a8f450..4a09cf5b23 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/CustomTypeConverterWriter.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/CustomTypeConverterWriter.java @@ -18,13 +18,13 @@ */ package org.apache.aries.blueprint.plugin.model; -import org.apache.aries.blueprint.plugin.spi.XmlWriter; -import org.osgi.service.blueprint.container.Converter; - -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; import java.lang.annotation.Annotation; import java.util.List; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + +import org.apache.aries.blueprint.plugin.spi.XmlWriter; +import org.osgi.service.blueprint.container.Converter; class CustomTypeConverterWriter implements XmlWriter { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Introspector.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Introspector.java index 2d81e7485b..d3c08b48fe 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Introspector.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Introspector.java @@ -18,9 +18,6 @@ */ package org.apache.aries.blueprint.plugin.model; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -30,6 +27,9 @@ import java.util.List; import java.util.Set; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + /** * Class to find uniquely-named fields declared in a class hierarchy with specified annotations. */ diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java index 907e472c7b..7a627d2e70 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java @@ -18,20 +18,20 @@ */ package org.apache.aries.blueprint.plugin.model; -import org.apache.aries.blueprint.plugin.handlers.Handlers; -import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler; -import org.apache.aries.blueprint.plugin.spi.NamedLikeHandler; -import org.apache.aries.blueprint.plugin.spi.XmlWriter; +import static org.apache.aries.blueprint.plugin.model.AnnotationHelper.findName; +import static org.apache.aries.blueprint.plugin.model.NamingHelper.getBeanName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; import java.lang.reflect.Method; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; -import static org.apache.aries.blueprint.plugin.model.AnnotationHelper.findName; -import static org.apache.aries.blueprint.plugin.model.NamingHelper.getBeanName; +import org.apache.aries.blueprint.plugin.handlers.Handlers; +import org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler; +import org.apache.aries.blueprint.plugin.spi.NamedLikeHandler; +import org.apache.aries.blueprint.plugin.spi.XmlWriter; class Property implements Comparable, XmlWriter { public final String name; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/QualifierHelper.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/QualifierHelper.java index 740e08ef52..3f55490616 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/QualifierHelper.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/QualifierHelper.java @@ -18,12 +18,12 @@ */ package org.apache.aries.blueprint.plugin.model; -import org.apache.aries.blueprint.plugin.handlers.Handlers; - import java.lang.annotation.Annotation; import java.util.HashSet; import java.util.Set; +import org.apache.aries.blueprint.plugin.handlers.Handlers; + class QualifierHelper { static Set getQualifiers(Annotation[] annotations) { final Set qualifiers = new HashSet<>(); diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/RefCollection.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/RefCollection.java index 9929626bf4..d726229054 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/RefCollection.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/RefCollection.java @@ -18,18 +18,18 @@ */ package org.apache.aries.blueprint.plugin.model; -import org.apache.aries.blueprint.plugin.handlers.Handlers; -import org.apache.aries.blueprint.plugin.spi.CollectionDependencyAnnotationHandler; -import org.apache.aries.blueprint.plugin.spi.XmlWriter; - -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import java.util.Set; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + +import org.apache.aries.blueprint.plugin.handlers.Handlers; +import org.apache.aries.blueprint.plugin.spi.CollectionDependencyAnnotationHandler; +import org.apache.aries.blueprint.plugin.spi.XmlWriter; class RefCollection implements XmlWriter { private final String type; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/AnnotatedService.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/AnnotatedService.java index 25baf91869..30d13db13d 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/AnnotatedService.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/AnnotatedService.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin; -import javax.inject.Named; -import javax.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import javax.inject.Named; +import javax.inject.Qualifier; @Retention(RetentionPolicy.RUNTIME) @Qualifier diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java index 8a5b88b044..fef8333d27 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java @@ -18,7 +18,35 @@ */ package org.apache.aries.blueprint.plugin; -import com.google.common.collect.Sets; +import static org.apache.aries.blueprint.plugin.FilteredClassFinder.findClasses; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.xml.XMLConstants; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Source; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; + import org.apache.aries.blueprint.plugin.jakarta.JakartaFactoryBean; import org.apache.aries.blueprint.plugin.jakarta.JakartaTransactionalBean; import org.apache.aries.blueprint.plugin.jakarta.NamedJakartaBean; @@ -56,34 +84,7 @@ import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import javax.xml.XMLConstants; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamSource; -import javax.xml.validation.Schema; -import javax.xml.validation.SchemaFactory; -import javax.xml.validation.Validator; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import static org.apache.aries.blueprint.plugin.FilteredClassFinder.findClasses; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import com.google.common.collect.Sets; public class BlueprintFileWriterTest { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/EnableAnnotationTest.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/EnableAnnotationTest.java index 3e12a12a22..7671ccc571 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/EnableAnnotationTest.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/EnableAnnotationTest.java @@ -18,24 +18,10 @@ */ package org.apache.aries.blueprint.plugin; -import org.apache.aries.blueprint.plugin.model.Blueprint; -import org.apache.aries.blueprint.plugin.test.transactionenable.TxBean; -import org.apache.commons.io.output.ByteArrayOutputStream; -import org.apache.xbean.finder.ClassFinder; -import org.junit.BeforeClass; -import org.junit.Test; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.xml.sax.SAXException; +import static org.apache.aries.blueprint.plugin.FilteredClassFinder.findClasses; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.stream.XMLStreamException; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -45,10 +31,24 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.stream.XMLStreamException; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; -import static org.apache.aries.blueprint.plugin.FilteredClassFinder.findClasses; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import org.apache.aries.blueprint.plugin.model.Blueprint; +import org.apache.aries.blueprint.plugin.test.transactionenable.TxBean; +import org.apache.commons.io.output.ByteArrayOutputStream; +import org.apache.xbean.finder.ClassFinder; +import org.junit.BeforeClass; +import org.junit.Test; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.xml.sax.SAXException; public class EnableAnnotationTest { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/Namespaces.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/Namespaces.java index aa6470d3a1..3a4680d916 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/Namespaces.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/Namespaces.java @@ -19,7 +19,6 @@ package org.apache.aries.blueprint.plugin; import java.util.Iterator; - import javax.xml.XMLConstants; import javax.xml.namespace.NamespaceContext; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java index 809fe9fb78..9404dae957 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java @@ -18,14 +18,14 @@ */ package org.apache.aries.blueprint.plugin.extension; +import java.util.Map; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + import org.apache.aries.blueprint.plugin.spi.ContextEnricher; import org.apache.aries.blueprint.plugin.spi.ContextInitializationHandler; import org.apache.aries.blueprint.plugin.spi.XmlWriter; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; -import java.util.Map; - public class InitContextExample implements ContextInitializationHandler { @Override public void initContext(ContextEnricher contextEnricher) { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/jakarta/JakartaFactoryBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/jakarta/JakartaFactoryBean.java index 157d874679..15c152c66b 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/jakarta/JakartaFactoryBean.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/jakarta/JakartaFactoryBean.java @@ -18,14 +18,15 @@ */ package org.apache.aries.blueprint.plugin.jakarta; -import jakarta.enterprise.inject.Produces; -import jakarta.inject.Named; -import jakarta.inject.Singleton; import org.apache.aries.blueprint.annotation.config.ConfigProperty; import org.apache.aries.blueprint.annotation.service.Reference; import org.apache.aries.blueprint.plugin.test.MyBean1; import org.apache.aries.blueprint.plugin.test.interfaces.ServiceC; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Named; +import jakarta.inject.Singleton; + @Singleton public class JakartaFactoryBean { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java index 1eed309693..662b652b58 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java @@ -18,7 +18,14 @@ */ package org.apache.aries.blueprint.plugin.model; -import com.google.common.collect.Sets; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import javax.inject.Named; + import org.apache.aries.blueprint.plugin.BlueprintConfigurationImpl; import org.apache.aries.blueprint.plugin.bad.BadBean1; import org.apache.aries.blueprint.plugin.bad.BadBean2; @@ -33,13 +40,7 @@ import org.apache.aries.blueprint.plugin.test.ServiceAImpl1; import org.junit.Test; -import javax.inject.Named; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import com.google.common.collect.Sets; public class BeanTest { private static final String NS_JPA1 = "http://aries.apache.org/xmlns/jpa/v1.1.0"; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java index adc6b60b20..b35f9a9257 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java @@ -18,6 +18,13 @@ */ package org.apache.aries.blueprint.plugin.model; +import static org.junit.Assert.assertEquals; + +import java.lang.annotation.Annotation; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + import org.apache.aries.blueprint.plugin.BlueprintConfigurationImpl; import org.apache.aries.blueprint.plugin.test.MyBean3; import org.apache.aries.blueprint.plugin.test.ServiceReferences; @@ -27,13 +34,6 @@ import org.osgi.service.blueprint.container.BlueprintContainer; import org.osgi.service.blueprint.container.Converter; -import java.lang.annotation.Annotation; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -import static org.junit.Assert.assertEquals; - public class BlueprintTest { private static final String NS_JPA1 = "http://aries.apache.org/xmlns/jpa/v1.0.0"; private static final String NS_TX1 = "http://aries.apache.org/xmlns/transactions/v1.0.0"; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java index 27e4280aca..123c5ee5a5 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java @@ -18,6 +18,10 @@ */ package org.apache.aries.blueprint.plugin.test; +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; + import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; import org.ops4j.pax.cdi.api.OsgiService; @@ -26,10 +30,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; - @Singleton @Lazy(false) public class BeanWithSetters { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java index 757c77ccea..ad2905a37b 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java @@ -18,13 +18,13 @@ */ package org.apache.aries.blueprint.plugin.test; -import org.springframework.context.annotation.Lazy; - import javax.annotation.PostConstruct; import javax.inject.Singleton; import javax.transaction.Transactional; import javax.transaction.Transactional.TxType; +import org.springframework.context.annotation.Lazy; + @Singleton @Transactional(value=TxType.REQUIRES_NEW) @Lazy diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java index 09084f45c6..52346aa5a4 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java @@ -18,14 +18,14 @@ */ package org.apache.aries.blueprint.plugin.test; +import javax.inject.Inject; + import org.osgi.framework.BundleContext; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import javax.inject.Inject; - @Component @DependsOn({"myBean5", "myBean6"}) public class MyBean4 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java index f0a0568d93..3c3e9f77fc 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java @@ -18,6 +18,10 @@ */ package org.apache.aries.blueprint.plugin.test; +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; + import org.apache.aries.blueprint.plugin.AnnotatedService; import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; @@ -26,10 +30,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.DependsOn; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; - @Singleton @DependsOn("myBean6") public class MyBean5 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java index ef962047dd..4311f4dc0d 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java @@ -18,12 +18,12 @@ */ package org.apache.aries.blueprint.plugin.test; -import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; -import org.springframework.context.annotation.DependsOn; - import javax.inject.Named; import javax.inject.Singleton; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; +import org.springframework.context.annotation.DependsOn; + @Singleton @DependsOn public class MyBean6 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java index bb4e914259..425ff05552 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java @@ -18,11 +18,11 @@ */ package org.apache.aries.blueprint.plugin.test; +import javax.inject.Singleton; + import org.apache.aries.blueprint.plugin.test.interfaces.ServiceD; import org.ops4j.pax.cdi.api.OsgiService; -import javax.inject.Singleton; - @Singleton public class MyBean7 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java index 19fc8ac68e..e7a7c7ef44 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java @@ -18,16 +18,16 @@ */ package org.apache.aries.blueprint.plugin.test; -import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; -import org.apache.aries.blueprint.plugin.test.interfaces.ServiceC; -import org.ops4j.pax.cdi.api.OsgiService; -import org.springframework.beans.factory.annotation.Value; - import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceC; +import org.ops4j.pax.cdi.api.OsgiService; +import org.springframework.beans.factory.annotation.Value; + @Singleton public class MyFactoryBean { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryNamedBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryNamedBean.java index 0b941620a0..4e816c81a6 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryNamedBean.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryNamedBean.java @@ -18,13 +18,13 @@ */ package org.apache.aries.blueprint.plugin.test; -import org.springframework.context.annotation.DependsOn; -import org.springframework.context.annotation.Lazy; - import javax.enterprise.inject.Produces; import javax.inject.Named; import javax.inject.Singleton; +import org.springframework.context.annotation.DependsOn; +import org.springframework.context.annotation.Lazy; + @Singleton public class MyFactoryNamedBean { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java index 70e6ebbeae..691f939ba1 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java @@ -18,11 +18,11 @@ */ package org.apache.aries.blueprint.plugin.test; +import javax.inject.Inject; + import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import org.springframework.context.annotation.Lazy; -import javax.inject.Inject; - @Lazy public class MyProduced { private String message; diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java index d19e648063..592ec8088a 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java @@ -18,12 +18,12 @@ */ package org.apache.aries.blueprint.plugin.test; -import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; -import org.ops4j.pax.cdi.api.OsgiService; - import javax.inject.Inject; import javax.inject.Named; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; +import org.ops4j.pax.cdi.api.OsgiService; + public class MyProducedWithConstructor { @Inject diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java index 8af5ac923e..a67a1ebfee 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin.test; -import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; - import javax.inject.Named; +import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; + @Named("my1") public class ServiceAImpl1 implements ServiceA { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java index 5a49eeb3ad..be86591f33 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java @@ -18,11 +18,11 @@ */ package org.apache.aries.blueprint.plugin.test; +import javax.inject.Singleton; + import org.apache.aries.blueprint.plugin.AnnotatedService; import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; -import javax.inject.Singleton; - @Singleton @AnnotatedService public class ServiceAImplQualified implements ServiceA { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java index cbdb95b8f9..ffde18c7ec 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java @@ -18,13 +18,12 @@ */ package org.apache.aries.blueprint.plugin.test.cditransactional; -import org.apache.aries.blueprint.plugin.test.ParentBean; - -import javax.annotation.PostConstruct; import javax.inject.Singleton; import javax.transaction.cdi.Transactional; import javax.transaction.cdi.Transactional.TxType; +import org.apache.aries.blueprint.plugin.test.ParentBean; + @Singleton @Transactional(value = TxType.REQUIRES_NEW) public class CdiTransactionalAnnotatedBean extends ParentBean { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/BeanWithCollections.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/BeanWithCollections.java index 01af53b749..c5f9c45b40 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/BeanWithCollections.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/BeanWithCollections.java @@ -18,13 +18,13 @@ */ package org.apache.aries.blueprint.plugin.test.collection; +import java.util.List; +import java.util.Set; + import org.apache.aries.blueprint.annotation.bean.Bean; import org.apache.aries.blueprint.annotation.collection.CollectionInject; import org.apache.aries.blueprint.plugin.AnnotatedService; -import java.util.List; -import java.util.Set; - @Bean public class BeanWithCollections { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl3Annotated.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl3Annotated.java index ea27039a36..950286cbe3 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl3Annotated.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl3Annotated.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin.test.collection; -import org.apache.aries.blueprint.plugin.AnnotatedService; - import javax.inject.Singleton; +import org.apache.aries.blueprint.plugin.AnnotatedService; + @Singleton @AnnotatedService public class I1Impl3Annotated implements I1 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl4Annotated.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl4Annotated.java index 1f06b3b002..5807261c18 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl4Annotated.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl4Annotated.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin.test.collection; -import org.apache.aries.blueprint.plugin.AnnotatedService; - import javax.inject.Singleton; +import org.apache.aries.blueprint.plugin.AnnotatedService; + @Singleton @AnnotatedService public class I1Impl4Annotated implements I1 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl2Annotated.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl2Annotated.java index 6c8634f8d7..f1259fe439 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl2Annotated.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl2Annotated.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin.test.collection; -import org.apache.aries.blueprint.plugin.AnnotatedService; - import javax.inject.Singleton; +import org.apache.aries.blueprint.plugin.AnnotatedService; + @Singleton @AnnotatedService public class I2Impl2Annotated implements I2 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl3Annotated.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl3Annotated.java index 1bd8e51b0b..4911eae925 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl3Annotated.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl3Annotated.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin.test.collection; -import org.apache.aries.blueprint.plugin.AnnotatedService; - import javax.inject.Singleton; +import org.apache.aries.blueprint.plugin.AnnotatedService; + @Singleton @AnnotatedService public class I2Impl3Annotated implements I2 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfig.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfig.java index fcea162cb0..3239625270 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfig.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfig.java @@ -18,15 +18,15 @@ */ package org.apache.aries.blueprint.plugin.test.configuration; +import javax.enterprise.inject.Produces; +import javax.inject.Named; +import javax.inject.Singleton; + import org.apache.aries.blueprint.annotation.config.Config; import org.apache.aries.blueprint.annotation.config.ConfigProperty; import org.apache.aries.blueprint.annotation.config.DefaultProperty; import org.apache.aries.blueprint.plugin.test.MyProducedWithConstructor; -import javax.enterprise.inject.Produces; -import javax.inject.Named; -import javax.inject.Singleton; - @Config( pid = "org.apache.aries.my", placeholderPrefix = "$[", diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java index 79edcc0d15..6b6fe95317 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java @@ -18,14 +18,14 @@ */ package org.apache.aries.blueprint.plugin.test.configuration; -import org.apache.aries.blueprint.annotation.config.ConfigProperties; -import org.apache.aries.blueprint.plugin.test.MyProducedWithConstructor; - +import java.util.Properties; import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; -import java.util.Properties; + +import org.apache.aries.blueprint.annotation.config.ConfigProperties; +import org.apache.aries.blueprint.plugin.test.MyProducedWithConstructor; @Singleton public class BeanWithConfigurationProperties { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter1.java index d6d0249ee6..eeed46d4e4 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter1.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter1.java @@ -18,11 +18,11 @@ */ package org.apache.aries.blueprint.plugin.test.converters; +import javax.inject.Singleton; + import org.osgi.service.blueprint.container.Converter; import org.osgi.service.blueprint.container.ReifiedType; -import javax.inject.Singleton; - @Singleton public class Converter1 implements Converter { @Override diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter2.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter2.java index d770aafeab..f709089bd2 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter2.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter2.java @@ -18,11 +18,11 @@ */ package org.apache.aries.blueprint.plugin.test.converters; +import javax.inject.Singleton; + import org.osgi.service.blueprint.container.Converter; import org.osgi.service.blueprint.container.ReifiedType; -import javax.inject.Singleton; - @Singleton public class Converter2 implements Converter { @Override diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java index b81cd45c8f..400cbc2fac 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java @@ -18,16 +18,16 @@ */ package org.apache.aries.blueprint.plugin.test.osgiserviceprovider; +import javax.enterprise.inject.Produces; +import javax.inject.Named; +import javax.inject.Singleton; + import org.apache.aries.blueprint.plugin.test.MyProduced; import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import org.ops4j.pax.cdi.api.OsgiServiceProvider; import org.ops4j.pax.cdi.api.Properties; import org.ops4j.pax.cdi.api.Property; -import javax.enterprise.inject.Produces; -import javax.inject.Named; -import javax.inject.Singleton; - @Singleton public class MyFactoryBeanAsService { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java index 22e97a13fa..c580019c68 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java @@ -18,13 +18,13 @@ */ package org.apache.aries.blueprint.plugin.test.osgiserviceprovider; +import javax.inject.Singleton; + import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; import org.ops4j.pax.cdi.api.OsgiServiceProvider; import org.ops4j.pax.cdi.api.Properties; import org.ops4j.pax.cdi.api.Property; -import javax.inject.Singleton; - @Singleton @OsgiServiceProvider @Properties({ diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithTypedParameters.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithTypedParameters.java index 93fc50f74a..1770b23a7f 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithTypedParameters.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithTypedParameters.java @@ -18,12 +18,12 @@ */ package org.apache.aries.blueprint.plugin.test.osgiserviceprovider; +import javax.inject.Singleton; + import org.ops4j.pax.cdi.api.OsgiServiceProvider; import org.ops4j.pax.cdi.api.Properties; import org.ops4j.pax.cdi.api.Property; -import javax.inject.Singleton; - @OsgiServiceProvider @Properties({ @Property(name = "test1", value = "test"), diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A1.java index 91e9f23230..6981bc4023 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A1.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A1.java @@ -18,9 +18,9 @@ */ package org.apache.aries.blueprint.plugin.test.qualifiers; -import javax.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import javax.inject.Qualifier; @Retention(RetentionPolicy.RUNTIME) @Qualifier diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A2.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A2.java index f819dca54e..8446662a0f 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A2.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A2.java @@ -18,9 +18,9 @@ */ package org.apache.aries.blueprint.plugin.test.qualifiers; -import javax.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import javax.inject.Qualifier; @Retention(RetentionPolicy.RUNTIME) @Qualifier diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A3.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A3.java index 59363299c9..a5429c26bc 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A3.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A3.java @@ -18,10 +18,11 @@ */ package org.apache.aries.blueprint.plugin.test.qualifiers; -import jakarta.inject.Qualifier; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import jakarta.inject.Qualifier; + @Retention(RetentionPolicy.RUNTIME) @Qualifier public @interface A3 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/MyFactory.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/MyFactory.java index 36e0ebd28f..6104ec0fe1 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/MyFactory.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/MyFactory.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin.test.qualifiers; -import org.apache.aries.blueprint.annotation.bean.Bean; - import javax.inject.Named; +import org.apache.aries.blueprint.annotation.bean.Bean; + @Bean public class MyFactory { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferenceLists.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferenceLists.java index 1f62449f0a..b93b90660a 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferenceLists.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferenceLists.java @@ -18,16 +18,16 @@ */ package org.apache.aries.blueprint.plugin.test.reference; -import org.apache.aries.blueprint.annotation.service.Availability; -import org.apache.aries.blueprint.annotation.service.MemberType; -import org.apache.aries.blueprint.annotation.service.ReferenceList; -import org.osgi.framework.ServiceReference; - +import java.util.List; import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; -import java.util.List; + +import org.apache.aries.blueprint.annotation.service.Availability; +import org.apache.aries.blueprint.annotation.service.MemberType; +import org.apache.aries.blueprint.annotation.service.ReferenceList; +import org.osgi.framework.ServiceReference; @Singleton public class BeanWithReferenceLists { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferences.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferences.java index a6009b5205..caad6fc132 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferences.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferences.java @@ -18,14 +18,14 @@ */ package org.apache.aries.blueprint.plugin.test.reference; -import org.apache.aries.blueprint.annotation.service.Availability; -import org.apache.aries.blueprint.annotation.service.Reference; - import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; +import org.apache.aries.blueprint.annotation.service.Availability; +import org.apache.aries.blueprint.annotation.service.Reference; + @Singleton public class BeanWithReferences { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java index 136dba66e8..031b9ff8b1 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java @@ -18,13 +18,13 @@ */ package org.apache.aries.blueprint.plugin.test.referencelistener; +import javax.inject.Named; +import javax.inject.Singleton; + import org.apache.aries.blueprint.annotation.referencelistener.Cardinality; import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener; import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; -import javax.inject.Named; -import javax.inject.Singleton; - @ReferenceListener(referenceInterface = ServiceA.class, cardinality = Cardinality.SINGLE, referenceName = "serviceAReferenceWithoutMethods") @Singleton @Named("referenceListenerBeanWithNameWithoutMethods") diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java index 1affb94b27..a111f5a5b5 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java @@ -18,12 +18,12 @@ */ package org.apache.aries.blueprint.plugin.test.referencelistener; +import javax.inject.Singleton; + import org.apache.aries.blueprint.annotation.referencelistener.Cardinality; import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener; import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; -import javax.inject.Singleton; - @ReferenceListener(referenceInterface = ServiceA.class, cardinality = Cardinality.MULTIPLE, referenceName = "serviceAReference", bindMethod = "addMe", unbindMethod = "removeMe") @Singleton diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java index d6951b88ee..bd2a3bbf2d 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java @@ -18,14 +18,14 @@ */ package org.apache.aries.blueprint.plugin.test.referencelistener; +import javax.inject.Singleton; + import org.apache.aries.blueprint.annotation.referencelistener.Availability; import org.apache.aries.blueprint.annotation.referencelistener.Bind; import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener; import org.apache.aries.blueprint.annotation.referencelistener.Unbind; import org.apache.aries.blueprint.plugin.test.interfaces.ServiceA; -import javax.inject.Singleton; - @ReferenceListener(referenceInterface = ServiceA.class, filter = "(b=c)", componentName = "a", availability = Availability.MANDATORY) @Singleton public class ReferenceListenerListBean { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java index 4b680df3df..5e183a69b0 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java @@ -18,15 +18,15 @@ */ package org.apache.aries.blueprint.plugin.test.referencelistener; +import javax.enterprise.inject.Produces; +import javax.inject.Named; +import javax.inject.Singleton; + import org.apache.aries.blueprint.annotation.referencelistener.Availability; import org.apache.aries.blueprint.annotation.referencelistener.Cardinality; import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener; import org.apache.aries.blueprint.plugin.test.interfaces.ServiceB; -import javax.enterprise.inject.Produces; -import javax.inject.Named; -import javax.inject.Singleton; - @Singleton public class ReferenceListenerProducer { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceProducer.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceProducer.java index cb2d9650be..f6b54db020 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceProducer.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceProducer.java @@ -18,13 +18,13 @@ */ package org.apache.aries.blueprint.plugin.test.service; +import javax.inject.Singleton; + import org.apache.aries.blueprint.annotation.bean.Bean; import org.apache.aries.blueprint.annotation.service.AutoExport; import org.apache.aries.blueprint.annotation.service.Service; import org.apache.aries.blueprint.annotation.service.ServiceProperty; -import javax.inject.Singleton; - @Singleton public class ServiceProducer implements Service1, Service2 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithAllClasses.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithAllClasses.java index 0f1fb3bcb3..1da7e1aa11 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithAllClasses.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithAllClasses.java @@ -18,11 +18,11 @@ */ package org.apache.aries.blueprint.plugin.test.service; +import javax.inject.Singleton; + import org.apache.aries.blueprint.annotation.service.AutoExport; import org.apache.aries.blueprint.annotation.service.Service; -import javax.inject.Singleton; - @Service(autoExport = AutoExport.ALL_CLASSES) @Singleton public class ServiceWithAllClasses implements Service1, Service2 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithClassHierarchy.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithClassHierarchy.java index 8e426b6b0a..45aac56f05 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithClassHierarchy.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithClassHierarchy.java @@ -18,11 +18,11 @@ */ package org.apache.aries.blueprint.plugin.test.service; +import javax.inject.Singleton; + import org.apache.aries.blueprint.annotation.service.AutoExport; import org.apache.aries.blueprint.annotation.service.Service; -import javax.inject.Singleton; - @Service(autoExport = AutoExport.CLASS_HIERARCHY) @Singleton public class ServiceWithClassHierarchy implements Service1, Service2 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithManyInterfaces.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithManyInterfaces.java index 90448aac21..72d6d53b07 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithManyInterfaces.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithManyInterfaces.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin.test.service; -import org.apache.aries.blueprint.annotation.service.Service; - import javax.inject.Singleton; +import org.apache.aries.blueprint.annotation.service.Service; + @Service(classes = {Service1.class, Service2.class}) @Singleton public class ServiceWithManyInterfaces implements Service1, Service2 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithOneInterface.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithOneInterface.java index 1e3e9e624c..bf2b624fb7 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithOneInterface.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithOneInterface.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin.test.service; -import org.apache.aries.blueprint.annotation.service.Service; - import javax.inject.Singleton; +import org.apache.aries.blueprint.annotation.service.Service; + @Service(classes = Service1.class) @Singleton public class ServiceWithOneInterface implements Service1, Service2 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithProperties.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithProperties.java index 67f04298b2..43bde1795c 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithProperties.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithProperties.java @@ -18,11 +18,11 @@ */ package org.apache.aries.blueprint.plugin.test.service; +import javax.inject.Singleton; + import org.apache.aries.blueprint.annotation.service.Service; import org.apache.aries.blueprint.annotation.service.ServiceProperty; -import javax.inject.Singleton; - @Service(properties = { @ServiceProperty(name = "oneValue", values = "test"), @ServiceProperty(name = "intValue", values = "1", type = Integer.class), diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingAndProperty.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingAndProperty.java index 55d813af82..0f5ddcf3cd 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingAndProperty.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingAndProperty.java @@ -18,11 +18,11 @@ */ package org.apache.aries.blueprint.plugin.test.service; +import javax.inject.Singleton; + import org.apache.aries.blueprint.annotation.service.Service; import org.apache.aries.blueprint.annotation.service.ServiceProperty; -import javax.inject.Singleton; - @Service(ranking = 2, properties = @ServiceProperty(name = "service.ranking", values = "3")) @Singleton public class ServiceWithRankingAndProperty implements Service1, Service2 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingParameter.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingParameter.java index 2406a60169..520ad62e30 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingParameter.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingParameter.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin.test.service; -import org.apache.aries.blueprint.annotation.service.Service; - import javax.inject.Singleton; +import org.apache.aries.blueprint.annotation.service.Service; + @Service(ranking = 1000) @Singleton public class ServiceWithRankingParameter implements Service1, Service2 { diff --git a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/SimplestService.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/SimplestService.java index 07e82ee931..a528a77962 100644 --- a/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/SimplestService.java +++ b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/SimplestService.java @@ -18,10 +18,10 @@ */ package org.apache.aries.blueprint.plugin.test.service; -import org.apache.aries.blueprint.annotation.service.Service; - import javax.inject.Singleton; +import org.apache.aries.blueprint.annotation.service.Service; + @Service @Singleton public class SimplestService implements Service1, Service2 { diff --git a/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationBeanProcessor.java b/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationBeanProcessor.java index 991fca7f29..376744e32b 100644 --- a/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationBeanProcessor.java +++ b/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationBeanProcessor.java @@ -18,12 +18,12 @@ */ package org.apache.aries.blueprint.authorization.impl; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.aries.blueprint.BeanProcessor; import org.apache.aries.blueprint.ComponentDefinitionRegistry; import org.apache.aries.blueprint.Processor; import org.osgi.service.blueprint.reflect.BeanMetadata; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class AuthorizationBeanProcessor implements BeanProcessor { private static final Logger LOGGER = LoggerFactory.getLogger(AuthorizationInterceptor.class); diff --git a/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationInterceptor.java b/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationInterceptor.java index fdaeca9371..9d9e5c3ae5 100644 --- a/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationInterceptor.java +++ b/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/AuthorizationInterceptor.java @@ -27,7 +27,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; - import javax.annotation.security.PermitAll; import javax.annotation.security.RolesAllowed; import javax.security.auth.Subject; diff --git a/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/SecurityAnotationParser.java b/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/SecurityAnotationParser.java index bd51f5b501..f7b7e04a97 100644 --- a/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/SecurityAnotationParser.java +++ b/blueprint/blueprint-authz/src/main/java/org/apache/aries/blueprint/authorization/impl/SecurityAnotationParser.java @@ -21,7 +21,6 @@ import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Method; - import javax.annotation.security.DenyAll; import javax.annotation.security.PermitAll; import javax.annotation.security.RolesAllowed; diff --git a/blueprint/blueprint-authz/src/test/java/org/apache/aries/blueprint/authorization/impl/SecurityAnnoationParserTest.java b/blueprint/blueprint-authz/src/test/java/org/apache/aries/blueprint/authorization/impl/SecurityAnnoationParserTest.java index a75b8c3977..23eac09126 100644 --- a/blueprint/blueprint-authz/src/test/java/org/apache/aries/blueprint/authorization/impl/SecurityAnnoationParserTest.java +++ b/blueprint/blueprint-authz/src/test/java/org/apache/aries/blueprint/authorization/impl/SecurityAnnoationParserTest.java @@ -18,8 +18,11 @@ */ package org.apache.aries.blueprint.authorization.impl; -import java.lang.annotation.Annotation; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import java.lang.annotation.Annotation; import javax.annotation.security.DenyAll; import javax.annotation.security.PermitAll; import javax.annotation.security.RolesAllowed; @@ -27,10 +30,6 @@ import org.apache.aries.blueprint.authorization.impl.test.SecuredClass; import org.junit.Test; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class SecurityAnnoationParserTest { private SecurityAnotationParser annParser; diff --git a/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java b/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java index 00d754432f..8155a3c985 100644 --- a/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java +++ b/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java @@ -19,7 +19,14 @@ package org.apache.aries.blueprint.compendium.cm; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; import org.apache.aries.blueprint.ComponentDefinitionRegistry; import org.apache.aries.blueprint.NamespaceHandler; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AggregateConverter.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AggregateConverter.java index f554eb0e67..72adebd586 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AggregateConverter.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AggregateConverter.java @@ -16,6 +16,8 @@ */ package org.apache.aries.blueprint.container; +import static org.apache.aries.blueprint.utils.ReflectionUtils.getRealCause; + import java.io.ByteArrayInputStream; import java.lang.reflect.Array; import java.lang.reflect.Constructor; @@ -52,8 +54,6 @@ import org.osgi.service.blueprint.container.Converter; import org.osgi.service.blueprint.container.ReifiedType; -import static org.apache.aries.blueprint.utils.ReflectionUtils.getRealCause; - /** * Implementation of the Converter. * diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BeanRecipe.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BeanRecipe.java index cd9ad55a07..f656b763a8 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BeanRecipe.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BeanRecipe.java @@ -18,7 +18,13 @@ */ package org.apache.aries.blueprint.container; -import java.lang.reflect.*; +import static org.apache.aries.blueprint.utils.ReflectionUtils.getRealCause; + +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -53,8 +59,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.aries.blueprint.utils.ReflectionUtils.getRealCause; - /** * A Recipe to create POJOs. * diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintDomainCombiner.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintDomainCombiner.java index 35d9ccc01e..2e59c96e13 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintDomainCombiner.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintDomainCombiner.java @@ -24,7 +24,6 @@ import java.security.ProtectionDomain; import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; public class BlueprintDomainCombiner implements DomainCombiner { private final Bundle bundle; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintEventDispatcher.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintEventDispatcher.java index d7faee9f26..262dd6b43a 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintEventDispatcher.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintEventDispatcher.java @@ -36,6 +36,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import org.apache.aries.blueprint.utils.JavaUtils; +import org.apache.aries.blueprint.utils.threading.ScheduledExecutorServiceWrapper; +import org.apache.aries.blueprint.utils.threading.ScheduledExecutorServiceWrapper.ScheduledExecutorServiceFactory; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -49,10 +52,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.aries.blueprint.utils.JavaUtils; -import org.apache.aries.blueprint.utils.threading.ScheduledExecutorServiceWrapper; -import org.apache.aries.blueprint.utils.threading.ScheduledExecutorServiceWrapper.ScheduledExecutorServiceFactory; - /** * The delivery of {@link BlueprintEvent}s is complicated. The blueprint extender and its containers use this class to * deliver {@link BlueprintEvent}s. diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintQuiesceParticipant.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintQuiesceParticipant.java index 4c64e5bb26..cf3b4405eb 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintQuiesceParticipant.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintQuiesceParticipant.java @@ -18,7 +18,6 @@ */ package org.apache.aries.blueprint.container; -import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.concurrent.ExecutorService; @@ -27,7 +26,6 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.apache.aries.blueprint.di.Recipe; @@ -35,7 +33,6 @@ import org.apache.aries.quiesce.participant.QuiesceParticipant; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; public class BlueprintQuiesceParticipant implements QuiesceParticipant { private final BundleContext ctx; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintRepository.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintRepository.java index e0c5c7aa40..2002e3ab48 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintRepository.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintRepository.java @@ -35,19 +35,19 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.apache.aries.blueprint.reflect.MetadataUtil; -import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; import org.apache.aries.blueprint.container.BeanRecipe.UnwrapperedBeanHolder; import org.apache.aries.blueprint.di.CircularDependencyException; +import org.apache.aries.blueprint.di.CollectionRecipe; import org.apache.aries.blueprint.di.ExecutionContext; import org.apache.aries.blueprint.di.IdRefRecipe; import org.apache.aries.blueprint.di.Recipe; import org.apache.aries.blueprint.di.RefRecipe; import org.apache.aries.blueprint.di.Repository; -import org.apache.aries.blueprint.di.CollectionRecipe; -import org.osgi.service.blueprint.container.ReifiedType; +import org.apache.aries.blueprint.reflect.MetadataUtil; +import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; import org.osgi.service.blueprint.container.ComponentDefinitionException; import org.osgi.service.blueprint.container.NoSuchComponentException; +import org.osgi.service.blueprint.container.ReifiedType; import org.osgi.service.blueprint.reflect.BeanMetadata; import org.osgi.service.blueprint.reflect.ComponentMetadata; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ExecutorServiceWrapper.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ExecutorServiceWrapper.java index 005d1a5ecc..7cdb934ad3 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ExecutorServiceWrapper.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ExecutorServiceWrapper.java @@ -19,10 +19,12 @@ package org.apache.aries.blueprint.container; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; -import java.util.Queue; -import java.util.concurrent.*; +import java.util.concurrent.AbstractExecutorService; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; public class ExecutorServiceWrapper extends AbstractExecutorService implements Runnable { diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/GenericType.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/GenericType.java index 2d5d36cda8..4d38a84d3d 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/GenericType.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/GenericType.java @@ -29,8 +29,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; import org.apache.aries.blueprint.di.ExecutionContext; +import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; import org.osgi.framework.Bundle; import org.osgi.service.blueprint.container.ReifiedType; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/NamespaceHandlerRegistry.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/NamespaceHandlerRegistry.java index 2ddd62a7c7..2e4625b2f7 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/NamespaceHandlerRegistry.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/NamespaceHandlerRegistry.java @@ -21,8 +21,6 @@ import java.net.URI; import java.util.Set; -import javax.xml.validation.Schema; - import org.apache.aries.blueprint.parser.NamespaceHandlerSet; import org.osgi.framework.Bundle; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/NullProxy.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/NullProxy.java index c3687dc921..6551394bd8 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/NullProxy.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/NullProxy.java @@ -18,10 +18,6 @@ */ package org.apache.aries.blueprint.container; -import org.apache.aries.blueprint.container.AggregateConverter.Convertible; -import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; -import org.osgi.service.blueprint.container.ReifiedType; - import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -29,6 +25,10 @@ import java.util.HashMap; import java.util.Map; +import org.apache.aries.blueprint.container.AggregateConverter.Convertible; +import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; +import org.osgi.service.blueprint.container.ReifiedType; + public class NullProxy implements Convertible { private static final Map, Object> returns; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java index efd7995814..5909401298 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java @@ -30,7 +30,6 @@ import org.apache.aries.blueprint.ExtendedBeanMetadata; import org.apache.aries.blueprint.ExtendedReferenceMetadata; import org.apache.aries.blueprint.ExtendedServiceReferenceMetadata; -import org.apache.aries.blueprint.utils.ServiceListener; import org.apache.aries.blueprint.PassThroughMetadata; import org.apache.aries.blueprint.di.ArrayRecipe; import org.apache.aries.blueprint.di.CollectionRecipe; @@ -46,6 +45,7 @@ import org.apache.aries.blueprint.ext.DependentComponentFactoryMetadata; import org.apache.aries.blueprint.mutable.MutableMapMetadata; import org.apache.aries.blueprint.reflect.MetadataUtil; +import org.apache.aries.blueprint.utils.ServiceListener; import org.osgi.service.blueprint.reflect.BeanArgument; import org.osgi.service.blueprint.reflect.BeanMetadata; import org.osgi.service.blueprint.reflect.BeanProperty; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ReferenceListRecipe.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ReferenceListRecipe.java index e0e34b3960..3b1b51739a 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ReferenceListRecipe.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ReferenceListRecipe.java @@ -18,21 +18,30 @@ */ package org.apache.aries.blueprint.container; -import java.util.*; +import java.util.AbstractCollection; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.RandomAccess; +import java.util.Set; import java.util.concurrent.Callable; -import org.apache.aries.blueprint.di.ValueRecipe; -import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; import org.apache.aries.blueprint.ExtendedReferenceListMetadata; -import org.apache.aries.blueprint.di.Recipe; import org.apache.aries.blueprint.di.CollectionRecipe; +import org.apache.aries.blueprint.di.Recipe; +import org.apache.aries.blueprint.di.ValueRecipe; +import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; import org.apache.aries.blueprint.utils.DynamicCollection; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.framework.ServiceReference; -import org.osgi.service.blueprint.container.ReifiedType; import org.osgi.service.blueprint.container.ComponentDefinitionException; +import org.osgi.service.blueprint.container.ReifiedType; import org.osgi.service.blueprint.container.ServiceUnavailableException; import org.osgi.service.blueprint.reflect.ReferenceListMetadata; import org.slf4j.Logger; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/AbstractRecipe.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/AbstractRecipe.java index db0abfeb05..9bc25ca111 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/AbstractRecipe.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/AbstractRecipe.java @@ -17,7 +17,6 @@ */ package org.apache.aries.blueprint.di; -import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Collections; import java.util.List; @@ -28,7 +27,6 @@ import org.apache.aries.blueprint.container.GenericType; import org.osgi.service.blueprint.container.ComponentDefinitionException; -import org.osgi.service.blueprint.container.Converter; import org.osgi.service.blueprint.container.ReifiedType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/ComponentFactoryRecipe.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/ComponentFactoryRecipe.java index 323799c787..70eaa6475b 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/ComponentFactoryRecipe.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/ComponentFactoryRecipe.java @@ -20,8 +20,8 @@ import java.util.List; -import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; import org.apache.aries.blueprint.ext.ComponentFactoryMetadata; +import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; import org.osgi.service.blueprint.container.ComponentDefinitionException; /** diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/DependentComponentFactoryRecipe.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/DependentComponentFactoryRecipe.java index 4db3b41520..082821d071 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/DependentComponentFactoryRecipe.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/DependentComponentFactoryRecipe.java @@ -21,9 +21,9 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; import org.apache.aries.blueprint.container.SatisfiableRecipe; import org.apache.aries.blueprint.ext.DependentComponentFactoryMetadata; +import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; /** * Extends ComponentFactoryRecipe to support the dependency management (SatisfiableRecipe) for custom 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 531fcda604..8b4423902d 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 @@ -18,23 +18,49 @@ */ package org.apache.aries.blueprint.ext; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.apache.aries.blueprint.ComponentDefinitionRegistry; import org.apache.aries.blueprint.ComponentDefinitionRegistryProcessor; import org.apache.aries.blueprint.ExtendedValueMetadata; import org.apache.aries.blueprint.PassThroughMetadata; -import org.apache.aries.blueprint.mutable.*; +import org.apache.aries.blueprint.mutable.MutableBeanArgument; +import org.apache.aries.blueprint.mutable.MutableBeanMetadata; +import org.apache.aries.blueprint.mutable.MutableBeanProperty; +import org.apache.aries.blueprint.mutable.MutableCollectionMetadata; +import org.apache.aries.blueprint.mutable.MutableMapEntry; +import org.apache.aries.blueprint.mutable.MutableMapMetadata; +import org.apache.aries.blueprint.mutable.MutablePropsMetadata; +import org.apache.aries.blueprint.mutable.MutableReferenceListener; +import org.apache.aries.blueprint.mutable.MutableRegistrationListener; +import org.apache.aries.blueprint.mutable.MutableServiceMetadata; +import org.apache.aries.blueprint.mutable.MutableServiceReferenceMetadata; import org.osgi.framework.Bundle; import org.osgi.service.blueprint.container.ComponentDefinitionException; -import org.osgi.service.blueprint.reflect.*; +import org.osgi.service.blueprint.reflect.BeanArgument; +import org.osgi.service.blueprint.reflect.BeanMetadata; +import org.osgi.service.blueprint.reflect.BeanProperty; +import org.osgi.service.blueprint.reflect.CollectionMetadata; +import org.osgi.service.blueprint.reflect.MapEntry; +import org.osgi.service.blueprint.reflect.MapMetadata; +import org.osgi.service.blueprint.reflect.Metadata; +import org.osgi.service.blueprint.reflect.NonNullMetadata; +import org.osgi.service.blueprint.reflect.PropsMetadata; +import org.osgi.service.blueprint.reflect.ReferenceListMetadata; +import org.osgi.service.blueprint.reflect.ReferenceListener; +import org.osgi.service.blueprint.reflect.ReferenceMetadata; +import org.osgi.service.blueprint.reflect.RegistrationListener; +import org.osgi.service.blueprint.reflect.ServiceMetadata; +import org.osgi.service.blueprint.reflect.ServiceReferenceMetadata; +import org.osgi.service.blueprint.reflect.Target; +import org.osgi.service.blueprint.reflect.ValueMetadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - /** * Abstract class for property placeholders. * diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholderExt.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholderExt.java index b11a6c6343..c44e74ac8c 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholderExt.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholderExt.java @@ -18,16 +18,6 @@ */ package org.apache.aries.blueprint.ext; -import org.apache.aries.blueprint.ComponentDefinitionRegistry; -import org.apache.aries.blueprint.PassThroughMetadata; -import org.apache.aries.blueprint.ext.evaluator.PropertyEvaluator; -import org.apache.aries.blueprint.ext.evaluator.PropertyEvaluatorExt; -import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; -import org.apache.felix.utils.properties.Properties; -import org.osgi.service.blueprint.container.ComponentDefinitionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; @@ -37,6 +27,15 @@ import java.util.Map; import java.util.Set; +import org.apache.aries.blueprint.ComponentDefinitionRegistry; +import org.apache.aries.blueprint.PassThroughMetadata; +import org.apache.aries.blueprint.ext.evaluator.PropertyEvaluatorExt; +import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; +import org.apache.felix.utils.properties.Properties; +import org.osgi.service.blueprint.container.ComponentDefinitionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Property placeholder that looks for properties in the System properties. * diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java index 5b022c7430..73502683e9 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java @@ -19,7 +19,13 @@ package org.apache.aries.blueprint.ext.impl; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import org.apache.aries.blueprint.ExtendedReferenceListMetadata; import org.apache.aries.blueprint.ExtendedReferenceMetadata; @@ -39,7 +45,18 @@ import org.apache.aries.blueprint.mutable.MutableValueMetadata; import org.osgi.framework.BundleContext; import org.osgi.service.blueprint.container.ComponentDefinitionException; -import org.osgi.service.blueprint.reflect.*; +import org.osgi.service.blueprint.reflect.BeanArgument; +import org.osgi.service.blueprint.reflect.BeanMetadata; +import org.osgi.service.blueprint.reflect.BeanProperty; +import org.osgi.service.blueprint.reflect.CollectionMetadata; +import org.osgi.service.blueprint.reflect.ComponentMetadata; +import org.osgi.service.blueprint.reflect.IdRefMetadata; +import org.osgi.service.blueprint.reflect.Metadata; +import org.osgi.service.blueprint.reflect.RefMetadata; +import org.osgi.service.blueprint.reflect.ReferenceListMetadata; +import org.osgi.service.blueprint.reflect.ReferenceMetadata; +import org.osgi.service.blueprint.reflect.ServiceReferenceMetadata; +import org.osgi.service.blueprint.reflect.ValueMetadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Attr; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java index 5ebfea24f3..bfb2d99695 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java @@ -32,15 +32,24 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import java.util.*; +import java.util.AbstractMap; +import java.util.AbstractSet; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; - -import javax.xml.namespace.QName; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import javax.xml.transform.Source; @@ -61,7 +70,6 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.ls.LSInput; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/CollaboratorFactory.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/CollaboratorFactory.java index debfb2bc06..41033ea0b3 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/CollaboratorFactory.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/CollaboratorFactory.java @@ -18,12 +18,12 @@ */ package org.apache.aries.blueprint.proxy; +import java.util.List; + import org.apache.aries.blueprint.Interceptor; import org.apache.aries.proxy.InvocationListener; import org.osgi.service.blueprint.reflect.ComponentMetadata; -import java.util.List; - public class CollaboratorFactory { public static InvocationListener create(ComponentMetadata componentMetadata, List interceptors) { if (interceptors.size() == 1) { diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/ClassUtil.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/ClassUtil.java index 6938c9fbc4..a14167e881 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/ClassUtil.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/ClassUtil.java @@ -18,8 +18,15 @@ */ package org.apache.aries.blueprint.utils.generics; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Array; +import java.lang.reflect.GenericArrayType; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.lang.reflect.WildcardType; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; /** diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/GenericsUtil.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/GenericsUtil.java index 2b3c61ceb4..5250607ed2 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/GenericsUtil.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/GenericsUtil.java @@ -19,8 +19,22 @@ package org.apache.aries.blueprint.utils.generics; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Array; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.GenericArrayType; +import java.lang.reflect.GenericDeclaration; +import java.lang.reflect.Member; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.lang.reflect.WildcardType; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * Utility classes for generic type operations. diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/OwbTypeVariableImpl.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/OwbTypeVariableImpl.java index c329d7f4a9..78d3923f3d 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/OwbTypeVariableImpl.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/OwbTypeVariableImpl.java @@ -18,7 +18,12 @@ */ package org.apache.aries.blueprint.utils.generics; -import java.lang.reflect.*; +import java.lang.reflect.GenericDeclaration; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; import java.util.Arrays; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/TypeInference.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/TypeInference.java index 6e4d3853b3..e46cb924e7 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/TypeInference.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/generics/TypeInference.java @@ -18,10 +18,27 @@ */ package org.apache.aries.blueprint.utils.generics; -import org.apache.aries.blueprint.utils.ReflectionUtils; +import java.lang.reflect.Constructor; +import java.lang.reflect.GenericArrayType; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.lang.reflect.WildcardType; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; -import java.lang.reflect.*; -import java.util.*; +import org.apache.aries.blueprint.utils.ReflectionUtils; public class TypeInference { diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/DiscardableCallable.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/DiscardableCallable.java index 45e4c00b4f..acdb07465d 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/DiscardableCallable.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/DiscardableCallable.java @@ -18,7 +18,6 @@ */ package org.apache.aries.blueprint.utils.threading.impl; -import java.util.Collections; import java.util.Queue; import java.util.concurrent.Callable; import java.util.concurrent.CancellationException; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/DiscardableRunnable.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/DiscardableRunnable.java index 3a1462c6ec..5ccd35a2c7 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/DiscardableRunnable.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/DiscardableRunnable.java @@ -18,7 +18,6 @@ */ package org.apache.aries.blueprint.utils.threading.impl; -import java.util.Collections; import java.util.Queue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicReference; diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/WrappedScheduledFuture.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/WrappedScheduledFuture.java index e5fd2ca8bf..08a3e2a54d 100644 --- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/WrappedScheduledFuture.java +++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/WrappedScheduledFuture.java @@ -20,7 +20,6 @@ import java.util.concurrent.Delayed; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java index b48040a9e2..afa7a9ac50 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java @@ -23,13 +23,12 @@ import java.util.Collections; import java.util.Map; import java.util.Set; - import javax.xml.validation.Schema; import org.apache.aries.blueprint.ext.impl.ExtNamespaceHandler; import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl; -import org.apache.aries.blueprint.parser.Parser; import org.apache.aries.blueprint.parser.NamespaceHandlerSet; +import org.apache.aries.blueprint.parser.Parser; import org.xml.sax.SAXException; public abstract class AbstractBlueprintTest { diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/BeanLoadingTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/BeanLoadingTest.java index 5cbd2be6da..5f8d7c9fd7 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/BeanLoadingTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/BeanLoadingTest.java @@ -18,14 +18,14 @@ */ package org.apache.aries.blueprint; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import org.apache.aries.blueprint.di.Repository; import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl; import org.apache.aries.blueprint.pojos.SimpleBean; import org.junit.Test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - public class BeanLoadingTest extends AbstractBlueprintTest { @Test diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ExtPlaceholderTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ExtPlaceholderTest.java index 5ee5be437b..f492d3875c 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ExtPlaceholderTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ExtPlaceholderTest.java @@ -18,16 +18,16 @@ */ package org.apache.aries.blueprint; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import org.apache.aries.blueprint.di.Repository; import org.apache.aries.blueprint.ext.impl.ExtNamespaceHandler; import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl; import org.apache.aries.blueprint.pojos.BeanD; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - public class ExtPlaceholderTest extends AbstractBlueprintTest { @Test diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NonStandardSettersTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NonStandardSettersTest.java index 731736661b..a76bbf6144 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NonStandardSettersTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NonStandardSettersTest.java @@ -18,14 +18,14 @@ */ package org.apache.aries.blueprint; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import org.apache.aries.blueprint.di.Repository; import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl; import org.apache.aries.blueprint.pojos.NonStandardSetter; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - public class NonStandardSettersTest extends AbstractBlueprintTest { @Test diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NullProxyTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NullProxyTest.java index 0902d70f13..094554e511 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NullProxyTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/NullProxyTest.java @@ -18,6 +18,10 @@ */ package org.apache.aries.blueprint; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import org.apache.aries.blueprint.container.SatisfiableRecipe; import org.apache.aries.blueprint.di.Repository; import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl; @@ -27,10 +31,6 @@ import org.apache.aries.proxy.impl.JdkProxyManager; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - public class NullProxyTest extends AbstractBlueprintTest { @Test diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ParserTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ParserTest.java index 8bf27e8223..777be63466 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ParserTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ParserTest.java @@ -18,24 +18,23 @@ */ package org.apache.aries.blueprint; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; import java.net.URI; import java.net.URL; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.io.IOException; - import javax.xml.validation.Schema; -import org.junit.Test; -import org.w3c.dom.Attr; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - import org.apache.aries.blueprint.parser.NamespaceHandlerSet; import org.apache.aries.blueprint.reflect.BeanMetadataImpl; +import org.junit.Test; import org.osgi.service.blueprint.reflect.BeanArgument; import org.osgi.service.blueprint.reflect.BeanMetadata; import org.osgi.service.blueprint.reflect.BeanProperty; @@ -45,13 +44,11 @@ import org.osgi.service.blueprint.reflect.NullMetadata; import org.osgi.service.blueprint.reflect.RefMetadata; import org.osgi.service.blueprint.reflect.ValueMetadata; +import org.w3c.dom.Attr; +import org.w3c.dom.Element; +import org.w3c.dom.Node; import org.xml.sax.SAXException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - /** * TODO: constructor injection * TODO: Dependency#setMethod diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ReferencesTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ReferencesTest.java index 77183b1e89..58ec510efa 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ReferencesTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ReferencesTest.java @@ -18,6 +18,8 @@ */ package org.apache.aries.blueprint; +import static org.junit.Assert.assertThrows; + import java.lang.reflect.InvocationHandler; import java.util.Collection; import java.util.concurrent.Callable; @@ -28,13 +30,10 @@ import org.apache.aries.proxy.ProxyManager; import org.apache.aries.proxy.UnableToProxyException; import org.apache.aries.proxy.impl.AbstractProxyManager; -import org.junit.Assert; import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.service.blueprint.container.ComponentDefinitionException; -import static org.junit.Assert.assertThrows; - public class ReferencesTest extends AbstractBlueprintTest { @Test diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/WiringTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/WiringTest.java index 225e7bd043..47d7e1d85c 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/WiringTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/WiringTest.java @@ -18,6 +18,16 @@ */ package org.apache.aries.blueprint; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + import java.math.BigInteger; import java.net.URI; import java.util.ArrayList; @@ -33,7 +43,6 @@ import java.util.Set; import java.util.TimeZone; - import org.apache.aries.blueprint.CallbackTracker.Callback; import org.apache.aries.blueprint.container.BlueprintRepository; import org.apache.aries.blueprint.container.ServiceRecipe; @@ -45,22 +54,24 @@ import org.apache.aries.blueprint.intercept.BeanB; import org.apache.aries.blueprint.intercept.TheInterceptor; import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl; -import org.apache.aries.blueprint.pojos.*; +import org.apache.aries.blueprint.pojos.AmbiguousPojo; +import org.apache.aries.blueprint.pojos.BeanD; +import org.apache.aries.blueprint.pojos.BeanF; +import org.apache.aries.blueprint.pojos.CachePojos; +import org.apache.aries.blueprint.pojos.FITestBean; +import org.apache.aries.blueprint.pojos.Multiple; +import org.apache.aries.blueprint.pojos.PojoA; +import org.apache.aries.blueprint.pojos.PojoB; +import org.apache.aries.blueprint.pojos.PojoGenerics; +import org.apache.aries.blueprint.pojos.PojoListener; +import org.apache.aries.blueprint.pojos.PojoRecursive; +import org.apache.aries.blueprint.pojos.Primavera; +import org.apache.aries.blueprint.pojos.VarArg; import org.apache.aries.blueprint.proxy.ProxyUtils; import org.junit.Test; import org.osgi.framework.ServiceRegistration; import org.osgi.service.blueprint.container.ComponentDefinitionException; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; - public class WiringTest extends AbstractBlueprintTest { @Test diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/AggregateConverterTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/AggregateConverterTest.java index 9a144edb39..59ddc15717 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/AggregateConverterTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/AggregateConverterTest.java @@ -18,6 +18,15 @@ */ package org.apache.aries.blueprint.container; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + import java.io.ByteArrayOutputStream; import java.lang.reflect.Constructor; import java.math.BigInteger; @@ -39,17 +48,8 @@ import org.apache.aries.blueprint.pojos.PojoGenerics2.Toto; import org.junit.Before; import org.junit.Test; -import org.osgi.service.blueprint.container.ReifiedType; import org.osgi.service.blueprint.container.Converter; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; +import org.osgi.service.blueprint.container.ReifiedType; public class AggregateConverterTest { diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BeanRecipeTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BeanRecipeTest.java index 690aaa226c..13421fbd41 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BeanRecipeTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/BeanRecipeTest.java @@ -18,6 +18,12 @@ */ package org.apache.aries.blueprint.container; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.lang.reflect.Method; import java.util.Arrays; import java.util.Collection; @@ -31,8 +37,6 @@ import org.junit.Test; import org.osgi.service.blueprint.container.ComponentDefinitionException; -import static org.junit.Assert.*; - public class BeanRecipeTest { static class Base { public static Object getObject() { return null; } diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/DampingPolicyTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/DampingPolicyTest.java index 2a6116e99f..eb04714476 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/DampingPolicyTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/DampingPolicyTest.java @@ -18,6 +18,8 @@ */ package org.apache.aries.blueprint.container; +import static org.junit.Assert.assertSame; + import java.util.concurrent.atomic.AtomicReference; import org.apache.aries.blueprint.ExtendedReferenceMetadata; @@ -32,8 +34,6 @@ import org.osgi.framework.ServiceEvent; import org.osgi.framework.ServiceReference; -import static org.junit.Assert.assertSame; - public class DampingPolicyTest { @Test diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/GenericTypeTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/GenericTypeTest.java index 26074197d4..b1eadc7279 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/GenericTypeTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/GenericTypeTest.java @@ -18,16 +18,16 @@ */ package org.apache.aries.blueprint.container; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.net.URI; import java.util.List; import java.util.Map; -import java.net.URI; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class GenericTypeTest { private GenericType parse(String expression) throws Exception { diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/LifecyclePolicyTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/LifecyclePolicyTest.java index 63b360ed2d..57135d2ef1 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/LifecyclePolicyTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/LifecyclePolicyTest.java @@ -18,6 +18,9 @@ */ package org.apache.aries.blueprint.container; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import java.net.URI; import java.net.URL; import java.util.ArrayList; @@ -51,9 +54,6 @@ import org.osgi.service.blueprint.container.BlueprintEvent; import org.osgi.service.blueprint.container.BlueprintListener; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - public class LifecyclePolicyTest { @Test diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/TypeInferenceTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/TypeInferenceTest.java index 37b0b7d930..5ee41cc765 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/TypeInferenceTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/container/TypeInferenceTest.java @@ -18,6 +18,14 @@ */ package org.apache.aries.blueprint.container; +import static org.junit.Assert.assertNotNull; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + import org.apache.aries.blueprint.TestBlueprintContainer; import org.apache.aries.blueprint.di.ExecutionContext; import org.apache.aries.blueprint.pojos.DummyServiceTrackerCustomizer; @@ -29,14 +37,6 @@ import org.osgi.service.blueprint.container.Converter; import org.osgi.util.tracker.ServiceTracker; -import java.lang.reflect.Constructor; -import java.lang.reflect.Type; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import static org.junit.Assert.assertNotNull; - public class TypeInferenceTest { private final Converter converter; diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterA.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterA.java index 884b352c04..287ea62425 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterA.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterA.java @@ -21,8 +21,8 @@ import java.io.File; import java.net.URI; -import org.osgi.service.blueprint.container.ReifiedType; import org.osgi.service.blueprint.container.Converter; +import org.osgi.service.blueprint.container.ReifiedType; public class ConverterA implements Converter { diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterB.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterB.java index bc2f089f63..7dfd9add9a 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterB.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterB.java @@ -20,8 +20,8 @@ import java.net.URI; -import org.osgi.service.blueprint.container.ReifiedType; import org.osgi.service.blueprint.container.Converter; +import org.osgi.service.blueprint.container.ReifiedType; public class ConverterB implements Converter { diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoGenerics2.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoGenerics2.java index 7316f7509e..00b0b1b6a5 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoGenerics2.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoGenerics2.java @@ -18,10 +18,6 @@ */ package org.apache.aries.blueprint.pojos; -import java.util.List; -import java.util.Map; -import java.util.Set; - public class PojoGenerics2 { public static class MyClass { diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/DynamicCollectionTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/DynamicCollectionTest.java index a2218d7267..dcf3183e04 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/DynamicCollectionTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/DynamicCollectionTest.java @@ -18,15 +18,15 @@ */ package org.apache.aries.blueprint.utils; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.util.Iterator; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class DynamicCollectionTest { protected static final Object O0 = new Object(); diff --git a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/HeaderParserTest.java b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/HeaderParserTest.java index d5dd02c405..fa6af5a4ff 100644 --- a/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/HeaderParserTest.java +++ b/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/HeaderParserTest.java @@ -18,13 +18,13 @@ */ package org.apache.aries.blueprint.utils; +import static org.junit.Assert.assertEquals; + import java.util.List; import org.apache.aries.blueprint.utils.HeaderParser.PathElement; import org.junit.Test; -import static org.junit.Assert.assertEquals; - public class HeaderParserTest { @Test diff --git a/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlPropertyEvaluator.java b/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlPropertyEvaluator.java index b9389f6557..f6bc2619c1 100644 --- a/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlPropertyEvaluator.java +++ b/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlPropertyEvaluator.java @@ -16,7 +16,7 @@ */ package org.apache.aries.blueprint.jexl.evaluator; -import java.util.*; +import java.util.Map; import org.apache.aries.blueprint.ext.evaluator.PropertyEvaluatorExt; import org.apache.commons.jexl2.Expression; diff --git a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/BeanRecipe.java b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/BeanRecipe.java index 226fdeed66..6c6baa9d72 100644 --- a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/BeanRecipe.java +++ b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/BeanRecipe.java @@ -42,12 +42,10 @@ import org.apache.aries.blueprint.Interceptor; import org.apache.aries.blueprint.di.AbstractRecipe; import org.apache.aries.blueprint.di.Recipe; -import org.apache.aries.blueprint.proxy.Collaborator; import org.apache.aries.blueprint.proxy.ProxyUtils; import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; import org.apache.aries.blueprint.utils.ReflectionUtils; import org.apache.aries.blueprint.utils.ReflectionUtils.PropertyDescriptor; -import org.apache.aries.proxy.UnableToProxyException; import org.osgi.service.blueprint.container.ComponentDefinitionException; import org.osgi.service.blueprint.container.ReifiedType; import org.osgi.service.blueprint.reflect.BeanMetadata; diff --git a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/GenericType.java b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/GenericType.java index 30ef4404a4..4bfbe50062 100644 --- a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/GenericType.java +++ b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/GenericType.java @@ -17,14 +17,19 @@ */ package org.apache.aries.blueprint.container; +import java.lang.reflect.Array; +import java.lang.reflect.GenericArrayType; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.lang.reflect.WildcardType; +import java.util.HashMap; +import java.util.Map; + import org.apache.aries.blueprint.di.ExecutionContext; import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; import org.osgi.service.blueprint.container.ReifiedType; -import java.lang.reflect.*; -import java.util.HashMap; -import java.util.Map; - /** * XXXX: Currently, in case of arrays getActualTypeArgument(0) returns something similar to what * Class.getComponentType() does for arrays. I don't think this is quite right since getActualTypeArgument() diff --git a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/NoOsgiBlueprintRepository.java b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/NoOsgiBlueprintRepository.java index a70ad32daf..d5bcda1c89 100644 --- a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/NoOsgiBlueprintRepository.java +++ b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/NoOsgiBlueprintRepository.java @@ -18,7 +18,6 @@ */ package org.apache.aries.blueprint.container; -import org.apache.aries.blueprint.di.CollectionRecipe; import org.apache.aries.blueprint.di.IdRefRecipe; import org.apache.aries.blueprint.di.Recipe; import org.apache.aries.blueprint.di.RefRecipe; diff --git a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/NoOsgiRecipeBuilder.java b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/NoOsgiRecipeBuilder.java index 6138d20e35..88690bf5f5 100644 --- a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/NoOsgiRecipeBuilder.java +++ b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/NoOsgiRecipeBuilder.java @@ -18,17 +18,49 @@ */ package org.apache.aries.blueprint.container; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; + import org.apache.aries.blueprint.ComponentDefinitionRegistry; import org.apache.aries.blueprint.ExtendedBeanMetadata; import org.apache.aries.blueprint.PassThroughMetadata; -import org.apache.aries.blueprint.di.*; +import org.apache.aries.blueprint.di.ArrayRecipe; +import org.apache.aries.blueprint.di.CollectionRecipe; +import org.apache.aries.blueprint.di.ComponentFactoryRecipe; +import org.apache.aries.blueprint.di.DependentComponentFactoryRecipe; +import org.apache.aries.blueprint.di.IdRefRecipe; +import org.apache.aries.blueprint.di.MapRecipe; +import org.apache.aries.blueprint.di.PassThroughRecipe; +import org.apache.aries.blueprint.di.Recipe; +import org.apache.aries.blueprint.di.RefRecipe; +import org.apache.aries.blueprint.di.ValueRecipe; import org.apache.aries.blueprint.ext.ComponentFactoryMetadata; import org.apache.aries.blueprint.ext.DependentComponentFactoryMetadata; import org.apache.aries.blueprint.reflect.MetadataUtil; import org.apache.aries.blueprint.utils.ServiceListener; -import org.osgi.service.blueprint.reflect.*; - -import java.util.*; +import org.osgi.service.blueprint.reflect.BeanArgument; +import org.osgi.service.blueprint.reflect.BeanMetadata; +import org.osgi.service.blueprint.reflect.BeanProperty; +import org.osgi.service.blueprint.reflect.CollectionMetadata; +import org.osgi.service.blueprint.reflect.ComponentMetadata; +import org.osgi.service.blueprint.reflect.IdRefMetadata; +import org.osgi.service.blueprint.reflect.MapEntry; +import org.osgi.service.blueprint.reflect.MapMetadata; +import org.osgi.service.blueprint.reflect.Metadata; +import org.osgi.service.blueprint.reflect.NullMetadata; +import org.osgi.service.blueprint.reflect.PropsMetadata; +import org.osgi.service.blueprint.reflect.RefMetadata; +import org.osgi.service.blueprint.reflect.ReferenceListMetadata; +import org.osgi.service.blueprint.reflect.ReferenceListener; +import org.osgi.service.blueprint.reflect.ReferenceMetadata; +import org.osgi.service.blueprint.reflect.RegistrationListener; +import org.osgi.service.blueprint.reflect.ServiceMetadata; +import org.osgi.service.blueprint.reflect.ValueMetadata; public class NoOsgiRecipeBuilder { diff --git a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/SimpleNamespaceHandlerSet.java b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/SimpleNamespaceHandlerSet.java index e4854444af..b29cc133b1 100644 --- a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/SimpleNamespaceHandlerSet.java +++ b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/container/SimpleNamespaceHandlerSet.java @@ -29,7 +29,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import javax.xml.XMLConstants; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; 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 e0096d9138..546b73a5d1 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 @@ -27,7 +27,6 @@ import org.apache.aries.blueprint.ComponentDefinitionRegistry; import org.apache.aries.blueprint.ComponentDefinitionRegistryProcessor; import org.apache.aries.blueprint.ExtendedValueMetadata; -import org.apache.aries.blueprint.PassThroughMetadata; import org.apache.aries.blueprint.mutable.MutableBeanArgument; import org.apache.aries.blueprint.mutable.MutableBeanMetadata; import org.apache.aries.blueprint.mutable.MutableBeanProperty; diff --git a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java index ec06178267..8b71f0982a 100644 --- a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java +++ b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java @@ -26,7 +26,6 @@ import java.util.Map; import java.util.Set; -import org.apache.aries.blueprint.ext.evaluator.PropertyEvaluator; import org.apache.aries.blueprint.ext.evaluator.PropertyEvaluatorExt; import org.apache.felix.utils.properties.Properties; import org.slf4j.Logger; diff --git a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java index b21270c4b5..1e4ffcd70d 100644 --- a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java +++ b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java @@ -19,9 +19,19 @@ package org.apache.aries.blueprint.ext.impl; import java.net.URL; -import java.util.*; - -import org.apache.aries.blueprint.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + +import org.apache.aries.blueprint.ComponentDefinitionRegistry; +import org.apache.aries.blueprint.ExtendedBeanMetadata; +import org.apache.aries.blueprint.ExtendedReferenceListMetadata; +import org.apache.aries.blueprint.ExtendedReferenceMetadata; +import org.apache.aries.blueprint.ParserContext; import org.apache.aries.blueprint.container.NullProxy; import org.apache.aries.blueprint.ext.AbstractPropertyPlaceholder; import org.apache.aries.blueprint.ext.PropertyPlaceholder; @@ -35,7 +45,19 @@ import org.apache.aries.blueprint.mutable.MutableServiceReferenceMetadata; import org.apache.aries.blueprint.mutable.MutableValueMetadata; import org.osgi.service.blueprint.container.ComponentDefinitionException; -import org.osgi.service.blueprint.reflect.*; +import org.osgi.service.blueprint.reflect.BeanArgument; +import org.osgi.service.blueprint.reflect.BeanMetadata; +import org.osgi.service.blueprint.reflect.BeanProperty; +import org.osgi.service.blueprint.reflect.CollectionMetadata; +import org.osgi.service.blueprint.reflect.ComponentMetadata; +import org.osgi.service.blueprint.reflect.IdRefMetadata; +import org.osgi.service.blueprint.reflect.MapEntry; +import org.osgi.service.blueprint.reflect.Metadata; +import org.osgi.service.blueprint.reflect.RefMetadata; +import org.osgi.service.blueprint.reflect.ReferenceListMetadata; +import org.osgi.service.blueprint.reflect.ReferenceMetadata; +import org.osgi.service.blueprint.reflect.ServiceReferenceMetadata; +import org.osgi.service.blueprint.reflect.ValueMetadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Attr; diff --git a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/services/ExtendedBlueprintContainer.java b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/services/ExtendedBlueprintContainer.java index d490c71b50..ec577a9be3 100644 --- a/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/services/ExtendedBlueprintContainer.java +++ b/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/services/ExtendedBlueprintContainer.java @@ -18,15 +18,15 @@ */ package org.apache.aries.blueprint.services; +import java.net.URL; +import java.security.AccessControlContext; +import java.util.List; + import org.apache.aries.blueprint.ComponentDefinitionRegistry; import org.apache.aries.blueprint.Processor; import org.osgi.service.blueprint.container.BlueprintContainer; import org.osgi.service.blueprint.container.Converter; -import java.net.URL; -import java.security.AccessControlContext; -import java.util.List; - public interface ExtendedBlueprintContainer extends BlueprintContainer { Converter getConverter(); diff --git a/blueprint/blueprint-noosgi/src/test/java/org/apache/aries/blueprint/BlueprintContainerTest.java b/blueprint/blueprint-noosgi/src/test/java/org/apache/aries/blueprint/BlueprintContainerTest.java index 3e41c6d765..a16b2c883a 100644 --- a/blueprint/blueprint-noosgi/src/test/java/org/apache/aries/blueprint/BlueprintContainerTest.java +++ b/blueprint/blueprint-noosgi/src/test/java/org/apache/aries/blueprint/BlueprintContainerTest.java @@ -18,14 +18,15 @@ */ package org.apache.aries.blueprint; -import org.apache.aries.blueprint.container.BlueprintContainerImpl; -import org.apache.aries.blueprint.sample.Foo; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.net.URL; import java.util.Arrays; -import static org.junit.Assert.*; +import org.apache.aries.blueprint.container.BlueprintContainerImpl; +import org.apache.aries.blueprint.sample.Foo; +import org.junit.Test; public class BlueprintContainerTest { diff --git a/blueprint/blueprint-noosgi/src/test/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java b/blueprint/blueprint-noosgi/src/test/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java index 986787a895..34fd3329fe 100644 --- a/blueprint/blueprint-noosgi/src/test/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java +++ b/blueprint/blueprint-noosgi/src/test/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java @@ -16,11 +16,11 @@ */ package org.apache.aries.blueprint.sample; +import java.util.Currency; + import org.osgi.service.blueprint.container.Converter; import org.osgi.service.blueprint.container.ReifiedType; -import java.util.Currency; - public class CurrencyTypeConverter implements Converter { public boolean canConvert(Object fromValue, ReifiedType toType) { diff --git a/blueprint/blueprint-noosgi/src/test/java/org/apache/aries/blueprint/sample/DateTypeConverter.java b/blueprint/blueprint-noosgi/src/test/java/org/apache/aries/blueprint/sample/DateTypeConverter.java index 11e90147f6..eaca215e4c 100644 --- a/blueprint/blueprint-noosgi/src/test/java/org/apache/aries/blueprint/sample/DateTypeConverter.java +++ b/blueprint/blueprint-noosgi/src/test/java/org/apache/aries/blueprint/sample/DateTypeConverter.java @@ -16,13 +16,13 @@ */ package org.apache.aries.blueprint.sample; -import org.osgi.service.blueprint.container.Converter; -import org.osgi.service.blueprint.container.ReifiedType; - import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import org.osgi.service.blueprint.container.Converter; +import org.osgi.service.blueprint.container.ReifiedType; + public class DateTypeConverter implements Converter { DateFormat dateFormat; diff --git a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/NamespaceHandler.java b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/NamespaceHandler.java index 3fe82f4e5b..c20ac76420 100644 --- a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/NamespaceHandler.java +++ b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/NamespaceHandler.java @@ -19,11 +19,10 @@ import java.net.URL; import java.util.Set; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; +import org.w3c.dom.Element; +import org.w3c.dom.Node; /** * A processor for custom blueprint extensions diff --git a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableServiceReferenceMetadata.java b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableServiceReferenceMetadata.java index 5df26b1e64..8c2dc2f636 100644 --- a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableServiceReferenceMetadata.java +++ b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableServiceReferenceMetadata.java @@ -19,9 +19,9 @@ package org.apache.aries.blueprint.mutable; import org.apache.aries.blueprint.ExtendedServiceReferenceMetadata; +import org.osgi.framework.BundleContext; import org.osgi.service.blueprint.reflect.ReferenceListener; import org.osgi.service.blueprint.reflect.Target; -import org.osgi.framework.BundleContext; import org.osgi.service.blueprint.reflect.ValueMetadata; /** diff --git a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableValueMetadata.java b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableValueMetadata.java index 8e893018f8..85ee800ef2 100644 --- a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableValueMetadata.java +++ b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableValueMetadata.java @@ -19,7 +19,6 @@ package org.apache.aries.blueprint.mutable; import org.apache.aries.blueprint.ExtendedValueMetadata; -import org.osgi.service.blueprint.reflect.ValueMetadata; /** * A mutable version of the ValueMetadata that allows modifications. diff --git a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/NamespaceHandlerSet.java b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/NamespaceHandlerSet.java index f0fa88d918..07c982e431 100644 --- a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/NamespaceHandlerSet.java +++ b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/NamespaceHandlerSet.java @@ -22,7 +22,6 @@ import java.net.URI; import java.util.Map; import java.util.Set; - import javax.xml.validation.Schema; import org.apache.aries.blueprint.NamespaceHandler; diff --git a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/Parser.java b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/Parser.java index 3afcf5030e..aed27a1054 100644 --- a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/Parser.java +++ b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/Parser.java @@ -18,14 +18,6 @@ */ package org.apache.aries.blueprint.parser; -import javax.xml.XMLConstants; -import javax.xml.namespace.QName; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.dom.DOMSource; -import javax.xml.validation.Schema; -import javax.xml.validation.Validator; import java.io.InputStream; import java.net.URI; import java.net.URL; @@ -39,6 +31,14 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.xml.XMLConstants; +import javax.xml.namespace.QName; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.dom.DOMSource; +import javax.xml.validation.Schema; +import javax.xml.validation.Validator; import org.apache.aries.blueprint.ComponentDefinitionRegistry; import org.apache.aries.blueprint.NamespaceHandler; diff --git a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/reflect/BeanMetadataImpl.java b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/reflect/BeanMetadataImpl.java index 225e5e16a1..60f7cf0a95 100644 --- a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/reflect/BeanMetadataImpl.java +++ b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/reflect/BeanMetadataImpl.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; - import javax.xml.namespace.QName; import org.apache.aries.blueprint.ExtendedBeanMetadata; diff --git a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/reflect/MetadataUtil.java b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/reflect/MetadataUtil.java index 2e2b473fdb..e370d7bc1d 100644 --- a/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/reflect/MetadataUtil.java +++ b/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/reflect/MetadataUtil.java @@ -33,8 +33,8 @@ import org.osgi.service.blueprint.reflect.Metadata; import org.osgi.service.blueprint.reflect.NullMetadata; import org.osgi.service.blueprint.reflect.PropsMetadata; -import org.osgi.service.blueprint.reflect.ReferenceListMetadata; import org.osgi.service.blueprint.reflect.RefMetadata; +import org.osgi.service.blueprint.reflect.ReferenceListMetadata; import org.osgi.service.blueprint.reflect.ReferenceMetadata; import org.osgi.service.blueprint.reflect.ServiceMetadata; import org.osgi.service.blueprint.reflect.Target; diff --git a/blueprint/blueprint-spring-camel/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java b/blueprint/blueprint-spring-camel/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java index 157154abf4..cb0238429f 100644 --- a/blueprint/blueprint-spring-camel/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java +++ b/blueprint/blueprint-spring-camel/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java @@ -16,6 +16,10 @@ */ package org.apache.camel.osgi; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; + import org.apache.camel.core.osgi.OsgiCamelContextPublisher; import org.apache.camel.core.osgi.OsgiEventAdminNotifier; import org.apache.camel.spring.SpringCamelContext; @@ -23,10 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; - @XmlRootElement(name = "camelContext") @XmlAccessorType(XmlAccessType.FIELD) public class CamelContextFactoryBean extends org.apache.camel.spring.CamelContextFactoryBean { diff --git a/blueprint/blueprint-spring-extender/src/main/java/org/apache/aries/blueprint/spring/extender/SpringOsgiExtension.java b/blueprint/blueprint-spring-extender/src/main/java/org/apache/aries/blueprint/spring/extender/SpringOsgiExtension.java index 83fab5e128..d21462d945 100644 --- a/blueprint/blueprint-spring-extender/src/main/java/org/apache/aries/blueprint/spring/extender/SpringOsgiExtension.java +++ b/blueprint/blueprint-spring-extender/src/main/java/org/apache/aries/blueprint/spring/extender/SpringOsgiExtension.java @@ -16,8 +16,6 @@ */ package org.apache.aries.blueprint.spring.extender; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; @@ -30,6 +28,8 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; import org.apache.aries.blueprint.services.BlueprintExtenderService; import org.apache.felix.utils.extender.Extension; diff --git a/blueprint/blueprint-spring-extender/src/main/java/org/apache/aries/blueprint/spring/extender/SpringXsdVersionResolver.java b/blueprint/blueprint-spring-extender/src/main/java/org/apache/aries/blueprint/spring/extender/SpringXsdVersionResolver.java index e9ebc57ff0..badee1e845 100644 --- a/blueprint/blueprint-spring-extender/src/main/java/org/apache/aries/blueprint/spring/extender/SpringXsdVersionResolver.java +++ b/blueprint/blueprint-spring-extender/src/main/java/org/apache/aries/blueprint/spring/extender/SpringXsdVersionResolver.java @@ -18,6 +18,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.SpringVersion; diff --git a/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/BlueprintNamespaceHandler.java b/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/BlueprintNamespaceHandler.java index 2547c5307c..c27d33051b 100644 --- a/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/BlueprintNamespaceHandler.java +++ b/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/BlueprintNamespaceHandler.java @@ -31,8 +31,6 @@ import org.apache.aries.blueprint.mutable.MutableBeanMetadata; import org.apache.aries.blueprint.mutable.MutablePassThroughMetadata; import org.apache.aries.blueprint.mutable.MutableRefMetadata; -import org.apache.aries.blueprint.parser.Parser; -import org.apache.aries.blueprint.parser.ParserContextImpl; import org.apache.aries.blueprint.services.ExtendedBlueprintContainer; import org.osgi.framework.Bundle; import org.osgi.service.blueprint.reflect.BeanMetadata; @@ -59,7 +57,6 @@ import org.w3c.dom.Node; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; -import org.xml.sax.SAXException; /** * Blueprint NamespaceHandler wrapper for a spring NamespaceHandler diff --git a/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/SpringBeanProcessor.java b/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/SpringBeanProcessor.java index adf93bf2fc..4ff8f8977c 100644 --- a/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/SpringBeanProcessor.java +++ b/blueprint/blueprint-spring/src/main/java/org/apache/aries/blueprint/spring/SpringBeanProcessor.java @@ -32,8 +32,6 @@ import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.BeanNameAware; -import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor; public class SpringBeanProcessor implements BeanProcessor, ComponentDefinitionRegistryProcessor { diff --git a/blueprint/blueprint-web-osgi/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java b/blueprint/blueprint-web-osgi/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java index 7c5f5c2eb2..efcb001857 100644 --- a/blueprint/blueprint-web-osgi/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java +++ b/blueprint/blueprint-web-osgi/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java @@ -20,7 +20,6 @@ import java.net.URL; import java.util.LinkedList; import java.util.List; - import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java b/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java index 873e1d30e0..f505f5050b 100644 --- a/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java +++ b/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java @@ -31,7 +31,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; - import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/blueprint/examples/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/AccountsServlet.java b/blueprint/examples/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/AccountsServlet.java index 9eba74b191..2682f91ced 100644 --- a/blueprint/examples/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/AccountsServlet.java +++ b/blueprint/examples/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/AccountsServlet.java @@ -16,15 +16,15 @@ */ package org.apache.aries.blueprint.sample; -import org.apache.aries.blueprint.web.BlueprintContextListener; -import org.osgi.service.blueprint.container.BlueprintContainer; - +import java.io.IOException; +import java.util.List; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.List; + +import org.apache.aries.blueprint.web.BlueprintContextListener; +import org.osgi.service.blueprint.container.BlueprintContainer; public class AccountsServlet extends HttpServlet { diff --git a/blueprint/examples/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java b/blueprint/examples/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java index 986787a895..34fd3329fe 100644 --- a/blueprint/examples/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java +++ b/blueprint/examples/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java @@ -16,11 +16,11 @@ */ package org.apache.aries.blueprint.sample; +import java.util.Currency; + import org.osgi.service.blueprint.container.Converter; import org.osgi.service.blueprint.container.ReifiedType; -import java.util.Currency; - public class CurrencyTypeConverter implements Converter { public boolean canConvert(Object fromValue, ReifiedType toType) { diff --git a/blueprint/examples/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/DateTypeConverter.java b/blueprint/examples/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/DateTypeConverter.java index 11e90147f6..eaca215e4c 100644 --- a/blueprint/examples/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/DateTypeConverter.java +++ b/blueprint/examples/blueprint-sample-war/src/main/java/org/apache/aries/blueprint/sample/DateTypeConverter.java @@ -16,13 +16,13 @@ */ package org.apache.aries.blueprint.sample; -import org.osgi.service.blueprint.container.Converter; -import org.osgi.service.blueprint.container.ReifiedType; - import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import org.osgi.service.blueprint.container.Converter; +import org.osgi.service.blueprint.container.ReifiedType; + public class DateTypeConverter implements Converter { DateFormat dateFormat; diff --git a/blueprint/examples/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/BindingListener.java b/blueprint/examples/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/BindingListener.java index 1744a4521d..29b4ffc02e 100644 --- a/blueprint/examples/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/BindingListener.java +++ b/blueprint/examples/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/BindingListener.java @@ -16,9 +16,8 @@ */ package org.apache.aries.blueprint.sample; -import java.util.Map; import java.util.List; -import java.io.Serializable; +import java.util.Map; import org.osgi.framework.ServiceReference; diff --git a/blueprint/examples/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/DodgyListener.java b/blueprint/examples/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/DodgyListener.java index 03aa59bee9..769df1cd82 100644 --- a/blueprint/examples/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/DodgyListener.java +++ b/blueprint/examples/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/DodgyListener.java @@ -16,8 +16,8 @@ */ package org.apache.aries.blueprint.sample; -import java.util.Set; import java.util.Map; +import java.util.Set; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java index 38d423dedd..c27178b147 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java @@ -18,6 +18,13 @@ */ package org.apache.aries.blueprint.itests; +import static org.junit.Assert.assertNotNull; +import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.junitBundles; + +import java.io.InputStream; +import java.util.Hashtable; + import org.apache.aries.itest.AbstractIntegrationTest; import org.apache.aries.itest.RichBundleContext; import org.junit.runner.RunWith; @@ -34,15 +41,6 @@ import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; -import java.io.InputStream; -import java.util.Hashtable; - -import static org.apache.aries.blueprint.itests.Helper.mvnBundle; -import static org.junit.Assert.assertNotNull; -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.junitBundles; -import static org.ops4j.pax.exam.CoreOptions.systemProperty; - /** * Base class for Pax Exam 1.2.x based unit tests Contains the injection point and various utilities used in * most tests diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportAndIncludeXSDsTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportAndIncludeXSDsTest.java index 19a4a6a288..a789efb966 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportAndIncludeXSDsTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportAndIncludeXSDsTest.java @@ -18,6 +18,12 @@ */ package org.apache.aries.blueprint.itests; +import static org.apache.aries.blueprint.itests.Helper.blueprintBundles; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.ops4j.pax.exam.CoreOptions.keepCaches; +import static org.ops4j.pax.exam.CoreOptions.streamBundle; + import java.io.InputStream; import java.net.URL; import java.util.concurrent.atomic.AtomicBoolean; @@ -34,11 +40,6 @@ import org.osgi.service.blueprint.container.BlueprintEvent; import org.osgi.service.blueprint.container.BlueprintListener; -import static org.apache.aries.blueprint.itests.Helper.blueprintBundles; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.ops4j.pax.exam.CoreOptions.*; - public class ParserServiceImportAndIncludeXSDsTest extends AbstractBlueprintIntegrationTest { private static final String NS_HANDLER_BUNDLE = "org.apache.aries.blueprint.aries1682"; diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportCmAndIncorrectNamespaceHandlersTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportCmAndIncorrectNamespaceHandlersTest.java index 3c3747aac9..dd93df9c4b 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportCmAndIncorrectNamespaceHandlersTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportCmAndIncorrectNamespaceHandlersTest.java @@ -18,6 +18,13 @@ */ package org.apache.aries.blueprint.itests; +import static org.apache.aries.blueprint.itests.Helper.blueprintBundles; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.ops4j.pax.exam.CoreOptions.keepCaches; +import static org.ops4j.pax.exam.CoreOptions.streamBundle; + import java.io.InputStream; import java.net.URL; import java.util.concurrent.CountDownLatch; @@ -35,12 +42,6 @@ import org.osgi.service.blueprint.container.BlueprintEvent; import org.osgi.service.blueprint.container.BlueprintListener; -import static org.apache.aries.blueprint.itests.Helper.blueprintBundles; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.ops4j.pax.exam.CoreOptions.*; - public class ParserServiceImportCmAndIncorrectNamespaceHandlersTest extends AbstractBlueprintIntegrationTest { private static final String NS_HANDLER_BUNDLE = "org.apache.aries.blueprint.incorrect"; diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportXSDsBetweenNamespaceHandlersTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportXSDsBetweenNamespaceHandlersTest.java index 44d25a7945..8e1fee5662 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportXSDsBetweenNamespaceHandlersTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ParserServiceImportXSDsBetweenNamespaceHandlersTest.java @@ -22,7 +22,6 @@ import static org.junit.Assert.assertNotNull; import static org.ops4j.pax.exam.CoreOptions.keepCaches; import static org.ops4j.pax.exam.CoreOptions.streamBundle; -import static org.ops4j.pax.exam.CoreOptions.systemProperty; import java.io.InputStream; import java.net.URL; diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java index f2589fc82b..ca437e9ccc 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java @@ -21,9 +21,9 @@ import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Arrays; import org.apache.aries.blueprint.testquiescebundle.TestBean; import org.apache.aries.quiesce.manager.QuiesceCallback; diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringExtenderTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringExtenderTest.java index 0a58d7c6cc..f10f48f264 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringExtenderTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringExtenderTest.java @@ -18,17 +18,17 @@ */ package org.apache.aries.blueprint.itests; +import static org.apache.aries.blueprint.itests.Helper.mvnBundle; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + import org.apache.aries.blueprint.testbundlee.BeanCItf; import org.junit.Test; import org.ops4j.pax.exam.Option; import org.osgi.framework.Bundle; import org.osgi.service.blueprint.container.BlueprintContainer; -import static org.apache.aries.blueprint.itests.Helper.mvnBundle; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - public class SpringExtenderTest extends AbstractBlueprintIntegrationTest { @Test diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringTest.java index 14dfe6face..6ed5d6e200 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/SpringTest.java @@ -18,9 +18,14 @@ */ package org.apache.aries.blueprint.itests; +import static org.apache.aries.blueprint.itests.Helper.mvnBundle; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; + import java.util.List; -import org.apache.aries.blueprint.testbundles.BeanC; import org.apache.aries.blueprint.testbundles.BeanCItf; import org.junit.Test; import org.ops4j.pax.exam.Option; @@ -28,12 +33,6 @@ import org.osgi.service.blueprint.container.BlueprintContainer; import org.springframework.beans.factory.NoSuchBeanDefinitionException; -import static org.apache.aries.blueprint.itests.Helper.mvnBundle; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; - public class SpringTest extends AbstractBlueprintIntegrationTest { @Test diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java index d58257646f..c8a290a9f8 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java @@ -18,9 +18,13 @@ */ package org.apache.aries.blueprint.itests; +import static org.apache.aries.blueprint.itests.Helper.mvnBundle; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.ops4j.pax.exam.CoreOptions.junitBundles; + import java.util.Currency; import java.util.Hashtable; - import javax.inject.Inject; import org.apache.aries.blueprint.sample.Foo; @@ -37,11 +41,6 @@ import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; -import static org.apache.aries.blueprint.itests.Helper.mvnBundle; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.ops4j.pax.exam.CoreOptions.junitBundles; - @RunWith(PaxExam.class) @ExamReactorStrategy(PerMethod.class) public class TestConfigAdmin extends AbstractBlueprintIntegrationTest { diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/AuthorizationTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/AuthorizationTest.java index 0bca8d792a..b2d99b1ed0 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/AuthorizationTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/AuthorizationTest.java @@ -25,16 +25,13 @@ import java.io.InputStream; import java.security.AccessControlException; import java.security.PrivilegedAction; - import javax.inject.Inject; import javax.security.auth.login.LoginException; import org.apache.aries.blueprint.itests.AbstractBlueprintIntegrationTest; import org.apache.aries.blueprint.itests.Helper; import org.apache.aries.blueprint.itests.authz.helper.JAASHelper; -import org.apache.aries.blueprint.itests.authz.testbundle. - - SecuredService; +import org.apache.aries.blueprint.itests.authz.testbundle.SecuredService; import org.apache.aries.blueprint.itests.authz.testbundle.impl.SecuredServiceImpl; import org.junit.Test; import org.ops4j.pax.exam.CoreOptions; diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/helper/JAASHelper.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/helper/JAASHelper.java index 97ec58d514..b250b1fa30 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/helper/JAASHelper.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/helper/JAASHelper.java @@ -21,7 +21,6 @@ import java.security.PrivilegedAction; import java.util.HashMap; import java.util.Map; - import javax.security.auth.Subject; import javax.security.auth.login.AppConfigurationEntry; import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/helper/SimpleLoginModule.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/helper/SimpleLoginModule.java index a63807ee2b..6e6519a2da 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/helper/SimpleLoginModule.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/helper/SimpleLoginModule.java @@ -19,7 +19,6 @@ package org.apache.aries.blueprint.itests.authz.helper; import java.util.Map; - import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/CmPropertiesTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/CmPropertiesTest.java index 30842ab51a..f8fd90ac15 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/CmPropertiesTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/CmPropertiesTest.java @@ -18,6 +18,14 @@ */ package org.apache.aries.blueprint.itests.cm; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.ops4j.pax.exam.CoreOptions.keepCaches; +import static org.ops4j.pax.exam.CoreOptions.streamBundle; + import java.io.InputStream; import java.util.Hashtable; import javax.inject.Inject; @@ -38,10 +46,6 @@ import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; -import static org.junit.Assert.*; -import static org.ops4j.pax.exam.CoreOptions.keepCaches; -import static org.ops4j.pax.exam.CoreOptions.streamBundle; - public class CmPropertiesTest extends AbstractBlueprintIntegrationTest { private static final String TEST_BUNDLE = "org.apache.aries.blueprint.cm.test.b1"; diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/CmPropertyPlaceholderTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/CmPropertyPlaceholderTest.java index 01cfee3ff8..1898f6ca94 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/CmPropertyPlaceholderTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/CmPropertyPlaceholderTest.java @@ -18,6 +18,13 @@ */ package org.apache.aries.blueprint.itests.cm; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.ops4j.pax.exam.CoreOptions.keepCaches; +import static org.ops4j.pax.exam.CoreOptions.streamBundle; + import java.io.InputStream; import java.util.Hashtable; import javax.inject.Inject; @@ -38,13 +45,6 @@ import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.*; -import static org.ops4j.pax.exam.CoreOptions.keepCaches; -import static org.ops4j.pax.exam.CoreOptions.streamBundle; - public class CmPropertyPlaceholderTest extends AbstractBlueprintIntegrationTest { private static final String TEST_BUNDLE = "org.apache.aries.blueprint.cm.test.b1"; diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryTest.java index 0b531d0770..e89f15ba18 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/ManagedServiceFactoryTest.java @@ -26,7 +26,6 @@ import java.io.InputStream; import java.util.Hashtable; - import javax.inject.Inject; import org.apache.aries.blueprint.itests.AbstractBlueprintIntegrationTest; diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/handler/IncorrectNamespaceHandler.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/handler/IncorrectNamespaceHandler.java index e80ec7fa50..78273095f4 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/handler/IncorrectNamespaceHandler.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/cm/handler/IncorrectNamespaceHandler.java @@ -28,8 +28,6 @@ import org.apache.aries.blueprint.ParserContext; import org.apache.aries.blueprint.PassThroughMetadata; import org.apache.aries.blueprint.mutable.MutableBeanMetadata; -import org.osgi.framework.Bundle; -import org.osgi.framework.FrameworkUtil; import org.osgi.service.blueprint.reflect.BeanMetadata; import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; diff --git a/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerFive.java b/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerFive.java index 764961abab..d4c9238c24 100644 --- a/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerFive.java +++ b/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerFive.java @@ -18,20 +18,13 @@ import java.net.URL; import java.util.Collections; -import java.util.List; import java.util.Set; import org.apache.aries.blueprint.NamespaceHandler; import org.apache.aries.blueprint.ParserContext; -import org.apache.aries.blueprint.PassThroughMetadata; import org.apache.aries.blueprint.mutable.MutableBeanMetadata; -import org.apache.aries.blueprint.mutable.MutableRefMetadata; -import org.osgi.service.blueprint.reflect.BeanMetadata; import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; -import org.osgi.service.blueprint.reflect.RefMetadata; - -import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerFour.java b/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerFour.java index ec6e7620d7..3e53207920 100644 --- a/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerFour.java +++ b/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerFour.java @@ -18,20 +18,13 @@ import java.net.URL; import java.util.Collections; -import java.util.List; import java.util.Set; import org.apache.aries.blueprint.NamespaceHandler; import org.apache.aries.blueprint.ParserContext; -import org.apache.aries.blueprint.PassThroughMetadata; import org.apache.aries.blueprint.mutable.MutableBeanMetadata; -import org.apache.aries.blueprint.mutable.MutableRefMetadata; -import org.osgi.service.blueprint.reflect.BeanMetadata; import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; -import org.osgi.service.blueprint.reflect.RefMetadata; - -import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerSeven.java b/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerSeven.java index 4c3049c641..1520ba1746 100644 --- a/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerSeven.java +++ b/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerSeven.java @@ -18,20 +18,13 @@ import java.net.URL; import java.util.Collections; -import java.util.List; import java.util.Set; import org.apache.aries.blueprint.NamespaceHandler; import org.apache.aries.blueprint.ParserContext; -import org.apache.aries.blueprint.PassThroughMetadata; import org.apache.aries.blueprint.mutable.MutableBeanMetadata; -import org.apache.aries.blueprint.mutable.MutableRefMetadata; -import org.osgi.service.blueprint.reflect.BeanMetadata; import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; -import org.osgi.service.blueprint.reflect.RefMetadata; - -import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerSix.java b/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerSix.java index 00ac9593f7..664f334e06 100644 --- a/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerSix.java +++ b/blueprint/itests/blueprint-testbundlea/src/main/java/org/apache/aries/blueprint/testbundlea/NSHandlerSix.java @@ -18,20 +18,13 @@ import java.net.URL; import java.util.Collections; -import java.util.List; import java.util.Set; import org.apache.aries.blueprint.NamespaceHandler; import org.apache.aries.blueprint.ParserContext; -import org.apache.aries.blueprint.PassThroughMetadata; import org.apache.aries.blueprint.mutable.MutableBeanMetadata; -import org.apache.aries.blueprint.mutable.MutableRefMetadata; -import org.osgi.service.blueprint.reflect.BeanMetadata; import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.Metadata; -import org.osgi.service.blueprint.reflect.RefMetadata; - -import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/esa-ant-task/src/test/java/org/apache/aries/ant/taskdefs/EsaTaskTest.java b/esa-ant-task/src/test/java/org/apache/aries/ant/taskdefs/EsaTaskTest.java index a4e7c4464d..b9284ace90 100755 --- a/esa-ant-task/src/test/java/org/apache/aries/ant/taskdefs/EsaTaskTest.java +++ b/esa-ant-task/src/test/java/org/apache/aries/ant/taskdefs/EsaTaskTest.java @@ -19,19 +19,19 @@ package org.apache.aries.ant.taskdefs; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.FileSet; -import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.types.FileSet; +import org.junit.Test; /** * @version $Id: $ diff --git a/esa-maven-plugin/src/main/java/org/apache/aries/plugin/esa/ContentInfo.java b/esa-maven-plugin/src/main/java/org/apache/aries/plugin/esa/ContentInfo.java index 1ca2048517..76d9892f84 100644 --- a/esa-maven-plugin/src/main/java/org/apache/aries/plugin/esa/ContentInfo.java +++ b/esa-maven-plugin/src/main/java/org/apache/aries/plugin/esa/ContentInfo.java @@ -27,14 +27,14 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import aQute.bnd.osgi.Analyzer; - import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.plugin.logging.Log; import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter; import org.apache.maven.shared.osgi.Maven2OsgiConverter; +import aQute.bnd.osgi.Analyzer; + public class ContentInfo { /** diff --git a/esa-maven-plugin/src/main/java/org/apache/aries/plugin/esa/EsaMojo.java b/esa-maven-plugin/src/main/java/org/apache/aries/plugin/esa/EsaMojo.java index 7d39e8074a..a2faef7e53 100644 --- a/esa-maven-plugin/src/main/java/org/apache/aries/plugin/esa/EsaMojo.java +++ b/esa-maven-plugin/src/main/java/org/apache/aries/plugin/esa/EsaMojo.java @@ -30,7 +30,6 @@ import java.util.Map; import java.util.Set; -import aQute.bnd.osgi.Analyzer; import org.apache.aries.util.manifest.BundleManifest; import org.apache.maven.archiver.PomPropertiesUtil; import org.apache.maven.artifact.Artifact; @@ -42,6 +41,8 @@ import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.FileUtils; +import aQute.bnd.osgi.Analyzer; + /** * Builds OSGi Enterprise Subsystem Archive (esa) files. * diff --git a/jmx/jmx-api/src/main/java/org/osgi/jmx/Item.java b/jmx/jmx-api/src/main/java/org/osgi/jmx/Item.java index 5dd17899f3..ff4dab5429 100644 --- a/jmx/jmx-api/src/main/java/org/osgi/jmx/Item.java +++ b/jmx/jmx-api/src/main/java/org/osgi/jmx/Item.java @@ -19,7 +19,6 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.Set; - import javax.management.openmbean.ArrayType; import javax.management.openmbean.CompositeType; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-api/src/main/java/org/osgi/jmx/JmxConstants.java b/jmx/jmx-api/src/main/java/org/osgi/jmx/JmxConstants.java index 512dd5105d..c0fca75458 100644 --- a/jmx/jmx-api/src/main/java/org/osgi/jmx/JmxConstants.java +++ b/jmx/jmx-api/src/main/java/org/osgi/jmx/JmxConstants.java @@ -19,7 +19,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; - import javax.management.openmbean.ArrayType; import javax.management.openmbean.CompositeType; import javax.management.openmbean.SimpleType; diff --git a/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/BundleStateMBean.java b/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/BundleStateMBean.java index b45295d703..80bf41d4f2 100644 --- a/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/BundleStateMBean.java +++ b/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/BundleStateMBean.java @@ -17,7 +17,6 @@ package org.osgi.jmx.framework; import java.io.IOException; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeType; import javax.management.openmbean.SimpleType; diff --git a/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/FrameworkMBean.java b/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/FrameworkMBean.java index efbbb72653..f1b54318e9 100644 --- a/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/FrameworkMBean.java +++ b/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/FrameworkMBean.java @@ -17,7 +17,6 @@ package org.osgi.jmx.framework; import java.io.IOException; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeType; import javax.management.openmbean.SimpleType; diff --git a/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/PackageStateMBean.java b/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/PackageStateMBean.java index 9c8c52a470..23b561a73f 100644 --- a/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/PackageStateMBean.java +++ b/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/PackageStateMBean.java @@ -17,7 +17,6 @@ package org.osgi.jmx.framework; import java.io.IOException; - import javax.management.openmbean.CompositeType; import javax.management.openmbean.SimpleType; import javax.management.openmbean.TabularData; diff --git a/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/ServiceStateMBean.java b/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/ServiceStateMBean.java index 8d8864118d..8833c23421 100644 --- a/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/ServiceStateMBean.java +++ b/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/ServiceStateMBean.java @@ -17,7 +17,6 @@ package org.osgi.jmx.framework; import java.io.IOException; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeType; import javax.management.openmbean.SimpleType; diff --git a/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleWiringStateMBean.java b/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleWiringStateMBean.java index ba2655f60a..8b394e4205 100644 --- a/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleWiringStateMBean.java +++ b/jmx/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleWiringStateMBean.java @@ -17,7 +17,6 @@ package org.osgi.jmx.framework.wiring; import java.io.IOException; - import javax.management.JMException; import javax.management.openmbean.ArrayType; import javax.management.openmbean.CompositeData; diff --git a/jmx/jmx-api/src/main/java/org/osgi/jmx/service/cm/ConfigurationAdminMBean.java b/jmx/jmx-api/src/main/java/org/osgi/jmx/service/cm/ConfigurationAdminMBean.java index 91110bf7e3..5025cc2d40 100644 --- a/jmx/jmx-api/src/main/java/org/osgi/jmx/service/cm/ConfigurationAdminMBean.java +++ b/jmx/jmx-api/src/main/java/org/osgi/jmx/service/cm/ConfigurationAdminMBean.java @@ -17,7 +17,6 @@ package org.osgi.jmx.service.cm; import java.io.IOException; - import javax.management.openmbean.TabularData; import org.osgi.jmx.JmxConstants; diff --git a/jmx/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/ProvisioningServiceMBean.java b/jmx/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/ProvisioningServiceMBean.java index c8b97a1f61..79d89c3109 100644 --- a/jmx/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/ProvisioningServiceMBean.java +++ b/jmx/jmx-api/src/main/java/org/osgi/jmx/service/provisioning/ProvisioningServiceMBean.java @@ -17,7 +17,6 @@ package org.osgi.jmx.service.provisioning; import java.io.IOException; - import javax.management.openmbean.TabularData; import org.osgi.jmx.JmxConstants; diff --git a/jmx/jmx-api/src/main/java/org/osgi/jmx/service/useradmin/UserAdminMBean.java b/jmx/jmx-api/src/main/java/org/osgi/jmx/service/useradmin/UserAdminMBean.java index 7b61948cd0..bf93edd5ca 100644 --- a/jmx/jmx-api/src/main/java/org/osgi/jmx/service/useradmin/UserAdminMBean.java +++ b/jmx/jmx-api/src/main/java/org/osgi/jmx/service/useradmin/UserAdminMBean.java @@ -17,7 +17,6 @@ package org.osgi.jmx.service.useradmin; import java.io.IOException; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeType; import javax.management.openmbean.SimpleType; diff --git a/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java b/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java index 28fc89481f..4477862a77 100644 --- a/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java +++ b/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java @@ -20,7 +20,6 @@ package org.apache.aries.jmx.blueprint; import java.io.IOException; - import javax.management.openmbean.ArrayType; import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeType; diff --git a/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java b/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java index fbe8b0c794..75701bf20d 100644 --- a/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java +++ b/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java @@ -20,7 +20,6 @@ package org.apache.aries.jmx.blueprint; import java.io.IOException; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeType; import javax.management.openmbean.SimpleType; diff --git a/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java b/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java index 4473aba451..33365771f0 100644 --- a/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java +++ b/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java @@ -22,7 +22,6 @@ import java.util.Arrays; import java.util.LinkedHashSet; import java.util.Set; - import javax.management.openmbean.ArrayType; import javax.management.openmbean.CompositeType; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPBeanArgument.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPBeanArgument.java index 4c18f96fb1..c2c1437679 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPBeanArgument.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPBeanArgument.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.HashMap; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPBeanMetadata.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPBeanMetadata.java index 29e5a11879..68cfaee940 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPBeanMetadata.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPBeanMetadata.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPBeanProperty.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPBeanProperty.java index 6bf242df34..7e87faa214 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPBeanProperty.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPBeanProperty.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.HashMap; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPCollectionMetadata.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPCollectionMetadata.java index a142f1054f..385662130c 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPCollectionMetadata.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPCollectionMetadata.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.HashMap; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPComponentMetadata.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPComponentMetadata.java index 6baa700e0e..b43dd9cb8a 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPComponentMetadata.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPComponentMetadata.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; - import javax.management.openmbean.CompositeData; import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPIdRefMetadata.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPIdRefMetadata.java index fad0784e9d..8e80f71a14 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPIdRefMetadata.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPIdRefMetadata.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.HashMap; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPMapEntry.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPMapEntry.java index b2e45373a7..ea7a875b80 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPMapEntry.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPMapEntry.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.HashMap; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPMapMetadata.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPMapMetadata.java index e92dd3a3f5..20f0f8c9fc 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPMapMetadata.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPMapMetadata.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.HashMap; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPPropsMetadata.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPPropsMetadata.java index 13ed388f40..97e7c41d39 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPPropsMetadata.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPPropsMetadata.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.HashMap; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPRefMetadata.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPRefMetadata.java index f03b211b22..c258cf1736 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPRefMetadata.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPRefMetadata.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.HashMap; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPReferenceListMetadata.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPReferenceListMetadata.java index a1462ddb59..27e645a993 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPReferenceListMetadata.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPReferenceListMetadata.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPReferenceListener.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPReferenceListener.java index c4c78c5deb..8007d89cc9 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPReferenceListener.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPReferenceListener.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.HashMap; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPReferenceMetadata.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPReferenceMetadata.java index 6785a4a6f5..ba3c071fdf 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPReferenceMetadata.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPReferenceMetadata.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPRegistrationListener.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPRegistrationListener.java index b2e72e91f3..34e5be23bf 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPRegistrationListener.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPRegistrationListener.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.HashMap; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPServiceMetadata.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPServiceMetadata.java index a0315b25cd..6c465d053a 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPServiceMetadata.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPServiceMetadata.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPServiceReferenceMetadata.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPServiceReferenceMetadata.java index 21d50d00c1..fb29291bcd 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPServiceReferenceMetadata.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPServiceReferenceMetadata.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.Map; - import javax.management.openmbean.CompositeData; import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPValueMetadata.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPValueMetadata.java index 1c2782805c..f9f6761b95 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPValueMetadata.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/BPValueMetadata.java @@ -19,7 +19,6 @@ package org.apache.aries.jmx.blueprint.codec; import java.util.HashMap; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/OSGiBlueprintEvent.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/OSGiBlueprintEvent.java index 2e780aea38..57c60aaf12 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/OSGiBlueprintEvent.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/OSGiBlueprintEvent.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/Util.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/Util.java index ffb17b5d9c..df5055a9e0 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/Util.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/Util.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; - import javax.management.openmbean.CompositeData; import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java index b15687faa2..c8f64e4108 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java @@ -18,8 +18,6 @@ */ package org.apache.aries.jmx.blueprint.impl; -import java.util.concurrent.atomic.AtomicBoolean; - import javax.management.InstanceAlreadyExistsException; import javax.management.InstanceNotFoundException; import javax.management.MBeanRegistrationException; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java index c9f9c9d0fe..8dbce2d8e2 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.util.Collection; - import javax.management.openmbean.CompositeData; import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean; diff --git a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrableStandardEmitterMBean.java b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrableStandardEmitterMBean.java index adc70dacf2..ffd947b931 100644 --- a/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrableStandardEmitterMBean.java +++ b/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrableStandardEmitterMBean.java @@ -16,7 +16,17 @@ */ package org.apache.aries.jmx.blueprint.impl; -import javax.management.*; +import javax.management.ListenerNotFoundException; +import javax.management.MBeanInfo; +import javax.management.MBeanNotificationInfo; +import javax.management.MBeanRegistration; +import javax.management.MBeanServer; +import javax.management.NotCompliantMBeanException; +import javax.management.NotificationEmitter; +import javax.management.NotificationFilter; +import javax.management.NotificationListener; +import javax.management.ObjectName; +import javax.management.StandardMBean; /** * The StandardMBean does not appear to delegate correctly to the underlying MBean implementation. Due to diff --git a/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java b/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java index 4a00f388bc..b438146c77 100644 --- a/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java +++ b/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java @@ -18,14 +18,7 @@ */ package org.apache.aries.jmx.blueprint.impl; -import org.apache.aries.jmx.blueprint.BlueprintStateMBean; -import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; -import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.osgi.framework.BundleContext; //@RunWith(JMock.class) public class BlueprintStateTest { diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/AbstractCompendiumHandler.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/AbstractCompendiumHandler.java index ba8180e6f2..9cc4dc9ac9 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/AbstractCompendiumHandler.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/AbstractCompendiumHandler.java @@ -17,7 +17,6 @@ package org.apache.aries.jmx; import java.util.concurrent.atomic.AtomicLong; - import javax.management.StandardMBean; import org.apache.aries.jmx.agent.JMXAgentContext; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/agent/JMXAgentImpl.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/agent/JMXAgentImpl.java index f1ef77f848..294e78037b 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/agent/JMXAgentImpl.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/agent/JMXAgentImpl.java @@ -18,7 +18,6 @@ import java.util.IdentityHashMap; import java.util.Map; - import javax.management.InstanceAlreadyExistsException; import javax.management.InstanceNotFoundException; import javax.management.MBeanRegistrationException; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/cm/ConfigurationAdmin.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/cm/ConfigurationAdmin.java index a071ef908a..522fb23b26 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/cm/ConfigurationAdmin.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/cm/ConfigurationAdmin.java @@ -25,7 +25,6 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.List; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/AuthorizationData.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/AuthorizationData.java index 017fdcf2bb..f2287b1224 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/AuthorizationData.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/AuthorizationData.java @@ -18,7 +18,6 @@ import java.util.HashMap; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BatchActionResult.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BatchActionResult.java index f68d240546..b54dec924d 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BatchActionResult.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BatchActionResult.java @@ -18,7 +18,6 @@ import java.util.HashMap; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BatchInstallResult.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BatchInstallResult.java index ea2d712752..408d6627f9 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BatchInstallResult.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BatchInstallResult.java @@ -18,7 +18,6 @@ import java.util.HashMap; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BatchResolveResult.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BatchResolveResult.java index 4fa620d17b..6ba2d6ceef 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BatchResolveResult.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BatchResolveResult.java @@ -18,7 +18,6 @@ import java.util.HashMap; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleData.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleData.java index 6ef1c5ced1..ea1021a719 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleData.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleData.java @@ -62,7 +62,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.management.JMRuntimeException; import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleEventData.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleEventData.java index 01c11c6aa3..91500b0d29 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleEventData.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleEventData.java @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleWiringData.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleWiringData.java index 8233e8bcc7..23016820c8 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleWiringData.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleWiringData.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.CompositeType; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/GroupData.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/GroupData.java index d8a3e961db..47e8fc3d20 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/GroupData.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/GroupData.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PackageData.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PackageData.java index 72546eeab1..9828f53751 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PackageData.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PackageData.java @@ -19,7 +19,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PropertyData.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PropertyData.java index 0eb1cf7605..c1c483a5a3 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PropertyData.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PropertyData.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.Vector; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/RoleData.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/RoleData.java index 6ed36d1dcc..f0c466e16a 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/RoleData.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/RoleData.java @@ -24,7 +24,6 @@ import java.util.Hashtable; import java.util.List; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/ServiceData.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/ServiceData.java index 5d9231e697..69ac9ed633 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/ServiceData.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/ServiceData.java @@ -31,7 +31,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/ServiceEventData.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/ServiceEventData.java index d6c4bc742e..bdf3ba5811 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/ServiceEventData.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/ServiceEventData.java @@ -26,7 +26,6 @@ import java.util.HashMap; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/UserData.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/UserData.java index c034ecfbba..5b192397a3 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/UserData.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/UserData.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.OpenDataException; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleState.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleState.java index 5416156d3e..66dbc1f2b9 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleState.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleState.java @@ -43,7 +43,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; - import javax.management.AttributeChangeNotification; import javax.management.MBeanNotificationInfo; import javax.management.MBeanRegistration; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/Framework.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/Framework.java index 5efd4e35f0..d26d7dc205 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/Framework.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/Framework.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - import javax.management.openmbean.CompositeData; import org.apache.aries.jmx.codec.BatchActionResult; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/PackageState.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/PackageState.java index 55965e9a55..ef32722a90 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/PackageState.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/PackageState.java @@ -21,7 +21,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; - import javax.management.openmbean.TabularData; import org.apache.aries.jmx.codec.PackageData; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/ServiceState.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/ServiceState.java index f0427b22e1..0c2cac628e 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/ServiceState.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/ServiceState.java @@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; - import javax.management.AttributeChangeNotification; import javax.management.MBeanNotificationInfo; import javax.management.MBeanRegistration; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/StateConfig.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/StateConfig.java index d0b5dc4521..370d0ba8ee 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/StateConfig.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/StateConfig.java @@ -16,14 +16,14 @@ */ package org.apache.aries.jmx.framework; -import org.osgi.framework.BundleContext; -import org.osgi.service.cm.ConfigurationException; -import org.osgi.service.cm.ManagedService; - import java.io.IOException; import java.util.Dictionary; import java.util.Hashtable; +import org.osgi.framework.BundleContext; +import org.osgi.service.cm.ConfigurationException; +import org.osgi.service.cm.ManagedService; + /** * Configuration for {@link BundleState} and {@link ServiceState}. * diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/wiring/BundleWiringState.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/wiring/BundleWiringState.java index 2f63317fa7..bc175e24a9 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/wiring/BundleWiringState.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/wiring/BundleWiringState.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/provisioning/ProvisioningService.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/provisioning/ProvisioningService.java index 543cb2eb0e..c2a8445b2c 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/provisioning/ProvisioningService.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/provisioning/ProvisioningService.java @@ -26,7 +26,6 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.zip.ZipInputStream; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; diff --git a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/useradmin/UserAdmin.java b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/useradmin/UserAdmin.java index 48aa54e7eb..667865b86d 100644 --- a/jmx/jmx-core/src/main/java/org/apache/aries/jmx/useradmin/UserAdmin.java +++ b/jmx/jmx-core/src/main/java/org/apache/aries/jmx/useradmin/UserAdmin.java @@ -21,7 +21,6 @@ import java.util.Dictionary; import java.util.Enumeration; import java.util.List; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/CompendiumHandlerTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/CompendiumHandlerTest.java index 799ee4a9ad..2f2a2e9896 100644 --- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/CompendiumHandlerTest.java +++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/CompendiumHandlerTest.java @@ -22,10 +22,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; - import javax.management.StandardMBean; import org.apache.aries.jmx.agent.JMXAgentContext; diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminTest.java index f2bcfcb415..18a9ca4846 100644 --- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminTest.java +++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminTest.java @@ -29,7 +29,6 @@ import java.util.Dictionary; import java.util.Hashtable; - import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/BundleDataTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/BundleDataTest.java index 9859575c2f..b78bcab8dc 100644 --- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/BundleDataTest.java +++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/BundleDataTest.java @@ -55,7 +55,6 @@ import java.util.Hashtable; import java.util.Map; import java.util.Set; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.TabularData; diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/BundleEventDataTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/BundleEventDataTest.java index a598ae1f6f..b5849e8dcb 100644 --- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/BundleEventDataTest.java +++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/BundleEventDataTest.java @@ -16,8 +16,9 @@ */ package org.apache.aries.jmx.codec; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import static org.osgi.jmx.framework.BundleStateMBean.BUNDLE_EVENT_TYPE; import static org.osgi.jmx.framework.BundleStateMBean.EVENT; import static org.osgi.jmx.framework.BundleStateMBean.IDENTIFIER; @@ -26,7 +27,6 @@ import java.util.HashMap; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/PropertyDataTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/PropertyDataTest.java index 86d5aaa39f..82232d1e36 100644 --- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/PropertyDataTest.java +++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/PropertyDataTest.java @@ -41,7 +41,6 @@ import java.util.List; import java.util.Map; import java.util.Vector; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/ServiceDataTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/ServiceDataTest.java index bec14356fd..506c3e3292 100644 --- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/ServiceDataTest.java +++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/ServiceDataTest.java @@ -40,7 +40,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; import javax.management.openmbean.TabularData; diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/ServiceEventDataTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/ServiceEventDataTest.java index 96b23da7d2..25a5168e26 100644 --- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/ServiceEventDataTest.java +++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/ServiceEventDataTest.java @@ -30,7 +30,6 @@ import java.util.HashMap; import java.util.Map; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeDataSupport; diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/BundleStateTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/BundleStateTest.java index f5a39ec8e0..a106c2c9f0 100644 --- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/BundleStateTest.java +++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/BundleStateTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.atMost; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -31,7 +30,6 @@ import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; - import javax.management.AttributeChangeNotification; import javax.management.MBeanServer; import javax.management.Notification; diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/FrameworkTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/FrameworkTest.java index bce7d2a78b..8149fd0113 100644 --- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/FrameworkTest.java +++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/FrameworkTest.java @@ -16,9 +16,15 @@ */ package org.apache.aries.jmx.framework; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + import java.io.IOException; import java.io.InputStream; - import javax.management.openmbean.CompositeData; import org.apache.aries.jmx.codec.BatchActionResult; @@ -35,13 +41,6 @@ import org.osgi.service.packageadmin.PackageAdmin; import org.osgi.service.startlevel.StartLevel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; - /** * {@link FrameworkMBean} test case. * diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/PackageStateTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/PackageStateTest.java index f54d323825..68bf440d0a 100644 --- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/PackageStateTest.java +++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/PackageStateTest.java @@ -16,9 +16,13 @@ */ package org.apache.aries.jmx.framework; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.io.IOException; import java.util.Collection; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; @@ -34,11 +38,6 @@ import org.osgi.service.packageadmin.ExportedPackage; import org.osgi.service.packageadmin.PackageAdmin; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - /** * {@link PackageStateMBean} test case. * diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/ServiceStateTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/ServiceStateTest.java index 5e771eae02..50210a89dc 100644 --- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/ServiceStateTest.java +++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/ServiceStateTest.java @@ -21,7 +21,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.atMost; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -38,7 +37,6 @@ import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; - import javax.management.AttributeChangeNotification; import javax.management.MBeanServer; import javax.management.Notification; diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminTest.java index 08d118382c..cf27a31b9b 100644 --- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminTest.java +++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminTest.java @@ -16,6 +16,12 @@ */ package org.apache.aries.jmx.permissionadmin; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; + import java.io.IOException; import org.junit.Before; @@ -26,12 +32,6 @@ import org.osgi.jmx.service.permissionadmin.PermissionAdminMBean; import org.osgi.service.permissionadmin.PermissionInfo; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; - /** * {@link PermissionAdminMBean} test case. * diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceTest.java index b9c65f2af4..e5d406f30d 100644 --- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceTest.java +++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceTest.java @@ -36,7 +36,6 @@ import java.util.Dictionary; import java.util.Hashtable; import java.util.zip.ZipInputStream; - import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/useradmin/UserAdminTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/useradmin/UserAdminTest.java index 33cdbbfce1..0848502ebe 100644 --- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/useradmin/UserAdminTest.java +++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/useradmin/UserAdminTest.java @@ -16,10 +16,15 @@ */ package org.apache.aries.jmx.useradmin; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + import java.io.IOException; import java.util.Dictionary; import java.util.Hashtable; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; @@ -38,12 +43,6 @@ import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.User; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; - /** * UserAdminMBean test case. * diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java index ecada75b4f..38b750b1a9 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java @@ -31,7 +31,6 @@ import java.io.InputStream; import java.util.Properties; import java.util.Set; - import javax.inject.Inject; import javax.management.MBeanServer; import javax.management.MBeanServerInvocationHandler; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanTest.java index 0c1595462d..542a144da4 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanTest.java @@ -23,7 +23,6 @@ import static org.ops4j.pax.exam.CoreOptions.options; import java.util.Dictionary; - import javax.inject.Inject; import javax.management.openmbean.TabularData; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java index 321df2128c..9ac10af021 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java @@ -36,7 +36,6 @@ import java.util.Set; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; - import javax.management.AttributeChangeNotification; import javax.management.AttributeChangeNotificationFilter; import javax.management.Notification; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java index 736e3d7391..7dfce29572 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java @@ -16,28 +16,15 @@ */ package org.apache.aries.jmx.framework; -import org.apache.aries.jmx.AbstractIntegrationTest; -import org.apache.aries.jmx.codec.BatchActionResult; -import org.junit.Before; -import org.junit.Test; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.CoreOptions; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerMethod; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleException; -import org.osgi.framework.Constants; -import org.osgi.framework.Version; -import org.osgi.framework.wiring.BundleRevision; -import org.osgi.framework.wiring.BundleRevisions; -import org.osgi.framework.wiring.BundleWire; -import org.osgi.framework.wiring.BundleWiring; -import org.osgi.framework.wiring.FrameworkWiring; -import org.osgi.jmx.framework.FrameworkMBean; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.ops4j.pax.exam.CoreOptions.provision; +import static org.ops4j.pax.tinybundles.core.TinyBundles.bundle; +import static org.ops4j.pax.tinybundles.core.TinyBundles.withBnd; -import javax.management.ObjectName; -import javax.management.openmbean.CompositeData; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -57,15 +44,28 @@ import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; +import javax.management.ObjectName; +import javax.management.openmbean.CompositeData; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.ops4j.pax.exam.CoreOptions.provision; -import static org.ops4j.pax.tinybundles.core.TinyBundles.bundle; -import static org.ops4j.pax.tinybundles.core.TinyBundles.withBnd; +import org.apache.aries.jmx.AbstractIntegrationTest; +import org.apache.aries.jmx.codec.BatchActionResult; +import org.junit.Before; +import org.junit.Test; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.CoreOptions; +import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerMethod; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleException; +import org.osgi.framework.Constants; +import org.osgi.framework.Version; +import org.osgi.framework.wiring.BundleRevision; +import org.osgi.framework.wiring.BundleRevisions; +import org.osgi.framework.wiring.BundleWire; +import org.osgi.framework.wiring.BundleWiring; +import org.osgi.framework.wiring.FrameworkWiring; +import org.osgi.jmx.framework.FrameworkMBean; /** * @version $Rev$ $Date$ diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java index 5415e63431..cd71ea25e5 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java @@ -27,7 +27,6 @@ import java.util.Collection; import java.util.Hashtable; import java.util.Set; - import javax.management.ObjectName; import javax.management.openmbean.TabularData; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java index 10384bbb84..5e399b7bbe 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java @@ -32,7 +32,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import javax.management.AttributeChangeNotification; import javax.management.Notification; import javax.management.NotificationListener; @@ -40,7 +39,6 @@ import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; - import org.apache.aries.jmx.AbstractIntegrationTest; import org.apache.aries.jmx.codec.PropertyData; import org.apache.aries.jmx.test.bundlea.api.InterfaceA; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java index 3c43c85fa0..2309d055b7 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import javax.management.ObjectName; import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java index 55b678d992..6bf3fb3820 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java @@ -16,6 +16,12 @@ */ package org.apache.aries.jmx.permissionadmin; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertNotNull; +import static org.ops4j.pax.exam.CoreOptions.options; + +import java.io.IOException; + import org.apache.aries.jmx.AbstractIntegrationTest; import org.junit.Test; import org.ops4j.pax.exam.Configuration; @@ -25,12 +31,6 @@ import org.osgi.service.permissionadmin.PermissionAdmin; import org.osgi.service.permissionadmin.PermissionInfo; -import java.io.IOException; - -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertNotNull; -import static org.ops4j.pax.exam.CoreOptions.options; - /** * * diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java index c53f0133b7..ee88dc7a4a 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java @@ -33,7 +33,6 @@ import java.util.jar.JarOutputStream; import java.util.jar.Manifest; import java.util.zip.ZipEntry; - import javax.inject.Inject; import javax.management.openmbean.TabularData; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java index 2106129231..a7125b717e 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java @@ -23,7 +23,6 @@ import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import java.util.Arrays; - import javax.inject.Inject; import javax.management.MBeanServerInvocationHandler; import javax.management.ObjectName; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractCompositeDataValidator.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractCompositeDataValidator.java index e858d6e79d..219b90f98c 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractCompositeDataValidator.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractCompositeDataValidator.java @@ -25,7 +25,6 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeType; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractServiceReferenceValidator.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractServiceReferenceValidator.java index 323677cccc..ec9fe5198f 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractServiceReferenceValidator.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractServiceReferenceValidator.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.List; - import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeType; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanValidator.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanValidator.java index dc14ee994a..d53af8b24f 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanValidator.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanValidator.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.List; - import javax.management.openmbean.CompositeData; import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/CollectionValidator.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/CollectionValidator.java index d63be4dd6e..0257a1abe3 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/CollectionValidator.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/CollectionValidator.java @@ -18,10 +18,10 @@ */ package org.apache.aries.jmx.test.blueprint.framework; +import static org.junit.Assert.fail; + import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.*; - import javax.management.openmbean.CompositeData; import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/MapEntryValidator.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/MapEntryValidator.java index 53c4ce6a0e..3ef62315b4 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/MapEntryValidator.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/MapEntryValidator.java @@ -18,8 +18,9 @@ */ package org.apache.aries.jmx.test.blueprint.framework; +import static org.junit.Assert.assertNotNull; + import javax.management.openmbean.CompositeData; -import static org.junit.Assert.*; import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ServiceValidator.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ServiceValidator.java index a8d4b2805d..e84d9b5e7e 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ServiceValidator.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ServiceValidator.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.List; - import javax.management.openmbean.CompositeData; import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean; diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/Util.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/Util.java index 748e2f562f..7d96920bb5 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/Util.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/Util.java @@ -20,7 +20,6 @@ import java.io.ByteArrayInputStream; import java.io.ObjectInputStream; - import javax.management.openmbean.CompositeData; public class Util { diff --git a/jmx/jmx-mbeanserver-platform/src/main/java/org/apache/aries/jmx/mbean_server/platform/impl/Activator.java b/jmx/jmx-mbeanserver-platform/src/main/java/org/apache/aries/jmx/mbean_server/platform/impl/Activator.java index add5d02179..402ee690a8 100644 --- a/jmx/jmx-mbeanserver-platform/src/main/java/org/apache/aries/jmx/mbean_server/platform/impl/Activator.java +++ b/jmx/jmx-mbeanserver-platform/src/main/java/org/apache/aries/jmx/mbean_server/platform/impl/Activator.java @@ -20,7 +20,6 @@ import java.lang.management.ManagementFactory; import java.util.Hashtable; - import javax.management.Attribute; import javax.management.AttributeList; import javax.management.MBeanServer; diff --git a/jmx/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/JmxWhiteboardSupport.java b/jmx/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/JmxWhiteboardSupport.java index def9397762..f80115c300 100644 --- a/jmx/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/JmxWhiteboardSupport.java +++ b/jmx/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/JmxWhiteboardSupport.java @@ -22,7 +22,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.IdentityHashMap; - import javax.management.MBeanRegistration; import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; diff --git a/jmx/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/MBeanHolder.java b/jmx/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/MBeanHolder.java index 9285cf41fc..1ae98ceb2b 100644 --- a/jmx/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/MBeanHolder.java +++ b/jmx/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/MBeanHolder.java @@ -21,7 +21,6 @@ import java.util.IdentityHashMap; import java.util.Map; import java.util.Map.Entry; - import javax.management.DynamicMBean; import javax.management.InstanceAlreadyExistsException; import javax.management.InstanceNotFoundException; diff --git a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/JmxWhiteboardSupportTest.java b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/JmxWhiteboardSupportTest.java index c2c24e3f7b..af9f234e56 100644 --- a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/JmxWhiteboardSupportTest.java +++ b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/JmxWhiteboardSupportTest.java @@ -21,7 +21,6 @@ import java.lang.reflect.Field; import java.util.Dictionary; import java.util.Hashtable; - import javax.management.DynamicMBean; import javax.management.InstanceAlreadyExistsException; import javax.management.MBeanRegistrationException; diff --git a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/MBeanHolderTest.java b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/MBeanHolderTest.java index 46ddf07dbf..06fcfd8e74 100644 --- a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/MBeanHolderTest.java +++ b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/MBeanHolderTest.java @@ -18,9 +18,11 @@ */ package org.apache.aries.jmx.whiteboard; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; + import java.lang.reflect.Field; import java.util.Map; - import javax.management.InstanceAlreadyExistsException; import javax.management.MBeanRegistrationException; import javax.management.MBeanServer; @@ -34,9 +36,6 @@ import org.mockito.stubbing.Answer; import org.slf4j.Logger; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; - public class MBeanHolderTest { @Test public void testPlainRegistration() throws Exception { diff --git a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java index ccdd17fe6f..b296ad5291 100644 --- a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java +++ b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java @@ -18,6 +18,8 @@ */ package org.apache.aries.jmx.whiteboard.integration; +import static org.junit.Assert.assertEquals; + import javax.management.MBeanServer; import javax.management.ObjectName; @@ -31,8 +33,6 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; import org.osgi.framework.ServiceRegistration; -import static org.junit.Assert.assertEquals; - /** * The MBeanTest tests MBean registration with MBean Servers */ diff --git a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java index b6b9ca7995..1a3aecafd1 100644 --- a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java +++ b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java @@ -18,6 +18,8 @@ */ package org.apache.aries.jmx.whiteboard.integration; +import static org.junit.Assert.assertEquals; + import javax.management.DynamicMBean; import javax.management.MBeanServer; import javax.management.ObjectName; @@ -34,8 +36,6 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; import org.osgi.framework.ServiceRegistration; -import static org.junit.Assert.assertEquals; - /** * The MBeanTest tests MBean registration with MBean Servers */ diff --git a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java index 7d182c7487..772264dd02 100644 --- a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java +++ b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java @@ -21,12 +21,15 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; -import static org.ops4j.pax.exam.CoreOptions.*; +import static org.ops4j.pax.exam.CoreOptions.bundle; +import static org.ops4j.pax.exam.CoreOptions.junitBundles; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; +import static org.ops4j.pax.exam.CoreOptions.options; +import static org.ops4j.pax.exam.CoreOptions.systemProperty; import java.io.File; import java.util.Dictionary; import java.util.Hashtable; - import javax.inject.Inject; import javax.management.InstanceNotFoundException; import javax.management.MBeanServer; diff --git a/jndi/jndi-api/src/main/java/org/apache/aries/jndi/urls/URLObjectFactoryFinder.java b/jndi/jndi-api/src/main/java/org/apache/aries/jndi/urls/URLObjectFactoryFinder.java index bad756cc0f..23493abd9c 100644 --- a/jndi/jndi-api/src/main/java/org/apache/aries/jndi/urls/URLObjectFactoryFinder.java +++ b/jndi/jndi-api/src/main/java/org/apache/aries/jndi/urls/URLObjectFactoryFinder.java @@ -18,9 +18,9 @@ */ package org.apache.aries.jndi.urls; +import java.util.Hashtable; import javax.naming.NamingException; import javax.naming.spi.ObjectFactory; -import java.util.Hashtable; public interface URLObjectFactoryFinder { diff --git a/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIContextManager.java b/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIContextManager.java index e2142a0dd8..bee6f69164 100644 --- a/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIContextManager.java +++ b/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIContextManager.java @@ -17,7 +17,6 @@ package org.osgi.service.jndi; import java.util.Map; - import javax.naming.Context; import javax.naming.NamingException; import javax.naming.directory.DirContext; diff --git a/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIProviderAdmin.java b/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIProviderAdmin.java index 747219aa35..99ea588fc8 100644 --- a/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIProviderAdmin.java +++ b/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIProviderAdmin.java @@ -17,7 +17,6 @@ package org.osgi.service.jndi; import java.util.Map; - import javax.naming.Context; import javax.naming.Name; import javax.naming.directory.Attributes; diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/AugmenterInvokerImpl.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/AugmenterInvokerImpl.java index e4790a7a89..8dc9284337 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/AugmenterInvokerImpl.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/AugmenterInvokerImpl.java @@ -18,14 +18,14 @@ */ package org.apache.aries.jndi; +import java.util.Hashtable; + import org.apache.aries.jndi.spi.AugmenterInvoker; import org.apache.aries.jndi.spi.EnvironmentAugmentation; import org.apache.aries.jndi.spi.EnvironmentUnaugmentation; import org.apache.aries.jndi.startup.Activator; import org.osgi.framework.BundleContext; -import java.util.Hashtable; - public class AugmenterInvokerImpl implements AugmenterInvoker { diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextHelper.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextHelper.java index 4a69607731..a46d9414bb 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextHelper.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextHelper.java @@ -18,24 +18,24 @@ */ package org.apache.aries.jndi; -import org.apache.aries.jndi.startup.Activator; -import org.apache.aries.jndi.urls.URLObjectFactoryFinder; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; -import org.osgi.framework.ServiceReference; - +import java.util.Collection; +import java.util.Hashtable; +import java.util.Optional; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.naming.Context; import javax.naming.NamingException; import javax.naming.NoInitialContextException; import javax.naming.spi.InitialContextFactory; import javax.naming.spi.InitialContextFactoryBuilder; import javax.naming.spi.ObjectFactory; -import java.util.Collection; -import java.util.Hashtable; -import java.util.Optional; -import java.util.logging.Level; -import java.util.logging.Logger; + +import org.apache.aries.jndi.startup.Activator; +import org.apache.aries.jndi.urls.URLObjectFactoryFinder; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.FrameworkUtil; +import org.osgi.framework.ServiceReference; /** * Provides helper methods for the DelegateContext. This provides the methods so diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextManagerService.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextManagerService.java index 51f7a1ea46..e076fc34f7 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextManagerService.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextManagerService.java @@ -18,13 +18,17 @@ */ package org.apache.aries.jndi; -import org.osgi.framework.BundleContext; -import org.osgi.service.jndi.JNDIContextManager; - +import java.util.Collections; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.Map; +import java.util.Set; import javax.naming.Context; import javax.naming.NamingException; import javax.naming.directory.DirContext; -import java.util.*; + +import org.osgi.framework.BundleContext; +import org.osgi.service.jndi.JNDIContextManager; public class ContextManagerService implements JNDIContextManager { diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextProvider.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextProvider.java index 7cac82b800..38b8a2e3e3 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextProvider.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextProvider.java @@ -18,12 +18,12 @@ */ package org.apache.aries.jndi; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; - import javax.naming.Context; import javax.naming.NamingException; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; + public abstract class ContextProvider { private final ServiceReference reference; private final BundleContext bc; diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/DelegateContext.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/DelegateContext.java index f44e2d909c..656860f22a 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/DelegateContext.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/DelegateContext.java @@ -18,17 +18,28 @@ */ package org.apache.aries.jndi; -import org.osgi.framework.BundleContext; - -import javax.naming.*; -import javax.naming.directory.*; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Map; +import javax.naming.Binding; +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.NameClassPair; +import javax.naming.NameParser; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.NoInitialContextException; +import javax.naming.directory.Attributes; +import javax.naming.directory.DirContext; +import javax.naming.directory.ModificationItem; +import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; import javax.naming.ldap.Control; import javax.naming.ldap.ExtendedRequest; import javax.naming.ldap.ExtendedResponse; import javax.naming.ldap.LdapContext; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Map; + +import org.osgi.framework.BundleContext; public class DelegateContext implements DirContext, LdapContext { diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/DirObjectFactoryHelper.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/DirObjectFactoryHelper.java index 4a5ef8a988..2b8100743b 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/DirObjectFactoryHelper.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/DirObjectFactoryHelper.java @@ -18,10 +18,10 @@ */ package org.apache.aries.jndi; -import org.osgi.framework.BundleContext; - import javax.naming.spi.DirObjectFactory; +import org.osgi.framework.BundleContext; + public class DirObjectFactoryHelper extends ObjectFactoryHelper implements DirObjectFactory { public DirObjectFactoryHelper(BundleContext defaultContext, BundleContext callerContext) { diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/JREInitialContextFactoryBuilder.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/JREInitialContextFactoryBuilder.java index 9485ad9999..4c51c7d6a9 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/JREInitialContextFactoryBuilder.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/JREInitialContextFactoryBuilder.java @@ -18,11 +18,11 @@ */ package org.apache.aries.jndi; +import java.util.Hashtable; import javax.naming.Context; import javax.naming.NamingException; import javax.naming.spi.InitialContextFactory; import javax.naming.spi.InitialContextFactoryBuilder; -import java.util.Hashtable; public class JREInitialContextFactoryBuilder implements InitialContextFactoryBuilder { diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiInitialContextFactoryBuilder.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiInitialContextFactoryBuilder.java index 1c96bce66f..87f92f6ee3 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiInitialContextFactoryBuilder.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiInitialContextFactoryBuilder.java @@ -18,16 +18,16 @@ */ package org.apache.aries.jndi; -import org.apache.aries.jndi.startup.Activator; -import org.osgi.framework.BundleContext; - +import java.util.Hashtable; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.naming.NoInitialContextException; import javax.naming.spi.InitialContextFactory; import javax.naming.spi.InitialContextFactoryBuilder; -import java.util.Hashtable; + +import org.apache.aries.jndi.startup.Activator; +import org.osgi.framework.BundleContext; public class OSGiInitialContextFactoryBuilder implements InitialContextFactoryBuilder, InitialContextFactory { diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java index 2948623ef0..d8471e6bae 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/OSGiObjectFactoryBuilder.java @@ -18,15 +18,18 @@ */ package org.apache.aries.jndi; -import org.apache.aries.jndi.startup.Activator; -import org.osgi.framework.BundleContext; - +import java.util.Hashtable; import javax.naming.Context; import javax.naming.Name; -import javax.naming.NamingException; import javax.naming.directory.Attributes; -import javax.naming.spi.*; -import java.util.Hashtable; +import javax.naming.spi.DirObjectFactory; +import javax.naming.spi.DirectoryManager; +import javax.naming.spi.NamingManager; +import javax.naming.spi.ObjectFactory; +import javax.naming.spi.ObjectFactoryBuilder; + +import org.apache.aries.jndi.startup.Activator; +import org.osgi.framework.BundleContext; public class OSGiObjectFactoryBuilder implements ObjectFactoryBuilder, ObjectFactory, DirObjectFactory { diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ObjectFactoryHelper.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ObjectFactoryHelper.java index 9146640ef1..edd9ee61dd 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ObjectFactoryHelper.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ObjectFactoryHelper.java @@ -18,21 +18,27 @@ */ package org.apache.aries.jndi; -import org.apache.aries.jndi.startup.Activator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; +import static org.osgi.service.jndi.JNDIConstants.JNDI_URLSCHEME; -import javax.naming.*; -import javax.naming.directory.Attributes; -import javax.naming.spi.DirObjectFactory; -import javax.naming.spi.ObjectFactory; -import javax.naming.spi.ObjectFactoryBuilder; import java.util.Enumeration; import java.util.Hashtable; import java.util.logging.Level; import java.util.logging.Logger; +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.NamingException; +import javax.naming.RefAddr; +import javax.naming.Reference; +import javax.naming.Referenceable; +import javax.naming.StringRefAddr; +import javax.naming.directory.Attributes; +import javax.naming.spi.DirObjectFactory; +import javax.naming.spi.ObjectFactory; +import javax.naming.spi.ObjectFactoryBuilder; -import static org.osgi.service.jndi.JNDIConstants.JNDI_URLSCHEME; +import org.apache.aries.jndi.startup.Activator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; public class ObjectFactoryHelper implements ObjectFactory { diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ProviderAdminService.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ProviderAdminService.java index 8cbc39c5c0..01b9ab1af8 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ProviderAdminService.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ProviderAdminService.java @@ -18,14 +18,14 @@ */ package org.apache.aries.jndi; -import org.osgi.framework.BundleContext; -import org.osgi.service.jndi.JNDIProviderAdmin; - +import java.util.Hashtable; +import java.util.Map; import javax.naming.Context; import javax.naming.Name; import javax.naming.directory.Attributes; -import java.util.Hashtable; -import java.util.Map; + +import org.osgi.framework.BundleContext; +import org.osgi.service.jndi.JNDIProviderAdmin; public class ProviderAdminService implements JNDIProviderAdmin { diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ServicePair.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ServicePair.java index f6e4d231c0..ebeab0dcaf 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ServicePair.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ServicePair.java @@ -18,12 +18,12 @@ */ package org.apache.aries.jndi; +import java.util.function.Supplier; + import org.apache.aries.jndi.startup.Activator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -import java.util.function.Supplier; - public class ServicePair implements Supplier { private BundleContext ctx; diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/SingleContextProvider.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/SingleContextProvider.java index 43723b1f9b..b39a7ac2b4 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/SingleContextProvider.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/SingleContextProvider.java @@ -18,12 +18,12 @@ */ package org.apache.aries.jndi; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; - import javax.naming.Context; import javax.naming.NamingException; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; + public class SingleContextProvider extends ContextProvider { private final Context context; diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/URLContextProvider.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/URLContextProvider.java index 12bbcf45f5..b11794668e 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/URLContextProvider.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/URLContextProvider.java @@ -18,13 +18,13 @@ */ package org.apache.aries.jndi; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; - +import java.util.Hashtable; import javax.naming.Context; import javax.naming.NamingException; import javax.naming.spi.ObjectFactory; -import java.util.Hashtable; + +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; public class URLContextProvider extends ContextProvider { private final ObjectFactory factory; diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/Utils.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/Utils.java index 720fd074d7..ad2ffde009 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/Utils.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/Utils.java @@ -18,13 +18,6 @@ */ package org.apache.aries.jndi; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; -import org.osgi.framework.BundleReference; -import org.osgi.service.jndi.JNDIConstants; - -import javax.naming.NamingException; import java.security.AccessController; import java.security.PrivilegedAction; import java.security.PrivilegedActionException; @@ -35,6 +28,13 @@ import java.util.NoSuchElementException; import java.util.function.Function; import java.util.function.Supplier; +import javax.naming.NamingException; + +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.BundleReference; +import org.osgi.service.jndi.JNDIConstants; /** */ 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 d740140389..93393a8535 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 @@ -18,11 +18,37 @@ */ package org.apache.aries.jndi.startup; -import org.apache.aries.jndi.*; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import javax.naming.NamingException; +import javax.naming.spi.InitialContextFactory; +import javax.naming.spi.InitialContextFactoryBuilder; +import javax.naming.spi.NamingManager; +import javax.naming.spi.ObjectFactory; +import javax.naming.spi.ObjectFactoryBuilder; + +import org.apache.aries.jndi.AugmenterInvokerImpl; +import org.apache.aries.jndi.ContextManagerServiceFactory; +import org.apache.aries.jndi.JREInitialContextFactoryBuilder; +import org.apache.aries.jndi.OSGiInitialContextFactoryBuilder; +import org.apache.aries.jndi.OSGiObjectFactoryBuilder; +import org.apache.aries.jndi.ProviderAdminServiceFactory; +import org.apache.aries.jndi.Utils; import org.apache.aries.jndi.spi.AugmenterInvoker; import org.apache.aries.jndi.tracker.CachingServiceTracker; import org.apache.aries.jndi.urls.URLObjectFactoryFinder; -import org.osgi.framework.*; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleEvent; +import org.osgi.framework.Constants; +import org.osgi.framework.ServiceReference; import org.osgi.framework.wiring.BundleRevision; import org.osgi.service.jndi.JNDIConstants; import org.osgi.service.jndi.JNDIContextManager; @@ -31,12 +57,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.naming.NamingException; -import javax.naming.spi.*; -import java.lang.reflect.Field; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; - /** * The activator for this bundle makes sure the static classes in it are * driven so they can do their magic stuff properly. diff --git a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/tracker/CachingServiceTracker.java b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/tracker/CachingServiceTracker.java index ec849041d5..4e6eeaafdb 100644 --- a/jndi/jndi-core/src/main/java/org/apache/aries/jndi/tracker/CachingServiceTracker.java +++ b/jndi/jndi-core/src/main/java/org/apache/aries/jndi/tracker/CachingServiceTracker.java @@ -18,14 +18,19 @@ */ package org.apache.aries.jndi.tracker; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; + import org.apache.aries.jndi.Utils; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTracker; -import java.util.*; -import java.util.function.Function; - public class CachingServiceTracker extends ServiceTracker> { /** The cached references */ diff --git a/jndi/jndi-core/src/test/java/org/apache/aries/jndi/InitialContextTest.java b/jndi/jndi-core/src/test/java/org/apache/aries/jndi/InitialContextTest.java index a11179a22c..0c4ff9a83f 100644 --- a/jndi/jndi-core/src/test/java/org/apache/aries/jndi/InitialContextTest.java +++ b/jndi/jndi-core/src/test/java/org/apache/aries/jndi/InitialContextTest.java @@ -18,17 +18,20 @@ */ package org.apache.aries.jndi; -import org.apache.aries.jndi.startup.Activator; -import org.apache.aries.mocks.BundleContextMock; -import org.apache.aries.unittest.mocks.MethodCall; -import org.apache.aries.unittest.mocks.Skeleton; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.osgi.framework.BundleContext; -import org.osgi.service.jndi.JNDIConstants; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; -import javax.naming.*; +import java.util.Dictionary; +import java.util.Hashtable; +import java.util.Properties; +import java.util.concurrent.atomic.AtomicBoolean; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.Name; +import javax.naming.NamingException; +import javax.naming.NoInitialContextException; import javax.naming.ldap.Control; import javax.naming.ldap.ExtendedRequest; import javax.naming.ldap.InitialLdapContext; @@ -36,12 +39,16 @@ import javax.naming.spi.InitialContextFactory; import javax.naming.spi.InitialContextFactoryBuilder; import javax.naming.spi.ObjectFactory; -import java.util.Dictionary; -import java.util.Hashtable; -import java.util.Properties; -import java.util.concurrent.atomic.AtomicBoolean; -import static org.junit.Assert.*; +import org.apache.aries.jndi.startup.Activator; +import org.apache.aries.mocks.BundleContextMock; +import org.apache.aries.unittest.mocks.MethodCall; +import org.apache.aries.unittest.mocks.Skeleton; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.osgi.framework.BundleContext; +import org.osgi.service.jndi.JNDIConstants; public class InitialContextTest { private Activator activator; diff --git a/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java b/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java index f2aae06960..f3e4ed7b88 100644 --- a/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java +++ b/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java @@ -18,6 +18,20 @@ */ package org.apache.aries.jndi; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + +import java.util.Dictionary; +import java.util.Hashtable; +import java.util.Properties; +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.Reference; +import javax.naming.StringRefAddr; +import javax.naming.spi.NamingManager; +import javax.naming.spi.ObjectFactory; + import org.apache.aries.jndi.startup.Activator; import org.apache.aries.jndi.urls.URLObjectFactoryFinder; import org.apache.aries.mocks.BundleContextMock; @@ -29,18 +43,6 @@ import org.osgi.framework.BundleContext; import org.osgi.service.jndi.JNDIConstants; -import javax.naming.Context; -import javax.naming.Name; -import javax.naming.Reference; -import javax.naming.StringRefAddr; -import javax.naming.spi.NamingManager; -import javax.naming.spi.ObjectFactory; -import java.util.Dictionary; -import java.util.Hashtable; -import java.util.Properties; - -import static org.junit.Assert.*; - public class ObjectFactoryTest { private Activator activator; private BundleContext bc; diff --git a/jndi/jndi-legacy-support/src/main/java/org/apache/aries/jndi/legacy/support/Activator.java b/jndi/jndi-legacy-support/src/main/java/org/apache/aries/jndi/legacy/support/Activator.java index 0b340a3350..9ee889ff7a 100644 --- a/jndi/jndi-legacy-support/src/main/java/org/apache/aries/jndi/legacy/support/Activator.java +++ b/jndi/jndi-legacy-support/src/main/java/org/apache/aries/jndi/legacy/support/Activator.java @@ -18,11 +18,11 @@ */ package org.apache.aries.jndi.legacy.support; +import javax.naming.spi.InitialContextFactoryBuilder; + import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; -import javax.naming.spi.InitialContextFactoryBuilder; - public class Activator implements BundleActivator { @Override diff --git a/jndi/jndi-legacy-support/src/main/java/org/apache/aries/jndi/legacy/support/LegacyInitialContextFinder.java b/jndi/jndi-legacy-support/src/main/java/org/apache/aries/jndi/legacy/support/LegacyInitialContextFinder.java index bcf23fc28b..2260daee1d 100644 --- a/jndi/jndi-legacy-support/src/main/java/org/apache/aries/jndi/legacy/support/LegacyInitialContextFinder.java +++ b/jndi/jndi-legacy-support/src/main/java/org/apache/aries/jndi/legacy/support/LegacyInitialContextFinder.java @@ -18,13 +18,13 @@ */ package org.apache.aries.jndi.legacy.support; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.Hashtable; import javax.naming.Context; import javax.naming.NamingException; import javax.naming.spi.InitialContextFactory; import javax.naming.spi.InitialContextFactoryBuilder; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.Hashtable; /** * Some OSGi based server runtimes, such as jetty OSGi and virgo rely on the thread context classloader diff --git a/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java b/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java index 79156a643a..1d796ff6b7 100644 --- a/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java +++ b/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java @@ -18,6 +18,9 @@ */ package org.apache.aries.jndi.rmi; +import java.util.Hashtable; +import javax.naming.spi.ObjectFactory; + import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; @@ -25,9 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.naming.spi.ObjectFactory; -import java.util.Hashtable; - public class Activator implements BundleActivator { private static final Logger LOGGER = LoggerFactory.getLogger(Activator.class.getName()); diff --git a/jndi/jndi-url-itest-web/src/main/java/org/apache/aries/jndiurl/itest/JndiUrlItestServlet.java b/jndi/jndi-url-itest-web/src/main/java/org/apache/aries/jndiurl/itest/JndiUrlItestServlet.java index 19ce6f9cad..dd551812d3 100644 --- a/jndi/jndi-url-itest-web/src/main/java/org/apache/aries/jndiurl/itest/JndiUrlItestServlet.java +++ b/jndi/jndi-url-itest-web/src/main/java/org/apache/aries/jndiurl/itest/JndiUrlItestServlet.java @@ -19,15 +19,15 @@ package org.apache.aries.jndiurl.itest; -import org.apache.aries.jndiurl.itest.beans.ConfigBean; - +import java.io.IOException; +import java.util.List; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.List; + +import org.apache.aries.jndiurl.itest.beans.ConfigBean; public class JndiUrlItestServlet extends HttpServlet { diff --git a/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java b/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java index ae69a4f01c..b2de9ab8c5 100644 --- a/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java +++ b/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java @@ -19,6 +19,18 @@ package org.apache.aries.jndi.itests; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.junitBundles; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; + import org.apache.aries.itest.AbstractIntegrationTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,16 +42,6 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; import org.osgi.framework.Bundle; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.ops4j.pax.exam.CoreOptions.*; - @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class JndiUrlIntegrationTest extends AbstractIntegrationTest { diff --git a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java index 32cb5ece85..72aa6c75a0 100644 --- a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java +++ b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java @@ -18,21 +18,38 @@ */ package org.apache.aries.jndi.services; -import org.apache.aries.jndi.url.Activator; -import org.apache.aries.jndi.url.OsgiName; -import org.apache.aries.proxy.ProxyManager; -import org.apache.aries.proxy.UnableToProxyException; -import org.osgi.framework.*; -import org.osgi.service.jndi.JNDIConstants; - -import javax.naming.NamingException; import java.lang.ref.WeakReference; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import javax.naming.NamingException; + +import org.apache.aries.jndi.url.Activator; +import org.apache.aries.jndi.url.OsgiName; +import org.apache.aries.proxy.ProxyManager; +import org.apache.aries.proxy.UnableToProxyException; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleEvent; +import org.osgi.framework.BundleListener; +import org.osgi.framework.Constants; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceEvent; +import org.osgi.framework.ServiceException; +import org.osgi.framework.ServiceListener; +import org.osgi.framework.ServiceReference; +import org.osgi.service.jndi.JNDIConstants; /** * This helper provides access to services registered in the OSGi service registry. diff --git a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/AbstractName.java b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/AbstractName.java index a9875ae25f..047d2b2454 100644 --- a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/AbstractName.java +++ b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/AbstractName.java @@ -19,11 +19,11 @@ package org.apache.aries.jndi.url; -import javax.naming.CompositeName; import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; import java.util.List; +import javax.naming.CompositeName; @SuppressWarnings("serial") public abstract class AbstractName extends CompositeName { diff --git a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/AbstractServiceRegistryContext.java b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/AbstractServiceRegistryContext.java index 1e352a6b62..c11d8c5db9 100644 --- a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/AbstractServiceRegistryContext.java +++ b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/AbstractServiceRegistryContext.java @@ -18,16 +18,20 @@ */ package org.apache.aries.jndi.url; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Map; +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.NameParser; +import javax.naming.NamingException; +import javax.naming.OperationNotSupportedException; + import org.apache.aries.jndi.spi.AugmenterInvoker; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.jndi.JNDIConstants; -import javax.naming.*; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Map; - public abstract class AbstractServiceRegistryContext implements Context { private static final String ARIES_SERVICES = "aries:services/"; diff --git a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java index df7382e389..b8ace201ef 100644 --- a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java +++ b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java @@ -18,6 +18,11 @@ */ package org.apache.aries.jndi.url; +import java.util.Hashtable; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.naming.spi.ObjectFactory; + import org.apache.aries.proxy.ProxyManager; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; @@ -25,11 +30,6 @@ import org.osgi.framework.ServiceRegistration; import org.osgi.service.jndi.JNDIConstants; -import javax.naming.spi.ObjectFactory; -import java.util.Hashtable; -import java.util.logging.Level; -import java.util.logging.Logger; - public class Activator implements BundleActivator { private static SingleServiceTracker proxyManager; private BundleContext ctx; diff --git a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContext.java b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContext.java index a6fda7ff23..d4d69d0f13 100644 --- a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContext.java +++ b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContext.java @@ -19,6 +19,28 @@ package org.apache.aries.jndi.url; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.concurrent.Semaphore; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import javax.naming.Binding; +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.NameClassPair; +import javax.naming.NameNotFoundException; +import javax.naming.NameParser; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.OperationNotSupportedException; +import javax.naming.ServiceUnavailableException; + import org.osgi.framework.Bundle; import org.osgi.framework.Constants; import org.osgi.framework.ServiceReference; @@ -27,14 +49,6 @@ import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; -import javax.naming.*; -import java.util.*; -import java.util.concurrent.Semaphore; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - public class BlueprintURLContext implements Context { static final Pattern graceP = Pattern.compile(".*;\\s*blueprint.graceperiod\\s*:=\\s*\"?([A-Za-z]+).*"); static final Pattern timeoutP = Pattern.compile(".*;\\s*blueprint.timeout\\s*:=\\s*\"?([0-9]+).*"); diff --git a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContextFactory.java b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContextFactory.java index 334fa1f36b..10f657c21f 100644 --- a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContextFactory.java +++ b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContextFactory.java @@ -19,17 +19,17 @@ package org.apache.aries.jndi.url; +import java.util.Hashtable; +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.spi.ObjectFactory; + import org.apache.aries.jndi.spi.AugmenterInvoker; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.jndi.JNDIConstants; -import javax.naming.Context; -import javax.naming.Name; -import javax.naming.spi.ObjectFactory; -import java.util.Hashtable; - public class BlueprintURLContextFactory implements ObjectFactory { private static AugmenterInvoker augmenterInvoker = null; diff --git a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContextServiceFactory.java b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContextServiceFactory.java index a3f479c38b..0b761ee5fe 100644 --- a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContextServiceFactory.java +++ b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContextServiceFactory.java @@ -19,12 +19,12 @@ package org.apache.aries.jndi.url; +import javax.naming.spi.ObjectFactory; + import org.osgi.framework.Bundle; import org.osgi.framework.ServiceFactory; import org.osgi.framework.ServiceRegistration; -import javax.naming.spi.ObjectFactory; - /** * A factory for the aries blueprint context diff --git a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiName.java b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiName.java index a3aee5e123..ba237bd565 100644 --- a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiName.java +++ b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiName.java @@ -18,9 +18,9 @@ */ package org.apache.aries.jndi.url; +import java.util.Enumeration; import javax.naming.InvalidNameException; import javax.naming.Name; -import java.util.Enumeration; /** * A composite name for the aries namespace. This provides useful utility methods diff --git a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiURLContextFactory.java b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiURLContextFactory.java index aff4e76b57..14a5eefc15 100644 --- a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiURLContextFactory.java +++ b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiURLContextFactory.java @@ -18,14 +18,14 @@ */ package org.apache.aries.jndi.url; -import org.osgi.framework.BundleContext; - +import java.util.Hashtable; import javax.naming.ConfigurationException; import javax.naming.Context; import javax.naming.Name; import javax.naming.NamingException; import javax.naming.spi.ObjectFactory; -import java.util.Hashtable; + +import org.osgi.framework.BundleContext; /** * A factory for the aries JNDI context diff --git a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiURLContextServiceFactory.java b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiURLContextServiceFactory.java index 68453b85fd..25a401b0e3 100644 --- a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiURLContextServiceFactory.java +++ b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiURLContextServiceFactory.java @@ -18,12 +18,12 @@ */ package org.apache.aries.jndi.url; +import javax.naming.spi.ObjectFactory; + import org.osgi.framework.Bundle; import org.osgi.framework.ServiceFactory; import org.osgi.framework.ServiceRegistration; -import javax.naming.spi.ObjectFactory; - /** * A factory for the aries JNDI context */ diff --git a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java index 6373976b18..72fe9ac227 100644 --- a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java +++ b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java @@ -18,15 +18,20 @@ */ package org.apache.aries.jndi.url; -import org.apache.aries.jndi.services.ServiceHelper; -import org.osgi.framework.AdminPermission; -import org.osgi.framework.BundleContext; - -import javax.naming.*; import java.security.AccessControlException; -import java.security.AccessController; import java.util.Hashtable; import java.util.Map; +import javax.naming.Binding; +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.NameClassPair; +import javax.naming.NameNotFoundException; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; + +import org.apache.aries.jndi.services.ServiceHelper; +import org.osgi.framework.AdminPermission; +import org.osgi.framework.BundleContext; /** * A JNDI context for looking stuff up from the service registry. diff --git a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryListContext.java b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryListContext.java index 982e11a2ba..bc202a5693 100644 --- a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryListContext.java +++ b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryListContext.java @@ -18,15 +18,21 @@ */ package org.apache.aries.jndi.url; +import java.util.Map; +import java.util.NoSuchElementException; +import javax.naming.Binding; +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.NameClassPair; +import javax.naming.NameNotFoundException; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; + import org.apache.aries.jndi.services.ServiceHelper; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.framework.ServiceReference; -import javax.naming.*; -import java.util.Map; -import java.util.NoSuchElementException; - public class ServiceRegistryListContext extends AbstractServiceRegistryContext implements Context { /** * The osgi lookup name diff --git a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/SingleServiceTracker.java b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/SingleServiceTracker.java index 8a1955fe78..d67ba2bd83 100644 --- a/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/SingleServiceTracker.java +++ b/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/SingleServiceTracker.java @@ -18,13 +18,19 @@ */ package org.apache.aries.jndi.url; -import org.osgi.framework.*; - import java.util.Arrays; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; +import org.osgi.framework.BundleContext; +import org.osgi.framework.Constants; +import org.osgi.framework.Filter; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceEvent; +import org.osgi.framework.ServiceListener; +import org.osgi.framework.ServiceReference; + //This is from aries util public final class SingleServiceTracker implements ServiceListener { diff --git a/jndi/jndi-url/src/test/java/org/apache/aries/jndi/services/ServiceHelperTest.java b/jndi/jndi-url/src/test/java/org/apache/aries/jndi/services/ServiceHelperTest.java index 2eca3a4614..20590cc238 100644 --- a/jndi/jndi-url/src/test/java/org/apache/aries/jndi/services/ServiceHelperTest.java +++ b/jndi/jndi-url/src/test/java/org/apache/aries/jndi/services/ServiceHelperTest.java @@ -18,13 +18,12 @@ */ package org.apache.aries.jndi.services; +import static org.junit.Assert.assertTrue; + import java.util.Collection; -import org.apache.aries.jndi.services.ServiceHelper; import org.junit.Test; -import static org.junit.Assert.assertTrue; - public class ServiceHelperTest { interface A {}; diff --git a/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/BlueprintURLContextTest.java b/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/BlueprintURLContextTest.java index 4e69054671..21b3bf3883 100644 --- a/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/BlueprintURLContextTest.java +++ b/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/BlueprintURLContextTest.java @@ -22,15 +22,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Arrays; import java.util.HashSet; import java.util.Hashtable; import java.util.Properties; import java.util.Set; - import javax.naming.Binding; import javax.naming.Context; import javax.naming.InitialContext; diff --git a/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/ServiceRegistryContextTest.java b/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/ServiceRegistryContextTest.java index 72ea06d81c..d64f1b1cb7 100644 --- a/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/ServiceRegistryContextTest.java +++ b/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/ServiceRegistryContextTest.java @@ -18,6 +18,31 @@ */ package org.apache.aries.jndi.url; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.sql.SQLException; +import java.util.Collection; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Properties; +import java.util.concurrent.Callable; +import javax.naming.Binding; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NameClassPair; +import javax.naming.NameNotFoundException; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.spi.ObjectFactory; +import javax.sql.DataSource; + import org.apache.aries.jndi.api.JNDIConstants; import org.apache.aries.mocks.BundleContextMock; import org.apache.aries.mocks.BundleMock; @@ -36,31 +61,6 @@ import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; -import javax.naming.Binding; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NameClassPair; -import javax.naming.NameNotFoundException; -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.spi.ObjectFactory; -import javax.sql.DataSource; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.sql.SQLException; -import java.util.Collection; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.Properties; -import java.util.concurrent.Callable; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; - /** * Tests for our JNDI implementation for the service registry. */ diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java index 7b435ca967..60d1c59ed3 100644 --- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java +++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java @@ -30,9 +30,9 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.UUID; -import java.util.Map.Entry; import java.util.concurrent.Callable; import org.apache.aries.proxy.InvocationListener; diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java index cd518adced..38bbe8aaaa 100644 --- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java +++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java @@ -28,7 +28,9 @@ import static org.apache.aries.proxy.impl.common.AbstractWovenProxyAdapter.OBJECT_TYPE; import static org.apache.aries.proxy.impl.common.AbstractWovenProxyAdapter.THROWABLE_INAME; import static org.apache.aries.proxy.impl.common.AbstractWovenProxyAdapter.WOVEN_PROXY_IFACE_TYPE; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.ACONST_NULL; +import static org.objectweb.asm.Opcodes.ASM9; +import static org.objectweb.asm.Opcodes.IFNE; import java.util.Arrays; 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 f54cdbc766..f04bf374d1 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 @@ -18,6 +18,8 @@ */ package org.apache.aries.proxy.impl.weaving; +import static org.objectweb.asm.Opcodes.ASM9; + import java.lang.reflect.Modifier; import org.objectweb.asm.FieldVisitor; @@ -25,8 +27,6 @@ import org.objectweb.asm.Type; import org.objectweb.asm.commons.SerialVersionUIDAdder; -import static org.objectweb.asm.Opcodes.ASM9; - class SyntheticSerialVerUIDAdder extends SerialVersionUIDAdder { private WovenProxyAdapter wpa; 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 b0f4da05b3..2c1407a934 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 @@ -18,25 +18,25 @@ */ package org.apache.aries.blueprint.proxy; -import org.apache.aries.blueprint.proxy.ProxyTestClassInnerClasses.ProxyTestClassInner; -import org.apache.aries.blueprint.proxy.ProxyTestClassInnerClasses.ProxyTestClassStaticInner; -import org.apache.aries.proxy.InvocationListener; -import org.apache.aries.proxy.impl.SingleInstanceDispatcher; -import org.junit.Test; -import org.osgi.framework.wiring.BundleWiring; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.concurrent.Callable; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.concurrent.Callable; + +import org.apache.aries.blueprint.proxy.ProxyTestClassInnerClasses.ProxyTestClassInner; +import org.apache.aries.blueprint.proxy.ProxyTestClassInnerClasses.ProxyTestClassStaticInner; +import org.apache.aries.proxy.InvocationListener; +import org.apache.aries.proxy.impl.SingleInstanceDispatcher; +import org.junit.Test; +import org.osgi.framework.wiring.BundleWiring; + public abstract class AbstractProxyTest { protected static class TestListener implements InvocationListener { diff --git a/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/complex/AriesTransactionManager.java b/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/complex/AriesTransactionManager.java index bf97d6593e..8281e7d3d2 100644 --- a/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/complex/AriesTransactionManager.java +++ b/proxy/proxy-impl/src/test/java/org/apache/aries/blueprint/proxy/complex/AriesTransactionManager.java @@ -18,16 +18,16 @@ */ package org.apache.aries.blueprint.proxy.complex; -import org.apache.aries.blueprint.proxy.complex.manager.MonitorableTransactionManager; -import org.apache.aries.blueprint.proxy.complex.manager.RecoverableTransactionManager; -import org.apache.aries.blueprint.proxy.complex.manager.XAWork; -import org.apache.aries.blueprint.proxy.complex.manager.XidImporter; - import javax.resource.spi.XATerminator; import javax.transaction.TransactionManager; import javax.transaction.TransactionSynchronizationRegistry; import javax.transaction.UserTransaction; +import org.apache.aries.blueprint.proxy.complex.manager.MonitorableTransactionManager; +import org.apache.aries.blueprint.proxy.complex.manager.RecoverableTransactionManager; +import org.apache.aries.blueprint.proxy.complex.manager.XAWork; +import org.apache.aries.blueprint.proxy.complex.manager.XidImporter; + public interface AriesTransactionManager extends TransactionManager, UserTransaction, TransactionSynchronizationRegistry, XidImporter, diff --git a/proxy/proxy-impl/src/test/java/org/apache/aries/proxy/impl/weaving/ProxyWeavingHookTest.java b/proxy/proxy-impl/src/test/java/org/apache/aries/proxy/impl/weaving/ProxyWeavingHookTest.java index b2b8296ebc..b82646c3e9 100644 --- a/proxy/proxy-impl/src/test/java/org/apache/aries/proxy/impl/weaving/ProxyWeavingHookTest.java +++ b/proxy/proxy-impl/src/test/java/org/apache/aries/proxy/impl/weaving/ProxyWeavingHookTest.java @@ -18,6 +18,9 @@ */ package org.apache.aries.proxy.impl.weaving; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -25,9 +28,6 @@ import org.junit.Test; import org.osgi.framework.BundleContext; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class ProxyWeavingHookTest { @Test diff --git a/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java b/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java index dc603d4f89..dfa974d077 100644 --- a/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java +++ b/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/AbstractProxyTest.java @@ -18,12 +18,27 @@ */ package org.apache.aries.proxy.itests; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.junitBundles; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; + +import java.lang.reflect.Method; +import java.util.AbstractList; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.Callable; +import javax.inject.Inject; + import org.apache.aries.itest.AbstractIntegrationTest; import org.apache.aries.proxy.InvocationListener; import org.apache.aries.proxy.ProxyManager; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; @@ -31,22 +46,6 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; -import javax.inject.Inject; -import java.lang.reflect.Method; -import java.util.AbstractList; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.concurrent.Callable; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.junitBundles; -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; - @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public abstract class AbstractProxyTest extends AbstractIntegrationTest { diff --git a/pushstream/pushstream/src/main/java/org/apache/aries/pushstream/AbstractPushStreamImpl.java b/pushstream/pushstream/src/main/java/org/apache/aries/pushstream/AbstractPushStreamImpl.java index 36a92fc76d..3ddec12c1d 100644 --- a/pushstream/pushstream/src/main/java/org/apache/aries/pushstream/AbstractPushStreamImpl.java +++ b/pushstream/pushstream/src/main/java/org/apache/aries/pushstream/AbstractPushStreamImpl.java @@ -20,8 +20,10 @@ import static java.util.Collections.emptyList; import static java.util.concurrent.TimeUnit.NANOSECONDS; -import static org.apache.aries.pushstream.AbstractPushStreamImpl.State.*; -import static org.osgi.util.pushstream.PushEventConsumer.*; +import static org.apache.aries.pushstream.AbstractPushStreamImpl.State.BUILDING; +import static org.apache.aries.pushstream.AbstractPushStreamImpl.State.CLOSED; +import static org.osgi.util.pushstream.PushEventConsumer.ABORT; +import static org.osgi.util.pushstream.PushEventConsumer.CONTINUE; import java.time.Duration; import java.util.AbstractQueue; @@ -65,12 +67,12 @@ import org.osgi.util.promise.Deferred; import org.osgi.util.promise.Promise; import org.osgi.util.pushstream.PushEvent; +import org.osgi.util.pushstream.PushEvent.EventType; import org.osgi.util.pushstream.PushEventConsumer; import org.osgi.util.pushstream.PushEventSource; import org.osgi.util.pushstream.PushStream; import org.osgi.util.pushstream.PushStreamBuilder; import org.osgi.util.pushstream.PushStreamProvider; -import org.osgi.util.pushstream.PushEvent.EventType; public abstract class AbstractPushStreamImpl implements PushStream { diff --git a/pushstream/pushstream/src/main/java/org/apache/aries/pushstream/IntermediatePushStreamImpl.java b/pushstream/pushstream/src/main/java/org/apache/aries/pushstream/IntermediatePushStreamImpl.java index 51ddf001ce..f1b6c466c0 100644 --- a/pushstream/pushstream/src/main/java/org/apache/aries/pushstream/IntermediatePushStreamImpl.java +++ b/pushstream/pushstream/src/main/java/org/apache/aries/pushstream/IntermediatePushStreamImpl.java @@ -18,7 +18,8 @@ */ package org.apache.aries.pushstream; -import static org.apache.aries.pushstream.AbstractPushStreamImpl.State.*; +import static org.apache.aries.pushstream.AbstractPushStreamImpl.State.BUILDING; +import static org.apache.aries.pushstream.AbstractPushStreamImpl.State.STARTED; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; diff --git a/pushstream/pushstream/src/main/java/org/apache/aries/pushstream/UnbufferedPushStreamImpl.java b/pushstream/pushstream/src/main/java/org/apache/aries/pushstream/UnbufferedPushStreamImpl.java index ef23c7fe19..6d133293ef 100644 --- a/pushstream/pushstream/src/main/java/org/apache/aries/pushstream/UnbufferedPushStreamImpl.java +++ b/pushstream/pushstream/src/main/java/org/apache/aries/pushstream/UnbufferedPushStreamImpl.java @@ -19,7 +19,9 @@ package org.apache.aries.pushstream; import static java.util.Optional.ofNullable; -import static org.apache.aries.pushstream.AbstractPushStreamImpl.State.*; +import static org.apache.aries.pushstream.AbstractPushStreamImpl.State.BUILDING; +import static org.apache.aries.pushstream.AbstractPushStreamImpl.State.CLOSED; +import static org.apache.aries.pushstream.AbstractPushStreamImpl.State.STARTED; import java.util.concurrent.BlockingQueue; import java.util.concurrent.Executor; diff --git a/pushstream/pushstream/src/main/java/org/osgi/util/pushstream/PushEvent.java b/pushstream/pushstream/src/main/java/org/osgi/util/pushstream/PushEvent.java index 028f0a3929..62b70095d7 100644 --- a/pushstream/pushstream/src/main/java/org/osgi/util/pushstream/PushEvent.java +++ b/pushstream/pushstream/src/main/java/org/osgi/util/pushstream/PushEvent.java @@ -16,7 +16,9 @@ package org.osgi.util.pushstream; -import static org.osgi.util.pushstream.PushEvent.EventType.*; +import static org.osgi.util.pushstream.PushEvent.EventType.CLOSE; +import static org.osgi.util.pushstream.PushEvent.EventType.DATA; +import static org.osgi.util.pushstream.PushEvent.EventType.ERROR; /** * A PushEvent is an immutable object that is transferred through a diff --git a/pushstream/pushstream/src/main/java/org/osgi/util/pushstream/PushbackPolicy.java b/pushstream/pushstream/src/main/java/org/osgi/util/pushstream/PushbackPolicy.java index 648edddb1b..168b8a24f2 100644 --- a/pushstream/pushstream/src/main/java/org/osgi/util/pushstream/PushbackPolicy.java +++ b/pushstream/pushstream/src/main/java/org/osgi/util/pushstream/PushbackPolicy.java @@ -17,6 +17,7 @@ package org.osgi.util.pushstream; import java.util.concurrent.BlockingQueue; + import org.osgi.annotation.versioning.ConsumerType; /** diff --git a/quiesce/quiesce-api/src/main/java/org/apache/aries/quiesce/participant/QuiesceParticipant.java b/quiesce/quiesce-api/src/main/java/org/apache/aries/quiesce/participant/QuiesceParticipant.java index df09f2703e..22e499a3cf 100644 --- a/quiesce/quiesce-api/src/main/java/org/apache/aries/quiesce/participant/QuiesceParticipant.java +++ b/quiesce/quiesce-api/src/main/java/org/apache/aries/quiesce/participant/QuiesceParticipant.java @@ -19,6 +19,7 @@ package org.apache.aries.quiesce.participant; import java.util.List; + import org.apache.aries.quiesce.manager.QuiesceCallback; import org.osgi.framework.Bundle; diff --git a/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java b/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java index 67acc59735..5a6f72fd95 100644 --- a/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java +++ b/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java @@ -15,6 +15,13 @@ */ package org.apache.aries.quiesce.manager.itest; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.junitBundles; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -33,20 +40,9 @@ import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerClass; import org.ops4j.pax.exam.spi.reactors.PerMethod; import org.osgi.framework.Bundle; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.junitBundles; -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; -import static org.ops4j.pax.exam.CoreOptions.systemProperty; -import static org.ops4j.pax.exam.CoreOptions.vmOption; -import static org.ops4j.pax.exam.CoreOptions.when; - @RunWith(PaxExam.class) @ExamReactorStrategy(PerMethod.class) public class QuiesceManagerTest extends AbstractIntegrationTest { diff --git a/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeServicesManager.java b/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeServicesManager.java index 671e9b5f01..5465c77edb 100644 --- a/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeServicesManager.java +++ b/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/TradeServicesManager.java @@ -17,7 +17,6 @@ package org.apache.aries.samples.ariestrader.api; import java.util.ArrayList; -import java.util.List; import org.apache.aries.samples.ariestrader.api.persistence.MarketSummaryDataBean; diff --git a/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/MarketSummaryDataBean.java b/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/MarketSummaryDataBean.java index a5fff45170..1076ddc9f4 100644 --- a/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/MarketSummaryDataBean.java +++ b/samples/ariestrader/modules/ariestrader-api/src/main/java/org/apache/aries/samples/ariestrader/api/persistence/MarketSummaryDataBean.java @@ -18,14 +18,12 @@ import java.io.Serializable; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.Iterator; import org.apache.aries.samples.ariestrader.util.FinancialUtils; import org.apache.aries.samples.ariestrader.util.Log; -import org.apache.aries.samples.ariestrader.util.TradeConfig; public class MarketSummaryDataBean implements Serializable { diff --git a/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountDataBeanImpl.java b/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountDataBeanImpl.java index fa2213d5bd..204eb35247 100644 --- a/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountDataBeanImpl.java +++ b/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountDataBeanImpl.java @@ -22,12 +22,12 @@ import java.util.Collection; import java.util.Date; -import org.apache.aries.samples.ariestrader.util.Log; -import org.apache.aries.samples.ariestrader.util.TradeConfig; import org.apache.aries.samples.ariestrader.api.persistence.AccountDataBean; import org.apache.aries.samples.ariestrader.api.persistence.AccountProfileDataBean; import org.apache.aries.samples.ariestrader.api.persistence.HoldingDataBean; import org.apache.aries.samples.ariestrader.api.persistence.OrderDataBean; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; public class AccountDataBeanImpl implements AccountDataBean, Serializable { diff --git a/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountProfileDataBeanImpl.java b/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountProfileDataBeanImpl.java index 8fa60afe38..3321fd70c6 100644 --- a/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountProfileDataBeanImpl.java +++ b/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/AccountProfileDataBeanImpl.java @@ -16,10 +16,10 @@ */ package org.apache.aries.samples.ariestrader.beans; -import org.apache.aries.samples.ariestrader.util.Log; -import org.apache.aries.samples.ariestrader.util.TradeConfig; import org.apache.aries.samples.ariestrader.api.persistence.AccountDataBean; import org.apache.aries.samples.ariestrader.api.persistence.AccountProfileDataBean; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; public class AccountProfileDataBeanImpl implements AccountProfileDataBean, java.io.Serializable { diff --git a/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/HoldingDataBeanImpl.java b/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/HoldingDataBeanImpl.java index d902520096..d579ea14e8 100644 --- a/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/HoldingDataBeanImpl.java +++ b/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/HoldingDataBeanImpl.java @@ -20,11 +20,11 @@ import java.math.BigDecimal; import java.util.Date; -import org.apache.aries.samples.ariestrader.util.Log; -import org.apache.aries.samples.ariestrader.util.TradeConfig; import org.apache.aries.samples.ariestrader.api.persistence.AccountDataBean; import org.apache.aries.samples.ariestrader.api.persistence.HoldingDataBean; import org.apache.aries.samples.ariestrader.api.persistence.QuoteDataBean; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; public class HoldingDataBeanImpl implements HoldingDataBean, Serializable { diff --git a/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/OrderDataBeanImpl.java b/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/OrderDataBeanImpl.java index e56571857a..f5d9643b47 100644 --- a/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/OrderDataBeanImpl.java +++ b/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/OrderDataBeanImpl.java @@ -20,12 +20,12 @@ import java.math.BigDecimal; import java.util.Date; -import org.apache.aries.samples.ariestrader.util.Log; -import org.apache.aries.samples.ariestrader.util.TradeConfig; import org.apache.aries.samples.ariestrader.api.persistence.AccountDataBean; import org.apache.aries.samples.ariestrader.api.persistence.HoldingDataBean; import org.apache.aries.samples.ariestrader.api.persistence.OrderDataBean; import org.apache.aries.samples.ariestrader.api.persistence.QuoteDataBean; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; public class OrderDataBeanImpl implements OrderDataBean, Serializable { diff --git a/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/QuoteDataBeanImpl.java b/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/QuoteDataBeanImpl.java index 1bdc190eaa..759ec561ce 100644 --- a/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/QuoteDataBeanImpl.java +++ b/samples/ariestrader/modules/ariestrader-beans/src/main/java/org/apache/aries/samples/ariestrader/beans/QuoteDataBeanImpl.java @@ -18,9 +18,10 @@ import java.io.Serializable; import java.math.BigDecimal; + +import org.apache.aries.samples.ariestrader.api.persistence.QuoteDataBean; import org.apache.aries.samples.ariestrader.util.Log; import org.apache.aries.samples.ariestrader.util.TradeConfig; -import org.apache.aries.samples.ariestrader.api.persistence.QuoteDataBean; public class QuoteDataBeanImpl implements QuoteDataBean, Serializable { diff --git a/samples/ariestrader/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java b/samples/ariestrader/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java index 83ee8d08e1..5716e2f3de 100644 --- a/samples/ariestrader/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java +++ b/samples/ariestrader/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeDBManagerImpl.java @@ -16,23 +16,22 @@ */ package org.apache.aries.samples.ariestrader.core; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; import javax.sql.DataSource; import org.apache.aries.blueprint.annotation.bean.Bean; import org.apache.aries.blueprint.annotation.service.Service; +import org.apache.aries.samples.ariestrader.api.TradeDBManager; import org.apache.aries.samples.ariestrader.api.persistence.RunStatsDataBean; import org.apache.aries.samples.ariestrader.util.Log; import org.apache.aries.samples.ariestrader.util.MDBStats; import org.apache.aries.samples.ariestrader.util.ServiceUtilities; import org.apache.aries.samples.ariestrader.util.TradeConfig; -import org.apache.aries.samples.ariestrader.api.TradeDBManager; - -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; /** diff --git a/samples/ariestrader/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeServicesManagerImpl.java b/samples/ariestrader/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeServicesManagerImpl.java index 169c3bf796..acb3c36e9d 100644 --- a/samples/ariestrader/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeServicesManagerImpl.java +++ b/samples/ariestrader/modules/ariestrader-core/src/main/java/org/apache/aries/samples/ariestrader/core/TradeServicesManagerImpl.java @@ -22,11 +22,11 @@ import org.apache.aries.blueprint.annotation.bean.Bean; import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener; import org.apache.aries.blueprint.annotation.service.Service; +import org.apache.aries.samples.ariestrader.api.TradeServices; +import org.apache.aries.samples.ariestrader.api.TradeServicesManager; import org.apache.aries.samples.ariestrader.api.persistence.MarketSummaryDataBean; import org.apache.aries.samples.ariestrader.util.Log; import org.apache.aries.samples.ariestrader.util.TradeConfig; -import org.apache.aries.samples.ariestrader.api.TradeServicesManager; -import org.apache.aries.samples.ariestrader.api.TradeServices; /** diff --git a/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java b/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java index 569c48783c..f9ce95ec6c 100644 --- a/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java +++ b/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountDataBeanImpl.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -40,12 +39,12 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.apache.aries.samples.ariestrader.util.Log; -import org.apache.aries.samples.ariestrader.util.TradeConfig; import org.apache.aries.samples.ariestrader.api.persistence.AccountDataBean; import org.apache.aries.samples.ariestrader.api.persistence.AccountProfileDataBean; import org.apache.aries.samples.ariestrader.api.persistence.HoldingDataBean; import org.apache.aries.samples.ariestrader.api.persistence.OrderDataBean; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; @Entity (name = "accountejb") @Table(name = "accountejb") diff --git a/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java b/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java index bbcd78ca7b..97ccbc1f20 100644 --- a/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java +++ b/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/AccountProfileDataBeanImpl.java @@ -25,10 +25,10 @@ import javax.persistence.OneToOne; import javax.persistence.Table; -import org.apache.aries.samples.ariestrader.util.Log; -import org.apache.aries.samples.ariestrader.util.TradeConfig; import org.apache.aries.samples.ariestrader.api.persistence.AccountDataBean; import org.apache.aries.samples.ariestrader.api.persistence.AccountProfileDataBean; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; @Entity(name = "accountprofileejb") @Table(name = "accountprofileejb") diff --git a/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java b/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java index aedd426246..88092f31e3 100644 --- a/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java +++ b/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/HoldingDataBeanImpl.java @@ -19,7 +19,6 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -34,11 +33,11 @@ import javax.persistence.TableGenerator; import javax.persistence.Transient; -import org.apache.aries.samples.ariestrader.util.Log; -import org.apache.aries.samples.ariestrader.util.TradeConfig; import org.apache.aries.samples.ariestrader.api.persistence.AccountDataBean; import org.apache.aries.samples.ariestrader.api.persistence.HoldingDataBean; import org.apache.aries.samples.ariestrader.api.persistence.QuoteDataBean; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; @Entity(name = "holdingejb") @Table(name = "holdingejb") diff --git a/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java b/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java index 196713e08a..2bca545b6e 100644 --- a/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java +++ b/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/OrderDataBeanImpl.java @@ -19,7 +19,6 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -37,12 +36,12 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.apache.aries.samples.ariestrader.util.Log; -import org.apache.aries.samples.ariestrader.util.TradeConfig; import org.apache.aries.samples.ariestrader.api.persistence.AccountDataBean; import org.apache.aries.samples.ariestrader.api.persistence.HoldingDataBean; import org.apache.aries.samples.ariestrader.api.persistence.OrderDataBean; import org.apache.aries.samples.ariestrader.api.persistence.QuoteDataBean; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; @Entity(name = "orderejb") @Table(name = "orderejb") diff --git a/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/QuoteDataBeanImpl.java b/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/QuoteDataBeanImpl.java index 7f30ad64ed..91078b2e37 100644 --- a/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/QuoteDataBeanImpl.java +++ b/samples/ariestrader/modules/ariestrader-entities/src/main/java/org/apache/aries/samples/ariestrader/entities/QuoteDataBeanImpl.java @@ -18,7 +18,6 @@ import java.io.Serializable; import java.math.BigDecimal; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; @@ -28,9 +27,9 @@ import javax.persistence.NamedQuery; import javax.persistence.Table; +import org.apache.aries.samples.ariestrader.api.persistence.QuoteDataBean; import org.apache.aries.samples.ariestrader.util.Log; import org.apache.aries.samples.ariestrader.util.TradeConfig; -import org.apache.aries.samples.ariestrader.api.persistence.QuoteDataBean; @Entity(name = "quoteejb") @Table(name = "quoteejb") diff --git a/samples/ariestrader/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/KeySequenceDirect.java b/samples/ariestrader/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/KeySequenceDirect.java index 24f8a632aa..a2f8efd295 100644 --- a/samples/ariestrader/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/KeySequenceDirect.java +++ b/samples/ariestrader/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/KeySequenceDirect.java @@ -16,15 +16,16 @@ */ package org.apache.aries.samples.ariestrader.persist.jdbc; -import java.util.Collection; -import java.util.Iterator; -import java.util.HashMap; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; -import org.apache.aries.samples.ariestrader.util.*; +import org.apache.aries.samples.ariestrader.util.KeyBlock; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; public class KeySequenceDirect { diff --git a/samples/ariestrader/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java b/samples/ariestrader/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java index 9efae30a76..8893c2fa68 100644 --- a/samples/ariestrader/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java +++ b/samples/ariestrader/modules/ariestrader-persist-jdbc/src/main/java/org/apache/aries/samples/ariestrader/persist/jdbc/TradeJdbc.java @@ -17,8 +17,12 @@ package org.apache.aries.samples.ariestrader.persist.jdbc; import java.math.BigDecimal; -import java.util.Collection; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.Timestamp; import java.util.ArrayList; +import java.util.Collection; import javax.inject.Inject; import javax.sql.DataSource; @@ -26,27 +30,22 @@ import org.apache.aries.blueprint.annotation.service.Service; import org.apache.aries.blueprint.annotation.service.ServiceProperty; import org.apache.aries.samples.ariestrader.api.TradeServices; -import org.apache.aries.samples.ariestrader.beans.AccountDataBeanImpl; -import org.apache.aries.samples.ariestrader.beans.AccountProfileDataBeanImpl; -import org.apache.aries.samples.ariestrader.beans.HoldingDataBeanImpl; -import org.apache.aries.samples.ariestrader.beans.OrderDataBeanImpl; -import org.apache.aries.samples.ariestrader.beans.QuoteDataBeanImpl; import org.apache.aries.samples.ariestrader.api.persistence.AccountDataBean; import org.apache.aries.samples.ariestrader.api.persistence.AccountProfileDataBean; import org.apache.aries.samples.ariestrader.api.persistence.HoldingDataBean; import org.apache.aries.samples.ariestrader.api.persistence.MarketSummaryDataBean; import org.apache.aries.samples.ariestrader.api.persistence.OrderDataBean; import org.apache.aries.samples.ariestrader.api.persistence.QuoteDataBean; +import org.apache.aries.samples.ariestrader.beans.AccountDataBeanImpl; +import org.apache.aries.samples.ariestrader.beans.AccountProfileDataBeanImpl; +import org.apache.aries.samples.ariestrader.beans.HoldingDataBeanImpl; +import org.apache.aries.samples.ariestrader.beans.OrderDataBeanImpl; +import org.apache.aries.samples.ariestrader.beans.QuoteDataBeanImpl; import org.apache.aries.samples.ariestrader.util.FinancialUtils; import org.apache.aries.samples.ariestrader.util.Log; import org.apache.aries.samples.ariestrader.util.ServiceUtilities; import org.apache.aries.samples.ariestrader.util.TradeConfig; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.Timestamp; - /** * TradeJdbc uses direct JDBC access to a diff --git a/samples/ariestrader/modules/ariestrader-persist-jpa-am/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/am/TradeJpaAm.java b/samples/ariestrader/modules/ariestrader-persist-jpa-am/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/am/TradeJpaAm.java index 55302194e5..9fd149e151 100644 --- a/samples/ariestrader/modules/ariestrader-persist-jpa-am/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/am/TradeJpaAm.java +++ b/samples/ariestrader/modules/ariestrader-persist-jpa-am/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/am/TradeJpaAm.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; - import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.PersistenceUnit; @@ -31,17 +30,17 @@ import org.apache.aries.blueprint.annotation.service.Service; import org.apache.aries.blueprint.annotation.service.ServiceProperty; import org.apache.aries.samples.ariestrader.api.TradeServices; -import org.apache.aries.samples.ariestrader.entities.AccountDataBeanImpl; -import org.apache.aries.samples.ariestrader.entities.AccountProfileDataBeanImpl; -import org.apache.aries.samples.ariestrader.entities.HoldingDataBeanImpl; -import org.apache.aries.samples.ariestrader.entities.OrderDataBeanImpl; -import org.apache.aries.samples.ariestrader.entities.QuoteDataBeanImpl; import org.apache.aries.samples.ariestrader.api.persistence.AccountDataBean; import org.apache.aries.samples.ariestrader.api.persistence.AccountProfileDataBean; import org.apache.aries.samples.ariestrader.api.persistence.HoldingDataBean; import org.apache.aries.samples.ariestrader.api.persistence.MarketSummaryDataBean; import org.apache.aries.samples.ariestrader.api.persistence.OrderDataBean; import org.apache.aries.samples.ariestrader.api.persistence.QuoteDataBean; +import org.apache.aries.samples.ariestrader.entities.AccountDataBeanImpl; +import org.apache.aries.samples.ariestrader.entities.AccountProfileDataBeanImpl; +import org.apache.aries.samples.ariestrader.entities.HoldingDataBeanImpl; +import org.apache.aries.samples.ariestrader.entities.OrderDataBeanImpl; +import org.apache.aries.samples.ariestrader.entities.QuoteDataBeanImpl; import org.apache.aries.samples.ariestrader.util.FinancialUtils; import org.apache.aries.samples.ariestrader.util.Log; import org.apache.aries.samples.ariestrader.util.TradeConfig; diff --git a/samples/ariestrader/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/cm/TradeJpaCm.java b/samples/ariestrader/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/cm/TradeJpaCm.java index ffbd55463b..ff34877009 100644 --- a/samples/ariestrader/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/cm/TradeJpaCm.java +++ b/samples/ariestrader/modules/ariestrader-persist-jpa-cm/src/main/java/org/apache/aries/samples/ariestrader/persist/jpa/cm/TradeJpaCm.java @@ -16,6 +16,16 @@ */ package org.apache.aries.samples.ariestrader.persist.jpa.cm; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.Query; +import javax.transaction.Transactional; + import org.apache.aries.blueprint.annotation.bean.Bean; import org.apache.aries.blueprint.annotation.service.Service; import org.apache.aries.blueprint.annotation.service.ServiceProperty; @@ -35,16 +45,6 @@ import org.apache.aries.samples.ariestrader.util.Log; import org.apache.aries.samples.ariestrader.util.TradeConfig; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.transaction.Transactional; -import java.math.BigDecimal; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; - /** * TradeJpaCm uses JPA via Container Managed (CM) Entity * Managers to implement the business methods of the Trade diff --git a/samples/ariestrader/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/Log.java b/samples/ariestrader/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/Log.java index 546a405361..775367890b 100644 --- a/samples/ariestrader/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/Log.java +++ b/samples/ariestrader/modules/ariestrader-util/src/main/java/org/apache/aries/samples/ariestrader/util/Log.java @@ -16,12 +16,12 @@ */ package org.apache.aries.samples.ariestrader.util; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Collection; import java.util.Iterator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class Log { private final static Logger log = LoggerFactory.getLogger(Log.class); //A general purpose, high performance logging, tracing, statistic service diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/OrdersAlertFilter.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/OrdersAlertFilter.java index 1dfe873efe..4dce1caede 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/OrdersAlertFilter.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/OrdersAlertFilter.java @@ -17,13 +17,19 @@ package org.apache.aries.samples.ariestrader.web; import java.io.IOException; -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; -import org.apache.aries.samples.ariestrader.api.TradeServicesManager; import org.apache.aries.samples.ariestrader.api.TradeServiceUtilities; import org.apache.aries.samples.ariestrader.api.TradeServices; -import org.apache.aries.samples.ariestrader.util.*; +import org.apache.aries.samples.ariestrader.api.TradeServicesManager; +import org.apache.aries.samples.ariestrader.util.Log; public class OrdersAlertFilter implements Filter { diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeAppServlet.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeAppServlet.java index ad728b7af8..0c1d691e88 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeAppServlet.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeAppServlet.java @@ -16,15 +16,19 @@ */ package org.apache.aries.samples.ariestrader.web; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; -import org.apache.aries.samples.ariestrader.api.TradeServicesManager; import org.apache.aries.samples.ariestrader.api.TradeServiceUtilities; import org.apache.aries.samples.ariestrader.api.TradeServices; -import org.apache.aries.samples.ariestrader.util.*; - -import java.io.IOException; +import org.apache.aries.samples.ariestrader.api.TradeServicesManager; +import org.apache.aries.samples.ariestrader.util.TradeConfig; /** diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java index 7a77d57160..6c3b7304bf 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeBuildDB.java @@ -18,18 +18,19 @@ import java.io.BufferedReader; import java.io.File; -import java.io.InputStreamReader; import java.io.IOException; +import java.io.InputStreamReader; import java.math.BigDecimal; import java.net.URL; import java.util.ArrayList; import org.apache.aries.samples.ariestrader.api.TradeDBManager; -import org.apache.aries.samples.ariestrader.api.TradeServicesManager; import org.apache.aries.samples.ariestrader.api.TradeServiceUtilities; import org.apache.aries.samples.ariestrader.api.TradeServices; -import org.apache.aries.samples.ariestrader.api.persistence.*; -import org.apache.aries.samples.ariestrader.util.*; +import org.apache.aries.samples.ariestrader.api.TradeServicesManager; +import org.apache.aries.samples.ariestrader.api.persistence.AccountDataBean; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; /** * TradeBuildDB uses operations provided by the TradeApplication to diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeConfigServlet.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeConfigServlet.java index fedece3df0..17124987c6 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeConfigServlet.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeConfigServlet.java @@ -16,8 +16,12 @@ */ package org.apache.aries.samples.ariestrader.web; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.aries.samples.ariestrader.api.TradeDBManager; import org.apache.aries.samples.ariestrader.api.TradeServiceUtilities; @@ -25,8 +29,6 @@ import org.apache.aries.samples.ariestrader.util.Log; import org.apache.aries.samples.ariestrader.util.TradeConfig; -import java.io.IOException; - /** * TradeConfigServlet provides a servlet interface to adjust AriesTrader runtime parameters. * TradeConfigServlet updates values in the {@link org.apache.aries.samples.ariestrader.web.TradeConfig} JavaBean holding diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeScenarioServlet.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeScenarioServlet.java index 6a45bcbcb4..2d87b6ef76 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeScenarioServlet.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeScenarioServlet.java @@ -16,16 +16,21 @@ */ package org.apache.aries.samples.ariestrader.web; -import javax.servlet.*; -import javax.servlet.http.*; - -import org.apache.aries.samples.ariestrader.api.persistence.*; -import org.apache.aries.samples.ariestrader.util.*; - -import java.util.Collection; -import java.util.Iterator; import java.io.IOException; import java.io.PrintWriter; +import java.util.Collection; +import java.util.Iterator; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.apache.aries.samples.ariestrader.api.persistence.HoldingDataBean; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; /** * TradeScenarioServlet emulates a population of web users by generating a specific Trade operation diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeServletAction.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeServletAction.java index e9b393a133..dde923f248 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeServletAction.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/TradeServletAction.java @@ -17,18 +17,25 @@ */ package org.apache.aries.samples.ariestrader.web; -import javax.servlet.*; -import javax.servlet.http.*; - -import org.apache.aries.samples.ariestrader.api.TradeServices; -import org.apache.aries.samples.ariestrader.api.persistence.*; -import org.apache.aries.samples.ariestrader.util.*; - import java.io.IOException; +import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import java.util.ArrayList; -import java.math.BigDecimal; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.apache.aries.samples.ariestrader.api.TradeServices; +import org.apache.aries.samples.ariestrader.api.persistence.AccountDataBean; +import org.apache.aries.samples.ariestrader.api.persistence.AccountProfileDataBean; +import org.apache.aries.samples.ariestrader.api.persistence.HoldingDataBean; +import org.apache.aries.samples.ariestrader.api.persistence.OrderDataBean; +import org.apache.aries.samples.ariestrader.api.persistence.QuoteDataBean; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; /** diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/ExplicitGC.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/ExplicitGC.java index 0ba3324b81..7f99bfaa1e 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/ExplicitGC.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/ExplicitGC.java @@ -16,11 +16,15 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import org.apache.aries.samples.ariestrader.util.*; +import org.apache.aries.samples.ariestrader.util.Log; /** diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingJDBCRead.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingJDBCRead.java index 92ba7623cf..9d7d130c4b 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingJDBCRead.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingJDBCRead.java @@ -16,14 +16,18 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.aries.samples.ariestrader.api.TradeServiceUtilities; import org.apache.aries.samples.ariestrader.api.TradeServices; -import org.apache.aries.samples.ariestrader.api.persistence.*; -import org.apache.aries.samples.ariestrader.util.*; +import org.apache.aries.samples.ariestrader.api.persistence.QuoteDataBean; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; /** * diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingJDBCWrite.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingJDBCWrite.java index f23f14c4e4..7f8d5c1dbb 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingJDBCWrite.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingJDBCWrite.java @@ -16,15 +16,19 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; +import java.io.IOException; import java.math.BigDecimal; -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.aries.samples.ariestrader.api.TradeServiceUtilities; import org.apache.aries.samples.ariestrader.api.TradeServices; -import org.apache.aries.samples.ariestrader.api.persistence.*; -import org.apache.aries.samples.ariestrader.util.*; +import org.apache.aries.samples.ariestrader.api.persistence.QuoteDataBean; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; /** * diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet.java index 838d9fbfb7..e658aea17e 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet.java @@ -16,11 +16,15 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import org.apache.aries.samples.ariestrader.util.*; +import org.apache.aries.samples.ariestrader.util.Log; /** diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Include.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Include.java index b31af03ebe..e1a45e3674 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Include.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Include.java @@ -16,11 +16,15 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import org.apache.aries.samples.ariestrader.util.*; +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.TradeConfig; /** * diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2IncludeRcv.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2IncludeRcv.java index b9fd7f8b10..cd0292f51e 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2IncludeRcv.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2IncludeRcv.java @@ -16,9 +16,11 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2JNDI.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2JNDI.java index cd5c58cc38..56f441a73e 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2JNDI.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2JNDI.java @@ -16,11 +16,17 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.sql.DataSource; -import org.apache.aries.samples.ariestrader.util.*; + +import org.apache.aries.samples.ariestrader.util.Log; +import org.apache.aries.samples.ariestrader.util.ServiceUtilities; +import org.apache.aries.samples.ariestrader.util.TradeConfig; /** * diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Jsp.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Jsp.java index 019d837b0f..97f2e33f0f 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Jsp.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Jsp.java @@ -16,11 +16,13 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import org.apache.aries.samples.ariestrader.util.*; +import org.apache.aries.samples.ariestrader.util.Log; /** diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Servlet.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Servlet.java index 7429196726..73aa9e9fa9 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Servlet.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2Servlet.java @@ -16,11 +16,13 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import org.apache.aries.samples.ariestrader.util.*; +import org.apache.aries.samples.ariestrader.util.Log; /** diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2ServletRcv.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2ServletRcv.java index 7803f88018..4240725288 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2ServletRcv.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServlet2ServletRcv.java @@ -16,11 +16,15 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import java.io.PrintWriter; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import org.apache.aries.samples.ariestrader.util.*; +import org.apache.aries.samples.ariestrader.util.Log; /** diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServletWriter.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServletWriter.java index 6e37a618d3..39b893b36c 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServletWriter.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingServletWriter.java @@ -16,11 +16,14 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import org.apache.aries.samples.ariestrader.util.*; +import org.apache.aries.samples.ariestrader.util.Log; /** diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession1.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession1.java index b8fb16d6ef..c6385c630c 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession1.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession1.java @@ -16,11 +16,16 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import java.io.PrintWriter; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; -import org.apache.aries.samples.ariestrader.util.*; +import org.apache.aries.samples.ariestrader.util.Log; /** * diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession2.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession2.java index 483d54ed33..517f60e1bc 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession2.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession2.java @@ -16,11 +16,16 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import java.io.PrintWriter; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; -import org.apache.aries.samples.ariestrader.util.*; +import org.apache.aries.samples.ariestrader.util.Log; /** * diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3.java index 81fcaf1401..b0fa371ca0 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3.java @@ -16,11 +16,16 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import org.apache.aries.samples.ariestrader.util.*; +import java.io.IOException; +import java.io.PrintWriter; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.apache.aries.samples.ariestrader.util.Log; /** * diff --git a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3Object.java b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3Object.java index 55594ca1b2..69a24828cf 100644 --- a/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3Object.java +++ b/samples/ariestrader/modules/ariestrader-web/src/main/java/org/apache/aries/samples/ariestrader/web/prims/PingSession3Object.java @@ -16,7 +16,7 @@ */ package org.apache.aries.samples.ariestrader.web.prims; -import java.io.*; +import java.io.Serializable; /** * diff --git a/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogAuthorManagerImpl.java b/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogAuthorManagerImpl.java index a9c754e2ae..7313acdccb 100644 --- a/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogAuthorManagerImpl.java +++ b/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogAuthorManagerImpl.java @@ -20,18 +20,16 @@ import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; -import java.util.Iterator; import java.util.List; +import javax.inject.Singleton; import org.apache.aries.blueprint.annotation.service.Reference; -import org.apache.aries.samples.blog.api.*; +import org.apache.aries.samples.blog.api.BlogAuthor; +import org.apache.aries.samples.blog.api.BlogAuthorManager; import org.apache.aries.samples.blog.api.persistence.Author; import org.apache.aries.samples.blog.api.persistence.BlogPersistenceService; -import javax.inject.Singleton; - @Singleton public class BlogAuthorManagerImpl implements BlogAuthorManager { diff --git a/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogCommentImpl.java b/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogCommentImpl.java index a4b95961c5..5feda5ba51 100644 --- a/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogCommentImpl.java +++ b/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogCommentImpl.java @@ -18,8 +18,8 @@ */ package org.apache.aries.samples.blog.biz; -import java.util.Date; import java.util.Calendar; +import java.util.Date; import org.apache.aries.samples.blog.api.BlogAuthor; import org.apache.aries.samples.blog.api.BlogComment; diff --git a/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogCommentManagerImpl.java b/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogCommentManagerImpl.java index f5e929bb19..2105816de8 100644 --- a/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogCommentManagerImpl.java +++ b/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogCommentManagerImpl.java @@ -22,6 +22,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import javax.inject.Inject; +import javax.inject.Singleton; import org.apache.aries.blueprint.annotation.referencelistener.ReferenceListener; import org.apache.aries.blueprint.annotation.service.Availability; @@ -31,9 +33,6 @@ import org.apache.aries.samples.blog.api.comment.persistence.BlogCommentService; import org.apache.aries.samples.blog.api.comment.persistence.Comment; -import javax.inject.Inject; -import javax.inject.Singleton; - @ReferenceListener(referenceInterface = BlogCommentService.class, bindMethod = "blogServiceBound", unbindMethod = "blogServiceUnbound") @Singleton public class BlogCommentManagerImpl implements BlogCommentManager { diff --git a/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogEntryManagerImpl.java b/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogEntryManagerImpl.java index 9c16fb8607..7ea123e056 100644 --- a/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogEntryManagerImpl.java +++ b/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogEntryManagerImpl.java @@ -23,6 +23,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import javax.inject.Inject; +import javax.inject.Singleton; import org.apache.aries.samples.blog.api.BlogAuthor; import org.apache.aries.samples.blog.api.BlogEntry; @@ -30,9 +32,6 @@ import org.apache.aries.samples.blog.api.persistence.BlogPersistenceService; import org.apache.aries.samples.blog.api.persistence.Entry; -import javax.inject.Inject; -import javax.inject.Singleton; - @Singleton public class BlogEntryManagerImpl implements BlogEntryManager diff --git a/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogListAdapter.java b/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogListAdapter.java index d78db21cec..edbfad60c3 100644 --- a/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogListAdapter.java +++ b/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BlogListAdapter.java @@ -19,7 +19,6 @@ package org.apache.aries.samples.blog.biz; import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.util.Collection; import java.util.Iterator; import java.util.List; diff --git a/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BloggingServiceImpl.java b/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BloggingServiceImpl.java index eb2b62e332..015e99f317 100644 --- a/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BloggingServiceImpl.java +++ b/samples/blog/blog-biz/src/main/java/org/apache/aries/samples/blog/biz/BloggingServiceImpl.java @@ -22,6 +22,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import javax.inject.Singleton; import org.apache.aries.blueprint.annotation.service.Service; import org.apache.aries.samples.blog.api.BlogAuthor; @@ -32,8 +33,6 @@ import org.apache.aries.samples.blog.api.BlogEntryManager; import org.apache.aries.samples.blog.api.BloggingService; -import javax.inject.Singleton; - /** Implementation of the BloggingService */ @Service(classes = BloggingService.class) @Singleton diff --git a/samples/blog/blog-comment-ejb/src/main/java/org/apache/aries/samples/blog/comment/ejb/BlogCommentEJB.java b/samples/blog/blog-comment-ejb/src/main/java/org/apache/aries/samples/blog/comment/ejb/BlogCommentEJB.java index 2294d2876e..ed876f214d 100644 --- a/samples/blog/blog-comment-ejb/src/main/java/org/apache/aries/samples/blog/comment/ejb/BlogCommentEJB.java +++ b/samples/blog/blog-comment-ejb/src/main/java/org/apache/aries/samples/blog/comment/ejb/BlogCommentEJB.java @@ -19,7 +19,6 @@ package org.apache.aries.samples.blog.comment.ejb; import java.util.List; - import javax.ejb.Stateless; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; diff --git a/samples/blog/blog-comment-ejb/src/main/java/org/apache/aries/samples/blog/comment/ejb/CommentImpl.java b/samples/blog/blog-comment-ejb/src/main/java/org/apache/aries/samples/blog/comment/ejb/CommentImpl.java index 549eb3dd29..af00c792ae 100644 --- a/samples/blog/blog-comment-ejb/src/main/java/org/apache/aries/samples/blog/comment/ejb/CommentImpl.java +++ b/samples/blog/blog-comment-ejb/src/main/java/org/apache/aries/samples/blog/comment/ejb/CommentImpl.java @@ -19,7 +19,6 @@ package org.apache.aries.samples.blog.comment.ejb; import java.util.Date; - import javax.naming.InitialContext; import javax.naming.NamingException; import javax.persistence.Entity; diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java index 05abc064ee..7ff9d6609d 100644 --- a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java +++ b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java @@ -32,7 +32,6 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; - import javax.inject.Inject; import javax.sql.XADataSource; import javax.transaction.TransactionManager; diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleTest.java b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleTest.java index d6efe6f9dc..85bd0cd258 100644 --- a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleTest.java +++ b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleTest.java @@ -18,17 +18,16 @@ */ package org.apache.aries.samples.blog.itests; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; + import java.util.Arrays; import java.util.Collections; - import javax.inject.Inject; import org.apache.aries.quiesce.manager.QuiesceManager; import org.junit.Test; import org.osgi.framework.Bundle; -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; - public class QuiesceBlogSampleTest extends AbstractBlogIntegrationTest { @Inject diff --git a/samples/blog/blog-persistence-jdbc/src/main/java/org/apache/aries/samples/blog/persistence/jdbc/BlogPersistenceServiceImpl.java b/samples/blog/blog-persistence-jdbc/src/main/java/org/apache/aries/samples/blog/persistence/jdbc/BlogPersistenceServiceImpl.java index ba2ad110a8..d84d8725d5 100644 --- a/samples/blog/blog-persistence-jdbc/src/main/java/org/apache/aries/samples/blog/persistence/jdbc/BlogPersistenceServiceImpl.java +++ b/samples/blog/blog-persistence-jdbc/src/main/java/org/apache/aries/samples/blog/persistence/jdbc/BlogPersistenceServiceImpl.java @@ -27,11 +27,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; - import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.inject.Inject; -import javax.inject.Named; import javax.sql.DataSource; import org.apache.aries.blueprint.annotation.bean.Activation; diff --git a/samples/blog/blog-persistence-jdbc/src/main/java/org/apache/aries/samples/blog/persistence/jdbc/DatasourceProducer.java b/samples/blog/blog-persistence-jdbc/src/main/java/org/apache/aries/samples/blog/persistence/jdbc/DatasourceProducer.java index e2d0fbdc51..470edd476c 100644 --- a/samples/blog/blog-persistence-jdbc/src/main/java/org/apache/aries/samples/blog/persistence/jdbc/DatasourceProducer.java +++ b/samples/blog/blog-persistence-jdbc/src/main/java/org/apache/aries/samples/blog/persistence/jdbc/DatasourceProducer.java @@ -18,11 +18,11 @@ */ package org.apache.aries.samples.blog.persistence.jdbc; +import javax.inject.Singleton; + import org.apache.aries.blueprint.annotation.bean.Bean; import org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource; -import javax.inject.Singleton; - @Singleton public class DatasourceProducer { diff --git a/samples/blog/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/jpa/BlogPersistenceServiceImpl.java b/samples/blog/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/jpa/BlogPersistenceServiceImpl.java index 0bc4be4a60..608517a641 100644 --- a/samples/blog/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/jpa/BlogPersistenceServiceImpl.java +++ b/samples/blog/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/jpa/BlogPersistenceServiceImpl.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; - import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.Query; diff --git a/samples/blog/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/jpa/entity/AuthorImpl.java b/samples/blog/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/jpa/entity/AuthorImpl.java index e94da3f2a9..fec0c6bd39 100644 --- a/samples/blog/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/jpa/entity/AuthorImpl.java +++ b/samples/blog/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/jpa/entity/AuthorImpl.java @@ -21,7 +21,6 @@ import java.util.Date; import java.util.List; - import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/samples/blog/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/jpa/entity/EntryImpl.java b/samples/blog/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/jpa/entity/EntryImpl.java index d459477a18..39e0462765 100644 --- a/samples/blog/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/jpa/entity/EntryImpl.java +++ b/samples/blog/blog-persistence-jpa/src/main/java/org/apache/aries/samples/blog/persistence/jpa/entity/EntryImpl.java @@ -20,14 +20,13 @@ import java.util.Date; import java.util.List; - +import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; import javax.persistence.ManyToOne; -import javax.persistence.Column; +import javax.persistence.Table; import org.apache.aries.samples.blog.api.persistence.Entry; diff --git a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/AddComment.java b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/AddComment.java index 6f06c4d798..fabc533c24 100644 --- a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/AddComment.java +++ b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/AddComment.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; - import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/AddCommentForm.java b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/AddCommentForm.java index 161358a645..cd1f0f666c 100644 --- a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/AddCommentForm.java +++ b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/AddCommentForm.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.List; - import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/CreateBlogEntry.java b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/CreateBlogEntry.java index df09ae3618..63d877848e 100644 --- a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/CreateBlogEntry.java +++ b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/CreateBlogEntry.java @@ -19,7 +19,6 @@ package org.apache.aries.samples.blog.web; import java.io.IOException; - import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/CreateBlogEntryForm.java b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/CreateBlogEntryForm.java index 5f6c865447..62e2c88457 100644 --- a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/CreateBlogEntryForm.java +++ b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/CreateBlogEntryForm.java @@ -19,7 +19,6 @@ package org.apache.aries.samples.blog.web; import java.io.PrintWriter; - import javax.servlet.http.HttpServletRequest; import org.apache.aries.samples.blog.web.util.FormServlet; diff --git a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/EditAuthor.java b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/EditAuthor.java index 9c631c85a1..3c26f78b93 100644 --- a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/EditAuthor.java +++ b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/EditAuthor.java @@ -19,7 +19,6 @@ package org.apache.aries.samples.blog.web; import java.io.IOException; - import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/EditAuthorForm.java b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/EditAuthorForm.java index a6af9b142a..7763b46eb0 100644 --- a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/EditAuthorForm.java +++ b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/EditAuthorForm.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.io.PrintWriter; - import javax.servlet.http.HttpServletRequest; import org.apache.aries.samples.blog.api.BlogAuthor; diff --git a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/ViewAuthor.java b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/ViewAuthor.java index 761592c661..deddbc1d77 100644 --- a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/ViewAuthor.java +++ b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/ViewAuthor.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.io.PrintWriter; - import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/ViewBlog.java b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/ViewBlog.java index bb8a5ebb4d..a7cd548cac 100644 --- a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/ViewBlog.java +++ b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/ViewBlog.java @@ -25,7 +25,6 @@ import java.util.Date; import java.util.Iterator; import java.util.List; - import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/util/FormServlet.java b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/util/FormServlet.java index deaafbace8..6556de2670 100644 --- a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/util/FormServlet.java +++ b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/util/FormServlet.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; - import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/util/JNDIHelper.java b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/util/JNDIHelper.java index ef1c2e823c..efebe597b1 100644 --- a/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/util/JNDIHelper.java +++ b/samples/blog/blog-web/src/main/java/org/apache/aries/samples/blog/web/util/JNDIHelper.java @@ -19,7 +19,6 @@ package org.apache.aries.samples.blog.web.util; import java.io.IOException; - import javax.naming.InitialContext; import javax.naming.NamingException; diff --git a/samples/blueprint/helloworld/helloworld-client/src/main/java/org/apache/aries/samples/blueprint/helloworld/client/HelloWorldClient.java b/samples/blueprint/helloworld/helloworld-client/src/main/java/org/apache/aries/samples/blueprint/helloworld/client/HelloWorldClient.java index 8d3446d9fb..357efd0a5e 100644 --- a/samples/blueprint/helloworld/helloworld-client/src/main/java/org/apache/aries/samples/blueprint/helloworld/client/HelloWorldClient.java +++ b/samples/blueprint/helloworld/helloworld-client/src/main/java/org/apache/aries/samples/blueprint/helloworld/client/HelloWorldClient.java @@ -18,12 +18,12 @@ */ package org.apache.aries.samples.blueprint.helloworld.client; +import javax.inject.Inject; + import org.apache.aries.blueprint.annotation.bean.Bean; import org.apache.aries.blueprint.annotation.service.Reference; import org.apache.aries.samples.blueprint.helloworld.api.HelloWorldService; -import javax.inject.Inject; - @Bean(initMethod = "startUp") public class HelloWorldClient { diff --git a/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/AbstractIntegrationTest.java b/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/AbstractIntegrationTest.java index 265d772821..c34682f366 100644 --- a/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/AbstractIntegrationTest.java +++ b/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/AbstractIntegrationTest.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; +import javax.inject.Inject; import org.junit.After; import org.junit.Before; @@ -43,8 +44,6 @@ import org.osgi.framework.InvalidSyntaxException; import org.osgi.util.tracker.ServiceTracker; -import javax.inject.Inject; - public abstract class AbstractIntegrationTest { diff --git a/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java b/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java index e8b3ec0593..24f6f66cab 100644 --- a/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java +++ b/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java @@ -22,21 +22,20 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages; -import static org.ops4j.pax.exam.CoreOptions.*; -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; +import static org.ops4j.pax.exam.CoreOptions.junitBundles; import static org.ops4j.pax.exam.CoreOptions.options; import static org.ops4j.pax.exam.CoreOptions.systemProperty; +import static org.ops4j.pax.exam.CoreOptions.vmOption; +import org.junit.Test; +import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; -import org.osgi.service.blueprint.container.BlueprintContainer; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Option; import org.osgi.framework.Bundle; +import org.osgi.service.blueprint.container.BlueprintContainer; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) diff --git a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/CreditQueryRegistrationListener.java b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/CreditQueryRegistrationListener.java index 0f7b467762..bbf2a10c61 100644 --- a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/CreditQueryRegistrationListener.java +++ b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/CreditQueryRegistrationListener.java @@ -18,13 +18,13 @@ */ package org.apache.aries.samples.blueprint.idverifier.client; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Iterator; import java.util.Map; import java.util.Set; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author forrestxm * diff --git a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/IDConverter.java b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/IDConverter.java index 26e5dbf413..3180d78372 100644 --- a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/IDConverter.java +++ b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/IDConverter.java @@ -19,7 +19,7 @@ package org.apache.aries.samples.blueprint.idverifier.client; -import org.apache.aries.samples.blueprint.idverifier.api.*; +import org.apache.aries.samples.blueprint.idverifier.api.PersonIDVerifier; import org.osgi.service.blueprint.container.Converter; import org.osgi.service.blueprint.container.ReifiedType; diff --git a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/IDVerifierClientActivator.java b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/IDVerifierClientActivator.java index 2d1605447c..3313fca7ce 100644 --- a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/IDVerifierClientActivator.java +++ b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/IDVerifierClientActivator.java @@ -19,7 +19,6 @@ package org.apache.aries.samples.blueprint.idverifier.client; import java.lang.management.ManagementFactory; - import javax.management.MBeanServer; import org.osgi.framework.BundleActivator; diff --git a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/PersonBankBean.java b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/PersonBankBean.java index c732ef07a5..19216ac931 100644 --- a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/PersonBankBean.java +++ b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/PersonBankBean.java @@ -27,11 +27,9 @@ import java.util.Set; -import org.apache.aries.samples.blueprint.idverifier.api.*; +import org.apache.aries.samples.blueprint.idverifier.api.CreditRecordOperation; import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceRegistration; -import org.osgi.framework.ServiceReference; import org.osgi.service.blueprint.container.BlueprintContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/VerifierServiceReferenceListener.java b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/VerifierServiceReferenceListener.java index 771ca890f3..4364d068f4 100644 --- a/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/VerifierServiceReferenceListener.java +++ b/samples/blueprint/idverifier/idverifier-client/src/main/java/org/apache/aries/samples/blueprint/idverifier/client/VerifierServiceReferenceListener.java @@ -21,10 +21,9 @@ import java.util.Map; import java.util.Set; - import org.apache.aries.samples.blueprint.idverifier.api.PersonIDVerifier; -import org.apache.aries.samples.blueprint.idverifier.server.PersonIDVerifierSimpleImpl; import org.apache.aries.samples.blueprint.idverifier.server.PersonIDVerifierComplexImpl; +import org.apache.aries.samples.blueprint.idverifier.server.PersonIDVerifierSimpleImpl; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; diff --git a/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/ComplexVerifierRegistrationListener.java b/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/ComplexVerifierRegistrationListener.java index 04cf4c9395..d285b5bdc4 100644 --- a/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/ComplexVerifierRegistrationListener.java +++ b/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/ComplexVerifierRegistrationListener.java @@ -18,13 +18,13 @@ */ package org.apache.aries.samples.blueprint.idverifier.server; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Iterator; import java.util.Map; import java.util.Set; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author forrestxm * diff --git a/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/SimpleVerifierRegistrationListener.java b/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/SimpleVerifierRegistrationListener.java index f69f624e06..7704b98080 100644 --- a/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/SimpleVerifierRegistrationListener.java +++ b/samples/blueprint/idverifier/idverifier-server/src/main/java/org/apache/aries/samples/blueprint/idverifier/server/SimpleVerifierRegistrationListener.java @@ -18,13 +18,13 @@ */ package org.apache.aries.samples.blueprint.idverifier.server; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Iterator; import java.util.Map; import java.util.Set; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author forrestxm * diff --git a/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/HeaderParserTest.java b/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/HeaderParserTest.java index 66b014ebef..f2af734798 100644 --- a/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/HeaderParserTest.java +++ b/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/HeaderParserTest.java @@ -18,12 +18,12 @@ */ package org.apache.aries.spifly; +import static org.junit.Assert.assertEquals; + import java.util.List; import org.junit.Test; -import static org.junit.Assert.assertEquals; - public class HeaderParserTest { @Test diff --git a/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java b/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java index de693976ed..217f28d9e8 100644 --- a/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java +++ b/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java @@ -18,7 +18,27 @@ */ package org.apache.aries.spifly; -import aQute.bnd.header.Parameters; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Dictionary; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + import org.apache.aries.mytest.MySPI; import org.apache.aries.mytest.MySPI2; import org.apache.aries.spifly.impl4.MySPIImpl4a; @@ -38,26 +58,7 @@ import org.osgi.framework.wiring.BundleWire; import org.osgi.framework.wiring.BundleWiring; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Dictionary; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import aQute.bnd.header.Parameters; public class ProviderBundleTrackerCustomizerGenericCapabilityTest { @Test diff --git a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookGenericCapabilityTest.java b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookGenericCapabilityTest.java index 1b3be75c03..bcd3036c58 100644 --- a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookGenericCapabilityTest.java +++ b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookGenericCapabilityTest.java @@ -18,6 +18,12 @@ */ package org.apache.aries.spifly.dynamic; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -64,12 +70,6 @@ import aQute.bnd.header.Parameters; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; - public class ClientWeavingHookGenericCapabilityTest { DynamicWeavingActivator activator; diff --git a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookOSGi43Test.java b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookOSGi43Test.java index 2666d60437..2400eb133a 100644 --- a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookOSGi43Test.java +++ b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookOSGi43Test.java @@ -18,6 +18,9 @@ */ package org.apache.aries.spifly.dynamic; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -56,9 +59,6 @@ import org.osgi.framework.wiring.BundleRevision; import org.osgi.framework.wiring.BundleWiring; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - public class ClientWeavingHookOSGi43Test { DynamicWeavingActivator activator; diff --git a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookTest.java b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookTest.java index 693ff1f65f..57ef54ef18 100644 --- a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookTest.java +++ b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookTest.java @@ -18,6 +18,11 @@ */ package org.apache.aries.spifly.dynamic; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -40,7 +45,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; - import javax.xml.parsers.DocumentBuilderFactory; import org.apache.aries.mytest.MySPI; @@ -61,11 +65,6 @@ import org.osgi.framework.wiring.BundleRevision; import org.osgi.framework.wiring.BundleWiring; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - public class ClientWeavingHookTest { DynamicWeavingActivator activator; diff --git a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/TestClient.java b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/TestClient.java index b2129cedf1..9c85299ca9 100644 --- a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/TestClient.java +++ b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/TestClient.java @@ -18,12 +18,12 @@ */ package org.apache.aries.spifly.dynamic; -import org.apache.aries.mytest.MySPI; - import java.util.HashSet; import java.util.ServiceLoader; import java.util.Set; +import org.apache.aries.mytest.MySPI; + public class TestClient { /** * Load using a constant as parameter. diff --git a/spi-fly/spi-fly-itests/src/main/java/org/apache/aries/spifly/itests/InitialTest.java b/spi-fly/spi-fly-itests/src/main/java/org/apache/aries/spifly/itests/InitialTest.java index 12a26e0153..8f1da37c38 100644 --- a/spi-fly/spi-fly-itests/src/main/java/org/apache/aries/spifly/itests/InitialTest.java +++ b/spi-fly/spi-fly-itests/src/main/java/org/apache/aries/spifly/itests/InitialTest.java @@ -18,15 +18,6 @@ */ package org.apache.aries.spifly.itests; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.namespace.HostNamespace; -import org.osgi.framework.wiring.BundleWire; -import org.osgi.framework.wiring.BundleWiring; -import org.osgi.test.assertj.bundle.BundleAssert; -import org.osgi.test.common.annotation.InjectBundleContext; -import org.osgi.test.junit5.context.BundleContextExtension; - import static org.assertj.core.api.Assertions.assertThat; import java.io.ByteArrayOutputStream; @@ -44,6 +35,14 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.namespace.HostNamespace; +import org.osgi.framework.wiring.BundleWire; +import org.osgi.framework.wiring.BundleWiring; +import org.osgi.test.assertj.bundle.BundleAssert; +import org.osgi.test.common.annotation.InjectBundleContext; +import org.osgi.test.junit5.context.BundleContextExtension; @ExtendWith(BundleContextExtension.class) public class InitialTest { diff --git a/spi-fly/spi-fly-static-tool/src/test/java/org/apache/aries/spifly/statictool/ConsumerTest.java b/spi-fly/spi-fly-static-tool/src/test/java/org/apache/aries/spifly/statictool/ConsumerTest.java index e80682b9b6..5807a1d8da 100644 --- a/spi-fly/spi-fly-static-tool/src/test/java/org/apache/aries/spifly/statictool/ConsumerTest.java +++ b/spi-fly/spi-fly-static-tool/src/test/java/org/apache/aries/spifly/statictool/ConsumerTest.java @@ -18,6 +18,12 @@ */ package org.apache.aries.spifly.statictool; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.io.File; import java.io.FileOutputStream; import java.net.URL; @@ -35,12 +41,6 @@ import org.apache.aries.spifly.statictool.bundle.TestClass; import org.junit.Test; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - public class ConsumerTest { @Test public void testConsumerBundle() throws Exception { diff --git a/spi-fly/spi-fly-static-tool/src/test/java/org/apache/aries/spifly/statictool/RequirementTest.java b/spi-fly/spi-fly-static-tool/src/test/java/org/apache/aries/spifly/statictool/RequirementTest.java index 8f1e6ee98f..e1f0151ba5 100644 --- a/spi-fly/spi-fly-static-tool/src/test/java/org/apache/aries/spifly/statictool/RequirementTest.java +++ b/spi-fly/spi-fly-static-tool/src/test/java/org/apache/aries/spifly/statictool/RequirementTest.java @@ -18,6 +18,12 @@ */ package org.apache.aries.spifly.statictool; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.io.File; import java.io.FileOutputStream; import java.net.URL; @@ -35,12 +41,6 @@ import org.apache.aries.spifly.statictool.bundle.TestClass; import org.junit.Test; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - public class RequirementTest { @Test public void testConsumerBundle() throws Exception { diff --git a/spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java b/spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java index eb33531133..9a05deec5a 100644 --- a/spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java +++ b/spi-fly/spi-fly-weaver/src/main/java/org/apache/aries/spifly/weaver/TCCLSetterVisitor.java @@ -25,14 +25,13 @@ import org.apache.aries.spifly.Util; import org.apache.aries.spifly.WeavingData; -import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; import org.objectweb.asm.commons.GeneratorAdapter; -import org.objectweb.asm.commons.JSRInlinerAdapter; +import org.objectweb.asm.commons.JSRInlinerAdapter; import org.objectweb.asm.commons.Method; import aQute.bnd.annotation.baseline.BaselineIgnore; @@ -79,10 +78,10 @@ public boolean isWoven() { public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions); - mv = new TCCLSetterMethodVisitor(mv, access, name, desc); - mv = new JSRInlinerAdapter(mv, access, name, desc, signature, exceptions); - - return mv; + mv = new TCCLSetterMethodVisitor(mv, access, name, desc); + mv = new JSRInlinerAdapter(mv, access, name, desc, signature, exceptions); + + return mv; } @Override diff --git a/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/Repository.java b/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/Repository.java index 7c1e9f0758..317596c386 100644 --- a/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/Repository.java +++ b/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/Repository.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Map; + import org.osgi.resource.Capability; import org.osgi.resource.Requirement; import org.osgi.resource.Resource; diff --git a/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/RepositoryContent.java b/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/RepositoryContent.java index 65c9ca6046..865eb97282 100644 --- a/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/RepositoryContent.java +++ b/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/RepositoryContent.java @@ -17,6 +17,7 @@ package org.osgi.service.repository; import java.io.InputStream; + import org.osgi.resource.Resource; /** diff --git a/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/Subsystem.java b/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/Subsystem.java index 7cf39bf4bc..720eda9c06 100644 --- a/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/Subsystem.java +++ b/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/Subsystem.java @@ -20,6 +20,7 @@ import java.util.Collection; import java.util.Locale; import java.util.Map; + import org.osgi.annotation.versioning.ProviderType; import org.osgi.framework.BundleContext; import org.osgi.framework.Version; diff --git a/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/SubsystemPermission.java b/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/SubsystemPermission.java index c907f6f2af..7a1ddf5cf7 100644 --- a/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/SubsystemPermission.java +++ b/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/SubsystemPermission.java @@ -33,6 +33,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.osgi.framework.Filter; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.InvalidSyntaxException; diff --git a/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/capabilityset/SimpleFilter.java b/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/capabilityset/SimpleFilter.java index 71edb5955e..3193f99c14 100644 --- a/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/capabilityset/SimpleFilter.java +++ b/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/capabilityset/SimpleFilter.java @@ -26,9 +26,6 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.aries.subsystem.core.archive.AttributeFactory; -import org.apache.aries.subsystem.core.archive.Parameter; -import org.apache.aries.subsystem.core.archive.VersionRangeAttribute; import org.osgi.framework.VersionRange; public class SimpleFilter diff --git a/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Utils.java b/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Utils.java index af813334a3..3bca6b17f0 100644 --- a/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Utils.java +++ b/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/Utils.java @@ -28,9 +28,9 @@ import org.osgi.service.coordinator.Coordination; import org.osgi.service.coordinator.CoordinationException; import org.osgi.service.subsystem.Subsystem; +import org.osgi.service.subsystem.Subsystem.State; import org.osgi.service.subsystem.SubsystemConstants; import org.osgi.service.subsystem.SubsystemException; -import org.osgi.service.subsystem.Subsystem.State; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/repository/Repository.java b/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/repository/Repository.java index 6cd4fe413d..224eafc9a4 100755 --- a/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/repository/Repository.java +++ b/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/repository/Repository.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Map; + import org.osgi.resource.Capability; import org.osgi.resource.Requirement; import org.osgi.resource.Resource; diff --git a/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/repository/RepositoryContent.java b/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/repository/RepositoryContent.java index 698c636ef8..85d262056d 100755 --- a/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/repository/RepositoryContent.java +++ b/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/repository/RepositoryContent.java @@ -17,6 +17,7 @@ package org.apache.aries.subsystem.core.repository; import java.io.InputStream; + import org.osgi.resource.Resource; /** diff --git a/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/Aries1453Test.java b/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/Aries1453Test.java index bb432695f4..de88161b02 100644 --- a/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/Aries1453Test.java +++ b/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/Aries1453Test.java @@ -13,6 +13,9 @@ */ package org.apache.aries.subsystem.core.archive; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import java.util.Arrays; import java.util.List; import java.util.Set; @@ -26,9 +29,6 @@ import org.osgi.resource.Requirement; import org.osgi.resource.Resource; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; - /* * https://issues.apache.org/jira/browse/ARIES-1453 * diff --git a/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/GenericHeaderTest.java b/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/GenericHeaderTest.java index ad50c73c6e..9302683523 100644 --- a/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/GenericHeaderTest.java +++ b/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/archive/GenericHeaderTest.java @@ -18,10 +18,10 @@ */ package org.apache.aries.subsystem.core.archive; -import org.junit.Test; - import static org.junit.Assert.assertEquals; +import org.junit.Test; + public class GenericHeaderTest { @Test public void testEmptyHeader() { diff --git a/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java b/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java index 1f7697b571..84e7e74b17 100644 --- a/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java +++ b/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java @@ -13,8 +13,11 @@ */ package org.apache.aries.subsystem.core.internal; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; import static org.junit.Assert.assertEquals; -import static org.easymock.EasyMock.*; import java.lang.reflect.Field; import java.util.Collections; diff --git a/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/LocationTest.java b/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/LocationTest.java index d228841869..802d5b9b32 100644 --- a/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/LocationTest.java +++ b/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/LocationTest.java @@ -16,7 +16,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; import java.net.MalformedURLException; import java.net.URISyntaxException; diff --git a/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/ResolveContextTest.java b/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/ResolveContextTest.java index f1b521e4ea..520bf78703 100644 --- a/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/ResolveContextTest.java +++ b/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/ResolveContextTest.java @@ -13,6 +13,9 @@ */ package org.apache.aries.subsystem.core.internal; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import java.io.File; import java.lang.reflect.Field; import java.util.ArrayList; @@ -25,9 +28,6 @@ import org.osgi.resource.Capability; import org.osgi.service.resolver.HostedCapability; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; - public class ResolveContextTest { @Test public void testInsertHostedCapability() throws Exception { diff --git a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ConfigAdminPropsFileContentHandlerTest.java b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ConfigAdminPropsFileContentHandlerTest.java index 620d03def9..a286c9a91c 100644 --- a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ConfigAdminPropsFileContentHandlerTest.java +++ b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ConfigAdminPropsFileContentHandlerTest.java @@ -15,6 +15,9 @@ import static org.junit.Assert.assertEquals; +import java.util.Dictionary; +import java.util.Hashtable; + import org.junit.Test; import org.osgi.framework.Filter; import org.osgi.service.cm.Configuration; @@ -22,9 +25,6 @@ import org.osgi.service.subsystem.Subsystem; import org.osgi.util.tracker.ServiceTracker; -import java.util.Dictionary; -import java.util.Hashtable; - public class ConfigAdminPropsFileContentHandlerTest extends SubsystemTest { public ConfigAdminPropsFileContentHandlerTest() { installConfigAdmin = true; diff --git a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/FeatureTest.java b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/FeatureTest.java index dd03303256..4798bc7b41 100644 --- a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/FeatureTest.java +++ b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/FeatureTest.java @@ -18,9 +18,11 @@ */ package org.apache.aries.subsystem.itests; -import java.util.Collection; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; -import junit.framework.AssertionFailedError; +import java.util.Collection; import org.apache.aries.subsystem.core.internal.ResourceHelper; import org.junit.Test; @@ -32,9 +34,7 @@ import org.osgi.resource.Resource; import org.osgi.service.subsystem.Subsystem; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import junit.framework.AssertionFailedError; @ExamReactorStrategy(PerMethod.class) public class FeatureTest extends SubsystemTest { diff --git a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/NoBSNTest.java b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/NoBSNTest.java index 12e0ffd62e..16f3cf7e66 100644 --- a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/NoBSNTest.java +++ b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/NoBSNTest.java @@ -18,28 +18,7 @@ */ package org.apache.aries.subsystem.itests; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.jar.Attributes; -import java.util.jar.JarOutputStream; -import java.util.jar.Manifest; - -import org.apache.aries.subsystem.itests.util.TestCapability; -import org.apache.aries.subsystem.itests.util.TestRepository; -import org.apache.aries.subsystem.itests.util.TestRepositoryContent; -import org.junit.Before; import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.Constants; -import org.osgi.framework.Version; -import org.osgi.framework.namespace.IdentityNamespace; -import org.osgi.framework.namespace.PackageNamespace; -import org.osgi.resource.Resource; -import org.osgi.service.repository.Repository; import org.osgi.service.subsystem.Subsystem; import org.osgi.service.subsystem.SubsystemConstants; diff --git a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java index e7f40a04cf..d549020362 100644 --- a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java +++ b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java @@ -24,7 +24,6 @@ import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.streamBundle; import static org.ops4j.pax.exam.CoreOptions.systemProperty; -import static org.ops4j.pax.exam.CoreOptions.vmOption; import static org.ops4j.pax.exam.CoreOptions.when; import java.io.File; diff --git a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/AbstractParserProxy.java b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/AbstractParserProxy.java index abdddf651e..d2e554b3ab 100644 --- a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/AbstractParserProxy.java +++ b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/AbstractParserProxy.java @@ -31,14 +31,14 @@ import java.util.Queue; import java.util.Set; -import org.apache.aries.subsystem.modelling.InvalidAttributeException; +import org.apache.aries.blueprint.ComponentDefinitionRegistry; import org.apache.aries.subsystem.modelling.ExportedService; import org.apache.aries.subsystem.modelling.ImportedService; +import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ModellingManager; import org.apache.aries.subsystem.modelling.ParsedServiceElements; import org.apache.aries.subsystem.modelling.ParserProxy; import org.apache.aries.subsystem.modelling.WrappedServiceMetadata; -import org.apache.aries.blueprint.ComponentDefinitionRegistry; import org.apache.aries.util.manifest.ManifestHeaderProcessor; import org.osgi.service.blueprint.reflect.BeanArgument; import org.osgi.service.blueprint.reflect.BeanMetadata; diff --git a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/DeployedBundlesImpl.java b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/DeployedBundlesImpl.java index e01d3a6e37..a8b7cacf27 100644 --- a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/DeployedBundlesImpl.java +++ b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/DeployedBundlesImpl.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Set; -import org.apache.aries.subsystem.modelling.ResolverException; import org.apache.aries.subsystem.modelling.DeployedBundles; import org.apache.aries.subsystem.modelling.DeploymentMFElement; import org.apache.aries.subsystem.modelling.ExportedBundle; @@ -39,6 +38,7 @@ import org.apache.aries.subsystem.modelling.ImportedPackage; import org.apache.aries.subsystem.modelling.ImportedService; import org.apache.aries.subsystem.modelling.ModelledResource; +import org.apache.aries.subsystem.modelling.ResolverException; import org.osgi.framework.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedBundleImpl.java b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedBundleImpl.java index 6feedde375..bb61dac919 100644 --- a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedBundleImpl.java +++ b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedBundleImpl.java @@ -23,8 +23,8 @@ import java.util.Map; import java.util.jar.Attributes; -import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ImportedBundle; +import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ModellingConstants; import org.apache.aries.util.manifest.ManifestHeaderProcessor; import org.osgi.framework.Constants; diff --git a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedPackageImpl.java b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedPackageImpl.java index 64fcc29b28..20694b3c5a 100644 --- a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedPackageImpl.java +++ b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ExportedPackageImpl.java @@ -17,6 +17,7 @@ * under the License. */ package org.apache.aries.subsystem.modelling.impl; + import static org.apache.aries.subsystem.modelling.ResourceType.PACKAGE; import java.util.Collections; diff --git a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedBundleImpl.java b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedBundleImpl.java index 7f643f8156..1aa3f527dd 100644 --- a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedBundleImpl.java +++ b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedBundleImpl.java @@ -23,8 +23,8 @@ import java.util.Hashtable; import java.util.Map; -import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ImportedBundle; +import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ModellingConstants; import org.apache.aries.subsystem.modelling.Provider; import org.apache.aries.subsystem.modelling.ResourceType; diff --git a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedPackageImpl.java b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedPackageImpl.java index ce5c12eb93..5899f674c2 100644 --- a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedPackageImpl.java +++ b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedPackageImpl.java @@ -28,8 +28,8 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ImportedPackage; +import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.Provider; import org.apache.aries.subsystem.modelling.ResourceType; import org.apache.aries.util.manifest.ManifestHeaderProcessor; diff --git a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedServiceImpl.java b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedServiceImpl.java index be9a89f68a..de559fb952 100644 --- a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedServiceImpl.java +++ b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ImportedServiceImpl.java @@ -26,8 +26,8 @@ import java.util.Map; import java.util.regex.Pattern; -import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ImportedService; +import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ModellingConstants; import org.apache.aries.subsystem.modelling.Provider; import org.apache.aries.subsystem.modelling.ResourceType; diff --git a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModelledResourceImpl.java b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModelledResourceImpl.java index 049cf2cb61..f7b1933d76 100644 --- a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModelledResourceImpl.java +++ b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModelledResourceImpl.java @@ -37,13 +37,13 @@ import java.util.Map; import java.util.jar.Attributes; -import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ExportedBundle; import org.apache.aries.subsystem.modelling.ExportedPackage; import org.apache.aries.subsystem.modelling.ExportedService; import org.apache.aries.subsystem.modelling.ImportedBundle; import org.apache.aries.subsystem.modelling.ImportedPackage; import org.apache.aries.subsystem.modelling.ImportedService; +import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ModelledResource; import org.apache.aries.subsystem.modelling.ModellingConstants; import org.apache.aries.subsystem.modelling.ResourceType; diff --git a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModelledResourceManagerImpl.java b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModelledResourceManagerImpl.java index 13829bc8c3..d53ee6db92 100644 --- a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModelledResourceManagerImpl.java +++ b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModelledResourceManagerImpl.java @@ -30,9 +30,9 @@ import java.util.Set; import java.util.jar.Attributes; -import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ExportedService; import org.apache.aries.subsystem.modelling.ImportedService; +import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ModelledResource; import org.apache.aries.subsystem.modelling.ModelledResourceManager; import org.apache.aries.subsystem.modelling.ModellerException; diff --git a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModellingHelperImpl.java b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModellingHelperImpl.java index f6a9111c7a..dcc949aaed 100644 --- a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModellingHelperImpl.java +++ b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModellingHelperImpl.java @@ -27,14 +27,14 @@ import java.util.List; import java.util.Map; -import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.DeployedBundles; import org.apache.aries.subsystem.modelling.ImportedBundle; import org.apache.aries.subsystem.modelling.ImportedPackage; +import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ModelledResource; import org.apache.aries.subsystem.modelling.ModellingConstants; -import org.apache.aries.subsystem.modelling.Provider; import org.apache.aries.subsystem.modelling.ModellingHelper; +import org.apache.aries.subsystem.modelling.Provider; import org.apache.aries.util.VersionRange; import org.apache.aries.util.manifest.ManifestHeaderProcessor; import org.osgi.framework.Constants; diff --git a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModellingManagerImpl.java b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModellingManagerImpl.java index 7b9183f372..cf8e6d39d5 100644 --- a/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModellingManagerImpl.java +++ b/subsystem/subsystem-modeller/src/main/java/org/apache/aries/subsystem/modelling/impl/ModellingManagerImpl.java @@ -22,9 +22,9 @@ import java.util.Map; import java.util.jar.Attributes; -import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ExportedService; import org.apache.aries.subsystem.modelling.ImportedService; +import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ModelledResource; import org.apache.aries.subsystem.modelling.ModellingManager; import org.apache.aries.subsystem.modelling.ParsedServiceElements; diff --git a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/ModellerTest.java b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/ModellerTest.java index 28937990fa..09223936d6 100644 --- a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/ModellerTest.java +++ b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/ModellerTest.java @@ -19,6 +19,11 @@ package org.apache.aries.subsystem.modelling; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -29,10 +34,10 @@ import java.util.List; import java.util.jar.Manifest; +import org.apache.aries.mocks.BundleContextMock; import org.apache.aries.subsystem.modelling.impl.ModelledResourceManagerImpl; import org.apache.aries.subsystem.modelling.impl.ModellingManagerImpl; import org.apache.aries.subsystem.modelling.impl.ParserProxyTest; -import org.apache.aries.mocks.BundleContextMock; import org.apache.aries.util.filesystem.FileSystem; import org.apache.aries.util.io.IOUtils; import org.junit.AfterClass; @@ -41,7 +46,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import static org.junit.Assert.*; @RunWith(Parameterized.class) public class ModellerTest { diff --git a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/impl/ParserProxyTest.java b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/impl/ParserProxyTest.java index a0898b6bbe..271e6eda29 100644 --- a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/impl/ParserProxyTest.java +++ b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/impl/ParserProxyTest.java @@ -37,16 +37,16 @@ import java.util.Map; import java.util.Set; -import org.apache.aries.subsystem.modelling.ModellingManager; -import org.apache.aries.subsystem.modelling.ParsedServiceElements; -import org.apache.aries.subsystem.modelling.ParserProxy; -import org.apache.aries.subsystem.modelling.WrappedReferenceMetadata; -import org.apache.aries.subsystem.modelling.WrappedServiceMetadata; import org.apache.aries.blueprint.container.NamespaceHandlerRegistry; import org.apache.aries.blueprint.container.ParserServiceImpl; import org.apache.aries.blueprint.namespace.NamespaceHandlerRegistryImpl; import org.apache.aries.blueprint.services.ParserService; import org.apache.aries.mocks.BundleContextMock; +import org.apache.aries.subsystem.modelling.ModellingManager; +import org.apache.aries.subsystem.modelling.ParsedServiceElements; +import org.apache.aries.subsystem.modelling.ParserProxy; +import org.apache.aries.subsystem.modelling.WrappedReferenceMetadata; +import org.apache.aries.subsystem.modelling.WrappedServiceMetadata; import org.apache.aries.unittest.mocks.Skeleton; import org.junit.AfterClass; import org.junit.Test; diff --git a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/AbstractBundleResourceTest.java b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/AbstractBundleResourceTest.java index 7b7a7a9890..a21da7a4a8 100644 --- a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/AbstractBundleResourceTest.java +++ b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/AbstractBundleResourceTest.java @@ -25,7 +25,6 @@ import java.io.IOException; import java.util.Map; -import org.apache.aries.subsystem.modelling.ResolverException; import org.apache.aries.subsystem.modelling.ExportedPackage; import org.apache.aries.subsystem.modelling.ExportedService; import org.apache.aries.subsystem.modelling.ImportedBundle; @@ -33,6 +32,7 @@ import org.apache.aries.subsystem.modelling.ImportedService; import org.apache.aries.subsystem.modelling.ModelledResource; import org.apache.aries.subsystem.modelling.ModellingConstants; +import org.apache.aries.subsystem.modelling.ResolverException; import org.apache.aries.util.manifest.ManifestHeaderProcessor; import org.junit.Before; import org.junit.Ignore; diff --git a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/BundleResourceTest.java b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/BundleResourceTest.java index 510b32c1a6..d2610e6db9 100644 --- a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/BundleResourceTest.java +++ b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/BundleResourceTest.java @@ -28,8 +28,8 @@ import java.util.jar.Manifest; import org.apache.aries.subsystem.modelling.InvalidAttributeException; -import org.apache.aries.subsystem.modelling.ResolverException; import org.apache.aries.subsystem.modelling.ModelledResource; +import org.apache.aries.subsystem.modelling.ResolverException; import org.apache.aries.subsystem.modelling.ResourceType; import org.apache.aries.subsystem.modelling.impl.ModelledResourceImpl; import org.junit.Test; diff --git a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/DeployedBundlesTest.java b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/DeployedBundlesTest.java index 5e23599887..0374920231 100644 --- a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/DeployedBundlesTest.java +++ b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/DeployedBundlesTest.java @@ -32,13 +32,13 @@ import java.util.Map; import java.util.jar.Attributes; -import org.apache.aries.subsystem.modelling.InvalidAttributeException; -import org.apache.aries.subsystem.modelling.ResolverException; import org.apache.aries.subsystem.modelling.DeployedBundles; import org.apache.aries.subsystem.modelling.ExportedService; import org.apache.aries.subsystem.modelling.ImportedBundle; import org.apache.aries.subsystem.modelling.ImportedService; +import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ModelledResource; +import org.apache.aries.subsystem.modelling.ResolverException; import org.apache.aries.subsystem.modelling.impl.ExportedServiceImpl; import org.apache.aries.subsystem.modelling.impl.ImportedBundleImpl; import org.apache.aries.subsystem.modelling.impl.ImportedServiceImpl; diff --git a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ExportedServiceTest.java b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ExportedServiceTest.java index f5551eaa9d..427e9865b4 100644 --- a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ExportedServiceTest.java +++ b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ExportedServiceTest.java @@ -17,6 +17,7 @@ * under the License. */ package org.apache.aries.subsystem.modelling.utils; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ImportedPackageTest.java b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ImportedPackageTest.java index d100d5a9fa..9699485962 100644 --- a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ImportedPackageTest.java +++ b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/ImportedPackageTest.java @@ -6,8 +6,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ImportedPackage; +import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.impl.ImportedPackageImpl; import org.junit.Test; import org.osgi.framework.Constants; diff --git a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/PackageRequirementMergerTest.java b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/PackageRequirementMergerTest.java index 1cf75cd1d5..833df3f201 100644 --- a/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/PackageRequirementMergerTest.java +++ b/subsystem/subsystem-modeller/src/test/java/org/apache/aries/subsystem/modelling/utils/PackageRequirementMergerTest.java @@ -19,6 +19,11 @@ package org.apache.aries.subsystem.modelling.utils; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -26,8 +31,8 @@ import java.util.Map; import java.util.Set; -import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.ImportedPackage; +import org.apache.aries.subsystem.modelling.InvalidAttributeException; import org.apache.aries.subsystem.modelling.impl.ImportedPackageImpl; import org.apache.aries.subsystem.modelling.impl.PackageRequirementMerger; import org.apache.aries.util.VersionRange; @@ -35,11 +40,6 @@ import org.junit.Test; import org.osgi.framework.Constants; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; - public final class PackageRequirementMergerTest { diff --git a/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/OsgiRequirementAdapter.java b/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/OsgiRequirementAdapter.java index 11a2b62a7e..aa956d8ec3 100644 --- a/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/OsgiRequirementAdapter.java +++ b/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/OsgiRequirementAdapter.java @@ -13,6 +13,8 @@ */ package org.apache.aries.subsystem.util.felix; +import java.util.Map; + import org.apache.aries.subsystem.obr.internal.NamespaceTranslator; import org.apache.aries.subsystem.obr.internal.ResourceHelper; import org.apache.felix.bundlerepository.Capability; @@ -22,8 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Map; - public class OsgiRequirementAdapter implements Requirement { private static final Logger logger = LoggerFactory.getLogger(OsgiRequirementAdapter.class); diff --git a/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java b/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java index 1bd10fff08..820371f204 100644 --- a/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java +++ b/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java @@ -18,13 +18,6 @@ */ package org.apache.aries.itest; -import org.ops4j.pax.exam.Option; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; - -import javax.inject.Inject; - import static org.ops4j.pax.exam.CoreOptions.composite; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.systemProperty; @@ -32,6 +25,13 @@ import static org.ops4j.pax.exam.CoreOptions.vmOption; import static org.ops4j.pax.exam.CoreOptions.when; +import javax.inject.Inject; + +import org.ops4j.pax.exam.Option; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; + /** * Base class for Pax Exam based unit tests *

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 4fc11d9a01..f8718297d0 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 @@ -41,8 +41,7 @@ import java.util.jar.JarInputStream; import java.util.jar.Manifest; -import junit.framework.AssertionFailedError; - +import org.apache.aries.unittest.mocks.Skeleton; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; @@ -55,7 +54,7 @@ import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; -import org.apache.aries.unittest.mocks.Skeleton; +import junit.framework.AssertionFailedError; /** * 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 e659e28117..1459618790 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 @@ -34,8 +34,6 @@ import java.util.Vector; import java.util.regex.Pattern; -import junit.framework.AssertionFailedError; - import org.apache.aries.unittest.mocks.MethodCall; import org.apache.aries.unittest.mocks.MethodCallHandler; import org.apache.aries.unittest.mocks.Skeleton; @@ -48,6 +46,8 @@ import org.osgi.framework.ServiceReference; import org.osgi.framework.Version; +import junit.framework.AssertionFailedError; + @Singleton public class BundleMock { diff --git a/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/MockInitialContextFactoryBuilder.java b/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/MockInitialContextFactoryBuilder.java index 244e103402..edf06570d5 100644 --- a/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/MockInitialContextFactoryBuilder.java +++ b/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/MockInitialContextFactoryBuilder.java @@ -19,7 +19,6 @@ package org.apache.aries.mocks; import java.util.Hashtable; - import javax.naming.Context; import javax.naming.NamingException; import javax.naming.spi.InitialContextFactory; diff --git a/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java b/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java index 32e726bd2e..853c594ea8 100644 --- a/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java +++ b/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java @@ -18,6 +18,9 @@ */ package org.apache.aries.unittest.mocks; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + import java.lang.ref.SoftReference; import java.lang.reflect.Field; import java.lang.reflect.InvocationHandler; @@ -33,13 +36,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import junit.framework.AssertionFailedError; - import org.apache.aries.unittest.mocks.annotations.InjectSkeleton; import org.apache.aries.unittest.mocks.annotations.Singleton; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import junit.framework.AssertionFailedError; /** *

The Skeleton class is an implementation of the diff --git a/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/ComponentTxData.java b/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/ComponentTxData.java index af5102751c..d3d89e249c 100644 --- a/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/ComponentTxData.java +++ b/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/ComponentTxData.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; - import javax.transaction.Transactional; import javax.transaction.Transactional.TxType; diff --git a/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionalAnnotationAttributes.java b/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionalAnnotationAttributes.java index 83228fc917..0c88e6c388 100644 --- a/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionalAnnotationAttributes.java +++ b/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionalAnnotationAttributes.java @@ -18,10 +18,10 @@ */ package org.apache.aries.transaction; -import javax.transaction.Transactional.TxType; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import javax.transaction.Transactional.TxType; public class TransactionalAnnotationAttributes { diff --git a/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java b/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java index 43c5c14c84..266807b4c8 100644 --- a/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java +++ b/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java @@ -20,7 +20,6 @@ import java.lang.reflect.Method; import java.util.Optional; - import javax.transaction.RollbackException; import javax.transaction.Status; import javax.transaction.Transaction; diff --git a/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java b/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java index 77ae68178f..2f555445aa 100644 --- a/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java +++ b/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; - import javax.transaction.TransactionManager; import org.apache.aries.blueprint.ComponentDefinitionRegistry; diff --git a/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java b/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java index 6ef4d18a45..c7a51ed499 100644 --- a/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java +++ b/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java @@ -22,7 +22,6 @@ import java.net.URL; import java.util.Arrays; import java.util.Set; - import javax.transaction.TransactionManager; import org.apache.aries.blueprint.ComponentDefinitionRegistry; diff --git a/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/ComponentTxDataTest.java b/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/ComponentTxDataTest.java index ca01bac64a..6e62b9093a 100644 --- a/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/ComponentTxDataTest.java +++ b/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/ComponentTxDataTest.java @@ -26,11 +26,10 @@ import java.sql.BatchUpdateException; import java.sql.SQLDataException; import java.util.List; - import javax.transaction.Transactional.TxType; -import org.apache.aries.transaction.pojo.BadlyAnnotatedPojo1; import org.apache.aries.transaction.pojo.AnnotatedPojo; +import org.apache.aries.transaction.pojo.BadlyAnnotatedPojo1; import org.apache.aries.transaction.pojo.ExtendedPojo; import org.apache.aries.transaction.pojo.ExtendedPojo2; import org.apache.aries.transaction.pojo.ExtendedPojo3; diff --git a/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/DummyNamespaceHandlerSet.java b/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/DummyNamespaceHandlerSet.java index cb4387eed5..20151d7794 100644 --- a/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/DummyNamespaceHandlerSet.java +++ b/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/DummyNamespaceHandlerSet.java @@ -22,7 +22,6 @@ import java.net.URI; import java.util.Map; import java.util.Set; - import javax.xml.validation.Schema; import org.apache.aries.blueprint.NamespaceHandler; diff --git a/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/InterceptorTest.java b/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/InterceptorTest.java index ce6e4d3cf7..ae3ccc6a5f 100644 --- a/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/InterceptorTest.java +++ b/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/InterceptorTest.java @@ -22,7 +22,6 @@ import static org.easymock.EasyMock.replay; import java.io.IOException; - import javax.transaction.Transaction; import javax.transaction.TransactionManager; diff --git a/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/TranStrategyTest.java b/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/TranStrategyTest.java index 723ca3a67f..32505b9bac 100644 --- a/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/TranStrategyTest.java +++ b/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/TranStrategyTest.java @@ -29,7 +29,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; - import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; import javax.transaction.InvalidTransactionException; diff --git a/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/pojo/OnRollbackPojo.java b/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/pojo/OnRollbackPojo.java index f41bb678a9..d0e9b6868c 100644 --- a/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/pojo/OnRollbackPojo.java +++ b/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/pojo/OnRollbackPojo.java @@ -20,7 +20,6 @@ import java.sql.BatchUpdateException; import java.sql.SQLDataException; - import javax.transaction.Transactional; @Transactional(rollbackOn = SQLDataException.class) diff --git a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java index e8f1b71e6f..d448f2fcad 100644 --- a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java +++ b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java @@ -27,7 +27,6 @@ import static org.ops4j.pax.exam.CoreOptions.systemProperty; import java.sql.SQLException; - import javax.inject.Inject; import javax.transaction.RollbackException; import javax.transaction.UserTransaction; diff --git a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NotSupportedTest.java b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NotSupportedTest.java index 07a062f01f..471e9e8a71 100644 --- a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NotSupportedTest.java +++ b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NotSupportedTest.java @@ -18,7 +18,6 @@ import static org.junit.Assert.assertEquals; import java.sql.SQLException; - import javax.inject.Inject; import org.apache.aries.transaction.test.TestBean; diff --git a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiresNewTest.java b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiresNewTest.java index 7fc7385fc6..7422145588 100644 --- a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiresNewTest.java +++ b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiresNewTest.java @@ -18,7 +18,6 @@ import static org.junit.Assert.assertEquals; import java.sql.SQLException; - import javax.inject.Inject; import org.apache.aries.transaction.test.TestBean; diff --git a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RollbackOnTest.java b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RollbackOnTest.java index f7a1958407..8dfe6a6bb6 100644 --- a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RollbackOnTest.java +++ b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RollbackOnTest.java @@ -18,18 +18,18 @@ */ package org.apache.aries.transaction.itests; +import static org.junit.Assert.assertEquals; + +import java.sql.SQLException; +import javax.inject.Inject; +import javax.transaction.Status; + import org.apache.aries.transaction.test.RollbackOnBean; import org.apache.aries.transaction.test.TestBean; import org.junit.Before; import org.junit.Test; import org.ops4j.pax.exam.util.Filter; -import javax.inject.Inject; -import javax.transaction.Status; -import java.sql.SQLException; - -import static org.junit.Assert.assertEquals; - public class RollbackOnTest extends AbstractIntegrationTest { @Inject diff --git a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/RecoverableDataSource.java b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/RecoverableDataSource.java index 24ca7ec0ec..2e8d8ca865 100644 --- a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/RecoverableDataSource.java +++ b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/RecoverableDataSource.java @@ -18,6 +18,14 @@ */ package org.apache.aries.transaction.jdbc; +import java.io.PrintWriter; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import javax.sql.CommonDataSource; +import javax.sql.DataSource; +import javax.sql.XADataSource; + import org.apache.aries.transaction.AriesTransactionManager; import org.apache.aries.transaction.jdbc.internal.AbstractMCFFactory; import org.apache.aries.transaction.jdbc.internal.ConnectionManagerFactory; @@ -25,14 +33,6 @@ import org.apache.aries.transaction.jdbc.internal.Recovery; import org.apache.aries.transaction.jdbc.internal.XADataSourceMCFFactory; -import javax.sql.CommonDataSource; -import javax.sql.DataSource; -import javax.sql.XADataSource; -import java.io.PrintWriter; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; - /** * Defines a JDBC DataSource that will auto-enlist into existing XA transactions. * The DataSource will also be registered with the Aries/Geronimo transaction diff --git a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/AbstractMCFFactory.java b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/AbstractMCFFactory.java index 604be72ed3..76ed26e7f3 100644 --- a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/AbstractMCFFactory.java +++ b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/AbstractMCFFactory.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; - import javax.resource.spi.ManagedConnectionFactory; import javax.sql.CommonDataSource; diff --git a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/Activator.java b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/Activator.java index 5749725bad..5b440f24ce 100644 --- a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/Activator.java +++ b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/Activator.java @@ -18,6 +18,9 @@ */ package org.apache.aries.transaction.jdbc.internal; +import java.util.Hashtable; +import javax.sql.CommonDataSource; + import org.apache.aries.blueprint.NamespaceHandler; import org.apache.aries.transaction.AriesTransactionManager; import org.apache.aries.util.tracker.SingleServiceTracker; @@ -33,10 +36,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.sql.CommonDataSource; - -import java.util.Hashtable; - @SuppressWarnings("rawtypes") public class Activator implements BundleActivator, ServiceTrackerCustomizer, diff --git a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ConnectionManagerFactory.java b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ConnectionManagerFactory.java index bb76bd850e..534a42508a 100644 --- a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ConnectionManagerFactory.java +++ b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ConnectionManagerFactory.java @@ -18,6 +18,9 @@ */ package org.apache.aries.transaction.jdbc.internal; +import javax.resource.spi.ConnectionManager; +import javax.resource.spi.ManagedConnectionFactory; + import org.apache.aries.transaction.AriesTransactionManager; import org.apache.geronimo.connector.outbound.GenericConnectionManager; import org.apache.geronimo.connector.outbound.SubjectSource; @@ -34,9 +37,6 @@ import org.apache.geronimo.transaction.manager.TransactionManagerMonitor; import org.tranql.connector.UserPasswordManagedConnectionFactory; -import javax.resource.spi.ConnectionManager; -import javax.resource.spi.ManagedConnectionFactory; - public class ConnectionManagerFactory { private AriesTransactionManager transactionManager; diff --git a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/DataSourceMCFFactory.java b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/DataSourceMCFFactory.java index f57338eac3..9957367869 100644 --- a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/DataSourceMCFFactory.java +++ b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/DataSourceMCFFactory.java @@ -18,16 +18,16 @@ */ package org.apache.aries.transaction.jdbc.internal; -import org.tranql.connector.CredentialExtractor; -import org.tranql.connector.jdbc.AbstractLocalDataSourceMCF; - +import java.sql.Connection; +import java.sql.SQLException; import javax.resource.ResourceException; import javax.resource.spi.ResourceAdapterInternalException; import javax.resource.spi.TransactionSupport; import javax.security.auth.Subject; import javax.sql.DataSource; -import java.sql.Connection; -import java.sql.SQLException; + +import org.tranql.connector.CredentialExtractor; +import org.tranql.connector.jdbc.AbstractLocalDataSourceMCF; public class DataSourceMCFFactory extends AbstractMCFFactory { diff --git a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ManagedDataSourceFactory.java b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ManagedDataSourceFactory.java index 7c4f27cde1..be2814197e 100644 --- a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ManagedDataSourceFactory.java +++ b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ManagedDataSourceFactory.java @@ -18,6 +18,12 @@ */ package org.apache.aries.transaction.jdbc.internal; +import java.util.Hashtable; +import java.util.Map; +import javax.sql.CommonDataSource; +import javax.sql.DataSource; +import javax.sql.XADataSource; + import org.apache.aries.transaction.AriesTransactionManager; import org.apache.aries.transaction.jdbc.RecoverableDataSource; import org.osgi.framework.BundleContext; @@ -25,13 +31,6 @@ import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; -import javax.sql.CommonDataSource; -import javax.sql.DataSource; -import javax.sql.XADataSource; - -import java.util.Hashtable; -import java.util.Map; - @SuppressWarnings({"rawtypes", "unchecked"}) public class ManagedDataSourceFactory { diff --git a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/Recovery.java b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/Recovery.java index 70f536be02..f375f29724 100644 --- a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/Recovery.java +++ b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/Recovery.java @@ -18,6 +18,12 @@ */ package org.apache.aries.transaction.jdbc.internal; +import java.io.IOException; +import javax.sql.XAConnection; +import javax.sql.XADataSource; +import javax.transaction.SystemException; +import javax.transaction.xa.XAResource; + import org.apache.geronimo.transaction.manager.NamedXAResource; import org.apache.geronimo.transaction.manager.NamedXAResourceFactory; import org.apache.geronimo.transaction.manager.RecoverableTransactionManager; @@ -25,12 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.sql.XAConnection; -import javax.sql.XADataSource; -import javax.transaction.SystemException; -import javax.transaction.xa.XAResource; -import java.io.IOException; - /** * This class will ensure the broker is properly recovered when wired with * the Geronimo transaction manager. diff --git a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingDelegatingManagedConnectionFactory.java b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingDelegatingManagedConnectionFactory.java index 34fc8a9e98..4f18c26bad 100644 --- a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingDelegatingManagedConnectionFactory.java +++ b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingDelegatingManagedConnectionFactory.java @@ -18,14 +18,11 @@ */ package org.apache.aries.transaction.jdbc.internal; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.tranql.connector.AbstractManagedConnection; -import org.tranql.connector.ManagedConnectionHandle; -import org.tranql.connector.UserPasswordManagedConnectionFactory; -import org.tranql.connector.jdbc.ConnectionHandle; -import org.tranql.connector.jdbc.TranqlDataSource; - +import java.io.PrintWriter; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.HashSet; +import java.util.Set; import javax.resource.NotSupportedException; import javax.resource.ResourceException; import javax.resource.spi.ConnectionManager; @@ -36,11 +33,13 @@ import javax.resource.spi.ValidatingManagedConnectionFactory; import javax.security.auth.Subject; -import java.io.PrintWriter; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.HashSet; -import java.util.Set; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.tranql.connector.AbstractManagedConnection; +import org.tranql.connector.ManagedConnectionHandle; +import org.tranql.connector.UserPasswordManagedConnectionFactory; +import org.tranql.connector.jdbc.ConnectionHandle; +import org.tranql.connector.jdbc.TranqlDataSource; @SuppressWarnings({ "rawtypes", "serial", "unchecked" diff --git a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingGenericConnectionManager.java b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingGenericConnectionManager.java index 8b9e44f84f..a25b20998e 100644 --- a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingGenericConnectionManager.java +++ b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ValidatingGenericConnectionManager.java @@ -18,6 +18,18 @@ */ package org.apache.aries.transaction.jdbc.internal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Timer; +import java.util.TimerTask; +import java.util.concurrent.locks.ReadWriteLock; +import javax.resource.ResourceException; +import javax.resource.spi.ManagedConnection; +import javax.resource.spi.ManagedConnectionFactory; +import javax.resource.spi.ValidatingManagedConnectionFactory; + import org.apache.geronimo.connector.outbound.AbstractSinglePoolConnectionInterceptor; import org.apache.geronimo.connector.outbound.ConnectionInfo; import org.apache.geronimo.connector.outbound.ConnectionInterceptor; @@ -33,19 +45,6 @@ import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker; import org.apache.geronimo.transaction.manager.RecoverableTransactionManager; -import javax.resource.ResourceException; -import javax.resource.spi.ManagedConnection; -import javax.resource.spi.ManagedConnectionFactory; -import javax.resource.spi.ValidatingManagedConnectionFactory; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.Timer; -import java.util.TimerTask; -import java.util.concurrent.locks.ReadWriteLock; - @SuppressWarnings({ "unchecked", "serial" }) diff --git a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/XADataSourceMCFFactory.java b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/XADataSourceMCFFactory.java index 7252b84c9e..c2d5d5b07a 100644 --- a/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/XADataSourceMCFFactory.java +++ b/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/XADataSourceMCFFactory.java @@ -19,7 +19,6 @@ package org.apache.aries.transaction.jdbc.internal; import java.sql.SQLException; - import javax.resource.ResourceException; import javax.resource.spi.ConnectionRequestInfo; import javax.resource.spi.ManagedConnection; diff --git a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/PooledConnectionFactory.java b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/PooledConnectionFactory.java index 927185ae7e..7028e67ce1 100644 --- a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/PooledConnectionFactory.java +++ b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/PooledConnectionFactory.java @@ -17,7 +17,6 @@ package org.apache.aries.transaction.jms; import java.util.concurrent.atomic.AtomicBoolean; - import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.JMSException; diff --git a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/ConnectionPool.java b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/ConnectionPool.java index 4805d5db76..10305d0963 100644 --- a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/ConnectionPool.java +++ b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/ConnectionPool.java @@ -19,7 +19,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicBoolean; - import javax.jms.Connection; import javax.jms.IllegalStateException; import javax.jms.JMSException; diff --git a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/IntrospectionSupport.java b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/IntrospectionSupport.java index 88827f4b27..f48f426536 100755 --- a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/IntrospectionSupport.java +++ b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/IntrospectionSupport.java @@ -20,7 +20,6 @@ import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; - import javax.net.ssl.SSLServerSocket; import org.slf4j.Logger; diff --git a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/PooledConnection.java b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/PooledConnection.java index 98e65eab2c..07750a588e 100755 --- a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/PooledConnection.java +++ b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/PooledConnection.java @@ -18,8 +18,22 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; - -import javax.jms.*; +import javax.jms.Connection; +import javax.jms.ConnectionConsumer; +import javax.jms.ConnectionMetaData; +import javax.jms.Destination; +import javax.jms.ExceptionListener; +import javax.jms.JMSException; +import javax.jms.Queue; +import javax.jms.QueueConnection; +import javax.jms.QueueSession; +import javax.jms.ServerSessionPool; +import javax.jms.Session; +import javax.jms.TemporaryQueue; +import javax.jms.TemporaryTopic; +import javax.jms.Topic; +import javax.jms.TopicConnection; +import javax.jms.TopicSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/PooledSession.java b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/PooledSession.java index 1ceb0a8778..d6d8fb424d 100644 --- a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/PooledSession.java +++ b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/PooledSession.java @@ -17,10 +17,32 @@ package org.apache.aries.transaction.jms.internal; import java.io.Serializable; -import java.lang.IllegalStateException; import java.util.Iterator; import java.util.concurrent.CopyOnWriteArrayList; -import javax.jms.*; +import javax.jms.BytesMessage; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.MapMessage; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageListener; +import javax.jms.MessageProducer; +import javax.jms.ObjectMessage; +import javax.jms.Queue; +import javax.jms.QueueBrowser; +import javax.jms.QueueReceiver; +import javax.jms.QueueSender; +import javax.jms.QueueSession; +import javax.jms.Session; +import javax.jms.StreamMessage; +import javax.jms.TemporaryQueue; +import javax.jms.TemporaryTopic; +import javax.jms.TextMessage; +import javax.jms.Topic; +import javax.jms.TopicPublisher; +import javax.jms.TopicSession; +import javax.jms.TopicSubscriber; +import javax.jms.XASession; import javax.transaction.xa.XAResource; import org.apache.commons.pool.KeyedObjectPool; diff --git a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/XaPooledConnectionFactory.java b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/XaPooledConnectionFactory.java index 501db56301..553599e186 100644 --- a/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/XaPooledConnectionFactory.java +++ b/transaction/transaction-jms/src/main/java/org/apache/aries/transaction/jms/internal/XaPooledConnectionFactory.java @@ -18,7 +18,6 @@ import java.io.Serializable; import java.util.Hashtable; - import javax.jms.Connection; import javax.jms.JMSException; import javax.jms.QueueConnection; diff --git a/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/AriesTransactionManager.java b/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/AriesTransactionManager.java index f6819bdd71..7928786fa7 100644 --- a/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/AriesTransactionManager.java +++ b/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/AriesTransactionManager.java @@ -16,16 +16,16 @@ */ package org.apache.aries.transaction; -import org.apache.geronimo.transaction.manager.MonitorableTransactionManager; -import org.apache.geronimo.transaction.manager.RecoverableTransactionManager; -import org.apache.geronimo.transaction.manager.XAWork; -import org.apache.geronimo.transaction.manager.XidImporter; - import javax.resource.spi.XATerminator; import javax.transaction.TransactionManager; import javax.transaction.TransactionSynchronizationRegistry; import javax.transaction.UserTransaction; +import org.apache.geronimo.transaction.manager.MonitorableTransactionManager; +import org.apache.geronimo.transaction.manager.RecoverableTransactionManager; +import org.apache.geronimo.transaction.manager.XAWork; +import org.apache.geronimo.transaction.manager.XidImporter; + public interface AriesTransactionManager extends TransactionManager, UserTransaction, TransactionSynchronizationRegistry, XidImporter, diff --git a/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/Activator.java b/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/Activator.java index 7688db4203..be12eec5cb 100644 --- a/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/Activator.java +++ b/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/Activator.java @@ -16,6 +16,9 @@ */ package org.apache.aries.transaction.internal; +import static org.apache.aries.transaction.internal.TransactionManagerService.DEFAULT_RECOVERABLE; +import static org.apache.aries.transaction.internal.TransactionManagerService.RECOVERABLE; + import java.io.IOException; import java.util.Dictionary; import java.util.Enumeration; @@ -32,9 +35,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.aries.transaction.internal.TransactionManagerService.DEFAULT_RECOVERABLE; -import static org.apache.aries.transaction.internal.TransactionManagerService.RECOVERABLE; - /** */ public class Activator implements BundleActivator, ManagedService { diff --git a/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesPlatformTransactionManager.java b/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesPlatformTransactionManager.java index 333fc8e91a..922f635e7a 100644 --- a/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesPlatformTransactionManager.java +++ b/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesPlatformTransactionManager.java @@ -16,26 +16,25 @@ */ package org.apache.aries.transaction.internal; -import java.util.Map; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - -import javax.transaction.Transaction; import javax.transaction.Status; import javax.transaction.SystemException; +import javax.transaction.Transaction; import javax.transaction.xa.XAException; import org.apache.geronimo.transaction.manager.TransactionLog; -import org.apache.geronimo.transaction.manager.XidFactory; import org.apache.geronimo.transaction.manager.TransactionManagerMonitor; +import org.apache.geronimo.transaction.manager.XidFactory; import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionException; -import org.springframework.transaction.support.TransactionSynchronizationManager; -import org.springframework.transaction.support.TransactionSynchronization; +import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.jta.JtaTransactionManager; +import org.springframework.transaction.support.TransactionSynchronization; +import org.springframework.transaction.support.TransactionSynchronizationManager; /** */ diff --git a/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesTransactionManagerImpl.java b/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesTransactionManagerImpl.java index 61bd1d08bb..5554f724d9 100644 --- a/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesTransactionManagerImpl.java +++ b/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/AriesTransactionManagerImpl.java @@ -16,13 +16,13 @@ */ package org.apache.aries.transaction.internal; +import javax.transaction.xa.XAException; + import org.apache.aries.transaction.AriesTransactionManager; import org.apache.geronimo.transaction.manager.GeronimoTransactionManager; import org.apache.geronimo.transaction.manager.TransactionLog; import org.apache.geronimo.transaction.manager.XidFactory; -import javax.transaction.xa.XAException; - public class AriesTransactionManagerImpl extends GeronimoTransactionManager implements AriesTransactionManager { public AriesTransactionManagerImpl() throws XAException { diff --git a/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionLogUtils.java b/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionLogUtils.java index 027584d0b6..596bede2ee 100644 --- a/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionLogUtils.java +++ b/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionLogUtils.java @@ -16,6 +16,17 @@ */ package org.apache.aries.transaction.internal; +import static org.apache.aries.transaction.internal.TransactionManagerService.HOWL_BUFFER_SIZE; +import static org.apache.aries.transaction.internal.TransactionManagerService.HOWL_LOG_FILE_DIR; +import static org.apache.aries.transaction.internal.TransactionManagerService.HOWL_LOG_FILE_EXT; +import static org.apache.aries.transaction.internal.TransactionManagerService.HOWL_LOG_FILE_NAME; +import static org.apache.aries.transaction.internal.TransactionManagerService.HOWL_MAX_BLOCKS_PER_FILE; +import static org.apache.aries.transaction.internal.TransactionManagerService.HOWL_MAX_LOG_FILES; +import static org.apache.aries.transaction.internal.TransactionManagerService.RECOVERABLE; +import static org.apache.aries.transaction.internal.TransactionManagerService.TMID; +import static org.apache.aries.transaction.internal.TransactionManagerService.getInt; +import static org.apache.aries.transaction.internal.TransactionManagerService.getString; + import java.io.File; import java.io.FilenameFilter; import java.io.IOException; @@ -41,8 +52,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.aries.transaction.internal.TransactionManagerService.*; - public class TransactionLogUtils { public static Logger log = LoggerFactory.getLogger(TransactionLogUtils.class); diff --git a/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java b/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java index 8a5fca2869..b0e6e7df10 100644 --- a/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java +++ b/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/TransactionManagerService.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Dictionary; import java.util.List; - import javax.transaction.TransactionManager; import javax.transaction.TransactionSynchronizationRegistry; import javax.transaction.UserTransaction; diff --git a/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/XidFactoryImpl.java b/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/XidFactoryImpl.java index 86663162ee..d3e037bba5 100644 --- a/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/XidFactoryImpl.java +++ b/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/internal/XidFactoryImpl.java @@ -18,6 +18,7 @@ package org.apache.aries.transaction.internal; import javax.transaction.xa.Xid; + import org.apache.geronimo.transaction.manager.XidFactory; import org.apache.geronimo.transaction.manager.XidImpl; diff --git a/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogConversionTest.java b/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogConversionTest.java index a1f5f039a1..65f8129920 100644 --- a/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogConversionTest.java +++ b/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/LogConversionTest.java @@ -16,6 +16,11 @@ */ package org.apache.aries.transaction.internal; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; + import java.io.File; import java.io.RandomAccessFile; import java.util.Dictionary; @@ -33,11 +38,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; - public class LogConversionTest { public static Logger LOG = LoggerFactory.getLogger(LogConversionTest.class); diff --git a/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/XidFactoryImplTest.java b/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/XidFactoryImplTest.java index 1eb7c0ca50..99d6d08037 100644 --- a/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/XidFactoryImplTest.java +++ b/transaction/transaction-manager/src/test/java/org/apache/aries/transaction/internal/XidFactoryImplTest.java @@ -17,17 +17,16 @@ package org.apache.aries.transaction.internal; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.util.concurrent.TimeUnit; import javax.transaction.xa.Xid; -import org.apache.aries.transaction.internal.XidFactoryImpl; import org.apache.geronimo.transaction.manager.XidFactory; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class XidFactoryImplTest { @Test diff --git a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/Connector.java b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/Connector.java index b843e1cdda..129b25bed6 100644 --- a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/Connector.java +++ b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/Connector.java @@ -24,7 +24,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; - import javax.sql.DataSource; import org.apache.aries.transaction.test.Counter; diff --git a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/MandatoryTestBeanImpl.java b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/MandatoryTestBeanImpl.java index 671ff2a8f9..636e4d235e 100644 --- a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/MandatoryTestBeanImpl.java +++ b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/MandatoryTestBeanImpl.java @@ -18,8 +18,8 @@ */ package org.apache.aries.transaction.test.impl; -import javax.transaction.Transactional; import java.sql.SQLException; +import javax.transaction.Transactional; public class MandatoryTestBeanImpl extends TestBeanImpl { diff --git a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/NeverTestBeanImpl.java b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/NeverTestBeanImpl.java index d5dab18e0a..4506c4641f 100644 --- a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/NeverTestBeanImpl.java +++ b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/NeverTestBeanImpl.java @@ -18,11 +18,10 @@ */ package org.apache.aries.transaction.test.impl; +import java.sql.SQLException; import javax.transaction.Transactional; import javax.transaction.Transactional.TxType; -import java.sql.SQLException; - public class NeverTestBeanImpl extends TestBeanImpl { @Override diff --git a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/NotSupportedTestBeanImpl.java b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/NotSupportedTestBeanImpl.java index 4f97889407..413e5e7d30 100644 --- a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/NotSupportedTestBeanImpl.java +++ b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/NotSupportedTestBeanImpl.java @@ -19,7 +19,6 @@ package org.apache.aries.transaction.test.impl; import java.sql.SQLException; - import javax.transaction.Transactional; @Transactional(Transactional.TxType.NOT_SUPPORTED) diff --git a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/RequiredTestBeanImpl.java b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/RequiredTestBeanImpl.java index d6ebdf777e..cbfd8be19b 100644 --- a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/RequiredTestBeanImpl.java +++ b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/RequiredTestBeanImpl.java @@ -19,7 +19,6 @@ package org.apache.aries.transaction.test.impl; import java.sql.SQLException; - import javax.transaction.Transactional; public class RequiredTestBeanImpl extends TestBeanImpl { diff --git a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/RequiresNewTestBeanImpl.java b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/RequiresNewTestBeanImpl.java index b61a7b3619..2cbc6b99dd 100644 --- a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/RequiresNewTestBeanImpl.java +++ b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/RequiresNewTestBeanImpl.java @@ -18,11 +18,10 @@ */ package org.apache.aries.transaction.test.impl; +import java.sql.SQLException; import javax.transaction.Transactional; import javax.transaction.Transactional.TxType; -import java.sql.SQLException; - public class RequiresNewTestBeanImpl extends TestBeanImpl { @Override diff --git a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/RollbackOnBeanImpl.java b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/RollbackOnBeanImpl.java index 89fcf416bb..f73b6e7da4 100644 --- a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/RollbackOnBeanImpl.java +++ b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/RollbackOnBeanImpl.java @@ -18,13 +18,13 @@ */ package org.apache.aries.transaction.test.impl; -import org.apache.aries.transaction.test.RollbackOnBean; -import org.apache.aries.transaction.test.TestBean; +import static javax.transaction.Transactional.TxType; -import javax.transaction.Transactional; import java.sql.SQLException; +import javax.transaction.Transactional; -import static javax.transaction.Transactional.TxType; +import org.apache.aries.transaction.test.RollbackOnBean; +import org.apache.aries.transaction.test.TestBean; public class RollbackOnBeanImpl implements RollbackOnBean { diff --git a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/SupportsTestBeanImpl.java b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/SupportsTestBeanImpl.java index 8d1b958cb6..f314234702 100644 --- a/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/SupportsTestBeanImpl.java +++ b/transaction/transaction-testbundle/src/main/java/org/apache/aries/transaction/test/impl/SupportsTestBeanImpl.java @@ -18,11 +18,10 @@ */ package org.apache.aries.transaction.test.impl; +import java.sql.SQLException; import javax.transaction.Transactional; import javax.transaction.Transactional.TxType; -import java.sql.SQLException; - public class SupportsTestBeanImpl extends TestBeanImpl { @Override diff --git a/tutorials/blueprint/tutorial-modules/greeter-client-blueprint/src/main/java/org/apache/aries/tutorials/blueprint/greeter/client/GreeterBlueprintClient.java b/tutorials/blueprint/tutorial-modules/greeter-client-blueprint/src/main/java/org/apache/aries/tutorials/blueprint/greeter/client/GreeterBlueprintClient.java index a361ea43ab..d587ae74c3 100644 --- a/tutorials/blueprint/tutorial-modules/greeter-client-blueprint/src/main/java/org/apache/aries/tutorials/blueprint/greeter/client/GreeterBlueprintClient.java +++ b/tutorials/blueprint/tutorial-modules/greeter-client-blueprint/src/main/java/org/apache/aries/tutorials/blueprint/greeter/client/GreeterBlueprintClient.java @@ -18,13 +18,13 @@ */ package org.apache.aries.tutorials.blueprint.greeter.client; +import javax.inject.Inject; + import org.apache.aries.blueprint.annotation.bean.Bean; import org.apache.aries.blueprint.annotation.config.ConfigProperty; import org.apache.aries.blueprint.annotation.service.Reference; import org.apache.aries.tutorials.blueprint.greeter.api.GreeterMessageService; -import javax.inject.Inject; - @Bean(initMethod = "doRequests") public class GreeterBlueprintClient { private final String clientID; diff --git a/tutorials/blueprint/tutorial-modules/greeter-server-osgi/src/main/java/org/apache/aries/tutorials/blueprint/greeter/server/osgi/ServiceRegisteringActivator.java b/tutorials/blueprint/tutorial-modules/greeter-server-osgi/src/main/java/org/apache/aries/tutorials/blueprint/greeter/server/osgi/ServiceRegisteringActivator.java index a96013e2d7..3773339e48 100644 --- a/tutorials/blueprint/tutorial-modules/greeter-server-osgi/src/main/java/org/apache/aries/tutorials/blueprint/greeter/server/osgi/ServiceRegisteringActivator.java +++ b/tutorials/blueprint/tutorial-modules/greeter-server-osgi/src/main/java/org/apache/aries/tutorials/blueprint/greeter/server/osgi/ServiceRegisteringActivator.java @@ -18,13 +18,13 @@ */ package org.apache.aries.tutorials.blueprint.greeter.server.osgi; +import java.util.Properties; + import org.apache.aries.tutorials.blueprint.greeter.api.GreeterMessageService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; -import java.util.Properties; - public class ServiceRegisteringActivator implements BundleActivator { private ServiceRegistration greeterServiceRegistration = null; 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 1bac5808b5..138f115b96 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 @@ -19,11 +19,6 @@ package org.apache.aries.util.manifest; -import org.apache.aries.util.ManifestHeaderUtils; -import org.apache.aries.util.VersionRange; -import org.osgi.framework.Constants; -import org.osgi.framework.Version; - import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -33,6 +28,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.aries.util.ManifestHeaderUtils; +import org.apache.aries.util.VersionRange; +import org.osgi.framework.Constants; +import org.osgi.framework.Version; + public class ManifestHeaderProcessor { diff --git a/util/src/main/java/org/apache/aries/util/tracker/RecursiveBundleTracker.java b/util/src/main/java/org/apache/aries/util/tracker/RecursiveBundleTracker.java index ff009858bb..ad10954f63 100644 --- a/util/src/main/java/org/apache/aries/util/tracker/RecursiveBundleTracker.java +++ b/util/src/main/java/org/apache/aries/util/tracker/RecursiveBundleTracker.java @@ -21,7 +21,6 @@ import org.apache.aries.util.tracker.hook.BundleHookBundleTracker; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.BundleTracker; import org.osgi.util.tracker.BundleTrackerCustomizer; diff --git a/util/src/main/java/org/apache/aries/util/tracker/hook/BundleHookBundleTracker.java b/util/src/main/java/org/apache/aries/util/tracker/hook/BundleHookBundleTracker.java index c24e65b351..c4b1b03801 100644 --- a/util/src/main/java/org/apache/aries/util/tracker/hook/BundleHookBundleTracker.java +++ b/util/src/main/java/org/apache/aries/util/tracker/hook/BundleHookBundleTracker.java @@ -20,6 +20,13 @@ package org.apache.aries.util.tracker.hook; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; @@ -29,13 +36,6 @@ import org.osgi.util.tracker.BundleTracker; import org.osgi.util.tracker.BundleTrackerCustomizer; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - /** * The Tracked and AbstractTracked inner classes are copied from felix framework 4.0.1. * diff --git a/util/src/test/java/org/apache/aries/util/BundleToClassLoaderAdapterTest.java b/util/src/test/java/org/apache/aries/util/BundleToClassLoaderAdapterTest.java index 277bb705e9..eaca331718 100644 --- a/util/src/test/java/org/apache/aries/util/BundleToClassLoaderAdapterTest.java +++ b/util/src/test/java/org/apache/aries/util/BundleToClassLoaderAdapterTest.java @@ -19,14 +19,14 @@ package org.apache.aries.util; +import static org.junit.Assert.assertEquals; + import org.apache.aries.unittest.mocks.MethodCall; import org.apache.aries.unittest.mocks.Skeleton; import org.apache.aries.util.internal.BundleToClassLoaderAdapter; import org.junit.Test; import org.osgi.framework.Bundle; -import static org.junit.Assert.assertEquals; - public class BundleToClassLoaderAdapterTest { @Test(expected=ClassNotFoundException.class) public void testInheritance() throws Exception { diff --git a/util/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java b/util/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java index 6bcc5ca1d5..a138711968 100644 --- a/util/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java +++ b/util/src/test/java/org/apache/aries/util/SingleServiceTrackerTest.java @@ -18,6 +18,9 @@ */ package org.apache.aries.util; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + import java.util.Arrays; import java.util.Dictionary; import java.util.Hashtable; @@ -33,8 +36,6 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.InvalidSyntaxException; -import static org.junit.Assert.*; - public class SingleServiceTrackerTest { private BundleContext ctx; private SingleServiceTracker sut; diff --git a/util/src/test/java/org/apache/aries/util/log/LoggerTest.java b/util/src/test/java/org/apache/aries/util/log/LoggerTest.java index a6d15006c5..4814e3ad0f 100644 --- a/util/src/test/java/org/apache/aries/util/log/LoggerTest.java +++ b/util/src/test/java/org/apache/aries/util/log/LoggerTest.java @@ -18,6 +18,9 @@ */ package org.apache.aries.util.log; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -32,9 +35,6 @@ import org.osgi.framework.ServiceReference; import org.osgi.service.log.LogService; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; - @SuppressWarnings("rawtypes") public class LoggerTest { private BundleContext ctx; 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 92b00675b2..44b42c19c4 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 @@ -22,7 +22,6 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.lang.String; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; @@ -33,7 +32,6 @@ import java.util.List; import java.util.Map; - import org.apache.aries.util.filesystem.FileSystem; import org.apache.aries.util.filesystem.IDirectory; import org.apache.aries.util.filesystem.IFile; diff --git a/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/tests/FilterResultsTest.java b/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/tests/FilterResultsTest.java index 566ded8971..e97428055e 100644 --- a/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/tests/FilterResultsTest.java +++ b/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/tests/FilterResultsTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; diff --git a/versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java b/versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java index d5349ea2f0..69f66b641d 100644 --- a/versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java +++ b/versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java @@ -24,8 +24,8 @@ import java.net.URLClassLoader; import java.util.List; import java.util.Map; - import javax.inject.Inject; + import org.apache.aries.util.manifest.BundleManifest; import org.apache.aries.versioning.check.BundleCompatibility; import org.apache.aries.versioning.check.BundleInfo; diff --git a/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java b/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java index 9c8f1a7387..842b476461 100644 --- a/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java +++ b/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java @@ -16,6 +16,21 @@ */ package org.apache.aries.web.converter.itest; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.junitBundles; +import static org.ops4j.pax.exam.CoreOptions.options; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Dictionary; +import javax.inject.Inject; + import org.apache.aries.itest.AbstractIntegrationTest; import org.apache.aries.unittest.fixture.ArchiveFixture; import org.apache.aries.unittest.fixture.ArchiveFixture.ZipFixture; @@ -32,21 +47,6 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; -import javax.inject.Inject; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Dictionary; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.junitBundles; -import static org.ops4j.pax.exam.CoreOptions.options; - @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class WabConverterITest extends AbstractIntegrationTest { diff --git a/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java b/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java index 30de7ce867..0281aec6f1 100644 --- a/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java +++ b/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java @@ -25,11 +25,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.TreeSet; import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; +import java.util.TreeSet; import java.util.jar.Attributes; import java.util.jar.JarInputStream; import java.util.jar.JarOutputStream; diff --git a/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/JSPImportParserTest.java b/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/JSPImportParserTest.java index 557a133db2..bfad8418d6 100644 --- a/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/JSPImportParserTest.java +++ b/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/JSPImportParserTest.java @@ -24,7 +24,6 @@ import java.io.InputStream; import java.util.Collection; -import org.apache.aries.web.converter.impl.JSPImportParser; import org.junit.Test; public class JSPImportParserTest {