diff options
| author | Morten Tokle <mortent@yahooinc.com> | 2023-04-27 08:54:12 +0200 |
|---|---|---|
| committer | Morten Tokle <mortent@yahooinc.com> | 2023-04-27 08:54:12 +0200 |
| commit | c07f807a15db8e65f2f474f3bbf07bd3f8fab023 (patch) | |
| tree | 35a9365cbbef0414999f72626b052a36d9403f4e /container-disc | |
| parent | 3ded973e207dddf9a61d7bbff5cc203e53881bae (diff) | |
Revert "Revert "Merge pull request #26859 from vespa-engine/revert-26805-olaa/versioned-feature-flag""
This reverts commit e10612188741a2d5ce9c69b80c35015b38ea1627.
Diffstat (limited to 'container-disc')
3 files changed, 2 insertions, 6 deletions
diff --git a/container-disc/abi-spec.json b/container-disc/abi-spec.json index 75246a77e03..dd681e4124f 100644 --- a/container-disc/abi-spec.json +++ b/container-disc/abi-spec.json @@ -19,8 +19,7 @@ "public abstract java.util.List getIdentityCertificate()", "public abstract java.security.cert.X509Certificate getRoleCertificate(java.lang.String, java.lang.String)", "public abstract java.security.PrivateKey getPrivateKey()", - "public abstract java.nio.file.Path trustStorePath()", - "public abstract void deconstruct()" + "public abstract java.nio.file.Path trustStorePath()" ], "fields" : [ ] }, diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java index 9d2e06ed9da..f04e2291ee8 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/AthenzIdentityProviderProvider.java @@ -89,9 +89,6 @@ public class AthenzIdentityProviderProvider implements Provider<AthenzIdentityPr public Path trustStorePath() { throw new UnsupportedOperationException(message); } - - @Override - public void deconstruct() {} } } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java index 46803988b20..af5133eceac 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/AthenzIdentityProvider.java @@ -24,5 +24,5 @@ public interface AthenzIdentityProvider { X509Certificate getRoleCertificate(String domain, String role); PrivateKey getPrivateKey(); Path trustStorePath(); - void deconstruct(); + } |