From eac5a8a220f107316fefca6f87f3f73d270e143e Mon Sep 17 00:00:00 2001 From: Anatoly Cherkasov Date: Fri, 3 Sep 2021 17:27:11 +0300 Subject: [PATCH] JD-573: add library-parent-pom (#69) * JD-573: add library-parent-pom Co-authored-by: Alexey Pronin <24279065+vulnbe@users.noreply.github.com> --- .lgtm.yml | 4 + Jenkinsfile | 5 +- build_utils | 2 +- common/pom.xml | 7 +- .../geck/common/reflection/ClassFinder.java | 10 +- .../rbkmoney/geck/common/util/StringUtil.java | 3 +- .../rbkmoney/geck/common/util/TypeUtil.java | 3 +- .../common/reflection/ClassFinderTest.java | 4 +- filter/pom.xml | 7 +- .../java/com/rbkmoney/geck/filter/Filter.java | 1 - .../java/com/rbkmoney/geck/filter/Parser.java | 1 - .../filter/kit/msgpack/MultiSelector.java | 1 - .../filter/kit/msgpack/SelectionResult.java | 1 - .../geck/filter/kit/msgpack/Selector.java | 1 - .../filter/kit/msgpack/SelectorParser.java | 1 - .../filter/kit/msgpack/StructSelector.java | 1 - .../filter/kit/msgpack/StructVisitor.java | 5 +- .../geck/filter/parser/PathParser.java | 1 - .../geck/filter/rule/PathConditionRule.java | 1 - .../geck/filter/PathConditionFilterTest.java | 5 +- .../kit/msgpack/SelectorParserTest.java | 310 +++++++++++------- .../geck/filter/parser/PathParserTest.java | 1 - .../com/rbkmoney/geck/filter/test/Fail.java | 7 - .../com/rbkmoney/geck/filter/test/Ids.java | 7 - .../com/rbkmoney/geck/filter/test/Ok.java | 7 - .../com/rbkmoney/geck/filter/test/Status.java | 7 - .../rbkmoney/geck/filter/test/TestObject.java | 7 - .../com/rbkmoney/geck/filter/test/Type.java | 7 - .../rbkmoney/geck/filter/test/Unknown.java | 7 - .../geck/filter/test/UnknownType.java | 7 - .../geck/filter/test/filter/IData.java | 7 - .../filter/test/filter/IDataCollection.java | 7 - .../geck/filter/test/filter/ILvl2Data.java | 7 - .../geck/filter/test/filter/ILvlData.java | 7 - .../filter/test/filter/IStatusCanceled.java | 7 - .../geck/filter/test/filter/IStatusPaid.java | 7 - .../geck/filter/test/filter/Invoice.java | 7 - .../filter/test/filter/InvoiceStatus.java | 7 - .../geck/filter/test/filter/MapTest.java | 7 - migrator/pom.xml | 7 +- .../geck/migrator/MigrationException.java | 1 - .../geck/migrator/MigrationManager.java | 1 - .../migrator/MigrationManagerBuilder.java | 1 - .../geck/migrator/MigrationPoint.java | 1 - .../rbkmoney/geck/migrator/MigrationSpec.java | 1 - .../geck/migrator/MigrationStore.java | 1 - .../rbkmoney/geck/migrator/MigrationType.java | 1 - .../com/rbkmoney/geck/migrator/Migrator.java | 1 - .../rbkmoney/geck/migrator/SerializerDef.java | 1 - .../geck/migrator/SerializerSpec.java | 1 - .../com/rbkmoney/geck/migrator/ThriftDef.java | 5 +- .../rbkmoney/geck/migrator/ThriftSpec.java | 5 +- .../geck/migrator/kit/AbstractMigrator.java | 1 - .../migrator/kit/BaseMigrationManager.java | 1 - .../geck/migrator/kit/BaseMigrationSpec.java | 1 - .../geck/migrator/kit/BaseMigrationStore.java | 1 - .../migrator/kit/BaseSerializerProvider.java | 1 - .../geck/migrator/kit/BaseSerializerSpec.java | 4 +- .../migrator/kit/MigrationPointProvider.java | 1 - .../migrator/kit/MutableSerializerSpec.java | 1 - .../geck/migrator/kit/MutableThriftDef.java | 1 - .../geck/migrator/kit/SerializerProvider.java | 1 - .../geck/migrator/kit/jolt/JoltMigrator.java | 1 - .../geck/migrator/kit/jolt/JoltSpec.java | 1 - .../geck/migrator/kit/nop/NopMigrator.java | 1 - .../object/ObjectMigrationPointProvider.java | 1 - .../migrator/kit/object/ObjectMigrator.java | 1 - .../kit/TestBaseMigrationManager.java | 1 - .../migrator/kit/jolt/JoltMigratorTest.java | 1 - .../kit/object/ObjectMigration3Spec.java | 1 - .../kit/object/TestObjectMigration.java | 1 - .../spec/object/ObjectMigration0Spec.java | 1 - .../object/test/ObjectMigration4Spec.java | 1 - pom.xml | 6 +- serializer/pom.xml | 14 +- .../com/rbkmoney/geck/serializer/Geck.java | 1 - .../geck/serializer/StructHandler.java | 1 - .../geck/serializer/StructProcessor.java | 1 - .../geck/serializer/kit/EventFlags.java | 1 - .../geck/serializer/kit/StructType.java | 1 - .../geck/serializer/kit/json/JsonHandler.java | 1 - .../serializer/kit/json/JsonProcessor.java | 1 - .../kit/mock/FixedValueGenerator.java | 1 - .../kit/mock/MockTBaseProcessor.java | 1 - .../kit/mock/RandomValueGenerator.java | 1 - .../serializer/kit/mock/ValueGenerator.java | 1 - .../kit/msgpack/MsgPackHandler.java | 1 - .../kit/msgpack/MsgPackProcessor.java | 1 - .../serializer/kit/object/ObjectHandler.java | 1 - .../kit/object/ObjectHandlerConstants.java | 1 - .../kit/object/ObjectProcessor.java | 1 - .../serializer/kit/tbase/TBaseHandler.java | 1 - .../serializer/kit/tbase/TBaseProcessor.java | 1 - .../tbase/TDomainToStringErrorHandler.java | 1 - .../serializer/kit/tbase/TErrorHandler.java | 1 - .../geck/serializer/kit/tbase/TErrorUtil.java | 1 - .../TTypedStringToDomainErrorProcessor.java | 1 - .../kit/tbase/TTypedToDomainErrorHandler.java | 1 - .../kit/tbase/TTypedToStringErrorHandler.java | 1 - .../geck/serializer/kit/tbase/ThriftType.java | 1 - .../geck/serializer/kit/xml/XMLConstants.java | 1 - .../geck/serializer/kit/xml/XMLHandler.java | 1 - .../geck/serializer/kit/xml/XMLProcessor.java | 1 - .../rbkmoney/geck/serializer/GeckTest.java | 1 - .../geck/serializer/GeckTestUtil.java | 1 - .../geck/serializer/domain/BinaryTest.java | 7 - .../geck/serializer/domain/Enums.java | 6 - .../rbkmoney/geck/serializer/domain/Fail.java | 7 - .../serializer/domain/FilterListObject.java | 7 - .../serializer/domain/FilterMapObject.java | 7 - .../geck/serializer/domain/FilterObject.java | 7 - .../geck/serializer/domain/FilterUnion.java | 7 - .../geck/serializer/domain/HandlerTest.java | 7 - .../rbkmoney/geck/serializer/domain/Ids.java | 7 - .../rbkmoney/geck/serializer/domain/Ids2.java | 7 - .../rbkmoney/geck/serializer/domain/Ids3.java | 7 - .../geck/serializer/domain/MapListTest.java | 7 - .../geck/serializer/domain/MapTest.java | 7 - .../rbkmoney/geck/serializer/domain/Ok.java | 7 - .../geck/serializer/domain/SetTest.java | 7 - .../geck/serializer/domain/Status.java | 7 - .../geck/serializer/domain/TUnionTest.java | 7 - .../geck/serializer/domain/TestObject.java | 7 - .../geck/serializer/domain/Unknown.java | 7 - .../geck/serializer/handler/HandlerStub.java | 1 - .../serializer/kit/damsel/DamselTest.java | 1 - .../geck/serializer/kit/json/JsonTest.java | 1 - .../kit/mock/RandomValueGeneratorTest.java | 1 - .../serializer/kit/msgpack/MsgPackTest.java | 1 - .../msgpack/StringUtilCompressingTest.java | 1 - .../msgpack/TestFilterMsgPackProcessor.java | 112 ++++--- .../supply/NoFilterMsgPackProcessor.java | 1 - .../kit/object/ObjectHandlerTest.java | 1 - .../kit/tbase/TBaseProcessorTest.java | 1 - .../geck/serializer/kit/xml/XMLTest.java | 1 - .../checkstyle/checkstyle-suppressions.xml | 63 ++++ 136 files changed, 388 insertions(+), 524 deletions(-) create mode 100644 .lgtm.yml create mode 100644 src/main/resources/checkstyle/checkstyle-suppressions.xml diff --git a/.lgtm.yml b/.lgtm.yml new file mode 100644 index 0000000..6ec8d3c --- /dev/null +++ b/.lgtm.yml @@ -0,0 +1,4 @@ +extraction: + java: + index: + java_version: "15" diff --git a/Jenkinsfile b/Jenkinsfile index 3e785de..8ef6b5b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,9 +5,8 @@ build('geck', 'docker-host') { def javaLibPipeline runStage('load JavaLib pipeline') { - javaLibPipeline = load("build_utils/jenkins_lib/pipeJavaLib.groovy") + javaLibPipeline = load("build_utils/jenkins_lib/pipeJavaLibInsideDocker.groovy") } - def buildImageTag = "07d3946f8f005782697de20270ac58cdcd18b011" - javaLibPipeline(buildImageTag) + javaLibPipeline() } diff --git a/build_utils b/build_utils index 8cee874..c12c9dd 160000 --- a/build_utils +++ b/build_utils @@ -1 +1 @@ -Subproject commit 8cee874fda7c15061b4c8493a434b74b785840b5 +Subproject commit c12c9dd296912ec3c34ad443b448df98fef2556a diff --git a/common/pom.xml b/common/pom.xml index a59fbc7..2ea59dd 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -7,11 +7,16 @@ com.rbkmoney.geck parent - 0.6.11 + 0.6.12 + ../pom.xml common + + ./src/main/resources/checkstyle/checkstyle-suppressions.xml + + com.rbkmoney.woody diff --git a/common/src/main/java/com/rbkmoney/geck/common/reflection/ClassFinder.java b/common/src/main/java/com/rbkmoney/geck/common/reflection/ClassFinder.java index 437c27c..c68b7b5 100644 --- a/common/src/main/java/com/rbkmoney/geck/common/reflection/ClassFinder.java +++ b/common/src/main/java/com/rbkmoney/geck/common/reflection/ClassFinder.java @@ -11,11 +11,11 @@ import java.util.Set; import java.util.regex.Pattern; import java.util.stream.Collectors; - - public class ClassFinder { - public static Collection> find(Collection scannedPackages, String classNameSuffix, Class classType) { + public static Collection> find(Collection scannedPackages, + String classNameSuffix, + Class classType) { Set> classes = new HashSet<>(); for (String scannedPackage : scannedPackages) { classes.addAll(find(scannedPackage, classNameSuffix, classType)); @@ -23,7 +23,9 @@ public class ClassFinder { return classes; } - public static Collection> find(String scannedPackage, String classSuffix, Class classType) { + public static Collection> find(String scannedPackage, + String classSuffix, + Class classType) { return new Reflections(scannedPackage) .getSubTypesOf(classType).stream() .filter(t -> t.getSimpleName().endsWith(classSuffix)) diff --git a/common/src/main/java/com/rbkmoney/geck/common/util/StringUtil.java b/common/src/main/java/com/rbkmoney/geck/common/util/StringUtil.java index bec6ffb..53f96a3 100644 --- a/common/src/main/java/com/rbkmoney/geck/common/util/StringUtil.java +++ b/common/src/main/java/com/rbkmoney/geck/common/util/StringUtil.java @@ -103,8 +103,9 @@ public final class StringUtil { int mask = 1 << i; result.append((number & mask) != 0 ? "1" : "0"); - if (i % groupSize == 0 && i > 0) + if (i % groupSize == 0 && i > 0) { result.append(" "); + } } return result.toString(); } diff --git a/common/src/main/java/com/rbkmoney/geck/common/util/TypeUtil.java b/common/src/main/java/com/rbkmoney/geck/common/util/TypeUtil.java index 0b95b50..38ff3b4 100644 --- a/common/src/main/java/com/rbkmoney/geck/common/util/TypeUtil.java +++ b/common/src/main/java/com/rbkmoney/geck/common/util/TypeUtil.java @@ -17,7 +17,8 @@ public class TypeUtil { return stringToLocalDateTime(dateTimeStr, ZoneOffset.UTC); } - public static LocalDateTime stringToLocalDateTime(String dateTimeStr, ZoneId zoneId) throws IllegalArgumentException { + public static LocalDateTime stringToLocalDateTime(String dateTimeStr, ZoneId zoneId) + throws IllegalArgumentException { try { return LocalDateTime.ofInstant(stringToInstant(dateTimeStr), zoneId); } catch (DateTimeException e) { diff --git a/common/src/test/java/com/rbkmoney/geck/common/reflection/ClassFinderTest.java b/common/src/test/java/com/rbkmoney/geck/common/reflection/ClassFinderTest.java index 139bd0d..9c02c08 100644 --- a/common/src/test/java/com/rbkmoney/geck/common/reflection/ClassFinderTest.java +++ b/common/src/test/java/com/rbkmoney/geck/common/reflection/ClassFinderTest.java @@ -17,7 +17,9 @@ public class ClassFinderTest { assertNotNull(resources); assertTrue(resources.size() == 2); for (String resource : resources) { - try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(Thread.currentThread().getContextClassLoader().getResourceAsStream(resource)))) { + try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader( + Thread.currentThread().getContextClassLoader().getResourceAsStream(resource))) + ) { assertEquals("{ \"tipa\": \"json\" }", bufferedReader.readLine()); } } diff --git a/filter/pom.xml b/filter/pom.xml index f88d95f..98fdbe0 100644 --- a/filter/pom.xml +++ b/filter/pom.xml @@ -7,11 +7,16 @@ com.rbkmoney.geck parent - 0.6.11 + 0.6.12 + ../pom.xml filter + + ./src/main/resources/checkstyle/checkstyle-suppressions.xml + + com.rbkmoney.geck diff --git a/filter/src/main/java/com/rbkmoney/geck/filter/Filter.java b/filter/src/main/java/com/rbkmoney/geck/filter/Filter.java index ba66c3f..ddc5168 100644 --- a/filter/src/main/java/com/rbkmoney/geck/filter/Filter.java +++ b/filter/src/main/java/com/rbkmoney/geck/filter/Filter.java @@ -2,7 +2,6 @@ package com.rbkmoney.geck.filter; import java.util.List; - public interface Filter { /** diff --git a/filter/src/main/java/com/rbkmoney/geck/filter/Parser.java b/filter/src/main/java/com/rbkmoney/geck/filter/Parser.java index d9ab1ce..eb3ad02 100644 --- a/filter/src/main/java/com/rbkmoney/geck/filter/Parser.java +++ b/filter/src/main/java/com/rbkmoney/geck/filter/Parser.java @@ -1,6 +1,5 @@ package com.rbkmoney.geck.filter; - public interface Parser { String getItem(int item); diff --git a/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/MultiSelector.java b/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/MultiSelector.java index 4cc2f0d..744c8d1 100644 --- a/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/MultiSelector.java +++ b/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/MultiSelector.java @@ -1,6 +1,5 @@ package com.rbkmoney.geck.filter.kit.msgpack; - abstract class MultiSelector extends Selector { public MultiSelector(Type type) { diff --git a/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/SelectionResult.java b/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/SelectionResult.java index f191730..f1d7be5 100644 --- a/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/SelectionResult.java +++ b/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/SelectionResult.java @@ -5,7 +5,6 @@ import com.rbkmoney.geck.filter.Rule; import java.util.Arrays; import java.util.List; - class SelectionResult { final SelectionType type; diff --git a/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/Selector.java b/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/Selector.java index f58b1e9..3c588c3 100644 --- a/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/Selector.java +++ b/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/Selector.java @@ -1,6 +1,5 @@ package com.rbkmoney.geck.filter.kit.msgpack; - import com.rbkmoney.geck.filter.Condition; import com.rbkmoney.geck.filter.Rule; import com.rbkmoney.geck.serializer.StructHandleResult; diff --git a/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/SelectorParser.java b/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/SelectorParser.java index 6c4a258..da5ec55 100644 --- a/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/SelectorParser.java +++ b/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/SelectorParser.java @@ -14,7 +14,6 @@ import java.util.List; import static com.rbkmoney.geck.filter.kit.msgpack.MatchKeySelector.MATCH_RULE; import static com.rbkmoney.geck.filter.kit.msgpack.SelectorParser.State.*; - public class SelectorParser { enum State { EVAL_READY, diff --git a/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/StructSelector.java b/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/StructSelector.java index 8c0e684..a67b471 100644 --- a/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/StructSelector.java +++ b/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/StructSelector.java @@ -5,7 +5,6 @@ import com.rbkmoney.geck.serializer.kit.EventFlags; import static com.rbkmoney.geck.serializer.kit.EventFlags.endStruct; - class StructSelector extends Selector { private final Rule rule; diff --git a/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/StructVisitor.java b/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/StructVisitor.java index 61a2f3f..cf2112f 100644 --- a/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/StructVisitor.java +++ b/filter/src/main/java/com/rbkmoney/geck/filter/kit/msgpack/StructVisitor.java @@ -10,7 +10,6 @@ import java.util.function.Supplier; import static com.rbkmoney.geck.serializer.StructHandleResult.*; - class StructVisitor { private final Supplier cnfSupplier; private Selector.Config config; @@ -113,7 +112,7 @@ class StructVisitor { return currConfig.context; } currConfig = currConfig.prevConfig; - } while (currConfig != null); - return currConfig == null ? null : currConfig.context; + } while (currConfig != null);//NOSONAR + return currConfig == null ? null : currConfig.context;//NOSONAR } } diff --git a/filter/src/main/java/com/rbkmoney/geck/filter/parser/PathParser.java b/filter/src/main/java/com/rbkmoney/geck/filter/parser/PathParser.java index 76dbc22..98562be 100644 --- a/filter/src/main/java/com/rbkmoney/geck/filter/parser/PathParser.java +++ b/filter/src/main/java/com/rbkmoney/geck/filter/parser/PathParser.java @@ -5,7 +5,6 @@ import com.rbkmoney.geck.filter.Parser; import java.util.Arrays; - public class PathParser implements Parser { private final String[] items; diff --git a/filter/src/main/java/com/rbkmoney/geck/filter/rule/PathConditionRule.java b/filter/src/main/java/com/rbkmoney/geck/filter/rule/PathConditionRule.java index 117616f..8167497 100644 --- a/filter/src/main/java/com/rbkmoney/geck/filter/rule/PathConditionRule.java +++ b/filter/src/main/java/com/rbkmoney/geck/filter/rule/PathConditionRule.java @@ -5,7 +5,6 @@ import com.rbkmoney.geck.filter.Parser; import com.rbkmoney.geck.filter.Rule; import com.rbkmoney.geck.filter.parser.PathParser; - public class PathConditionRule implements Rule { private final Parser parser; diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/PathConditionFilterTest.java b/filter/src/test/java/com/rbkmoney/geck/filter/PathConditionFilterTest.java index 98cb7c8..b50f497 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/PathConditionFilterTest.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/PathConditionFilterTest.java @@ -14,10 +14,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; - -public class - -PathConditionFilterTest { +public class PathConditionFilterTest { List testObjectList = new ArrayList<>(); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/kit/msgpack/SelectorParserTest.java b/filter/src/test/java/com/rbkmoney/geck/filter/kit/msgpack/SelectorParserTest.java index 2fbd80f..67efeef 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/kit/msgpack/SelectorParserTest.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/kit/msgpack/SelectorParserTest.java @@ -6,7 +6,15 @@ import com.rbkmoney.geck.filter.Rule; import com.rbkmoney.geck.filter.condition.EqualsCondition; import com.rbkmoney.geck.filter.condition.IsNullCondition; import com.rbkmoney.geck.filter.rule.ConditionRule; -import com.rbkmoney.geck.filter.test.filter.*; +import com.rbkmoney.geck.filter.test.filter.IData; +import com.rbkmoney.geck.filter.test.filter.IDataCollection; +import com.rbkmoney.geck.filter.test.filter.ILvl2Data; +import com.rbkmoney.geck.filter.test.filter.ILvlData; +import com.rbkmoney.geck.filter.test.filter.IStatusCanceled; +import com.rbkmoney.geck.filter.test.filter.IStatusPaid; +import com.rbkmoney.geck.filter.test.filter.Invoice; +import com.rbkmoney.geck.filter.test.filter.InvoiceStatus; +import com.rbkmoney.geck.filter.test.filter.MapTest; import com.rbkmoney.geck.serializer.kit.json.JsonHandler; import com.rbkmoney.geck.serializer.kit.msgpack.MsgPackHandler; import com.rbkmoney.geck.serializer.kit.msgpack.MsgPackProcessor; @@ -15,66 +23,119 @@ import org.apache.thrift.TBase; import org.junit.Test; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Set; import java.util.stream.IntStream; import static org.junit.Assert.assertEquals; - public class SelectorParserTest { + private static Invoice createInvoice(int invId, String details, String dataVal, InvoiceStatus invoiceStatus) { + Invoice invoice = new Invoice(invId, invoiceStatus, + new IData(dataVal) {{ + setDataOptVal("opt_data"); + }}, + new ILvlData() {{ + setLvl2Data1(new ILvl2Data("lvl21val1", "lvl21val2")); + setLvl2Data2(new ILvl2Data("lvl22val1", "lvl22val2")); + }} + ); + invoice.setIDetails(details); + + return invoice; + } + + private static InvoiceStatus iPaidStatus(String date) { + return InvoiceStatus.paid(new IStatusPaid(date) { + { + setValue("pvalue"); + } + }); + } + + private static InvoiceStatus iCanceledStatus(String details) { + return InvoiceStatus.canceled(new IStatusCanceled(details) { + { + setValue("cvalue"); + } + }); + } + @Test public void test1LvlParser() throws IOException { - List rules = applyRules(new SelectorParser().parse("id", new ConditionRule(new EqualsCondition(1L))), preparePaidSample1("")); + List rules = applyRules(new SelectorParser().parse("id", new ConditionRule(new EqualsCondition(1L))), + preparePaidSample1("")); assertEquals(1, rules.size()); } @Test public void test2LvlNotNullParserParser() throws IOException { - List rules = applyRules(new SelectorParser().parse("status.paid", new ConditionRule(new IsNullCondition().not())), preparePaidSample1("")); + List rules = + applyRules(new SelectorParser().parse("status.paid", new ConditionRule(new IsNullCondition().not())), + preparePaidSample1("")); assertEquals(1, rules.size()); } @Test public void test3LvlParser() throws IOException { - List rules = applyRules(new SelectorParser().parse("status.canceled.details", new ConditionRule(new EqualsCondition("fail"))), prepareCanceledSample1("fail", "")); + List rules = applyRules( + new SelectorParser().parse("status.canceled.details", new ConditionRule(new EqualsCondition("fail"))), + prepareCanceledSample1("fail", "")); assertEquals(1, rules.size()); } @Test public void testAnyNameParser() throws IOException { - List rules = applyRules(new SelectorParser().parse("*", new ConditionRule(new EqualsCondition("i_details_p"))), preparePaidSample1("")); + List rules = + applyRules(new SelectorParser().parse("*", new ConditionRule(new EqualsCondition("i_details_p"))), + preparePaidSample1("")); assertEquals(1, rules.size()); } @Test public void test3LvlMiddleAnyNameParser() throws IOException { - List rules = applyRules(new SelectorParser().parse("status.*.value", new ConditionRule(new EqualsCondition("pvalue"))), preparePaidSample1("")); + List rules = applyRules( + new SelectorParser().parse("status.*.value", new ConditionRule(new EqualsCondition("pvalue"))), + preparePaidSample1("")); assertEquals(1, rules.size()); } @Test public void test3LvlTailAnyNameParser() throws IOException { - List rules = applyRules(new SelectorParser().parse("data.*", new ConditionRule(new EqualsCondition("data_val"))), preparePaidSample1("data_val")); + List rules = + applyRules(new SelectorParser().parse("data.*", new ConditionRule(new EqualsCondition("data_val"))), + preparePaidSample1("data_val")); assertEquals(1, rules.size()); } @Test public void test2LvlAnyNameParser() throws IOException { - List rules = applyRules(new SelectorParser().parse("lvl_data.*.*", new ConditionRule(new EqualsCondition("lvl22val2"))), preparePaidSample1("data_val")); + List rules = applyRules( + new SelectorParser().parse("lvl_data.*.*", new ConditionRule(new EqualsCondition("lvl22val2"))), + preparePaidSample1("data_val")); assertEquals(1, rules.size()); } @Test public void testAnyElemParser() throws IOException { - List rules = applyRules(new SelectorParser().parse("data_coll.data_list.[*].data_val", new ConditionRule(new EqualsCondition("1"))), preparePaidSample2("value", true, 2)); + List rules = applyRules(new SelectorParser() + .parse("data_coll.data_list.[*].data_val", new ConditionRule(new EqualsCondition("1"))), + preparePaidSample2("value", true, 2)); assertEquals(1, rules.size()); } @Test public void testArrayNotExistsParser() throws IOException { Invoice invoice = preparePaidInvoice2("value", true, 2); - List rules = applyRules(new SelectorParser().parse("i_list.[]", new ConditionRule(obj -> true)), prepareSample(invoice)); + List rules = applyRules(new SelectorParser().parse("i_list.[]", new ConditionRule(obj -> true)), + prepareSample(invoice)); assertEquals(0, rules.size()); } @@ -82,7 +143,8 @@ public class SelectorParserTest { public void testArrayExistsParser() throws IOException { Invoice invoice = preparePaidInvoice2("value", true, 2); invoice.setIList(new ArrayList<>()); - List rules = applyRules(new SelectorParser().parse("i_list.[]", new ConditionRule(obj -> true)), prepareSample(invoice)); + List rules = applyRules(new SelectorParser().parse("i_list.[]", new ConditionRule(obj -> true)), + prepareSample(invoice)); assertEquals(1, rules.size()); } @@ -91,115 +153,93 @@ public class SelectorParserTest { Invoice invoice = createInvoice(1, "", "", InvoiceStatus.paid(new IStatusPaid())); invoice.setIList(Arrays.asList(0, 1, 2, 3)); - List rules = applyRules(new SelectorParser().parse("i_list.[*]", new ConditionRule(new EqualsCondition(2L))), prepareSample(invoice)); + List rules = + applyRules(new SelectorParser().parse("i_list.[*]", new ConditionRule(new EqualsCondition(2L))), + prepareSample(invoice)); assertEquals(1, rules.size()); invoice.setIList(Arrays.asList()); - rules = applyRules(new SelectorParser().parse("i_list.[*]", new ConditionRule(new EqualsCondition(2L))), prepareSample(invoice)); + rules = applyRules(new SelectorParser().parse("i_list.[*]", new ConditionRule(new EqualsCondition(2L))), + prepareSample(invoice)); assertEquals(0, rules.size()); } @Test public void testMapExistsParser() throws IOException { Invoice invoice = preparePaidInvoice1("value"); - invoice.setIMap(new LinkedHashMap() {{ - }}); - List rules = applyRules(new SelectorParser().parse("i_map.{}", new ConditionRule(obj -> true)), prepareSample(invoice)); + invoice.setIMap(new LinkedHashMap() { + { + } + }); + List rules = applyRules(new SelectorParser().parse("i_map.{}", new ConditionRule(obj -> true)), + prepareSample(invoice)); assertEquals(1, rules.size()); } @Test public void testMapKeyParser() throws IOException { Invoice invoice = preparePaidInvoice1("value"); - invoice.setIMap(new LinkedHashMap() {{ - put(1, new IData("val1")); - put(2, new IData("val2")); - }}); - List rules = applyRules(new SelectorParser().parse("i_map.{*}.data_val", new ConditionRule(new EqualsCondition("val2"))), prepareSample(invoice)); + invoice.setIMap(new LinkedHashMap() { + { + put(1, new IData("val1")); + put(2, new IData("val2")); + } + }); + List rules = applyRules( + new SelectorParser().parse("i_map.{*}.data_val", new ConditionRule(new EqualsCondition("val2"))), + prepareSample(invoice)); assertEquals(1, rules.size()); } @Test public void testEmptyMapKeyParser() throws IOException { Invoice invoice = preparePaidInvoice1("value"); - invoice.setIMap(new LinkedHashMap() {{ - }}); - List rules = applyRules(new SelectorParser().parse("i_map.{*}.data_val", new ConditionRule(new EqualsCondition("val2"))), prepareSample(invoice)); + invoice.setIMap(new LinkedHashMap() { + { + } + }); + List rules = applyRules( + new SelectorParser().parse("i_map.{*}.data_val", new ConditionRule(new EqualsCondition("val2"))), + prepareSample(invoice)); assertEquals(0, rules.size()); } @Test public void testNullMapKeyParser() throws IOException { Invoice invoice = preparePaidInvoice1("value"); - List rules = applyRules(new SelectorParser().parse("i_map.{*}.data_val", new ConditionRule(new EqualsCondition("val2"))), prepareSample(invoice)); + List rules = applyRules( + new SelectorParser().parse("i_map.{*}.data_val", new ConditionRule(new EqualsCondition("val2"))), + prepareSample(invoice)); assertEquals(0, rules.size()); } @Test public void testObjMapKeyParser() throws IOException { Invoice invoice = preparePaidInvoice1("value"); - invoice.setObjMap(new LinkedHashMap(){{ - put(iPaidStatus("p"), new IData("val1")); - put(iCanceledStatus("c"), new IData("val2")); - }}); - List rules = applyRules(new SelectorParser().parse("obj_map.{*}.data_val", new ConditionRule(new EqualsCondition("val3"))), prepareSample(invoice)); + invoice.setObjMap(new LinkedHashMap() { + { + put(iPaidStatus("p"), new IData("val1")); + put(iCanceledStatus("c"), new IData("val2")); + } + }); + List rules = applyRules( + new SelectorParser().parse("obj_map.{*}.data_val", new ConditionRule(new EqualsCondition("val3"))), + prepareSample(invoice)); assertEquals(0, rules.size()); } @Test public void test2ObjMapKeyParser() throws IOException { Invoice invoice = preparePaidInvoice1("value"); - invoice.setObjMap(new LinkedHashMap(){{ - put(iPaidStatus("p"), new IData("val1")); - put(iCanceledStatus("c"), new IData("val2")); - }}); - List rules = applyRules(new SelectorParser().parse("obj_map.{*}.data_val", new ConditionRule(new EqualsCondition("val3"))), prepareSample(invoice)); - assertEquals(0, rules.size()); - } - - @Test - public void test3ObjMapKeyParser() throws IOException { - Invoice invoice = preparePaidInvoice1("value"); - invoice.setObjMap(new LinkedHashMap(){{ - put(iPaidStatus("p"), new IData("val1")); - put(iCanceledStatus("c"), new IData("val2")); - }}); - List rules = applyRules(new SelectorParser().parse("obj_map.{canceled}.data_val", new ConditionRule(new EqualsCondition("val2"))), prepareSample(invoice)); - assertEquals(1, rules.size()); - rules = applyRules(new SelectorParser().parse("obj_map.{canceled}.data_val", new ConditionRule(new EqualsCondition("val3"))), prepareSample(invoice)); - assertEquals(0, rules.size()); - } - - @Test - public void testListMapKeyParser() throws IOException { - MapTest mapTest = new MapTest(); - mapTest.setLstKeyMap(new HashMap, Integer>(){{ - put(Arrays.asList(), -1); - }}); - - List rules = null;/*applyRules(new SelectorParser().parse("lst_key_map.{[]}", new ConditionRule(new EqualsCondition(-1L))), prepareSample(mapTest)); - assertEquals(1, rules.size());*/ - - rules = applyRules(new SelectorParser().parse("lst_key_map.{*}", new ConditionRule(new EqualsCondition(-1L))), prepareSample(mapTest)); - assertEquals(1, rules.size()); - - - mapTest.setLstKeyMap(new HashMap, Integer>(){{ - put(Arrays.asList(), 0); - }}); - - rules = applyRules(new SelectorParser().parse("lst_key_map.{[]}", new ConditionRule(new EqualsCondition(-1L))), prepareSample(mapTest)); - assertEquals(0, rules.size()); - - rules = applyRules(new SelectorParser().parse("lst_key_map.{*}", new ConditionRule(new EqualsCondition(-1L))), prepareSample(mapTest)); - assertEquals(0, rules.size()); - - } - - @Test - public void testMapNotExistsParser() throws IOException { - Invoice invoice = preparePaidInvoice1("value"); - List rules = applyRules(new SelectorParser().parse("i_map.{}", new ConditionRule(obj -> true)), prepareSample(invoice)); + invoice.setObjMap(new LinkedHashMap() { + { + put(iPaidStatus("p"), new IData("val1")); + put(iCanceledStatus("c"), new IData("val2")); + } + }); + List rules = applyRules( + new SelectorParser().parse("obj_map.{*}.data_val", new ConditionRule(new EqualsCondition("val3"))), + prepareSample(invoice)); assertEquals(0, rules.size()); } @@ -209,10 +249,23 @@ public class SelectorParserTest { assertEquals(1, rules.size()); }*/ - @Test(expected = IllegalArgumentException.class) - public void testBadFormat2MapExistsParser() throws IOException { - List rules = applyRules(new SelectorParser().parse("i_map.{}.something", new ConditionRule(obj -> true)), preparePaidSample2("value", true, 2)); + @Test + public void test3ObjMapKeyParser() throws IOException { + Invoice invoice = preparePaidInvoice1("value"); + invoice.setObjMap(new LinkedHashMap() { + { + put(iPaidStatus("p"), new IData("val1")); + put(iCanceledStatus("c"), new IData("val2")); + } + }); + List rules = applyRules(new SelectorParser() + .parse("obj_map.{canceled}.data_val", new ConditionRule(new EqualsCondition("val2"))), + prepareSample(invoice)); assertEquals(1, rules.size()); + rules = applyRules(new SelectorParser() + .parse("obj_map.{canceled}.data_val", new ConditionRule(new EqualsCondition("val3"))), + prepareSample(invoice)); + assertEquals(0, rules.size()); } /*@Test(expected = IllegalArgumentException.class) @@ -221,9 +274,58 @@ public class SelectorParserTest { assertEquals(1, rules.size()); }*/ + @Test + public void testListMapKeyParser() throws IOException { + MapTest mapTest = new MapTest(); + mapTest.setLstKeyMap(new HashMap, Integer>() { + { + put(Arrays.asList(), -1); + } + }); + + List rules = null;/*applyRules(new SelectorParser().parse("lst_key_map.{[]}", new ConditionRule(new EqualsCondition(-1L))), prepareSample(mapTest)); + assertEquals(1, rules.size());*/ + + rules = applyRules(new SelectorParser().parse("lst_key_map.{*}", new ConditionRule(new EqualsCondition(-1L))), + prepareSample(mapTest)); + assertEquals(1, rules.size()); + + + mapTest.setLstKeyMap(new HashMap, Integer>() { + { + put(Arrays.asList(), 0); + } + }); + + rules = applyRules(new SelectorParser().parse("lst_key_map.{[]}", new ConditionRule(new EqualsCondition(-1L))), + prepareSample(mapTest)); + assertEquals(0, rules.size()); + + rules = applyRules(new SelectorParser().parse("lst_key_map.{*}", new ConditionRule(new EqualsCondition(-1L))), + prepareSample(mapTest)); + assertEquals(0, rules.size()); + + } + + @Test + public void testMapNotExistsParser() throws IOException { + Invoice invoice = preparePaidInvoice1("value"); + List rules = applyRules(new SelectorParser().parse("i_map.{}", new ConditionRule(obj -> true)), + prepareSample(invoice)); + assertEquals(0, rules.size()); + } + + @Test(expected = IllegalArgumentException.class) + public void testBadFormat2MapExistsParser() throws IOException { + List rules = applyRules(new SelectorParser().parse("i_map.{}.something", new ConditionRule(obj -> true)), + preparePaidSample2("value", true, 2)); + assertEquals(1, rules.size()); + } + @Test(expected = IllegalArgumentException.class) public void testBadFormat2ArrayExistsParser() throws IOException { - List rules = applyRules(new SelectorParser().parse("i_list.[].something", new ConditionRule(obj -> true)), preparePaidSample2("value", true, 2)); + List rules = applyRules(new SelectorParser().parse("i_list.[].something", new ConditionRule(obj -> true)), + preparePaidSample2("value", true, 2)); assertEquals(1, rules.size()); } @@ -271,41 +373,15 @@ public class SelectorParserTest { private void printJson(TBase object) throws IOException { JsonNode node = new TBaseProcessor().process(object, new JsonHandler(true)); - System.out.printf("%nData: %n %s %n =========================================================%n", new ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(node)); + System.out.printf("%nData: %n %s %n =========================================================%n", + new ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(node)); } private void setIDataCollection(Invoice invoice, boolean useList, int elemCount) { Collection collection = useList ? new ArrayList<>() : new HashSet<>(); IntStream.range(0, elemCount).forEach(i -> collection.add(new IData("" + i))); - invoice.setDataColl(useList ? IDataCollection.data_list((List) collection) : IDataCollection.data_set((Set) collection)); - } - - - private static Invoice createInvoice(int invId, String details, String dataVal, InvoiceStatus invoiceStatus) { - Invoice invoice = new Invoice(invId, invoiceStatus, - new IData(dataVal) {{ - setDataOptVal("opt_data"); - }}, - new ILvlData() {{ - setLvl2Data1(new ILvl2Data("lvl21val1", "lvl21val2")); - setLvl2Data2(new ILvl2Data("lvl22val1", "lvl22val2")); - }} - ); - invoice.setIDetails(details); - - return invoice; - } - - private static InvoiceStatus iPaidStatus(String date) { - return InvoiceStatus.paid(new IStatusPaid(date) {{ - setValue("pvalue"); - }}); - } - - private static InvoiceStatus iCanceledStatus(String details) { - return InvoiceStatus.canceled(new IStatusCanceled(details) {{ - setValue("cvalue"); - }}); + invoice.setDataColl(useList ? IDataCollection.data_list((List) collection) : + IDataCollection.data_set((Set) collection)); } } diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/parser/PathParserTest.java b/filter/src/test/java/com/rbkmoney/geck/filter/parser/PathParserTest.java index c7ed327..20b3f5f 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/parser/PathParserTest.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/parser/PathParserTest.java @@ -5,7 +5,6 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; - public class PathParserTest { @Test diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/Fail.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/Fail.java index e0952d6..087c8cd 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/Fail.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/Fail.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test; import org.apache.thrift.EncodingUtils; @@ -17,7 +11,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class Fail implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Fail"); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/Ids.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/Ids.java index 7b1a5fa..95c319c 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/Ids.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/Ids.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test; import org.apache.thrift.EncodingUtils; @@ -17,7 +11,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class Ids implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Ids"); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/Ok.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/Ok.java index 6e4b131..10d8144 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/Ok.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/Ok.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test; import org.apache.thrift.protocol.TTupleProtocol; @@ -15,7 +9,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class Ok implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Ok"); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/Status.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/Status.java index 787b0d1..42d9c27 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/Status.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/Status.java @@ -1,16 +1,9 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test; import org.apache.thrift.protocol.TProtocolException; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) public class Status extends org.apache.thrift.TUnion { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Status"); private static final org.apache.thrift.protocol.TField OK_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("ok_status", org.apache.thrift.protocol.TType.STRUCT, (short)1); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/TestObject.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/TestObject.java index e58d6d7..e30d25e 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/TestObject.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/TestObject.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test; import org.apache.thrift.EncodingUtils; @@ -17,7 +11,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class TestObject implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TestObject"); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/Type.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/Type.java index 9b020ac..a7f4a88 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/Type.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/Type.java @@ -1,12 +1,5 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test; - import org.apache.thrift.TEnum; public enum Type implements TEnum { diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/Unknown.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/Unknown.java index 1df151a..5fa88f0 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/Unknown.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/Unknown.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test; import org.apache.thrift.protocol.TProtocolException; @@ -16,7 +10,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class Unknown implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Unknown"); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/UnknownType.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/UnknownType.java index cc89a03..11921fc 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/UnknownType.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/UnknownType.java @@ -1,16 +1,9 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test; import org.apache.thrift.protocol.TProtocolException; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) public class UnknownType extends org.apache.thrift.TUnion { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnknownType"); private static final org.apache.thrift.protocol.TField RESULT_FIELD_DESC = new org.apache.thrift.protocol.TField("result", org.apache.thrift.protocol.TType.STRING, (short)1); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IData.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IData.java index 5b8c46c..51b3588 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IData.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IData.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test.filter; import org.apache.thrift.protocol.TProtocolException; @@ -16,7 +10,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class IData implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IData"); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IDataCollection.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IDataCollection.java index de60c54..e2dbcdd 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IDataCollection.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IDataCollection.java @@ -1,16 +1,9 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test.filter; import org.apache.thrift.protocol.TProtocolException; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) public class IDataCollection extends org.apache.thrift.TUnion { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IDataCollection"); private static final org.apache.thrift.protocol.TField DATA_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("data_list", org.apache.thrift.protocol.TType.LIST, (short)1); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/ILvl2Data.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/ILvl2Data.java index fd4d73a..b79476e 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/ILvl2Data.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/ILvl2Data.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test.filter; import org.apache.thrift.protocol.TProtocolException; @@ -16,7 +10,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class ILvl2Data implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ILvl2Data"); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/ILvlData.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/ILvlData.java index 6ff64c2..cf861a7 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/ILvlData.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/ILvlData.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test.filter; import org.apache.thrift.protocol.TTupleProtocol; @@ -15,7 +9,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class ILvlData implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ILvlData"); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IStatusCanceled.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IStatusCanceled.java index 105d655..26029a8 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IStatusCanceled.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IStatusCanceled.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test.filter; import org.apache.thrift.protocol.TProtocolException; @@ -16,7 +10,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class IStatusCanceled implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IStatusCanceled"); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IStatusPaid.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IStatusPaid.java index d0dfcb9..db3cc8c 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IStatusPaid.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/IStatusPaid.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test.filter; import org.apache.thrift.protocol.TTupleProtocol; @@ -15,7 +9,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class IStatusPaid implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IStatusPaid"); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/Invoice.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/Invoice.java index d8f4b30..eb66b74 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/Invoice.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/Invoice.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test.filter; import org.apache.thrift.EncodingUtils; @@ -16,7 +10,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class Invoice implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Invoice"); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/InvoiceStatus.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/InvoiceStatus.java index 9c5f462..a011386 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/InvoiceStatus.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/InvoiceStatus.java @@ -1,16 +1,9 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test.filter; import org.apache.thrift.protocol.TProtocolException; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) public class InvoiceStatus extends org.apache.thrift.TUnion { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvoiceStatus"); private static final org.apache.thrift.protocol.TField PAID_FIELD_DESC = new org.apache.thrift.protocol.TField("paid", org.apache.thrift.protocol.TType.STRUCT, (short)1); diff --git a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/MapTest.java b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/MapTest.java index c9def87..2cd75d5 100644 --- a/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/MapTest.java +++ b/filter/src/test/java/com/rbkmoney/geck/filter/test/filter/MapTest.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.filter.test.filter; import org.apache.thrift.protocol.TTupleProtocol; @@ -15,7 +9,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class MapTest implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MapTest"); diff --git a/migrator/pom.xml b/migrator/pom.xml index 27932b0..99bca2f 100644 --- a/migrator/pom.xml +++ b/migrator/pom.xml @@ -7,11 +7,16 @@ com.rbkmoney.geck parent - 0.6.11 + 0.6.12 + ../pom.xml migrator + + ./src/main/resources/checkstyle/checkstyle-suppressions.xml + + com.rbkmoney.geck diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationException.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationException.java index e071fa9..47f9974 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationException.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationException.java @@ -1,6 +1,5 @@ package com.rbkmoney.geck.migrator; - public class MigrationException extends Exception { public MigrationException() { } diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationManager.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationManager.java index 10aac84..2ce3cdd 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationManager.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationManager.java @@ -1,6 +1,5 @@ package com.rbkmoney.geck.migrator; - public interface MigrationManager { O migrate(I src, ThriftSpec thriftSpec, SerializerSpec serializerSpec) throws MigrationException; T migrate(T src, ThriftDef thriftDef, SerializerDef serializerDef) throws MigrationException; diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationManagerBuilder.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationManagerBuilder.java index 2b19928..e203e84 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationManagerBuilder.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationManagerBuilder.java @@ -11,7 +11,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - public class MigrationManagerBuilder { private Map migratorsMap = new HashMap<>(); private List providers = new ArrayList<>(); diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationPoint.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationPoint.java index 1483ab0..bf73883 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationPoint.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationPoint.java @@ -1,6 +1,5 @@ package com.rbkmoney.geck.migrator; - public class MigrationPoint { private final long id; private final ThriftSpec thriftSpec; diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationSpec.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationSpec.java index 9e9892e..32c1b8d 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationSpec.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationSpec.java @@ -1,6 +1,5 @@ package com.rbkmoney.geck.migrator; - public interface MigrationSpec { T getSpec(); String getType(); diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationStore.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationStore.java index fdfe71f..de0e5a7 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationStore.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationStore.java @@ -2,7 +2,6 @@ package com.rbkmoney.geck.migrator; import java.util.List; - public interface MigrationStore { List getMigrations(ThriftSpec thriftSpec) throws MigrationException; int getLastVersion() throws MigrationException; diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationType.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationType.java index 5d73883..d09abb9 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationType.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/MigrationType.java @@ -3,7 +3,6 @@ package com.rbkmoney.geck.migrator; import java.util.HashMap; import java.util.Map; - public enum MigrationType { JOLT("JOLT"), JOBJECT("JOBJECT"), diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/Migrator.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/Migrator.java index c143fe2..9405a02 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/Migrator.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/Migrator.java @@ -1,6 +1,5 @@ package com.rbkmoney.geck.migrator; - public interface Migrator { /** * @param serializerSpec specifies input data format and expected output data format diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/SerializerDef.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/SerializerDef.java index 803e6b5..533be44 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/SerializerDef.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/SerializerDef.java @@ -2,7 +2,6 @@ package com.rbkmoney.geck.migrator; import java.util.Objects; - public class SerializerDef { private final String type; diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/SerializerSpec.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/SerializerSpec.java index 1c9f57f..30a2117 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/SerializerSpec.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/SerializerSpec.java @@ -1,6 +1,5 @@ package com.rbkmoney.geck.migrator; - public interface SerializerSpec { SerializerDef getInDef(); SerializerDef getOutDef(); diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/ThriftDef.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/ThriftDef.java index fa1dda7..b1226fb 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/ThriftDef.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/ThriftDef.java @@ -2,7 +2,6 @@ package com.rbkmoney.geck.migrator; import java.util.Objects; - public class ThriftDef { public static final int NO_VERSION = -1; private final String type; @@ -30,8 +29,8 @@ public class ThriftDef { if (this == o) return true; if (!(o instanceof ThriftDef)) return false; ThriftDef thriftDef = (ThriftDef) o; - return getVersion() == thriftDef.getVersion() && - Objects.equals(getType(), thriftDef.getType()); + return getVersion() == thriftDef.getVersion() + && Objects.equals(getType(), thriftDef.getType()); } @Override diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/ThriftSpec.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/ThriftSpec.java index 2836022..575f699 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/ThriftSpec.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/ThriftSpec.java @@ -2,7 +2,6 @@ package com.rbkmoney.geck.migrator; import java.util.Objects; - public class ThriftSpec { private final ThriftDef inDef; private final ThriftDef outDef; @@ -25,8 +24,8 @@ public class ThriftSpec { if (this == o) return true; if (!(o instanceof ThriftSpec)) return false; ThriftSpec that = (ThriftSpec) o; - return Objects.equals(inDef, that.inDef) && - Objects.equals(outDef, that.outDef); + return Objects.equals(inDef, that.inDef) + && Objects.equals(outDef, that.outDef); } @Override diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/AbstractMigrator.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/AbstractMigrator.java index ac46019..c0f5347 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/AbstractMigrator.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/AbstractMigrator.java @@ -6,7 +6,6 @@ import com.rbkmoney.geck.serializer.StructProcessor; import java.io.IOException; - public abstract class AbstractMigrator implements Migrator { private final SerializerProvider serializerProvider; diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseMigrationManager.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseMigrationManager.java index 8e34006..7de412f 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseMigrationManager.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseMigrationManager.java @@ -9,7 +9,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - public class BaseMigrationManager implements MigrationManager { private final ConcurrentHashMap> cache = new ConcurrentHashMap<>(); private final Map migrators = new HashMap<>(); diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseMigrationSpec.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseMigrationSpec.java index 9a04efb..df02d57 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseMigrationSpec.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseMigrationSpec.java @@ -2,7 +2,6 @@ package com.rbkmoney.geck.migrator.kit; import com.rbkmoney.geck.migrator.MigrationSpec; - public class BaseMigrationSpec implements MigrationSpec { private final T spec; private final String type; diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseMigrationStore.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseMigrationStore.java index 3221124..0596b6c 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseMigrationStore.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseMigrationStore.java @@ -5,7 +5,6 @@ import com.rbkmoney.geck.migrator.*; import java.util.*; - public class BaseMigrationStore implements MigrationStore { private final List providers; diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseSerializerProvider.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseSerializerProvider.java index 1d94772..d6e3acd 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseSerializerProvider.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseSerializerProvider.java @@ -12,7 +12,6 @@ import com.rbkmoney.geck.serializer.kit.object.ObjectProcessor; import java.util.ArrayList; import java.util.List; - public class BaseSerializerProvider implements SerializerProvider { private final List providers; diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseSerializerSpec.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseSerializerSpec.java index ad661aa..5913e3d 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseSerializerSpec.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/BaseSerializerSpec.java @@ -27,8 +27,8 @@ public class BaseSerializerSpec implements SerializerSpec { if (this == o) return true; if (!(o instanceof BaseSerializerSpec)) return false; BaseSerializerSpec that = (BaseSerializerSpec) o; - return Objects.equals(inDef, that.inDef) && - Objects.equals(outDef, that.outDef); + return Objects.equals(inDef, that.inDef) + && Objects.equals(outDef, that.outDef); } @Override diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/MigrationPointProvider.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/MigrationPointProvider.java index 2b6e5e1..88a6aae 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/MigrationPointProvider.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/MigrationPointProvider.java @@ -9,7 +9,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; - public interface MigrationPointProvider { /** * Get all thrift version transitions known to this provider. If provider knows about specific thrift version but doesn't have migration spec, diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/MutableSerializerSpec.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/MutableSerializerSpec.java index f9a1d65..af2e204 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/MutableSerializerSpec.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/MutableSerializerSpec.java @@ -5,7 +5,6 @@ import com.rbkmoney.geck.migrator.SerializerSpec; import java.util.Objects; - public class MutableSerializerSpec implements SerializerSpec { private SerializerDef inDef; private SerializerDef outDef; diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/MutableThriftDef.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/MutableThriftDef.java index c385047..c09cc58 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/MutableThriftDef.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/MutableThriftDef.java @@ -2,7 +2,6 @@ package com.rbkmoney.geck.migrator.kit; import com.rbkmoney.geck.migrator.ThriftDef; - public class MutableThriftDef extends ThriftDef { private int version; private String type; diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/SerializerProvider.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/SerializerProvider.java index 17711a6..0b3ea0d 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/SerializerProvider.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/SerializerProvider.java @@ -5,7 +5,6 @@ import com.rbkmoney.geck.migrator.ThriftDef; import com.rbkmoney.geck.serializer.StructHandler; import com.rbkmoney.geck.serializer.StructProcessor; - public interface SerializerProvider { StructProcessor getStructProcessor(SerializerDef sDef, ThriftDef srcTypeDef); StructHandler getStructHandler(SerializerDef sDef, ThriftDef resTypeDef); diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/jolt/JoltMigrator.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/jolt/JoltMigrator.java index afae54f..086effb 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/jolt/JoltMigrator.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/jolt/JoltMigrator.java @@ -4,7 +4,6 @@ import com.bazaarvoice.jolt.Chainr; import com.rbkmoney.geck.migrator.*; import com.rbkmoney.geck.migrator.kit.AbstractMigrator; - public class JoltMigrator extends AbstractMigrator { public static final SerializerDef SERIALIZER_DEF = new SerializerDef<>(MigrationType.JOLT.getKey()); diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/jolt/JoltSpec.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/jolt/JoltSpec.java index 04215af..77261a4 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/jolt/JoltSpec.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/jolt/JoltSpec.java @@ -3,7 +3,6 @@ package com.rbkmoney.geck.migrator.kit.jolt; import com.bazaarvoice.jolt.Chainr; import com.rbkmoney.geck.migrator.ThriftSpec; - public class JoltSpec { private final ThriftSpec thriftSpec; diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/nop/NopMigrator.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/nop/NopMigrator.java index e993f71..219292a 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/nop/NopMigrator.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/nop/NopMigrator.java @@ -6,7 +6,6 @@ import com.rbkmoney.geck.migrator.MigrationType; import com.rbkmoney.geck.migrator.SerializerSpec; import com.rbkmoney.geck.migrator.kit.AbstractMigrator; - public class NopMigrator extends AbstractMigrator { @Override diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/object/ObjectMigrationPointProvider.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/object/ObjectMigrationPointProvider.java index 78486d4..7c37127 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/object/ObjectMigrationPointProvider.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/object/ObjectMigrationPointProvider.java @@ -13,7 +13,6 @@ import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; - public class ObjectMigrationPointProvider extends SimpleMigrationPointProvider { private static final Logger log = LoggerFactory.getLogger(ObjectMigrationPointProvider.class); diff --git a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/object/ObjectMigrator.java b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/object/ObjectMigrator.java index 146433e..f27b055 100644 --- a/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/object/ObjectMigrator.java +++ b/migrator/src/main/java/com/rbkmoney/geck/migrator/kit/object/ObjectMigrator.java @@ -4,7 +4,6 @@ import com.rbkmoney.geck.common.util.TypeUtil; import com.rbkmoney.geck.migrator.*; import com.rbkmoney.geck.migrator.kit.AbstractMigrator; - public class ObjectMigrator extends AbstractMigrator { public static final SerializerDef SERIALIZER_DEF = new SerializerDef<>(MigrationType.JOBJECT.getKey()); @Override diff --git a/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/TestBaseMigrationManager.java b/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/TestBaseMigrationManager.java index f9ba98c..6062db9 100644 --- a/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/TestBaseMigrationManager.java +++ b/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/TestBaseMigrationManager.java @@ -11,7 +11,6 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; - public class TestBaseMigrationManager { @Test diff --git a/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/jolt/JoltMigratorTest.java b/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/jolt/JoltMigratorTest.java index 2ad958c..cac6e35 100644 --- a/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/jolt/JoltMigratorTest.java +++ b/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/jolt/JoltMigratorTest.java @@ -16,7 +16,6 @@ import java.util.stream.Collectors; import static org.junit.Assert.assertEquals; - public class JoltMigratorTest { @Test diff --git a/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/object/ObjectMigration3Spec.java b/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/object/ObjectMigration3Spec.java index 171a3fb..5a7386b 100644 --- a/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/object/ObjectMigration3Spec.java +++ b/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/object/ObjectMigration3Spec.java @@ -6,7 +6,6 @@ import com.rbkmoney.geck.migrator.ThriftSpec; import java.util.Map; - public class ObjectMigration3Spec implements ObjectSpec { @Override public Object apply(Object in) throws MigrationException { diff --git a/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/object/TestObjectMigration.java b/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/object/TestObjectMigration.java index 9100a8b..ff4b747 100644 --- a/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/object/TestObjectMigration.java +++ b/migrator/src/test/java/com/rbkmoney/geck/migrator/kit/object/TestObjectMigration.java @@ -12,7 +12,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; - public class TestObjectMigration { @Test diff --git a/migrator/src/test/java/com/rbkmoney/geck/migrator/spec/object/ObjectMigration0Spec.java b/migrator/src/test/java/com/rbkmoney/geck/migrator/spec/object/ObjectMigration0Spec.java index 4aeb0db..32cb40a 100644 --- a/migrator/src/test/java/com/rbkmoney/geck/migrator/spec/object/ObjectMigration0Spec.java +++ b/migrator/src/test/java/com/rbkmoney/geck/migrator/spec/object/ObjectMigration0Spec.java @@ -7,7 +7,6 @@ import com.rbkmoney.geck.migrator.kit.object.ObjectSpec; import java.util.Map; - public class ObjectMigration0Spec implements ObjectSpec { @Override public Object apply(Object in) throws MigrationException { diff --git a/migrator/src/test/java/com/rbkmoney/geck/migrator/spec/object/test/ObjectMigration4Spec.java b/migrator/src/test/java/com/rbkmoney/geck/migrator/spec/object/test/ObjectMigration4Spec.java index d86685e..51f7c15 100644 --- a/migrator/src/test/java/com/rbkmoney/geck/migrator/spec/object/test/ObjectMigration4Spec.java +++ b/migrator/src/test/java/com/rbkmoney/geck/migrator/spec/object/test/ObjectMigration4Spec.java @@ -7,7 +7,6 @@ import com.rbkmoney.geck.migrator.kit.object.ObjectSpec; import java.util.Map; - public class ObjectMigration4Spec implements ObjectSpec { @Override public Object apply(Object in) throws MigrationException { diff --git a/pom.xml b/pom.xml index 1beccda..60556d5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ com.rbkmoney - parent - 1.0.5 + library-parent-pom + 1.0.6 com.rbkmoney.geck parent - 0.6.11 + 0.6.12 pom Geck diff --git a/serializer/pom.xml b/serializer/pom.xml index df4f720..18259bc 100644 --- a/serializer/pom.xml +++ b/serializer/pom.xml @@ -7,12 +7,17 @@ com.rbkmoney.geck parent - 0.6.11 + 0.6.12 + ../pom.xml serializer jar + + ./src/main/resources/checkstyle/checkstyle-suppressions.xml + + com.rbkmoney.geck @@ -43,6 +48,11 @@ com.bazaarvoice.jolt json-utils + + javax.annotation + javax.annotation-api + 1.3.1 + junit junit @@ -75,7 +85,7 @@ org.mockito mockito-core - 2.9.0 + 3.12.4 test diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/Geck.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/Geck.java index d65660b..7942967 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/Geck.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/Geck.java @@ -9,7 +9,6 @@ import org.apache.thrift.TBase; import java.io.IOException; - public class Geck { public static String toJson(TBase src) { diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/StructHandler.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/StructHandler.java index d6686ae..5db9dec 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/StructHandler.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/StructHandler.java @@ -2,7 +2,6 @@ package com.rbkmoney.geck.serializer; import java.io.IOException; - public interface StructHandler { byte DEFAULT_FIELD_ID = Byte.MIN_VALUE; diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/StructProcessor.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/StructProcessor.java index 32e5d77..14a4735 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/StructProcessor.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/StructProcessor.java @@ -2,7 +2,6 @@ package com.rbkmoney.geck.serializer; import java.io.IOException; - public interface StructProcessor { R process(S value, StructHandler handler) throws IOException; diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/EventFlags.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/EventFlags.java index 746eaf2..92e1188 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/EventFlags.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/EventFlags.java @@ -1,6 +1,5 @@ package com.rbkmoney.geck.serializer.kit; - public class EventFlags { public static final byte nop = 0; public static final byte startStruct = 1; diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/StructType.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/StructType.java index b788de1..2774131 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/StructType.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/StructType.java @@ -3,7 +3,6 @@ package com.rbkmoney.geck.serializer.kit; import java.util.HashMap; import java.util.Map; - public enum StructType { MAP("map"), SET("set"), diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/json/JsonHandler.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/json/JsonHandler.java index 4100a1b..6179bfc 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/json/JsonHandler.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/json/JsonHandler.java @@ -13,7 +13,6 @@ import com.rbkmoney.geck.serializer.kit.StructType; import java.io.IOException; import java.util.Base64; - public class JsonHandler implements StructHandler { public static final String KEY = "key"; diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/json/JsonProcessor.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/json/JsonProcessor.java index a6da9a5..dbf74f3 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/json/JsonProcessor.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/json/JsonProcessor.java @@ -11,7 +11,6 @@ import java.util.Base64; import java.util.Iterator; import java.util.Map; - public class JsonProcessor implements StructProcessor { @Override diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/FixedValueGenerator.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/FixedValueGenerator.java index e0423da..02906a2 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/FixedValueGenerator.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/FixedValueGenerator.java @@ -4,7 +4,6 @@ import org.apache.thrift.TBase; import org.apache.thrift.TEnum; import org.apache.thrift.TFieldIdEnum; - public class FixedValueGenerator implements ValueGenerator { @Override public byte getByte() { diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/MockTBaseProcessor.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/MockTBaseProcessor.java index 58fcaf9..6cfe1e5 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/MockTBaseProcessor.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/MockTBaseProcessor.java @@ -11,7 +11,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; - public class MockTBaseProcessor extends TBaseProcessor { private final MockMode mode; diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/RandomValueGenerator.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/RandomValueGenerator.java index 1152982..eb3ae39 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/RandomValueGenerator.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/RandomValueGenerator.java @@ -6,7 +6,6 @@ import org.apache.thrift.TFieldIdEnum; import java.util.Random; - public class RandomValueGenerator implements ValueGenerator { public int randomNumber(int bitSize) { diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/ValueGenerator.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/ValueGenerator.java index f20a7b5..acd117e 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/ValueGenerator.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/mock/ValueGenerator.java @@ -4,7 +4,6 @@ import org.apache.thrift.TBase; import org.apache.thrift.TEnum; import org.apache.thrift.TFieldIdEnum; - public interface ValueGenerator { byte getByte(); diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/msgpack/MsgPackHandler.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/msgpack/MsgPackHandler.java index a3e8322..cb5e503 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/msgpack/MsgPackHandler.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/msgpack/MsgPackHandler.java @@ -13,7 +13,6 @@ import org.msgpack.core.buffer.ArrayBufferOutput; import java.io.IOException; import java.io.OutputStream; - public abstract class MsgPackHandler implements StructHandler { private final boolean useDictionary; diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/msgpack/MsgPackProcessor.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/msgpack/MsgPackProcessor.java index a9d67e1..be03711 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/msgpack/MsgPackProcessor.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/msgpack/MsgPackProcessor.java @@ -17,7 +17,6 @@ import java.io.IOException; import static com.rbkmoney.geck.serializer.StructHandleResult.*; import static com.rbkmoney.geck.serializer.kit.EventFlags.*; - public abstract class MsgPackProcessor implements StructProcessor { private final TCharObjectHashMap dictionary; private final char noDictEntryValue = 0; diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/object/ObjectHandler.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/object/ObjectHandler.java index b36f53e..852bdd1 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/object/ObjectHandler.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/object/ObjectHandler.java @@ -13,7 +13,6 @@ import java.util.*; import static com.rbkmoney.geck.serializer.kit.EventFlags.*; import static com.rbkmoney.geck.serializer.kit.object.ObjectHandlerConstants.*; - public class ObjectHandler implements StructHandler { private final ByteStack state = new ByteStack(nop); private final ObjectStack context = new ObjectStack(null); diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/object/ObjectHandlerConstants.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/object/ObjectHandlerConstants.java index 06b04db..2e7fdec 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/object/ObjectHandlerConstants.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/object/ObjectHandlerConstants.java @@ -2,7 +2,6 @@ package com.rbkmoney.geck.serializer.kit.object; import com.rbkmoney.geck.serializer.kit.StructType; - class ObjectHandlerConstants { public static final char ESCAPE_CHAR = '\\'; public static final char TYPE_DELIMITER = '@'; diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/object/ObjectProcessor.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/object/ObjectProcessor.java index 803bdcc..9c2a153 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/object/ObjectProcessor.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/object/ObjectProcessor.java @@ -12,7 +12,6 @@ import java.util.*; import static com.rbkmoney.geck.serializer.kit.object.ObjectHandlerConstants.TYPE_DELIMITER; - public class ObjectProcessor implements StructProcessor { @Override public R process(Object value, StructHandler handler) throws IOException { diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TBaseHandler.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TBaseHandler.java index 08f2f1c..ce152a1 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TBaseHandler.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TBaseHandler.java @@ -18,7 +18,6 @@ import java.util.*; import static com.rbkmoney.geck.serializer.kit.EventFlags.*; - public class TBaseHandler implements StructHandler { private final Class parentClass; diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TBaseProcessor.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TBaseProcessor.java index fdff75a..7fda2e3 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TBaseProcessor.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TBaseProcessor.java @@ -17,7 +17,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - public class TBaseProcessor implements StructProcessor { private final boolean checkRequiredFields; diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TDomainToStringErrorHandler.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TDomainToStringErrorHandler.java index 83560d1..2eb5564 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TDomainToStringErrorHandler.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TDomainToStringErrorHandler.java @@ -2,7 +2,6 @@ package com.rbkmoney.geck.serializer.kit.tbase; import java.io.IOException; - public class TDomainToStringErrorHandler extends TErrorHandler { private StringBuilder builder; private final String CODE_NAME = "code"; diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TErrorHandler.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TErrorHandler.java index 157333b..0cc6b5b 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TErrorHandler.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TErrorHandler.java @@ -4,7 +4,6 @@ import com.rbkmoney.geck.serializer.StructHandler; import java.io.IOException; - abstract class TErrorHandler implements StructHandler { @Override diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TErrorUtil.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TErrorUtil.java index 6883245..99f2b65 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TErrorUtil.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TErrorUtil.java @@ -5,7 +5,6 @@ import com.rbkmoney.damsel.payment_processing.errors.PaymentFailure; import java.io.IOException; - public class TErrorUtil { public static Failure toGeneral(PaymentFailure failure) { try { diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TTypedStringToDomainErrorProcessor.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TTypedStringToDomainErrorProcessor.java index ab6b15d..5e1eaf2 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TTypedStringToDomainErrorProcessor.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TTypedStringToDomainErrorProcessor.java @@ -5,7 +5,6 @@ import com.rbkmoney.geck.serializer.StructProcessor; import java.io.IOException; - public class TTypedStringToDomainErrorProcessor implements StructProcessor { @Override public R process(String value, StructHandler handler) throws IOException { diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TTypedToDomainErrorHandler.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TTypedToDomainErrorHandler.java index 3e3dae3..d8b9501 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TTypedToDomainErrorHandler.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TTypedToDomainErrorHandler.java @@ -7,7 +7,6 @@ import com.rbkmoney.geck.serializer.exception.BadFormatException; import java.io.IOException; - public class TTypedToDomainErrorHandler extends TErrorHandler { private Failure failure; private ObjectStack subFailures = new ObjectStack<>(); diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TTypedToStringErrorHandler.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TTypedToStringErrorHandler.java index 26d3bee..a4940e2 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TTypedToStringErrorHandler.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/TTypedToStringErrorHandler.java @@ -2,7 +2,6 @@ package com.rbkmoney.geck.serializer.kit.tbase; import java.io.IOException; - public class TTypedToStringErrorHandler extends TDomainToStringErrorHandler { @Override diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/ThriftType.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/ThriftType.java index ffcfba0..5537d7f 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/ThriftType.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/tbase/ThriftType.java @@ -3,7 +3,6 @@ package com.rbkmoney.geck.serializer.kit.tbase; import org.apache.thrift.meta_data.FieldValueMetaData; import org.apache.thrift.protocol.TType; - public enum ThriftType { NULL(-1), diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/xml/XMLConstants.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/xml/XMLConstants.java index df56714..1dc5cd3 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/xml/XMLConstants.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/xml/XMLConstants.java @@ -1,6 +1,5 @@ package com.rbkmoney.geck.serializer.kit.xml; - public interface XMLConstants { String KEY = "key"; String VALUE = "value"; diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/xml/XMLHandler.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/xml/XMLHandler.java index 2301103..b928c8d 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/xml/XMLHandler.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/xml/XMLHandler.java @@ -16,7 +16,6 @@ import javax.xml.transform.dom.DOMResult; import java.io.IOException; import java.util.Base64; - public class XMLHandler implements StructHandler { private ByteStack stack = new ByteStack(); diff --git a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/xml/XMLProcessor.java b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/xml/XMLProcessor.java index 55027a7..c6b65c4 100644 --- a/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/xml/XMLProcessor.java +++ b/serializer/src/main/java/com/rbkmoney/geck/serializer/kit/xml/XMLProcessor.java @@ -13,7 +13,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.Base64; - public class XMLProcessor implements StructProcessor { @Override public R process(DOMResult value, StructHandler handler) throws IOException { diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/GeckTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/GeckTest.java index d57b700..2ec31fe 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/GeckTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/GeckTest.java @@ -26,7 +26,6 @@ import java.util.zip.GZIPOutputStream; import static com.rbkmoney.geck.serializer.GeckTestUtil.getTestObject; import static org.junit.Assert.assertEquals; - public class GeckTest { Geck geck = new Geck(); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/GeckTestUtil.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/GeckTestUtil.java index d0d207b..d3d93af 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/GeckTestUtil.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/GeckTestUtil.java @@ -12,7 +12,6 @@ import java.util.function.IntFunction; import java.util.stream.Collectors; import java.util.stream.IntStream; - public class GeckTestUtil { public static TestObject getTestObject(int statusCount, IntFunction statusGen) throws IOException { TestObject testObject = getTestObject(); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/BinaryTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/BinaryTest.java index b09ab5b..4af8bd2 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/BinaryTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/BinaryTest.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.protocol.TProtocolException; @@ -17,7 +11,6 @@ import javax.annotation.Generated; import java.nio.ByteBuffer; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class BinaryTest implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BinaryTest"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Enums.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Enums.java index 7413869..6ab4bb9 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Enums.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Enums.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Fail.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Fail.java index 354d333..3f73ecb 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Fail.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Fail.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.protocol.TTupleProtocol; @@ -15,7 +9,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class Fail implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Fail"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterListObject.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterListObject.java index 3349dd1..88fbb06 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterListObject.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterListObject.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.protocol.TTupleProtocol; @@ -15,7 +9,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class FilterListObject implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FilterListObject"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterMapObject.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterMapObject.java index b8c1855..b66eee9 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterMapObject.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterMapObject.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.protocol.TProtocolException; @@ -16,7 +10,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class FilterMapObject implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FilterMapObject"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterObject.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterObject.java index ccce484..8832668 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterObject.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterObject.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.protocol.TProtocolException; @@ -16,7 +10,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class FilterObject implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FilterObject"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterUnion.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterUnion.java index 3b41a0c..7a4f5c6 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterUnion.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/FilterUnion.java @@ -1,16 +1,9 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.protocol.TProtocolException; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) public class FilterUnion extends org.apache.thrift.TUnion { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FilterUnion"); private static final org.apache.thrift.protocol.TField LIST_OBJECT_1_FIELD_DESC = new org.apache.thrift.protocol.TField("list_object_1", org.apache.thrift.protocol.TType.STRUCT, (short)1); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/HandlerTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/HandlerTest.java index c4d387d..eb4c412 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/HandlerTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/HandlerTest.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.EncodingUtils; @@ -17,7 +11,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class HandlerTest implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HandlerTest"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ids.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ids.java index b4f6ff8..9443645 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ids.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ids.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.EncodingUtils; @@ -17,7 +11,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class Ids implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Ids"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ids2.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ids2.java index 55cc6c9..51c81e3 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ids2.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ids2.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.EncodingUtils; @@ -17,7 +11,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class Ids2 implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Ids2"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ids3.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ids3.java index 5c61d74..162f0cb 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ids3.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ids3.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.EncodingUtils; @@ -17,7 +11,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class Ids3 implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Ids3"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/MapListTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/MapListTest.java index 0d3f79d..e11ac9c 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/MapListTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/MapListTest.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.protocol.TTupleProtocol; @@ -15,7 +9,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class MapListTest implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MapListTest"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/MapTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/MapTest.java index 3e95434..5ba1f47 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/MapTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/MapTest.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.protocol.TProtocolException; @@ -16,7 +10,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class MapTest implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MapTest"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ok.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ok.java index 965a1ba..274302a 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ok.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Ok.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.protocol.TTupleProtocol; @@ -15,7 +9,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class Ok implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Ok"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/SetTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/SetTest.java index 4b35f11..96f3dbe 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/SetTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/SetTest.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.protocol.TProtocolException; @@ -16,7 +10,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class SetTest implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetTest"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Status.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Status.java index 8d5588d..913e884 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Status.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Status.java @@ -1,16 +1,9 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.protocol.TProtocolException; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) public class Status extends org.apache.thrift.TUnion { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Status"); private static final org.apache.thrift.protocol.TField OK_FIELD_DESC = new org.apache.thrift.protocol.TField("ok", org.apache.thrift.protocol.TType.STRUCT, (short)1); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/TUnionTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/TUnionTest.java index 3a1c5c6..7b8944b 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/TUnionTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/TUnionTest.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.protocol.TProtocolException; @@ -16,7 +10,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class TUnionTest implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TUnionTest"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/TestObject.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/TestObject.java index df0f237..8338d2e 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/TestObject.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/TestObject.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.EncodingUtils; @@ -18,7 +12,6 @@ import javax.annotation.Generated; import java.nio.ByteBuffer; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class TestObject implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TestObject"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Unknown.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Unknown.java index d3ec478..4d7d291 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Unknown.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/domain/Unknown.java @@ -1,9 +1,3 @@ -/** - * Autogenerated by Thrift Compiler (1.0.0-dev) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ package com.rbkmoney.geck.serializer.domain; import org.apache.thrift.protocol.TProtocolException; @@ -16,7 +10,6 @@ import org.apache.thrift.scheme.TupleScheme; import javax.annotation.Generated; import java.util.*; -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) @Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2020-07-09") public class Unknown implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Unknown"); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/handler/HandlerStub.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/handler/HandlerStub.java index 1d993f0..d88cc03 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/handler/HandlerStub.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/handler/HandlerStub.java @@ -4,7 +4,6 @@ import com.rbkmoney.geck.serializer.StructHandler; import java.io.IOException; - public class HandlerStub implements StructHandler { @Override public void beginStruct(int size) throws IOException { diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/damsel/DamselTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/damsel/DamselTest.java index 37bd8c0..7276e6f 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/damsel/DamselTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/damsel/DamselTest.java @@ -34,7 +34,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; - public class DamselTest { @Test public void jsonInvoiceTest() throws IOException { diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/json/JsonTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/json/JsonTest.java index 0bebd2b..9d8404f 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/json/JsonTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/json/JsonTest.java @@ -15,7 +15,6 @@ import org.junit.Test; import java.io.IOException; - public class JsonTest { @Test diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/mock/RandomValueGeneratorTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/mock/RandomValueGeneratorTest.java index 8bfe6c3..7783f8d 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/mock/RandomValueGeneratorTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/mock/RandomValueGeneratorTest.java @@ -10,7 +10,6 @@ import java.util.Arrays; import static org.junit.Assert.*; - public class RandomValueGeneratorTest { RandomValueGenerator randomValueGenerator = new RandomValueGenerator(); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/MsgPackTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/MsgPackTest.java index 7f07213..c4973e9 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/MsgPackTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/MsgPackTest.java @@ -13,7 +13,6 @@ import org.junit.Test; import java.io.IOException; import java.util.stream.IntStream; - public class MsgPackTest { Geck geck = new Geck(); diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/StringUtilCompressingTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/StringUtilCompressingTest.java index c46ba08..ee5f0a7 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/StringUtilCompressingTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/StringUtilCompressingTest.java @@ -12,7 +12,6 @@ import java.util.Collection; import static org.junit.Assert.*; import static java.lang.System.*; - @RunWith(Parameterized.class) public class StringUtilCompressingTest { private String testString; diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/TestFilterMsgPackProcessor.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/TestFilterMsgPackProcessor.java index da94e34..a103e17 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/TestFilterMsgPackProcessor.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/TestFilterMsgPackProcessor.java @@ -3,9 +3,15 @@ package com.rbkmoney.geck.serializer.kit.msgpack; import com.rbkmoney.geck.serializer.Geck; import com.rbkmoney.geck.serializer.StructHandleResult; import com.rbkmoney.geck.serializer.StructHandler; +import com.rbkmoney.geck.serializer.domain.FilterListObject; +import com.rbkmoney.geck.serializer.domain.FilterMapObject; +import com.rbkmoney.geck.serializer.domain.FilterObject; +import com.rbkmoney.geck.serializer.domain.FilterUnion; +import com.rbkmoney.geck.serializer.domain.Status; +import com.rbkmoney.geck.serializer.domain.TestObject; +import com.rbkmoney.geck.serializer.domain.Unknown; import com.rbkmoney.geck.serializer.kit.msgpack.supply.NoFilterMsgPackProcessor; import com.rbkmoney.geck.serializer.kit.tbase.TBaseProcessor; -import com.rbkmoney.geck.serializer.domain.*; import org.apache.thrift.TBase; import org.junit.Ignore; import org.junit.Test; @@ -24,7 +30,17 @@ import static com.rbkmoney.geck.serializer.GeckTestUtil.getTestObject; import static com.rbkmoney.geck.serializer.StructHandleResult.CONTINUE; import static com.rbkmoney.geck.serializer.StructHandleResult.SKIP_SIBLINGS; import static com.rbkmoney.geck.serializer.StructHandleResult.SKIP_SUBTREE; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.anyByte; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.when; public class TestFilterMsgPackProcessor { @Test @@ -44,35 +60,39 @@ public class TestFilterMsgPackProcessor { return tbp.process(getTestObject(100, j -> Status.unknown(new Unknown("unknown"))), handler); } catch (IOException e) { return null; - }}).collect(Collectors.toList()); + } + }).collect(Collectors.toList()); long start = System.currentTimeMillis(); iterate(nfp, handler, list, 1); long time = System.currentTimeMillis() - start; - System.out.println("NoFilter Time(ms):"+time); + System.out.println("NoFilter Time(ms):" + time); start = System.currentTimeMillis(); iterate(fp, handler, list, 1); time = System.currentTimeMillis() - start; - System.out.println("Filter Time(ms):"+time); + System.out.println("Filter Time(ms):" + time); start = System.currentTimeMillis(); iterate(nfp, handler, list, 1); time = System.currentTimeMillis() - start; - System.out.println("NoFilter Time(ms):"+time); + System.out.println("NoFilter Time(ms):" + time); start = System.currentTimeMillis(); iterate(fp, handler, list, 1); time = System.currentTimeMillis() - start; - System.out.println("Filter Time(ms):"+time); + System.out.println("Filter Time(ms):" + time); } - private void iterate(MsgPackProcessor processor, MsgPackHandler handler, List elements, int iterCount) throws IOException { - for (int i = 0; i < iterCount; i++) - for (byte[] bytes : elements) + private void iterate(MsgPackProcessor processor, MsgPackHandler handler, List elements, int iterCount) + throws IOException { + for (int i = 0; i < iterCount; i++) { + for (byte[] bytes : elements) { processor.process(bytes, handler); + } + } } @Test @@ -190,13 +210,15 @@ public class TestFilterMsgPackProcessor { verifyZeroInteractions(mocked); } - private void nStrAndLastResult(InOrder inOrder, StructHandler mock, T1BiConsumer method, String val) throws Exception { + private void nStrAndLastResult(InOrder inOrder, StructHandler mock, T1BiConsumer method, String val) + throws Exception { inOrder.verify(mock); method.accept(anyByte(), eq(val)); inOrder.verify(mock).getLastHandleResult(); } - private void strAndLastResult(InOrder inOrder, StructHandler mock, T1Consumer method, String str) throws Exception { + private void strAndLastResult(InOrder inOrder, StructHandler mock, T1Consumer method, String str) + throws Exception { inOrder.verify(mock); method.accept(eq(str)); inOrder.verify(mock).getLastHandleResult(); @@ -224,19 +246,41 @@ public class TestFilterMsgPackProcessor { } private FilterObject genSample1() { - return new FilterObject("val1", FilterUnion.list_object_1(new FilterListObject(Arrays.asList("lval1", "lval2", "lval3"))), "val2"); + return new FilterObject("val1", + FilterUnion.list_object_1(new FilterListObject(Arrays.asList("lval1", "lval2", "lval3"))), "val2"); } private FilterMapObject genSample2() { - return new FilterMapObject(new LinkedHashMap(){{ - put("mkey1", new Unknown("descr1")); - put("mkey2", new Unknown("descr2")); - }}); + return new FilterMapObject(new LinkedHashMap() { + { + put("mkey1", new Unknown("descr1")); + put("mkey2", new Unknown("descr2")); + } + }); + } + + @FunctionalInterface + private interface T0Consumer { + void accept() throws Exception; + } + + @FunctionalInterface + private interface T1Consumer { + void accept(T val) throws Exception; + + } + + + @FunctionalInterface + private interface T1BiConsumer { + void accept(T val1, TT val2) throws Exception; + } static class HandleResultAnswer implements Answer { - private StructHandleResult responseStatus; + private final StructHandleResult responseStatus; public StructHandleResult newResponseStatus; + public HandleResultAnswer(StructHandleResult responseStatus) { this.responseStatus = responseStatus; this.newResponseStatus = responseStatus; @@ -250,13 +294,15 @@ public class TestFilterMsgPackProcessor { } } - static class OnValueAnswer implements Answer { - private int argIdx; - private String condition; - private StructHandleResult newResult; - private HandleResultAnswer handleResultAnswer; - public OnValueAnswer(HandleResultAnswer handleResultAnswer, String condition, StructHandleResult newResult, int argIdx) { + static class OnValueAnswer implements Answer { + private final int argIdx; + private final String condition; + private final StructHandleResult newResult; + private final HandleResultAnswer handleResultAnswer; + + public OnValueAnswer(HandleResultAnswer handleResultAnswer, String condition, StructHandleResult newResult, + int argIdx) { this.handleResultAnswer = handleResultAnswer; this.newResult = newResult; this.condition = condition; @@ -271,22 +317,4 @@ public class TestFilterMsgPackProcessor { return null; } } - - - @FunctionalInterface - private interface T0Consumer { - void accept() throws Exception; - } - - @FunctionalInterface - private interface T1Consumer { - void accept(T val) throws Exception; - - } - - @FunctionalInterface - private interface T1BiConsumer { - void accept(T val1, TT val2) throws Exception; - - } } diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/supply/NoFilterMsgPackProcessor.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/supply/NoFilterMsgPackProcessor.java index ac11eb5..7db15bc 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/supply/NoFilterMsgPackProcessor.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/msgpack/supply/NoFilterMsgPackProcessor.java @@ -18,7 +18,6 @@ import java.io.IOException; import static com.rbkmoney.geck.serializer.kit.EventFlags.*; - public abstract class NoFilterMsgPackProcessor implements StructProcessor { private final TCharObjectHashMap dictionary; private final char noDictEntryValue = 0; diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/object/ObjectHandlerTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/object/ObjectHandlerTest.java index b912862..b70ac23 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/object/ObjectHandlerTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/object/ObjectHandlerTest.java @@ -22,7 +22,6 @@ import java.util.List; import static com.rbkmoney.geck.serializer.GeckTestUtil.getTestObject; import static org.junit.Assert.assertEquals; - @Ignore public class ObjectHandlerTest { diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/tbase/TBaseProcessorTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/tbase/TBaseProcessorTest.java index eb32565..6f7b6d5 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/tbase/TBaseProcessorTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/tbase/TBaseProcessorTest.java @@ -13,7 +13,6 @@ import java.util.List; import static com.rbkmoney.geck.serializer.GeckTestUtil.getTestObject; import static org.assertj.core.api.Assertions.assertThatThrownBy; - public class TBaseProcessorTest { @Test diff --git a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/xml/XMLTest.java b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/xml/XMLTest.java index d8871bd..c944fea 100644 --- a/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/xml/XMLTest.java +++ b/serializer/src/test/java/com/rbkmoney/geck/serializer/kit/xml/XMLTest.java @@ -13,7 +13,6 @@ import org.junit.Test; import java.io.IOException; - public class XMLTest { @Test public void testInvoiceBackTransform1() throws IOException { diff --git a/src/main/resources/checkstyle/checkstyle-suppressions.xml b/src/main/resources/checkstyle/checkstyle-suppressions.xml new file mode 100644 index 0000000..36c80ed --- /dev/null +++ b/src/main/resources/checkstyle/checkstyle-suppressions.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +