Skip to content

Commit

Permalink
spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
knighto82 committed Dec 3, 2024
1 parent 2a80821 commit 2bdfbe2
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 22 deletions.
6 changes: 4 additions & 2 deletions src/main/java/io/github/jpmorganchase/fusion/Fusion.java
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,10 @@ public Map<String, Map<String, Object>> dataDictionaryAttributeResources(String
* @throws ParsingException if the response from Fusion could not be parsed successfully
* @throws OAuthException if a token could not be retrieved for authentication
*/
public DataDictionaryAttributeLineage dataDictionaryAttributeLineage(String catalogName, String attributeIdentifier) {
String url = String.format("%1scatalogs/%2s/attributes/%3s/lineage", this.rootURL, catalogName, attributeIdentifier);
public DataDictionaryAttributeLineage dataDictionaryAttributeLineage(
String catalogName, String attributeIdentifier) {
String url =
String.format("%1scatalogs/%2s/attributes/%3s/lineage", this.rootURL, catalogName, attributeIdentifier);
String json = this.api.callAPI(url);
return responseParser.parseDataDictionaryAttributeLineageResponse(json, catalogName, attributeIdentifier);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ public interface APIResponseParser {
Map<String, Attribute> parseAttributeResponse(String json, String dataset);

Map<String, DataDictionaryAttribute> parseDataDictionaryAttributeResponse(String json);
DataDictionaryAttributeLineage parseDataDictionaryAttributeLineageResponse(String json, String baseCatalogIdentifier, String baseIdentifier);

DataDictionaryAttributeLineage parseDataDictionaryAttributeLineageResponse(
String json, String baseCatalogIdentifier, String baseIdentifier);

Map<String, DataProduct> parseDataProductResponse(String json);

Map<String, DatasetSeries> parseDatasetSeriesResponse(String json);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ public Map<String, DataDictionaryAttribute> parseDataDictionaryAttributeResponse
}

@Override
public DataDictionaryAttributeLineage parseDataDictionaryAttributeLineageResponse(String json, String baseCatalogIdentifier, String baseIdentifier) {
public DataDictionaryAttributeLineage parseDataDictionaryAttributeLineageResponse(
String json, String baseCatalogIdentifier, String baseIdentifier) {
return parseResourceFromResponse(
json, DataDictionaryAttributeLineage.class, (resource, mc) -> resource.toBuilder()
.varArgs(mc.getVarArgs())
Expand All @@ -82,7 +83,6 @@ public DataDictionaryAttributeLineage parseDataDictionaryAttributeLineageRespons
.build());
}


@Override
public Map<String, Attribute> parseAttributeResponse(String json, String dataset) {
return parseResourcesWithVarArgsFromResponse(json, Attribute.class, (resource, mc) -> resource.toBuilder()
Expand Down Expand Up @@ -199,10 +199,7 @@ private ParsingException generateNoResourceException() {
}

private <T extends CatalogResource> T parseResourceWithVarArgs(
Set<String> excludes,
T obj,
Map<String, Object> untypedResource,
ResourceMutationFactory<T> mutator) {
Set<String> excludes, T obj, Map<String, Object> untypedResource, ResourceMutationFactory<T> mutator) {

Map<String, Object> varArgs = getVarArgsToInclude(untypedResource, excludes);
return mutator.mutate(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
package io.github.jpmorganchase.fusion.parsing;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;

import io.github.jpmorganchase.fusion.api.APIManager;
import io.github.jpmorganchase.fusion.api.context.APIContext;
import io.github.jpmorganchase.fusion.model.Application;
import io.github.jpmorganchase.fusion.model.Catalog;
import io.github.jpmorganchase.fusion.model.DataDictionaryAttribute;
import io.github.jpmorganchase.fusion.model.DataDictionaryAttributeLineage;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

public class GsonAPIResponseParserDataDictionaryAttributeLineageTest {

Expand Down Expand Up @@ -47,7 +43,6 @@ public class GsonAPIResponseParserDataDictionaryAttributeLineageTest {
.baseIdentifier("BA0001")
.build();


private static final APIContext apiContext = APIContext.builder()
.apiManager(Mockito.mock(APIManager.class))
.rootUrl("http://foobar/api/v1/")
Expand All @@ -58,14 +53,13 @@ public class GsonAPIResponseParserDataDictionaryAttributeLineageTest {

@Test
public void singleDataDictionaryAttributeResourceIsParsedCorrectly() {
DataDictionaryAttributeLineage l =
responseParser.parseDataDictionaryAttributeLineageResponse(singleDataDictionaryAttributeLineageJson, "base", "BA0001");
DataDictionaryAttributeLineage l = responseParser.parseDataDictionaryAttributeLineageResponse(
singleDataDictionaryAttributeLineageJson, "base", "BA0001");
assertThat(l, is(notNullValue()));

assertThat(l, is(equalTo(lineage)));
}


private static String loadTestResource(String resourceName) {
URL url = GsonAPIResponseParser.class.getResource(resourceName);
try {
Expand Down

0 comments on commit 2bdfbe2

Please sign in to comment.