This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch gg-18540 in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 6d1322eb9f1f6af68c678e9d1749b6f050a8f769 Author: Sergey Antonov <[email protected]> AuthorDate: Tue Apr 30 13:42:06 2019 +0300 GG-18543 Reorder modifiers and remove unused imports. --- .../h2/src/main/java/org/h2/command/dml/MergeUsing.java | 2 +- .../main/java/org/h2/expression/analysis/WindowFrame.java | 2 +- .../src/main/java/org/h2/util/geometry/GeometryUtils.java | 2 +- modules/h2/src/test/java/org/h2/test/TestAll.java | 3 --- .../java/org/h2/test/jdbc/TestCustomDataTypesHandler.java | 15 +++++++-------- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/modules/h2/src/main/java/org/h2/command/dml/MergeUsing.java b/modules/h2/src/main/java/org/h2/command/dml/MergeUsing.java index 2690cd4..17ae626 100644 --- a/modules/h2/src/main/java/org/h2/command/dml/MergeUsing.java +++ b/modules/h2/src/main/java/org/h2/command/dml/MergeUsing.java @@ -40,7 +40,7 @@ public class MergeUsing extends Prepared { /** * Abstract WHEN command of the MERGE statement. */ - public static abstract class When { + public abstract static class When { /** * The parent MERGE statement. diff --git a/modules/h2/src/main/java/org/h2/expression/analysis/WindowFrame.java b/modules/h2/src/main/java/org/h2/expression/analysis/WindowFrame.java index 7d63eec..d1a0c70 100644 --- a/modules/h2/src/main/java/org/h2/expression/analysis/WindowFrame.java +++ b/modules/h2/src/main/java/org/h2/expression/analysis/WindowFrame.java @@ -27,7 +27,7 @@ import org.h2.value.ValueNull; */ public final class WindowFrame { - private static abstract class Itr implements Iterator<Value[]> { + private abstract static class Itr implements Iterator<Value[]> { final ArrayList<Value[]> orderedRows; diff --git a/modules/h2/src/main/java/org/h2/util/geometry/GeometryUtils.java b/modules/h2/src/main/java/org/h2/util/geometry/GeometryUtils.java index c5fd6d40..1c1020e 100644 --- a/modules/h2/src/main/java/org/h2/util/geometry/GeometryUtils.java +++ b/modules/h2/src/main/java/org/h2/util/geometry/GeometryUtils.java @@ -13,7 +13,7 @@ public final class GeometryUtils { /** * Converter output target. */ - public static abstract class Target { + public abstract static class Target { public Target() { } diff --git a/modules/h2/src/test/java/org/h2/test/TestAll.java b/modules/h2/src/test/java/org/h2/test/TestAll.java index 460d850..d84be87 100644 --- a/modules/h2/src/test/java/org/h2/test/TestAll.java +++ b/modules/h2/src/test/java/org/h2/test/TestAll.java @@ -170,7 +170,6 @@ import org.h2.test.synth.TestTimer; import org.h2.test.synth.sql.TestSynth; import org.h2.test.synth.thread.TestMulti; import org.h2.test.unit.TestAnsCompression; -import org.h2.test.unit.TestAutoReconnect; import org.h2.test.unit.TestBinaryArithmeticStream; import org.h2.test.unit.TestBitStream; import org.h2.test.unit.TestBnf; @@ -188,7 +187,6 @@ import org.h2.test.unit.TestDbException; import org.h2.test.unit.TestExit; import org.h2.test.unit.TestFile; import org.h2.test.unit.TestFileLock; -import org.h2.test.unit.TestFileLockProcess; import org.h2.test.unit.TestFileLockSerialized; import org.h2.test.unit.TestFileSystem; import org.h2.test.unit.TestFtp; @@ -227,7 +225,6 @@ import org.h2.test.unit.TestStreams; import org.h2.test.unit.TestStringCache; import org.h2.test.unit.TestStringUtils; import org.h2.test.unit.TestTimeStampWithTimeZone; -import org.h2.test.unit.TestTools; import org.h2.test.unit.TestTraceSystem; import org.h2.test.unit.TestUtils; import org.h2.test.unit.TestValue; diff --git a/modules/h2/src/test/java/org/h2/test/jdbc/TestCustomDataTypesHandler.java b/modules/h2/src/test/java/org/h2/test/jdbc/TestCustomDataTypesHandler.java index 1aebdce..4fd99f2 100644 --- a/modules/h2/src/test/java/org/h2/test/jdbc/TestCustomDataTypesHandler.java +++ b/modules/h2/src/test/java/org/h2/test/jdbc/TestCustomDataTypesHandler.java @@ -37,16 +37,15 @@ import org.h2.value.ValueString; * Tests {@link CustomDataTypesHandler}. */ public class TestCustomDataTypesHandler extends TestDb { - /** * The database name. */ - public final static String DB_NAME = "customDataTypes"; + public static final String DB_NAME = "customDataTypes"; /** * The system property name. */ - public final static String HANDLER_NAME_PROPERTY = "h2.customDataTypesHandler"; + public static final String HANDLER_NAME_PROPERTY = "h2.customDataTypesHandler"; /** * Run just this test. @@ -170,13 +169,13 @@ public class TestCustomDataTypesHandler extends TestDb { public static class TestOnlyCustomDataTypesHandler implements CustomDataTypesHandler { /** Type name for complex number */ - public final static String COMPLEX_DATA_TYPE_NAME = "complex"; + public static final String COMPLEX_DATA_TYPE_NAME = "complex"; /** Type id for complex number */ - public final static int COMPLEX_DATA_TYPE_ID = 1000; + public static final int COMPLEX_DATA_TYPE_ID = 1000; /** Order for complex number data type */ - public final static int COMPLEX_DATA_TYPE_ORDER = 100_000; + public static final int COMPLEX_DATA_TYPE_ORDER = 100_000; /** Cached DataType instance for complex number */ public final DataType complexDataType; @@ -434,10 +433,10 @@ public class TestCustomDataTypesHandler extends TestDb { private static final long serialVersionUID = 1L; /** */ - public final static DecimalFormat REAL_FMT = new DecimalFormat("###.###"); + public static final DecimalFormat REAL_FMT = new DecimalFormat("###.###"); /** */ - public final static DecimalFormat IMG_FMT = new DecimalFormat("+###.###i;-###.###i"); + public static final DecimalFormat IMG_FMT = new DecimalFormat("+###.###i;-###.###i"); /** * Real part
