From 09daceba4a9e9d3b095ceb07f78b0d128d06d579 Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Sat, 16 Sep 2023 11:03:04 +0300 Subject: [PATCH] Remove unused ResourceFinder Files --- .../google/fhir/gateway/BundleResources.java | 33 ------- .../fhir/gateway/ResourceFinderImp.java | 98 ------------------- .../gateway/interfaces/ResourceFinder.java | 24 ----- 3 files changed, 155 deletions(-) delete mode 100755 server/src/main/java/com/google/fhir/gateway/BundleResources.java delete mode 100755 server/src/main/java/com/google/fhir/gateway/ResourceFinderImp.java delete mode 100755 server/src/main/java/com/google/fhir/gateway/interfaces/ResourceFinder.java diff --git a/server/src/main/java/com/google/fhir/gateway/BundleResources.java b/server/src/main/java/com/google/fhir/gateway/BundleResources.java deleted file mode 100755 index 9a68c3d5..00000000 --- a/server/src/main/java/com/google/fhir/gateway/BundleResources.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2021-2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.google.fhir.gateway; - -import ca.uhn.fhir.rest.api.RequestTypeEnum; -import lombok.Getter; -import lombok.Setter; -import org.hl7.fhir.instance.model.api.IBaseResource; - -@Getter -@Setter -public class BundleResources { - private RequestTypeEnum requestType; - private IBaseResource resource; - - public BundleResources(RequestTypeEnum requestType, IBaseResource resource) { - this.requestType = requestType; - this.resource = resource; - } -} diff --git a/server/src/main/java/com/google/fhir/gateway/ResourceFinderImp.java b/server/src/main/java/com/google/fhir/gateway/ResourceFinderImp.java deleted file mode 100755 index c43cbb0c..00000000 --- a/server/src/main/java/com/google/fhir/gateway/ResourceFinderImp.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright 2021-2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.google.fhir.gateway; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.parser.IParser; -import ca.uhn.fhir.rest.api.RequestTypeEnum; -import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; -import com.google.fhir.gateway.interfaces.RequestDetailsReader; -import com.google.fhir.gateway.interfaces.ResourceFinder; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.r4.model.Bundle; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public final class ResourceFinderImp implements ResourceFinder { - private static final Logger logger = LoggerFactory.getLogger(ResourceFinderImp.class); - private static ResourceFinderImp instance = null; - private final FhirContext fhirContext; - - // This is supposed to be instantiated with getInstance method only. - private ResourceFinderImp(FhirContext fhirContext) { - this.fhirContext = fhirContext; - } - - private IBaseResource createResourceFromRequest(RequestDetailsReader request) { - byte[] requestContentBytes = request.loadRequestContents(); - Charset charset = request.getCharset(); - if (charset == null) { - charset = StandardCharsets.UTF_8; - } - String requestContent = new String(requestContentBytes, charset); - IParser jsonParser = fhirContext.newJsonParser(); - return jsonParser.parseResource(requestContent); - } - - @Override - public List findResourcesInBundle(RequestDetailsReader request) { - IBaseResource resource = createResourceFromRequest(request); - if (!(resource instanceof Bundle)) { - ExceptionUtil.throwRuntimeExceptionAndLog( - logger, "The provided resource is not a Bundle!", InvalidRequestException.class); - } - Bundle bundle = (Bundle) resource; - - if (bundle.getType() != Bundle.BundleType.TRANSACTION) { - // Currently, support only for transaction bundles - ExceptionUtil.throwRuntimeExceptionAndLog( - logger, "Bundle type needs to be transaction!", InvalidRequestException.class); - } - - List requestTypeEnumList = new ArrayList<>(); - if (!bundle.hasEntry()) { - return requestTypeEnumList; - } - - for (Bundle.BundleEntryComponent entryComponent : bundle.getEntry()) { - Bundle.HTTPVerb httpMethod = entryComponent.getRequest().getMethod(); - if (httpMethod != Bundle.HTTPVerb.GET && !entryComponent.hasResource()) { - ExceptionUtil.throwRuntimeExceptionAndLog( - logger, "Bundle entry requires a resource field!", InvalidRequestException.class); - } - - requestTypeEnumList.add( - new BundleResources( - RequestTypeEnum.valueOf(httpMethod.name()), entryComponent.getResource())); - } - - return requestTypeEnumList; - } - - // A singleton instance of this class should be used, hence the constructor is private. - public static synchronized ResourceFinderImp getInstance(FhirContext fhirContext) { - if (instance != null) { - return instance; - } - - instance = new ResourceFinderImp(fhirContext); - return instance; - } -} diff --git a/server/src/main/java/com/google/fhir/gateway/interfaces/ResourceFinder.java b/server/src/main/java/com/google/fhir/gateway/interfaces/ResourceFinder.java deleted file mode 100755 index 7ea67781..00000000 --- a/server/src/main/java/com/google/fhir/gateway/interfaces/ResourceFinder.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2021-2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.google.fhir.gateway.interfaces; - -import com.google.fhir.gateway.BundleResources; -import java.util.List; - -public interface ResourceFinder { - - List findResourcesInBundle(RequestDetailsReader request); -}