diff --git a/pom.xml b/pom.xml index 11667bf..f789285 100644 --- a/pom.xml +++ b/pom.xml @@ -45,8 +45,13 @@ log4j-over-slf4j org.slf4j + + log4j + log4j + + org.slf4j slf4j-api @@ -57,11 +62,7 @@ slf4j-log4j12 1.7.25 - - log4j - log4j - 1.2.17 - + org.apache.flink flink-core @@ -92,23 +93,32 @@ ${flink.version} provided - - org.apache.flink - flink-metrics-dropwizard - ${flink.version} - org.apache.flink flink-runtime_2.12 ${flink.version} provided + org.apache.flink flink-test-utils_2.12 ${flink.version} test + + junit + junit + 4.13.1 + test + + + org.mockito + mockito-core + 2.21.0 + test + + org.msgpack msgpack-core @@ -119,33 +129,25 @@ jackson-dataformat-msgpack 0.9.5 + cn.hutool hutool-all - 5.8.22 + 5.8.25 + com.alibaba fastjson 2.0.32 + org.jasypt jasypt 1.9.3 - - junit - junit - 4.12 - test - - - org.mockito - mockito-core - 2.21.0 - test - + org.apache.httpcomponents httpclient @@ -161,6 +163,7 @@ httpasyncclient 4.1.5 + org.apache.hbase hbase-client @@ -178,6 +181,10 @@ org.slf4j log4j-over-slf4j + + log4j + log4j + org.apache.hadoop hadoop-annotations @@ -193,12 +200,24 @@ hadoop-common 2.8.5 provided + + + jdk.tools + jdk.tools + + + log4j + log4j + + + org.apache.commons commons-jexl3 3.2.1 + com.github.ben-manes.caffeine caffeine @@ -260,6 +279,7 @@ 11 11 + UTF-8 true @@ -267,6 +287,7 @@ org.apache.maven.plugins maven-shade-plugin + 3.2.4 false true diff --git a/src/test/java/com/zdjizhi/FileChunkCombinerTests.java b/src/test/java/com/zdjizhi/FileChunkCombinerTests.java index d3d30c4..959db5c 100644 --- a/src/test/java/com/zdjizhi/FileChunkCombinerTests.java +++ b/src/test/java/com/zdjizhi/FileChunkCombinerTests.java @@ -630,20 +630,6 @@ public class FileChunkCombinerTests { } } - private static class ProcessWindowFunctionMock extends ProcessWindowFunction implements OutputTypeConfigurable { - private static final long serialVersionUID = 1L; - - private ProcessWindowFunctionMock() { - } - - @Override - public void process(String s, Context context, Iterable elements, Collector out) throws Exception { - } - - public void setOutputType(TypeInformation outTypeInfo, ExecutionConfig executionConfig) { - } - } - private StreamExecutionEnvironment createPipeline(int parallelism, SourceFunction source, long windowTime, long windowIdleTime) { StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); env.setParallelism(parallelism); @@ -656,7 +642,7 @@ public class FileChunkCombinerTests { Trigger trigger = MultipleTrigger.of(triggers); env.addSource(source) .map(new ParseMessagePackMapFunction()) - .filter(new FileChunkFilterFunction("","test")) + .filter(new FileChunkFilterFunction("", "test")) .assignTimestampsAndWatermarks(watermarkStrategy) .keyBy(new FileChunkKeySelector(), BasicTypeInfo.STRING_TYPE_INFO) .window(TumblingEventTimeWindows.of(Time.seconds(windowTime))) @@ -715,6 +701,20 @@ public class FileChunkCombinerTests { // windowFunction.close(); // Mockito.verify(mock).close(); // } +// +// private static class ProcessWindowFunctionMock extends ProcessWindowFunction implements OutputTypeConfigurable { +// private static final long serialVersionUID = 1L; +// +// private ProcessWindowFunctionMock() { +// } +// +// @Override +// public void process(String s, Context context, Iterable elements, Collector out) throws Exception { +// } +// +// public void setOutputType(TypeInformation outTypeInfo, ExecutionConfig executionConfig) { +// } +// } // @Test // public void testCombineChunkProcessWindowFunction() throws Exception {