Discovery proto classes use shaded annotations (#46)

* Add guava to shaded libs * Update README for mantis-shaded * Bump mantis-control-plane dependency to latest version * Discovery proto classes use shaded annotations Co-authored-by: Calvin Cheung <[email protected]>
Netflix · Jul 24, 2020 · dba2b80 · dba2b80
1 parent a50e38c
commit dba2b80
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 24 deletions.
diff --git a/mantis-discovery-proto/build.gradle b/mantis-discovery-proto/build.gradle
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-ext {
-    jacksonVersion = '2.10.+'
-}
-
 dependencies {
-    implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
+    api project(path: ':mantis-shaded', configuration: 'shadow')
 
     testImplementation "junit:junit-dep:$junitVersion"
     testImplementation "org.mockito:mockito-core:$mockitoVersion"

diff --git a/...s-discovery-proto/src/main/java/com/netflix/mantis/discovery/proto/AppJobClustersMap.java b/...s-discovery-proto/src/main/java/com/netflix/mantis/discovery/proto/AppJobClustersMap.java
@@ -22,10 +22,10 @@
 import java.util.Map;
 import java.util.Objects;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonCreator;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonIgnore;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonProperty;
 
 
 public class AppJobClustersMap {

diff --git a/...is-discovery-proto/src/main/java/com/netflix/mantis/discovery/proto/JobDiscoveryInfo.java b/...is-discovery-proto/src/main/java/com/netflix/mantis/discovery/proto/JobDiscoveryInfo.java
@@ -20,10 +20,10 @@
 import java.util.Map;
 import java.util.Objects;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonCreator;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonIgnore;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonProperty;
 
 
 public class JobDiscoveryInfo {

diff --git a/mantis-discovery-proto/src/main/java/com/netflix/mantis/discovery/proto/MantisWorker.java b/mantis-discovery-proto/src/main/java/com/netflix/mantis/discovery/proto/MantisWorker.java
@@ -19,9 +19,9 @@
 import java.net.InetSocketAddress;
 import java.util.Objects;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonCreator;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonProperty;
 
 
 public class MantisWorker {

diff --git a/mantis-discovery-proto/src/main/java/com/netflix/mantis/discovery/proto/StageWorkers.java b/mantis-discovery-proto/src/main/java/com/netflix/mantis/discovery/proto/StageWorkers.java
@@ -19,9 +19,9 @@
 import java.util.List;
 import java.util.Objects;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonCreator;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonProperty;
 
 
 public class StageWorkers {

diff --git a/...discovery-proto/src/main/java/com/netflix/mantis/discovery/proto/StreamJobClusterMap.java b/...discovery-proto/src/main/java/com/netflix/mantis/discovery/proto/StreamJobClusterMap.java
@@ -16,9 +16,9 @@
 
 package com.netflix.mantis.discovery.proto;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonCreator;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonIgnore;
+import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import java.util.Collections;
 import java.util.Map;

diff --git a/...scovery-proto/src/test/java/com/netflix/mantis/discovery/proto/AppJobClustersMapTest.java b/...scovery-proto/src/test/java/com/netflix/mantis/discovery/proto/AppJobClustersMapTest.java
@@ -24,8 +24,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import io.mantisrx.shaded.com.fasterxml.jackson.databind.DeserializationFeature;
+import io.mantisrx.shaded.com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;