[#1289] Revisit API of "org.eclipse.passage.lic.hc" bundle

Signed-off-by: eparovyshnaya <[email protected]>
eclipse-passage · Apr 5, 2024 · 0d92a7a · 0d92a7a
1 parent 7b5b7dd
commit 0d92a7a
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 25 deletions.
diff --git a/bundles/org.eclipse.passage.lic.hc/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.hc/META-INF/MANIFEST.MF
@@ -14,8 +14,9 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="0.0.0",
  org.eclipse.passage.lic.equinox;bundle-version="0.0.0",
  org.eclipse.passage.lic.net;bundle-version="0.0.0",
  org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0"
-Export-Package: org.eclipse.passage.lic.hc.remote,
- org.eclipse.passage.lic.hc.remote.impl,
- org.eclipse.passage.lic.hc.remote.impl.acquire,
- org.eclipse.passage.lic.hc.remote.impl.mine
+Export-Package: org.eclipse.passage.lic.hc.internal.remote;x-internal:=true,
+ org.eclipse.passage.lic.hc.remote,
+ org.eclipse.passage.lic.hc.remote.impl;x-internal:=true,
+ org.eclipse.passage.lic.hc.remote.impl.acquire;x-internal:=true,
+ org.eclipse.passage.lic.hc.remote.impl.mine;x-internal:=true
 Bundle-ActivationPolicy: lazy
diff --git a/...eclipse/passage/lic/hc/remote/Client.java → ...assage/lic/hc/internal/remote/Client.java b/...eclipse/passage/lic/hc/remote/Client.java → ...assage/lic/hc/internal/remote/Client.java
@@ -10,9 +10,11 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.hc.remote;
+package org.eclipse.passage.lic.hc.internal.remote;
 
 import org.eclipse.passage.lic.api.ServiceInvocationResult;
+import org.eclipse.passage.lic.hc.remote.Connection;
+import org.eclipse.passage.lic.hc.remote.Request;
 
 /**
  * 

diff --git a/...assage/lic/hc/remote/ResponseHandler.java → ...c/hc/internal/remote/ResponseHandler.java b/...assage/lic/hc/remote/ResponseHandler.java → ...c/hc/internal/remote/ResponseHandler.java
@@ -10,9 +10,10 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.hc.remote;
+package org.eclipse.passage.lic.hc.internal.remote;
 
 import org.eclipse.passage.lic.api.LicensingException;
+import org.eclipse.passage.lic.hc.remote.RequestContext;
 import org.eclipse.passage.lic.hc.remote.impl.ResultsTransfered;
 
 /**

diff --git a/...pse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/EObjectFromXmiResponse.java b/...pse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/EObjectFromXmiResponse.java
@@ -17,8 +17,8 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.passage.lic.api.LicensingException;
 import org.eclipse.passage.lic.api.conditions.mining.ContentType;
+import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler;
 import org.eclipse.passage.lic.hc.remote.RequestContext;
-import org.eclipse.passage.lic.hc.remote.ResponseHandler;
 import org.eclipse.passage.lic.internal.emf.EObjectFromBytes;
 import org.eclipse.passage.lic.internal.hc.i18n.AccessMessages;
 import org.eclipse.passage.lic.internal.net.io.SafePayload;

diff --git a/...les/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/HttpClient.java b/...les/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/HttpClient.java
@@ -20,10 +20,10 @@
 import org.eclipse.passage.lic.base.BaseServiceInvocationResult;
 import org.eclipse.passage.lic.base.diagnostic.BaseDiagnostic;
 import org.eclipse.passage.lic.base.diagnostic.code.ServiceFailedOnInfrastructureDenial;
-import org.eclipse.passage.lic.hc.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler;
 import org.eclipse.passage.lic.hc.remote.Request;
 import org.eclipse.passage.lic.hc.remote.RequestContext;
-import org.eclipse.passage.lic.hc.remote.ResponseHandler;
 import org.eclipse.passage.lic.internal.hc.i18n.AccessMessages;
 
 /**

diff --git a/...les/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceAny.java b/...les/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceAny.java
@@ -24,7 +24,7 @@
 import org.eclipse.passage.lic.base.diagnostic.BaseDiagnostic;
 import org.eclipse.passage.lic.base.diagnostic.NoSevereErrors;
 import org.eclipse.passage.lic.base.diagnostic.SumOfDiagnostics;
-import org.eclipse.passage.lic.hc.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.Client;
 import org.eclipse.passage.lic.hc.remote.Connection;
 import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess;
 

diff --git a/...s/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceEvery.java b/...s/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceEvery.java
@@ -19,7 +19,7 @@
 
 import org.eclipse.passage.lic.api.ServiceInvocationResult;
 import org.eclipse.passage.lic.base.BaseServiceInvocationResult;
-import org.eclipse.passage.lic.hc.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.Client;
 import org.eclipse.passage.lic.hc.remote.Connection;
 import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess;
 

diff --git a/.../org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceRemote.java b/.../org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceRemote.java
@@ -27,9 +27,9 @@
 import org.eclipse.passage.lic.base.io.LicensingFolder;
 import org.eclipse.passage.lic.base.io.PathFromLicensedProduct;
 import org.eclipse.passage.lic.base.io.UserHomePath;
-import org.eclipse.passage.lic.hc.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler;
 import org.eclipse.passage.lic.hc.remote.Connection;
-import org.eclipse.passage.lic.hc.remote.ResponseHandler;
 import org.eclipse.passage.lic.internal.hc.i18n.AccessMessages;
 import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess;
 

diff --git a/...ipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquire.java b/...ipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquire.java
@@ -19,11 +19,11 @@
 import org.eclipse.passage.lic.api.LicensingException;
 import org.eclipse.passage.lic.api.acquire.GrantAcquisition;
 import org.eclipse.passage.lic.api.io.HashesRegistry;
-import org.eclipse.passage.lic.hc.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler;
 import org.eclipse.passage.lic.hc.remote.Configuration;
 import org.eclipse.passage.lic.hc.remote.Connection;
 import org.eclipse.passage.lic.hc.remote.RequestContext;
-import org.eclipse.passage.lic.hc.remote.ResponseHandler;
 import org.eclipse.passage.lic.hc.remote.impl.BaseConfiguration;
 import org.eclipse.passage.lic.hc.remote.impl.EObjectFromXmiResponse;
 import org.eclipse.passage.lic.hc.remote.impl.Equipment;

diff --git a/...e.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquisitionService.java b/...e.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquisitionService.java
@@ -22,7 +22,7 @@
 import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget;
 import org.eclipse.passage.lic.base.io.LicensingFolder;
 import org.eclipse.passage.lic.base.io.UserHomePath;
-import org.eclipse.passage.lic.hc.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.Client;
 import org.eclipse.passage.lic.hc.remote.Connection;
 import org.eclipse.passage.lic.hc.remote.impl.Equipment;
 import org.eclipse.passage.lic.hc.remote.impl.HttpClient;

diff --git a/...ipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteRelease.java b/...ipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteRelease.java
@@ -19,11 +19,11 @@
 import org.eclipse.passage.lic.api.LicensingException;
 import org.eclipse.passage.lic.api.acquire.GrantAcquisition;
 import org.eclipse.passage.lic.api.io.HashesRegistry;
-import org.eclipse.passage.lic.hc.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler;
 import org.eclipse.passage.lic.hc.remote.Configuration;
 import org.eclipse.passage.lic.hc.remote.Connection;
 import org.eclipse.passage.lic.hc.remote.RequestContext;
-import org.eclipse.passage.lic.hc.remote.ResponseHandler;
 import org.eclipse.passage.lic.hc.remote.impl.BaseConfiguration;
 import org.eclipse.passage.lic.hc.remote.impl.Equipment;
 import org.eclipse.passage.lic.hc.remote.impl.RemoteRequest;

diff --git a/...e.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/DecryptedConditions.java b/...e.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/DecryptedConditions.java
@@ -24,8 +24,8 @@
 import org.eclipse.passage.lic.api.conditions.mining.ConditionTransport.Data;
 import org.eclipse.passage.lic.base.conditions.BaseConditionOrigin;
 import org.eclipse.passage.lic.base.conditions.BaseConditionPack;
+import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler;
 import org.eclipse.passage.lic.hc.remote.RequestContext;
-import org.eclipse.passage.lic.hc.remote.ResponseHandler;
 import org.eclipse.passage.lic.hc.remote.impl.Equipment;
 import org.eclipse.passage.lic.hc.remote.impl.ResultsTransfered;
 import org.eclipse.passage.lic.internal.hc.i18n.MineMessages;

diff --git a/...ipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/RemoteConditions.java b/...ipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/RemoteConditions.java
@@ -26,9 +26,9 @@
 import org.eclipse.passage.lic.base.SumOfCollections;
 import org.eclipse.passage.lic.base.io.LicensingFolder;
 import org.eclipse.passage.lic.base.io.UserHomePath;
-import org.eclipse.passage.lic.hc.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler;
 import org.eclipse.passage.lic.hc.remote.Connection;
-import org.eclipse.passage.lic.hc.remote.ResponseHandler;
 import org.eclipse.passage.lic.hc.remote.impl.Equipment;
 import org.eclipse.passage.lic.hc.remote.impl.HttpClient;
 import org.eclipse.passage.lic.hc.remote.impl.RemoteRequest;

diff --git a/...assage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/AcquireTest.java b/...assage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/AcquireTest.java
@@ -26,7 +26,7 @@
 import org.eclipse.passage.lic.api.ServiceInvocationResult;
 import org.eclipse.passage.lic.api.acquire.GrantAcquisition;
 import org.eclipse.passage.lic.base.diagnostic.DiagnosticExplained;
-import org.eclipse.passage.lic.hc.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.Client;
 import org.eclipse.passage.lic.hc.remote.impl.acquire.RemoteAcquisitionService;
 import org.eclipse.passage.lic.internal.net.api.handle.NetResponse;
 import org.eclipse.passage.lic.internal.net.handle.ProductUserRequest;

diff --git a/...e.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/MineTest.java b/...e.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/MineTest.java
@@ -28,7 +28,7 @@
 import org.eclipse.passage.lic.api.ServiceInvocationResult;
 import org.eclipse.passage.lic.api.conditions.ConditionPack;
 import org.eclipse.passage.lic.base.diagnostic.DiagnosticExplained;
-import org.eclipse.passage.lic.hc.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.Client;
 import org.eclipse.passage.lic.hc.remote.impl.mine.RemoteConditions;
 import org.eclipse.passage.lic.internal.net.api.handle.NetResponse;
 import org.eclipse.passage.lic.internal.net.handle.ProductUserRequest;

diff --git a/...age.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/ShortcutClient.java b/...age.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/ShortcutClient.java
@@ -22,9 +22,9 @@
 import org.eclipse.passage.lic.api.LicensingException;
 import org.eclipse.passage.lic.api.ServiceInvocationResult;
 import org.eclipse.passage.lic.base.BaseServiceInvocationResult;
-import org.eclipse.passage.lic.hc.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.Client;
+import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler;
 import org.eclipse.passage.lic.hc.remote.Request;
-import org.eclipse.passage.lic.hc.remote.ResponseHandler;
 import org.eclipse.passage.lic.hc.remote.impl.ResultsTransfered;
 import org.eclipse.passage.lic.internal.net.api.handle.NetResponse;