Explorar o código

Update libraries

Lukas Cerny %!s(int64=2) %!d(string=hai) anos
pai
achega
dd467a19ff
Modificáronse 59 ficheiros con 46 adicións e 2689 borrados
  1. 26 23
      build.gradle
  2. 1 1
      gradle.properties
  3. 1 1
      settings.gradle
  4. 0 68
      src/main/generated/proxy/cz/senslog/analyzer/analysis/AnalyzerModule_ProvideSimpleAnalyzerFactory.java
  5. 0 180
      src/main/generated/proxy/cz/senslog/analyzer/analysis/DaggerAnalyzerComponent.java
  6. 0 41
      src/main/generated/proxy/cz/senslog/analyzer/analysis/module/HandlersModule_ProvideFilterHandlerFactory.java
  7. 0 41
      src/main/generated/proxy/cz/senslog/analyzer/analysis/module/HandlersModule_ProvideGroupThresholdHandlerFactory.java
  8. 0 57
      src/main/generated/proxy/cz/senslog/analyzer/analysis/module/HandlersModule_ProvideObservationCollectorFactory.java
  9. 0 41
      src/main/generated/proxy/cz/senslog/analyzer/analysis/module/HandlersModule_ProvideSensorThresholdHandlerFactory.java
  10. 0 52
      src/main/generated/proxy/cz/senslog/analyzer/core/EventBusModule_ProvideEventBusFactory.java
  11. 0 33
      src/main/generated/proxy/cz/senslog/analyzer/core/config/ConfigurationModule_EventBusConfigFactory.java
  12. 0 33
      src/main/generated/proxy/cz/senslog/analyzer/core/config/ConfigurationModule_StorageConfigFactory.java
  13. 0 142
      src/main/generated/proxy/cz/senslog/analyzer/provider/DaggerDataProviderComponent.java
  14. 0 40
      src/main/generated/proxy/cz/senslog/analyzer/provider/DatabaseProviderModule_ProvideLoopedDatabaseProviderFactory.java
  15. 0 39
      src/main/generated/proxy/cz/senslog/analyzer/provider/DatabaseProviderModule_ProvideLoopedProviderFactory.java
  16. 0 47
      src/main/generated/proxy/cz/senslog/analyzer/provider/DatabaseProviderModule_ProvideScheduleDatabaseProviderFactory.java
  17. 0 39
      src/main/generated/proxy/cz/senslog/analyzer/provider/DatabaseProviderModule_ProvideScheduledProviderFactory.java
  18. 0 35
      src/main/generated/proxy/cz/senslog/analyzer/provider/HttpMiddlewareProviderModule_ProvideHttpMiddlewareProviderFactory.java
  19. 0 39
      src/main/generated/proxy/cz/senslog/analyzer/provider/HttpMiddlewareProviderModule_ProvideMiddlewareProviderFactory.java
  20. 0 29
      src/main/generated/proxy/cz/senslog/analyzer/provider/HttpMiddlewareProvider_Factory.java
  21. 0 34
      src/main/generated/proxy/cz/senslog/analyzer/provider/LoopedDatabaseProvider_Factory.java
  22. 0 41
      src/main/generated/proxy/cz/senslog/analyzer/provider/ScheduledDatabaseProvider_Factory.java
  23. 0 33
      src/main/generated/proxy/cz/senslog/analyzer/storage/ConnectionModule_Factory.java
  24. 0 34
      src/main/generated/proxy/cz/senslog/analyzer/storage/ConnectionModule_ProvideInMemoryStorageConnectionFactory.java
  25. 0 34
      src/main/generated/proxy/cz/senslog/analyzer/storage/ConnectionModule_ProvidePermanentStorageConnectionFactory.java
  26. 0 41
      src/main/generated/proxy/cz/senslog/analyzer/storage/RepositoryModule_ProvideCollectedStatisticsRepositoryFactory.java
  27. 0 41
      src/main/generated/proxy/cz/senslog/analyzer/storage/RepositoryModule_ProvideObservationRepositoryFactory.java
  28. 0 41
      src/main/generated/proxy/cz/senslog/analyzer/storage/RepositoryModule_ProvideScheduledDatabaseRepositoryFactory.java
  29. 0 41
      src/main/generated/proxy/cz/senslog/analyzer/storage/RepositoryModule_ProvideStatisticsConfigRepositoryFactory.java
  30. 0 41
      src/main/generated/proxy/cz/senslog/analyzer/storage/RepositoryModule_ProvideStatisticsRepositoryFactory.java
  31. 0 35
      src/main/generated/proxy/cz/senslog/analyzer/storage/inmemory/repository/CollectedStatisticsRepository_Factory.java
  32. 0 34
      src/main/generated/proxy/cz/senslog/analyzer/storage/inmemory/repository/TimestampRepository_Factory.java
  33. 0 34
      src/main/generated/proxy/cz/senslog/analyzer/storage/permanent/repository/SensLogRepository_Factory.java
  34. 0 35
      src/main/generated/proxy/cz/senslog/analyzer/storage/permanent/repository/StatisticsConfigRepository_Factory.java
  35. 0 34
      src/main/generated/proxy/cz/senslog/analyzer/storage/permanent/repository/StatisticsRepository_Factory.java
  36. 0 112
      src/main/generated/proxy/cz/senslog/analyzer/ws/DaggerServerComponent.java
  37. 0 34
      src/main/generated/proxy/cz/senslog/analyzer/ws/handler/GroupsHandler_Factory.java
  38. 0 29
      src/main/generated/proxy/cz/senslog/analyzer/ws/handler/InfoHandler_Factory.java
  39. 0 33
      src/main/generated/proxy/cz/senslog/analyzer/ws/handler/StatisticsHandler_Factory.java
  40. 0 41
      src/main/generated/proxy/cz/senslog/analyzer/ws/manager/WSStatisticsManager_Factory.java
  41. 0 46
      src/main/generated/proxy/cz/senslog/analyzer/ws/vertx/VertxServer_Factory.java
  42. 1 2
      src/main/java/cz/senslog/analyzer/broker/email/EmailBroker.java
  43. 6 6
      src/main/java/cz/senslog/analyzer/broker/email/EmailServerConnection.java
  44. 0 1
      src/main/java/cz/senslog/analyzer/util/TimestampUtil.java
  45. 0 191
      src/main/java/cz/senslog/analyzer/util/http/HttpClient.java
  46. 0 13
      src/main/java/cz/senslog/analyzer/util/http/HttpCode.java
  47. 0 16
      src/main/java/cz/senslog/analyzer/util/http/HttpContentType.java
  48. 0 39
      src/main/java/cz/senslog/analyzer/util/http/HttpCookie.java
  49. 0 10
      src/main/java/cz/senslog/analyzer/util/http/HttpHeader.java
  50. 0 5
      src/main/java/cz/senslog/analyzer/util/http/HttpMethod.java
  51. 0 111
      src/main/java/cz/senslog/analyzer/util/http/HttpRequest.java
  52. 0 80
      src/main/java/cz/senslog/analyzer/util/http/HttpRequestBuilder.java
  53. 0 77
      src/main/java/cz/senslog/analyzer/util/http/HttpResponse.java
  54. 0 42
      src/main/java/cz/senslog/analyzer/util/http/HttpResponseBuilder.java
  55. 0 113
      src/main/java/cz/senslog/analyzer/util/http/URLBuilder.java
  56. 0 139
      src/main/java/cz/senslog/analyzer/util/json/JsonSchema.java
  57. 2 3
      src/main/java/cz/senslog/analyzer/ws/handler/InfoHandler.java
  58. 6 7
      src/main/java/cz/senslog/analyzer/ws/handler/StatisticsHandler.java
  59. 3 5
      src/main/java/cz/senslog/analyzer/ws/vertx/VertxServer.java

+ 26 - 23
build.gradle

@@ -7,7 +7,7 @@ group 'cz.senslog'
 version '1.2.2'
 //version '1.3-SNAPSHOT'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 
 repositories {
     mavenCentral()
@@ -15,7 +15,7 @@ repositories {
 }
 
 codeGen {
-    vertxVersion = '4.2.1'
+    vertxVersion = '4.4.3'
     generatedDirs = "src/main/generated"
     generationPath = "proxy"
 }
@@ -25,6 +25,8 @@ test {
 }
 
 jar {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
     manifest {
         attributes(
                 'Main-Class': 'cz.senslog.analyzer.app.Main'
@@ -36,30 +38,31 @@ jar {
 }
 
 dependencies {
-    testCompile group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.6.0'
-    testCompile group: 'org.mockito', name: 'mockito-core', version: '3.6.28'
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.9.3'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.4.0'
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.20.0'
+
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.20.0'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.20.0'
 
-    compile group: 'com.beust', name: 'jcommander', version: '1.78'
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.9'
-    implementation group: 'org.yaml', name: 'snakeyaml', version: '1.29'
-    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
-    implementation group: 'org.everit.json', name: 'org.everit.json.schema', version: '1.5.1'
-    implementation group: 'javax.mail', name: 'javax.mail-api', version: '1.6.2'
-    implementation group: 'com.sun.mail', name: 'javax.mail', version: '1.6.2'
+    implementation group: 'com.beust', name: 'jcommander', version: '1.82'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
+    implementation group: 'org.yaml', name: 'snakeyaml', version: '2.0'
 
-    compile group: 'io.vertx', name: 'vertx-core', version: '4.2.1'
-    compile group: 'io.vertx', name: 'vertx-web', version: '4.2.1'
-    annotationProcessor 'io.vertx:vertx-codegen:4.2.1:processor'
-    annotationProcessor 'io.vertx:vertx-service-proxy:4.2.1'
+    implementation group: 'jakarta.mail', name: 'jakarta.mail-api', version: '2.1.2'
+    implementation group: 'com.sun.mail', name: 'jakarta.mail', version: '2.0.1'
 
+    implementation group: 'io.vertx', name: 'vertx-core', version: '4.4.3'
+    implementation group: 'io.vertx', name: 'vertx-web', version: '4.4.3'
+    annotationProcessor 'io.vertx:vertx-codegen:4.4.3:processor'
+    annotationProcessor 'io.vertx:vertx-service-proxy:4.4.3'
 
-    compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.17.0'
-    compile group: 'org.jdbi', name: 'jdbi3-postgres', version: '3.12.2'
-    compile group: 'org.jdbi', name: 'jdbi3-jodatime2', version: '3.12.2'
-    compile group: 'com.zaxxer', name: 'HikariCP', version: '3.4.2'
-    compile group: 'org.postgresql', name: 'postgresql', version: '42.2.10'
-    compile group: 'com.h2database', name: 'h2', version: '1.4.200'
+    implementation group: 'org.jdbi', name: 'jdbi3-postgres', version: '3.39.1'
+    implementation group: 'org.jdbi', name: 'jdbi3-jodatime2', version: '3.39.1'
+    implementation group: 'org.postgresql', name: 'postgresql', version: '42.6.0'
+    implementation group: 'com.h2database', name: 'h2', version: '2.1.214'
+    implementation group: 'com.zaxxer', name: 'HikariCP', version: '5.0.1'
 
-    implementation 'com.google.dagger:dagger:2.40.3'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.40.3'
+    implementation group: 'com.google.dagger', name: 'dagger', version: '2.46.1'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.46.1'
 }

+ 1 - 1
gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx10248m -XX:MaxPermSize=256m
+#org.gradle.jvmargs=-Xmx10248m -XX:MaxPermSize=256m
 org.gradle.workers.max=4
 org.gradle.parallel=true

+ 1 - 1
settings.gradle

@@ -1,2 +1,2 @@
-rootProject.name = 'analyzer'
+rootProject.name = 'analytics'
 

+ 0 - 68
src/main/generated/proxy/cz/senslog/analyzer/analysis/AnalyzerModule_ProvideSimpleAnalyzerFactory.java

@@ -1,68 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.analysis;
-
-import cz.senslog.analyzer.analysis.module.FilterHandler;
-import cz.senslog.analyzer.analysis.module.ThresholdHandler;
-import cz.senslog.analyzer.core.EventBus;
-import cz.senslog.analyzer.core.api.BlockingHandler;
-import cz.senslog.analyzer.domain.DoubleStatistics;
-import cz.senslog.analyzer.domain.Observation;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class AnalyzerModule_ProvideSimpleAnalyzerFactory implements Factory<Analyzer<Observation>> {
-  private final AnalyzerModule module;
-
-  private final Provider<FilterHandler<Observation>> sensorFilterHandlerProvider;
-
-  private final Provider<ThresholdHandler<Observation>> sensorThresholdHandlerProvider;
-
-  private final Provider<BlockingHandler<Observation, DoubleStatistics>> aggregateCollectorHandlerProvider;
-
-  private final Provider<ThresholdHandler<DoubleStatistics>> groupThresholdHandlerProvider;
-
-  private final Provider<EventBus> eventBusProvider;
-
-  public AnalyzerModule_ProvideSimpleAnalyzerFactory(AnalyzerModule module,
-      Provider<FilterHandler<Observation>> sensorFilterHandlerProvider,
-      Provider<ThresholdHandler<Observation>> sensorThresholdHandlerProvider,
-      Provider<BlockingHandler<Observation, DoubleStatistics>> aggregateCollectorHandlerProvider,
-      Provider<ThresholdHandler<DoubleStatistics>> groupThresholdHandlerProvider,
-      Provider<EventBus> eventBusProvider) {
-    this.module = module;
-    this.sensorFilterHandlerProvider = sensorFilterHandlerProvider;
-    this.sensorThresholdHandlerProvider = sensorThresholdHandlerProvider;
-    this.aggregateCollectorHandlerProvider = aggregateCollectorHandlerProvider;
-    this.groupThresholdHandlerProvider = groupThresholdHandlerProvider;
-    this.eventBusProvider = eventBusProvider;
-  }
-
-  @Override
-  public Analyzer<Observation> get() {
-    return provideSimpleAnalyzer(module, sensorFilterHandlerProvider.get(), sensorThresholdHandlerProvider.get(), aggregateCollectorHandlerProvider.get(), groupThresholdHandlerProvider.get(), eventBusProvider.get());
-  }
-
-  public static AnalyzerModule_ProvideSimpleAnalyzerFactory create(AnalyzerModule module,
-      Provider<FilterHandler<Observation>> sensorFilterHandlerProvider,
-      Provider<ThresholdHandler<Observation>> sensorThresholdHandlerProvider,
-      Provider<BlockingHandler<Observation, DoubleStatistics>> aggregateCollectorHandlerProvider,
-      Provider<ThresholdHandler<DoubleStatistics>> groupThresholdHandlerProvider,
-      Provider<EventBus> eventBusProvider) {
-    return new AnalyzerModule_ProvideSimpleAnalyzerFactory(module, sensorFilterHandlerProvider, sensorThresholdHandlerProvider, aggregateCollectorHandlerProvider, groupThresholdHandlerProvider, eventBusProvider);
-  }
-
-  public static Analyzer<Observation> provideSimpleAnalyzer(AnalyzerModule instance,
-      FilterHandler<Observation> sensorFilterHandler,
-      ThresholdHandler<Observation> sensorThresholdHandler,
-      BlockingHandler<Observation, DoubleStatistics> aggregateCollectorHandler,
-      ThresholdHandler<DoubleStatistics> groupThresholdHandler, EventBus eventBus) {
-    return Preconditions.checkNotNullFromProvides(instance.provideSimpleAnalyzer(sensorFilterHandler, sensorThresholdHandler, aggregateCollectorHandler, groupThresholdHandler, eventBus));
-  }
-}

+ 0 - 180
src/main/generated/proxy/cz/senslog/analyzer/analysis/DaggerAnalyzerComponent.java

@@ -1,180 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.analysis;
-
-import cz.senslog.analyzer.analysis.module.FilterHandler;
-import cz.senslog.analyzer.analysis.module.HandlersModule;
-import cz.senslog.analyzer.analysis.module.HandlersModule_ProvideFilterHandlerFactory;
-import cz.senslog.analyzer.analysis.module.HandlersModule_ProvideGroupThresholdHandlerFactory;
-import cz.senslog.analyzer.analysis.module.HandlersModule_ProvideObservationCollectorFactory;
-import cz.senslog.analyzer.analysis.module.HandlersModule_ProvideSensorThresholdHandlerFactory;
-import cz.senslog.analyzer.analysis.module.ThresholdHandler;
-import cz.senslog.analyzer.core.EventBus;
-import cz.senslog.analyzer.core.EventBusModule;
-import cz.senslog.analyzer.core.EventBusModule_ProvideEventBusFactory;
-import cz.senslog.analyzer.core.api.BlockingHandler;
-import cz.senslog.analyzer.core.config.ConfigurationModule;
-import cz.senslog.analyzer.core.config.ConfigurationModule_EventBusConfigFactory;
-import cz.senslog.analyzer.core.config.domain.EventBusConfig;
-import cz.senslog.analyzer.domain.DoubleStatistics;
-import cz.senslog.analyzer.domain.Observation;
-import cz.senslog.analyzer.storage.ConnectionModule;
-import cz.senslog.analyzer.storage.ConnectionModule_ProvideInMemoryStorageConnectionFactory;
-import cz.senslog.analyzer.storage.ConnectionModule_ProvidePermanentStorageConnectionFactory;
-import cz.senslog.analyzer.storage.RepositoryModule;
-import cz.senslog.analyzer.storage.RepositoryModule_ProvideCollectedStatisticsRepositoryFactory;
-import cz.senslog.analyzer.storage.RepositoryModule_ProvideObservationRepositoryFactory;
-import cz.senslog.analyzer.storage.RepositoryModule_ProvideScheduledDatabaseRepositoryFactory;
-import cz.senslog.analyzer.storage.RepositoryModule_ProvideStatisticsConfigRepositoryFactory;
-import cz.senslog.analyzer.storage.RepositoryModule_ProvideStatisticsRepositoryFactory;
-import cz.senslog.analyzer.storage.inmemory.InMemoryConnection;
-import cz.senslog.analyzer.storage.inmemory.repository.CollectedStatisticsRepository;
-import cz.senslog.analyzer.storage.inmemory.repository.TimestampRepository;
-import cz.senslog.analyzer.storage.permanent.PermanentConnection;
-import cz.senslog.analyzer.storage.permanent.repository.SensLogRepository;
-import cz.senslog.analyzer.storage.permanent.repository.StatisticsConfigRepository;
-import cz.senslog.analyzer.storage.permanent.repository.StatisticsRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.DoubleCheck;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class DaggerAnalyzerComponent implements AnalyzerComponent {
-  private final AnalyzerModule analyzerModule;
-
-  private final DaggerAnalyzerComponent analyzerComponent = this;
-
-  private Provider<PermanentConnection> providePermanentStorageConnectionProvider;
-
-  private Provider<StatisticsConfigRepository> provideStatisticsConfigRepositoryProvider;
-
-  private Provider<FilterHandler<Observation>> provideFilterHandlerProvider;
-
-  private Provider<ThresholdHandler<Observation>> provideSensorThresholdHandlerProvider;
-
-  private Provider<InMemoryConnection> provideInMemoryStorageConnectionProvider;
-
-  private Provider<CollectedStatisticsRepository> provideCollectedStatisticsRepositoryProvider;
-
-  private Provider<TimestampRepository> provideScheduledDatabaseRepositoryProvider;
-
-  private Provider<BlockingHandler<Observation, DoubleStatistics>> provideObservationCollectorProvider;
-
-  private Provider<ThresholdHandler<DoubleStatistics>> provideGroupThresholdHandlerProvider;
-
-  private Provider<EventBusConfig> eventBusConfigProvider;
-
-  private Provider<StatisticsRepository> provideStatisticsRepositoryProvider;
-
-  private Provider<SensLogRepository> provideObservationRepositoryProvider;
-
-  private Provider<EventBus> provideEventBusProvider;
-
-  private DaggerAnalyzerComponent(AnalyzerModule analyzerModuleParam,
-      HandlersModule handlersModuleParam, RepositoryModule repositoryModuleParam,
-      ConnectionModule connectionModuleParam, ConfigurationModule configurationModuleParam,
-      EventBusModule eventBusModuleParam) {
-    this.analyzerModule = analyzerModuleParam;
-    initialize(analyzerModuleParam, handlersModuleParam, repositoryModuleParam, connectionModuleParam, configurationModuleParam, eventBusModuleParam);
-
-  }
-
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  @SuppressWarnings("unchecked")
-  private void initialize(final AnalyzerModule analyzerModuleParam,
-      final HandlersModule handlersModuleParam, final RepositoryModule repositoryModuleParam,
-      final ConnectionModule connectionModuleParam,
-      final ConfigurationModule configurationModuleParam,
-      final EventBusModule eventBusModuleParam) {
-    this.providePermanentStorageConnectionProvider = DoubleCheck.provider(ConnectionModule_ProvidePermanentStorageConnectionFactory.create(connectionModuleParam));
-    this.provideStatisticsConfigRepositoryProvider = DoubleCheck.provider(RepositoryModule_ProvideStatisticsConfigRepositoryFactory.create(repositoryModuleParam, providePermanentStorageConnectionProvider));
-    this.provideFilterHandlerProvider = DoubleCheck.provider(HandlersModule_ProvideFilterHandlerFactory.create(handlersModuleParam, provideStatisticsConfigRepositoryProvider));
-    this.provideSensorThresholdHandlerProvider = DoubleCheck.provider(HandlersModule_ProvideSensorThresholdHandlerFactory.create(handlersModuleParam, provideStatisticsConfigRepositoryProvider));
-    this.provideInMemoryStorageConnectionProvider = DoubleCheck.provider(ConnectionModule_ProvideInMemoryStorageConnectionFactory.create(connectionModuleParam));
-    this.provideCollectedStatisticsRepositoryProvider = DoubleCheck.provider(RepositoryModule_ProvideCollectedStatisticsRepositoryFactory.create(repositoryModuleParam, provideInMemoryStorageConnectionProvider));
-    this.provideScheduledDatabaseRepositoryProvider = DoubleCheck.provider(RepositoryModule_ProvideScheduledDatabaseRepositoryFactory.create(repositoryModuleParam, provideInMemoryStorageConnectionProvider));
-    this.provideObservationCollectorProvider = DoubleCheck.provider(HandlersModule_ProvideObservationCollectorFactory.create(handlersModuleParam, provideStatisticsConfigRepositoryProvider, provideCollectedStatisticsRepositoryProvider, provideScheduledDatabaseRepositoryProvider));
-    this.provideGroupThresholdHandlerProvider = DoubleCheck.provider(HandlersModule_ProvideGroupThresholdHandlerFactory.create(handlersModuleParam, provideStatisticsConfigRepositoryProvider));
-    this.eventBusConfigProvider = DoubleCheck.provider(ConfigurationModule_EventBusConfigFactory.create(configurationModuleParam));
-    this.provideStatisticsRepositoryProvider = DoubleCheck.provider(RepositoryModule_ProvideStatisticsRepositoryFactory.create(repositoryModuleParam, providePermanentStorageConnectionProvider));
-    this.provideObservationRepositoryProvider = DoubleCheck.provider(RepositoryModule_ProvideObservationRepositoryFactory.create(repositoryModuleParam, providePermanentStorageConnectionProvider));
-    this.provideEventBusProvider = DoubleCheck.provider(EventBusModule_ProvideEventBusFactory.create(eventBusModuleParam, eventBusConfigProvider, provideStatisticsRepositoryProvider, provideObservationRepositoryProvider));
-  }
-
-  @Override
-  public Analyzer<Observation> createObservationAnalyzer() {
-    return AnalyzerModule_ProvideSimpleAnalyzerFactory.provideSimpleAnalyzer(analyzerModule, provideFilterHandlerProvider.get(), provideSensorThresholdHandlerProvider.get(), provideObservationCollectorProvider.get(), provideGroupThresholdHandlerProvider.get(), provideEventBusProvider.get());
-  }
-
-  public static final class Builder {
-    private AnalyzerModule analyzerModule;
-
-    private HandlersModule handlersModule;
-
-    private RepositoryModule repositoryModule;
-
-    private ConnectionModule connectionModule;
-
-    private ConfigurationModule configurationModule;
-
-    private EventBusModule eventBusModule;
-
-    private Builder() {
-    }
-
-    public Builder analyzerModule(AnalyzerModule analyzerModule) {
-      this.analyzerModule = Preconditions.checkNotNull(analyzerModule);
-      return this;
-    }
-
-    public Builder handlersModule(HandlersModule handlersModule) {
-      this.handlersModule = Preconditions.checkNotNull(handlersModule);
-      return this;
-    }
-
-    public Builder repositoryModule(RepositoryModule repositoryModule) {
-      this.repositoryModule = Preconditions.checkNotNull(repositoryModule);
-      return this;
-    }
-
-    public Builder connectionModule(ConnectionModule connectionModule) {
-      this.connectionModule = Preconditions.checkNotNull(connectionModule);
-      return this;
-    }
-
-    public Builder configurationModule(ConfigurationModule configurationModule) {
-      this.configurationModule = Preconditions.checkNotNull(configurationModule);
-      return this;
-    }
-
-    public Builder eventBusModule(EventBusModule eventBusModule) {
-      this.eventBusModule = Preconditions.checkNotNull(eventBusModule);
-      return this;
-    }
-
-    public AnalyzerComponent build() {
-      if (analyzerModule == null) {
-        this.analyzerModule = new AnalyzerModule();
-      }
-      if (handlersModule == null) {
-        this.handlersModule = new HandlersModule();
-      }
-      if (repositoryModule == null) {
-        this.repositoryModule = new RepositoryModule();
-      }
-      Preconditions.checkBuilderRequirement(connectionModule, ConnectionModule.class);
-      Preconditions.checkBuilderRequirement(configurationModule, ConfigurationModule.class);
-      if (eventBusModule == null) {
-        this.eventBusModule = new EventBusModule();
-      }
-      return new DaggerAnalyzerComponent(analyzerModule, handlersModule, repositoryModule, connectionModule, configurationModule, eventBusModule);
-    }
-  }
-}

+ 0 - 41
src/main/generated/proxy/cz/senslog/analyzer/analysis/module/HandlersModule_ProvideFilterHandlerFactory.java

@@ -1,41 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.analysis.module;
-
-import cz.senslog.analyzer.domain.Observation;
-import cz.senslog.analyzer.storage.permanent.repository.StatisticsConfigRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class HandlersModule_ProvideFilterHandlerFactory implements Factory<FilterHandler<Observation>> {
-  private final HandlersModule module;
-
-  private final Provider<StatisticsConfigRepository> repositoryProvider;
-
-  public HandlersModule_ProvideFilterHandlerFactory(HandlersModule module,
-      Provider<StatisticsConfigRepository> repositoryProvider) {
-    this.module = module;
-    this.repositoryProvider = repositoryProvider;
-  }
-
-  @Override
-  public FilterHandler<Observation> get() {
-    return provideFilterHandler(module, repositoryProvider.get());
-  }
-
-  public static HandlersModule_ProvideFilterHandlerFactory create(HandlersModule module,
-      Provider<StatisticsConfigRepository> repositoryProvider) {
-    return new HandlersModule_ProvideFilterHandlerFactory(module, repositoryProvider);
-  }
-
-  public static FilterHandler<Observation> provideFilterHandler(HandlersModule instance,
-      StatisticsConfigRepository repository) {
-    return Preconditions.checkNotNullFromProvides(instance.provideFilterHandler(repository));
-  }
-}

+ 0 - 41
src/main/generated/proxy/cz/senslog/analyzer/analysis/module/HandlersModule_ProvideGroupThresholdHandlerFactory.java

@@ -1,41 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.analysis.module;
-
-import cz.senslog.analyzer.domain.DoubleStatistics;
-import cz.senslog.analyzer.storage.permanent.repository.StatisticsConfigRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class HandlersModule_ProvideGroupThresholdHandlerFactory implements Factory<ThresholdHandler<DoubleStatistics>> {
-  private final HandlersModule module;
-
-  private final Provider<StatisticsConfigRepository> repositoryProvider;
-
-  public HandlersModule_ProvideGroupThresholdHandlerFactory(HandlersModule module,
-      Provider<StatisticsConfigRepository> repositoryProvider) {
-    this.module = module;
-    this.repositoryProvider = repositoryProvider;
-  }
-
-  @Override
-  public ThresholdHandler<DoubleStatistics> get() {
-    return provideGroupThresholdHandler(module, repositoryProvider.get());
-  }
-
-  public static HandlersModule_ProvideGroupThresholdHandlerFactory create(HandlersModule module,
-      Provider<StatisticsConfigRepository> repositoryProvider) {
-    return new HandlersModule_ProvideGroupThresholdHandlerFactory(module, repositoryProvider);
-  }
-
-  public static ThresholdHandler<DoubleStatistics> provideGroupThresholdHandler(
-      HandlersModule instance, StatisticsConfigRepository repository) {
-    return Preconditions.checkNotNullFromProvides(instance.provideGroupThresholdHandler(repository));
-  }
-}

+ 0 - 57
src/main/generated/proxy/cz/senslog/analyzer/analysis/module/HandlersModule_ProvideObservationCollectorFactory.java

@@ -1,57 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.analysis.module;
-
-import cz.senslog.analyzer.core.api.BlockingHandler;
-import cz.senslog.analyzer.domain.DoubleStatistics;
-import cz.senslog.analyzer.domain.Observation;
-import cz.senslog.analyzer.storage.inmemory.repository.CollectedStatisticsRepository;
-import cz.senslog.analyzer.storage.inmemory.repository.TimestampRepository;
-import cz.senslog.analyzer.storage.permanent.repository.StatisticsConfigRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class HandlersModule_ProvideObservationCollectorFactory implements Factory<BlockingHandler<Observation, DoubleStatistics>> {
-  private final HandlersModule module;
-
-  private final Provider<StatisticsConfigRepository> statisticsConfigRepositoryProvider;
-
-  private final Provider<CollectedStatisticsRepository> collectedStatisticsRepositoryProvider;
-
-  private final Provider<TimestampRepository> timestampRepositoryProvider;
-
-  public HandlersModule_ProvideObservationCollectorFactory(HandlersModule module,
-      Provider<StatisticsConfigRepository> statisticsConfigRepositoryProvider,
-      Provider<CollectedStatisticsRepository> collectedStatisticsRepositoryProvider,
-      Provider<TimestampRepository> timestampRepositoryProvider) {
-    this.module = module;
-    this.statisticsConfigRepositoryProvider = statisticsConfigRepositoryProvider;
-    this.collectedStatisticsRepositoryProvider = collectedStatisticsRepositoryProvider;
-    this.timestampRepositoryProvider = timestampRepositoryProvider;
-  }
-
-  @Override
-  public BlockingHandler<Observation, DoubleStatistics> get() {
-    return provideObservationCollector(module, statisticsConfigRepositoryProvider.get(), collectedStatisticsRepositoryProvider.get(), timestampRepositoryProvider.get());
-  }
-
-  public static HandlersModule_ProvideObservationCollectorFactory create(HandlersModule module,
-      Provider<StatisticsConfigRepository> statisticsConfigRepositoryProvider,
-      Provider<CollectedStatisticsRepository> collectedStatisticsRepositoryProvider,
-      Provider<TimestampRepository> timestampRepositoryProvider) {
-    return new HandlersModule_ProvideObservationCollectorFactory(module, statisticsConfigRepositoryProvider, collectedStatisticsRepositoryProvider, timestampRepositoryProvider);
-  }
-
-  public static BlockingHandler<Observation, DoubleStatistics> provideObservationCollector(
-      HandlersModule instance, StatisticsConfigRepository statisticsConfigRepository,
-      CollectedStatisticsRepository collectedStatisticsRepository,
-      TimestampRepository timestampRepository) {
-    return Preconditions.checkNotNullFromProvides(instance.provideObservationCollector(statisticsConfigRepository, collectedStatisticsRepository, timestampRepository));
-  }
-}

+ 0 - 41
src/main/generated/proxy/cz/senslog/analyzer/analysis/module/HandlersModule_ProvideSensorThresholdHandlerFactory.java

@@ -1,41 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.analysis.module;
-
-import cz.senslog.analyzer.domain.Observation;
-import cz.senslog.analyzer.storage.permanent.repository.StatisticsConfigRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class HandlersModule_ProvideSensorThresholdHandlerFactory implements Factory<ThresholdHandler<Observation>> {
-  private final HandlersModule module;
-
-  private final Provider<StatisticsConfigRepository> repositoryProvider;
-
-  public HandlersModule_ProvideSensorThresholdHandlerFactory(HandlersModule module,
-      Provider<StatisticsConfigRepository> repositoryProvider) {
-    this.module = module;
-    this.repositoryProvider = repositoryProvider;
-  }
-
-  @Override
-  public ThresholdHandler<Observation> get() {
-    return provideSensorThresholdHandler(module, repositoryProvider.get());
-  }
-
-  public static HandlersModule_ProvideSensorThresholdHandlerFactory create(HandlersModule module,
-      Provider<StatisticsConfigRepository> repositoryProvider) {
-    return new HandlersModule_ProvideSensorThresholdHandlerFactory(module, repositoryProvider);
-  }
-
-  public static ThresholdHandler<Observation> provideSensorThresholdHandler(HandlersModule instance,
-      StatisticsConfigRepository repository) {
-    return Preconditions.checkNotNullFromProvides(instance.provideSensorThresholdHandler(repository));
-  }
-}

+ 0 - 52
src/main/generated/proxy/cz/senslog/analyzer/core/EventBusModule_ProvideEventBusFactory.java

@@ -1,52 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.core;
-
-import cz.senslog.analyzer.core.config.domain.EventBusConfig;
-import cz.senslog.analyzer.storage.permanent.repository.SensLogRepository;
-import cz.senslog.analyzer.storage.permanent.repository.StatisticsRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class EventBusModule_ProvideEventBusFactory implements Factory<EventBus> {
-  private final EventBusModule module;
-
-  private final Provider<EventBusConfig> eventBusConfigProvider;
-
-  private final Provider<StatisticsRepository> statisticsRepositoryProvider;
-
-  private final Provider<SensLogRepository> senslogRepositoryProvider;
-
-  public EventBusModule_ProvideEventBusFactory(EventBusModule module,
-      Provider<EventBusConfig> eventBusConfigProvider,
-      Provider<StatisticsRepository> statisticsRepositoryProvider,
-      Provider<SensLogRepository> senslogRepositoryProvider) {
-    this.module = module;
-    this.eventBusConfigProvider = eventBusConfigProvider;
-    this.statisticsRepositoryProvider = statisticsRepositoryProvider;
-    this.senslogRepositoryProvider = senslogRepositoryProvider;
-  }
-
-  @Override
-  public EventBus get() {
-    return provideEventBus(module, eventBusConfigProvider.get(), statisticsRepositoryProvider.get(), senslogRepositoryProvider.get());
-  }
-
-  public static EventBusModule_ProvideEventBusFactory create(EventBusModule module,
-      Provider<EventBusConfig> eventBusConfigProvider,
-      Provider<StatisticsRepository> statisticsRepositoryProvider,
-      Provider<SensLogRepository> senslogRepositoryProvider) {
-    return new EventBusModule_ProvideEventBusFactory(module, eventBusConfigProvider, statisticsRepositoryProvider, senslogRepositoryProvider);
-  }
-
-  public static EventBus provideEventBus(EventBusModule instance, EventBusConfig eventBusConfig,
-      StatisticsRepository statisticsRepository, SensLogRepository senslogRepository) {
-    return Preconditions.checkNotNullFromProvides(instance.provideEventBus(eventBusConfig, statisticsRepository, senslogRepository));
-  }
-}

+ 0 - 33
src/main/generated/proxy/cz/senslog/analyzer/core/config/ConfigurationModule_EventBusConfigFactory.java

@@ -1,33 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.core.config;
-
-import cz.senslog.analyzer.core.config.domain.EventBusConfig;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class ConfigurationModule_EventBusConfigFactory implements Factory<EventBusConfig> {
-  private final ConfigurationModule module;
-
-  public ConfigurationModule_EventBusConfigFactory(ConfigurationModule module) {
-    this.module = module;
-  }
-
-  @Override
-  public EventBusConfig get() {
-    return eventBusConfig(module);
-  }
-
-  public static ConfigurationModule_EventBusConfigFactory create(ConfigurationModule module) {
-    return new ConfigurationModule_EventBusConfigFactory(module);
-  }
-
-  public static EventBusConfig eventBusConfig(ConfigurationModule instance) {
-    return Preconditions.checkNotNullFromProvides(instance.eventBusConfig());
-  }
-}

+ 0 - 33
src/main/generated/proxy/cz/senslog/analyzer/core/config/ConfigurationModule_StorageConfigFactory.java

@@ -1,33 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.core.config;
-
-import cz.senslog.analyzer.core.config.domain.StorageConfig;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class ConfigurationModule_StorageConfigFactory implements Factory<StorageConfig> {
-  private final ConfigurationModule module;
-
-  public ConfigurationModule_StorageConfigFactory(ConfigurationModule module) {
-    this.module = module;
-  }
-
-  @Override
-  public StorageConfig get() {
-    return storageConfig(module);
-  }
-
-  public static ConfigurationModule_StorageConfigFactory create(ConfigurationModule module) {
-    return new ConfigurationModule_StorageConfigFactory(module);
-  }
-
-  public static StorageConfig storageConfig(ConfigurationModule instance) {
-    return Preconditions.checkNotNullFromProvides(instance.storageConfig());
-  }
-}

+ 0 - 142
src/main/generated/proxy/cz/senslog/analyzer/provider/DaggerDataProviderComponent.java

@@ -1,142 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.provider;
-
-import cz.senslog.analyzer.core.config.ConfigurationModule;
-import cz.senslog.analyzer.storage.ConnectionModule;
-import cz.senslog.analyzer.storage.ConnectionModule_ProvideInMemoryStorageConnectionFactory;
-import cz.senslog.analyzer.storage.ConnectionModule_ProvidePermanentStorageConnectionFactory;
-import cz.senslog.analyzer.storage.RepositoryModule;
-import cz.senslog.analyzer.storage.RepositoryModule_ProvideObservationRepositoryFactory;
-import cz.senslog.analyzer.storage.RepositoryModule_ProvideScheduledDatabaseRepositoryFactory;
-import cz.senslog.analyzer.storage.inmemory.InMemoryConnection;
-import cz.senslog.analyzer.storage.inmemory.repository.TimestampRepository;
-import cz.senslog.analyzer.storage.permanent.PermanentConnection;
-import cz.senslog.analyzer.storage.permanent.repository.SensLogRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.DoubleCheck;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class DaggerDataProviderComponent implements DataProviderComponent {
-  private final DatabaseProviderModule databaseProviderModule;
-
-  private final HttpMiddlewareProviderModule httpMiddlewareProviderModule;
-
-  private final DaggerDataProviderComponent dataProviderComponent = this;
-
-  private Provider<InMemoryConnection> provideInMemoryStorageConnectionProvider;
-
-  private Provider<TimestampRepository> provideScheduledDatabaseRepositoryProvider;
-
-  private Provider<PermanentConnection> providePermanentStorageConnectionProvider;
-
-  private Provider<SensLogRepository> provideObservationRepositoryProvider;
-
-  private DaggerDataProviderComponent(DatabaseProviderModule databaseProviderModuleParam,
-      RepositoryModule repositoryModuleParam, ConnectionModule connectionModuleParam,
-      HttpMiddlewareProviderModule httpMiddlewareProviderModuleParam) {
-    this.databaseProviderModule = databaseProviderModuleParam;
-    this.httpMiddlewareProviderModule = httpMiddlewareProviderModuleParam;
-    initialize(databaseProviderModuleParam, repositoryModuleParam, connectionModuleParam, httpMiddlewareProviderModuleParam);
-
-  }
-
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  private ScheduledDatabaseProvider scheduledDatabaseProvider2() {
-    return DatabaseProviderModule_ProvideScheduleDatabaseProviderFactory.provideScheduleDatabaseProvider(databaseProviderModule, provideScheduledDatabaseRepositoryProvider.get(), provideObservationRepositoryProvider.get());
-  }
-
-  private LoopedDatabaseProvider loopedDatabaseProvider2() {
-    return DatabaseProviderModule_ProvideLoopedDatabaseProviderFactory.provideLoopedDatabaseProvider(databaseProviderModule, provideObservationRepositoryProvider.get());
-  }
-
-  @SuppressWarnings("unchecked")
-  private void initialize(final DatabaseProviderModule databaseProviderModuleParam,
-      final RepositoryModule repositoryModuleParam, final ConnectionModule connectionModuleParam,
-      final HttpMiddlewareProviderModule httpMiddlewareProviderModuleParam) {
-    this.provideInMemoryStorageConnectionProvider = DoubleCheck.provider(ConnectionModule_ProvideInMemoryStorageConnectionFactory.create(connectionModuleParam));
-    this.provideScheduledDatabaseRepositoryProvider = DoubleCheck.provider(RepositoryModule_ProvideScheduledDatabaseRepositoryFactory.create(repositoryModuleParam, provideInMemoryStorageConnectionProvider));
-    this.providePermanentStorageConnectionProvider = DoubleCheck.provider(ConnectionModule_ProvidePermanentStorageConnectionFactory.create(connectionModuleParam));
-    this.provideObservationRepositoryProvider = DoubleCheck.provider(RepositoryModule_ProvideObservationRepositoryFactory.create(repositoryModuleParam, providePermanentStorageConnectionProvider));
-  }
-
-  @Override
-  public ScheduledDataProviderConfig scheduledDatabaseProvider() {
-    return DatabaseProviderModule_ProvideScheduledProviderFactory.provideScheduledProvider(databaseProviderModule, scheduledDatabaseProvider2());
-  }
-
-  @Override
-  public LoopedDataProviderConfig loopedDatabaseProvider() {
-    return DatabaseProviderModule_ProvideLoopedProviderFactory.provideLoopedProvider(databaseProviderModule, loopedDatabaseProvider2());
-  }
-
-  @Override
-  public MiddlewareDataProviderConfig httpMiddlewareProvider() {
-    return HttpMiddlewareProviderModule_ProvideMiddlewareProviderFactory.provideMiddlewareProvider(httpMiddlewareProviderModule, HttpMiddlewareProviderModule_ProvideHttpMiddlewareProviderFactory.provideHttpMiddlewareProvider(httpMiddlewareProviderModule));
-  }
-
-  public static final class Builder {
-    private DatabaseProviderModule databaseProviderModule;
-
-    private RepositoryModule repositoryModule;
-
-    private ConnectionModule connectionModule;
-
-    private HttpMiddlewareProviderModule httpMiddlewareProviderModule;
-
-    private Builder() {
-    }
-
-    public Builder databaseProviderModule(DatabaseProviderModule databaseProviderModule) {
-      this.databaseProviderModule = Preconditions.checkNotNull(databaseProviderModule);
-      return this;
-    }
-
-    public Builder repositoryModule(RepositoryModule repositoryModule) {
-      this.repositoryModule = Preconditions.checkNotNull(repositoryModule);
-      return this;
-    }
-
-    public Builder connectionModule(ConnectionModule connectionModule) {
-      this.connectionModule = Preconditions.checkNotNull(connectionModule);
-      return this;
-    }
-
-    /**
-     * @deprecated This module is declared, but an instance is not used in the component. This method is a no-op. For more, see https://dagger.dev/unused-modules.
-     */
-    @Deprecated
-    public Builder configurationModule(ConfigurationModule configurationModule) {
-      Preconditions.checkNotNull(configurationModule);
-      return this;
-    }
-
-    public Builder httpMiddlewareProviderModule(
-        HttpMiddlewareProviderModule httpMiddlewareProviderModule) {
-      this.httpMiddlewareProviderModule = Preconditions.checkNotNull(httpMiddlewareProviderModule);
-      return this;
-    }
-
-    public DataProviderComponent build() {
-      if (databaseProviderModule == null) {
-        this.databaseProviderModule = new DatabaseProviderModule();
-      }
-      if (repositoryModule == null) {
-        this.repositoryModule = new RepositoryModule();
-      }
-      Preconditions.checkBuilderRequirement(connectionModule, ConnectionModule.class);
-      if (httpMiddlewareProviderModule == null) {
-        this.httpMiddlewareProviderModule = new HttpMiddlewareProviderModule();
-      }
-      return new DaggerDataProviderComponent(databaseProviderModule, repositoryModule, connectionModule, httpMiddlewareProviderModule);
-    }
-  }
-}

+ 0 - 40
src/main/generated/proxy/cz/senslog/analyzer/provider/DatabaseProviderModule_ProvideLoopedDatabaseProviderFactory.java

@@ -1,40 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.provider;
-
-import cz.senslog.analyzer.storage.permanent.repository.SensLogRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class DatabaseProviderModule_ProvideLoopedDatabaseProviderFactory implements Factory<LoopedDatabaseProvider> {
-  private final DatabaseProviderModule module;
-
-  private final Provider<SensLogRepository> sensLogRepositoryProvider;
-
-  public DatabaseProviderModule_ProvideLoopedDatabaseProviderFactory(DatabaseProviderModule module,
-      Provider<SensLogRepository> sensLogRepositoryProvider) {
-    this.module = module;
-    this.sensLogRepositoryProvider = sensLogRepositoryProvider;
-  }
-
-  @Override
-  public LoopedDatabaseProvider get() {
-    return provideLoopedDatabaseProvider(module, sensLogRepositoryProvider.get());
-  }
-
-  public static DatabaseProviderModule_ProvideLoopedDatabaseProviderFactory create(
-      DatabaseProviderModule module, Provider<SensLogRepository> sensLogRepositoryProvider) {
-    return new DatabaseProviderModule_ProvideLoopedDatabaseProviderFactory(module, sensLogRepositoryProvider);
-  }
-
-  public static LoopedDatabaseProvider provideLoopedDatabaseProvider(
-      DatabaseProviderModule instance, SensLogRepository sensLogRepository) {
-    return Preconditions.checkNotNullFromProvides(instance.provideLoopedDatabaseProvider(sensLogRepository));
-  }
-}

+ 0 - 39
src/main/generated/proxy/cz/senslog/analyzer/provider/DatabaseProviderModule_ProvideLoopedProviderFactory.java

@@ -1,39 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.provider;
-
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class DatabaseProviderModule_ProvideLoopedProviderFactory implements Factory<LoopedDataProviderConfig> {
-  private final DatabaseProviderModule module;
-
-  private final Provider<LoopedDatabaseProvider> providerProvider;
-
-  public DatabaseProviderModule_ProvideLoopedProviderFactory(DatabaseProviderModule module,
-      Provider<LoopedDatabaseProvider> providerProvider) {
-    this.module = module;
-    this.providerProvider = providerProvider;
-  }
-
-  @Override
-  public LoopedDataProviderConfig get() {
-    return provideLoopedProvider(module, providerProvider.get());
-  }
-
-  public static DatabaseProviderModule_ProvideLoopedProviderFactory create(
-      DatabaseProviderModule module, Provider<LoopedDatabaseProvider> providerProvider) {
-    return new DatabaseProviderModule_ProvideLoopedProviderFactory(module, providerProvider);
-  }
-
-  public static LoopedDataProviderConfig provideLoopedProvider(DatabaseProviderModule instance,
-      LoopedDatabaseProvider provider) {
-    return Preconditions.checkNotNullFromProvides(instance.provideLoopedProvider(provider));
-  }
-}

+ 0 - 47
src/main/generated/proxy/cz/senslog/analyzer/provider/DatabaseProviderModule_ProvideScheduleDatabaseProviderFactory.java

@@ -1,47 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.provider;
-
-import cz.senslog.analyzer.storage.inmemory.repository.TimestampRepository;
-import cz.senslog.analyzer.storage.permanent.repository.SensLogRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class DatabaseProviderModule_ProvideScheduleDatabaseProviderFactory implements Factory<ScheduledDatabaseProvider> {
-  private final DatabaseProviderModule module;
-
-  private final Provider<TimestampRepository> configRepositoryProvider;
-
-  private final Provider<SensLogRepository> sensLogRepositoryProvider;
-
-  public DatabaseProviderModule_ProvideScheduleDatabaseProviderFactory(
-      DatabaseProviderModule module, Provider<TimestampRepository> configRepositoryProvider,
-      Provider<SensLogRepository> sensLogRepositoryProvider) {
-    this.module = module;
-    this.configRepositoryProvider = configRepositoryProvider;
-    this.sensLogRepositoryProvider = sensLogRepositoryProvider;
-  }
-
-  @Override
-  public ScheduledDatabaseProvider get() {
-    return provideScheduleDatabaseProvider(module, configRepositoryProvider.get(), sensLogRepositoryProvider.get());
-  }
-
-  public static DatabaseProviderModule_ProvideScheduleDatabaseProviderFactory create(
-      DatabaseProviderModule module, Provider<TimestampRepository> configRepositoryProvider,
-      Provider<SensLogRepository> sensLogRepositoryProvider) {
-    return new DatabaseProviderModule_ProvideScheduleDatabaseProviderFactory(module, configRepositoryProvider, sensLogRepositoryProvider);
-  }
-
-  public static ScheduledDatabaseProvider provideScheduleDatabaseProvider(
-      DatabaseProviderModule instance, TimestampRepository configRepository,
-      SensLogRepository sensLogRepository) {
-    return Preconditions.checkNotNullFromProvides(instance.provideScheduleDatabaseProvider(configRepository, sensLogRepository));
-  }
-}

+ 0 - 39
src/main/generated/proxy/cz/senslog/analyzer/provider/DatabaseProviderModule_ProvideScheduledProviderFactory.java

@@ -1,39 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.provider;
-
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class DatabaseProviderModule_ProvideScheduledProviderFactory implements Factory<ScheduledDataProviderConfig> {
-  private final DatabaseProviderModule module;
-
-  private final Provider<ScheduledDatabaseProvider> providerProvider;
-
-  public DatabaseProviderModule_ProvideScheduledProviderFactory(DatabaseProviderModule module,
-      Provider<ScheduledDatabaseProvider> providerProvider) {
-    this.module = module;
-    this.providerProvider = providerProvider;
-  }
-
-  @Override
-  public ScheduledDataProviderConfig get() {
-    return provideScheduledProvider(module, providerProvider.get());
-  }
-
-  public static DatabaseProviderModule_ProvideScheduledProviderFactory create(
-      DatabaseProviderModule module, Provider<ScheduledDatabaseProvider> providerProvider) {
-    return new DatabaseProviderModule_ProvideScheduledProviderFactory(module, providerProvider);
-  }
-
-  public static ScheduledDataProviderConfig provideScheduledProvider(
-      DatabaseProviderModule instance, ScheduledDatabaseProvider provider) {
-    return Preconditions.checkNotNullFromProvides(instance.provideScheduledProvider(provider));
-  }
-}

+ 0 - 35
src/main/generated/proxy/cz/senslog/analyzer/provider/HttpMiddlewareProviderModule_ProvideHttpMiddlewareProviderFactory.java

@@ -1,35 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.provider;
-
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class HttpMiddlewareProviderModule_ProvideHttpMiddlewareProviderFactory implements Factory<HttpMiddlewareProvider> {
-  private final HttpMiddlewareProviderModule module;
-
-  public HttpMiddlewareProviderModule_ProvideHttpMiddlewareProviderFactory(
-      HttpMiddlewareProviderModule module) {
-    this.module = module;
-  }
-
-  @Override
-  public HttpMiddlewareProvider get() {
-    return provideHttpMiddlewareProvider(module);
-  }
-
-  public static HttpMiddlewareProviderModule_ProvideHttpMiddlewareProviderFactory create(
-      HttpMiddlewareProviderModule module) {
-    return new HttpMiddlewareProviderModule_ProvideHttpMiddlewareProviderFactory(module);
-  }
-
-  public static HttpMiddlewareProvider provideHttpMiddlewareProvider(
-      HttpMiddlewareProviderModule instance) {
-    return Preconditions.checkNotNullFromProvides(instance.provideHttpMiddlewareProvider());
-  }
-}

+ 0 - 39
src/main/generated/proxy/cz/senslog/analyzer/provider/HttpMiddlewareProviderModule_ProvideMiddlewareProviderFactory.java

@@ -1,39 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.provider;
-
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class HttpMiddlewareProviderModule_ProvideMiddlewareProviderFactory implements Factory<MiddlewareDataProviderConfig> {
-  private final HttpMiddlewareProviderModule module;
-
-  private final Provider<HttpMiddlewareProvider> providerProvider;
-
-  public HttpMiddlewareProviderModule_ProvideMiddlewareProviderFactory(
-      HttpMiddlewareProviderModule module, Provider<HttpMiddlewareProvider> providerProvider) {
-    this.module = module;
-    this.providerProvider = providerProvider;
-  }
-
-  @Override
-  public MiddlewareDataProviderConfig get() {
-    return provideMiddlewareProvider(module, providerProvider.get());
-  }
-
-  public static HttpMiddlewareProviderModule_ProvideMiddlewareProviderFactory create(
-      HttpMiddlewareProviderModule module, Provider<HttpMiddlewareProvider> providerProvider) {
-    return new HttpMiddlewareProviderModule_ProvideMiddlewareProviderFactory(module, providerProvider);
-  }
-
-  public static MiddlewareDataProviderConfig provideMiddlewareProvider(
-      HttpMiddlewareProviderModule instance, HttpMiddlewareProvider provider) {
-    return Preconditions.checkNotNullFromProvides(instance.provideMiddlewareProvider(provider));
-  }
-}

+ 0 - 29
src/main/generated/proxy/cz/senslog/analyzer/provider/HttpMiddlewareProvider_Factory.java

@@ -1,29 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.provider;
-
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class HttpMiddlewareProvider_Factory implements Factory<HttpMiddlewareProvider> {
-  @Override
-  public HttpMiddlewareProvider get() {
-    return newInstance();
-  }
-
-  public static HttpMiddlewareProvider_Factory create() {
-    return InstanceHolder.INSTANCE;
-  }
-
-  public static HttpMiddlewareProvider newInstance() {
-    return new HttpMiddlewareProvider();
-  }
-
-  private static final class InstanceHolder {
-    private static final HttpMiddlewareProvider_Factory INSTANCE = new HttpMiddlewareProvider_Factory();
-  }
-}

+ 0 - 34
src/main/generated/proxy/cz/senslog/analyzer/provider/LoopedDatabaseProvider_Factory.java

@@ -1,34 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.provider;
-
-import cz.senslog.analyzer.storage.permanent.repository.SensLogRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class LoopedDatabaseProvider_Factory implements Factory<LoopedDatabaseProvider> {
-  private final Provider<SensLogRepository> sensLogRepositoryProvider;
-
-  public LoopedDatabaseProvider_Factory(Provider<SensLogRepository> sensLogRepositoryProvider) {
-    this.sensLogRepositoryProvider = sensLogRepositoryProvider;
-  }
-
-  @Override
-  public LoopedDatabaseProvider get() {
-    return newInstance(sensLogRepositoryProvider.get());
-  }
-
-  public static LoopedDatabaseProvider_Factory create(
-      Provider<SensLogRepository> sensLogRepositoryProvider) {
-    return new LoopedDatabaseProvider_Factory(sensLogRepositoryProvider);
-  }
-
-  public static LoopedDatabaseProvider newInstance(SensLogRepository sensLogRepository) {
-    return new LoopedDatabaseProvider(sensLogRepository);
-  }
-}

+ 0 - 41
src/main/generated/proxy/cz/senslog/analyzer/provider/ScheduledDatabaseProvider_Factory.java

@@ -1,41 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.provider;
-
-import cz.senslog.analyzer.storage.inmemory.repository.TimestampRepository;
-import cz.senslog.analyzer.storage.permanent.repository.SensLogRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class ScheduledDatabaseProvider_Factory implements Factory<ScheduledDatabaseProvider> {
-  private final Provider<TimestampRepository> configRepositoryProvider;
-
-  private final Provider<SensLogRepository> sensLogRepositoryProvider;
-
-  public ScheduledDatabaseProvider_Factory(Provider<TimestampRepository> configRepositoryProvider,
-      Provider<SensLogRepository> sensLogRepositoryProvider) {
-    this.configRepositoryProvider = configRepositoryProvider;
-    this.sensLogRepositoryProvider = sensLogRepositoryProvider;
-  }
-
-  @Override
-  public ScheduledDatabaseProvider get() {
-    return newInstance(configRepositoryProvider.get(), sensLogRepositoryProvider.get());
-  }
-
-  public static ScheduledDatabaseProvider_Factory create(
-      Provider<TimestampRepository> configRepositoryProvider,
-      Provider<SensLogRepository> sensLogRepositoryProvider) {
-    return new ScheduledDatabaseProvider_Factory(configRepositoryProvider, sensLogRepositoryProvider);
-  }
-
-  public static ScheduledDatabaseProvider newInstance(TimestampRepository configRepository,
-      SensLogRepository sensLogRepository) {
-    return new ScheduledDatabaseProvider(configRepository, sensLogRepository);
-  }
-}

+ 0 - 33
src/main/generated/proxy/cz/senslog/analyzer/storage/ConnectionModule_Factory.java

@@ -1,33 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.storage;
-
-import cz.senslog.analyzer.core.config.domain.StorageConfig;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class ConnectionModule_Factory implements Factory<ConnectionModule> {
-  private final Provider<StorageConfig> configProvider;
-
-  public ConnectionModule_Factory(Provider<StorageConfig> configProvider) {
-    this.configProvider = configProvider;
-  }
-
-  @Override
-  public ConnectionModule get() {
-    return newInstance(configProvider.get());
-  }
-
-  public static ConnectionModule_Factory create(Provider<StorageConfig> configProvider) {
-    return new ConnectionModule_Factory(configProvider);
-  }
-
-  public static ConnectionModule newInstance(StorageConfig config) {
-    return new ConnectionModule(config);
-  }
-}

+ 0 - 34
src/main/generated/proxy/cz/senslog/analyzer/storage/ConnectionModule_ProvideInMemoryStorageConnectionFactory.java

@@ -1,34 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.storage;
-
-import cz.senslog.analyzer.storage.inmemory.InMemoryConnection;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class ConnectionModule_ProvideInMemoryStorageConnectionFactory implements Factory<InMemoryConnection> {
-  private final ConnectionModule module;
-
-  public ConnectionModule_ProvideInMemoryStorageConnectionFactory(ConnectionModule module) {
-    this.module = module;
-  }
-
-  @Override
-  public InMemoryConnection get() {
-    return provideInMemoryStorageConnection(module);
-  }
-
-  public static ConnectionModule_ProvideInMemoryStorageConnectionFactory create(
-      ConnectionModule module) {
-    return new ConnectionModule_ProvideInMemoryStorageConnectionFactory(module);
-  }
-
-  public static InMemoryConnection provideInMemoryStorageConnection(ConnectionModule instance) {
-    return Preconditions.checkNotNullFromProvides(instance.provideInMemoryStorageConnection());
-  }
-}

+ 0 - 34
src/main/generated/proxy/cz/senslog/analyzer/storage/ConnectionModule_ProvidePermanentStorageConnectionFactory.java

@@ -1,34 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.storage;
-
-import cz.senslog.analyzer.storage.permanent.PermanentConnection;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class ConnectionModule_ProvidePermanentStorageConnectionFactory implements Factory<PermanentConnection> {
-  private final ConnectionModule module;
-
-  public ConnectionModule_ProvidePermanentStorageConnectionFactory(ConnectionModule module) {
-    this.module = module;
-  }
-
-  @Override
-  public PermanentConnection get() {
-    return providePermanentStorageConnection(module);
-  }
-
-  public static ConnectionModule_ProvidePermanentStorageConnectionFactory create(
-      ConnectionModule module) {
-    return new ConnectionModule_ProvidePermanentStorageConnectionFactory(module);
-  }
-
-  public static PermanentConnection providePermanentStorageConnection(ConnectionModule instance) {
-    return Preconditions.checkNotNullFromProvides(instance.providePermanentStorageConnection());
-  }
-}

+ 0 - 41
src/main/generated/proxy/cz/senslog/analyzer/storage/RepositoryModule_ProvideCollectedStatisticsRepositoryFactory.java

@@ -1,41 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.storage;
-
-import cz.senslog.analyzer.storage.inmemory.InMemoryConnection;
-import cz.senslog.analyzer.storage.inmemory.repository.CollectedStatisticsRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class RepositoryModule_ProvideCollectedStatisticsRepositoryFactory implements Factory<CollectedStatisticsRepository> {
-  private final RepositoryModule module;
-
-  private final Provider<InMemoryConnection> connectionProvider;
-
-  public RepositoryModule_ProvideCollectedStatisticsRepositoryFactory(RepositoryModule module,
-      Provider<InMemoryConnection> connectionProvider) {
-    this.module = module;
-    this.connectionProvider = connectionProvider;
-  }
-
-  @Override
-  public CollectedStatisticsRepository get() {
-    return provideCollectedStatisticsRepository(module, connectionProvider.get());
-  }
-
-  public static RepositoryModule_ProvideCollectedStatisticsRepositoryFactory create(
-      RepositoryModule module, Provider<InMemoryConnection> connectionProvider) {
-    return new RepositoryModule_ProvideCollectedStatisticsRepositoryFactory(module, connectionProvider);
-  }
-
-  public static CollectedStatisticsRepository provideCollectedStatisticsRepository(
-      RepositoryModule instance, InMemoryConnection connection) {
-    return Preconditions.checkNotNullFromProvides(instance.provideCollectedStatisticsRepository(connection));
-  }
-}

+ 0 - 41
src/main/generated/proxy/cz/senslog/analyzer/storage/RepositoryModule_ProvideObservationRepositoryFactory.java

@@ -1,41 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.storage;
-
-import cz.senslog.analyzer.storage.permanent.PermanentConnection;
-import cz.senslog.analyzer.storage.permanent.repository.SensLogRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class RepositoryModule_ProvideObservationRepositoryFactory implements Factory<SensLogRepository> {
-  private final RepositoryModule module;
-
-  private final Provider<PermanentConnection> connectionProvider;
-
-  public RepositoryModule_ProvideObservationRepositoryFactory(RepositoryModule module,
-      Provider<PermanentConnection> connectionProvider) {
-    this.module = module;
-    this.connectionProvider = connectionProvider;
-  }
-
-  @Override
-  public SensLogRepository get() {
-    return provideObservationRepository(module, connectionProvider.get());
-  }
-
-  public static RepositoryModule_ProvideObservationRepositoryFactory create(RepositoryModule module,
-      Provider<PermanentConnection> connectionProvider) {
-    return new RepositoryModule_ProvideObservationRepositoryFactory(module, connectionProvider);
-  }
-
-  public static SensLogRepository provideObservationRepository(RepositoryModule instance,
-      PermanentConnection connection) {
-    return Preconditions.checkNotNullFromProvides(instance.provideObservationRepository(connection));
-  }
-}

+ 0 - 41
src/main/generated/proxy/cz/senslog/analyzer/storage/RepositoryModule_ProvideScheduledDatabaseRepositoryFactory.java

@@ -1,41 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.storage;
-
-import cz.senslog.analyzer.storage.inmemory.InMemoryConnection;
-import cz.senslog.analyzer.storage.inmemory.repository.TimestampRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class RepositoryModule_ProvideScheduledDatabaseRepositoryFactory implements Factory<TimestampRepository> {
-  private final RepositoryModule module;
-
-  private final Provider<InMemoryConnection> connectionProvider;
-
-  public RepositoryModule_ProvideScheduledDatabaseRepositoryFactory(RepositoryModule module,
-      Provider<InMemoryConnection> connectionProvider) {
-    this.module = module;
-    this.connectionProvider = connectionProvider;
-  }
-
-  @Override
-  public TimestampRepository get() {
-    return provideScheduledDatabaseRepository(module, connectionProvider.get());
-  }
-
-  public static RepositoryModule_ProvideScheduledDatabaseRepositoryFactory create(
-      RepositoryModule module, Provider<InMemoryConnection> connectionProvider) {
-    return new RepositoryModule_ProvideScheduledDatabaseRepositoryFactory(module, connectionProvider);
-  }
-
-  public static TimestampRepository provideScheduledDatabaseRepository(RepositoryModule instance,
-      InMemoryConnection connection) {
-    return Preconditions.checkNotNullFromProvides(instance.provideScheduledDatabaseRepository(connection));
-  }
-}

+ 0 - 41
src/main/generated/proxy/cz/senslog/analyzer/storage/RepositoryModule_ProvideStatisticsConfigRepositoryFactory.java

@@ -1,41 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.storage;
-
-import cz.senslog.analyzer.storage.permanent.PermanentConnection;
-import cz.senslog.analyzer.storage.permanent.repository.StatisticsConfigRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class RepositoryModule_ProvideStatisticsConfigRepositoryFactory implements Factory<StatisticsConfigRepository> {
-  private final RepositoryModule module;
-
-  private final Provider<PermanentConnection> connectionProvider;
-
-  public RepositoryModule_ProvideStatisticsConfigRepositoryFactory(RepositoryModule module,
-      Provider<PermanentConnection> connectionProvider) {
-    this.module = module;
-    this.connectionProvider = connectionProvider;
-  }
-
-  @Override
-  public StatisticsConfigRepository get() {
-    return provideStatisticsConfigRepository(module, connectionProvider.get());
-  }
-
-  public static RepositoryModule_ProvideStatisticsConfigRepositoryFactory create(
-      RepositoryModule module, Provider<PermanentConnection> connectionProvider) {
-    return new RepositoryModule_ProvideStatisticsConfigRepositoryFactory(module, connectionProvider);
-  }
-
-  public static StatisticsConfigRepository provideStatisticsConfigRepository(
-      RepositoryModule instance, PermanentConnection connection) {
-    return Preconditions.checkNotNullFromProvides(instance.provideStatisticsConfigRepository(connection));
-  }
-}

+ 0 - 41
src/main/generated/proxy/cz/senslog/analyzer/storage/RepositoryModule_ProvideStatisticsRepositoryFactory.java

@@ -1,41 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.storage;
-
-import cz.senslog.analyzer.storage.permanent.PermanentConnection;
-import cz.senslog.analyzer.storage.permanent.repository.StatisticsRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class RepositoryModule_ProvideStatisticsRepositoryFactory implements Factory<StatisticsRepository> {
-  private final RepositoryModule module;
-
-  private final Provider<PermanentConnection> connectionProvider;
-
-  public RepositoryModule_ProvideStatisticsRepositoryFactory(RepositoryModule module,
-      Provider<PermanentConnection> connectionProvider) {
-    this.module = module;
-    this.connectionProvider = connectionProvider;
-  }
-
-  @Override
-  public StatisticsRepository get() {
-    return provideStatisticsRepository(module, connectionProvider.get());
-  }
-
-  public static RepositoryModule_ProvideStatisticsRepositoryFactory create(RepositoryModule module,
-      Provider<PermanentConnection> connectionProvider) {
-    return new RepositoryModule_ProvideStatisticsRepositoryFactory(module, connectionProvider);
-  }
-
-  public static StatisticsRepository provideStatisticsRepository(RepositoryModule instance,
-      PermanentConnection connection) {
-    return Preconditions.checkNotNullFromProvides(instance.provideStatisticsRepository(connection));
-  }
-}

+ 0 - 35
src/main/generated/proxy/cz/senslog/analyzer/storage/inmemory/repository/CollectedStatisticsRepository_Factory.java

@@ -1,35 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.storage.inmemory.repository;
-
-import cz.senslog.analyzer.storage.Connection;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import javax.inject.Provider;
-import org.jdbi.v3.core.Jdbi;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class CollectedStatisticsRepository_Factory implements Factory<CollectedStatisticsRepository> {
-  private final Provider<Connection<Jdbi>> connectionProvider;
-
-  public CollectedStatisticsRepository_Factory(Provider<Connection<Jdbi>> connectionProvider) {
-    this.connectionProvider = connectionProvider;
-  }
-
-  @Override
-  public CollectedStatisticsRepository get() {
-    return newInstance(connectionProvider.get());
-  }
-
-  public static CollectedStatisticsRepository_Factory create(
-      Provider<Connection<Jdbi>> connectionProvider) {
-    return new CollectedStatisticsRepository_Factory(connectionProvider);
-  }
-
-  public static CollectedStatisticsRepository newInstance(Connection<Jdbi> connection) {
-    return new CollectedStatisticsRepository(connection);
-  }
-}

+ 0 - 34
src/main/generated/proxy/cz/senslog/analyzer/storage/inmemory/repository/TimestampRepository_Factory.java

@@ -1,34 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.storage.inmemory.repository;
-
-import cz.senslog.analyzer.storage.Connection;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import javax.inject.Provider;
-import org.jdbi.v3.core.Jdbi;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class TimestampRepository_Factory implements Factory<TimestampRepository> {
-  private final Provider<Connection<Jdbi>> connectionProvider;
-
-  public TimestampRepository_Factory(Provider<Connection<Jdbi>> connectionProvider) {
-    this.connectionProvider = connectionProvider;
-  }
-
-  @Override
-  public TimestampRepository get() {
-    return newInstance(connectionProvider.get());
-  }
-
-  public static TimestampRepository_Factory create(Provider<Connection<Jdbi>> connectionProvider) {
-    return new TimestampRepository_Factory(connectionProvider);
-  }
-
-  public static TimestampRepository newInstance(Connection<Jdbi> connection) {
-    return new TimestampRepository(connection);
-  }
-}

+ 0 - 34
src/main/generated/proxy/cz/senslog/analyzer/storage/permanent/repository/SensLogRepository_Factory.java

@@ -1,34 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.storage.permanent.repository;
-
-import cz.senslog.analyzer.storage.Connection;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import javax.inject.Provider;
-import org.jdbi.v3.core.Jdbi;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class SensLogRepository_Factory implements Factory<SensLogRepository> {
-  private final Provider<Connection<Jdbi>> connectionProvider;
-
-  public SensLogRepository_Factory(Provider<Connection<Jdbi>> connectionProvider) {
-    this.connectionProvider = connectionProvider;
-  }
-
-  @Override
-  public SensLogRepository get() {
-    return newInstance(connectionProvider.get());
-  }
-
-  public static SensLogRepository_Factory create(Provider<Connection<Jdbi>> connectionProvider) {
-    return new SensLogRepository_Factory(connectionProvider);
-  }
-
-  public static SensLogRepository newInstance(Connection<Jdbi> connection) {
-    return new SensLogRepository(connection);
-  }
-}

+ 0 - 35
src/main/generated/proxy/cz/senslog/analyzer/storage/permanent/repository/StatisticsConfigRepository_Factory.java

@@ -1,35 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.storage.permanent.repository;
-
-import cz.senslog.analyzer.storage.Connection;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import javax.inject.Provider;
-import org.jdbi.v3.core.Jdbi;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class StatisticsConfigRepository_Factory implements Factory<StatisticsConfigRepository> {
-  private final Provider<Connection<Jdbi>> connectionProvider;
-
-  public StatisticsConfigRepository_Factory(Provider<Connection<Jdbi>> connectionProvider) {
-    this.connectionProvider = connectionProvider;
-  }
-
-  @Override
-  public StatisticsConfigRepository get() {
-    return newInstance(connectionProvider.get());
-  }
-
-  public static StatisticsConfigRepository_Factory create(
-      Provider<Connection<Jdbi>> connectionProvider) {
-    return new StatisticsConfigRepository_Factory(connectionProvider);
-  }
-
-  public static StatisticsConfigRepository newInstance(Connection<Jdbi> connection) {
-    return new StatisticsConfigRepository(connection);
-  }
-}

+ 0 - 34
src/main/generated/proxy/cz/senslog/analyzer/storage/permanent/repository/StatisticsRepository_Factory.java

@@ -1,34 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.storage.permanent.repository;
-
-import cz.senslog.analyzer.storage.Connection;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import javax.inject.Provider;
-import org.jdbi.v3.core.Jdbi;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class StatisticsRepository_Factory implements Factory<StatisticsRepository> {
-  private final Provider<Connection<Jdbi>> connectionProvider;
-
-  public StatisticsRepository_Factory(Provider<Connection<Jdbi>> connectionProvider) {
-    this.connectionProvider = connectionProvider;
-  }
-
-  @Override
-  public StatisticsRepository get() {
-    return newInstance(connectionProvider.get());
-  }
-
-  public static StatisticsRepository_Factory create(Provider<Connection<Jdbi>> connectionProvider) {
-    return new StatisticsRepository_Factory(connectionProvider);
-  }
-
-  public static StatisticsRepository newInstance(Connection<Jdbi> connection) {
-    return new StatisticsRepository(connection);
-  }
-}

+ 0 - 112
src/main/generated/proxy/cz/senslog/analyzer/ws/DaggerServerComponent.java

@@ -1,112 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.ws;
-
-import cz.senslog.analyzer.core.config.ConfigurationModule;
-import cz.senslog.analyzer.storage.ConnectionModule;
-import cz.senslog.analyzer.storage.ConnectionModule_ProvidePermanentStorageConnectionFactory;
-import cz.senslog.analyzer.storage.RepositoryModule;
-import cz.senslog.analyzer.storage.RepositoryModule_ProvideStatisticsConfigRepositoryFactory;
-import cz.senslog.analyzer.storage.RepositoryModule_ProvideStatisticsRepositoryFactory;
-import cz.senslog.analyzer.storage.permanent.PermanentConnection;
-import cz.senslog.analyzer.storage.permanent.repository.StatisticsConfigRepository;
-import cz.senslog.analyzer.storage.permanent.repository.StatisticsRepository;
-import cz.senslog.analyzer.ws.handler.GroupsHandler;
-import cz.senslog.analyzer.ws.handler.InfoHandler;
-import cz.senslog.analyzer.ws.handler.StatisticsHandler;
-import cz.senslog.analyzer.ws.manager.WSStatisticsManager;
-import cz.senslog.analyzer.ws.vertx.VertxServer;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.DoubleCheck;
-import dagger.internal.Preconditions;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class DaggerServerComponent implements ServerComponent {
-  private final DaggerServerComponent serverComponent = this;
-
-  private Provider<PermanentConnection> providePermanentStorageConnectionProvider;
-
-  private Provider<StatisticsRepository> provideStatisticsRepositoryProvider;
-
-  private Provider<StatisticsConfigRepository> provideStatisticsConfigRepositoryProvider;
-
-  private DaggerServerComponent(RepositoryModule repositoryModuleParam,
-      ConnectionModule connectionModuleParam) {
-
-    initialize(repositoryModuleParam, connectionModuleParam);
-
-  }
-
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  private WSStatisticsManager wSStatisticsManager() {
-    return new WSStatisticsManager(provideStatisticsRepositoryProvider.get(), provideStatisticsConfigRepositoryProvider.get());
-  }
-
-  private StatisticsHandler statisticsHandler() {
-    return new StatisticsHandler(wSStatisticsManager());
-  }
-
-  private GroupsHandler groupsHandler() {
-    return new GroupsHandler(provideStatisticsConfigRepositoryProvider.get());
-  }
-
-  private VertxServer vertxServer() {
-    return new VertxServer(new InfoHandler(), statisticsHandler(), groupsHandler());
-  }
-
-  @SuppressWarnings("unchecked")
-  private void initialize(final RepositoryModule repositoryModuleParam,
-      final ConnectionModule connectionModuleParam) {
-    this.providePermanentStorageConnectionProvider = DoubleCheck.provider(ConnectionModule_ProvidePermanentStorageConnectionFactory.create(connectionModuleParam));
-    this.provideStatisticsRepositoryProvider = DoubleCheck.provider(RepositoryModule_ProvideStatisticsRepositoryFactory.create(repositoryModuleParam, providePermanentStorageConnectionProvider));
-    this.provideStatisticsConfigRepositoryProvider = DoubleCheck.provider(RepositoryModule_ProvideStatisticsConfigRepositoryFactory.create(repositoryModuleParam, providePermanentStorageConnectionProvider));
-  }
-
-  @Override
-  public Server createServer() {
-    return vertxServer();
-  }
-
-  public static final class Builder {
-    private RepositoryModule repositoryModule;
-
-    private ConnectionModule connectionModule;
-
-    private Builder() {
-    }
-
-    public Builder repositoryModule(RepositoryModule repositoryModule) {
-      this.repositoryModule = Preconditions.checkNotNull(repositoryModule);
-      return this;
-    }
-
-    public Builder connectionModule(ConnectionModule connectionModule) {
-      this.connectionModule = Preconditions.checkNotNull(connectionModule);
-      return this;
-    }
-
-    /**
-     * @deprecated This module is declared, but an instance is not used in the component. This method is a no-op. For more, see https://dagger.dev/unused-modules.
-     */
-    @Deprecated
-    public Builder configurationModule(ConfigurationModule configurationModule) {
-      Preconditions.checkNotNull(configurationModule);
-      return this;
-    }
-
-    public ServerComponent build() {
-      if (repositoryModule == null) {
-        this.repositoryModule = new RepositoryModule();
-      }
-      Preconditions.checkBuilderRequirement(connectionModule, ConnectionModule.class);
-      return new DaggerServerComponent(repositoryModule, connectionModule);
-    }
-  }
-}

+ 0 - 34
src/main/generated/proxy/cz/senslog/analyzer/ws/handler/GroupsHandler_Factory.java

@@ -1,34 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.ws.handler;
-
-import cz.senslog.analyzer.storage.permanent.repository.StatisticsConfigRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class GroupsHandler_Factory implements Factory<GroupsHandler> {
-  private final Provider<StatisticsConfigRepository> repositoryProvider;
-
-  public GroupsHandler_Factory(Provider<StatisticsConfigRepository> repositoryProvider) {
-    this.repositoryProvider = repositoryProvider;
-  }
-
-  @Override
-  public GroupsHandler get() {
-    return newInstance(repositoryProvider.get());
-  }
-
-  public static GroupsHandler_Factory create(
-      Provider<StatisticsConfigRepository> repositoryProvider) {
-    return new GroupsHandler_Factory(repositoryProvider);
-  }
-
-  public static GroupsHandler newInstance(StatisticsConfigRepository repository) {
-    return new GroupsHandler(repository);
-  }
-}

+ 0 - 29
src/main/generated/proxy/cz/senslog/analyzer/ws/handler/InfoHandler_Factory.java

@@ -1,29 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.ws.handler;
-
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class InfoHandler_Factory implements Factory<InfoHandler> {
-  @Override
-  public InfoHandler get() {
-    return newInstance();
-  }
-
-  public static InfoHandler_Factory create() {
-    return InstanceHolder.INSTANCE;
-  }
-
-  public static InfoHandler newInstance() {
-    return new InfoHandler();
-  }
-
-  private static final class InstanceHolder {
-    private static final InfoHandler_Factory INSTANCE = new InfoHandler_Factory();
-  }
-}

+ 0 - 33
src/main/generated/proxy/cz/senslog/analyzer/ws/handler/StatisticsHandler_Factory.java

@@ -1,33 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.ws.handler;
-
-import cz.senslog.analyzer.ws.manager.WSStatisticsManager;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class StatisticsHandler_Factory implements Factory<StatisticsHandler> {
-  private final Provider<WSStatisticsManager> managerProvider;
-
-  public StatisticsHandler_Factory(Provider<WSStatisticsManager> managerProvider) {
-    this.managerProvider = managerProvider;
-  }
-
-  @Override
-  public StatisticsHandler get() {
-    return newInstance(managerProvider.get());
-  }
-
-  public static StatisticsHandler_Factory create(Provider<WSStatisticsManager> managerProvider) {
-    return new StatisticsHandler_Factory(managerProvider);
-  }
-
-  public static StatisticsHandler newInstance(WSStatisticsManager manager) {
-    return new StatisticsHandler(manager);
-  }
-}

+ 0 - 41
src/main/generated/proxy/cz/senslog/analyzer/ws/manager/WSStatisticsManager_Factory.java

@@ -1,41 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.ws.manager;
-
-import cz.senslog.analyzer.storage.permanent.repository.StatisticsConfigRepository;
-import cz.senslog.analyzer.storage.permanent.repository.StatisticsRepository;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class WSStatisticsManager_Factory implements Factory<WSStatisticsManager> {
-  private final Provider<StatisticsRepository> statisticsRepositoryProvider;
-
-  private final Provider<StatisticsConfigRepository> configRepositoryProvider;
-
-  public WSStatisticsManager_Factory(Provider<StatisticsRepository> statisticsRepositoryProvider,
-      Provider<StatisticsConfigRepository> configRepositoryProvider) {
-    this.statisticsRepositoryProvider = statisticsRepositoryProvider;
-    this.configRepositoryProvider = configRepositoryProvider;
-  }
-
-  @Override
-  public WSStatisticsManager get() {
-    return newInstance(statisticsRepositoryProvider.get(), configRepositoryProvider.get());
-  }
-
-  public static WSStatisticsManager_Factory create(
-      Provider<StatisticsRepository> statisticsRepositoryProvider,
-      Provider<StatisticsConfigRepository> configRepositoryProvider) {
-    return new WSStatisticsManager_Factory(statisticsRepositoryProvider, configRepositoryProvider);
-  }
-
-  public static WSStatisticsManager newInstance(StatisticsRepository statisticsRepository,
-      StatisticsConfigRepository configRepository) {
-    return new WSStatisticsManager(statisticsRepository, configRepository);
-  }
-}

+ 0 - 46
src/main/generated/proxy/cz/senslog/analyzer/ws/vertx/VertxServer_Factory.java

@@ -1,46 +0,0 @@
-// Generated by Dagger (https://dagger.dev).
-package cz.senslog.analyzer.ws.vertx;
-
-import cz.senslog.analyzer.ws.handler.GroupsHandler;
-import cz.senslog.analyzer.ws.handler.InfoHandler;
-import cz.senslog.analyzer.ws.handler.StatisticsHandler;
-import dagger.internal.DaggerGenerated;
-import dagger.internal.Factory;
-import javax.inject.Provider;
-
-@DaggerGenerated
-@SuppressWarnings({
-    "unchecked",
-    "rawtypes"
-})
-public final class VertxServer_Factory implements Factory<VertxServer> {
-  private final Provider<InfoHandler> infoHandlerProvider;
-
-  private final Provider<StatisticsHandler> statisticsHandlerProvider;
-
-  private final Provider<GroupsHandler> groupsHandlerProvider;
-
-  public VertxServer_Factory(Provider<InfoHandler> infoHandlerProvider,
-      Provider<StatisticsHandler> statisticsHandlerProvider,
-      Provider<GroupsHandler> groupsHandlerProvider) {
-    this.infoHandlerProvider = infoHandlerProvider;
-    this.statisticsHandlerProvider = statisticsHandlerProvider;
-    this.groupsHandlerProvider = groupsHandlerProvider;
-  }
-
-  @Override
-  public VertxServer get() {
-    return newInstance(infoHandlerProvider.get(), statisticsHandlerProvider.get(), groupsHandlerProvider.get());
-  }
-
-  public static VertxServer_Factory create(Provider<InfoHandler> infoHandlerProvider,
-      Provider<StatisticsHandler> statisticsHandlerProvider,
-      Provider<GroupsHandler> groupsHandlerProvider) {
-    return new VertxServer_Factory(infoHandlerProvider, statisticsHandlerProvider, groupsHandlerProvider);
-  }
-
-  public static VertxServer newInstance(InfoHandler infoHandler,
-      StatisticsHandler statisticsHandler, GroupsHandler groupsHandler) {
-    return new VertxServer(infoHandler, statisticsHandler, groupsHandler);
-  }
-}

+ 1 - 2
src/main/java/cz/senslog/analyzer/broker/email/EmailBroker.java

@@ -3,11 +3,10 @@ package cz.senslog.analyzer.broker.email;
 import cz.senslog.analyzer.broker.AlertFormatter;
 import cz.senslog.analyzer.core.AbstractEventBroker;
 import cz.senslog.analyzer.domain.Alert;
+import jakarta.mail.MessagingException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.mail.MessagingException;
-
 public class EmailBroker extends AbstractEventBroker<Alert> {
 
     private static final Logger logger = LogManager.getLogger(EmailBroker.class);

+ 6 - 6
src/main/java/cz/senslog/analyzer/broker/email/EmailServerConnection.java

@@ -1,14 +1,14 @@
 package cz.senslog.analyzer.broker.email;
 
-import javax.mail.*;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
+import jakarta.mail.*;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 import java.util.Map;
 import java.util.Properties;
 
-import static javax.mail.Message.RecipientType.TO;
+import static jakarta.mail.Message.RecipientType.TO;
 
 public class EmailServerConnection {
 

+ 0 - 1
src/main/java/cz/senslog/analyzer/util/TimestampUtil.java

@@ -1,6 +1,5 @@
 package cz.senslog.analyzer.util;
 
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import cz.senslog.analyzer.domain.IntervalGroup;
 import cz.senslog.analyzer.domain.Timestamp;
 

+ 0 - 191
src/main/java/cz/senslog/analyzer/util/http/HttpClient.java

@@ -1,191 +0,0 @@
-package cz.senslog.analyzer.util.http;
-
-import cz.senslog.analyzer.util.StringUtils;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpMessage;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.apache.http.HttpHeaders.*;
-
-/**
- * The class {@code HttpClient} represents a wrapper for {@link org.apache.http.client.HttpClient}.
- * Provides functionality of sending GET and POST request. Otherwise is returned response with {@see #BAD_REQUEST}.
- *
- * @author Lukas Cerny
- * @version 1.0
- * @since 1.0
- */
-public class HttpClient {
-
-    /** Instance of http client. */
-    private final org.apache.http.client.HttpClient client;
-    private final BasicCookieStore cookieStore;
-
-
-    /**
-     * Factory method to create a new instance of client.
-     * @return new instance of {@code HttpClient}.
-     */
-    public static HttpClient newHttpClient() {
-        return new HttpClient(HttpClientBuilder.create(), new BasicCookieStore());
-    }
-
-    /**
-     * Private constructors sets http client.
-     */
-    private HttpClient(HttpClientBuilder httpClientBuilder, BasicCookieStore cookieStore) {
-        this.cookieStore = cookieStore;
-        this.client = httpClientBuilder.setDefaultCookieStore(cookieStore).build();
-    }
-
-    /**
-     * Sends http request.
-     * @param request - virtual request.
-     * @return virtual response.
-     */
-    public HttpResponse send(HttpRequest request) {
-        try {
-            switch (request.getMethod()) {
-                case GET:  return sendGet(request);
-                case POST: return sendPost(request);
-                default: return HttpResponse.newBuilder()
-                            .body("Request does not contain method definition.")
-                            .status(HttpCode.METHOD_NOT_ALLOWED).build();
-            }
-        } catch (URISyntaxException e) {
-            return HttpResponse.newBuilder()
-                    .body(e.getMessage()).status(HttpCode.BAD_REQUEST)
-                    .build();
-        } catch (IOException e) {
-            return  HttpResponse.newBuilder()
-                    .body(e.getMessage()).status(HttpCode.SERVER_ERROR)
-                    .build();
-        }
-    }
-
-    /**
-     * Sends GET request.
-     * @param request - virtual request.
-     * @return virtual response of the request.
-     * @throws URISyntaxException throws if host url is not valid.
-     * @throws IOException throws if anything happen during sending.
-     */
-    private HttpResponse sendGet(HttpRequest request) throws IOException, URISyntaxException {
-
-        URI uri = request.getUrl().toURI();
-        HttpGet requestGet = new HttpGet(uri);
-        setBasicHeaders(request, requestGet);
-
-        cookieStore.clear();
-        for (HttpCookie cookie : request.getCookies()) {
-            cookieStore.addCookie(cookie);
-        }
-
-        org.apache.http.HttpResponse responseGet = client.execute(requestGet);
-
-        HttpResponse response = HttpResponse.newBuilder()
-                .status(responseGet.getStatusLine().getStatusCode())
-                .headers(getHeaders(responseGet))
-                .body(getBody(responseGet.getEntity()))
-                .build();
-
-        EntityUtils.consume(responseGet.getEntity());
-
-        return response;
-    }
-
-    /**
-     * Sends POST request.
-     * @param request - virtual request.
-     * @return virtual response of the request.
-     * @throws URISyntaxException throws if host url is not valid.
-     * @throws IOException throws if anything happen during sending.
-     */
-    private HttpResponse sendPost(HttpRequest request) throws URISyntaxException, IOException {
-
-        URI uri = request.getUrl().toURI();
-        HttpPost requestPost = new HttpPost(uri);
-        setBasicHeaders(request, requestPost);
-
-        if (StringUtils.isNotBlank(request.getContentType())) {
-            requestPost.setHeader(CONTENT_TYPE, request.getContentType());
-        }
-
-        requestPost.setEntity(new StringEntity(request.getBody()));
-
-        org.apache.http.HttpResponse responsePost = client.execute(requestPost);
-
-        HttpResponse response = HttpResponse.newBuilder()
-                .headers(getHeaders(requestPost))
-                .status(responsePost.getStatusLine().getStatusCode())
-                .body(getBody(responsePost.getEntity()))
-                .build();
-
-        EntityUtils.consume(responsePost.getEntity());
-
-        return response;
-    }
-
-    /**
-     * Sets basic headers to each request.
-     * @param userRequest - virtual request.
-     * @param httpRequest - real request prepared to send.
-     */
-    private void setBasicHeaders(HttpRequest userRequest, HttpRequestBase httpRequest) {
-
-        httpRequest.setHeader(USER_AGENT, "SenslogConnector/1.0");
-        httpRequest.setHeader(CACHE_CONTROL, "no-cache");
-
-        for (Map.Entry<String, String> headerEntry : userRequest.getHeaders().entrySet()) {
-            httpRequest.setHeader(headerEntry.getKey(), headerEntry.getValue());
-        }
-    }
-
-    /**
-     * Returns map of headers from the response.
-     * @param response - response message.
-     * @return map of headers.
-     */
-    private Map<String, String> getHeaders(HttpMessage response) {
-        Map<String, String> headers = new HashMap<>();
-        for (Header header : response.getAllHeaders()) {
-            headers.put(header.getName(), header.getValue());
-        }
-        return headers;
-    }
-
-    /**
-     * Returns body from the response.
-     * @param entity - response entity.
-     * @return string body of the response.
-     * @throws IOException can not get body from the response.
-     */
-    private String getBody(HttpEntity entity) throws IOException {
-        if (entity == null) return "";
-        InputStream contentStream = entity.getContent();
-        InputStreamReader bodyStream = new InputStreamReader(contentStream);
-        BufferedReader rd = new BufferedReader(bodyStream);
-        StringBuilder bodyBuffer = new StringBuilder();
-        String line;
-        while ((line = rd.readLine()) != null) {
-            bodyBuffer.append(line);
-        }
-        return bodyBuffer.toString();
-    }
-}

+ 0 - 13
src/main/java/cz/senslog/analyzer/util/http/HttpCode.java

@@ -1,13 +0,0 @@
-package cz.senslog.analyzer.util.http;
-
-public final class HttpCode {
-    public static final int OK = 200;
-    public static final int NO_RESULT = 204;
-    public static final int NO_CONTENT = 204;
-    public static final int BAD_REQUEST = 400;
-    public static final int UNAUTHORIZED = 401;
-    public static final int FORBIDDEN = 403;
-    public static final int NOT_FOUND = 404;
-    public static final int METHOD_NOT_ALLOWED = 405;
-    public static final int SERVER_ERROR = 500;
-}

+ 0 - 16
src/main/java/cz/senslog/analyzer/util/http/HttpContentType.java

@@ -1,16 +0,0 @@
-package cz.senslog.analyzer.util.http;
-
-public final class HttpContentType {
-    public final static String APPLICATION_ATOM_XML         = "application/atom+xml";
-    public final static String APPLICATION_FORM_URLENCODED  = "application/x-www-form-urlencoded";
-    public final static String APPLICATION_JSON             = "application/json";
-    public final static String APPLICATION_OCTET_STREAM     = "application/octet-stream";
-    public final static String APPLICATION_SVG_XML          = "application/svg+xml";
-    public final static String APPLICATION_XHTML_XML        = "application/xhtml+xml";
-    public final static String APPLICATION_XML              = "application/xml";
-    public final static String MULTIPART_FORM_DATA          = "multipart/form-data";
-    public final static String TEXT_HTML                    = "text/html";
-    public final static String TEXT_PLAIN                   = "text/plain";
-    public final static String TEXT_XML                     = "text/xml";
-    public final static String WILDCARD                     = "*/*";
-}

+ 0 - 39
src/main/java/cz/senslog/analyzer/util/http/HttpCookie.java

@@ -1,39 +0,0 @@
-package cz.senslog.analyzer.util.http;
-
-import org.apache.http.impl.cookie.BasicClientCookie;
-
-public class HttpCookie extends BasicClientCookie {
-
-    public static HttpCookie empty() {
-        HttpCookie cookie = new HttpCookie("", "", "", "");
-        cookie.setSecure(false);
-        return cookie;
-    }
-
-    public HttpCookie(String name, String value, String domain, String path) {
-        super(name, value);
-        super.setDomain(domain);
-        super.setPath(path);
-        super.setSecure(true);
-    }
-
-    @Override
-    public String getName() {
-        return super.getName();
-    }
-
-    @Override
-    public String getValue() {
-        return super.getValue();
-    }
-
-    @Override
-    public String getDomain() {
-        return super.getDomain();
-    }
-
-    @Override
-    public String getPath() {
-        return super.getPath();
-    }
-}

+ 0 - 10
src/main/java/cz/senslog/analyzer/util/http/HttpHeader.java

@@ -1,10 +0,0 @@
-package cz.senslog.analyzer.util.http;
-
-import org.apache.http.HttpHeaders;
-
-public final class HttpHeader {
-    public static final String AUTHORIZATION = HttpHeaders.AUTHORIZATION;
-    public static final String DATE = HttpHeaders.DATE;
-    public static final String ACCEPT = HttpHeaders.ACCEPT;
-    public static final String CONTENT_TYPE = HttpHeaders.CONTENT_TYPE;
-}

+ 0 - 5
src/main/java/cz/senslog/analyzer/util/http/HttpMethod.java

@@ -1,5 +0,0 @@
-package cz.senslog.analyzer.util.http;
-
-public enum  HttpMethod {
-    GET, POST
-}

+ 0 - 111
src/main/java/cz/senslog/analyzer/util/http/HttpRequest.java

@@ -1,111 +0,0 @@
-package cz.senslog.analyzer.util.http;
-
-
-import java.net.URL;
-import java.util.Map;
-
-import static cz.senslog.analyzer.util.json.BasicJson.objectToJson;
-
-
-/**
- * The class {@code HttpRequest} represents a wrapper for a http request.
- *
- * @author Lukas Cerny
- * @version 1.0
- * @since 1.0
- */
-public class HttpRequest {
-
-    public interface Builder {
-        Builder header(String name, String value);
-        Builder url(URL url);
-        Builder POST();
-        Builder GET();
-        Builder contentType(String contentType);
-        Builder body(String body);
-        Builder addCookie(HttpCookie cookie);
-        HttpRequest build();
-    }
-
-    /**
-     * Factory method to create a new builder for {@link HttpRequest}.
-     * @return new instance of builder.
-     */
-    public static Builder newBuilder() {
-        return new HttpRequestBuilder();
-    }
-
-    /**
-     * Factory method to create a new builder for {@link HttpRequest}.
-     * @param url - host url.
-     * @return new instance of builder.
-     */
-    public static Builder newBuilder(URL url) {
-        HttpRequestBuilder builder = new HttpRequestBuilder();
-        builder.url(url);
-        return builder;
-    }
-
-    /** Request url. */
-    private final URL url;
-
-    /** Request headers. */
-    private final Map<String, String> headers;
-
-    /** Request body. */
-    private final String body;
-
-    /** Request method. */
-    private final HttpMethod method;
-
-    /** Request content type. */
-    private final String contentType;
-
-    private final HttpCookie [] cookies;
-
-    /**
-     * Constructors sets all attributes.
-     * @param url - url.
-     * @param headers - headers.
-     * @param body - body.
-     * @param method - method.
-     * @param contentType - content type.
-     */
-    HttpRequest(URL url, Map<String, String> headers, String body, HttpMethod method, String contentType, HttpCookie [] cookies) {
-        this.url = url;
-        this.headers = headers;
-        this.body = body;
-        this.method = method;
-        this.contentType = contentType;
-        this.cookies = cookies;
-    }
-
-    public URL getUrl() {
-        return url;
-    }
-
-    public String getBody() {
-        return body;
-    }
-
-    public HttpMethod getMethod() {
-        return method;
-    }
-
-    public Map<String, String> getHeaders() {
-        return headers;
-    }
-
-    public String getContentType() {
-        return contentType;
-    }
-
-    public HttpCookie[] getCookies() {
-        return cookies;
-    }
-
-    @Override
-    public String toString() {
-        return objectToJson(this);
-    }
-}

+ 0 - 80
src/main/java/cz/senslog/analyzer/util/http/HttpRequestBuilder.java

@@ -1,80 +0,0 @@
-package cz.senslog.analyzer.util.http;
-
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * The class {@code HttpRequestBuilder} represents a builder for the {@link HttpRequest}.
- *
- * @author Lukas Cerny
- * @version 1.0
- * @since 1.0
- */
-final class HttpRequestBuilder implements HttpRequest.Builder {
-
-    private URL url;
-    private Map<String, String> headers;
-    private final List<HttpCookie> cookies;
-    private String body;
-    private HttpMethod method;
-    private String contentType;
-
-    HttpRequestBuilder() {
-        this.headers = new HashMap<>();
-        this.cookies = new ArrayList<>();
-        this.method = HttpMethod.GET;
-        this.body = "";
-    }
-
-
-    @Override
-    public HttpRequest.Builder header(String name, String value) {
-        this.headers.put(name, value);
-        return this;
-    }
-
-    @Override
-    public HttpRequest.Builder url(URL url) {
-        this.url = url;
-        return this;
-    }
-
-    @Override
-    public HttpRequest.Builder POST() {
-        this.method = HttpMethod.POST;
-        return this;
-    }
-
-    @Override
-    public HttpRequest.Builder GET() {
-        this.method = HttpMethod.GET;
-        return this;
-    }
-
-    @Override
-    public HttpRequest.Builder contentType(String contentType) {
-        this.contentType = contentType;
-        return this;
-    }
-
-    @Override
-    public HttpRequest.Builder body(String body) {
-        this.body = body;
-        return this;
-    }
-
-    @Override
-    public HttpRequest.Builder addCookie(HttpCookie cookie) {
-        this.cookies.add(cookie);
-        return this;
-    }
-
-    @Override
-    public HttpRequest build() {
-        return new HttpRequest(url, headers, body, method, contentType, cookies.toArray(new HttpCookie[0]));
-    }
-}

+ 0 - 77
src/main/java/cz/senslog/analyzer/util/http/HttpResponse.java

@@ -1,77 +0,0 @@
-package cz.senslog.analyzer.util.http;
-
-import cz.senslog.analyzer.util.json.BasicJson;
-
-import java.util.Map;
-
-/**
- * The class {@code HttpResponse} represents a wrapper for a http response.
- * Contains basic information like status, headers and body.
- *
- * @author Lukas Cerny
- * @version 1.0
- * @since 1.0
- */
-public class HttpResponse {
-
-    public interface Builder {
-        Builder body(String body);
-        Builder headers(Map<String, String> headers);
-        Builder status(int status);
-        HttpResponse build();
-    }
-
-    /**
-     * Factory method to create a new builder for {@link HttpResponse}.
-     * @return new instance of builder.
-     */
-    public static Builder newBuilder() {
-        return new HttpResponseBuilder();
-    }
-
-    /** Response body. */
-    private final String body;
-
-    /** Response headers. */
-    private final Map<String, String> headers;
-
-    /** Response status. */
-    private final int status;
-
-    /**
-     * Constructors sets all attributes.
-     * @param body - body.
-     * @param headers - headers.
-     * @param status - status.
-     */
-    HttpResponse(String body, Map<String, String> headers, int status) {
-        this.body = body;
-        this.headers = headers;
-        this.status = status;
-    }
-
-    public String getBody() {
-        return body;
-    }
-
-    public String getHeader(String value) {
-        return headers.get(value);
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public boolean isOk() {
-        return status == HttpCode.OK;
-    }
-
-    public boolean isError() {
-        return !isOk();
-    }
-
-    @Override
-    public String toString() {
-        return BasicJson.objectToJson(this);
-    }
-}

+ 0 - 42
src/main/java/cz/senslog/analyzer/util/http/HttpResponseBuilder.java

@@ -1,42 +0,0 @@
-package cz.senslog.analyzer.util.http;
-
-import java.util.Map;
-
-/**
- * The class {@code HttpResponseBuilder} represents a builder for the {@link HttpResponse}.
- *
- * @author Lukas Cerny
- * @version 1.0
- * @since 1.0
- */
-class HttpResponseBuilder implements HttpResponse.Builder {
-
-    private String body;
-    private Map<String, String> headers;
-    private int status;
-
-    HttpResponseBuilder(){}
-
-    @Override
-    public HttpResponse.Builder body(String body) {
-        this.body = body;
-        return this;
-    }
-
-    @Override
-    public HttpResponse.Builder headers(Map<String, String> headers) {
-        this.headers = headers;
-        return this;
-    }
-
-    @Override
-    public HttpResponse.Builder status(int status) {
-        this.status = status;
-        return this;
-    }
-
-    @Override
-    public HttpResponse build() {
-        return new HttpResponse(body, headers, status);
-    }
-}

+ 0 - 113
src/main/java/cz/senslog/analyzer/util/http/URLBuilder.java

@@ -1,113 +0,0 @@
-package cz.senslog.analyzer.util.http;
-
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import static java.net.URLEncoder.encode;
-
-/**
- * The class {@code URLBuilder} represents a builder to create a new instance of {@link URL}.
- * Provides a creating a url from domain and path and adding a parameter.
- *
- * @author Lukas Cerny
- * @version 1.0
- * @since 1.0
- */
-public final class URLBuilder {
-
-    /**
-     * Factory method to create a new instance of {@code URLBuilder} from base url.
-     * @param baseURL - host url.
-     * @return new instance of {@code URLBuilder}.
-     */
-    public static URLBuilder newBuilder(String baseURL) {
-        return new URLBuilder(baseURL);
-    }
-
-    /**
-     * Factory method to create a new instance of {@code URLBuilder} from domain and path.
-     * Normalizes domain and path to the form:
-     *
-     * domain: http://domain.com/
-     * path: /host
-     * -> url: http://domain.com/host
-     *
-     * domain: http://domain.com
-     * path: host
-     * -> url: http://domain.com/host
-     *
-     * @param domain - domain of host.
-     * @param path - path of host.
-     * @return new instance of {@code URLBuilder}.
-     */
-    public static URLBuilder newBuilder(String domain, String path) {
-        boolean domainSlash = domain.endsWith("/");
-        boolean pathSlash = path.startsWith("/");
-
-        if ((domainSlash && !pathSlash) || (!domainSlash && pathSlash)) {
-            return new URLBuilder(domain + path);
-        } else if (domainSlash) {
-            return new URLBuilder(domain + path.substring(1));
-        } else {
-            return new URLBuilder(domain + "/" + path);
-        }
-    }
-
-    /** String builder for url. */
-    private StringBuilder urlBuilder;
-
-    /** String builder for parameters. */
-    private StringBuilder paramsBuilder;
-
-    /**
-     * Private constructor initializes builders and normalizes url.
-     * If the url ends with slash '/', it is removed.
-     * @param baseURL - host url.
-     */
-    private URLBuilder(String baseURL) {
-        String url = baseURL.endsWith("/") ? baseURL.substring(0, baseURL.length() - 1) : baseURL;
-        this.urlBuilder = new StringBuilder(url);
-        this.paramsBuilder = new StringBuilder();
-    }
-
-    /**
-     * Adds a new parameter to the url.
-     * @param name - name of parameter.
-     * @param value - value of parameter.
-     * @return instance of {@code URLBuilder}.
-     */
-    public URLBuilder addParam(String name, String value) {
-        try {
-            paramsBuilder.append("&").append(name).append("=").append(encode(value, "UTF-8"));
-        } catch (UnsupportedEncodingException e) {
-            throw new AssertionError(e.getMessage());
-        }
-        return this;
-    }
-
-    /**
-     * Adds a new parameter to the url.
-     * @param name - name of parameter.
-     * @param value - value of parameter.
-     * @return instance of {@code URLBuilder}.
-     */
-    public URLBuilder addParam(String name, Object value) {
-        if (value == null) return this;
-        return addParam(name, value.toString());
-    }
-
-    /**
-     * Creates a new instance of {@link URL}.
-     * @return new instance of {@link URL}.
-     */
-    public URL build() {
-        try {
-            String params = paramsBuilder.replace(0, 1, "").toString();
-            return new URL(urlBuilder.append(params.isEmpty() ? "" : ("?" + params)).toString());
-        } catch (MalformedURLException e) {
-            throw new IllegalArgumentException(e.getMessage(), e);
-        }
-    }
-}
-

+ 0 - 139
src/main/java/cz/senslog/analyzer/util/json/JsonSchema.java

@@ -1,139 +0,0 @@
-package cz.senslog.analyzer.util.json;
-
-import org.everit.json.schema.Schema;
-import org.everit.json.schema.ValidationException;
-import org.everit.json.schema.loader.SchemaLoader;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static java.lang.String.format;
-import static java.nio.file.Files.readAllBytes;
-
-/**
- * The class {@code JsonSchema} represents a basic wrapper for {@link Schema}.
- * Provides functionality of creating a new schema and validation an input json according the schema.
- * Input json can start as a list or object.
- *
- * @author Lukas Cerny
- * @version 1.0
- * @since 1.0
- */
-public final class JsonSchema {
-
-    /** Instance of loaded schema. */
-    private final Schema schema;
-
-    /**
-     * Loads the schema from resources.
-     * @param schemaName - name of the schema.
-     * @return new instance of {@code JsonSchema}.
-     * @throws IOException throws if the schema does not exist or can not be loaded.
-     */
-    public static JsonSchema loadAsResource(String schemaName) throws IOException {
-        InputStream inputStream = ClassLoader.getSystemResourceAsStream(schemaName);
-
-        if (inputStream == null) {
-            throw new IOException(format("Resource file %s was not found.", schemaName));
-        }
-
-        BufferedReader streamReader = new BufferedReader(new InputStreamReader(inputStream));
-        String schema = streamReader.lines().collect(Collectors.joining());
-
-        return create(schema);
-    }
-
-    /**
-     * Loads the schema from file system.
-     * @param schemaPath - path of the schema.
-     * @return new instance of {@code JsonSchema}.
-     * @throws IOException throws if the schema does not exist or can not be loaded.
-     */
-    public static JsonSchema load(Path schemaPath) throws IOException {
-        return create(new String(readAllBytes(schemaPath)));
-    }
-
-    /**
-     *  Creates and build a new schema.
-     * @param jsonSchema - string json schema.
-     * @return new instance of {@code JsonSchema}.
-     */
-    public static JsonSchema create(String jsonSchema) {
-        Schema schema = SchemaLoader.builder()
-                .schemaJson(new JSONObject(jsonSchema)).build()
-                .load().build();
-        return new JsonSchema(schema);
-    }
-
-    /**
-     * Private constructor of the class. Accessible via static method {@link JsonSchema#create(String)}.
-     * @param schema - build schema.
-     */
-    private JsonSchema(Schema schema) {
-        this.schema = schema;
-    }
-
-    /**
-     * Validates input json which starts as an object.
-     * @param json - input object json.
-     * @param errors - list of errors if json is not valid.
-     * @return true - valid, false - invalid.
-     */
-    public boolean validateJsonObject(String json, List<String> errors) {
-        try {
-            return validate(new JSONObject(json), errors);
-        } catch (JSONException e) {
-            if (errors != null) {
-                errors.clear();
-                errors.add(e.getMessage());
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Validates input json which starts as an array.
-     * @param json - input array json.
-     * @param errors - list of errors if json is not valid.
-     * @return true - valid, false - invalid.
-     */
-    public boolean validateJsonArray(String json, List<String> errors) {
-        try {
-            return validate(new JSONArray(json), errors);
-        } catch (JSONException e) {
-            if (errors != null) {
-                errors.clear();
-                errors.add(e.getMessage());
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Validates input json according to build schema. If input json is not valid,
-     * is thrown an exception with messages why json is not valid.
-     * @param json - input json.
-     * @param errors - list of errors if json is not valid.
-     * @return true - valid, false - invalid.
-     */
-    private boolean validate(Object json, List<String> errors) {
-        try {
-            schema.validate(json);
-            return true;
-        } catch (ValidationException e) {
-            if (errors != null) {
-                errors.clear();
-                errors.addAll(e.getAllMessages());
-            }
-            return false;
-        }
-    }
-}

+ 2 - 3
src/main/java/cz/senslog/analyzer/ws/handler/InfoHandler.java

@@ -7,9 +7,8 @@ import io.vertx.core.http.HttpServerResponse;
 
 import javax.inject.Inject;
 
-import static cz.senslog.analyzer.util.http.HttpContentType.APPLICATION_JSON;
-import static cz.senslog.analyzer.util.http.HttpHeader.CONTENT_TYPE;
 import static cz.senslog.analyzer.util.json.BasicJson.objectToJson;
+import static io.vertx.core.http.HttpHeaders.CONTENT_TYPE;
 
 public class InfoHandler extends AbstractRestHandler {
 
@@ -21,7 +20,7 @@ public class InfoHandler extends AbstractRestHandler {
 
         router().get().handler(ctx -> {
             HttpServerResponse response = ctx.response();
-            response.putHeader(CONTENT_TYPE, APPLICATION_JSON);
+            response.putHeader(CONTENT_TYPE, "application/json");
 
             JsonObject uptime = new JsonObject();
             uptime.addProperty("app", Application.uptime() / 1000);

+ 6 - 7
src/main/java/cz/senslog/analyzer/ws/handler/StatisticsHandler.java

@@ -16,9 +16,8 @@ import java.util.*;
 
 import static cz.senslog.analyzer.domain.IntervalGroup.parseIntervalGroup;
 import static cz.senslog.analyzer.util.TimestampUtil.parseTimestamp;
-import static cz.senslog.analyzer.util.http.HttpContentType.APPLICATION_JSON;
-import static cz.senslog.analyzer.util.http.HttpHeader.CONTENT_TYPE;
 import static cz.senslog.analyzer.util.LongUtils.parseLong;
+import static io.vertx.core.http.HttpHeaders.CONTENT_TYPE;
 
 public class StatisticsHandler extends AbstractRestHandler {
 
@@ -38,11 +37,11 @@ public class StatisticsHandler extends AbstractRestHandler {
             logger.info("Handling '{}' with the params '{}'.", ctx.request().path(), ctx.request().params().entries());
 
             HttpServerResponse response = ctx.response();
-            response.putHeader(CONTENT_TYPE, APPLICATION_JSON);
+            response.putHeader(CONTENT_TYPE, "application/json");
             MultiMap params = ctx.request().params();
 
             Optional<Long> unitIdOpt = parseLong(params.get("unit_id"));
-            if (!unitIdOpt.isPresent()) {
+            if (unitIdOpt.isEmpty()) {
                 ctx.fail(400, new Throwable(
                         "Parameter 'unit_id' is not at the correct format. Expected long number."
                 )); return;
@@ -51,7 +50,7 @@ public class StatisticsHandler extends AbstractRestHandler {
             Optional<Long> sensorIdOpt = parseLong(params.get("sensor_id"));
 
             Optional<IntervalGroup> intervalGroupOpt = Optional.ofNullable(parseIntervalGroup(params.get("interval")));
-            if (!intervalGroupOpt.isPresent()) {
+            if (intervalGroupOpt.isEmpty()) {
                 ctx.fail(400, new Throwable(
                         "Parameter 'interval' is not at the correct format. " +
                         "Expected one of these values: "+ Arrays.toString(IntervalGroup.values()) +"."
@@ -59,7 +58,7 @@ public class StatisticsHandler extends AbstractRestHandler {
             }
 
             Optional<Timestamp> fromOpt = parseTimestamp(params.get("from"));
-            if (!fromOpt.isPresent()) {
+            if (fromOpt.isEmpty()) {
                 Timestamp now = Timestamp.now();
                 ctx.fail(400, new Throwable(
                         "Parameter 'from' is not at the correct format. " +
@@ -69,7 +68,7 @@ public class StatisticsHandler extends AbstractRestHandler {
             }
 
             Optional<Timestamp> toOpt = parseTimestamp(params.get("to"));
-            if (!toOpt.isPresent()) {
+            if (toOpt.isEmpty()) {
                 Timestamp now = Timestamp.now();
                 ctx.fail(400, new Throwable(
                         "Parameter 'to' is not at the correct format. " +

+ 3 - 5
src/main/java/cz/senslog/analyzer/ws/vertx/VertxServer.java

@@ -16,8 +16,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static cz.senslog.analyzer.util.StringUtils.getOrDefault;
-import static cz.senslog.analyzer.util.http.HttpContentType.APPLICATION_JSON;
-import static cz.senslog.analyzer.util.http.HttpHeader.CONTENT_TYPE;
+import static io.vertx.core.http.HttpHeaders.CONTENT_TYPE;
 
 
 public class VertxServer extends AbstractVerticle implements Server {
@@ -54,15 +53,14 @@ public class VertxServer extends AbstractVerticle implements Server {
             ctx.response().putHeader("Access-Control-Allow-Origin", origin);
             ctx.next();
         });
-
         for (Map.Entry<String, AbstractRestHandler> handlerEntry : restHandlers.entrySet()) {
-            router.mountSubRouter(handlerEntry.getKey(), handlerEntry.getValue().start(vertx));
+            router.route(handlerEntry.getKey()).subRouter(handlerEntry.getValue().start(vertx));
         }
 
         router.route().failureHandler(ctx -> {
             logger.catching(ctx.failure());
             HttpServerResponse response = ctx.response();
-            response.putHeader(CONTENT_TYPE, APPLICATION_JSON);
+            response.putHeader(CONTENT_TYPE, "application/json");
             JsonObject error = new JsonObject()
                     .put("timestamp", System.nanoTime())
                     .put("message", ctx.failure().getMessage())