Merge pull request #961 from ie3-institute/sp/#960-groovy-import-sorting

Sorting groovy imports

Author: danielfeismann

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased/Snapshot]
 
 ### Added
+- Formatting Spotless Groovy import order [#960](https://github.com/ie3-institute/PowerSystemDataModel/issues/960)
 
 ### Fixed
 - Fixed Couchbase integration tests that randomly failed [#755](https://github.com/ie3-institute/PowerSystemDataModel/issues/755)

gradle/scripts/spotless.gradle

@@ -17,19 +17,18 @@ spotless {
 
   /* cf. https://github.com/diffplug/spotless/tree/master/plugin-gradle */
   groovy {
+    importOrder('\\#', '', 'java')
     licenseHeader ie3LicHead
     // the Groovy Eclipse formatter extends the Java Eclipse formatter,
     // so it formats Java files by default (unless `excludeJava` is used).
-    // FIXME rolled back greclipse version https://github.com/diffplug/spotless/issues/1860
-    greclipse('4.27').configFile('greclipse.properties')
+    greclipse().configFile('greclipse.properties')
     indentWithSpaces 2
   }
 
   groovyGradle {
     // same as groovy, but for .gradle (defaults to '*.gradle')
     target '*.gradle', 'gradle/scripts/*.gradle'
-    // FIXME rolled back greclipse version https://github.com/diffplug/spotless/issues/1860
-    greclipse('4.27')
+    greclipse()
     indentWithSpaces 2
   }
 

src/test/groovy/edu/ie3/datamodel/io/connectors/CsvFileConnectorTest.groovy

@@ -6,11 +6,11 @@
 package edu.ie3.datamodel.io.connectors
 
 import edu.ie3.datamodel.exceptions.ConnectorException
-import edu.ie3.datamodel.io.csv.CsvIndividualTimeSeriesMetaInformation
-import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.csv.CsvFileDefinition
+import edu.ie3.datamodel.io.csv.CsvIndividualTimeSeriesMetaInformation
 import edu.ie3.datamodel.io.naming.DefaultDirectoryHierarchy
 import edu.ie3.datamodel.io.naming.EntityPersistenceNamingStrategy
+import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.naming.timeseries.ColumnScheme
 import edu.ie3.datamodel.models.StandardUnits
 import edu.ie3.datamodel.models.input.NodeInput

src/test/groovy/edu/ie3/datamodel/io/factory/input/LineInputFactoryTest.groovy

@@ -5,6 +5,9 @@
  */
 package edu.ie3.datamodel.io.factory.input
 
+import static edu.ie3.util.quantities.PowerSystemUnits.METRE_PER_SECOND
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.FactoryException
 import edu.ie3.datamodel.models.StandardUnits
 import edu.ie3.datamodel.models.input.NodeInput
@@ -19,12 +22,9 @@ import org.locationtech.jts.geom.LineString
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
+import java.time.ZonedDateTime
 import javax.measure.quantity.Dimensionless
 import javax.measure.quantity.Speed
-import java.time.ZonedDateTime
-
-import static edu.ie3.util.quantities.PowerSystemUnits.METRE_PER_SECOND
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
 
 class LineInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A LineInputFactory should contain exactly the expected class for parsing"() {

src/test/groovy/edu/ie3/datamodel/io/factory/input/NodeInputFactoryTest.groovy

@@ -15,8 +15,8 @@ import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
 import tech.units.indriya.ComparableQuantity
 
-import javax.measure.quantity.ElectricPotential
 import java.time.ZonedDateTime
+import javax.measure.quantity.ElectricPotential
 
 class NodeInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A NodeInputFactory should contain exactly the expected class for parsing"() {

src/test/groovy/edu/ie3/datamodel/io/factory/input/Transformer2WInputFactoryTest.groovy

@@ -11,9 +11,9 @@ import edu.ie3.datamodel.models.input.OperatorInput
 import edu.ie3.datamodel.models.input.connector.Transformer2WInput
 import edu.ie3.datamodel.models.input.connector.type.Transformer2WTypeInput
 import edu.ie3.datamodel.utils.Try
+import edu.ie3.test.common.GridTestData
 import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
-import edu.ie3.test.common.GridTestData
 
 import java.time.ZonedDateTime
 

src/test/groovy/edu/ie3/datamodel/io/factory/input/Transformer3WInputFactoryTest.groovy

@@ -86,4 +86,3 @@ class Transformer3WInputFactoryTest  extends Specification implements FactoryTes
     e.message == "Voltage level of node a must be greater than voltage level of node b and voltage level of node b must be greater than voltage level of node c"
   }
 }
-

src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/BmInputFactoryTest.groovy

@@ -5,6 +5,8 @@
  */
 package edu.ie3.datamodel.io.factory.input.participant
 
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.FactoryException
 import edu.ie3.datamodel.models.StandardUnits
 import edu.ie3.datamodel.models.input.NodeInput
@@ -17,10 +19,8 @@ import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.quantity.Dimensionless
 import java.time.ZonedDateTime
-
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
+import javax.measure.quantity.Dimensionless
 
 class BmInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A BmInputFactory should contain exactly the expected class for parsing"() {

src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/ChpInputFactoryTest.groovy

@@ -5,6 +5,8 @@
  */
 package edu.ie3.datamodel.io.factory.input.participant
 
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.FactoryException
 import edu.ie3.datamodel.models.input.NodeInput
 import edu.ie3.datamodel.models.input.OperatorInput
@@ -18,10 +20,8 @@ import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.quantity.Dimensionless
 import java.time.ZonedDateTime
-
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
+import javax.measure.quantity.Dimensionless
 
 class ChpInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A ChpInputFactory should contain exactly the expected class for parsing"() {
@@ -78,4 +78,3 @@ class ChpInputFactoryTest extends Specification implements FactoryTestHelper {
     }
   }
 }
-

src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EmInputFactoryTest.groovy

@@ -18,8 +18,8 @@ import edu.ie3.util.quantities.PowerSystemUnits
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.quantity.Dimensionless
 import java.time.ZonedDateTime
+import javax.measure.quantity.Dimensionless
 
 class EmInputFactoryTest extends Specification {