From 57d837b95cacd197ddf418eb161785c60e0b6428 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Wed, 18 Sep 2024 16:47:24 +0000
Subject: [PATCH] Pre-merge code cleanup
---
.../service/DltConnectorServiceServicerImpl.py | 8 ++++----
src/dlt/connector/service/__main__.py | 2 +-
src/dlt/gateway/{legacy => _legacy}/.gitignore | 0
src/dlt/gateway/{legacy => _legacy}/Dockerfile | 0
src/dlt/gateway/{legacy => _legacy}/README.md | 0
.../gateway/{legacy => _legacy}/build.gradle.kts | 0
.../config/ca.org1.example.com-cert.pem | 0
.../{legacy => _legacy}/config/connection-org1.json | 0
.../gateway/{legacy => _legacy}/gradle.properties | 0
.../gradle/wrapper/gradle-wrapper.jar | Bin
.../gradle/wrapper/gradle-wrapper.properties | 0
src/dlt/gateway/{legacy => _legacy}/gradlew | 0
src/dlt/gateway/{legacy => _legacy}/gradlew.bat | 0
.../gateway/{legacy => _legacy}/settings.gradle.kts | 0
.../{legacy => _legacy}/src/main/kotlin/Main.kt | 0
.../src/main/kotlin/fabric/ConnectGateway.kt | 0
.../src/main/kotlin/fabric/EnrollAdmin.kt | 0
.../src/main/kotlin/fabric/FabricConnector.kt | 0
.../src/main/kotlin/fabric/RegisterUser.kt | 0
.../src/main/kotlin/grpc/FabricServer.kt | 0
.../src/main/kotlin/grpc/GrpcHandler.kt | 0
.../src/main/kotlin/proto/Config.proto | 0
src/dlt/gateway/dltApp/.gitignore | 2 --
23 files changed, 5 insertions(+), 7 deletions(-)
rename src/dlt/gateway/{legacy => _legacy}/.gitignore (100%)
rename src/dlt/gateway/{legacy => _legacy}/Dockerfile (100%)
rename src/dlt/gateway/{legacy => _legacy}/README.md (100%)
rename src/dlt/gateway/{legacy => _legacy}/build.gradle.kts (100%)
rename src/dlt/gateway/{legacy => _legacy}/config/ca.org1.example.com-cert.pem (100%)
rename src/dlt/gateway/{legacy => _legacy}/config/connection-org1.json (100%)
rename src/dlt/gateway/{legacy => _legacy}/gradle.properties (100%)
rename src/dlt/gateway/{legacy => _legacy}/gradle/wrapper/gradle-wrapper.jar (100%)
rename src/dlt/gateway/{legacy => _legacy}/gradle/wrapper/gradle-wrapper.properties (100%)
rename src/dlt/gateway/{legacy => _legacy}/gradlew (100%)
rename src/dlt/gateway/{legacy => _legacy}/gradlew.bat (100%)
rename src/dlt/gateway/{legacy => _legacy}/settings.gradle.kts (100%)
rename src/dlt/gateway/{legacy => _legacy}/src/main/kotlin/Main.kt (100%)
rename src/dlt/gateway/{legacy => _legacy}/src/main/kotlin/fabric/ConnectGateway.kt (100%)
rename src/dlt/gateway/{legacy => _legacy}/src/main/kotlin/fabric/EnrollAdmin.kt (100%)
rename src/dlt/gateway/{legacy => _legacy}/src/main/kotlin/fabric/FabricConnector.kt (100%)
rename src/dlt/gateway/{legacy => _legacy}/src/main/kotlin/fabric/RegisterUser.kt (100%)
rename src/dlt/gateway/{legacy => _legacy}/src/main/kotlin/grpc/FabricServer.kt (100%)
rename src/dlt/gateway/{legacy => _legacy}/src/main/kotlin/grpc/GrpcHandler.kt (100%)
rename src/dlt/gateway/{legacy => _legacy}/src/main/kotlin/proto/Config.proto (100%)
delete mode 100644 src/dlt/gateway/dltApp/.gitignore
diff --git a/src/dlt/connector/service/DltConnectorServiceServicerImpl.py b/src/dlt/connector/service/DltConnectorServiceServicerImpl.py
index 1885cc153..c1a4b7b1e 100644
--- a/src/dlt/connector/service/DltConnectorServiceServicerImpl.py
+++ b/src/dlt/connector/service/DltConnectorServiceServicerImpl.py
@@ -118,9 +118,9 @@ class DltConnectorServiceServicerImpl(DltConnectorServiceServicer):
data_json : Optional[str] = None
) -> None:
dlt_record_id = DltRecordId()
- dlt_record_id.domain_uuid.uuid = dlt_domain_uuid # pylint: disable=no-member
- dlt_record_id.type = dlt_record_type
- dlt_record_id.record_uuid.uuid = dlt_record_uuid # pylint: disable=no-member
+ dlt_record_id.domain_uuid.uuid = dlt_domain_uuid # pylint: disable=no-member
+ dlt_record_id.type = dlt_record_type
+ dlt_record_id.record_uuid.uuid = dlt_record_uuid # pylint: disable=no-member
str_dlt_record_id = grpc_message_to_json_string(dlt_record_id)
LOGGER.debug('[_record_entity] sent dlt_record_id = {:s}'.format(str_dlt_record_id))
@@ -132,7 +132,7 @@ class DltConnectorServiceServicerImpl(DltConnectorServiceServicer):
LOGGER.debug('[_record_entity] exists = {:s}'.format(str(exists)))
dlt_record = DltRecord()
- dlt_record.record_id.CopyFrom(dlt_record_id) # pylint: disable=no-member
+ dlt_record.record_id.CopyFrom(dlt_record_id) # pylint: disable=no-member
if delete and exists:
dlt_record.operation = DltRecordOperationEnum.DLTRECORDOPERATION_DELETE
elif not delete and exists:
diff --git a/src/dlt/connector/service/__main__.py b/src/dlt/connector/service/__main__.py
index 632b2f781..d1c946124 100644
--- a/src/dlt/connector/service/__main__.py
+++ b/src/dlt/connector/service/__main__.py
@@ -42,7 +42,7 @@ async def main():
get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_PORT_GRPC),
])
- signal.signal(signal.SIGINT, signal_handler)
+ signal.signal(signal.SIGINT, signal_handler)
signal.signal(signal.SIGTERM, signal_handler)
LOGGER.info('Starting...')
diff --git a/src/dlt/gateway/legacy/.gitignore b/src/dlt/gateway/_legacy/.gitignore
similarity index 100%
rename from src/dlt/gateway/legacy/.gitignore
rename to src/dlt/gateway/_legacy/.gitignore
diff --git a/src/dlt/gateway/legacy/Dockerfile b/src/dlt/gateway/_legacy/Dockerfile
similarity index 100%
rename from src/dlt/gateway/legacy/Dockerfile
rename to src/dlt/gateway/_legacy/Dockerfile
diff --git a/src/dlt/gateway/legacy/README.md b/src/dlt/gateway/_legacy/README.md
similarity index 100%
rename from src/dlt/gateway/legacy/README.md
rename to src/dlt/gateway/_legacy/README.md
diff --git a/src/dlt/gateway/legacy/build.gradle.kts b/src/dlt/gateway/_legacy/build.gradle.kts
similarity index 100%
rename from src/dlt/gateway/legacy/build.gradle.kts
rename to src/dlt/gateway/_legacy/build.gradle.kts
diff --git a/src/dlt/gateway/legacy/config/ca.org1.example.com-cert.pem b/src/dlt/gateway/_legacy/config/ca.org1.example.com-cert.pem
similarity index 100%
rename from src/dlt/gateway/legacy/config/ca.org1.example.com-cert.pem
rename to src/dlt/gateway/_legacy/config/ca.org1.example.com-cert.pem
diff --git a/src/dlt/gateway/legacy/config/connection-org1.json b/src/dlt/gateway/_legacy/config/connection-org1.json
similarity index 100%
rename from src/dlt/gateway/legacy/config/connection-org1.json
rename to src/dlt/gateway/_legacy/config/connection-org1.json
diff --git a/src/dlt/gateway/legacy/gradle.properties b/src/dlt/gateway/_legacy/gradle.properties
similarity index 100%
rename from src/dlt/gateway/legacy/gradle.properties
rename to src/dlt/gateway/_legacy/gradle.properties
diff --git a/src/dlt/gateway/legacy/gradle/wrapper/gradle-wrapper.jar b/src/dlt/gateway/_legacy/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from src/dlt/gateway/legacy/gradle/wrapper/gradle-wrapper.jar
rename to src/dlt/gateway/_legacy/gradle/wrapper/gradle-wrapper.jar
diff --git a/src/dlt/gateway/legacy/gradle/wrapper/gradle-wrapper.properties b/src/dlt/gateway/_legacy/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from src/dlt/gateway/legacy/gradle/wrapper/gradle-wrapper.properties
rename to src/dlt/gateway/_legacy/gradle/wrapper/gradle-wrapper.properties
diff --git a/src/dlt/gateway/legacy/gradlew b/src/dlt/gateway/_legacy/gradlew
similarity index 100%
rename from src/dlt/gateway/legacy/gradlew
rename to src/dlt/gateway/_legacy/gradlew
diff --git a/src/dlt/gateway/legacy/gradlew.bat b/src/dlt/gateway/_legacy/gradlew.bat
similarity index 100%
rename from src/dlt/gateway/legacy/gradlew.bat
rename to src/dlt/gateway/_legacy/gradlew.bat
diff --git a/src/dlt/gateway/legacy/settings.gradle.kts b/src/dlt/gateway/_legacy/settings.gradle.kts
similarity index 100%
rename from src/dlt/gateway/legacy/settings.gradle.kts
rename to src/dlt/gateway/_legacy/settings.gradle.kts
diff --git a/src/dlt/gateway/legacy/src/main/kotlin/Main.kt b/src/dlt/gateway/_legacy/src/main/kotlin/Main.kt
similarity index 100%
rename from src/dlt/gateway/legacy/src/main/kotlin/Main.kt
rename to src/dlt/gateway/_legacy/src/main/kotlin/Main.kt
diff --git a/src/dlt/gateway/legacy/src/main/kotlin/fabric/ConnectGateway.kt b/src/dlt/gateway/_legacy/src/main/kotlin/fabric/ConnectGateway.kt
similarity index 100%
rename from src/dlt/gateway/legacy/src/main/kotlin/fabric/ConnectGateway.kt
rename to src/dlt/gateway/_legacy/src/main/kotlin/fabric/ConnectGateway.kt
diff --git a/src/dlt/gateway/legacy/src/main/kotlin/fabric/EnrollAdmin.kt b/src/dlt/gateway/_legacy/src/main/kotlin/fabric/EnrollAdmin.kt
similarity index 100%
rename from src/dlt/gateway/legacy/src/main/kotlin/fabric/EnrollAdmin.kt
rename to src/dlt/gateway/_legacy/src/main/kotlin/fabric/EnrollAdmin.kt
diff --git a/src/dlt/gateway/legacy/src/main/kotlin/fabric/FabricConnector.kt b/src/dlt/gateway/_legacy/src/main/kotlin/fabric/FabricConnector.kt
similarity index 100%
rename from src/dlt/gateway/legacy/src/main/kotlin/fabric/FabricConnector.kt
rename to src/dlt/gateway/_legacy/src/main/kotlin/fabric/FabricConnector.kt
diff --git a/src/dlt/gateway/legacy/src/main/kotlin/fabric/RegisterUser.kt b/src/dlt/gateway/_legacy/src/main/kotlin/fabric/RegisterUser.kt
similarity index 100%
rename from src/dlt/gateway/legacy/src/main/kotlin/fabric/RegisterUser.kt
rename to src/dlt/gateway/_legacy/src/main/kotlin/fabric/RegisterUser.kt
diff --git a/src/dlt/gateway/legacy/src/main/kotlin/grpc/FabricServer.kt b/src/dlt/gateway/_legacy/src/main/kotlin/grpc/FabricServer.kt
similarity index 100%
rename from src/dlt/gateway/legacy/src/main/kotlin/grpc/FabricServer.kt
rename to src/dlt/gateway/_legacy/src/main/kotlin/grpc/FabricServer.kt
diff --git a/src/dlt/gateway/legacy/src/main/kotlin/grpc/GrpcHandler.kt b/src/dlt/gateway/_legacy/src/main/kotlin/grpc/GrpcHandler.kt
similarity index 100%
rename from src/dlt/gateway/legacy/src/main/kotlin/grpc/GrpcHandler.kt
rename to src/dlt/gateway/_legacy/src/main/kotlin/grpc/GrpcHandler.kt
diff --git a/src/dlt/gateway/legacy/src/main/kotlin/proto/Config.proto b/src/dlt/gateway/_legacy/src/main/kotlin/proto/Config.proto
similarity index 100%
rename from src/dlt/gateway/legacy/src/main/kotlin/proto/Config.proto
rename to src/dlt/gateway/_legacy/src/main/kotlin/proto/Config.proto
diff --git a/src/dlt/gateway/dltApp/.gitignore b/src/dlt/gateway/dltApp/.gitignore
deleted file mode 100644
index 9e21c69ae..000000000
--- a/src/dlt/gateway/dltApp/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules/
-operation_times.txt
\ No newline at end of file
--
GitLab