From 5b5da1be8d68f10047c0d0eb0321a5d86da5ca95 Mon Sep 17 00:00:00 2001
From: Mingyang Zhu <mzhu9@slb.com>
Date: Tue, 18 May 2021 10:28:00 -0500
Subject: [PATCH] simplify the change by using default interface method
---
.../interfaces/IHealthCheckService.java | 10 ++++++++--
.../service/DefaultHealthCheckImpl.java | 18 ------------------
.../azure/service/HealthCheckServiceImpl.java | 6 ++----
3 files changed, 10 insertions(+), 24 deletions(-)
delete mode 100644 partition-core/src/main/java/org/opengroup/osdu/partition/service/DefaultHealthCheckImpl.java
diff --git a/partition-core/src/main/java/org/opengroup/osdu/partition/provider/interfaces/IHealthCheckService.java b/partition-core/src/main/java/org/opengroup/osdu/partition/provider/interfaces/IHealthCheckService.java
index 70163e513..d7bf541dd 100644
--- a/partition-core/src/main/java/org/opengroup/osdu/partition/provider/interfaces/IHealthCheckService.java
+++ b/partition-core/src/main/java/org/opengroup/osdu/partition/provider/interfaces/IHealthCheckService.java
@@ -1,6 +1,12 @@
package org.opengroup.osdu.partition.provider.interfaces;
public interface IHealthCheckService {
- void performLivenessCheck();
- void performReadinessCheck();
+
+ default void performLivenessCheck() {
+
+ }
+
+ default void performReadinessCheck() {
+
+ }
}
diff --git a/partition-core/src/main/java/org/opengroup/osdu/partition/service/DefaultHealthCheckImpl.java b/partition-core/src/main/java/org/opengroup/osdu/partition/service/DefaultHealthCheckImpl.java
deleted file mode 100644
index 102bffb95..000000000
--- a/partition-core/src/main/java/org/opengroup/osdu/partition/service/DefaultHealthCheckImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.opengroup.osdu.partition.service;
-
-import org.opengroup.osdu.partition.provider.interfaces.IHealthCheckService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class DefaultHealthCheckImpl implements IHealthCheckService {
-
- @Override
- public void performLivenessCheck() {
-
- }
-
- @Override
- public void performReadinessCheck() {
-
- }
-}
diff --git a/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/service/HealthCheckServiceImpl.java b/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/service/HealthCheckServiceImpl.java
index ecfa0c75a..aa9e36200 100644
--- a/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/service/HealthCheckServiceImpl.java
+++ b/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/service/HealthCheckServiceImpl.java
@@ -2,18 +2,16 @@ package org.opengroup.osdu.partition.provider.azure.service;
import lombok.RequiredArgsConstructor;
import org.opengroup.osdu.partition.model.PartitionInfo;
+import org.opengroup.osdu.partition.provider.interfaces.IHealthCheckService;
import org.opengroup.osdu.partition.provider.interfaces.IPartitionServiceCache;
-import org.opengroup.osdu.partition.service.DefaultHealthCheckImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
@Service
-@Primary
@RequiredArgsConstructor
-public class HealthCheckServiceImpl extends DefaultHealthCheckImpl {
+public class HealthCheckServiceImpl implements IHealthCheckService {
@Autowired
@Qualifier("partitionServiceCache")
--
GitLab