Skip to content

Commit

Permalink
Merge pull request #7 from rtdi/master
Browse files Browse the repository at this point in the history
update pom
  • Loading branch information
wernerdaehn authored Jan 2, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 3d0e369 + d1ded13 commit 88b7e1d
Showing 5 changed files with 23 additions and 25 deletions.
2 changes: 1 addition & 1 deletion WebContent/WEB-INF/web.xml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
<servlet-name>jersey-servlet</servlet-name>
<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
<param-name>jakarta.ws.rs.Application</param-name>
<param-value>io.rtdi.bigdata.hanaconnector.JerseyApplicationSettings</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.rtdi.bigdata.connector</groupId>
<artifactId>hanaconnector</artifactId>
<version>0.9.4</version>
<version>0.9.5</version>
<packaging>war</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<io.rtdi.bigdata.connector.version>0.9.40</io.rtdi.bigdata.connector.version>
<io.rtdi.bigdata.connector.version>0.10.1</io.rtdi.bigdata.connector.version>
</properties>
<build>
<finalName>${project.artifactId}</finalName>
@@ -51,7 +51,7 @@
<dependency>
<groupId>com.sap.cloud.db.jdbc</groupId>
<artifactId>ngdbc</artifactId>
<version>2.5.50</version>
<version>2.7.7</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -60,10 +60,10 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>provided</scope>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
8 changes: 3 additions & 5 deletions src/main/java/io/rtdi/bigdata/hanaconnector/HanaProducer.java
Original file line number Diff line number Diff line change
@@ -483,7 +483,6 @@ public long executeInitialLoad(String schemaname, String transactionid) throws I
try (PreparedStatement stmt = conn.prepareStatement(sql); ) {
schema = obj.getAvroSchema();
beginInitialLoadTransaction(transactionid, schemaname, instance.getInstanceNumber());
long rowcount = 0L;
try (ResultSet rs = stmt.executeQuery();) {
while (rs.next()) {
JexlRecord r = convert(rs, schema);
@@ -494,12 +493,11 @@ public long executeInitialLoad(String schemaname, String transactionid) throws I
RowType.INSERT,
null,
getProducerProperties().getName());
rowcount++;
}
}
commitInitialLoadTransaction(rowcount);
logger.debug("Initial load for mapping \"{}\" is completed, loaded {} rows", schemaname, rowcount);
return rowcount;
commitInitialLoadTransaction();
logger.debug("Initial load for mapping \"{}\" is completed, loaded {} rows", schemaname, getCurrentTransactionRowCount());
return getCurrentTransactionRowCount();
} catch (SQLException e) {
abortTransaction();
throw new ConnectorRuntimeException("Executing the initial load SQL failed with SQL error", e,
Original file line number Diff line number Diff line change
@@ -2,17 +2,17 @@

import java.util.List;

import javax.annotation.security.RolesAllowed;
import javax.servlet.ServletContext;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Configuration;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.annotation.security.RolesAllowed;
import jakarta.servlet.ServletContext;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.Configuration;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;

import io.rtdi.bigdata.connector.connectorframework.WebAppController;
import io.rtdi.bigdata.connector.connectorframework.controller.ConnectionController;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.rtdi.bigdata.hanaconnector.servlet;

import javax.servlet.annotation.WebServlet;
import jakarta.servlet.annotation.WebServlet;

import io.rtdi.bigdata.connector.connectorframework.servlet.UI5ServletAbstract;

0 comments on commit 88b7e1d

Please sign in to comment.