diff --git a/.gitignore b/.gitignore index 54049b88..df5687b2 100644 --- a/.gitignore +++ b/.gitignore @@ -24,5 +24,6 @@ replay_pid* .idea .gradle +.vscode build jte-classes diff --git a/build.gradle b/build.gradle index 1370ee35..94bb183e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,91 +1,50 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.5.4' + id 'org.springframework.boot' version '3.5.4' apply false id 'io.spring.dependency-management' version '1.1.7' - id 'gg.jte.gradle' version '3.2.1' - id 'com.google.protobuf' version '0.9.5' } -ext { - set('springGrpcVersion', "0.9.0") -} - -group = 'org.huebert' -version = file('version.txt').text.trim() +subprojects { + apply plugin: 'java' + apply plugin: 'io.spring.dependency-management' -java { - toolchain { - languageVersion = JavaLanguageVersion.of(24) + repositories { + mavenCentral() } -} -springBoot { - buildInfo() -} - -jar { - enabled = false -} - -jte { - generate() -} - -dependencyManagement { - imports { - mavenBom "org.springframework.grpc:spring-grpc-dependencies:${springGrpcVersion}" - } -} + group = 'org.huebert.iotfsdb' + version = file('../version.txt').text.trim() -protobuf { - protoc { - artifact = 'com.google.protobuf:protoc' - } - plugins { - grpc { - artifact = 'io.grpc:protoc-gen-grpc-java' + java { + toolchain { + languageVersion = JavaLanguageVersion.of(24) } } - generateProtoTasks { - all()*.plugins { - grpc { - option 'jakarta_omit' - option '@generated=omit' - } + + configurations { + compileOnly { + extendsFrom annotationProcessor } } -} -configurations { - compileOnly { - extendsFrom annotationProcessor + tasks.named('test') { + useJUnitPlatform() } -} - -repositories { - mavenCentral() -} -dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.springframework.boot:spring-boot-starter-aop' - implementation 'com.google.guava:guava:33.4.8-jre' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9' - implementation 'io.grpc:grpc-services' - implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter' - implementation 'gg.jte:jte:3.2.1' - implementation 'gg.jte:jte-spring-boot-starter-3:3.2.1' - implementation("com.google.protobuf:protobuf-java:4.31.1") - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.mapstruct:mapstruct:1.6.3' - annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3' - annotationProcessor"no.entur.mapstruct.spi:protobuf-spi-impl:1.49.0" - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' -} + dependencyManagement { + imports { + mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES + } + } -tasks.named('test') { - useJUnitPlatform() + dependencies { + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + implementation 'org.mapstruct:mapstruct:1.6.3' + annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3' + annotationProcessor "no.entur.mapstruct.spi:protobuf-spi-impl:1.49.0" + implementation 'com.google.guava:guava:33.4.8-jre' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + } } diff --git a/iotfsdb-app-server/build.gradle b/iotfsdb-app-server/build.gradle new file mode 100644 index 00000000..8abc46e8 --- /dev/null +++ b/iotfsdb-app-server/build.gradle @@ -0,0 +1,40 @@ +plugins { + id 'org.springframework.boot' + id 'com.google.protobuf' version '0.9.5' +} + +ext { + set('springGrpcVersion', "0.9.0") +} + +springBoot { + buildInfo() +} + +jar { + enabled = false +} + +dependencyManagement { + imports { + mavenBom "org.springframework.grpc:spring-grpc-dependencies:${springGrpcVersion}" + } +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-aop' + implementation 'com.google.guava:guava:33.4.8-jre' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9' + implementation 'io.grpc:grpc-services' + implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter' + implementation 'gg.jte:jte:3.2.1' + implementation 'gg.jte:jte-spring-boot-starter-3:3.2.1' + implementation("com.google.protobuf:protobuf-java:4.31.1") + annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3' + annotationProcessor"no.entur.mapstruct.spi:protobuf-spi-impl:1.49.0" + implementation project(':iotfsdb-rest') + implementation project(':iotfsdb-grpc') + implementation project(':iotfsdb-web') +} diff --git a/src/main/java/org/huebert/iotfsdb/IotfsdbApplication.java b/iotfsdb-app-server/src/main/java/org/huebert/iotfsdb/IotfsdbApplication.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/IotfsdbApplication.java rename to iotfsdb-app-server/src/main/java/org/huebert/iotfsdb/IotfsdbApplication.java diff --git a/src/main/java/org/huebert/iotfsdb/ObjectMapperConfiguration.java b/iotfsdb-app-server/src/main/java/org/huebert/iotfsdb/ObjectMapperConfiguration.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/ObjectMapperConfiguration.java rename to iotfsdb-app-server/src/main/java/org/huebert/iotfsdb/ObjectMapperConfiguration.java diff --git a/src/main/resources/application.yml b/iotfsdb-app-server/src/main/resources/application.yml similarity index 100% rename from src/main/resources/application.yml rename to iotfsdb-app-server/src/main/resources/application.yml diff --git a/src/test/java/org/huebert/iotfsdb/IotfsdbApplicationTests.java b/iotfsdb-app-server/src/test/java/org/huebert/iotfsdb/IotfsdbApplicationTests.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/IotfsdbApplicationTests.java rename to iotfsdb-app-server/src/test/java/org/huebert/iotfsdb/IotfsdbApplicationTests.java diff --git a/src/test/resources/application.yml b/iotfsdb-app-server/src/test/resources/application.yml similarity index 100% rename from src/test/resources/application.yml rename to iotfsdb-app-server/src/test/resources/application.yml diff --git a/src/main/jte/.jteroot b/iotfsdb-collector/build.gradle similarity index 100% rename from src/main/jte/.jteroot rename to iotfsdb-collector/build.gradle diff --git a/src/main/java/org/huebert/iotfsdb/collectors/AveragingCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/AveragingCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/AveragingCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/AveragingCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalAveragingCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalAveragingCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/BigDecimalAveragingCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalAveragingCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMaximumCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMaximumCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMaximumCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMaximumCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMedianCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMedianCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMedianCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMedianCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMinimumCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMinimumCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMinimumCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMinimumCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMultiplyingCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMultiplyingCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMultiplyingCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalMultiplyingCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalSummingCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalSummingCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/BigDecimalSummingCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/BigDecimalSummingCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/CountingCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/CountingCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/CountingCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/CountingCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/CountingDistinctCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/CountingDistinctCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/CountingDistinctCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/CountingDistinctCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/FirstCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/FirstCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/FirstCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/FirstCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/LastCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/LastCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/LastCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/LastCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/MaximumCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/MaximumCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/MaximumCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/MaximumCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/MedianCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/MedianCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/MedianCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/MedianCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/MinimumCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/MinimumCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/MinimumCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/MinimumCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/ModeCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/ModeCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/ModeCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/ModeCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/MultiplyingCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/MultiplyingCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/MultiplyingCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/MultiplyingCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/NumberCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/NumberCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/NumberCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/NumberCollector.java diff --git a/src/main/java/org/huebert/iotfsdb/collectors/SummingCollector.java b/iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/SummingCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/collectors/SummingCollector.java rename to iotfsdb-collector/src/main/java/org/huebert/iotfsdb/collectors/SummingCollector.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/AveragingCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/AveragingCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/AveragingCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/AveragingCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalAveragingCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalAveragingCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/BigDecimalAveragingCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalAveragingCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMaximumCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMaximumCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMaximumCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMaximumCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMedianCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMedianCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMedianCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMedianCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMinimumCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMinimumCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMinimumCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMinimumCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMultiplyingCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMultiplyingCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMultiplyingCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalMultiplyingCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalSummingCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalSummingCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/BigDecimalSummingCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/BigDecimalSummingCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/CountingCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/CountingCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/CountingCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/CountingCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/CountingDistinctCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/CountingDistinctCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/CountingDistinctCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/CountingDistinctCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/FirstCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/FirstCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/FirstCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/FirstCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/LastCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/LastCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/LastCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/LastCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/MaximumCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/MaximumCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/MaximumCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/MaximumCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/MedianCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/MedianCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/MedianCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/MedianCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/MinimumCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/MinimumCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/MinimumCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/MinimumCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/ModeCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/ModeCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/ModeCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/ModeCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/MultiplyingCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/MultiplyingCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/MultiplyingCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/MultiplyingCollectorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/collectors/SummingCollectorTest.java b/iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/SummingCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/collectors/SummingCollectorTest.java rename to iotfsdb-collector/src/test/java/org/huebert/iotfsdb/collectors/SummingCollectorTest.java diff --git a/iotfsdb-grpc/build.gradle b/iotfsdb-grpc/build.gradle new file mode 100644 index 00000000..1c001cf2 --- /dev/null +++ b/iotfsdb-grpc/build.gradle @@ -0,0 +1,22 @@ +ext { + set('springGrpcVersion', "0.9.0") +} + +dependencyManagement { + imports { + mavenBom "org.springframework.grpc:spring-grpc-dependencies:${springGrpcVersion}" + } +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-aop' + implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter' + + implementation project(':iotfsdb-persistence') + implementation project(':iotfsdb-proto') + implementation project(':iotfsdb-schema') + implementation project(':iotfsdb-service') + implementation project(':iotfsdb-stats') +} diff --git a/src/main/java/org/huebert/iotfsdb/api/grpc/CommonMapper.java b/iotfsdb-grpc/src/main/java/org/huebert/iotfsdb/api/grpc/CommonMapper.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/grpc/CommonMapper.java rename to iotfsdb-grpc/src/main/java/org/huebert/iotfsdb/api/grpc/CommonMapper.java diff --git a/src/main/java/org/huebert/iotfsdb/api/grpc/api/GrpcDataService.java b/iotfsdb-grpc/src/main/java/org/huebert/iotfsdb/api/grpc/api/GrpcDataService.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/grpc/api/GrpcDataService.java rename to iotfsdb-grpc/src/main/java/org/huebert/iotfsdb/api/grpc/api/GrpcDataService.java diff --git a/src/main/java/org/huebert/iotfsdb/api/grpc/api/GrpcSeriesService.java b/iotfsdb-grpc/src/main/java/org/huebert/iotfsdb/api/grpc/api/GrpcSeriesService.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/grpc/api/GrpcSeriesService.java rename to iotfsdb-grpc/src/main/java/org/huebert/iotfsdb/api/grpc/api/GrpcSeriesService.java diff --git a/src/main/java/org/huebert/iotfsdb/api/grpc/api/ServiceMapper.java b/iotfsdb-grpc/src/main/java/org/huebert/iotfsdb/api/grpc/api/ServiceMapper.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/grpc/api/ServiceMapper.java rename to iotfsdb-grpc/src/main/java/org/huebert/iotfsdb/api/grpc/api/ServiceMapper.java diff --git a/src/main/java/org/huebert/iotfsdb/api/grpc/internal/PartitionPersistenceService.java b/iotfsdb-grpc/src/main/java/org/huebert/iotfsdb/api/grpc/internal/PartitionPersistenceService.java similarity index 99% rename from src/main/java/org/huebert/iotfsdb/api/grpc/internal/PartitionPersistenceService.java rename to iotfsdb-grpc/src/main/java/org/huebert/iotfsdb/api/grpc/internal/PartitionPersistenceService.java index 00ccabd0..d2fbb53b 100644 --- a/src/main/java/org/huebert/iotfsdb/api/grpc/internal/PartitionPersistenceService.java +++ b/iotfsdb-grpc/src/main/java/org/huebert/iotfsdb/api/grpc/internal/PartitionPersistenceService.java @@ -6,9 +6,9 @@ import org.huebert.iotfsdb.api.grpc.CommonMapper; import org.huebert.iotfsdb.api.grpc.proto.v1.internal.PartitionPersistenceServiceGrpc; import org.huebert.iotfsdb.api.grpc.proto.v1.internal.PartitionPersistenceServiceProto; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.persistence.PartitionByteBuffer; import org.huebert.iotfsdb.persistence.PersistenceAdapter; -import org.huebert.iotfsdb.service.PartitionKey; import org.huebert.iotfsdb.stats.CaptureStats; import org.mapstruct.factory.Mappers; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; diff --git a/src/main/java/org/huebert/iotfsdb/api/grpc/internal/SeriesPersistenceService.java b/iotfsdb-grpc/src/main/java/org/huebert/iotfsdb/api/grpc/internal/SeriesPersistenceService.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/grpc/internal/SeriesPersistenceService.java rename to iotfsdb-grpc/src/main/java/org/huebert/iotfsdb/api/grpc/internal/SeriesPersistenceService.java diff --git a/src/test/java/org/huebert/iotfsdb/api/grpc/CommonMapperTest.java b/iotfsdb-grpc/src/test/java/org/huebert/iotfsdb/api/grpc/CommonMapperTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/grpc/CommonMapperTest.java rename to iotfsdb-grpc/src/test/java/org/huebert/iotfsdb/api/grpc/CommonMapperTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/grpc/api/GrpcDataServiceTest.java b/iotfsdb-grpc/src/test/java/org/huebert/iotfsdb/api/grpc/api/GrpcDataServiceTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/grpc/api/GrpcDataServiceTest.java rename to iotfsdb-grpc/src/test/java/org/huebert/iotfsdb/api/grpc/api/GrpcDataServiceTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/grpc/api/GrpcSeriesServiceTest.java b/iotfsdb-grpc/src/test/java/org/huebert/iotfsdb/api/grpc/api/GrpcSeriesServiceTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/grpc/api/GrpcSeriesServiceTest.java rename to iotfsdb-grpc/src/test/java/org/huebert/iotfsdb/api/grpc/api/GrpcSeriesServiceTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/grpc/api/ServiceMapperTest.java b/iotfsdb-grpc/src/test/java/org/huebert/iotfsdb/api/grpc/api/ServiceMapperTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/grpc/api/ServiceMapperTest.java rename to iotfsdb-grpc/src/test/java/org/huebert/iotfsdb/api/grpc/api/ServiceMapperTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/grpc/internal/PartitionPersistenceServiceTest.java b/iotfsdb-grpc/src/test/java/org/huebert/iotfsdb/api/grpc/internal/PartitionPersistenceServiceTest.java similarity index 99% rename from src/test/java/org/huebert/iotfsdb/api/grpc/internal/PartitionPersistenceServiceTest.java rename to iotfsdb-grpc/src/test/java/org/huebert/iotfsdb/api/grpc/internal/PartitionPersistenceServiceTest.java index 82f593de..fad65686 100644 --- a/src/test/java/org/huebert/iotfsdb/api/grpc/internal/PartitionPersistenceServiceTest.java +++ b/iotfsdb-grpc/src/test/java/org/huebert/iotfsdb/api/grpc/internal/PartitionPersistenceServiceTest.java @@ -15,10 +15,10 @@ import org.huebert.iotfsdb.api.grpc.CommonMapper; import org.huebert.iotfsdb.api.grpc.proto.v1.CommonProto; import org.huebert.iotfsdb.api.grpc.proto.v1.internal.PartitionPersistenceServiceProto; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.SeriesFile; import org.huebert.iotfsdb.persistence.PartitionByteBuffer; import org.huebert.iotfsdb.persistence.PersistenceAdapter; -import org.huebert.iotfsdb.service.PartitionKey; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/huebert/iotfsdb/api/grpc/internal/SeriesPersistenceServiceTest.java b/iotfsdb-grpc/src/test/java/org/huebert/iotfsdb/api/grpc/internal/SeriesPersistenceServiceTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/grpc/internal/SeriesPersistenceServiceTest.java rename to iotfsdb-grpc/src/test/java/org/huebert/iotfsdb/api/grpc/internal/SeriesPersistenceServiceTest.java diff --git a/iotfsdb-partition/build.gradle b/iotfsdb-partition/build.gradle new file mode 100644 index 00000000..e69de29b diff --git a/src/main/java/org/huebert/iotfsdb/partition/BufferIterator.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/BufferIterator.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/BufferIterator.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/BufferIterator.java diff --git a/src/main/java/org/huebert/iotfsdb/partition/BytePartition.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/BytePartition.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/BytePartition.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/BytePartition.java diff --git a/src/main/java/org/huebert/iotfsdb/partition/CurvedMappedPartition.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/CurvedMappedPartition.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/CurvedMappedPartition.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/CurvedMappedPartition.java diff --git a/src/main/java/org/huebert/iotfsdb/partition/DoublePartition.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/DoublePartition.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/DoublePartition.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/DoublePartition.java diff --git a/src/main/java/org/huebert/iotfsdb/partition/Float3.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/Float3.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/Float3.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/Float3.java diff --git a/src/main/java/org/huebert/iotfsdb/partition/Float3Partition.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/Float3Partition.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/Float3Partition.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/Float3Partition.java diff --git a/src/main/java/org/huebert/iotfsdb/partition/FloatPartition.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/FloatPartition.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/FloatPartition.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/FloatPartition.java diff --git a/src/main/java/org/huebert/iotfsdb/partition/HalfFloatPartition.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/HalfFloatPartition.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/HalfFloatPartition.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/HalfFloatPartition.java diff --git a/src/main/java/org/huebert/iotfsdb/partition/IntegerPartition.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/IntegerPartition.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/IntegerPartition.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/IntegerPartition.java diff --git a/src/main/java/org/huebert/iotfsdb/partition/LongPartition.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/LongPartition.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/LongPartition.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/LongPartition.java diff --git a/src/main/java/org/huebert/iotfsdb/partition/MappedPartition.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/MappedPartition.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/MappedPartition.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/MappedPartition.java diff --git a/src/main/java/org/huebert/iotfsdb/partition/NumberConverter.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/NumberConverter.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/NumberConverter.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/NumberConverter.java diff --git a/src/main/java/org/huebert/iotfsdb/partition/PartitionAdapter.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/PartitionAdapter.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/PartitionAdapter.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/PartitionAdapter.java diff --git a/src/main/java/org/huebert/iotfsdb/partition/RangeMapper.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/RangeMapper.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/RangeMapper.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/RangeMapper.java diff --git a/src/main/java/org/huebert/iotfsdb/partition/ShortPartition.java b/iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/ShortPartition.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/partition/ShortPartition.java rename to iotfsdb-partition/src/main/java/org/huebert/iotfsdb/partition/ShortPartition.java diff --git a/src/test/java/org/huebert/iotfsdb/partition/BufferIteratorTest.java b/iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/BufferIteratorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/partition/BufferIteratorTest.java rename to iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/BufferIteratorTest.java diff --git a/src/test/java/org/huebert/iotfsdb/partition/BytePartitionTest.java b/iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/BytePartitionTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/partition/BytePartitionTest.java rename to iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/BytePartitionTest.java diff --git a/src/test/java/org/huebert/iotfsdb/partition/CurvedMappedPartitionTest.java b/iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/CurvedMappedPartitionTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/partition/CurvedMappedPartitionTest.java rename to iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/CurvedMappedPartitionTest.java diff --git a/src/test/java/org/huebert/iotfsdb/partition/DoublePartitionTest.java b/iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/DoublePartitionTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/partition/DoublePartitionTest.java rename to iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/DoublePartitionTest.java diff --git a/src/test/java/org/huebert/iotfsdb/partition/Float3PartitionTest.java b/iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/Float3PartitionTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/partition/Float3PartitionTest.java rename to iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/Float3PartitionTest.java diff --git a/src/test/java/org/huebert/iotfsdb/partition/Float3Test.java b/iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/Float3Test.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/partition/Float3Test.java rename to iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/Float3Test.java diff --git a/src/test/java/org/huebert/iotfsdb/partition/FloatPartitionTest.java b/iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/FloatPartitionTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/partition/FloatPartitionTest.java rename to iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/FloatPartitionTest.java diff --git a/src/test/java/org/huebert/iotfsdb/partition/HalfFloatPartitionTest.java b/iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/HalfFloatPartitionTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/partition/HalfFloatPartitionTest.java rename to iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/HalfFloatPartitionTest.java diff --git a/src/test/java/org/huebert/iotfsdb/partition/IntegerPartitionTest.java b/iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/IntegerPartitionTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/partition/IntegerPartitionTest.java rename to iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/IntegerPartitionTest.java diff --git a/src/test/java/org/huebert/iotfsdb/partition/LongPartitionTest.java b/iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/LongPartitionTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/partition/LongPartitionTest.java rename to iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/LongPartitionTest.java diff --git a/src/test/java/org/huebert/iotfsdb/partition/MappedPartitionTest.java b/iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/MappedPartitionTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/partition/MappedPartitionTest.java rename to iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/MappedPartitionTest.java diff --git a/src/test/java/org/huebert/iotfsdb/partition/NumberConverterTest.java b/iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/NumberConverterTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/partition/NumberConverterTest.java rename to iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/NumberConverterTest.java diff --git a/src/test/java/org/huebert/iotfsdb/partition/RangeMapperTest.java b/iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/RangeMapperTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/partition/RangeMapperTest.java rename to iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/RangeMapperTest.java diff --git a/src/test/java/org/huebert/iotfsdb/partition/ShortPartitionTest.java b/iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/ShortPartitionTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/partition/ShortPartitionTest.java rename to iotfsdb-partition/src/test/java/org/huebert/iotfsdb/partition/ShortPartitionTest.java diff --git a/iotfsdb-persistence/build.gradle b/iotfsdb-persistence/build.gradle new file mode 100644 index 00000000..3addc140 --- /dev/null +++ b/iotfsdb-persistence/build.gradle @@ -0,0 +1,7 @@ +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + + implementation project(':iotfsdb-properties') + implementation project(':iotfsdb-schema') +} diff --git a/src/main/java/org/huebert/iotfsdb/persistence/FilePersistenceAdapter.java b/iotfsdb-persistence/src/main/java/org/huebert/iotfsdb/persistence/FilePersistenceAdapter.java similarity index 99% rename from src/main/java/org/huebert/iotfsdb/persistence/FilePersistenceAdapter.java rename to iotfsdb-persistence/src/main/java/org/huebert/iotfsdb/persistence/FilePersistenceAdapter.java index 90e24d91..af84cd3d 100644 --- a/src/main/java/org/huebert/iotfsdb/persistence/FilePersistenceAdapter.java +++ b/iotfsdb-persistence/src/main/java/org/huebert/iotfsdb/persistence/FilePersistenceAdapter.java @@ -13,10 +13,10 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.huebert.iotfsdb.IotfsdbProperties; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.PartitionPeriod; import org.huebert.iotfsdb.api.schema.SeriesDefinition; import org.huebert.iotfsdb.api.schema.SeriesFile; -import org.huebert.iotfsdb.service.PartitionKey; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/huebert/iotfsdb/persistence/MemoryPersistenceAdapter.java b/iotfsdb-persistence/src/main/java/org/huebert/iotfsdb/persistence/MemoryPersistenceAdapter.java similarity index 98% rename from src/main/java/org/huebert/iotfsdb/persistence/MemoryPersistenceAdapter.java rename to iotfsdb-persistence/src/main/java/org/huebert/iotfsdb/persistence/MemoryPersistenceAdapter.java index 2a8795b2..4feb907f 100644 --- a/src/main/java/org/huebert/iotfsdb/persistence/MemoryPersistenceAdapter.java +++ b/iotfsdb-persistence/src/main/java/org/huebert/iotfsdb/persistence/MemoryPersistenceAdapter.java @@ -9,8 +9,8 @@ import jakarta.validation.constraints.Positive; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.SeriesFile; -import org.huebert.iotfsdb.service.PartitionKey; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/org/huebert/iotfsdb/persistence/PartitionByteBuffer.java b/iotfsdb-persistence/src/main/java/org/huebert/iotfsdb/persistence/PartitionByteBuffer.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/persistence/PartitionByteBuffer.java rename to iotfsdb-persistence/src/main/java/org/huebert/iotfsdb/persistence/PartitionByteBuffer.java diff --git a/src/main/java/org/huebert/iotfsdb/persistence/PersistenceAdapter.java b/iotfsdb-persistence/src/main/java/org/huebert/iotfsdb/persistence/PersistenceAdapter.java similarity index 94% rename from src/main/java/org/huebert/iotfsdb/persistence/PersistenceAdapter.java rename to iotfsdb-persistence/src/main/java/org/huebert/iotfsdb/persistence/PersistenceAdapter.java index 4adddae9..1808a9b6 100644 --- a/src/main/java/org/huebert/iotfsdb/persistence/PersistenceAdapter.java +++ b/iotfsdb-persistence/src/main/java/org/huebert/iotfsdb/persistence/PersistenceAdapter.java @@ -4,8 +4,8 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.SeriesFile; -import org.huebert.iotfsdb.service.PartitionKey; import org.springframework.validation.annotation.Validated; import java.util.List; diff --git a/src/test/java/org/huebert/iotfsdb/persistence/FilePersistenceAdapterTest.java b/iotfsdb-persistence/src/test/java/org/huebert/iotfsdb/persistence/FilePersistenceAdapterTest.java similarity index 99% rename from src/test/java/org/huebert/iotfsdb/persistence/FilePersistenceAdapterTest.java rename to iotfsdb-persistence/src/test/java/org/huebert/iotfsdb/persistence/FilePersistenceAdapterTest.java index 77ba3ec5..005b9a43 100644 --- a/src/test/java/org/huebert/iotfsdb/persistence/FilePersistenceAdapterTest.java +++ b/iotfsdb-persistence/src/test/java/org/huebert/iotfsdb/persistence/FilePersistenceAdapterTest.java @@ -6,10 +6,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.huebert.iotfsdb.IotfsdbProperties; import org.huebert.iotfsdb.api.schema.NumberType; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.PartitionPeriod; import org.huebert.iotfsdb.api.schema.SeriesDefinition; import org.huebert.iotfsdb.api.schema.SeriesFile; -import org.huebert.iotfsdb.service.PartitionKey; import org.junit.jupiter.api.Test; import org.springframework.util.FileSystemUtils; diff --git a/src/test/java/org/huebert/iotfsdb/persistence/MemoryPersistenceAdapterTest.java b/iotfsdb-persistence/src/test/java/org/huebert/iotfsdb/persistence/MemoryPersistenceAdapterTest.java similarity index 96% rename from src/test/java/org/huebert/iotfsdb/persistence/MemoryPersistenceAdapterTest.java rename to iotfsdb-persistence/src/test/java/org/huebert/iotfsdb/persistence/MemoryPersistenceAdapterTest.java index eeed243a..844266f7 100644 --- a/src/test/java/org/huebert/iotfsdb/persistence/MemoryPersistenceAdapterTest.java +++ b/iotfsdb-persistence/src/test/java/org/huebert/iotfsdb/persistence/MemoryPersistenceAdapterTest.java @@ -2,9 +2,9 @@ import static org.assertj.core.api.Assertions.assertThat; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.SeriesDefinition; import org.huebert.iotfsdb.api.schema.SeriesFile; -import org.huebert.iotfsdb.service.PartitionKey; import org.junit.jupiter.api.Test; public class MemoryPersistenceAdapterTest { diff --git a/src/test/resources/db.zip b/iotfsdb-persistence/src/test/resources/db.zip similarity index 100% rename from src/test/resources/db.zip rename to iotfsdb-persistence/src/test/resources/db.zip diff --git a/iotfsdb-properties/build.gradle b/iotfsdb-properties/build.gradle new file mode 100644 index 00000000..3b76bd12 --- /dev/null +++ b/iotfsdb-properties/build.gradle @@ -0,0 +1,5 @@ +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-validation' + + implementation project(':iotfsdb-schema') +} diff --git a/src/main/java/org/huebert/iotfsdb/IotfsdbProperties.java b/iotfsdb-properties/src/main/java/org/huebert/iotfsdb/IotfsdbProperties.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/IotfsdbProperties.java rename to iotfsdb-properties/src/main/java/org/huebert/iotfsdb/IotfsdbProperties.java diff --git a/iotfsdb-proto/build.gradle b/iotfsdb-proto/build.gradle new file mode 100644 index 00000000..04c23552 --- /dev/null +++ b/iotfsdb-proto/build.gradle @@ -0,0 +1,36 @@ +plugins { + id 'com.google.protobuf' version '0.9.5' +} + +ext { + set('springGrpcVersion', "0.9.0") +} + +dependencyManagement { + imports { + mavenBom "org.springframework.grpc:spring-grpc-dependencies:${springGrpcVersion}" + } +} + +protobuf { + protoc { + artifact = 'com.google.protobuf:protoc' + } + plugins { + grpc { + artifact = 'io.grpc:protoc-gen-grpc-java' + } + } + generateProtoTasks { + all()*.plugins { + grpc { + option 'jakarta_omit' + option '@generated=omit' + } + } + } +} + +dependencies { + implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter' +} diff --git a/src/main/proto/iotfsdb/api/data_service.proto b/iotfsdb-proto/src/main/proto/iotfsdb/api/data_service.proto similarity index 100% rename from src/main/proto/iotfsdb/api/data_service.proto rename to iotfsdb-proto/src/main/proto/iotfsdb/api/data_service.proto diff --git a/src/main/proto/iotfsdb/api/series_service.proto b/iotfsdb-proto/src/main/proto/iotfsdb/api/series_service.proto similarity index 100% rename from src/main/proto/iotfsdb/api/series_service.proto rename to iotfsdb-proto/src/main/proto/iotfsdb/api/series_service.proto diff --git a/src/main/proto/iotfsdb/common.proto b/iotfsdb-proto/src/main/proto/iotfsdb/common.proto similarity index 100% rename from src/main/proto/iotfsdb/common.proto rename to iotfsdb-proto/src/main/proto/iotfsdb/common.proto diff --git a/src/main/proto/iotfsdb/internal/partition_service.proto b/iotfsdb-proto/src/main/proto/iotfsdb/internal/partition_service.proto similarity index 100% rename from src/main/proto/iotfsdb/internal/partition_service.proto rename to iotfsdb-proto/src/main/proto/iotfsdb/internal/partition_service.proto diff --git a/src/main/proto/iotfsdb/internal/series_service.proto b/iotfsdb-proto/src/main/proto/iotfsdb/internal/series_service.proto similarity index 100% rename from src/main/proto/iotfsdb/internal/series_service.proto rename to iotfsdb-proto/src/main/proto/iotfsdb/internal/series_service.proto diff --git a/iotfsdb-rest/build.gradle b/iotfsdb-rest/build.gradle new file mode 100644 index 00000000..b6d52949 --- /dev/null +++ b/iotfsdb-rest/build.gradle @@ -0,0 +1,10 @@ +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9' + + implementation project(':iotfsdb-properties') + implementation project(':iotfsdb-schema') + implementation project(':iotfsdb-service') + implementation project(':iotfsdb-stats') +} diff --git a/src/main/java/org/huebert/iotfsdb/api/rest/MutatingSeriesController.java b/iotfsdb-rest/src/main/java/org/huebert/iotfsdb/api/rest/MutatingSeriesController.java similarity index 93% rename from src/main/java/org/huebert/iotfsdb/api/rest/MutatingSeriesController.java rename to iotfsdb-rest/src/main/java/org/huebert/iotfsdb/api/rest/MutatingSeriesController.java index 3a21c1ca..30d5c951 100644 --- a/src/main/java/org/huebert/iotfsdb/api/rest/MutatingSeriesController.java +++ b/iotfsdb-rest/src/main/java/org/huebert/iotfsdb/api/rest/MutatingSeriesController.java @@ -60,7 +60,7 @@ public void createSeries(@Valid @RequestBody SeriesFile seriesFile) { @Operation(tags = "Series", summary = "Delete a series") @DeleteMapping("{id}") @ResponseStatus(NO_CONTENT) - public void deleteSeries(@PathVariable @Pattern(regexp = ID_PATTERN) String id) { + public void deleteSeries(@PathVariable("id") @Pattern(regexp = ID_PATTERN) String id) { seriesService.deleteSeries(id); } @@ -74,7 +74,7 @@ public void deleteSeries(@PathVariable @Pattern(regexp = ID_PATTERN) String id) @Operation(tags = "Series", summary = "Updates metadata for a series") @PutMapping("{id}/metadata") @ResponseStatus(NO_CONTENT) - public void updateMetadata(@PathVariable @Pattern(regexp = ID_PATTERN) String id, @Valid @RequestBody Map metadata) { + public void updateMetadata(@PathVariable("id") @Pattern(regexp = ID_PATTERN) String id, @Valid @RequestBody Map metadata) { seriesService.updateMetadata(id, metadata, false); } diff --git a/src/main/java/org/huebert/iotfsdb/api/rest/MutatingSeriesDataController.java b/iotfsdb-rest/src/main/java/org/huebert/iotfsdb/api/rest/MutatingSeriesDataController.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/rest/MutatingSeriesDataController.java rename to iotfsdb-rest/src/main/java/org/huebert/iotfsdb/api/rest/MutatingSeriesDataController.java diff --git a/src/main/java/org/huebert/iotfsdb/api/rest/SeriesController.java b/iotfsdb-rest/src/main/java/org/huebert/iotfsdb/api/rest/SeriesController.java similarity index 94% rename from src/main/java/org/huebert/iotfsdb/api/rest/SeriesController.java rename to iotfsdb-rest/src/main/java/org/huebert/iotfsdb/api/rest/SeriesController.java index 366de0a0..4e1b375a 100644 --- a/src/main/java/org/huebert/iotfsdb/api/rest/SeriesController.java +++ b/iotfsdb-rest/src/main/java/org/huebert/iotfsdb/api/rest/SeriesController.java @@ -60,7 +60,7 @@ public List findSeries(@Valid @RequestBody FindSeriesRequest request ) @Operation(tags = "Series", summary = "Get series details") @GetMapping("{id}") - public SeriesFile getSeries(@PathVariable @Pattern(regexp = ID_PATTERN) String id) { + public SeriesFile getSeries(@PathVariable("id") @Pattern(regexp = ID_PATTERN) String id) { return getSeriesFile(id); } @@ -73,7 +73,7 @@ public SeriesFile getSeries(@PathVariable @Pattern(regexp = ID_PATTERN) String i ) @Operation(tags = "Series", summary = "Retrieves the metadata for a series") @GetMapping("{id}/metadata") - public Map getMetadata(@PathVariable @Pattern(regexp = ID_PATTERN) String id) { + public Map getMetadata(@PathVariable("id") @Pattern(regexp = ID_PATTERN) String id) { return getSeriesFile(id).getMetadata(); } diff --git a/src/main/java/org/huebert/iotfsdb/api/rest/SeriesDataController.java b/iotfsdb-rest/src/main/java/org/huebert/iotfsdb/api/rest/SeriesDataController.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/rest/SeriesDataController.java rename to iotfsdb-rest/src/main/java/org/huebert/iotfsdb/api/rest/SeriesDataController.java diff --git a/src/test/java/org/huebert/iotfsdb/api/rest/MutatingSeriesControllerTest.java b/iotfsdb-rest/src/test/java/org/huebert/iotfsdb/api/rest/MutatingSeriesControllerTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/rest/MutatingSeriesControllerTest.java rename to iotfsdb-rest/src/test/java/org/huebert/iotfsdb/api/rest/MutatingSeriesControllerTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/rest/MutatingSeriesDataControllerTest.java b/iotfsdb-rest/src/test/java/org/huebert/iotfsdb/api/rest/MutatingSeriesDataControllerTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/rest/MutatingSeriesDataControllerTest.java rename to iotfsdb-rest/src/test/java/org/huebert/iotfsdb/api/rest/MutatingSeriesDataControllerTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/rest/SeriesControllerTest.java b/iotfsdb-rest/src/test/java/org/huebert/iotfsdb/api/rest/SeriesControllerTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/rest/SeriesControllerTest.java rename to iotfsdb-rest/src/test/java/org/huebert/iotfsdb/api/rest/SeriesControllerTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/rest/SeriesDataControllerTest.java b/iotfsdb-rest/src/test/java/org/huebert/iotfsdb/api/rest/SeriesDataControllerTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/rest/SeriesDataControllerTest.java rename to iotfsdb-rest/src/test/java/org/huebert/iotfsdb/api/rest/SeriesDataControllerTest.java diff --git a/iotfsdb-rest/src/test/java/org/huebert/iotfsdb/api/rest/TestConfiguration.java b/iotfsdb-rest/src/test/java/org/huebert/iotfsdb/api/rest/TestConfiguration.java new file mode 100644 index 00000000..01b7c81a --- /dev/null +++ b/iotfsdb-rest/src/test/java/org/huebert/iotfsdb/api/rest/TestConfiguration.java @@ -0,0 +1,8 @@ +package org.huebert.iotfsdb.api.rest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TestConfiguration { + +} diff --git a/iotfsdb-rest/src/test/resources/db.zip b/iotfsdb-rest/src/test/resources/db.zip new file mode 100644 index 00000000..d67cb63f Binary files /dev/null and b/iotfsdb-rest/src/test/resources/db.zip differ diff --git a/iotfsdb-schema/build.gradle b/iotfsdb-schema/build.gradle new file mode 100644 index 00000000..a1c7e5ce --- /dev/null +++ b/iotfsdb-schema/build.gradle @@ -0,0 +1,5 @@ +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9' +} diff --git a/src/main/java/org/huebert/iotfsdb/api/schema/DateTimePreset.java b/iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/DateTimePreset.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/schema/DateTimePreset.java rename to iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/DateTimePreset.java diff --git a/src/main/java/org/huebert/iotfsdb/api/schema/FindDataRequest.java b/iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/FindDataRequest.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/schema/FindDataRequest.java rename to iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/FindDataRequest.java diff --git a/src/main/java/org/huebert/iotfsdb/api/schema/FindDataResponse.java b/iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/FindDataResponse.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/schema/FindDataResponse.java rename to iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/FindDataResponse.java diff --git a/src/main/java/org/huebert/iotfsdb/api/schema/FindSeriesRequest.java b/iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/FindSeriesRequest.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/schema/FindSeriesRequest.java rename to iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/FindSeriesRequest.java diff --git a/src/main/java/org/huebert/iotfsdb/api/schema/InsertRequest.java b/iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/InsertRequest.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/schema/InsertRequest.java rename to iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/InsertRequest.java diff --git a/src/main/java/org/huebert/iotfsdb/api/schema/NumberType.java b/iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/NumberType.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/schema/NumberType.java rename to iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/NumberType.java diff --git a/src/main/java/org/huebert/iotfsdb/service/PartitionKey.java b/iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/PartitionKey.java similarity index 81% rename from src/main/java/org/huebert/iotfsdb/service/PartitionKey.java rename to iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/PartitionKey.java index f9ddf7a0..fb45316f 100644 --- a/src/main/java/org/huebert/iotfsdb/service/PartitionKey.java +++ b/iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/PartitionKey.java @@ -1,7 +1,6 @@ -package org.huebert.iotfsdb.service; +package org.huebert.iotfsdb.api.schema; import jakarta.validation.constraints.NotBlank; -import org.huebert.iotfsdb.api.schema.PartitionPeriod; import java.time.LocalDateTime; diff --git a/src/main/java/org/huebert/iotfsdb/api/schema/PartitionPeriod.java b/iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/PartitionPeriod.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/schema/PartitionPeriod.java rename to iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/PartitionPeriod.java diff --git a/src/main/java/org/huebert/iotfsdb/api/schema/Reducer.java b/iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/Reducer.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/schema/Reducer.java rename to iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/Reducer.java diff --git a/src/main/java/org/huebert/iotfsdb/api/schema/SeriesData.java b/iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/SeriesData.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/schema/SeriesData.java rename to iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/SeriesData.java diff --git a/src/main/java/org/huebert/iotfsdb/api/schema/SeriesDefinition.java b/iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/SeriesDefinition.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/schema/SeriesDefinition.java rename to iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/SeriesDefinition.java diff --git a/src/main/java/org/huebert/iotfsdb/api/schema/SeriesFile.java b/iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/SeriesFile.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/schema/SeriesFile.java rename to iotfsdb-schema/src/main/java/org/huebert/iotfsdb/api/schema/SeriesFile.java diff --git a/src/test/java/org/huebert/iotfsdb/api/schema/FindDataRequestTest.java b/iotfsdb-schema/src/test/java/org/huebert/iotfsdb/api/schema/FindDataRequestTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/schema/FindDataRequestTest.java rename to iotfsdb-schema/src/test/java/org/huebert/iotfsdb/api/schema/FindDataRequestTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/schema/PartitionPeriodTest.java b/iotfsdb-schema/src/test/java/org/huebert/iotfsdb/api/schema/PartitionPeriodTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/schema/PartitionPeriodTest.java rename to iotfsdb-schema/src/test/java/org/huebert/iotfsdb/api/schema/PartitionPeriodTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/schema/SeriesDefinitionTest.java b/iotfsdb-schema/src/test/java/org/huebert/iotfsdb/api/schema/SeriesDefinitionTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/schema/SeriesDefinitionTest.java rename to iotfsdb-schema/src/test/java/org/huebert/iotfsdb/api/schema/SeriesDefinitionTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/schema/SeriesFileTest.java b/iotfsdb-schema/src/test/java/org/huebert/iotfsdb/api/schema/SeriesFileTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/schema/SeriesFileTest.java rename to iotfsdb-schema/src/test/java/org/huebert/iotfsdb/api/schema/SeriesFileTest.java diff --git a/iotfsdb-service/build.gradle b/iotfsdb-service/build.gradle new file mode 100644 index 00000000..ffdaa3e2 --- /dev/null +++ b/iotfsdb-service/build.gradle @@ -0,0 +1,10 @@ +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + + implementation project(':iotfsdb-collector') + implementation project(':iotfsdb-partition') + implementation project(':iotfsdb-persistence') + implementation project(':iotfsdb-properties') + implementation project(':iotfsdb-schema') +} diff --git a/src/main/java/org/huebert/iotfsdb/service/CacheLoader.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/CacheLoader.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/service/CacheLoader.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/CacheLoader.java diff --git a/src/main/java/org/huebert/iotfsdb/service/CloneService.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/CloneService.java similarity index 98% rename from src/main/java/org/huebert/iotfsdb/service/CloneService.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/CloneService.java index e8050b46..44a2d63d 100644 --- a/src/main/java/org/huebert/iotfsdb/service/CloneService.java +++ b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/CloneService.java @@ -5,6 +5,7 @@ import jakarta.validation.constraints.NotNull; import lombok.extern.slf4j.Slf4j; import org.huebert.iotfsdb.api.schema.InsertRequest; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.Reducer; import org.huebert.iotfsdb.api.schema.SeriesData; import org.huebert.iotfsdb.api.schema.SeriesDefinition; diff --git a/src/main/java/org/huebert/iotfsdb/service/DataService.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/DataService.java similarity index 99% rename from src/main/java/org/huebert/iotfsdb/service/DataService.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/DataService.java index 12ef36e7..5b7ab640 100644 --- a/src/main/java/org/huebert/iotfsdb/service/DataService.java +++ b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/DataService.java @@ -10,6 +10,7 @@ import jakarta.validation.constraints.Positive; import lombok.extern.slf4j.Slf4j; import org.huebert.iotfsdb.IotfsdbProperties; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.SeriesFile; import org.huebert.iotfsdb.partition.PartitionAdapter; import org.huebert.iotfsdb.persistence.PartitionByteBuffer; diff --git a/src/main/java/org/huebert/iotfsdb/service/ExportService.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/ExportService.java similarity index 98% rename from src/main/java/org/huebert/iotfsdb/service/ExportService.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/ExportService.java index d0a5c266..8652c1ae 100644 --- a/src/main/java/org/huebert/iotfsdb/service/ExportService.java +++ b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/ExportService.java @@ -6,6 +6,7 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import org.huebert.iotfsdb.api.schema.FindSeriesRequest; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.SeriesFile; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/org/huebert/iotfsdb/service/ImportService.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/ImportService.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/service/ImportService.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/ImportService.java diff --git a/src/main/java/org/huebert/iotfsdb/service/InsertService.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/InsertService.java similarity index 98% rename from src/main/java/org/huebert/iotfsdb/service/InsertService.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/InsertService.java index 599a04fb..5e097516 100644 --- a/src/main/java/org/huebert/iotfsdb/service/InsertService.java +++ b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/InsertService.java @@ -4,6 +4,7 @@ import jakarta.validation.constraints.NotNull; import org.huebert.iotfsdb.IotfsdbProperties; import org.huebert.iotfsdb.api.schema.InsertRequest; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.PartitionPeriod; import org.huebert.iotfsdb.api.schema.SeriesData; import org.huebert.iotfsdb.api.schema.SeriesDefinition; diff --git a/src/main/java/org/huebert/iotfsdb/service/IntervalService.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/IntervalService.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/service/IntervalService.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/IntervalService.java diff --git a/src/main/java/org/huebert/iotfsdb/service/LockUtil.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/LockUtil.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/service/LockUtil.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/LockUtil.java diff --git a/src/main/java/org/huebert/iotfsdb/service/ParallelUtil.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/ParallelUtil.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/service/ParallelUtil.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/ParallelUtil.java diff --git a/src/main/java/org/huebert/iotfsdb/service/PartitionRange.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/PartitionRange.java similarity index 97% rename from src/main/java/org/huebert/iotfsdb/service/PartitionRange.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/PartitionRange.java index 9d5f11b9..2900d20d 100644 --- a/src/main/java/org/huebert/iotfsdb/service/PartitionRange.java +++ b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/PartitionRange.java @@ -5,6 +5,7 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.Getter; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.partition.PartitionAdapter; import java.nio.ByteBuffer; diff --git a/src/main/java/org/huebert/iotfsdb/service/PartitionService.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/PartitionService.java similarity index 99% rename from src/main/java/org/huebert/iotfsdb/service/PartitionService.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/PartitionService.java index 5adb87e1..f21c00cc 100644 --- a/src/main/java/org/huebert/iotfsdb/service/PartitionService.java +++ b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/PartitionService.java @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.huebert.iotfsdb.IotfsdbProperties; import org.huebert.iotfsdb.api.schema.NumberType; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.PartitionPeriod; import org.huebert.iotfsdb.api.schema.SeriesDefinition; import org.huebert.iotfsdb.api.schema.SeriesFile; diff --git a/src/main/java/org/huebert/iotfsdb/service/QueryService.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/QueryService.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/service/QueryService.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/QueryService.java diff --git a/src/main/java/org/huebert/iotfsdb/service/ReducerService.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/ReducerService.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/service/ReducerService.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/ReducerService.java diff --git a/src/main/java/org/huebert/iotfsdb/service/SeriesService.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/SeriesService.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/service/SeriesService.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/SeriesService.java diff --git a/src/main/java/org/huebert/iotfsdb/service/TimeConverter.java b/iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/TimeConverter.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/service/TimeConverter.java rename to iotfsdb-service/src/main/java/org/huebert/iotfsdb/service/TimeConverter.java diff --git a/src/test/java/org/huebert/iotfsdb/service/CacheLoaderTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/CacheLoaderTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/service/CacheLoaderTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/CacheLoaderTest.java diff --git a/src/test/java/org/huebert/iotfsdb/service/CloneServiceTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/CloneServiceTest.java similarity index 99% rename from src/test/java/org/huebert/iotfsdb/service/CloneServiceTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/CloneServiceTest.java index d9134015..22bc888a 100644 --- a/src/test/java/org/huebert/iotfsdb/service/CloneServiceTest.java +++ b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/CloneServiceTest.java @@ -13,6 +13,7 @@ import static org.mockito.Mockito.when; import com.google.common.collect.Range; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.PartitionPeriod; import org.huebert.iotfsdb.api.schema.SeriesDefinition; import org.huebert.iotfsdb.api.schema.SeriesFile; diff --git a/src/test/java/org/huebert/iotfsdb/service/DataServiceTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/DataServiceTest.java similarity index 99% rename from src/test/java/org/huebert/iotfsdb/service/DataServiceTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/DataServiceTest.java index f850426d..e1e16ccb 100644 --- a/src/test/java/org/huebert/iotfsdb/service/DataServiceTest.java +++ b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/DataServiceTest.java @@ -6,6 +6,7 @@ import static org.mockito.Mockito.when; import org.huebert.iotfsdb.IotfsdbProperties; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.SeriesDefinition; import org.huebert.iotfsdb.api.schema.SeriesFile; import org.huebert.iotfsdb.partition.PartitionAdapter; diff --git a/src/test/java/org/huebert/iotfsdb/service/ExportServiceTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/ExportServiceTest.java similarity index 98% rename from src/test/java/org/huebert/iotfsdb/service/ExportServiceTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/ExportServiceTest.java index 68f8c03c..4786b52a 100644 --- a/src/test/java/org/huebert/iotfsdb/service/ExportServiceTest.java +++ b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/ExportServiceTest.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Range; import org.huebert.iotfsdb.api.schema.FindSeriesRequest; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.SeriesDefinition; import org.huebert.iotfsdb.api.schema.SeriesFile; import org.huebert.iotfsdb.partition.PartitionAdapter; diff --git a/src/test/java/org/huebert/iotfsdb/service/ImportServiceTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/ImportServiceTest.java similarity index 91% rename from src/test/java/org/huebert/iotfsdb/service/ImportServiceTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/ImportServiceTest.java index d903a0a5..5be5b82a 100644 --- a/src/test/java/org/huebert/iotfsdb/service/ImportServiceTest.java +++ b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/ImportServiceTest.java @@ -10,7 +10,6 @@ import org.huebert.iotfsdb.api.schema.NumberType; import org.huebert.iotfsdb.api.schema.Reducer; import org.huebert.iotfsdb.api.schema.SeriesFile; -import org.huebert.iotfsdb.persistence.FilePersistenceAdapterTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -41,7 +40,7 @@ public class ImportServiceTest { public void testImportData() throws Exception { Path temp = Files.createTempFile("iotfsdb", ".zip"); - try (InputStream is = FilePersistenceAdapterTest.class.getResourceAsStream("/import.zip"); OutputStream os = new FileOutputStream(temp.toFile())) { + try (InputStream is = ImportServiceTest.class.getResourceAsStream("/import.zip"); OutputStream os = new FileOutputStream(temp.toFile())) { is.transferTo(os); } diff --git a/src/test/java/org/huebert/iotfsdb/service/InsertServiceTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/InsertServiceTest.java similarity index 99% rename from src/test/java/org/huebert/iotfsdb/service/InsertServiceTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/InsertServiceTest.java index 46ccf36c..c4427621 100644 --- a/src/test/java/org/huebert/iotfsdb/service/InsertServiceTest.java +++ b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/InsertServiceTest.java @@ -9,6 +9,7 @@ import com.google.common.collect.Range; import org.huebert.iotfsdb.IotfsdbProperties; import org.huebert.iotfsdb.api.schema.InsertRequest; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.PartitionPeriod; import org.huebert.iotfsdb.api.schema.Reducer; import org.huebert.iotfsdb.api.schema.SeriesData; diff --git a/src/test/java/org/huebert/iotfsdb/service/IntervalServiceTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/IntervalServiceTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/service/IntervalServiceTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/IntervalServiceTest.java diff --git a/src/test/java/org/huebert/iotfsdb/service/LockUtilTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/LockUtilTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/service/LockUtilTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/LockUtilTest.java diff --git a/src/test/java/org/huebert/iotfsdb/service/ParallelUtilTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/ParallelUtilTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/service/ParallelUtilTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/ParallelUtilTest.java diff --git a/src/test/java/org/huebert/iotfsdb/service/PartitionKeyTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/PartitionKeyTest.java similarity index 90% rename from src/test/java/org/huebert/iotfsdb/service/PartitionKeyTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/PartitionKeyTest.java index 312244a5..96fec938 100644 --- a/src/test/java/org/huebert/iotfsdb/service/PartitionKeyTest.java +++ b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/PartitionKeyTest.java @@ -2,6 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.PartitionPeriod; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/huebert/iotfsdb/service/PartitionRangeTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/PartitionRangeTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/service/PartitionRangeTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/PartitionRangeTest.java diff --git a/src/test/java/org/huebert/iotfsdb/service/PartitionServiceTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/PartitionServiceTest.java similarity index 99% rename from src/test/java/org/huebert/iotfsdb/service/PartitionServiceTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/PartitionServiceTest.java index 330cea75..351d70b5 100644 --- a/src/test/java/org/huebert/iotfsdb/service/PartitionServiceTest.java +++ b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/PartitionServiceTest.java @@ -8,6 +8,7 @@ import com.google.common.collect.RangeMap; import org.huebert.iotfsdb.IotfsdbProperties; import org.huebert.iotfsdb.api.schema.NumberType; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.PartitionPeriod; import org.huebert.iotfsdb.api.schema.SeriesDefinition; import org.huebert.iotfsdb.api.schema.SeriesFile; diff --git a/src/test/java/org/huebert/iotfsdb/service/QueryServiceTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/QueryServiceTest.java similarity index 99% rename from src/test/java/org/huebert/iotfsdb/service/QueryServiceTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/QueryServiceTest.java index 7b3bbd79..f9fd3161 100644 --- a/src/test/java/org/huebert/iotfsdb/service/QueryServiceTest.java +++ b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/QueryServiceTest.java @@ -11,6 +11,7 @@ import org.huebert.iotfsdb.api.schema.FindDataRequest; import org.huebert.iotfsdb.api.schema.FindDataResponse; import org.huebert.iotfsdb.api.schema.FindSeriesRequest; +import org.huebert.iotfsdb.api.schema.PartitionKey; import org.huebert.iotfsdb.api.schema.Reducer; import org.huebert.iotfsdb.api.schema.SeriesData; import org.huebert.iotfsdb.api.schema.SeriesDefinition; diff --git a/src/test/java/org/huebert/iotfsdb/service/ReducerServiceTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/ReducerServiceTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/service/ReducerServiceTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/ReducerServiceTest.java diff --git a/src/test/java/org/huebert/iotfsdb/service/SeriesServiceTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/SeriesServiceTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/service/SeriesServiceTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/SeriesServiceTest.java diff --git a/src/test/java/org/huebert/iotfsdb/service/TimeConverterTest.java b/iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/TimeConverterTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/service/TimeConverterTest.java rename to iotfsdb-service/src/test/java/org/huebert/iotfsdb/service/TimeConverterTest.java diff --git a/src/test/resources/import.zip b/iotfsdb-service/src/test/resources/import.zip similarity index 100% rename from src/test/resources/import.zip rename to iotfsdb-service/src/test/resources/import.zip diff --git a/iotfsdb-stats/build.gradle b/iotfsdb-stats/build.gradle new file mode 100644 index 00000000..4b12e6b0 --- /dev/null +++ b/iotfsdb-stats/build.gradle @@ -0,0 +1,7 @@ +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-aop' + + implementation project(':iotfsdb-properties') + implementation project(':iotfsdb-schema') + implementation project(':iotfsdb-service') +} diff --git a/src/main/java/org/huebert/iotfsdb/stats/CaptureStats.java b/iotfsdb-stats/src/main/java/org/huebert/iotfsdb/stats/CaptureStats.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/stats/CaptureStats.java rename to iotfsdb-stats/src/main/java/org/huebert/iotfsdb/stats/CaptureStats.java diff --git a/src/main/java/org/huebert/iotfsdb/stats/StatsCollector.java b/iotfsdb-stats/src/main/java/org/huebert/iotfsdb/stats/StatsCollector.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/stats/StatsCollector.java rename to iotfsdb-stats/src/main/java/org/huebert/iotfsdb/stats/StatsCollector.java diff --git a/src/test/java/org/huebert/iotfsdb/stats/StatsCollectorTest.java b/iotfsdb-stats/src/test/java/org/huebert/iotfsdb/stats/StatsCollectorTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/stats/StatsCollectorTest.java rename to iotfsdb-stats/src/test/java/org/huebert/iotfsdb/stats/StatsCollectorTest.java diff --git a/iotfsdb-web/build.gradle b/iotfsdb-web/build.gradle new file mode 100644 index 00000000..d07cf3fa --- /dev/null +++ b/iotfsdb-web/build.gradle @@ -0,0 +1,20 @@ +plugins { + id 'gg.jte.gradle' version '3.2.1' +} + +jte { + generate() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-aop' + implementation 'gg.jte:jte-spring-boot-starter-3:3.2.1' + implementation 'gg.jte:jte:3.2.1' + + implementation project(':iotfsdb-properties') + implementation project(':iotfsdb-stats') + implementation project(':iotfsdb-service') + implementation project(':iotfsdb-schema') +} diff --git a/src/main/java/org/huebert/iotfsdb/api/ui/DataUiController.java b/iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/DataUiController.java similarity index 99% rename from src/main/java/org/huebert/iotfsdb/api/ui/DataUiController.java rename to iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/DataUiController.java index 735827eb..2d418d86 100644 --- a/src/main/java/org/huebert/iotfsdb/api/ui/DataUiController.java +++ b/iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/DataUiController.java @@ -12,7 +12,6 @@ import org.huebert.iotfsdb.api.ui.service.PlotData; import org.huebert.iotfsdb.api.ui.service.SearchParser; import org.huebert.iotfsdb.service.QueryService; -import org.huebert.iotfsdb.service.TimeConverter; import org.huebert.iotfsdb.stats.CaptureStats; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.stereotype.Controller; diff --git a/src/main/java/org/huebert/iotfsdb/api/ui/IndexUiController.java b/iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/IndexUiController.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/ui/IndexUiController.java rename to iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/IndexUiController.java diff --git a/src/main/java/org/huebert/iotfsdb/api/ui/MutatingSeriesUiController.java b/iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/MutatingSeriesUiController.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/ui/MutatingSeriesUiController.java rename to iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/MutatingSeriesUiController.java diff --git a/src/main/java/org/huebert/iotfsdb/api/ui/MutatingTransferUiController.java b/iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/MutatingTransferUiController.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/ui/MutatingTransferUiController.java rename to iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/MutatingTransferUiController.java diff --git a/src/main/java/org/huebert/iotfsdb/api/ui/SeriesUiController.java b/iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/SeriesUiController.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/ui/SeriesUiController.java rename to iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/SeriesUiController.java diff --git a/src/main/java/org/huebert/iotfsdb/api/ui/TransferUiController.java b/iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/TransferUiController.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/ui/TransferUiController.java rename to iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/TransferUiController.java diff --git a/src/main/java/org/huebert/iotfsdb/api/ui/service/BasePageService.java b/iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/service/BasePageService.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/ui/service/BasePageService.java rename to iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/service/BasePageService.java diff --git a/src/main/java/org/huebert/iotfsdb/api/ui/service/ExportUiService.java b/iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/service/ExportUiService.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/ui/service/ExportUiService.java rename to iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/service/ExportUiService.java diff --git a/src/main/java/org/huebert/iotfsdb/api/ui/service/ObjectEncoder.java b/iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/service/ObjectEncoder.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/ui/service/ObjectEncoder.java rename to iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/service/ObjectEncoder.java diff --git a/src/main/java/org/huebert/iotfsdb/api/ui/service/PlotData.java b/iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/service/PlotData.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/ui/service/PlotData.java rename to iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/service/PlotData.java diff --git a/src/main/java/org/huebert/iotfsdb/api/ui/service/SearchParser.java b/iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/service/SearchParser.java similarity index 100% rename from src/main/java/org/huebert/iotfsdb/api/ui/service/SearchParser.java rename to iotfsdb-web/src/main/java/org/huebert/iotfsdb/api/ui/service/SearchParser.java diff --git a/iotfsdb-web/src/main/jte/.jteroot b/iotfsdb-web/src/main/jte/.jteroot new file mode 100644 index 00000000..e69de29b diff --git a/src/main/jte/components/button.jte b/iotfsdb-web/src/main/jte/components/button.jte similarity index 100% rename from src/main/jte/components/button.jte rename to iotfsdb-web/src/main/jte/components/button.jte diff --git a/src/main/jte/components/datetime.jte b/iotfsdb-web/src/main/jte/components/datetime.jte similarity index 100% rename from src/main/jte/components/datetime.jte rename to iotfsdb-web/src/main/jte/components/datetime.jte diff --git a/src/main/jte/components/number.jte b/iotfsdb-web/src/main/jte/components/number.jte similarity index 100% rename from src/main/jte/components/number.jte rename to iotfsdb-web/src/main/jte/components/number.jte diff --git a/src/main/jte/components/search.jte b/iotfsdb-web/src/main/jte/components/search.jte similarity index 100% rename from src/main/jte/components/search.jte rename to iotfsdb-web/src/main/jte/components/search.jte diff --git a/src/main/jte/components/select.jte b/iotfsdb-web/src/main/jte/components/select.jte similarity index 100% rename from src/main/jte/components/select.jte rename to iotfsdb-web/src/main/jte/components/select.jte diff --git a/src/main/jte/components/switch.jte b/iotfsdb-web/src/main/jte/components/switch.jte similarity index 100% rename from src/main/jte/components/switch.jte rename to iotfsdb-web/src/main/jte/components/switch.jte diff --git a/src/main/jte/components/text.jte b/iotfsdb-web/src/main/jte/components/text.jte similarity index 100% rename from src/main/jte/components/text.jte rename to iotfsdb-web/src/main/jte/components/text.jte diff --git a/src/main/jte/data/fragments/script.jte b/iotfsdb-web/src/main/jte/data/fragments/script.jte similarity index 100% rename from src/main/jte/data/fragments/script.jte rename to iotfsdb-web/src/main/jte/data/fragments/script.jte diff --git a/src/main/jte/data/fragments/search.jte b/iotfsdb-web/src/main/jte/data/fragments/search.jte similarity index 100% rename from src/main/jte/data/fragments/search.jte rename to iotfsdb-web/src/main/jte/data/fragments/search.jte diff --git a/src/main/jte/data/index.jte b/iotfsdb-web/src/main/jte/data/index.jte similarity index 100% rename from src/main/jte/data/index.jte rename to iotfsdb-web/src/main/jte/data/index.jte diff --git a/src/main/jte/layout.jte b/iotfsdb-web/src/main/jte/layout.jte similarity index 100% rename from src/main/jte/layout.jte rename to iotfsdb-web/src/main/jte/layout.jte diff --git a/src/main/jte/series/fragments/create.jte b/iotfsdb-web/src/main/jte/series/fragments/create.jte similarity index 100% rename from src/main/jte/series/fragments/create.jte rename to iotfsdb-web/src/main/jte/series/fragments/create.jte diff --git a/src/main/jte/series/fragments/metadata-row.jte b/iotfsdb-web/src/main/jte/series/fragments/metadata-row.jte similarity index 100% rename from src/main/jte/series/fragments/metadata-row.jte rename to iotfsdb-web/src/main/jte/series/fragments/metadata-row.jte diff --git a/src/main/jte/series/fragments/results.jte b/iotfsdb-web/src/main/jte/series/fragments/results.jte similarity index 100% rename from src/main/jte/series/fragments/results.jte rename to iotfsdb-web/src/main/jte/series/fragments/results.jte diff --git a/src/main/jte/series/fragments/search.jte b/iotfsdb-web/src/main/jte/series/fragments/search.jte similarity index 100% rename from src/main/jte/series/fragments/search.jte rename to iotfsdb-web/src/main/jte/series/fragments/search.jte diff --git a/src/main/jte/series/index.jte b/iotfsdb-web/src/main/jte/series/index.jte similarity index 100% rename from src/main/jte/series/index.jte rename to iotfsdb-web/src/main/jte/series/index.jte diff --git a/src/main/jte/transfer/fragments/transfer.jte b/iotfsdb-web/src/main/jte/transfer/fragments/transfer.jte similarity index 100% rename from src/main/jte/transfer/fragments/transfer.jte rename to iotfsdb-web/src/main/jte/transfer/fragments/transfer.jte diff --git a/src/main/jte/transfer/index.jte b/iotfsdb-web/src/main/jte/transfer/index.jte similarity index 100% rename from src/main/jte/transfer/index.jte rename to iotfsdb-web/src/main/jte/transfer/index.jte diff --git a/src/main/resources/static/icons/cpu.svg b/iotfsdb-web/src/main/resources/icons/cpu.svg similarity index 100% rename from src/main/resources/static/icons/cpu.svg rename to iotfsdb-web/src/main/resources/icons/cpu.svg diff --git a/src/test/java/org/huebert/iotfsdb/api/ui/DataUiControllerTest.java b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/DataUiControllerTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/ui/DataUiControllerTest.java rename to iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/DataUiControllerTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/ui/IndexUiControllerTest.java b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/IndexUiControllerTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/ui/IndexUiControllerTest.java rename to iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/IndexUiControllerTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/ui/MutatingSeriesUiControllerTest.java b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/MutatingSeriesUiControllerTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/ui/MutatingSeriesUiControllerTest.java rename to iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/MutatingSeriesUiControllerTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/ui/MutatingTransferUiControllerTest.java b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/MutatingTransferUiControllerTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/ui/MutatingTransferUiControllerTest.java rename to iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/MutatingTransferUiControllerTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/ui/SeriesUiControllerTest.java b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/SeriesUiControllerTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/ui/SeriesUiControllerTest.java rename to iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/SeriesUiControllerTest.java diff --git a/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/TestConfiguration.java b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/TestConfiguration.java new file mode 100644 index 00000000..a28fa412 --- /dev/null +++ b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/TestConfiguration.java @@ -0,0 +1,8 @@ +package org.huebert.iotfsdb.api.ui; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TestConfiguration { + +} diff --git a/src/test/java/org/huebert/iotfsdb/api/ui/TransferUiControllerTest.java b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/TransferUiControllerTest.java similarity index 100% rename from src/test/java/org/huebert/iotfsdb/api/ui/TransferUiControllerTest.java rename to iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/TransferUiControllerTest.java diff --git a/src/test/java/org/huebert/iotfsdb/api/service/BasePageServiceTest.java b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/service/BasePageServiceTest.java similarity index 89% rename from src/test/java/org/huebert/iotfsdb/api/service/BasePageServiceTest.java rename to iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/service/BasePageServiceTest.java index ebba5657..3aac8fc4 100644 --- a/src/test/java/org/huebert/iotfsdb/api/service/BasePageServiceTest.java +++ b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/service/BasePageServiceTest.java @@ -1,9 +1,8 @@ -package org.huebert.iotfsdb.api.service; +package org.huebert.iotfsdb.api.ui.service; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import org.huebert.iotfsdb.api.ui.service.BasePageService; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; diff --git a/src/test/java/org/huebert/iotfsdb/api/service/ExportUiServiceTest.java b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/service/ExportUiServiceTest.java similarity index 97% rename from src/test/java/org/huebert/iotfsdb/api/service/ExportUiServiceTest.java rename to iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/service/ExportUiServiceTest.java index 268eda98..370e4194 100644 --- a/src/test/java/org/huebert/iotfsdb/api/service/ExportUiServiceTest.java +++ b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/service/ExportUiServiceTest.java @@ -1,4 +1,4 @@ -package org.huebert.iotfsdb.api.service; +package org.huebert.iotfsdb.api.ui.service; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -7,7 +7,6 @@ import com.google.common.net.HttpHeaders; import org.huebert.iotfsdb.api.schema.FindSeriesRequest; -import org.huebert.iotfsdb.api.ui.service.ExportUiService; import org.huebert.iotfsdb.service.ExportService; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/org/huebert/iotfsdb/api/service/ObjectEncoderTest.java b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/service/ObjectEncoderTest.java similarity index 92% rename from src/test/java/org/huebert/iotfsdb/api/service/ObjectEncoderTest.java rename to iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/service/ObjectEncoderTest.java index e1cd9def..2cd3e014 100644 --- a/src/test/java/org/huebert/iotfsdb/api/service/ObjectEncoderTest.java +++ b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/service/ObjectEncoderTest.java @@ -1,4 +1,4 @@ -package org.huebert.iotfsdb.api.service; +package org.huebert.iotfsdb.api.ui.service; import static org.assertj.core.api.Assertions.assertThat; @@ -6,7 +6,6 @@ import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.google.common.base.Strings; -import org.huebert.iotfsdb.api.ui.service.ObjectEncoder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/src/test/java/org/huebert/iotfsdb/api/service/SearchParserTest.java b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/service/SearchParserTest.java similarity index 95% rename from src/test/java/org/huebert/iotfsdb/api/service/SearchParserTest.java rename to iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/service/SearchParserTest.java index 875911d0..3678e58e 100644 --- a/src/test/java/org/huebert/iotfsdb/api/service/SearchParserTest.java +++ b/iotfsdb-web/src/test/java/org/huebert/iotfsdb/api/ui/service/SearchParserTest.java @@ -1,10 +1,9 @@ -package org.huebert.iotfsdb.api.service; +package org.huebert.iotfsdb.api.ui.service; import static org.assertj.core.api.Assertions.assertThat; import org.huebert.iotfsdb.api.schema.FindDataRequest; import org.huebert.iotfsdb.api.schema.FindSeriesRequest; -import org.huebert.iotfsdb.api.ui.service.SearchParser; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/settings.gradle b/settings.gradle index 8189b5e1..440512f0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,12 @@ -rootProject.name = 'iotfsdb' +include "iotfsdb-app-server" +include "iotfsdb-collector" +include "iotfsdb-grpc" +include "iotfsdb-partition" +include "iotfsdb-persistence" +include "iotfsdb-properties" +include "iotfsdb-proto" +include "iotfsdb-rest" +include "iotfsdb-schema" +include "iotfsdb-service" +include "iotfsdb-stats" +include "iotfsdb-web"