From 092a927019f6b88ef6ea9b1cfa6ff22126bffd48 Mon Sep 17 00:00:00 2001 From: Julia Pampus <72392527+juliapampus@users.noreply.github.com> Date: Mon, 13 Jun 2022 13:58:20 +0200 Subject: [PATCH] refactor: remove ids.spi.policy --- CHANGELOG.md | 1 + .../ids/spi/policy/IdsOfferDutyFunction.java | 36 --------------- .../policy/IdsOfferPermissionFunction.java | 35 --------------- .../ids/spi/policy/IdsOfferPolicyContext.java | 36 --------------- .../policy/IdsOfferProhibitionFunction.java | 36 --------------- .../ids/spi/policy/IdsPolicyActions.java | 44 ------------------- .../ids/spi/policy/IdsPolicyExpressions.java | 31 ------------- .../spi/policy/IdsRequestDutyFunction.java | 36 --------------- .../policy/IdsRequestPermissionFunction.java | 35 --------------- .../spi/policy/IdsRequestPolicyContext.java | 44 ------------------- .../policy/IdsRequestProhibitionFunction.java | 36 --------------- 11 files changed, 1 insertion(+), 369 deletions(-) delete mode 100644 data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferDutyFunction.java delete mode 100644 data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferPermissionFunction.java delete mode 100644 data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferPolicyContext.java delete mode 100644 data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferProhibitionFunction.java delete mode 100644 data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsPolicyActions.java delete mode 100644 data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsPolicyExpressions.java delete mode 100644 data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestDutyFunction.java delete mode 100644 data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestPermissionFunction.java delete mode 100644 data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestPolicyContext.java delete mode 100644 data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestProhibitionFunction.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f0a2095176..441422baf72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ in the detailed section referring to by linking pull requests or issues. * Old RegistrationService (was used for a PoC) (#164) * Deprecated `InlineDataFlowController` (replaced by the Data Plane) (#1464) +* Unused classes and interfaces at `ids.spi.policy` (#1471) #### Fixed diff --git a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferDutyFunction.java b/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferDutyFunction.java deleted file mode 100644 index 28b0e304cbd..00000000000 --- a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferDutyFunction.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2020, 2021 Microsoft Corporation - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Microsoft Corporation - initial API and implementation - * - */ - -package org.eclipse.dataspaceconnector.ids.spi.policy; - -import org.eclipse.dataspaceconnector.policy.model.Duty; -import org.eclipse.dataspaceconnector.policy.model.Operator; - -/** - * Evaluates a constraint attached to a duty. - */ -@FunctionalInterface -public interface IdsOfferDutyFunction { - - /** - * Performs the evaluation. - * - * @param operator the operation - * @param rightValue the right-side expression for the constraint - * @param duty the duty associated with the constraint - * @param context the policy context - */ - boolean evaluate(Operator operator, String rightValue, Duty duty, IdsOfferPolicyContext context); - -} diff --git a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferPermissionFunction.java b/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferPermissionFunction.java deleted file mode 100644 index 4601a41c344..00000000000 --- a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferPermissionFunction.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2020, 2021 Microsoft Corporation - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Microsoft Corporation - initial API and implementation - * - */ - -package org.eclipse.dataspaceconnector.ids.spi.policy; - -import org.eclipse.dataspaceconnector.policy.model.Operator; -import org.eclipse.dataspaceconnector.policy.model.Permission; - -/** - * Evaluates a constraint attached to a permission. - */ -@FunctionalInterface -public interface IdsOfferPermissionFunction { - - /** - * Performs the evaluation. - * - * @param operator the operation - * @param rightValue the right-side expression for the constraint - * @param permission the permission associated with the constraint - * @param context the policy context - */ - boolean evaluate(Operator operator, String rightValue, Permission permission, IdsOfferPolicyContext context); -} diff --git a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferPolicyContext.java b/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferPolicyContext.java deleted file mode 100644 index 9a468257fb6..00000000000 --- a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferPolicyContext.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2020, 2021 Microsoft Corporation - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Microsoft Corporation - initial API and implementation - * - */ - -package org.eclipse.dataspaceconnector.ids.spi.policy; - -/** - * IDS policy context for consumer-side offer evaluation functions. - */ -public class IdsOfferPolicyContext { - private final String processId; - private final String providerConnectorId; - - public IdsOfferPolicyContext(String providerConnectorId, String processId) { - this.providerConnectorId = providerConnectorId; - this.processId = processId; - } - - public String getProviderConnectorId() { - return providerConnectorId; - } - - public String getProcessId() { - return processId; - } -} diff --git a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferProhibitionFunction.java b/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferProhibitionFunction.java deleted file mode 100644 index d0863813ea9..00000000000 --- a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsOfferProhibitionFunction.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2020, 2021 Microsoft Corporation - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Microsoft Corporation - initial API and implementation - * - */ - -package org.eclipse.dataspaceconnector.ids.spi.policy; - -import org.eclipse.dataspaceconnector.policy.model.Operator; -import org.eclipse.dataspaceconnector.policy.model.Prohibition; - -/** - * Evaluates a constraint attached to a prohibition. - */ -@FunctionalInterface -public interface IdsOfferProhibitionFunction { - - /** - * Performs the evaluation. - * - * @param operator the operation - * @param rightValue the right-side expression for the constraint - * @param prohibition the prohibition associated with the constraint - * @param context the policy context - */ - boolean evaluate(Operator operator, String rightValue, Prohibition prohibition, IdsOfferPolicyContext context); - -} diff --git a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsPolicyActions.java b/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsPolicyActions.java deleted file mode 100644 index 180a49661c4..00000000000 --- a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsPolicyActions.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2020, 2021 Microsoft Corporation - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Microsoft Corporation - initial API and implementation - * - */ - -package org.eclipse.dataspaceconnector.ids.spi.policy; - -import org.eclipse.dataspaceconnector.policy.model.Action; - -/** - * Actions defined by IDS. - */ -public interface IdsPolicyActions { - - String USE = "idsc:USE"; - String COMPENSATE = "idsc:COMPENSATE"; - String DELETE = "idsc:DELETE"; - String GRANT_USE = "idsc:GRANT_USE"; - String DISTRIBUTE = "idsc:DISTRIBUTE"; - String READ = "idsc:READ"; - String RETRIEVE = "ids:retrieveOperation"; - String ANONYMIZE = "idsc:ANONYMIZE"; - String ENCRYPT = "idsc:ENCRYPT"; - - Action USE_ACTION = Action.Builder.newInstance().type(USE).build(); - Action COMPENSATE_ACTION = Action.Builder.newInstance().type(COMPENSATE).build(); - Action DELETE_ACTION = Action.Builder.newInstance().type(DELETE).build(); - Action GRANT_USE_ACTION = Action.Builder.newInstance().type(GRANT_USE).build(); - Action DISTRIBUTE_ACTION = Action.Builder.newInstance().type(DISTRIBUTE).build(); - Action READ_ACTION = Action.Builder.newInstance().type(READ).build(); - Action RETRIEVE_ACTION = Action.Builder.newInstance().type(RETRIEVE).build(); - Action ANONYMIZE_ACTION = Action.Builder.newInstance().type(ANONYMIZE).build(); - Action ENCRYPT_ACTION = Action.Builder.newInstance().type(ENCRYPT).build(); - -} diff --git a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsPolicyExpressions.java b/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsPolicyExpressions.java deleted file mode 100644 index 94a8c57cece..00000000000 --- a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsPolicyExpressions.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2020, 2021 Microsoft Corporation - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Microsoft Corporation - initial API and implementation - * - */ - -package org.eclipse.dataspaceconnector.ids.spi.policy; - -import org.eclipse.dataspaceconnector.policy.model.LiteralExpression; - -/** - * Policy expressions defined by IDS. - */ -public interface IdsPolicyExpressions { - - String PAY_AMOUNT = "idsc:PAY_AMOUNT"; - - String ABS_SPATIAL_POSITION = "ids:absoluteSpatialPosition"; - - LiteralExpression ABS_SPATIAL_POSITION_EXPRESSION = new LiteralExpression(ABS_SPATIAL_POSITION); - - LiteralExpression PAY_AMOUNT_EXPRESSION = new LiteralExpression(PAY_AMOUNT); -} diff --git a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestDutyFunction.java b/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestDutyFunction.java deleted file mode 100644 index e8e695cb12f..00000000000 --- a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestDutyFunction.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2020, 2021 Microsoft Corporation - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Microsoft Corporation - initial API and implementation - * - */ - -package org.eclipse.dataspaceconnector.ids.spi.policy; - -import org.eclipse.dataspaceconnector.policy.model.Duty; -import org.eclipse.dataspaceconnector.policy.model.Operator; - -/** - * Evaluates a constraint attached to a duty. - */ -@FunctionalInterface -public interface IdsRequestDutyFunction { - - /** - * Performs the evaluation. - * - * @param operator the operation - * @param rightValue the right-side expression for the constraint - * @param duty the duty associated with the constraint - * @param context the policy context - */ - boolean evaluate(Operator operator, String rightValue, Duty duty, IdsRequestPolicyContext context); - -} diff --git a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestPermissionFunction.java b/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestPermissionFunction.java deleted file mode 100644 index d4787ce7318..00000000000 --- a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestPermissionFunction.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2020, 2021 Microsoft Corporation - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Microsoft Corporation - initial API and implementation - * - */ - -package org.eclipse.dataspaceconnector.ids.spi.policy; - -import org.eclipse.dataspaceconnector.policy.model.Operator; -import org.eclipse.dataspaceconnector.policy.model.Permission; - -/** - * * Evaluates a constraint attached to a permission. - */ -@FunctionalInterface -public interface IdsRequestPermissionFunction { - - /** - * Performs the evaluation. - * - * @param operator the operation - * @param rightValue the right-side expression for the constraint - * @param permission the permission associated with the constraint - * @param context the policy context - */ - boolean evaluate(Operator operator, String rightValue, Permission permission, IdsRequestPolicyContext context); -} diff --git a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestPolicyContext.java b/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestPolicyContext.java deleted file mode 100644 index b29aceb42bd..00000000000 --- a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestPolicyContext.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2020, 2021 Microsoft Corporation - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Microsoft Corporation - initial API and implementation - * - */ - -package org.eclipse.dataspaceconnector.ids.spi.policy; - -import org.eclipse.dataspaceconnector.spi.iam.ClaimToken; - -/** - * IDS policy context for provider-side request evaluation functions. - */ -public class IdsRequestPolicyContext { - private final String correlationId; - private final String consumerConnectorId; - private final ClaimToken claimToken; - - public IdsRequestPolicyContext(String consumerConnectorId, String correlationId, ClaimToken claimToken) { - this.consumerConnectorId = consumerConnectorId; - this.correlationId = correlationId; - this.claimToken = claimToken; - } - - public String getConsumerConnectorId() { - return consumerConnectorId; - } - - public String getCorrelationId() { - return correlationId; - } - - public ClaimToken getClaimToken() { - return claimToken; - } -} diff --git a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestProhibitionFunction.java b/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestProhibitionFunction.java deleted file mode 100644 index 4c3248fe1ab..00000000000 --- a/data-protocols/ids/ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/policy/IdsRequestProhibitionFunction.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2020, 2021 Microsoft Corporation - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Microsoft Corporation - initial API and implementation - * - */ - -package org.eclipse.dataspaceconnector.ids.spi.policy; - -import org.eclipse.dataspaceconnector.policy.model.Operator; -import org.eclipse.dataspaceconnector.policy.model.Prohibition; - -/** - * Evaluates a constraint attached to a prohibition. - */ -@FunctionalInterface -public interface IdsRequestProhibitionFunction { - - /** - * Performs the evaluation. - * - * @param operator the operation - * @param rightValue the right-side expression for the constraint - * @param prohibition the prohibition associated with the constraint - * @param context the policy context - */ - boolean evaluate(Operator operator, String rightValue, Prohibition prohibition, IdsRequestPolicyContext context); - -}