Skip to content

Commit dd0f308

Browse files
KaviarasuSakthivadivelKaviarasuSakthivadivel
committed
Merge branch 'main' into jschneidereit/row-based-pagination-2
# Conflicts: # jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudQueryStatus.java # jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/core/partial/RowBased.java # jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/util/Unstable.java # jdbc-slim/src/test/java/com/salesforce/datacloud/jdbc/util/StreamUtilitiesTest.java # pom.xml
2 parents 907fc12 + 356e38b commit dd0f308

File tree

207 files changed

+662
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+662
-311
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ buildNumber.properties
1616
.mvn/wrapper/maven-wrapper.jar
1717
.project
1818
.classpath
19-
src/main/resources/config/config.properties
19+
jdbc-driver/src/main/resources/config/config.properties
20+
.flattened-pom.xml
2021

2122
*.iml
2223
pom.xml.bak

‎jdbc-grpc/pom.xml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>com.salesforce.datacloud</groupId>
6+
<artifactId>jdbc-parent</artifactId>
7+
<version>${revision}</version>
8+
</parent>
9+
10+
<artifactId>jdbc-grpc</artifactId>
11+
12+
<properties>
13+
<maven.compiler.source>${java.version}</maven.compiler.source>
14+
<maven.compiler.target>${java.version}</maven.compiler.target>
15+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16+
</properties>
17+
18+
<dependencies>
19+
<dependency>
20+
<groupId>com.salesforce.datacloud</groupId>
21+
<artifactId>jdbc-proto</artifactId>
22+
<version>${project.version}</version>
23+
</dependency>
24+
<dependency>
25+
<groupId>io.grpc</groupId>
26+
<artifactId>grpc-netty</artifactId>
27+
</dependency>
28+
<dependency>
29+
<groupId>io.grpc</groupId>
30+
<artifactId>grpc-protobuf</artifactId>
31+
</dependency>
32+
<dependency>
33+
<groupId>io.grpc</groupId>
34+
<artifactId>grpc-stub</artifactId>
35+
</dependency>
36+
<dependency>
37+
<groupId>javax.annotation</groupId>
38+
<artifactId>javax.annotation-api</artifactId>
39+
</dependency>
40+
</dependencies>
41+
42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.xolstice.maven.plugins</groupId>
46+
<artifactId>protobuf-maven-plugin</artifactId>
47+
<version>0.6.1</version>
48+
<configuration>
49+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
50+
<pluginId>grpc-java</pluginId>
51+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
52+
<attachProtoSources>false</attachProtoSources>
53+
<protoSourceRoot>${project.parent.basedir}/jdbc-proto/src/main/proto</protoSourceRoot>
54+
</configuration>
55+
<executions>
56+
<execution>
57+
<goals>
58+
<goal>compile</goal>
59+
<goal>compile-custom</goal>
60+
</goals>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
</plugins>
65+
</build>
66+
</project>

‎jdbc-proto/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>com.salesforce.datacloud</groupId>
6+
<artifactId>jdbc-parent</artifactId>
7+
<version>${revision}</version>
8+
</parent>
9+
10+
<artifactId>jdbc-proto</artifactId>
11+
12+
</project>

src/main/proto/error_details.proto renamed to jdbc-proto/src/main/proto/error_details.proto

File renamed without changes.

src/main/proto/hyper_service.proto renamed to jdbc-proto/src/main/proto/hyper_service.proto

File renamed without changes.

‎jdbc-slim/pom.xml‎

Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>com.salesforce.datacloud</groupId>
6+
<artifactId>jdbc-parent</artifactId>
7+
<version>${revision}</version>
8+
</parent>
9+
<artifactId>jdbc-slim</artifactId>
10+
11+
<properties>
12+
<maven.compiler.source>${java.version}</maven.compiler.source>
13+
<maven.compiler.target>${java.version}</maven.compiler.target>
14+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15+
</properties>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>com.fasterxml.jackson.core</groupId>
20+
<artifactId>jackson-databind</artifactId>
21+
<version>${jackson.version}</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>com.google.guava</groupId>
25+
<artifactId>guava</artifactId>
26+
<version>${guava.version}</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>com.squareup.okhttp3</groupId>
30+
<artifactId>okhttp</artifactId>
31+
<version>${okhttp.version}</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>io.jsonwebtoken</groupId>
35+
<artifactId>jjwt-api</artifactId>
36+
<version>${jjwt.version}</version>
37+
</dependency>
38+
<dependency>
39+
<groupId>javax.annotation</groupId>
40+
<artifactId>javax.annotation-api</artifactId>
41+
<version>1.3.2</version>
42+
</dependency>
43+
<dependency>
44+
<groupId>net.jodah</groupId>
45+
<artifactId>failsafe</artifactId>
46+
<version>2.4.4</version>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.apache.arrow</groupId>
50+
<artifactId>arrow-vector</artifactId>
51+
<version>${arrow.version}</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.apache.calcite.avatica</groupId>
55+
<artifactId>avatica</artifactId>
56+
<version>${avatica.version}</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.apache.commons</groupId>
60+
<artifactId>commons-lang3</artifactId>
61+
<version>${commons-lang3.version}</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.slf4j</groupId>
65+
<artifactId>slf4j-api</artifactId>
66+
<version>${slf4j.version}</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>com.salesforce.datacloud</groupId>
70+
<artifactId>jdbc-grpc</artifactId>
71+
<version>${project.version}</version>
72+
<scope>provided</scope>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.projectlombok</groupId>
76+
<artifactId>lombok</artifactId>
77+
<version>${lombok.version}</version>
78+
<scope>provided</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>io.jsonwebtoken</groupId>
82+
<artifactId>jjwt-impl</artifactId>
83+
<version>${jjwt.version}</version>
84+
<scope>runtime</scope>
85+
</dependency>
86+
<dependency>
87+
<groupId>io.jsonwebtoken</groupId>
88+
<artifactId>jjwt-jackson</artifactId>
89+
<version>${jjwt.version}</version>
90+
<scope>runtime</scope>
91+
</dependency>
92+
<dependency>
93+
<groupId>org.apache.arrow</groupId>
94+
<artifactId>arrow-memory-netty</artifactId>
95+
<version>${arrow.version}</version>
96+
<scope>runtime</scope>
97+
</dependency>
98+
<dependency>
99+
<groupId>com.squareup.okhttp3</groupId>
100+
<artifactId>mockwebserver</artifactId>
101+
<version>${okhttp.version}</version>
102+
<scope>test</scope>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.assertj</groupId>
106+
<artifactId>assertj-core</artifactId>
107+
<version>${assertj.version}</version>
108+
<scope>test</scope>
109+
</dependency>
110+
<dependency>
111+
<groupId>org.grpcmock</groupId>
112+
<artifactId>grpcmock-junit5</artifactId>
113+
<version>${grpcmock-junit5.version}</version>
114+
<scope>test</scope>
115+
</dependency>
116+
<dependency>
117+
<groupId>org.junit.jupiter</groupId>
118+
<artifactId>junit-jupiter-api</artifactId>
119+
<version>${junit-bom.version}</version>
120+
<scope>test</scope>
121+
</dependency>
122+
<dependency>
123+
<groupId>org.junit.jupiter</groupId>
124+
<artifactId>junit-jupiter-engine</artifactId>
125+
<version>${junit-bom.version}</version>
126+
<scope>test</scope>
127+
</dependency>
128+
<dependency>
129+
<groupId>org.junit.jupiter</groupId>
130+
<artifactId>junit-jupiter-params</artifactId>
131+
<version>${junit-bom.version}</version>
132+
<scope>test</scope>
133+
</dependency>
134+
<dependency>
135+
<groupId>org.junit.platform</groupId>
136+
<artifactId>junit-platform-launcher</artifactId>
137+
<version>1.11.4</version>
138+
<scope>test</scope>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.mockito</groupId>
142+
<artifactId>mockito-inline</artifactId>
143+
<version>${mockito-bom.version}</version>
144+
<scope>test</scope>
145+
</dependency>
146+
<dependency>
147+
<groupId>org.mockito</groupId>
148+
<artifactId>mockito-junit-jupiter</artifactId>
149+
<version>${mockito-bom.version}</version>
150+
<scope>test</scope>
151+
</dependency>
152+
<dependency>
153+
<groupId>org.slf4j</groupId>
154+
<artifactId>slf4j-simple</artifactId>
155+
<version>${slf4j.version}</version>
156+
<scope>test</scope>
157+
</dependency>
158+
</dependencies>
159+
160+
<build>
161+
<resources>
162+
<resource>
163+
<filtering>true</filtering>
164+
<directory>src/main/resources</directory>
165+
</resource>
166+
<resource>
167+
<filtering>true</filtering>
168+
<directory>src/test/resources</directory>
169+
</resource>
170+
</resources>
171+
<plugins>
172+
<plugin>
173+
<groupId>org.apache.maven.plugins</groupId>
174+
<artifactId>maven-resources-plugin</artifactId>
175+
<version>3.2.0</version>
176+
<executions>
177+
<execution>
178+
<goals>
179+
<goal>resources</goal>
180+
</goals>
181+
<phase>process-resources</phase>
182+
<configuration>
183+
<outputDirectory>${project.build.directory}/classes</outputDirectory>
184+
<resources>
185+
<resource>
186+
<directory>src/main/resources</directory>
187+
<includes>
188+
<include>version.properties</include>
189+
</includes>
190+
<filtering>true</filtering>
191+
</resource>
192+
</resources>
193+
</configuration>
194+
</execution>
195+
</executions>
196+
</plugin>
197+
<plugin>
198+
<groupId>org.projectlombok</groupId>
199+
<artifactId>lombok-maven-plugin</artifactId>
200+
<version>1.18.20.0</version>
201+
<executions>
202+
<execution>
203+
<id>delombok</id>
204+
<goals>
205+
<goal>delombok</goal>
206+
</goals>
207+
<configuration>
208+
<addOutputDirectory>false</addOutputDirectory>
209+
<sourceDirectory>jdbc-driver/src/main/java</sourceDirectory>
210+
<outputDirectory>${project.build.directory}/delombok</outputDirectory>
211+
</configuration>
212+
</execution>
213+
</executions>
214+
</plugin>
215+
</plugins>
216+
</build>
217+
218+
</project>

src/main/java/com/salesforce/datacloud/jdbc/DataCloudDatasource.java renamed to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/DataCloudDatasource.java

File renamed without changes.

src/main/java/com/salesforce/datacloud/jdbc/DataCloudJDBCDriver.java renamed to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/DataCloudJDBCDriver.java

File renamed without changes.

src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationSettings.java renamed to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationSettings.java

File renamed without changes.

src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationStrategy.java renamed to jdbc-slim/src/main/java/com/salesforce/datacloud/jdbc/auth/AuthenticationStrategy.java

File renamed without changes.

0 commit comments

Comments
 (0)