From 14f9a696945a2fb8f7446e2eb80afa6aa3fa873d Mon Sep 17 00:00:00 2001 From: Adrian Paschkowski Date: Fri, 13 Dec 2024 19:39:59 +0100 Subject: [PATCH] Fix proto package name It's part of the general Latte kotlin utils, not Vanilla specifically. --- proto/ratelimit.proto | 4 ++-- .../java/gg/beemo/vanilla/GrpcRatelimitService.kt | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/proto/ratelimit.proto b/proto/ratelimit.proto index ffd0c8e..c54d5e4 100644 --- a/proto/ratelimit.proto +++ b/proto/ratelimit.proto @@ -1,10 +1,10 @@ syntax = "proto3"; +package beemo.ratelimit; option java_multiple_files = true; -option java_package = "gg.beemo.vanilla.proto"; +option java_package = "gg.beemo.latte.proto"; option java_outer_classname = "RatelimitProto"; -package ratelimit; service Ratelimit { rpc ReserveQuota (RatelimitRequest) returns (RatelimitQuota) {} diff --git a/vanilla/src/main/java/gg/beemo/vanilla/GrpcRatelimitService.kt b/vanilla/src/main/java/gg/beemo/vanilla/GrpcRatelimitService.kt index e06f58e..55da8de 100644 --- a/vanilla/src/main/java/gg/beemo/vanilla/GrpcRatelimitService.kt +++ b/vanilla/src/main/java/gg/beemo/vanilla/GrpcRatelimitService.kt @@ -1,14 +1,14 @@ package gg.beemo.vanilla import gg.beemo.latte.logging.Log -import gg.beemo.vanilla.proto.RatelimitGrpcKt -import gg.beemo.vanilla.proto.RatelimitQuota -import gg.beemo.vanilla.proto.ratelimitQuota -import gg.beemo.vanilla.proto.RatelimitRequest -import gg.beemo.vanilla.proto.RatelimitType +import gg.beemo.latte.proto.RatelimitGrpcKt +import gg.beemo.latte.proto.RatelimitQuota +import gg.beemo.latte.proto.ratelimitQuota +import gg.beemo.latte.proto.RatelimitRequest +import gg.beemo.latte.proto.RatelimitType import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import java.util.* +import java.util.LinkedList import java.util.concurrent.ConcurrentHashMap import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds