Skip to content

fix: add strings by ref also for constructors and params #181

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
merged 1 commit into from
Feb 18, 2022
Merged

fix: add strings by ref also for constructors and params #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/InfluxDbClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,22 @@ InfluxDBClient::InfluxDBClient() {
resetBuffer();
}

InfluxDBClient::InfluxDBClient(const char *serverUrl, const char *db):InfluxDBClient() {
InfluxDBClient::InfluxDBClient(const String &serverUrl, const String &db):InfluxDBClient() {
setConnectionParamsV1(serverUrl, db);
}

InfluxDBClient::InfluxDBClient(const char *serverUrl, const char *org, const char *bucket, const char *authToken):InfluxDBClient(serverUrl, org, bucket, authToken, nullptr) {
InfluxDBClient::InfluxDBClient(const String &serverUrl, const String &org, const String &bucket, const String &authToken):InfluxDBClient(serverUrl, org, bucket, authToken, nullptr) {
}

InfluxDBClient::InfluxDBClient(const char *serverUrl, const char *org, const char *bucket, const char *authToken, const char *serverCert):InfluxDBClient() {
InfluxDBClient::InfluxDBClient(const String &serverUrl, const String &org, const String &bucket, const String &authToken, const char *serverCert):InfluxDBClient() {
setConnectionParams(serverUrl, org, bucket, authToken, serverCert);
}

void InfluxDBClient::setInsecure(bool value){
_connInfo.insecure = value;
}

void InfluxDBClient::setConnectionParams(const char *serverUrl, const char *org, const char *bucket, const char *authToken, const char *certInfo) {
void InfluxDBClient::setConnectionParams(const String &serverUrl, const String &org, const String &bucket, const String &authToken, const char *certInfo) {
clean();
_connInfo.serverUrl = serverUrl;
_connInfo.bucket = bucket;
Expand All @@ -80,7 +80,7 @@ void InfluxDBClient::setConnectionParams(const char *serverUrl, const char *org,
_connInfo.dbVersion = 2;
}

void InfluxDBClient::setConnectionParamsV1(const char *serverUrl, const char *db, const char *user, const char *password, const char *certInfo) {
void InfluxDBClient::setConnectionParamsV1(const String &serverUrl, const String &db, const String &user, const String &password, const char *certInfo) {
clean();
_connInfo.serverUrl = serverUrl;
_connInfo.bucket = db;
Expand Down
11 changes: 6 additions & 5 deletions src/InfluxDbClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,20 @@ class InfluxDBClient {
// Creates InfluxDBClient instance for unsecured connection to InfluxDB 1
// serverUrl - url of the InfluxDB 1 server (e.g. http://localhost:8086)
// db - database name where to store or read data
InfluxDBClient(const char *serverUrl, const char *db);
InfluxDBClient(const String &serverUrl, const String &db);
// Creates InfluxDBClient instance for unsecured connection
// serverUrl - url of the InfluxDB 2 server (e.g. http://localhost:8086)
// org - name of the organization, which bucket belongs to
// bucket - name of the bucket to write data into
// authToken - InfluxDB 2 authorization token
InfluxDBClient(const char *serverUrl, const char *org, const char *bucket, const char *authToken);
InfluxDBClient(const String &serverUrl, const String &org, const String &bucket, const String &authToken);
// Creates InfluxDBClient instance for secured connection
// serverUrl - url of the InfluxDB 2 server (e.g. https://localhost:8086)
// org - name of the organization, which bucket belongs to
// bucket - name of the bucket to write data into
// authToken - InfluxDB 2 authorization token
// certInfo - InfluxDB 2 server trusted certificate (or CA certificate) or certificate SHA1 fingerprint. Should be stored in PROGMEM.
InfluxDBClient(const char *serverUrl, const char *org, const char *bucket, const char *authToken, const char *certInfo);
InfluxDBClient(const String &serverUrl, const String &org, const String &bucket, const String &authToken, const char *certInfo);
// Clears instance.
~InfluxDBClient();
// Allows insecure connection by skiping server certificate validation.
Expand Down Expand Up @@ -106,15 +106,15 @@ class InfluxDBClient {
// bucket - name of the bucket to write data into
// authToken - InfluxDB 2 authorization token
// serverCert - Optional. InfluxDB 2 server trusted certificate (or CA certificate) or certificate SHA1 fingerprint. Should be stored in PROGMEM. Only in case of https connection.
void setConnectionParams(const char *serverUrl, const char *org, const char *bucket, const char *authToken, const char *certInfo = nullptr);
void setConnectionParams(const String &serverUrl, const String &org, const String &bucket, const String &authToken, const char *certInfo = nullptr);
// Sets parameters for connection to InfluxDB 1
// Must be called before calling any method initiating a connection to server.
// serverUrl - url of the InfluxDB server (e.g. http://localhost:8086)
// db - database name where to store or read data
// user - Optional. User name, in case of server requires authetication
// password - Optional. User password, in case of server requires authetication
// certInfo - Optional. InfluxDB server trusted certificate (or CA certificate) or certificate SHA1 fingerprint. Should be stored in PROGMEM. Only in case of https connection.
void setConnectionParamsV1(const char *serverUrl, const char *db, const char *user = nullptr, const char *password = nullptr, const char *certInfo = nullptr);
void setConnectionParamsV1(const String &serverUrl, const String &db, const String &user = (const char *)nullptr, const String &password = (const char *)nullptr, const char *certInfo = nullptr);
// Creates line protocol string from point data and optional default tags set in WriteOptions.
String pointToLineProtocol(const Point& point);
// Validates connection parameters by conecting to server
Expand Down Expand Up @@ -164,6 +164,7 @@ class InfluxDBClient {
// Enables/disables streaming write. This allows sending large batches without allocating buffer.
// It is about 50% slower than writing by allocated buffer (default);
void setStreamWrite(bool enable = true);
//
protected:
// Checks params and sets up security, if needed.
// Returns true in case of success, otherwise false
Expand Down