Merge pull request #9 from RADAR-CNS/v0.2.1_release

V0.2.1 release

Author: blootsvoets

.gitignore

@@ -92,11 +92,8 @@ fabric.properties
 ### Intellij+iml Patch ###
 # Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
 
+.idea/
 *.iml
-modules.xml
-.idea/misc.xml
-*.ipr
-.idea/runConfigurations.xml
 
 ## Pebble 2
 .lock*

.idea/compiler.xml

@@ -15,18 +15,18 @@ Build jar from source with
 ```shell
 ./gradlew build
 ```
-and find the output JAR file as `build/libs/restructurehdfs-all-0.2.jar`. Then run with:
+and find the output JAR file as `build/libs/restructurehdfs-0.2.1-all.jar`. Then run with:
 
 ```shell
-java -jar restructurehdfs-all-0.2.jar <webhdfs_url> <hdfs_topic_path> <output_folder>
+java -jar restructurehdfs-0.2.1-all.jar <webhdfs_url> <hdfs_topic_path> <output_folder>
 ```
 
 By default, this will output the data in CSV format. If JSON format is preferred, use the following instead:
 ```
-java -Dorg.radarcns.format=json -jar restructurehdfs-all-0.2.jar <webhdfs_url> <hdfs_topic_path> <output_folder>
+java -Dorg.radarcns.format=json -jar restructurehdfs-0.2.1-all.jar <webhdfs_url> <hdfs_topic_path> <output_folder>
 ```
 
 Another option is to output the data in compressed form. All files will get the `gz` suffix, and can be decompressed with a GZIP decoder. Note that for a very small number of records, this may actually increase the file size.
 ```
-java -Dorg.radarcns.compress=gzip -jar restructurehdfs-all-0.2.jar <webhdfs_url> <hdfs_topic_path> <output_folder>
+java -Dorg.radarcns.compress=gzip -jar restructurehdfs-0.2.1-all.jar <webhdfs_url> <hdfs_topic_path> <output_folder>
 ```

.idea/copyright/Apache_2_0_TheHyve.xml

@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'application'
 
 group 'org.radarcns.restructurehdfs'
-version '0.2'
+version '0.2.1'
 mainClassName = 'org.radarcns.RestructureAvroRecords'
 
 run {
@@ -56,6 +56,6 @@ artifacts {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '3.5'
+    gradleVersion = '4.1'
     distributionType 'all'
 }

.idea/copyright/profiles_settings.xml

@@ -1,6 +1,5 @@
-#Mon Jul 03 09:50:31 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

README.md

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

build.gradle

@@ -17,6 +17,7 @@
 package org.radarcns;
 
 import java.nio.file.Files;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import javax.annotation.Nonnull;
@@ -63,8 +64,8 @@ public static Frequency read(File file) {
         return new Frequency(file, map);
     }
 
-    public void add(String topicName, String id, GenericRecord valueField, Field timeField) {
-        String timestamp = RestructureAvroRecords.createHourTimestamp(valueField, timeField);
+    public void add(String topicName, String id, Date date) {
+        String timestamp = RestructureAvroRecords.createHourTimestamp(date);
 
         Integer count = (Integer) bins.get(topicName, id, timestamp);
         if (count == null) {