[#1372] Delete marker interface Gear

bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/api/FlsGear.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 ArSysOp
+ * Copyright (c) 2021, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,21 +9,21 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
  *******************************************************************************/
 package org.eclipse.passage.lbc.internal.base.api;
 
 import java.nio.file.Path;
 import java.util.function.Supplier;
 
-import org.eclipse.passage.lic.api.Gear;
 import org.eclipse.passage.lic.api.LicensedProduct;
 import org.eclipse.passage.lic.api.conditions.mining.ConditionTransport;
 import org.eclipse.passage.lic.api.conditions.mining.ContentType;
 import org.eclipse.passage.lic.api.io.HashesRegistry;
 import org.eclipse.passage.lic.api.io.KeyKeeper;
 import org.eclipse.passage.lic.api.io.StreamCodec;
 
-public interface FlsGear extends Gear {
+public interface FlsGear {
 
 	HashesRegistry hashes();
 

bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/api/FlsGearSupplier.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 ArSysOp
+ * Copyright (c) 2021, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,17 +9,12 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
  *******************************************************************************/
 package org.eclipse.passage.lbc.internal.base.api;
 
-import org.eclipse.passage.lic.api.GearSupplier;
+import java.util.function.Supplier;
 
-/**
- * @since 1.1
- */
-public interface FlsGearSupplier extends GearSupplier<FlsGear> {
-
-	@Override
-	FlsGear gear();
+public interface FlsGearSupplier extends Supplier<FlsGear> {
 
 }

bundles/org.eclipse.passage.lbc.fls.gear/src/org/eclipse/passage/lbc/internal/fls/gear/PassageFlsGearAvailable.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 ArSysOp
+ * Copyright (c) 2021, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
  *******************************************************************************/
 package org.eclipse.passage.lbc.internal.fls.gear;
 
@@ -21,7 +22,7 @@
 public final class PassageFlsGearAvailable implements FlsGearSupplier {
 
 	@Override
-	public FlsGear gear() {
+	public FlsGear get() {
 		return PassageFlsGear.gear;
 	}
 

bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/GearAware.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021, 2022 ArSysOp
+ * Copyright (c) 2021, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,15 +9,15 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
  *******************************************************************************/
 package org.eclipse.passage.lic.equinox;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Optional;
+import java.util.function.Supplier;
 
-import org.eclipse.passage.lic.api.Gear;
-import org.eclipse.passage.lic.api.GearSupplier;
 import org.eclipse.passage.lic.api.LicensingException;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
@@ -29,7 +29,7 @@
 /**
  * @since 2.1
  */
-public abstract class GearAware<G extends Gear, S extends GearSupplier<G>> {
+public abstract class GearAware<G, S extends Supplier<G>> {
 
 	private final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -48,7 +48,7 @@ public final <T> Optional<T> withGear(Unsafe<G, T> with) throws LicensingExcepti
 		}
 		ServiceReference<S> any = references.iterator().next();
 		try {
-			return with.apply(context.getService(any).gear());
+			return with.apply(context.getService(any).get());
 		} catch (Exception e) {
 			throw new LicensingException("Error on service invocation", e); //$NON-NLS-1$
 		} finally {
@@ -59,7 +59,7 @@ public final <T> Optional<T> withGear(Unsafe<G, T> with) throws LicensingExcepti
 	protected abstract Class<S> supplier();
 
 	@FunctionalInterface
-	public interface Unsafe<G extends Gear, T> {
+	public interface Unsafe<G, T> {
 
 		Optional<T> apply(G gear) throws Exception;
 

bundles/org.eclipse.passage.loc.api/src/org/eclipse/passage/loc/internal/api/OperatorGear.java

@@ -15,14 +15,13 @@
 
 import java.util.Optional;
 
-import org.eclipse.passage.lic.api.Gear;
 import org.eclipse.passage.lic.api.LicensedProduct;
 import org.eclipse.passage.lic.api.inspection.RuntimeEnvironmentRegistry;
 import org.eclipse.passage.lic.api.io.HashesRegistry;
 import org.eclipse.passage.lic.api.io.StreamCodec;
 import org.eclipse.passage.loc.internal.api.workspace.OperatorWorkspace;
 
-public interface OperatorGear extends Gear {
+public interface OperatorGear {
 
 	Optional<StreamCodec> codec(LicensedProduct product);
 

bundles/org.eclipse.passage.loc.api/src/org/eclipse/passage/loc/internal/api/OperatorGearSupplier.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 ArSysOp
+ * Copyright (c) 2021, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,11 +9,12 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
  *******************************************************************************/
 package org.eclipse.passage.loc.internal.api;
 
-import org.eclipse.passage.lic.api.GearSupplier;
+import java.util.function.Supplier;
 
-public interface OperatorGearSupplier extends GearSupplier<OperatorGear> {
+public interface OperatorGearSupplier extends Supplier<OperatorGear> {
 
 }

bundles/org.eclipse.passage.loc.equinox/src/org/eclipse/passage/loc/internal/equinox/BaseDomainRegistry.java

@@ -84,7 +84,7 @@ protected void activate(Map<String, Object> properties) {
 		try {
 			gear.stream()//
 					.findFirst()//
-					.map(OperatorGearSupplier::gear)//
+					.map(OperatorGearSupplier::get)//
 					.map(OperatorGear::workspace)//
 					.ifPresent(this::load);
 		} catch (Exception e) {
@@ -114,7 +114,7 @@ protected void deactivate(@SuppressWarnings("unused") Map<String, Object> proper
 		try {
 			gear.stream()//
 					.findFirst()//
-					.map(OperatorGearSupplier::gear)//
+					.map(OperatorGearSupplier::get)//
 					.map(OperatorGear::workspace)//
 					.ifPresent(this::store);
 		} catch (Exception e) {
@@ -133,7 +133,7 @@ private void store(OperatorWorkspace workspace) {
 	@Override
 	public EditingDomain getEditingDomain() {
 		if (editingDomain.isEmpty()) {
-			editingDomain = gear.map(OperatorGearSupplier::gear)//
+			editingDomain = gear.map(OperatorGearSupplier::get)//
 					.map(OperatorGear::editingDomainSource)//
 					.map(EditingDomainSource::create);
 		}

bundles/org.eclipse.passage.loc.operator.gear/src/org/eclipse/passage/loc/operator/internal/gear/OperatorGearAvailable.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 ArSysOp
+ * Copyright (c) 2021, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
  *******************************************************************************/
 package org.eclipse.passage.loc.operator.internal.gear;
 
@@ -20,7 +21,7 @@
 public final class OperatorGearAvailable implements OperatorGearSupplier {
 
 	@Override
-	public OperatorGear gear() {
+	public OperatorGear get() {
 		return DefaultGear.gear;
 	}
 

bundles/org.eclipse.passage.loc.products.emfforms/src/org/eclipse/passage/loc/products/emfforms/renderers/ProductVersionKeyRenderer.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019, 2023 ArSysOp
+ * Copyright (c) 2019, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
  *******************************************************************************/
 package org.eclipse.passage.loc.products.emfforms.renderers;
 
@@ -42,7 +43,7 @@ public ProductVersionKeyRenderer(VControl vElement, ViewModelContext viewContext
 			VTViewTemplateProvider vtViewTemplateProvider, OperatorGearSupplier gear) {
 		super(vElement, viewContext, reportService, emfFormsDatabinding, emfFormsLabelProvider, vtViewTemplateProvider,
 				ProductVersion.class);
-		this.workspace = gear.gear().workspace();
+		this.workspace = gear.get().workspace();
 	}
 
 	@Override