Skip to content
Snippets Groups Projects
Commit 5bcd424b authored by Lorenz Boguhn's avatar Lorenz Boguhn
Browse files

Align package structure uc4 hzj

parent 7839543d
No related branches found
No related tags found
1 merge request!208Add benchmark implementations for Hazelcast Jet
Pipeline #6986 passed
Stage: build
    Stage: test
      Stage: check
        Hide whitespace changes
        Inline Side-by-side
        Showing
        with 32 additions and 29 deletions
        theodolite-benchmarks/uc4-hazelcastjet/build.gradle
        + 1
        − 1
        View file @ 5bcd424b
        ...@@ -2,4 +2,4 @@ plugins { ...@@ -2,4 +2,4 @@ plugins {
        id 'theodolite.hazelcastjet' id 'theodolite.hazelcastjet'
        } }
        mainClassName = "theodolite.uc4.application.HistoryService" mainClassName = "rocks.theodolite.benchmarks.uc4.hazelcastjet.HistoryService"
        \ No newline at end of file \ No newline at end of file
        theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/HistoryService.java → theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java
        + 1
        − 1
        View file @ 5bcd424b
        package theodolite.uc4.application; package rocks.theodolite.benchmarks.uc4.hazelcastjet;
        import org.slf4j.Logger; import org.slf4j.Logger;
        import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
        ......
        theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4HazelcastJetFactory.java → theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4HazelcastJetFactory.java
        + 8
        − 6
        View file @ 5bcd424b
        package theodolite.uc4.application; package rocks.theodolite.benchmarks.uc4.hazelcastjet;
        import com.hazelcast.jet.JetInstance; import com.hazelcast.jet.JetInstance;
        import com.hazelcast.jet.config.JobConfig; import com.hazelcast.jet.config.JobConfig;
        ...@@ -8,13 +8,15 @@ import java.util.Properties; ...@@ -8,13 +8,15 @@ import java.util.Properties;
        import org.slf4j.Logger; import org.slf4j.Logger;
        import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys; import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
        import rocks.theodolite.benchmarks.commons.hazelcastjet.JetInstanceBuilder; import rocks.theodolite.benchmarks.commons.hazelcastjet.JetInstanceBuilder;
        import theodolite.uc4.application.uc4specifics.ImmutableSensorRegistryUc4Serializer; import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ImmutableSensorRegistryUc4Serializer;
        import theodolite.uc4.application.uc4specifics.SensorGroupKey; import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKey;
        import theodolite.uc4.application.uc4specifics.SensorGroupKeySerializer; import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKeySerializer;
        import theodolite.uc4.application.uc4specifics.ValueGroup; import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroup;
        import theodolite.uc4.application.uc4specifics.ValueGroupSerializer; import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroupSerializer;
        import titan.ccp.model.sensorregistry.ImmutableSensorRegistry; import titan.ccp.model.sensorregistry.ImmutableSensorRegistry;
        /** /**
        * A Hazelcast Jet factory which can build a Hazelcast Jet Instance and Pipeline for the UC4 * A Hazelcast Jet factory which can build a Hazelcast Jet Instance and Pipeline for the UC4
        * benchmark and lets you start the Hazelcast Jet job. The JetInstance can be built directly as the * benchmark and lets you start the Hazelcast Jet job. The JetInstance can be built directly as the
        ......
        theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java → theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4KafkaPropertiesBuilder.java
        + 2
        − 2
        View file @ 5bcd424b
        package theodolite.uc4.application; package rocks.theodolite.benchmarks.uc4.hazelcastjet;
        import io.confluent.kafka.serializers.KafkaAvroDeserializer; import io.confluent.kafka.serializers.KafkaAvroDeserializer;
        import io.confluent.kafka.serializers.KafkaAvroSerializer; import io.confluent.kafka.serializers.KafkaAvroSerializer;
        ...@@ -9,7 +9,7 @@ import org.apache.kafka.clients.producer.ProducerConfig; ...@@ -9,7 +9,7 @@ import org.apache.kafka.clients.producer.ProducerConfig;
        import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringDeserializer;
        import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.serialization.StringSerializer;
        import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys; import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
        import theodolite.uc4.application.uc4specifics.EventDeserializer; import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.EventDeserializer;
        /** /**
        * Builds a read and write Properties objects containing the needed kafka properties used for the * Builds a read and write Properties objects containing the needed kafka properties used for the
        ......
        theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4PipelineBuilder.java → theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineBuilder.java
        + 5
        − 5
        View file @ 5bcd424b
        package theodolite.uc4.application; package rocks.theodolite.benchmarks.uc4.hazelcastjet;
        import com.hazelcast.function.BiFunctionEx; import com.hazelcast.function.BiFunctionEx;
        import com.hazelcast.jet.Traverser; import com.hazelcast.jet.Traverser;
        ...@@ -25,10 +25,10 @@ import java.util.Properties; ...@@ -25,10 +25,10 @@ import java.util.Properties;
        import java.util.Set; import java.util.Set;
        import org.slf4j.Logger; import org.slf4j.Logger;
        import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
        import theodolite.uc4.application.uc4specifics.AggregatedActivePowerRecordAccumulator; import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.AggregatedActivePowerRecordAccumulator;
        import theodolite.uc4.application.uc4specifics.ChildParentsTransformer; import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ChildParentsTransformer;
        import theodolite.uc4.application.uc4specifics.SensorGroupKey; import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKey;
        import theodolite.uc4.application.uc4specifics.ValueGroup; import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroup;
        import titan.ccp.configuration.events.Event; import titan.ccp.configuration.events.Event;
        import titan.ccp.model.records.ActivePowerRecord; import titan.ccp.model.records.ActivePowerRecord;
        import titan.ccp.model.records.AggregatedActivePowerRecord; import titan.ccp.model.records.AggregatedActivePowerRecord;
        ......
        theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/AggregatedActivePowerRecordAccumulator.java → theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/AggregatedActivePowerRecordAccumulator.java
        + 1
        − 1
        View file @ 5bcd424b
        package theodolite.uc4.application.uc4specifics; package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
        import titan.ccp.model.records.ActivePowerRecord; import titan.ccp.model.records.ActivePowerRecord;
        ......
        theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ChildParentsTransformer.java → theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ChildParentsTransformer.java
        + 1
        − 1
        View file @ 5bcd424b
        package theodolite.uc4.application.uc4specifics; package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
        import java.util.Map; import java.util.Map;
        import java.util.Optional; import java.util.Optional;
        ......
        theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/EventDeserializer.java → theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/EventDeserializer.java
        + 1
        − 1
        View file @ 5bcd424b
        package theodolite.uc4.application.uc4specifics; package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
        import java.util.Map; import java.util.Map;
        import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Deserializer;
        ......
        theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/HashMapSupplier.java → theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/HashMapSupplier.java
        + 1
        − 1
        View file @ 5bcd424b
        package theodolite.uc4.application.uc4specifics; package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
        import com.hazelcast.function.SupplierEx; import com.hazelcast.function.SupplierEx;
        import java.util.HashMap; import java.util.HashMap;
        ......
        theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ImmutableSensorRegistryUc4Serializer.java → theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ImmutableSensorRegistryUc4Serializer.java
        + 1
        − 1
        View file @ 5bcd424b
        package theodolite.uc4.application.uc4specifics; package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
        import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataInput;
        import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.ObjectDataOutput;
        ......
        theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/SensorGroupKey.java → theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKey.java
        + 1
        − 1
        View file @ 5bcd424b
        package theodolite.uc4.application.uc4specifics; package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
        import java.util.Objects; import java.util.Objects;
        ......
        theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/SensorGroupKeySerializer.java → theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKeySerializer.java
        + 1
        − 1
        View file @ 5bcd424b
        package theodolite.uc4.application.uc4specifics; package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
        import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataInput;
        import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.ObjectDataOutput;
        ......
        theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ValueGroup.java → theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroup.java
        + 1
        − 1
        View file @ 5bcd424b
        package theodolite.uc4.application.uc4specifics; package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
        import java.util.Objects; import java.util.Objects;
        import java.util.Set; import java.util.Set;
        ......
        theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ValueGroupSerializer.java → theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroupSerializer.java
        + 1
        − 1
        View file @ 5bcd424b
        package theodolite.uc4.application.uc4specifics; package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
        import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataInput;
        import com.hazelcast.nio.ObjectDataOutput; import com.hazelcast.nio.ObjectDataOutput;
        ......
        theodolite-benchmarks/uc4-hazelcastjet/src/test/java/theodolite/uc4/application/Uc4PipelineTest.java
        + 6
        − 5
        View file @ 5bcd424b
        ...@@ -22,11 +22,12 @@ import org.junit.Assert; ...@@ -22,11 +22,12 @@ import org.junit.Assert;
        import org.junit.Before; import org.junit.Before;
        import org.junit.Test; import org.junit.Test;
        import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
        import theodolite.uc4.application.uc4specifics.ImmutableSensorRegistryUc4Serializer; import rocks.theodolite.benchmarks.uc4.hazelcastjet.Uc4PipelineBuilder;
        import theodolite.uc4.application.uc4specifics.SensorGroupKey; import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ImmutableSensorRegistryUc4Serializer;
        import theodolite.uc4.application.uc4specifics.SensorGroupKeySerializer; import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKey;
        import theodolite.uc4.application.uc4specifics.ValueGroup; import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKeySerializer;
        import theodolite.uc4.application.uc4specifics.ValueGroupSerializer; import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroup;
        import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroupSerializer;
        import titan.ccp.configuration.events.Event; import titan.ccp.configuration.events.Event;
        import titan.ccp.model.records.ActivePowerRecord; import titan.ccp.model.records.ActivePowerRecord;
        import titan.ccp.model.records.AggregatedActivePowerRecord; import titan.ccp.model.records.AggregatedActivePowerRecord;
        ......
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment