Merge pull request #164 from eclipse-opensmartclide/chore/format-and-…

…organise-imports-smartclide-monitoring organise imports in all source files
eclipse-opensmartclide · Oct 14, 2022 · 81346a8 · 81346a8
2 parents 7881c3d + 2c80ac2
commit 81346a8
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 33 deletions.
diff --git a/...ain/java/org/eclipse/opensmartclide/context/monitoring/analyser/GitlabCommitAnalyser.java b/...ain/java/org/eclipse/opensmartclide/context/monitoring/analyser/GitlabCommitAnalyser.java
@@ -14,6 +14,7 @@
  * #L%
  */
 
+import org.apache.lucene.document.Document;
 import org.eclipse.opensmartclide.context.monitoring.analyser.webservice.WebServiceAnalyser;
 import org.eclipse.opensmartclide.context.monitoring.config.models.DataSource;
 import org.eclipse.opensmartclide.context.monitoring.config.models.InterpreterConfiguration;
@@ -24,7 +25,6 @@
 import org.eclipse.opensmartclide.context.monitoring.models.IWebService;
 import org.eclipse.opensmartclide.context.tools.ontology.AmIMonitoringConfiguration;
 import org.eclipse.opensmartclide.contexthandling.services.GitlabApiClient;
-import org.apache.lucene.document.Document;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...eclipse/opensmartclide/context/monitoring/config/models/datasources/GitlabDataSource.java b/...eclipse/opensmartclide/context/monitoring/config/models/datasources/GitlabDataSource.java
@@ -14,8 +14,8 @@
  * #L%
  */
 
-import org.eclipse.opensmartclide.context.monitoring.config.models.DataSource;
 import lombok.NoArgsConstructor;
+import org.eclipse.opensmartclide.context.monitoring.config.models.DataSource;
 import thewebsemantic.Namespace;
 import thewebsemantic.RdfType;
 

diff --git a/...main/java/org/eclipse/opensmartclide/context/monitoring/models/GitlabCommitDataModel.java b/...main/java/org/eclipse/opensmartclide/context/monitoring/models/GitlabCommitDataModel.java
@@ -14,15 +14,15 @@
  * #L%
  */
 
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.jena.rdf.model.Model;
 import org.eclipse.opensmartclide.context.common.Version;
 import org.eclipse.opensmartclide.context.common.util.ApplicationScenario;
 import org.eclipse.opensmartclide.context.common.util.BusinessCase;
 import org.eclipse.opensmartclide.context.monitoring.config.models.datasources.WebServiceDataSource;
 import org.eclipse.opensmartclide.context.monitoring.rdf.RdfHelper;
 import org.eclipse.opensmartclide.context.persistence.ModelOutputLanguage;
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.jena.rdf.model.Model;
 import org.simpleframework.xml.Root;
 import thewebsemantic.Id;
 import thewebsemantic.Namespace;

diff --git a/...c/main/java/org/eclipse/opensmartclide/context/monitoring/models/GitlabCommitMessage.java b/...c/main/java/org/eclipse/opensmartclide/context/monitoring/models/GitlabCommitMessage.java
@@ -14,14 +14,14 @@
  * #L%
  */
 
-import org.eclipse.opensmartclide.context.common.util.BusinessCase;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import org.eclipse.opensmartclide.context.common.util.BusinessCase;
 import thewebsemantic.Namespace;
 import thewebsemantic.RdfType;
 

diff --git a/...rc/main/java/org/eclipse/opensmartclide/context/monitoring/parser/GitlabCommitParser.java b/...rc/main/java/org/eclipse/opensmartclide/context/monitoring/parser/GitlabCommitParser.java
@@ -14,14 +14,14 @@
  * #L%
  */
 
+import org.apache.lucene.document.Document;
 import org.eclipse.opensmartclide.context.monitoring.config.models.DataSource;
 import org.eclipse.opensmartclide.context.monitoring.config.models.InterpreterConfiguration;
 import org.eclipse.opensmartclide.context.monitoring.config.models.datasources.GitlabDataSource;
 import org.eclipse.opensmartclide.context.monitoring.index.Indexer;
 import org.eclipse.opensmartclide.context.monitoring.models.IWebService;
 import org.eclipse.opensmartclide.context.monitoring.parser.webservice.WebServiceParser;
 import org.eclipse.opensmartclide.context.tools.ontology.AmIMonitoringConfiguration;
-import org.apache.lucene.document.Document;
 
 public class GitlabCommitParser extends WebServiceParser {
     public GitlabCommitParser(final DataSource dataSource,

diff --git a/...lide-monitoring/src/main/java/org/eclipse/opensmartclide/contexthandling/ServiceMain.java b/...lide-monitoring/src/main/java/org/eclipse/opensmartclide/contexthandling/ServiceMain.java
@@ -14,11 +14,6 @@
  * #L%
  */
 
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Properties;
-
 import org.eclipse.opensmartclide.context.common.ContextPathUtils;
 import org.eclipse.opensmartclide.context.monitoring.models.IMonitoringDataModel;
 import org.eclipse.opensmartclide.context.services.AmIMonitoringService;
@@ -31,6 +26,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Properties;
+
 public class ServiceMain {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ServiceMain.class);

diff --git a/...e/opensmartclide/contexthandling/dle/listener/DleGitlabCommitMonitorProgressListener.java b/...e/opensmartclide/contexthandling/dle/listener/DleGitlabCommitMonitorProgressListener.java
@@ -1,9 +1,5 @@
 package org.eclipse.opensmartclide.contexthandling.dle.listener;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.TimeoutException;
-
 /*-
  * #%L
  * SmartCLIDE Monitoring
@@ -19,10 +15,8 @@
  */
 
 import com.rabbitmq.client.Channel;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.document.Document;
-
 import org.eclipse.opensmartclide.context.monitoring.config.models.datasources.GitlabDataSource;
 import org.eclipse.opensmartclide.context.monitoring.config.models.datasources.MessageBrokerDataSourceOptions;
 import org.eclipse.opensmartclide.context.monitoring.events.MonitoringProgressListener;
@@ -33,6 +27,10 @@
 import org.eclipse.opensmartclide.context.monitoring.monitors.messagebroker.util.MessageBrokerUtil;
 import org.eclipse.opensmartclide.contexthandling.dle.model.CommitMessage;
 
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+
 public class DleGitlabCommitMonitorProgressListener
         implements MonitoringProgressListener<IWebService, IMonitoringDataModel<?, ?>> {
 
@@ -81,10 +79,10 @@ public void documentAnalysed(final List<IMonitoringDataModel<?, ?>> analysed,
 
     private CommitMessage convertToCommitMessage(final GitlabCommitMessage gitlabCommitMessage) {
         return CommitMessage.builder()
-                        .repoId(gitlabCommitMessage.getRepository())
-                        .user(gitlabCommitMessage.getUser())
-                        .branch(gitlabCommitMessage.getBranch())
-                        .timeSinceLastCommit(gitlabCommitMessage.getTimeSinceLastCommit())
+                .repoId(gitlabCommitMessage.getRepository())
+                .user(gitlabCommitMessage.getUser())
+                .branch(gitlabCommitMessage.getBranch())
+                .timeSinceLastCommit(gitlabCommitMessage.getTimeSinceLastCommit())
                 .numberOfFilesModified(gitlabCommitMessage.getNoOfModifiedFiles())
                 .build();
     }

diff --git a/...ng/src/main/java/org/eclipse/opensmartclide/contexthandling/services/GitlabApiClient.java b/...ng/src/main/java/org/eclipse/opensmartclide/contexthandling/services/GitlabApiClient.java
@@ -18,8 +18,8 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import org.eclipse.opensmartclide.context.monitoring.models.GitlabCommitMessage;
 import org.apache.http.HttpStatus;
+import org.eclipse.opensmartclide.context.monitoring.models.GitlabCommitMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...ring/src/test/java/org/eclipse/opensmartclide/context/monitoring/GitlabApiClientTest.java b/...ring/src/test/java/org/eclipse/opensmartclide/context/monitoring/GitlabApiClientTest.java
@@ -1,16 +1,15 @@
 package org.eclipse.opensmartclide.context.monitoring;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.opensmartclide.context.monitoring.models.GitlabCommitMessage;
+import org.eclipse.opensmartclide.contexthandling.services.GitlabApiClient;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.eclipse.opensmartclide.contexthandling.services.GitlabApiClient;
+import java.util.List;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class GitlabApiClientTest {
 

diff --git a/.../src/test/java/org/eclipse/opensmartclide/context/monitoring/GitlabCommitMonitorTest.java b/.../src/test/java/org/eclipse/opensmartclide/context/monitoring/GitlabCommitMonitorTest.java
@@ -13,7 +13,10 @@
 import org.eclipse.opensmartclide.context.services.manager.ServiceManager;
 import org.eclipse.opensmartclide.context.services.wrapper.AmIMonitoringDataRepositoryServiceWrapper;
 import org.eclipse.opensmartclide.contexthandling.ServiceMain;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
 import org.simpleframework.xml.core.Persister;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...java/org/eclipse/opensmartclide/context/monitoring/analyser/FakeGitlabCommitAnalyser.java b/...java/org/eclipse/opensmartclide/context/monitoring/analyser/FakeGitlabCommitAnalyser.java
@@ -1,13 +1,13 @@
 package org.eclipse.opensmartclide.context.monitoring.analyser;
 
+import org.apache.lucene.document.Document;
 import org.eclipse.opensmartclide.context.monitoring.config.models.DataSource;
 import org.eclipse.opensmartclide.context.monitoring.config.models.InterpreterConfiguration;
 import org.eclipse.opensmartclide.context.monitoring.index.Indexer;
 import org.eclipse.opensmartclide.context.monitoring.models.GitlabCommitDataModel;
 import org.eclipse.opensmartclide.context.monitoring.models.GitlabCommitMessage;
 import org.eclipse.opensmartclide.context.monitoring.models.IWebService;
 import org.eclipse.opensmartclide.context.tools.ontology.AmIMonitoringConfiguration;
-import org.apache.lucene.document.Document;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/smartclide-monitoring/src/test/resources/config/monitoring-config.xsd b/smartclide-monitoring/src/test/resources/config/monitoring-config.xsd
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.atb-bremen.de" xmlns="http://www.atb-bremen.de">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.atb-bremen.de"
+           xmlns="http://www.atb-bremen.de">
     <xs:element name="config">
         <xs:complexType>
             <xs:sequence>

diff --git a/smartclide-monitoring/src/test/resources/config/services-config.xsd b/smartclide-monitoring/src/test/resources/config/services-config.xsd
@@ -1,4 +1,5 @@
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.atb-bremen.de" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.atb-bremen.de"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <xs:element name="config">
         <xs:complexType>
             <xs:sequence>