Skip to content

Commit

Permalink
feat: Compile code with jdk21
Browse files Browse the repository at this point in the history
  • Loading branch information
itinycheng committed Sep 21, 2023
1 parent f3acd1d commit 8235944
Show file tree
Hide file tree
Showing 42 changed files with 79 additions and 136 deletions.
6 changes: 0 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ updates:
- dependency-name: "org.apache.flink:*"
- dependency-name: "org.apache.hadoop:*"
- dependency-name: "org.apache.hive:*"
- dependency-name: "org.springframework.boot:*"
versions:
- ">= 3.0.0"
- dependency-name: "com.diffplug.spotless:*"
versions:
- ">= 2.31.0"
- dependency-name: "com.puppycrawl.tools:checkstyle"
versions:
- ">= 8.24"
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
6 changes: 4 additions & 2 deletions flink-platform-common/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -16,6 +16,8 @@

<properties>
<scope.provided>provided</scope.provided>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import lombok.Getter;

import javax.annotation.Nonnull;

import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.Arrays;
Expand Down Expand Up @@ -51,7 +49,7 @@ public class DurationUtil {
*
* @param text string to parse.
*/
public static Duration parse(@Nonnull String text) {
public static Duration parse(String text) {
final String trimmed = text.trim();

final int len = trimmed.length();
Expand Down Expand Up @@ -96,15 +94,6 @@ public static Duration parse(@Nonnull String text) {
}
}

public static boolean ableToParse(String text) {
try {
parse(text);
return true;
} catch (Exception ignored) {
return false;
}
}

@Getter
private enum TimeUnit {
DAYS(ChronoUnit.DAYS, singular("d"), plural("day")),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.flink.platform.common.util;

import javax.annotation.Nullable;

import java.util.function.Supplier;

/** check whether throw exception. */
Expand All @@ -21,7 +19,7 @@ public static <T> T checkState(T reference) {
return reference;
}

public static void checkArgument(boolean expression, @Nullable Object errorMsg) {
public static void checkArgument(boolean expression, Object errorMsg) {
if (!expression) {
throw new IllegalArgumentException(String.valueOf(errorMsg));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.flink.platform.common.enums.ExecutionStatus;
import jakarta.annotation.Nonnull;
import lombok.Data;
import lombok.experimental.Delegate;

import javax.annotation.Nonnull;

/** call back info from the command line. */
@Data
@JsonInclude(JsonInclude.Include.NON_NULL)
Expand Down
5 changes: 5 additions & 0 deletions flink-platform-grpc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
</properties>

<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
Expand Down
9 changes: 0 additions & 9 deletions flink-platform-monitor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,11 @@
<name>flink-platform-monitor</name>
<packaging>jar</packaging>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>com.flink.platform</groupId>
<artifactId>flink-platform-alert</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>

</build>
</project>
10 changes: 10 additions & 0 deletions flink-platform-udf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
<name>flink-platform-udf</name>
<packaging>jar</packaging>

<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>

<flink.version>1.12.0</flink.version>
<flink.scope>provided</flink.scope>
</properties>

<dependencies>
<dependency>
<groupId>com.flink.platform</groupId>
Expand All @@ -28,6 +36,8 @@
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-common</artifactId>
<version>${flink.version}</version>
<scope>${flink.scope}</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

import com.flink.platform.common.enums.JobType;
import com.flink.platform.dao.entity.JobRunInfo;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;

/** Command builder. */
public interface CommandBuilder {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

import com.flink.platform.common.enums.JobType;
import com.flink.platform.dao.entity.result.JobCallback;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@
import com.flink.platform.dao.entity.JobRunInfo;
import com.flink.platform.dao.entity.task.FlinkJob;
import com.flink.platform.dao.service.CatalogInfoService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.io.FileUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;

import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@
import com.flink.platform.dao.service.JobRunInfoService;
import com.flink.platform.web.command.CommandBuilder;
import com.flink.platform.web.command.JobCommand;
import jakarta.annotation.Nonnull;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.Nonnull;

import java.util.List;

import static com.flink.platform.common.enums.JobType.CONDITION;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
import com.flink.platform.dao.entity.result.JobCallback;
import com.flink.platform.web.command.CommandExecutor;
import com.flink.platform.web.command.JobCommand;
import jakarta.annotation.Nonnull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

import javax.annotation.Nonnull;

import static com.flink.platform.common.enums.ExecutionStatus.FAILURE;
import static com.flink.platform.common.enums.ExecutionStatus.SUCCESS;
import static com.flink.platform.common.enums.JobType.CONDITION;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@
import com.flink.platform.dao.service.JobRunInfoService;
import com.flink.platform.web.command.CommandBuilder;
import com.flink.platform.web.command.JobCommand;
import jakarta.annotation.Nonnull;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.Nonnull;

import static com.flink.platform.common.enums.JobType.DEPENDENT;
import static java.util.Objects.nonNull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
import com.flink.platform.dao.entity.result.JobCallback;
import com.flink.platform.web.command.CommandExecutor;
import com.flink.platform.web.command.JobCommand;
import jakarta.annotation.Nonnull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

import javax.annotation.Nonnull;

import static com.flink.platform.common.enums.ExecutionStatus.FAILURE;
import static com.flink.platform.common.enums.ExecutionStatus.SUCCESS;
import static com.flink.platform.common.enums.JobType.DEPENDENT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@
import com.flink.platform.web.config.FlinkConfig;
import com.flink.platform.web.external.YarnClientService;
import com.flink.platform.web.service.HdfsService;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.ListUtils;
import org.apache.hadoop.fs.Path;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;

import javax.annotation.Nonnull;
import javax.annotation.Resource;

import java.net.URL;
import java.nio.file.Paths;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.flink.platform.web.config.WorkerConfig;
import com.flink.platform.web.external.YarnClientService;
import com.flink.platform.web.util.YarnHelper;
import jakarta.annotation.Nonnull;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.yarn.api.records.ApplicationReport;
Expand All @@ -20,8 +21,6 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;

import javax.annotation.Nonnull;

import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
import com.flink.platform.dao.entity.task.ShellJob;
import com.flink.platform.web.command.CommandBuilder;
import com.flink.platform.web.command.JobCommand;
import jakarta.annotation.Nonnull;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.math.NumberUtils;
import org.springframework.stereotype.Component;

import javax.annotation.Nonnull;

import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
import com.flink.platform.web.command.CommandExecutor;
import com.flink.platform.web.command.JobCommand;
import com.flink.platform.web.config.WorkerConfig;
import jakarta.annotation.Nonnull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.Nonnull;

/** shell command executor. */
@Slf4j
@Component("shellCommandExecutor")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
import com.flink.platform.web.command.AbstractTask;
import com.flink.platform.web.util.CollectLogThread;
import com.flink.platform.web.util.CommandUtil;
import jakarta.annotation.Nullable;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;

import javax.annotation.Nullable;

import java.io.InputStream;
import java.util.function.BiConsumer;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

import com.flink.platform.common.util.JsonUtil;
import com.flink.platform.web.command.JobCommand;
import jakarta.annotation.Nonnull;
import lombok.Getter;

import javax.annotation.Nonnull;

import java.util.List;

/** SQL command. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
import com.flink.platform.dao.entity.task.SqlJob;
import com.flink.platform.web.command.CommandBuilder;
import com.flink.platform.web.command.JobCommand;
import jakarta.annotation.Nonnull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

import javax.annotation.Nonnull;

import java.util.ArrayList;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
import com.flink.platform.web.command.AbstractTask;
import com.flink.platform.web.command.CommandExecutor;
import com.flink.platform.web.command.JobCommand;
import jakarta.annotation.Nonnull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.Nonnull;

import static com.flink.platform.common.enums.JobType.CLICKHOUSE_SQL;
import static com.flink.platform.common.enums.JobType.HIVE_SQL;
import static com.flink.platform.common.enums.JobType.MYSQL_SQL;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
import com.flink.platform.dao.entity.Datasource;
import com.flink.platform.dao.entity.result.JobCallback;
import com.flink.platform.web.command.AbstractTask;
import jakarta.annotation.Nonnull;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;

import javax.annotation.Nonnull;

import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package com.flink.platform.web.config;

import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.validation.annotation.Validated;

import javax.validation.constraints.Max;
import javax.validation.constraints.Min;

/** Worker config. */
@Setter
@Getter
Expand Down
Loading

0 comments on commit 8235944

Please sign in to comment.