Fix broken API

cashapp · Apr 22, 2024 · 60d085d · 60d085d
1 parent 62b7b3f
commit 60d085d
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 10 deletions.
diff --git a/.palantir/revapi.yml b/.palantir/revapi.yml
@@ -6234,13 +6234,6 @@ acceptedBreaks:
         \ extends java.lang.annotation.Annotation>, java.util.List<java.lang.String>,\
         \ java.util.List<java.lang.String>, boolean, boolean)"
       justification: "New parameters are optional"
-  "2024.04.10.210352-9854ef3":
-    com.squareup.misk:misk-aws:
-    - code: "java.method.numberOfParametersChanged"
-      old: "method void misk.jobqueue.sqs.SqsJob::delayForFailure(int)"
-      new: "method void misk.jobqueue.sqs.SqsJob::delayForFailure()"
-      justification: "{SqsJob is an internal class and there seem to be no references\
-        \ to this function}"
   "2024.04.12.171745-81ea336":
     com.squareup.misk:misk-aws:
     - code: "java.method.numberOfParametersChanged"
@@ -6267,6 +6260,46 @@ acceptedBreaks:
         \ com.amazonaws.services.sqs.AmazonSQS, int)"
       justification: "SQSJob is an internal class and is not exposed to the clients\
         \ of Misk"
+  "2024.04.21.232758-20ad049":
+    com.squareup.misk:misk:
+    - code: "java.method.removed"
+      old: "method java.lang.String misk.web.metadata.Metadata::getId() @ misk.web.metadata.webaction.WebActionsMetadata"
+      justification: "API is unused so change is safe"
+    com.squareup.misk:misk-admin:
+    - code: "java.method.parameterTypeChanged"
+      old: "parameter misk.web.metadata.all.AllMetadataAction.Response misk.web.metadata.all.AllMetadataAction.Response::copy(===java.util.List<?\
+        \ extends misk.web.metadata.Metadata>===)"
+      new: "parameter misk.web.metadata.all.AllMetadataAction.Response misk.web.metadata.all.AllMetadataAction.Response::copy(===java.util.Map<java.lang.String,\
+        \ ? extends misk.web.metadata.Metadata>===)"
+      justification: "API is unused so change is safe"
+    - code: "java.method.parameterTypeChanged"
+      old: "parameter void misk.web.metadata.all.AllMetadataAction.Response::<init>(===java.util.List<?\
+        \ extends misk.web.metadata.Metadata>===)"
+      new: "parameter void misk.web.metadata.all.AllMetadataAction.Response::<init>(===java.util.Map<java.lang.String,\
+        \ ? extends misk.web.metadata.Metadata>===)"
+      justification: "API is unused so change is safe"
+    - code: "java.method.parameterTypeChanged"
+      old: "parameter void misk.web.metadata.all.AllMetadataAction::<init>(===java.util.List<?\
+        \ extends misk.web.metadata.Metadata>===)"
+      new: "parameter void misk.web.metadata.all.AllMetadataAction::<init>(===java.util.Map<java.lang.String,\
+        \ ? extends misk.web.metadata.Metadata>===)"
+      justification: "API is unused so change is safe"
+    - code: "java.method.returnTypeChanged"
+      old: "method java.util.List<misk.web.metadata.Metadata> misk.web.metadata.all.AllMetadataAction.Response::component1()"
+      new: "method java.util.Map<java.lang.String, misk.web.metadata.Metadata> misk.web.metadata.all.AllMetadataAction.Response::component1()"
+      justification: "API is unused so change is safe"
+    - code: "java.method.returnTypeChanged"
+      old: "method java.util.List<misk.web.metadata.Metadata> misk.web.metadata.all.AllMetadataAction.Response::getAll()"
+      new: "method java.util.Map<java.lang.String, misk.web.metadata.Metadata> misk.web.metadata.all.AllMetadataAction.Response::getAll()"
+      justification: "API is unused so change is safe"
+    com.squareup.misk:misk-config:
+    - code: "java.method.numberOfParametersChanged"
+      old: "method void misk.web.metadata.Metadata::<init>(java.lang.String, java.lang.Object)"
+      new: "method void misk.web.metadata.Metadata::<init>(java.lang.Object)"
+      justification: "API is unused so change is safe"
+    - code: "java.method.removed"
+      old: "method java.lang.String misk.web.metadata.Metadata::getId()"
+      justification: "API is unused so change is safe"
   misk-0.18.0:
     com.squareup.misk:misk-gcp:
     - code: "java.method.numberOfParametersChanged"

diff --git a/misk-config/api/misk-config.api b/misk-config/api/misk-config.api
@@ -102,7 +102,7 @@ public final class misk/web/metadata/MetadataModule : misk/inject/KAbstractModul
 	public fun <init> (Lmisk/web/metadata/MetadataProvider;)V
 }
 
-public abstract interface class misk/web/metadata/MetadataProvider : javax/inject/Provider {
+public abstract interface class misk/web/metadata/MetadataProvider : com/google/inject/Provider {
 	public abstract fun getId ()Ljava/lang/String;
 }
 
diff --git a/misk-config/build.gradle.kts b/misk-config/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
 }
 
 dependencies {
+  api(libs.guice)
   api(libs.jacksonAnotations)
   api(libs.jacksonDatabind)
   api(libs.jakartaInject)
@@ -18,7 +19,6 @@ dependencies {
   api(project(":misk-inject"))
   implementation(libs.apacheCommonsLang3)
   implementation(libs.guava)
-  implementation(libs.guice)
   implementation(libs.jacksonCore)
   implementation(libs.jacksonDataformatYaml)
   implementation(libs.jacksonJsr310)

diff --git a/misk-config/src/main/kotlin/misk/web/metadata/MetadataProvider.kt b/misk-config/src/main/kotlin/misk/web/metadata/MetadataProvider.kt
@@ -1,6 +1,6 @@
 package misk.web.metadata
 
-import javax.inject.Provider
+import com.google.inject.Provider
 
 interface MetadataProvider<T: Metadata> : Provider<T> {
   /** Unique identifier for the type of metadata. Ie. "web-actions" or "config". */