Release 3.2.51

src/main/java/de/fraunhofer/iese/ind2uce/api/component/exception/InhibitException.java

@@ -41,14 +41,13 @@ public class InhibitException extends Exception {
     super(message);
   }
 
-
   /**
    * Instantiates a new inhibit exception.
    *
    * @param message the message
    * @param causedby Wrapped Exception
    */
-  public InhibitException(String message,Throwable causedby) {
+  public InhibitException(String message, Throwable causedby) {
     super(message, causedby);
   }
 

src/main/java/de/fraunhofer/iese/ind2uce/api/component/interfaces/IComponent.java

@@ -63,7 +63,8 @@ public interface IComponent extends Serializable {
   /**
    * Checks whether a component is up and running.
    *
-   * @return a string describing the health status. In case of spring applications, a JSON of Health.class representation is used.
+   * @return a string describing the health status. In case of spring
+   *         applications, a JSON of Health.class representation is used.
    * @throws IOException
    */
   String getHealth() throws IOException;

src/main/java/de/fraunhofer/iese/ind2uce/api/component/interfaces/IPolicyDecisionPoint.java

@@ -30,6 +30,7 @@ import de.fraunhofer.iese.ind2uce.api.policy.identifier.PolicyId;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * The PolicyDecisionPoint draws decisions based on the currently deployed
@@ -96,4 +97,6 @@ public interface IPolicyDecisionPoint extends IComponent {
 
   boolean removeFromBlacklist(List<EnforcementScopeId> ids) throws IOException;
 
+  Map<Event, AuthorizationDecision> timerDecisionRequest(List<Event> events) throws IOException, EvaluationUndecidableException;
+
 }

src/main/java/de/fraunhofer/iese/ind2uce/api/component/interfaces/IPolicyManagementPoint.java

@@ -29,6 +29,7 @@ import de.fraunhofer.iese.ind2uce.api.component.exception.ConflictingPolicyExcep
 import de.fraunhofer.iese.ind2uce.api.component.exception.PolicyRevokationException;
 import de.fraunhofer.iese.ind2uce.api.component.identifier.ComponentId;
 import de.fraunhofer.iese.ind2uce.api.component.identifier.EnforcementScopeId;
+import de.fraunhofer.iese.ind2uce.api.policy.InvalidPolicyException;
 import de.fraunhofer.iese.ind2uce.api.policy.Policy;
 import de.fraunhofer.iese.ind2uce.api.policy.identifier.PolicyId;
 
@@ -56,8 +57,9 @@ public interface IPolicyManagementPoint extends IComponent {
    * @throws IllegalArgumentException policy is not valid
    * @throws ConflictingPolicyException multiple policies with same policyId
    *           exist in PMP database
+   * @throws InvalidPolicyException
    */
-  boolean addAndDeployPolicy(String policy) throws IOException, IllegalArgumentException, ConflictingPolicyException;
+  boolean addAndDeployPolicy(String policy) throws IOException, IllegalArgumentException, ConflictingPolicyException, InvalidPolicyException;
 
   /**
    * Adds a policy (ILP, ILPT, SLP, SLPT).
@@ -65,8 +67,19 @@ public interface IPolicyManagementPoint extends IComponent {
    * @param policy the policy
    * @return true if successfully added
    * @throws IOException Signals that an I/O exception has occurred.
+   * @throws InvalidPolicyException
    */
-  boolean addPolicy(String policy) throws IOException;
+  boolean addPolicyString(String policy) throws IOException;
+
+  /**
+   * Adds a policy (ILP, ILPT, SLP, SLPT).
+   *
+   * @param policy the policy
+   * @return true if successfully added
+   * @throws IOException Signals that an I/O exception has occurred.
+   * @throws InvalidPolicyException
+   */
+  boolean addPolicy(Policy p) throws IOException;
 
   /**
    * Checks if the component is already in the database.
@@ -314,4 +327,13 @@ public interface IPolicyManagementPoint extends IComponent {
    * @throws IOException
    */
   List<EnforcementScopeId> getBlackListedSolutions() throws IOException;
+
+  /**
+   * Gets the running hashcode of the pmp. Used in development mode, to check if
+   * the pmp restarted and the pdp has to be reset.
+   *
+   * @return the running id
+   * @throws IOException Signals that an I/O exception has occurred.
+   */
+  Integer getPmpHashcode() throws IOException;
 }

src/main/java/de/fraunhofer/iese/ind2uce/api/component/interfaces/IPolicyRetrievalPoint.java

@@ -56,7 +56,6 @@ public interface IPolicyRetrievalPoint extends IComponent {
    */
   boolean componentExists(ComponentId componentId) throws IOException;
 
-
   /**
    * Gets all policy.
    *
@@ -115,8 +114,6 @@ public interface IPolicyRetrievalPoint extends IComponent {
    */
   List<PolicyId> getPolicyIds() throws IOException;
 
-
-
   /**
    * Provides a list of currently deployed policy ids.
    *