Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

consume uid2-shared 1.18.0 #12

Merged
merged 1 commit into from
Jan 24, 2023
Merged

consume uid2-shared 1.18.0 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<vertx.version>3.9.4</vertx.version>
<!-- check micrometer.version vertx-micrometer-metrics consumes before bumping up -->
<micrometer.version>1.1.0</micrometer.version>
<uid2-shared.version>1.12.0</uid2-shared.version>
<uid2-shared.version>1.18.0</uid2-shared.version>
<image.version>${project.version}</image.version>
</properties>

Expand Down
7 changes: 6 additions & 1 deletion src/main/java/com/uid2/optout/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
import com.uid2.shared.jmx.AdminApi;
import com.uid2.shared.optout.OptOutCloudSync;
import com.uid2.shared.optout.OptOutUtils;
import com.uid2.shared.store.CloudPath;
import com.uid2.shared.store.scope.GlobalScope;
import com.uid2.shared.vertx.CloudSyncVerticle;
import com.uid2.shared.vertx.RotatingStoreVerticle;
import com.uid2.shared.vertx.VertxUtils;
Expand Down Expand Up @@ -132,7 +134,10 @@ public Main(Vertx vertx, JsonObject config) throws Exception {
}

String operatorsMdPath = this.config.getString(Const.Config.OperatorsMetadataPathProp);
this.operatorKeyProvider = new RotatingOperatorKeyProvider(this.fsOperatorKeyConfig, contentStorage, operatorsMdPath);
this.operatorKeyProvider = new RotatingOperatorKeyProvider(
this.fsOperatorKeyConfig,
contentStorage,
new GlobalScope(new CloudPath(operatorsMdPath)));
if (useStorageMock) {
this.operatorKeyProvider.loadContent(this.operatorKeyProvider.getMetadata());
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uid2/optout/vertx/PartnerConfigMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.uid2.optout.partner.PartnersConfig;
import com.uid2.shared.Utils;
import com.uid2.shared.cloud.ICloudStorage;
import com.uid2.shared.store.IMetadataVersionedStore;
import com.uid2.shared.store.reader.IMetadataVersionedStore;
import io.vertx.core.CompositeFuture;
import io.vertx.core.Future;
import io.vertx.core.Promise;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uid2/optout/vertx/PartnerConfigMonitorV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.uid2.shared.Utils;
import com.uid2.shared.auth.ClientKey;
import com.uid2.shared.cloud.ICloudStorage;
import com.uid2.shared.store.IMetadataVersionedStore;
import com.uid2.shared.store.reader.IMetadataVersionedStore;
import io.vertx.core.CompositeFuture;
import io.vertx.core.Future;
import io.vertx.core.Promise;
Expand Down