From f67db7edbb01d955faffefb7e978ee049e1dd242 Mon Sep 17 00:00:00 2001 From: Arthur Poiret Date: Sun, 30 Jul 2023 14:53:16 +0200 Subject: [PATCH] refactor: fix package import order --- .../java/com/owlplug/PreloaderProgressMessage.java | 1 - .../com/owlplug/auth/model/GoogleCredential.java | 2 +- .../owlplug/auth/services/AuthenticationService.java | 2 +- .../com/owlplug/core/components/BaseTaskFactory.java | 2 +- .../com/owlplug/core/components/CoreTaskFactory.java | 2 +- .../components/WorkspaceDirectoryInitializer.java | 2 +- .../com/owlplug/core/controllers/MainController.java | 2 +- .../src/main/java/com/owlplug/core/model/Plugin.java | 4 ++-- .../main/java/com/owlplug/core/model/Symlink.java | 2 +- .../java/com/owlplug/core/services/BaseService.java | 1 - .../com/owlplug/core/services/NativeHostService.java | 2 +- .../com/owlplug/core/services/OptionsService.java | 2 +- .../com/owlplug/core/tasks/DirectoryRemoveTask.java | 1 - .../core/ui/skins/OwlPlugProgressBarSkin.java | 12 ++++++++++-- .../explore/components/ExploreTaskFactory.java | 2 +- .../com/owlplug/explore/dao/RemotePackageDAO.java | 4 ++-- .../com/owlplug/explore/model/PackageBundle.java | 2 +- .../com/owlplug/explore/model/RemotePackage.java | 4 ++-- .../java/com/owlplug/explore/model/RemoteSource.java | 2 +- .../com/owlplug/explore/services/ExploreService.java | 6 +++--- .../com/owlplug/explore/tasks/SourceSyncTask.java | 3 +-- .../host/loaders/EmbeddedScannerPluginLoader.java | 7 +++---- 22 files changed, 35 insertions(+), 32 deletions(-) diff --git a/owlplug-client/src/main/java/com/owlplug/PreloaderProgressMessage.java b/owlplug-client/src/main/java/com/owlplug/PreloaderProgressMessage.java index 0e893534..549b646d 100644 --- a/owlplug-client/src/main/java/com/owlplug/PreloaderProgressMessage.java +++ b/owlplug-client/src/main/java/com/owlplug/PreloaderProgressMessage.java @@ -19,7 +19,6 @@ package com.owlplug; import java.util.Objects; - import javafx.application.Preloader.PreloaderNotification; public class PreloaderProgressMessage implements PreloaderNotification { diff --git a/owlplug-client/src/main/java/com/owlplug/auth/model/GoogleCredential.java b/owlplug-client/src/main/java/com/owlplug/auth/model/GoogleCredential.java index dfe80817..730fbbb3 100644 --- a/owlplug-client/src/main/java/com/owlplug/auth/model/GoogleCredential.java +++ b/owlplug-client/src/main/java/com/owlplug/auth/model/GoogleCredential.java @@ -19,12 +19,12 @@ package com.owlplug.auth.model; import com.google.api.client.auth.oauth2.StoredCredential; -import java.time.Instant; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import java.time.Instant; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; diff --git a/owlplug-client/src/main/java/com/owlplug/auth/services/AuthenticationService.java b/owlplug-client/src/main/java/com/owlplug/auth/services/AuthenticationService.java index c5d6293d..ed97befe 100644 --- a/owlplug-client/src/main/java/com/owlplug/auth/services/AuthenticationService.java +++ b/owlplug-client/src/main/java/com/owlplug/auth/services/AuthenticationService.java @@ -40,11 +40,11 @@ import com.owlplug.core.components.ApplicationDefaults; import com.owlplug.core.controllers.MainController; import com.owlplug.core.services.BaseService; +import jakarta.transaction.Transactional; import java.io.IOException; import java.security.GeneralSecurityException; import java.util.ArrayList; import java.util.Optional; -import jakarta.transaction.Transactional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/owlplug-client/src/main/java/com/owlplug/core/components/BaseTaskFactory.java b/owlplug-client/src/main/java/com/owlplug/core/components/BaseTaskFactory.java index 275c1217..3cdafe2f 100644 --- a/owlplug-client/src/main/java/com/owlplug/core/components/BaseTaskFactory.java +++ b/owlplug-client/src/main/java/com/owlplug/core/components/BaseTaskFactory.java @@ -19,8 +19,8 @@ package com.owlplug.core.components; import com.owlplug.core.tasks.AbstractTask; -import com.owlplug.core.tasks.TaskExecutionContext; import com.owlplug.core.tasks.SimpleEventListener; +import com.owlplug.core.tasks.TaskExecutionContext; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; diff --git a/owlplug-client/src/main/java/com/owlplug/core/components/CoreTaskFactory.java b/owlplug-client/src/main/java/com/owlplug/core/components/CoreTaskFactory.java index 1c20990f..fde6e9e4 100644 --- a/owlplug-client/src/main/java/com/owlplug/core/components/CoreTaskFactory.java +++ b/owlplug-client/src/main/java/com/owlplug/core/components/CoreTaskFactory.java @@ -25,10 +25,10 @@ import com.owlplug.core.services.NativeHostService; import com.owlplug.core.tasks.PluginRemoveTask; import com.owlplug.core.tasks.PluginSyncTask; +import com.owlplug.core.tasks.SimpleEventListener; import com.owlplug.core.tasks.TaskExecutionContext; import com.owlplug.core.tasks.plugins.discovery.PluginSyncTaskParameters; import com.owlplug.core.utils.FileUtils; -import com.owlplug.core.tasks.SimpleEventListener; import java.util.ArrayList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/owlplug-client/src/main/java/com/owlplug/core/components/WorkspaceDirectoryInitializer.java b/owlplug-client/src/main/java/com/owlplug/core/components/WorkspaceDirectoryInitializer.java index 5a4fa0da..ca6d76c3 100644 --- a/owlplug-client/src/main/java/com/owlplug/core/components/WorkspaceDirectoryInitializer.java +++ b/owlplug-client/src/main/java/com/owlplug/core/components/WorkspaceDirectoryInitializer.java @@ -21,13 +21,13 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import com.vdurmont.semver4j.Semver; +import jakarta.annotation.PostConstruct; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.Properties; -import jakarta.annotation.PostConstruct; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/owlplug-client/src/main/java/com/owlplug/core/controllers/MainController.java b/owlplug-client/src/main/java/com/owlplug/core/controllers/MainController.java index 86fb5b5e..ffd5f0c2 100644 --- a/owlplug-client/src/main/java/com/owlplug/core/controllers/MainController.java +++ b/owlplug-client/src/main/java/com/owlplug/core/controllers/MainController.java @@ -41,6 +41,7 @@ import com.owlplug.core.utils.PlatformUtils; import com.owlplug.explore.controllers.ExploreController; import com.owlplug.explore.services.ExploreService; +import jakarta.annotation.PreDestroy; import java.util.ArrayList; import java.util.Optional; import javafx.application.Platform; @@ -52,7 +53,6 @@ import javafx.scene.layout.Pane; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; -import jakarta.annotation.PreDestroy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/owlplug-client/src/main/java/com/owlplug/core/model/Plugin.java b/owlplug-client/src/main/java/com/owlplug/core/model/Plugin.java index 634c9775..25a96469 100644 --- a/owlplug-client/src/main/java/com/owlplug/core/model/Plugin.java +++ b/owlplug-client/src/main/java/com/owlplug/core/model/Plugin.java @@ -18,8 +18,6 @@ package com.owlplug.core.model; -import java.util.HashSet; -import java.util.Set; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -32,6 +30,8 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; import jakarta.persistence.Table; +import java.util.HashSet; +import java.util.Set; @Entity @Inheritance diff --git a/owlplug-client/src/main/java/com/owlplug/core/model/Symlink.java b/owlplug-client/src/main/java/com/owlplug/core/model/Symlink.java index 117d97cb..998b7a6d 100644 --- a/owlplug-client/src/main/java/com/owlplug/core/model/Symlink.java +++ b/owlplug-client/src/main/java/com/owlplug/core/model/Symlink.java @@ -18,12 +18,12 @@ package com.owlplug.core.model; -import java.util.List; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Transient; +import java.util.List; @Entity public class Symlink implements IDirectory { diff --git a/owlplug-client/src/main/java/com/owlplug/core/services/BaseService.java b/owlplug-client/src/main/java/com/owlplug/core/services/BaseService.java index 3686a7c9..91091fac 100644 --- a/owlplug-client/src/main/java/com/owlplug/core/services/BaseService.java +++ b/owlplug-client/src/main/java/com/owlplug/core/services/BaseService.java @@ -19,7 +19,6 @@ package com.owlplug.core.services; import com.owlplug.core.components.ApplicationDefaults; - import com.owlplug.core.components.ApplicationPreferences; import org.springframework.beans.factory.annotation.Autowired; diff --git a/owlplug-client/src/main/java/com/owlplug/core/services/NativeHostService.java b/owlplug-client/src/main/java/com/owlplug/core/services/NativeHostService.java index 41346966..84115312 100644 --- a/owlplug-client/src/main/java/com/owlplug/core/services/NativeHostService.java +++ b/owlplug-client/src/main/java/com/owlplug/core/services/NativeHostService.java @@ -24,10 +24,10 @@ import com.owlplug.host.loaders.EmbeddedScannerPluginLoader; import com.owlplug.host.loaders.NativePluginLoader; import com.owlplug.host.loaders.jni.JNINativePluginLoader; +import jakarta.annotation.PostConstruct; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/owlplug-client/src/main/java/com/owlplug/core/services/OptionsService.java b/owlplug-client/src/main/java/com/owlplug/core/services/OptionsService.java index 15f6eea7..c1767fcd 100644 --- a/owlplug-client/src/main/java/com/owlplug/core/services/OptionsService.java +++ b/owlplug-client/src/main/java/com/owlplug/core/services/OptionsService.java @@ -28,8 +28,8 @@ import com.owlplug.core.model.platform.OperatingSystem; import com.owlplug.explore.dao.RemotePackageDAO; import com.owlplug.explore.dao.RemoteSourceDAO; -import java.util.prefs.BackingStoreException; import jakarta.annotation.PostConstruct; +import java.util.prefs.BackingStoreException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/owlplug-client/src/main/java/com/owlplug/core/tasks/DirectoryRemoveTask.java b/owlplug-client/src/main/java/com/owlplug/core/tasks/DirectoryRemoveTask.java index 529bde26..c55f9ea3 100644 --- a/owlplug-client/src/main/java/com/owlplug/core/tasks/DirectoryRemoveTask.java +++ b/owlplug-client/src/main/java/com/owlplug/core/tasks/DirectoryRemoveTask.java @@ -20,7 +20,6 @@ import com.owlplug.core.model.PluginDirectory; import java.io.File; - import org.apache.commons.io.FileUtils; public class DirectoryRemoveTask extends AbstractTask { diff --git a/owlplug-client/src/main/java/com/owlplug/core/ui/skins/OwlPlugProgressBarSkin.java b/owlplug-client/src/main/java/com/owlplug/core/ui/skins/OwlPlugProgressBarSkin.java index df8c3f0c..2f947391 100644 --- a/owlplug-client/src/main/java/com/owlplug/core/ui/skins/OwlPlugProgressBarSkin.java +++ b/owlplug-client/src/main/java/com/owlplug/core/ui/skins/OwlPlugProgressBarSkin.java @@ -22,12 +22,20 @@ import com.jfoenix.utils.JFXNodeUtils; import com.sun.javafx.scene.NodeHelper; import com.sun.javafx.scene.TreeShowingExpression; -import javafx.animation.*; +import javafx.animation.Animation; +import javafx.animation.Interpolator; +import javafx.animation.KeyFrame; +import javafx.animation.KeyValue; +import javafx.animation.Timeline; import javafx.geometry.Insets; import javafx.scene.Node; import javafx.scene.control.ProgressIndicator; import javafx.scene.control.skin.ProgressIndicatorSkin; -import javafx.scene.layout.*; +import javafx.scene.layout.Background; +import javafx.scene.layout.BackgroundFill; +import javafx.scene.layout.CornerRadii; +import javafx.scene.layout.Region; +import javafx.scene.layout.StackPane; import javafx.scene.paint.Color; import javafx.util.Duration; diff --git a/owlplug-client/src/main/java/com/owlplug/explore/components/ExploreTaskFactory.java b/owlplug-client/src/main/java/com/owlplug/explore/components/ExploreTaskFactory.java index 54e99476..39406a87 100644 --- a/owlplug-client/src/main/java/com/owlplug/explore/components/ExploreTaskFactory.java +++ b/owlplug-client/src/main/java/com/owlplug/explore/components/ExploreTaskFactory.java @@ -21,9 +21,9 @@ import com.owlplug.core.components.ApplicationDefaults; import com.owlplug.core.components.BaseTaskFactory; import com.owlplug.core.components.CoreTaskFactory; +import com.owlplug.core.tasks.SimpleEventListener; import com.owlplug.core.tasks.TaskExecutionContext; import com.owlplug.core.utils.FileUtils; -import com.owlplug.core.tasks.SimpleEventListener; import com.owlplug.explore.dao.RemotePackageDAO; import com.owlplug.explore.dao.RemoteSourceDAO; import com.owlplug.explore.model.PackageBundle; diff --git a/owlplug-client/src/main/java/com/owlplug/explore/dao/RemotePackageDAO.java b/owlplug-client/src/main/java/com/owlplug/explore/dao/RemotePackageDAO.java index b72cbbed..1989a7a5 100644 --- a/owlplug-client/src/main/java/com/owlplug/explore/dao/RemotePackageDAO.java +++ b/owlplug-client/src/main/java/com/owlplug/explore/dao/RemotePackageDAO.java @@ -20,11 +20,11 @@ import com.owlplug.core.model.PluginType; import com.owlplug.explore.model.RemotePackage; -import java.util.ArrayList; -import java.util.List; import jakarta.persistence.criteria.Join; import jakarta.persistence.criteria.JoinType; import jakarta.persistence.criteria.Predicate; +import java.util.ArrayList; +import java.util.List; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; diff --git a/owlplug-client/src/main/java/com/owlplug/explore/model/PackageBundle.java b/owlplug-client/src/main/java/com/owlplug/explore/model/PackageBundle.java index e45a7475..77223532 100644 --- a/owlplug-client/src/main/java/com/owlplug/explore/model/PackageBundle.java +++ b/owlplug-client/src/main/java/com/owlplug/explore/model/PackageBundle.java @@ -19,7 +19,6 @@ package com.owlplug.explore.model; import com.owlplug.core.model.PluginFormat; -import java.util.List; import jakarta.persistence.ElementCollection; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -27,6 +26,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; +import java.util.List; @Entity public class PackageBundle { diff --git a/owlplug-client/src/main/java/com/owlplug/explore/model/RemotePackage.java b/owlplug-client/src/main/java/com/owlplug/explore/model/RemotePackage.java index 49bdb29b..60ccf96b 100644 --- a/owlplug-client/src/main/java/com/owlplug/explore/model/RemotePackage.java +++ b/owlplug-client/src/main/java/com/owlplug/explore/model/RemotePackage.java @@ -20,8 +20,6 @@ import com.owlplug.core.model.PluginStage; import com.owlplug.core.model.PluginType; -import java.util.HashSet; -import java.util.Set; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -33,6 +31,8 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; +import java.util.HashSet; +import java.util.Set; @Entity @Table(indexes = { @Index(name = "IDX_PACKAGE_ID", columnList = "id"), diff --git a/owlplug-client/src/main/java/com/owlplug/explore/model/RemoteSource.java b/owlplug-client/src/main/java/com/owlplug/explore/model/RemoteSource.java index 281c1dd9..046b3e6c 100644 --- a/owlplug-client/src/main/java/com/owlplug/explore/model/RemoteSource.java +++ b/owlplug-client/src/main/java/com/owlplug/explore/model/RemoteSource.java @@ -18,12 +18,12 @@ package com.owlplug.explore.model; -import java.util.List; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.OneToMany; +import java.util.List; @Entity public class RemoteSource { diff --git a/owlplug-client/src/main/java/com/owlplug/explore/services/ExploreService.java b/owlplug-client/src/main/java/com/owlplug/explore/services/ExploreService.java index 977e4b2f..300b39b9 100644 --- a/owlplug-client/src/main/java/com/owlplug/explore/services/ExploreService.java +++ b/owlplug-client/src/main/java/com/owlplug/explore/services/ExploreService.java @@ -38,15 +38,15 @@ import com.owlplug.explore.model.json.legacy.StoreModelAdapter; import com.owlplug.explore.model.search.StoreCriteriaAdapter; import com.owlplug.explore.model.search.StoreFilterCriteria; +import jakarta.annotation.PostConstruct; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; -import jakarta.annotation.PostConstruct; import org.apache.hc.client5.http.classic.methods.HttpGet; -import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; -import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.io.entity.EntityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/owlplug-client/src/main/java/com/owlplug/explore/tasks/SourceSyncTask.java b/owlplug-client/src/main/java/com/owlplug/explore/tasks/SourceSyncTask.java index 1f9abd3d..f73a4993 100644 --- a/owlplug-client/src/main/java/com/owlplug/explore/tasks/SourceSyncTask.java +++ b/owlplug-client/src/main/java/com/owlplug/explore/tasks/SourceSyncTask.java @@ -40,10 +40,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; - import org.apache.hc.client5.http.classic.methods.HttpGet; -import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.io.entity.EntityUtils; diff --git a/owlplug-host/src/main/java/com/owlplug/host/loaders/EmbeddedScannerPluginLoader.java b/owlplug-host/src/main/java/com/owlplug/host/loaders/EmbeddedScannerPluginLoader.java index d4c46b40..076b9212 100644 --- a/owlplug-host/src/main/java/com/owlplug/host/loaders/EmbeddedScannerPluginLoader.java +++ b/owlplug-host/src/main/java/com/owlplug/host/loaders/EmbeddedScannerPluginLoader.java @@ -27,6 +27,9 @@ import com.owlplug.host.io.LibraryLoader; import com.owlplug.host.model.OS; import com.owlplug.host.utils.FileSystemUtils; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import java.io.File; import java.io.IOException; import java.io.StringReader; @@ -36,10 +39,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; - -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.Unmarshaller; import org.slf4j.Logger; import org.slf4j.LoggerFactory;