Skip to content

[MAINTENANCE] Sort imports in java files #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alien11689 merged 1 commit into from
May 11, 2025
Merged

[MAINTENANCE] Sort imports in java files #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions async/async-api/src/main/java/org/osgi/service/async/delegate/AsyncDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion async/promise-api/src/main/java/org/apache/aries/async/promise/PromiseImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -442,9 +441,9 @@
if(!p.isDone()) {
try {
p.fail(new TimeoutException());
} catch (Exception e) {
// Already resolved
}

Check warning on line 446 in async/promise-api/src/main/java/org/apache/aries/async/promise/PromiseImpl.java

View workflow job for this annotation

GitHub Actions / PMD

Error Prone EmptyCatchBlock 

Avoid empty catch blocks
}
}
}, milliseconds, MILLISECONDS);
Expand All @@ -463,9 +462,9 @@
public void run() {
try {
p.resolve(resolved.getValue());
} catch (IllegalStateException ise) {
// Someone else resolved our promise?
} catch (Exception e) {

Check warning on line 467 in async/promise-api/src/main/java/org/apache/aries/async/promise/PromiseImpl.java

View workflow job for this annotation

GitHub Actions / PMD

Error Prone EmptyCatchBlock 

Avoid empty catch blocks
p.fail(e);
}
}
Expand Down
10 changes: 5 additions & 5 deletions async/promise-api/src/test/java/org/apache/aries/async/promise/test/CallbackTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
1 change: 0 additions & 1 deletion async/promise-api/src/test/java/org/apache/aries/async/promise/test/ChainTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
13 changes: 9 additions & 4 deletions async/promise-api/src/test/java/org/apache/aries/async/promise/test/DeferredTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
12 changes: 6 additions & 6 deletions ...s/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<OsgiService> {
@Override
public Class<OsgiService> getAnnotation() {
Expand Down
17 changes: 9 additions & 8 deletions ...in/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceProviderHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<OsgiServiceProvider> {

Expand Down
4 changes: 2 additions & 2 deletions ...lers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/ServiceProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion ...ain/java/org/apache/aries/blueprint/plugin/spi/CollectionDependencyAnnotationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ...ers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentAsNamed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/org/apache/aries/blueprint/plugin/handlers/spring/DependsOnAttributeResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<DependsOn> {
@Override
public Class<DependsOn> getAnnotation() {
Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/org/apache/aries/blueprint/plugin/handlers/spring/LazyAttributeResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Lazy> {
@Override
public Class<Lazy> getAnnotation() {
Expand Down
4 changes: 2 additions & 2 deletions ...ers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/QualifierAsNamed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
15 changes: 7 additions & 8 deletions ...in/java/org/apache/aries/blueprint/plugin/handlers/spring/SpringTransactionalFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<Transactional>, MethodAnnotationHandler<Transactional> {
private static final String PATTERN_NS_TX1 = "http\\:\\/\\/aries\\.apache\\.org\\/xmlns\\/transactions\\/v1\\.(.)\\.(.)";
Expand Down
4 changes: 2 additions & 2 deletions ...lueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ArtifactFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Pattern> includeArtifactPatterns;
Expand Down
8 changes: 4 additions & 4 deletions ...en-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
10 changes: 5 additions & 5 deletions ...int-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintFileWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
6 changes: 3 additions & 3 deletions ...int-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/FilteredClassFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
20 changes: 10 additions & 10 deletions .../blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
*/
Expand Down
10 changes: 5 additions & 5 deletions ...print-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/Handlers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<Class<? extends Annotation>> BEAN_MARKING_ANNOTATION_CLASSES = new ArrayList<>();
public static final List<Class<? extends Annotation>> SINGLETONS = new ArrayList<>();
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/bean/BeanHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<Bean>,
FactoryMethodFinder<Bean>,
Expand Down
Loading
Loading