You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/06/28 02:30:22 UTC
[inlong] branch master updated: [INLONG-4791][Manager] Remove DataSchema-related API and classes (#4792)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new b3b7e720d [INLONG-4791][Manager] Remove DataSchema-related API and classes (#4792)
b3b7e720d is described below
commit b3b7e720d854043b09fd0b0e12bf1aae6daad7e0
Author: healzhou <he...@gmail.com>
AuthorDate: Tue Jun 28 10:30:18 2022 +0800
[INLONG-4791][Manager] Remove DataSchema-related API and classes (#4792)
---
.../manager/common/pojo/group/DataSchemaInfo.java | 48 --------
.../manager/dao/entity/DataSchemaEntity.java | 37 ------
.../manager/dao/mapper/DataSchemaEntityMapper.java | 45 -------
.../resources/mappers/DataSchemaEntityMapper.xml | 134 ---------------------
.../manager/service/core/DataSchemaService.java | 35 ------
.../service/core/impl/DataSchemaServiceImpl.java | 48 --------
.../service/group/InlongGroupServiceImpl.java | 8 +-
.../main/resources/h2/apache_inlong_manager.sql | 15 ---
.../manager-web/sql/apache_inlong_manager.sql | 20 ---
.../web/controller/BasicInfoController.java | 50 --------
10 files changed, 3 insertions(+), 437 deletions(-)
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/DataSchemaInfo.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/DataSchemaInfo.java
deleted file mode 100644
index 4f3ad5e31..000000000
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/DataSchemaInfo.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.group;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * Data schema info
- */
-@Data
-@ApiModel("Data schema info")
-public class DataSchemaInfo {
-
- private Integer id;
-
- @ApiModelProperty(value = "schema name")
- private String name;
-
- @ApiModelProperty(value = "Agent type, support: file, db_incr, db_full")
- private String agentType;
-
- @ApiModelProperty(value = "data generate rule, support: day, hour")
- private String dataGenerateRule;
-
- @ApiModelProperty(value = "sort type, support: 0, 5, 9, 10, 13, 15")
- private Integer sortType;
-
- @ApiModelProperty(value = "time offset")
- private String timeOffset;
-
-}
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/DataSchemaEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/DataSchemaEntity.java
deleted file mode 100644
index 6c7a0afec..000000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/DataSchemaEntity.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.dao.entity;
-
-import java.io.Serializable;
-import lombok.Data;
-
-/**
- * Data schema entity, including name, agent type, etc.
- */
-@Data
-public class DataSchemaEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Integer id;
- private String name;
- private String agentType;
- private String dataGenerateRule;
- private Integer sortType;
- private String timeOffset;
-
-}
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataSchemaEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataSchemaEntityMapper.java
deleted file mode 100644
index de13e440f..000000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataSchemaEntityMapper.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.dao.mapper;
-
-import org.apache.inlong.manager.dao.entity.DataSchemaEntity;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface DataSchemaEntityMapper {
-
- int deleteByPrimaryKey(Integer id);
-
- int insert(DataSchemaEntity record);
-
- int insertSelective(DataSchemaEntity record);
-
- DataSchemaEntity selectByPrimaryKey(Integer id);
-
- int updateByPrimaryKeySelective(DataSchemaEntity record);
-
- int updateByPrimaryKey(DataSchemaEntity record);
-
- DataSchemaEntity selectByName(@Param("name") String name);
-
- List<DataSchemaEntity> selectAll();
-}
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/DataSchemaEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/DataSchemaEntityMapper.xml
deleted file mode 100644
index 096faf0ee..000000000
--- a/inlong-manager/manager-dao/src/main/resources/mappers/DataSchemaEntityMapper.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.apache.inlong.manager.dao.mapper.DataSchemaEntityMapper">
- <resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.DataSchemaEntity">
- <id column="id" jdbcType="INTEGER" property="id"/>
- <result column="name" jdbcType="VARCHAR" property="name"/>
- <result column="agent_type" jdbcType="VARCHAR" property="agentType"/>
- <result column="data_generate_rule" jdbcType="VARCHAR" property="dataGenerateRule"/>
- <result column="sort_type" jdbcType="INTEGER" property="sortType"/>
- <result column="time_offset" jdbcType="VARCHAR" property="timeOffset"/>
- </resultMap>
- <sql id="Base_Column_List">
- id, name, agent_type, data_generate_rule, sort_type, time_offset
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from data_schema
- where id = #{id,jdbcType=INTEGER}
- </select>
- <select id="selectByName" resultMap="BaseResultMap">
- select *
- from data_schema
- where name = #{name,jdbcType=VARCHAR}
- </select>
- <select id="selectAll" resultType="org.apache.inlong.manager.dao.entity.DataSchemaEntity">
- select *
- from data_schema
- </select>
-
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
- delete
- from data_schema
- where id = #{id,jdbcType=INTEGER}
- </delete>
- <insert id="insert" parameterType="org.apache.inlong.manager.dao.entity.DataSchemaEntity">
- insert into data_schema (id, name, agent_type,
- data_generate_rule, sort_type, time_offset)
- values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{agentType,jdbcType=VARCHAR},
- #{dataGenerateRule,jdbcType=VARCHAR}, #{sortType,jdbcType=INTEGER}, #{timeOffset,jdbcType=VARCHAR})
- </insert>
- <insert id="insertSelective" parameterType="org.apache.inlong.manager.dao.entity.DataSchemaEntity">
- insert into data_schema
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="name != null">
- name,
- </if>
- <if test="agentType != null">
- agent_type,
- </if>
- <if test="dataGenerateRule != null">
- data_generate_rule,
- </if>
- <if test="sortType != null">
- sort_type,
- </if>
- <if test="timeOffset != null">
- time_offset,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=INTEGER},
- </if>
- <if test="name != null">
- #{name,jdbcType=VARCHAR},
- </if>
- <if test="agentType != null">
- #{agentType,jdbcType=VARCHAR},
- </if>
- <if test="dataGenerateRule != null">
- #{dataGenerateRule,jdbcType=VARCHAR},
- </if>
- <if test="sortType != null">
- #{sortType,jdbcType=INTEGER},
- </if>
- <if test="timeOffset != null">
- #{timeOffset,jdbcType=VARCHAR},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="org.apache.inlong.manager.dao.entity.DataSchemaEntity">
- update data_schema
- <set>
- <if test="name != null">
- name = #{name,jdbcType=VARCHAR},
- </if>
- <if test="agentType != null">
- agent_type = #{agentType,jdbcType=VARCHAR},
- </if>
- <if test="dataGenerateRule != null">
- data_generate_rule = #{dataGenerateRule,jdbcType=VARCHAR},
- </if>
- <if test="sortType != null">
- sort_type = #{sortType,jdbcType=INTEGER},
- </if>
- <if test="timeOffset != null">
- time_offset = #{timeOffset,jdbcType=VARCHAR},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
- <update id="updateByPrimaryKey" parameterType="org.apache.inlong.manager.dao.entity.DataSchemaEntity">
- update data_schema
- set name = #{name,jdbcType=VARCHAR},
- agent_type = #{agentType,jdbcType=VARCHAR},
- data_generate_rule = #{dataGenerateRule,jdbcType=VARCHAR},
- sort_type = #{sortType,jdbcType=INTEGER},
- time_offset = #{timeOffset,jdbcType=VARCHAR}
- where id = #{id,jdbcType=INTEGER}
- </update>
-</mapper>
\ No newline at end of file
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataSchemaService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataSchemaService.java
deleted file mode 100644
index 7ca13eb6c..000000000
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataSchemaService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.service.core;
-
-import org.apache.inlong.manager.common.pojo.group.DataSchemaInfo;
-
-import java.util.List;
-
-/**
- * Data format service layer interface for inlong group
- */
-public interface DataSchemaService {
-
- /**
- * Query all data formats
- *
- * @return Data format list
- */
- List<DataSchemaInfo> listAllDataSchema();
-}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataSchemaServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataSchemaServiceImpl.java
deleted file mode 100644
index 6fef29fb6..000000000
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataSchemaServiceImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.service.core.impl;
-
-import org.apache.inlong.manager.common.pojo.group.DataSchemaInfo;
-import org.apache.inlong.manager.common.util.CommonBeanUtils;
-import org.apache.inlong.manager.dao.entity.DataSchemaEntity;
-import org.apache.inlong.manager.dao.mapper.DataSchemaEntityMapper;
-import org.apache.inlong.manager.service.core.DataSchemaService;
-
-import java.util.List;
-
-import lombok.extern.slf4j.Slf4j;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * Data format service layer interface implementation class for inlong group
- */
-@Service
-@Slf4j
-public class DataSchemaServiceImpl implements DataSchemaService {
-
- @Autowired
- private DataSchemaEntityMapper schemaMapper;
-
- @Override
- public List<DataSchemaInfo> listAllDataSchema() {
- List<DataSchemaEntity> entityList = schemaMapper.selectAll();
- return CommonBeanUtils.copyListProperties(entityList, DataSchemaInfo::new);
- }
-}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
index 69f48ff18..8ddb55662 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
@@ -352,15 +352,13 @@ public class InlongGroupServiceImpl implements InlongGroupService {
@Transactional(rollbackFor = Throwable.class, propagation = Propagation.REQUIRES_NEW)
public boolean updateAfterApprove(InlongGroupApproveRequest approveInfo, String operator) {
LOGGER.debug("begin to update inlong group after approve={}", approveInfo);
-
- // Save the dataSchema, Topic and other information of the inlong group
- Preconditions.checkNotNull(approveInfo, "InlongGroupApproveRequest is empty");
+ Preconditions.checkNotNull(approveInfo, "inlong approve request cannot be empty");
String groupId = approveInfo.getInlongGroupId();
Preconditions.checkNotNull(groupId, ErrorCodeEnum.GROUP_ID_IS_EMPTY.getMessage());
String mqType = approveInfo.getMqType();
- Preconditions.checkNotNull(mqType, "MQ type cannot by empty");
+ Preconditions.checkNotNull(mqType, "MQ type cannot be empty");
- // Update status to [GROUP_APPROVE_PASSED]
+ // update status to [GROUP_APPROVE_PASSED]
this.updateStatus(groupId, GroupStatus.APPROVE_PASSED.getCode(), operator);
// update other info for inlong group after approve
diff --git a/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql b/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql
index 09dca36ef..4db31bd8d 100644
--- a/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql
+++ b/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql
@@ -176,21 +176,6 @@ CREATE TABLE IF NOT EXISTS `consumption_pulsar`
PRIMARY KEY (`id`)
) COMMENT ='Pulsar consumption table';
--- ----------------------------
--- Table structure for data_schema
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `data_schema`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `name` varchar(128) NOT NULL COMMENT 'Data format name, globally unique',
- `agent_type` varchar(20) NOT NULL COMMENT 'Agent type: file, db_incr, db_full',
- `data_generate_rule` varchar(32) NOT NULL COMMENT 'Data file generation rules, including day and hour',
- `sort_type` int(11) NOT NULL COMMENT 'sort logic rules, 0, 5, 9, 10, 13, 15',
- `time_offset` varchar(10) NOT NULL COMMENT 'time offset',
- PRIMARY KEY (`id`),
- UNIQUE KEY `unique_schema_name` (`name`)
-);
-
-- ----------------------------
-- Table structure for stream_source_cmd_config
-- ----------------------------
diff --git a/inlong-manager/manager-web/sql/apache_inlong_manager.sql b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
index 8e92b7abe..0a4a2727a 100644
--- a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
+++ b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
@@ -189,26 +189,6 @@ CREATE TABLE IF NOT EXISTS `consumption_pulsar`
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='Pulsar consumption table';
--- ----------------------------
--- Table structure for data_schema
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `data_schema`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `name` varchar(128) NOT NULL COMMENT 'Data format name, globally unique',
- `agent_type` varchar(20) NOT NULL COMMENT 'Agent type: file, db_incr, db_full',
- `data_generate_rule` varchar(32) NOT NULL COMMENT 'Data file generation rules, including day and hour',
- `sort_type` int(11) NOT NULL COMMENT 'sort logic rules, 0, 5, 9, 10, 13, 15',
- `time_offset` varchar(10) NOT NULL COMMENT 'time offset',
- PRIMARY KEY (`id`),
- UNIQUE KEY `unique_schema_name` (`name`)
-) ENGINE = InnoDB
- DEFAULT CHARSET = utf8mb4 COMMENT ='Data format table';
-
--- create default data schema
-INSERT INTO `data_schema` (name, agent_type, data_generate_rule, sort_type, time_offset)
-values ('m0_day', 'file_agent', 'day', 0, '-0d');
-
-- ----------------------------
-- Table structure for stream_source_cmd_config
-- ----------------------------
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/BasicInfoController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/BasicInfoController.java
deleted file mode 100644
index c5fe85bfc..000000000
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/BasicInfoController.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.web.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.inlong.manager.common.beans.Response;
-import org.apache.inlong.manager.common.pojo.group.DataSchemaInfo;
-import org.apache.inlong.manager.service.core.DataSchemaService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * Control layer for basic information query
- * <p/>Basic information, such as data_schema, cluster info, etc.
- */
-@RestController
-@RequestMapping("/basic")
-@Api(tags = "Basic Config")
-public class BasicInfoController {
-
- @Autowired
- private DataSchemaService schemaService;
-
- @ApiOperation(value = "Query data format list")
- @GetMapping(value = "/schema/listAll")
- public Response<List<DataSchemaInfo>> dataSchemaList() {
- return Response.success(schemaService.listAllDataSchema());
- }
-
-}