Skip to content

Commit 9c45ea8

Browse files
committed
Refactor ApiClient initialization so that only factory methods are used
1 parent eedf09b commit 9c45ea8

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

basyx.aasrepository/basyx.aasrepository-client/src/main/java/org/eclipse/digitaltwin/basyx/aasrepository/client/AuthorizedConnectedAasRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
package org.eclipse.digitaltwin.basyx.aasrepository.client;
2727

28-
import org.eclipse.digitaltwin.basyx.aasrepository.client.internal.AssetAdministrationShellRepositoryApi;
28+
import org.eclipse.digitaltwin.basyx.aasrepository.client.internal.AssetAdministrationShellRepositoryApiFactory;
2929
import org.eclipse.digitaltwin.basyx.aasservice.client.ConnectedAasService;
3030
import org.eclipse.digitaltwin.basyx.aasservice.client.AuthorizedConnectedAasService;
3131
import org.eclipse.digitaltwin.basyx.client.internal.ApiException;
@@ -41,7 +41,7 @@ public class AuthorizedConnectedAasRepository extends ConnectedAasRepository {
4141
private TokenManager tokenManager;
4242

4343
public AuthorizedConnectedAasRepository(String repoUrl, TokenManager tokenManager) {
44-
super(repoUrl, new AssetAdministrationShellRepositoryApi(repoUrl, tokenManager));
44+
super(repoUrl, AssetAdministrationShellRepositoryApiFactory.create(repoUrl, tokenManager));
4545
this.tokenManager = tokenManager;
4646
}
4747

basyx.aasservice/basyx.aasservice-client/src/main/java/org/eclipse/digitaltwin/basyx/aasservice/client/AuthorizedConnectedAasService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
package org.eclipse.digitaltwin.basyx.aasservice.client;
2727

28-
import org.eclipse.digitaltwin.basyx.aasservice.client.internal.AssetAdministrationShellServiceApi;
28+
import org.eclipse.digitaltwin.basyx.aasservice.client.internal.AssetAdministrationShellServiceApiFactory;
2929
import org.eclipse.digitaltwin.basyx.client.internal.authorization.TokenManager;
3030

3131
/**
@@ -43,7 +43,7 @@ public class AuthorizedConnectedAasService extends ConnectedAasService {
4343
* @param tokenManager
4444
*/
4545
public AuthorizedConnectedAasService(String repoUrl, TokenManager tokenManager) {
46-
super(new AssetAdministrationShellServiceApi(repoUrl, tokenManager));
46+
super(AssetAdministrationShellServiceApiFactory.create(repoUrl, tokenManager));
4747
}
4848

4949
}

basyx.submodelrepository/basyx.submodelrepository-client/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/client/AuthorizedConnectedSubmodelRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import org.eclipse.digitaltwin.basyx.client.internal.ApiException;
2929
import org.eclipse.digitaltwin.basyx.client.internal.authorization.TokenManager;
30-
import org.eclipse.digitaltwin.basyx.submodelrepository.client.internal.SubmodelRepositoryApi;
30+
import org.eclipse.digitaltwin.basyx.submodelrepository.client.internal.SubmodelRepositoryApiFactory;
3131
import org.eclipse.digitaltwin.basyx.submodelservice.client.AuthorizedConnectedSubmodelService;
3232
import org.eclipse.digitaltwin.basyx.submodelservice.client.ConnectedSubmodelService;
3333

@@ -41,7 +41,7 @@ public class AuthorizedConnectedSubmodelRepository extends ConnectedSubmodelRepo
4141
private TokenManager tokenManager;
4242

4343
public AuthorizedConnectedSubmodelRepository(String repoUrl, TokenManager tokenManager) {
44-
super(repoUrl, new SubmodelRepositoryApi(repoUrl, tokenManager));
44+
super(repoUrl, SubmodelRepositoryApiFactory.create(repoUrl, tokenManager));
4545
this.tokenManager = tokenManager;
4646
}
4747

basyx.submodelservice/basyx.submodelservice-client/src/main/java/org/eclipse/digitaltwin/basyx/submodelservice/client/AuthorizedConnectedSubmodelService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
package org.eclipse.digitaltwin.basyx.submodelservice.client;
2727

2828
import org.eclipse.digitaltwin.basyx.client.internal.authorization.TokenManager;
29-
import org.eclipse.digitaltwin.basyx.submodelservice.client.internal.SubmodelServiceApi;
29+
import org.eclipse.digitaltwin.basyx.submodelservice.client.internal.SubmodelServiceApiFactory;
3030

3131
/**
3232
* Provides access to an authorized Submodel Service on a remote server - regardless if it
@@ -43,7 +43,7 @@ public class AuthorizedConnectedSubmodelService extends ConnectedSubmodelService
4343
* @param tokenManager
4444
*/
4545
public AuthorizedConnectedSubmodelService(String repoUrl, TokenManager tokenManager) {
46-
super(new SubmodelServiceApi(repoUrl, tokenManager));
46+
super(SubmodelServiceApiFactory.create(repoUrl, tokenManager));
4747
}
4848

4949
}

0 commit comments

Comments
 (0)