Skip to content

perf: update spring pom #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HTHou merged 8 commits into from
Apr 27, 2025
Merged

perf: update spring pom #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9a7d460
perf: update spring pom
CritasWang Apr 27, 2025
669118f
fix build
CritasWang Apr 27, 2025
9663795
add jdk17 compile
CritasWang Apr 27, 2025
e102da7
Update compile-check.yml
HTHou Apr 27, 2025
3c6551c
fix jdk17 compile
CritasWang Apr 27, 2025
571bb8d
fix jdk17 compile
CritasWang Apr 27, 2025
43d1d9e
remove some infomation
CritasWang Apr 27, 2025
fc0d64e
change pom name
CritasWang Apr 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/compile-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [8, 11, 17]
java: [8, 11, 17, 21]
os: [ ubuntu-latest ]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -47,4 +47,8 @@ jobs:
- name: Compiler Test
shell: bash
run: |
mvn clean verify -P with-integration-tests -ntp
if [ "${{ matrix.java }}" -ge 17 ]; then
mvn clean verify -P with-springboot -ntp
else
mvn clean verify -ntp
fi
4 changes: 3 additions & 1 deletion examples/iotdb-spring-boot-start/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-spring-boot-start-example</artifactId>
<version>2.0.2-SNAPHOT</version>
<name>iotdb-spring-boot-start</name>
<name>IoTDB: Example: SpringBoot Starter</name>
<description>iotdb-spring-boot-start</description>
<properties>
<java.version>17</java.version>
<spring-boot.version>3.4.5</spring-boot.version>
<spring.version>6.2.6</spring.version>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion examples/iotdb-spring-boot-start/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

spring.application.name=iotdb-spring-boot-start

iotdb.session.url=172.20.31.56:6668
iotdb.session.url=127.0.0.1:6667
iotdb.session.password=root
iotdb.session.username=root
iotdb.session.database=wind
Expand Down
2 changes: 1 addition & 1 deletion ...st/java/org/apache/iotdb/iotdbspringbootstartexample/SpringBootIoTDBApplicationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class SpringBootIoTDBApplicationTests {
@Autowired
private IoTDBService iotdbService;

@Test
// @Test
void contextLoads() throws IoTDBConnectionException, StatementExecutionException {
iotdbService.querySessionPool();
iotdbService.queryTableSessionPool();
Expand Down
8 changes: 2 additions & 6 deletions examples/mybatis-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,8 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>mybatis-generator-example</artifactId>
<name>IoTDB: Example: Mybatis Generator</name>
<version>2.0.2-SNAPHOT</version>
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<plugins>
<plugin>
Expand All @@ -44,7 +40,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>mybatis-generator-plugin</artifactId>
<version>1.3.2</version>
<version>2.0.2-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>
Expand Down
54 changes: 40 additions & 14 deletions examples/mybatisplus-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,22 @@
</parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>mybatisplus-generator-example</artifactId>
<name>IoTDB: Example: Mybatis Plus Generator</name>
<version>2.0.2-SNAPHOT</version>
<properties>
<mybatisplus.version>3.5.10</mybatisplus.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.4.5</spring-boot.version>
<spring.version>6.2.6</spring.version>
</properties>
<dependencies>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.5.19</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
Expand All @@ -50,37 +58,55 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>2.0</version>
<version>2.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
<version>2.0.1-beta</version>
<version>${iotdb.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>3.4.3</version>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>3.4.3</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>3.0.0</version>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>3.0.0</version>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.8.6</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.36</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<ignoredDependencies>
<!-- For some reason this plugin missed it being used for a constant import -->
<ignoredDependency>org.apache.iotdb:isession</ignoredDependency>
</ignoredDependencies>
<usedDependencies>
<!-- These are used at runtime in tests -->
<usedDependency>com.baomidou:mybatis-plus-spring-boot3-starter</usedDependency>
<usedDependency>org.apache.velocity:velocity-engine-core</usedDependency>
<usedDependency>org.springframework.boot:spring-boot-starter</usedDependency>
<usedDependency>org.springframework.boot:spring-boot-starter-web</usedDependency>
<usedDependency>org.springdoc:springdoc-openapi-starter-webmvc-ui</usedDependency>
<usedDependency>org.projectlombok:lombok</usedDependency>
</usedDependencies>
</configuration>
</plugin>
</plugins>
</build>
</project>
109 changes: 61 additions & 48 deletions examples/mybatisplus-generator/src/main/java/org/apache/iotdb/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,62 +19,75 @@

package org.apache.iotdb;

import org.apache.iotdb.jdbc.IoTDBDataSource;

import com.baomidou.mybatisplus.generator.FastAutoGenerator;
import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
import com.baomidou.mybatisplus.generator.config.OutputFile;
import com.baomidou.mybatisplus.generator.config.rules.DateType;
import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
import org.apache.iotdb.jdbc.IoTDBDataSource;

import java.sql.Types;
import java.util.Collections;


public class Main {
public static void main(String[] args) {
IoTDBDataSource dataSource = new IoTDBDataSource();
dataSource.setUrl("jdbc:iotdb://127.0.0.1:6667/test?sql_dialect=table");
dataSource.setUser("root");
dataSource.setPassword("root");
FastAutoGenerator generator = FastAutoGenerator.create(new DataSourceConfig.Builder(dataSource).driverClassName("org.apache.iotdb.jdbc.IoTDBDriver"));
generator
.globalConfig(builder -> {
builder.author("IoTDB")
.enableSwagger()
.dateType(DateType.ONLY_DATE)
.outputDir("/apache/iotdb-extras/examples/mybatisplus-generator/src/main/java/");
})
.packageConfig(builder -> {
builder.parent("org.apache.iotdb")
.mapper("mapper")
.pathInfo(Collections.singletonMap(OutputFile.xml, "/apache/iotdb-extras/examples/mybatisplus-generator/src/main/java/"));
})
.dataSourceConfig(builder -> {
builder.typeConvertHandler((globalConfig, typeRegistry, metaInfo) -> {
int typeCode = metaInfo.getJdbcType().TYPE_CODE;
switch (typeCode) {
case Types.FLOAT:
return DbColumnType.FLOAT;
default:
return typeRegistry.getColumnType(metaInfo);
}
});
})
.strategyConfig(builder -> {
builder.addInclude("mix");
builder.entityBuilder()
.enableLombok()
.addIgnoreColumns("create_time")
.enableFileOverride();
builder.serviceBuilder()
.formatServiceFileName("%sService")
.formatServiceImplFileName("%sServiceImpl")
.convertServiceFileName((entityName -> entityName + "Service"))
.enableFileOverride();
builder.controllerBuilder()
.enableRestStyle()
.enableFileOverride();
})
.execute();
}
public static void main(String[] args) {
IoTDBDataSource dataSource = new IoTDBDataSource();
dataSource.setUrl("jdbc:iotdb://127.0.0.1:6667/test?sql_dialect=table");
dataSource.setUser("root");
dataSource.setPassword("root");
FastAutoGenerator generator =
FastAutoGenerator.create(
new DataSourceConfig.Builder(dataSource)
.driverClassName("org.apache.iotdb.jdbc.IoTDBDriver"));
generator
.globalConfig(
builder -> {
builder
.author("IoTDB")
.enableSwagger()
.dateType(DateType.ONLY_DATE)
.outputDir("/apache/iotdb-extras/examples/mybatisplus-generator/src/main/java/");
})
.packageConfig(
builder -> {
builder
.parent("org.apache.iotdb")
.mapper("mapper")
.pathInfo(
Collections.singletonMap(
OutputFile.xml,
"/apache/iotdb-extras/examples/mybatisplus-generator/src/main/java/"));
})
.dataSourceConfig(
builder -> {
builder.typeConvertHandler(
(globalConfig, typeRegistry, metaInfo) -> {
int typeCode = metaInfo.getJdbcType().TYPE_CODE;
switch (typeCode) {
case Types.FLOAT:
return DbColumnType.FLOAT;
default:
return typeRegistry.getColumnType(metaInfo);
}
});
})
.strategyConfig(
builder -> {
builder.addInclude("mix");
builder
.entityBuilder()
.enableLombok()
.addIgnoreColumns("create_time")
.enableFileOverride();
builder
.serviceBuilder()
.formatServiceFileName("%sService")
.formatServiceImplFileName("%sServiceImpl")
.convertServiceFileName((entityName -> entityName + "Service"))
.enableFileOverride();
builder.controllerBuilder().enableRestStyle().enableFileOverride();
})
.execute();
}
}
10 changes: 10 additions & 0 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,17 @@
<module>rabbitmq</module>
<module>rocketmq</module>
<module>spark-table</module>
<module>mybatis-generator</module>
</modules>
<profiles>
<profile>
<id>with-springboot</id>
<modules>
<module>iotdb-spring-boot-start</module>
<module>mybatisplus-generator</module>
</modules>
</profile>
</profiles>
<build>
<pluginManagement>
<plugins>
Expand Down
Loading