diff --git a/eureka/src/main/java/com/linecorp/armeria/internal/common/eureka/DataCenterInfo.java b/eureka/src/main/java/com/linecorp/armeria/common/eureka/DataCenterInfo.java similarity index 87% rename from eureka/src/main/java/com/linecorp/armeria/internal/common/eureka/DataCenterInfo.java rename to eureka/src/main/java/com/linecorp/armeria/common/eureka/DataCenterInfo.java index 850df9ad0d3..612adb268fa 100644 --- a/eureka/src/main/java/com/linecorp/armeria/internal/common/eureka/DataCenterInfo.java +++ b/eureka/src/main/java/com/linecorp/armeria/common/eureka/DataCenterInfo.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package com.linecorp.armeria.internal.common.eureka; +package com.linecorp.armeria.common.eureka; import static com.google.common.base.MoreObjects.toStringHelper; import static java.util.Objects.requireNonNull; @@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableMap; import com.linecorp.armeria.common.annotation.Nullable; +import com.linecorp.armeria.internal.common.eureka.DataCenterInfoSerializer; /** * The data center information. @@ -52,10 +53,20 @@ public DataCenterInfo(@JsonProperty("name") String name, } } + /** + * Returns the name of the object. + * + * @return the name of the object + */ public String getName() { return name; } + /** + * Returns the metadata associated with the object. + * + * @return a map of key-value pairs representing the metadata + */ public Map getMetadata() { return metadata; } diff --git a/eureka/src/main/java/com/linecorp/armeria/common/eureka/InstanceInfo.java b/eureka/src/main/java/com/linecorp/armeria/common/eureka/InstanceInfo.java index 494b7eec27f..56b2bf00cac 100644 --- a/eureka/src/main/java/com/linecorp/armeria/common/eureka/InstanceInfo.java +++ b/eureka/src/main/java/com/linecorp/armeria/common/eureka/InstanceInfo.java @@ -34,8 +34,6 @@ import com.linecorp.armeria.client.Endpoint; import com.linecorp.armeria.common.annotation.Nullable; -import com.linecorp.armeria.internal.common.eureka.DataCenterInfo; -import com.linecorp.armeria.internal.common.eureka.LeaseInfo; import io.netty.util.AttributeKey; diff --git a/eureka/src/main/java/com/linecorp/armeria/internal/common/eureka/LeaseInfo.java b/eureka/src/main/java/com/linecorp/armeria/common/eureka/LeaseInfo.java similarity index 99% rename from eureka/src/main/java/com/linecorp/armeria/internal/common/eureka/LeaseInfo.java rename to eureka/src/main/java/com/linecorp/armeria/common/eureka/LeaseInfo.java index e45213e1516..ec726a414d5 100644 --- a/eureka/src/main/java/com/linecorp/armeria/internal/common/eureka/LeaseInfo.java +++ b/eureka/src/main/java/com/linecorp/armeria/common/eureka/LeaseInfo.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package com.linecorp.armeria.internal.common.eureka; +package com.linecorp.armeria.common.eureka; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; diff --git a/eureka/src/main/java/com/linecorp/armeria/internal/common/eureka/DataCenterInfoSerializer.java b/eureka/src/main/java/com/linecorp/armeria/internal/common/eureka/DataCenterInfoSerializer.java index 5cb51d6482e..4d5615e0526 100644 --- a/eureka/src/main/java/com/linecorp/armeria/internal/common/eureka/DataCenterInfoSerializer.java +++ b/eureka/src/main/java/com/linecorp/armeria/internal/common/eureka/DataCenterInfoSerializer.java @@ -23,7 +23,9 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -final class DataCenterInfoSerializer extends StdSerializer { +import com.linecorp.armeria.common.eureka.DataCenterInfo; + +public final class DataCenterInfoSerializer extends StdSerializer { private static final long serialVersionUID = -5766818057428683420L; diff --git a/eureka/src/main/java/com/linecorp/armeria/server/eureka/InstanceInfoBuilder.java b/eureka/src/main/java/com/linecorp/armeria/server/eureka/InstanceInfoBuilder.java index acddabeddb2..9e4632ea975 100644 --- a/eureka/src/main/java/com/linecorp/armeria/server/eureka/InstanceInfoBuilder.java +++ b/eureka/src/main/java/com/linecorp/armeria/server/eureka/InstanceInfoBuilder.java @@ -27,11 +27,11 @@ import com.linecorp.armeria.common.SessionProtocol; import com.linecorp.armeria.common.annotation.Nullable; +import com.linecorp.armeria.common.eureka.DataCenterInfo; import com.linecorp.armeria.common.eureka.InstanceInfo; import com.linecorp.armeria.common.eureka.InstanceInfo.InstanceStatus; import com.linecorp.armeria.common.eureka.InstanceInfo.PortWrapper; -import com.linecorp.armeria.internal.common.eureka.DataCenterInfo; -import com.linecorp.armeria.internal.common.eureka.LeaseInfo; +import com.linecorp.armeria.common.eureka.LeaseInfo; import io.netty.util.NetUtil; diff --git a/eureka/src/test/java/com/linecorp/armeria/client/eureka/ArmeriaEurekaClientTest.java b/eureka/src/test/java/com/linecorp/armeria/client/eureka/ArmeriaEurekaClientTest.java index 11d5c91dddf..d577ac090ed 100644 --- a/eureka/src/test/java/com/linecorp/armeria/client/eureka/ArmeriaEurekaClientTest.java +++ b/eureka/src/test/java/com/linecorp/armeria/client/eureka/ArmeriaEurekaClientTest.java @@ -140,9 +140,9 @@ private static com.linecorp.armeria.common.eureka.InstanceInfo convertInstanceIn info.getMetadata()); } - private static com.linecorp.armeria.internal.common.eureka.LeaseInfo convertLeaseInfo( + private static com.linecorp.armeria.common.eureka.LeaseInfo convertLeaseInfo( LeaseInfo leaseInfo) { - return new com.linecorp.armeria.internal.common.eureka.LeaseInfo( + return new com.linecorp.armeria.common.eureka.LeaseInfo( leaseInfo.getRenewalIntervalInSecs(), leaseInfo.getDurationInSecs(), leaseInfo.getRegistrationTimestamp(), @@ -312,7 +312,7 @@ private static Map headersOf(ResponseHeaders headers) { return result; } - private static com.linecorp.armeria.internal.common.eureka.DataCenterInfo convertDataCenterInfo( + private static com.linecorp.armeria.common.eureka.DataCenterInfo convertDataCenterInfo( DataCenterInfo dataCenterInfo) { final Map metadata; if (dataCenterInfo.getName() == Name.Amazon) { @@ -320,7 +320,7 @@ private static com.linecorp.armeria.internal.common.eureka.DataCenterInfo conver } else { metadata = ImmutableMap.of(); } - return new com.linecorp.armeria.internal.common.eureka.DataCenterInfo( + return new com.linecorp.armeria.common.eureka.DataCenterInfo( dataCenterInfo.getName().name(), metadata); } diff --git a/eureka/src/test/java/com/linecorp/armeria/common/eureka/InstanceInfoTest.java b/eureka/src/test/java/com/linecorp/armeria/common/eureka/InstanceInfoTest.java index 569dcef47f7..f851647fe04 100644 --- a/eureka/src/test/java/com/linecorp/armeria/common/eureka/InstanceInfoTest.java +++ b/eureka/src/test/java/com/linecorp/armeria/common/eureka/InstanceInfoTest.java @@ -25,8 +25,6 @@ import com.linecorp.armeria.client.Endpoint; import com.linecorp.armeria.common.eureka.InstanceInfo.InstanceStatus; import com.linecorp.armeria.common.eureka.InstanceInfo.PortWrapper; -import com.linecorp.armeria.internal.common.eureka.DataCenterInfo; -import com.linecorp.armeria.internal.common.eureka.LeaseInfo; class InstanceInfoTest { @@ -90,8 +88,8 @@ void getShouldReturnAssociatedInstanceInfo() { assertThat(instanceInfoRetrieved.getStatusPageUrl()).isEqualTo(statusPageUrl); assertThat(instanceInfoRetrieved.getHealthCheckUrl()).isEqualTo(healthCheckUrl); assertThat(instanceInfoRetrieved.getSecureHealthCheckUrl()).isEqualTo(secureHealthCheckUrl); - //assertThat(instanceInfoRetrieved.getDataCenterInfo()).isEqualTo(dataCenterInfo); - //assertThat(instanceInfoRetrieved.getLeaseInfo()).isEqualTo(leaseInfo); + assertThat(instanceInfoRetrieved.getDataCenterInfo()).isEqualTo(dataCenterInfo); + assertThat(instanceInfoRetrieved.getLeaseInfo()).isEqualTo(leaseInfo); assertThat(instanceInfoRetrieved.getMetadata()).isEqualTo(metadata); } }