Skip to content

Commit

Permalink
chore: fix compile issue after type manager refactor upstream (#1221)
Browse files Browse the repository at this point in the history
* chore: fix compile issue after type manager refactor upstream

* chore: deps file [skip-ci]
wolf4ood authored Apr 15, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent bdab899 commit 92c5032
Showing 8 changed files with 15 additions and 10 deletions.
1 change: 1 addition & 0 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
@@ -452,6 +452,7 @@ maven/mavencentral/org.eclipse.edc/jetty-micrometer/0.6.1-SNAPSHOT, Apache-2.0,
maven/mavencentral/org.eclipse.edc/json-ld-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/json-ld-spi/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/json-ld/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/json-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/junit-base/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/junit/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
maven/mavencentral/org.eclipse.edc/jws2020-lib/0.6.1-SNAPSHOT, Apache-2.0, approved, technology.edc
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@

package org.eclipse.tractusx.edc.validation.businesspartner.store.sql;

import org.eclipse.edc.json.JacksonTypeManager;
import org.eclipse.edc.junit.annotations.PostgresqlIntegrationTest;
import org.eclipse.edc.spi.types.TypeManager;
import org.eclipse.edc.sql.QueryExecutor;
@@ -36,7 +37,7 @@
@PostgresqlIntegrationTest
@ExtendWith(PostgresqlStoreSetupExtension.class)
class SqlBusinessPartnerStoreTest extends BusinessPartnerStoreTestBase {
private final TypeManager typeManager = new TypeManager();
private final TypeManager typeManager = new JacksonTypeManager();
private final BusinessPartnerGroupStatements statements = new PostgresBusinessPartnerGroupStatements();
private SqlBusinessPartnerStore store;

Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@
import org.eclipse.edc.connector.controlplane.asset.spi.domain.Asset;
import org.eclipse.edc.connector.controlplane.store.sql.assetindex.SqlAssetIndex;
import org.eclipse.edc.connector.controlplane.store.sql.assetindex.schema.postgres.PostgresDialectStatements;
import org.eclipse.edc.json.JacksonTypeManager;
import org.eclipse.edc.junit.annotations.PostgresqlIntegrationTest;
import org.eclipse.edc.spi.types.TypeManager;
import org.eclipse.edc.sql.QueryExecutor;
import org.eclipse.edc.sql.testfixtures.PostgresqlStoreSetupExtension;
import org.flywaydb.core.api.MigrationVersion;
@@ -44,7 +44,7 @@ class AssetPostgresqlMigrationExtensionTest {
@BeforeEach
void setUp(PostgresqlStoreSetupExtension extension, QueryExecutor queryExecutor) {
store = new SqlAssetIndex(extension.getDataSourceRegistry(), extension.getDatasourceName(),
extension.getTransactionContext(), new TypeManager().getMapper(), new PostgresDialectStatements(),
extension.getTransactionContext(), new JacksonTypeManager().getMapper(), new PostgresDialectStatements(),
queryExecutor);
}

Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@

package org.eclipse.tractusx.edc.provision.additionalheaders;

import org.eclipse.edc.spi.types.TypeManager;
import org.eclipse.edc.json.JacksonTypeManager;
import org.eclipse.edc.spi.types.domain.DataAddress;
import org.junit.jupiter.api.Test;

@@ -32,7 +32,7 @@ class AdditionalHeadersProvisionedResourceTest {

@Test
void serdes() {
var typeManager = new TypeManager();
var typeManager = new JacksonTypeManager();
var resource =
AdditionalHeadersProvisionedResource.Builder.newInstance()
.id(UUID.randomUUID().toString())
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@

package org.eclipse.tractusx.edc.provision.additionalheaders;

import org.eclipse.edc.spi.types.TypeManager;
import org.eclipse.edc.json.JacksonTypeManager;
import org.eclipse.edc.spi.types.domain.DataAddress;
import org.junit.jupiter.api.Test;

@@ -32,7 +32,7 @@ class AdditionalHeadersResourceDefinitionTest {

@Test
void serdes() {
var typeManager = new TypeManager();
var typeManager = new JacksonTypeManager();
var definition =
AdditionalHeadersResourceDefinition.Builder.newInstance()
.id(UUID.randomUUID().toString())
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@

package org.eclipse.tractusx.edc.tests;

import org.eclipse.edc.json.JacksonTypeManager;
import org.eclipse.edc.spi.iam.ClaimToken;
import org.eclipse.edc.spi.iam.IdentityService;
import org.eclipse.edc.spi.iam.TokenParameters;
@@ -39,7 +40,7 @@ public class MockBpnIdentityService implements IdentityService {

private static final String BUSINESS_PARTNER_NUMBER_CLAIM = "BusinessPartnerNumber";
private final String businessPartnerNumber;
private final TypeManager typeManager = new TypeManager();
private final TypeManager typeManager = new JacksonTypeManager();

public MockBpnIdentityService(String businessPartnerNumber) {
this.businessPartnerNumber = businessPartnerNumber;
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.RecordedRequest;
import org.eclipse.edc.iam.identitytrust.sts.embedded.EmbeddedSecureTokenService;
import org.eclipse.edc.json.JacksonTypeManager;
import org.eclipse.edc.spi.iam.TokenRepresentation;
import org.eclipse.edc.spi.types.TypeManager;
import org.jetbrains.annotations.NotNull;
@@ -42,7 +43,7 @@
*/
public class DimDispatcher extends Dispatcher {

private static final TypeManager MAPPER = new TypeManager();
private static final TypeManager MAPPER = new JacksonTypeManager();
private final String path;
private final Map<String, EmbeddedSecureTokenService> secureTokenServices;

Original file line number Diff line number Diff line change
@@ -22,14 +22,15 @@
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.RecordedRequest;
import org.eclipse.edc.json.JacksonTypeManager;
import org.eclipse.edc.spi.types.TypeManager;
import org.jetbrains.annotations.NotNull;

import java.util.Map;

public class KeycloakDispatcher extends Dispatcher {

private static final TypeManager MAPPER = new TypeManager();
private static final TypeManager MAPPER = new JacksonTypeManager();
private final String path;

public KeycloakDispatcher(String path) {

0 comments on commit 92c5032

Please sign in to comment.