Bug 566311 - [Passage] implement BoundLicense storage

canTake chain is now working Signed-off-by: Nikifor Fedorov <zelenyhleb@gmail.com>
eclipse-passage · Aug 25, 2020 · dbd1228 · dbd1228
1 parent 518b8ea
commit dbd1228
Show file tree

Hide file tree

Showing 15 changed files with 229 additions and 138 deletions.
diff --git a/bundles/org.eclipse.passage.lbc.api/.settings/.api_filters b/bundles/org.eclipse.passage.lbc.api/.settings/.api_filters
@@ -1,46 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.passage.lbc.api" version="2">
-    <resource path="src/org/eclipse/passage/lbc/internal/api/BackendLicenseLock.java" type="org.eclipse.passage.lbc.internal.api.BackendLicenseLock">
+    <resource path="src/org/eclipse/passage/lbc/internal/api/RequestedCondition.java" type="org.eclipse.passage.lbc.internal.api.RequestedCondition">
         <filter id="643842064">
-            <message_arguments>
-                <message_argument value="ServiceInvocationResult&lt;T&gt;"/>
-                <message_argument value="BackendLicenseLock"/>
-                <message_argument value="canTake(Condition)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="ServiceInvocationResult&lt;T&gt;"/>
-                <message_argument value="BackendLicenseLock"/>
-                <message_argument value="release(Condition)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="ServiceInvocationResult&lt;T&gt;"/>
-                <message_argument value="BackendLicenseLock"/>
-                <message_argument value="take(Condition)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="Condition"/>
-                <message_argument value="BackendLicenseLock"/>
-                <message_argument value="canTake(Condition)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="Condition"/>
-                <message_argument value="BackendLicenseLock"/>
-                <message_argument value="release(Condition)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
             <message_arguments>
                 <message_argument value="Condition"/>
-                <message_argument value="BackendLicenseLock"/>
-                <message_argument value="take(Condition)"/>
+                <message_argument value="RequestedCondition"/>
+                <message_argument value="condition()"/>
             </message_arguments>
         </filter>
     </resource>

diff --git a/....eclipse.passage.lbc.api/src/org/eclipse/passage/lbc/internal/api/BackendLicenseLock.java b/....eclipse.passage.lbc.api/src/org/eclipse/passage/lbc/internal/api/BackendLicenseLock.java
diff --git a/....eclipse.passage.lbc.api/src/org/eclipse/passage/lbc/internal/api/RequestedCondition.java b/....eclipse.passage.lbc.api/src/org/eclipse/passage/lbc/internal/api/RequestedCondition.java
@@ -12,8 +12,7 @@
  *******************************************************************************/
 package org.eclipse.passage.lbc.internal.api;
 
-import java.util.Optional;
-import java.util.function.Supplier;
+import org.eclipse.passage.lic.internal.api.conditions.Condition;
 
 /**
  * @since 1.0
@@ -22,6 +21,6 @@ public interface RequestedCondition {
 
 	Requester requester();
 
-	Supplier<Optional<String>> condition();
+	Condition condition();
 
 }
diff --git a/bundles/org.eclipse.passage.lbc.base/.settings/.api_filters b/bundles/org.eclipse.passage.lbc.base/.settings/.api_filters
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.passage.lbc.base" version="2">
+    <resource path="src/org/eclipse/passage/lbc/internal/base/BaseRequestedCondition.java" type="org.eclipse.passage.lbc.internal.base.BaseRequestedCondition">
+        <filter id="643842064">
+            <message_arguments>
+                <message_argument value="Condition"/>
+                <message_argument value="BaseRequestedCondition"/>
+                <message_argument value="condition()"/>
+            </message_arguments>
+        </filter>
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Condition"/>
+                <message_argument value="BaseRequestedCondition"/>
+                <message_argument value="BaseRequestedCondition(Condition, Requester)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/...se.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/BaseRequestedCondition.java b/...se.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/BaseRequestedCondition.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2020 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0/.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lbc.internal.base;
+
+import java.util.Objects;
+
+import org.eclipse.passage.lbc.internal.api.RequestedCondition;
+import org.eclipse.passage.lbc.internal.api.Requester;
+import org.eclipse.passage.lic.internal.api.conditions.Condition;
+
+/**
+ * @since 1.0
+ */
+public final class BaseRequestedCondition implements RequestedCondition {
+
+	private final Requester requester;
+	private final Condition condition;
+
+	public BaseRequestedCondition(Condition condition, Requester requester) {
+		Objects.requireNonNull(condition, "BaseRequestedCondition::condition"); //$NON-NLS-1$
+		Objects.requireNonNull(requester, "BaseRequestedCondition::requester"); //$NON-NLS-1$
+		this.requester = requester;
+		this.condition = condition;
+	}
+
+	@Override
+	public Requester requester() {
+		return requester;
+	}
+
+	@Override
+	public Condition condition() {
+		return condition;
+	}
+
+}
diff --git a/...lipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/ConditionIdentifier.java b/...lipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/ConditionIdentifier.java
@@ -12,7 +12,9 @@
  *******************************************************************************/
 package org.eclipse.passage.lbc.internal.base;
 
+import java.util.Optional;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import org.eclipse.passage.lic.internal.base.StringNamedData;
 
@@ -29,6 +31,10 @@ public ConditionIdentifier(Function<String, String> retrieve) {
 		super(retrieve);
 	}
 
+	public ConditionIdentifier(Supplier<Optional<String>> existing) {
+		this(existing.get().get());
+	}
+
 	@Override
 	public final String key() {
 		return "identifier"; //$NON-NLS-1$

diff --git a/...g.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/LicenseCapacity.java b/...g.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/LicenseCapacity.java
@@ -12,7 +12,9 @@
  *******************************************************************************/
 package org.eclipse.passage.lbc.internal.base;
 
+import java.util.Optional;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import org.eclipse.passage.lic.internal.base.BaseNamedData;
 
@@ -25,6 +27,14 @@ public LicenseCapacity(Function<String, Integer> retrieve) {
 		super(retrieve);
 	}
 
+	public LicenseCapacity(int value) {
+		super((key) -> value);
+	}
+
+	public LicenseCapacity(Supplier<Optional<Integer>> existing) {
+		this(existing.get().get());
+	}
+
 	@Override
 	public String key() {
 		return "capacity"; //$NON-NLS-1$

diff --git a/.../org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/LicenseTaken.java b/.../org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/LicenseTaken.java
@@ -12,7 +12,9 @@
  *******************************************************************************/
 package org.eclipse.passage.lbc.internal.base;
 
+import java.util.Optional;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import org.eclipse.passage.lic.internal.base.BaseNamedData;
 
@@ -25,6 +27,14 @@ public LicenseTaken(Function<String, Integer> retrieve) {
 		super(retrieve);
 	}
 
+	public LicenseTaken(int value) {
+		super((key) -> value);
+	}
+
+	public LicenseTaken(Supplier<Optional<Integer>> existing) {
+		this(existing.get().get());
+	}
+
 	@Override
 	public String key() {
 		return "taken"; //$NON-NLS-1$

diff --git a/...pse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/PassageFloatingServer.java b/...pse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/PassageFloatingServer.java
diff --git a/...rg.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/chains/CanTake.java b/...rg.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/chains/CanTake.java
@@ -12,17 +12,42 @@
  *******************************************************************************/
 package org.eclipse.passage.lbc.internal.base.chains;
 
+import java.util.Optional;
 import java.util.function.Function;
+import java.util.stream.Stream;
 
 import org.eclipse.passage.lbc.internal.api.RequestedCondition;
+import org.eclipse.passage.lbc.internal.api.persistence.PersistableLicense;
+import org.eclipse.passage.lbc.internal.base.troubles.ConditionEntryNotFound;
 import org.eclipse.passage.lic.internal.api.ServiceInvocationResult;
+import org.eclipse.passage.lic.internal.api.conditions.Condition;
+import org.eclipse.passage.lic.internal.api.diagnostic.Trouble;
 import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult;
 
+@SuppressWarnings("restriction")
 public final class CanTake implements Function<RequestedCondition, ServiceInvocationResult<Boolean>> {
 
+	private final Function<Condition, Optional<PersistableLicense>> find;
+
+	public CanTake(Function<Condition, Optional<PersistableLicense>> find) {
+		this.find = find;
+	}
+
 	@Override
-	public ServiceInvocationResult<Boolean> apply(RequestedCondition t) {
-		return new BaseServiceInvocationResult<Boolean>(true);
+	public ServiceInvocationResult<Boolean> apply(RequestedCondition request) {
+		Optional<PersistableLicense> license = license(request.condition());
+		if (license.isPresent()) {
+			return new BaseServiceInvocationResult<Boolean>(license.get().get().takeable());
+		} else {
+			return new BaseServiceInvocationResult<>(
+					new Trouble(new ConditionEntryNotFound(), request.condition().identifier()));
+		}
+	}
+
+	private Optional<PersistableLicense> license(Condition request) {
+		return Stream.of(request) //
+				.map(find) //
+				.findAny().get();
 	}
 
 }
diff --git a/...e.lbc.base/src/org/eclipse/passage/lbc/internal/base/troubles/ConditionEntryNotFound.java b/...e.lbc.base/src/org/eclipse/passage/lbc/internal/base/troubles/ConditionEntryNotFound.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2020 ArSysOp
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0/.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     ArSysOp - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.passage.lbc.internal.base.troubles;
+
+import org.eclipse.passage.lic.internal.api.diagnostic.TroubleCode;
+
+/**
+ * @since 1.0
+ */
+@SuppressWarnings("restriction")
+public final class ConditionEntryNotFound extends TroubleCode {
+
+	public ConditionEntryNotFound() {
+		super(601, "No bound license found for specified condition."); //$NON-NLS-1$
+	}
+
+}