migrate food service

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.3.71'
 
     repositories {
         mavenCentral()

common/build.gradle

@@ -13,7 +13,7 @@ dependencies {
     // API
     api("com.google.protobuf:protobuf-java:3.6.1")
     api("io.grpc:grpc-stub:1.18.0")
-    api("de.hpi.cloud:hpi-cloud:0.0.13")
+    api("de.hpi.cloud:hpi-cloud:0.0.14")
 
     // Storage
     api("com.couchbase.client:java-client:2.7.9")

common/src/main/kotlin/de/hpi/cloud/common/couchbase/ApiDocument.kt

@@ -9,7 +9,7 @@ import de.hpi.cloud.common.grpc.throwAlreadyExists
 
 inline fun <reified E : Entity<E>, reified Proto : GeneratedMessageV3> Bucket.tryInsert(wrapper: Wrapper<E>) {
     try {
-        insert<E, Proto>(wrapper)
+        insert(wrapper)
     } catch (e: DocumentAlreadyExistsException) {
         throwAlreadyExists<Proto>(wrapper.id)
     }

common/src/main/kotlin/de/hpi/cloud/common/couchbase/Document.kt

@@ -3,7 +3,6 @@ package de.hpi.cloud.common.couchbase
 import com.couchbase.client.java.AsyncBucket
 import com.couchbase.client.java.Bucket
 import com.couchbase.client.java.document.RawJsonDocument
-import com.google.protobuf.GeneratedMessageV3
 import de.hpi.cloud.common.entity.Entity
 import de.hpi.cloud.common.entity.Id
 import de.hpi.cloud.common.entity.Wrapper
@@ -37,9 +36,9 @@ inline fun <reified E : Entity<E>> Wrapper<E>.toJsonDocument(): RawJsonDocument
     )
 }
 
-inline fun <reified E : Entity<E>, reified Proto : GeneratedMessageV3> Bucket.insert(wrapper: Wrapper<E>) =
+inline fun <reified E : Entity<E>> Bucket.insert(wrapper: Wrapper<E>) =
     insert(wrapper.toJsonDocument())
 
-inline fun <reified E : Entity<E>> Bucket.upsert(entityWrapper: Wrapper<E>) {
-    upsert(entityWrapper.toJsonDocument())
+inline fun <reified E : Entity<E>> Bucket.upsert(wrapper: Wrapper<E>) {
+    upsert(wrapper.toJsonDocument())
 }

common/src/main/kotlin/de/hpi/cloud/common/entity/Entity.kt

@@ -3,11 +3,9 @@ package de.hpi.cloud.common.entity
 import com.google.protobuf.GeneratedMessageV3
 import de.hpi.cloud.common.Context
 import de.hpi.cloud.common.protobuf.setId
-import de.hpi.cloud.common.serializers.proto.InstantSerializer
 import kotlinx.serialization.ImplicitReflectionSerializer
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.serializer
-import java.time.Instant
 import kotlin.reflect.KClass
 import kotlin.reflect.full.companionObjectInstance
 import de.hpi.cloud.common.serializers.proto.ProtoSerializer as AnyProtoSerializer

service-food/build.gradle

@@ -3,21 +3,33 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.40")
-        classpath("com.github.jengelman.gradle.plugins:shadow:5.1.0")
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
-
 plugins {
     id "kotlin"
     id "application"
     id "com.github.johnrengelman.shadow" version "5.1.0"
 }
+apply plugin: 'kotlinx-serialization'
+apply plugin: 'kotlin'
+
+repositories {
+    jcenter()
+    mavenCentral()
+    maven { url "https://dl.bintray.com/hpi/hpi-cloud-mvn" }
+}
 
 dependencies {
     implementation(project(":common"))
+
+    // Crawling
+    implementation("com.beust:klaxon:5.0.11")
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
 application {
+    // mainClassName = "de.hpi.cloud.food.crawler.MainKt"
+
     mainClassName = "de.hpi.cloud.food.FoodServiceKt"
 }