diff --git a/.github/workflows/docker_build.yaml b/.github/workflows/docker_build.yaml index aeb0013f1f..01c656e02e 100644 --- a/.github/workflows/docker_build.yaml +++ b/.github/workflows/docker_build.yaml @@ -46,9 +46,9 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml') }} restore-keys: | ${{ runner.os }}-maven- -# - name: Check Style -# run: | -# ./mvnw -T 4C -B --no-snapshot-updates clean spotless:check + # - name: Check Style + # run: | + # ./mvnw -T 4C -B --no-snapshot-updates clean spotless:check - name: Build and Package run: | ./mvnw -B clean install \ @@ -114,7 +114,7 @@ jobs: - uses: actions/checkout@v3 - name: Move Dockerfile run: | - cp ./docker/Dockerfile* ./ + cp -r ./docker/Dockerfile* ./ - name: Download math result for job 1 uses: actions/download-artifact@v3 with: @@ -173,7 +173,7 @@ jobs: - uses: actions/checkout@v3 - name: Move Dockerfile run: | - cp ./docker/Dockerfile* ./ + cp -r ./docker/Dockerfile* ./ - uses: actions/checkout@v3 - name: set the flink_big_version run: | @@ -204,7 +204,7 @@ jobs: FLINK_VERSION=${{ matrix.FLINK_VERSION }} DINKY_IMAGE=${{ matrix.url }}/${{ matrix.namespace }}/dinky-standalone-server:${{ inputs.version }} FLINK_BIG_VERSION=${{ matrix.FLINK_BIG_VERSION }} - file: ./docker/DockerfileDinkyFlink + file: DockerfileDinkyFlink context: . push: true tags: ${{ matrix.url }}/${{ matrix.namespace }}/dinky-standalone-server:${{ inputs.version }}-flink-${{matrix.FLINK_BIG_VERSION }} diff --git a/dinky-cdc/dinky-cdc-core/src/main/java/org/dinky/cdc/SinkBuilderFactory.java b/dinky-cdc/dinky-cdc-core/src/main/java/org/dinky/cdc/SinkBuilderFactory.java index 46717510fa..62315dea71 100644 --- a/dinky-cdc/dinky-cdc-core/src/main/java/org/dinky/cdc/SinkBuilderFactory.java +++ b/dinky-cdc/dinky-cdc-core/src/main/java/org/dinky/cdc/SinkBuilderFactory.java @@ -69,24 +69,12 @@ private static Map> getPlusSinkBuilder() { sinkBuilders.add(factory); } - Map> plusSinkBuilder = sinkBuilders.stream() - .collect(Collectors.toMap(SinkBuilderFactory::getKeyWord, SinkBuilderFactory::getSupplier)); + Map> plusSinkBuilder = + sinkBuilders.stream().collect(Collectors.toMap(SinkBuilderFactory::getKeyWord, x -> () -> x)); map.putAll(plusSinkBuilder); return map; } - @SuppressWarnings("unchecked") - private static Supplier getSupplier(SinkBuilder clazz) { - return () -> { - try { - return SinkBuilder.class.newInstance(); - } catch (InstantiationException | IllegalAccessException e) { - logger.warn("Could not get constructor supplier : {}", e.getMessage()); - } - return null; - }; - } - public static String getKeyWord(SinkBuilder c) { String fieldName = "KEY_WORD"; String result = null; diff --git a/dinky-core/src/main/java/org/dinky/executor/Executor.java b/dinky-core/src/main/java/org/dinky/executor/Executor.java index 63b0bbfa88..c75dbde5d1 100644 --- a/dinky-core/src/main/java/org/dinky/executor/Executor.java +++ b/dinky-core/src/main/java/org/dinky/executor/Executor.java @@ -209,7 +209,7 @@ private void addJar(String... jarPath) { Configuration configuration = tableEnvironment.getRootConfiguration(); List jars = configuration.get(PipelineOptions.JARS); if (jars == null) { - configuration.set(PipelineOptions.JARS, CollUtil.newArrayList(jarPath)); + tableEnvironment.addConfiguration(PipelineOptions.JARS, CollUtil.newArrayList(jarPath)); } else { CollUtil.addAll(jars, jarPath); }