Skip to content

Commit

Permalink
refactor!: update package names (eclipse-edc#2127)
Browse files Browse the repository at this point in the history
* refactor: update package names of classes in all modules

* chore(build): update root project name

* refactor(extensions): rename :micrometer:micrometer-core to :metrics:micrometer-core

* refactor(spi): rename :transformer-spi to :transform-spi

* refactor(extensions): rename :provision modules

* refactor(extensions): change :policy-store-cosmos to :policy-definition-store-cosmos

* chore: update metaModelVersion to 0.0.1-20221024-SNAPSHOT

* chore: update openapi files
  • Loading branch information
juliapampus authored and diegogomez-zf committed Nov 7, 2022
1 parent da01d95 commit 22db58d
Show file tree
Hide file tree
Showing 1,881 changed files with 11,081 additions and 13,525 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ jobs:
uses: ./.github/actions/run-tests
with:
command: |
./gradlew -p extensions/common/micrometer/micrometer-core/ test -DincludeTags="OpenTelemetryIntegrationTest"
./gradlew -p extensions/common/metrics/micrometer-core/ test -DincludeTags="OpenTelemetryIntegrationTest"
./gradlew -p system-tests/tests test -DincludeTags="OpenTelemetryIntegrationTest"
Check-Cloud-Environments:
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ For detailed information about the whole project, please take a look at our [Git

### Add Maven dependencies

Official versions are available through [MavenCentral](https://search.maven.org/search?q=org.eclipse.dataspaceconnector)
Official versions are available through [MavenCentral](https://search.maven.org/search?q=org.eclipse.edc)
.
Please add the following instructions in your `build.gradle[.kts]` file (if not already present):

Expand All @@ -62,11 +62,11 @@ repositories {
We **strongly** recommend to use official versions and only switch to snapshots if there is a clear need to do so, or
you've been instructed to do so, e.g. to verify a bugfix.

All artifacts are under the `org.eclipse.dataspaceconnector` group id, for example:
All artifacts are under the `org.eclipse.edc` group id, for example:

```kotlin
dependencies {
implementation("org.eclipse.dataspaceconnector:spi:core-spi:<<version>>")
implementation("org.eclipse.edc:spi:core-spi:<<version>>")
// any other dependencies
}
```
Expand All @@ -91,7 +91,7 @@ Then you can add snapshot dependencies by simply using the `-SNAPSHOT` version s

```kotlin
dependencies {
implementation("org.eclipse.dataspaceconnector:spi:core-spi:0.0.1-SNAPSHOT")
implementation("org.eclipse.edc:spi:core-spi:0.0.1-SNAPSHOT")
// any other dependencies
}
```
Expand Down Expand Up @@ -192,7 +192,7 @@ Launchers are essentially connector packages that are runnable. What modules get
capabilities a connector has) is defined by the `build.gradle.kts` file inside the launcher subdirectory. That's also
where a Java class containing a `main` method should go. We will call that class a "runtime" and in order for the
connector to become operational the `runtime` needs to perform several important tasks (="bootstrapping"). For an
example take a look at [this runtime](samples/other/custom-runtime/src/main/java/org/eclipse/dataspaceconnector/demo/runtime/CustomRuntime.java)
example take a look at [this runtime](samples/other/custom-runtime/src/main/java/org/eclipse/edc/sample/runtime/CustomRuntime.java)

### `resources/charts`

Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ openApiMerger {

// Dependency analysis active if property "dependency.analysis" is set. Possible values are <'fail'|'warn'|'ignore'>.
if (project.hasProperty("dependency.analysis")) {
apply(plugin = "org.eclipse.dataspaceconnector.dependency-rules")
configure<org.eclipse.dataspaceconnector.gradle.DependencyRulesPluginExtension> {
apply(plugin = "org.eclipse.edc.dependency-rules")
configure<org.eclipse.edc.gradle.DependencyRulesPluginExtension> {
severity.set(project.property("dependency.analysis").toString())
}
apply(plugin = "com.autonomousapps.dependency-analysis")
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ gradlePlugin {
plugins {

create("DependencyRulesPlugin") {
id = "org.eclipse.dataspaceconnector.dependency-rules"
implementationClass = "org.eclipse.dataspaceconnector.gradle.DependencyRulesPlugin"
id = "org.eclipse.edc.dependency-rules"
implementationClass = "org.eclipse.edc.gradle.DependencyRulesPlugin"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
*/

package org.eclipse.dataspaceconnector.gradle;
package org.eclipse.edc.gradle;

import org.gradle.api.Plugin;
import org.gradle.api.Project;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
*/

package org.eclipse.dataspaceconnector.gradle;
package org.eclipse.edc.gradle;

import org.gradle.api.provider.Property;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
*/

package org.eclipse.dataspaceconnector.gradle;
package org.eclipse.edc.gradle;

import org.gradle.api.DefaultTask;
import org.gradle.api.GradleException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
*
*/

package org.eclipse.dataspaceconnector.boot.monitor;
package org.eclipse.edc.boot.monitor;

import org.eclipse.dataspaceconnector.spi.monitor.ConsoleMonitor;
import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
import org.eclipse.edc.spi.monitor.ConsoleMonitor;
import org.eclipse.edc.spi.monitor.Monitor;
import org.slf4j.ILoggerFactory;
import org.slf4j.IMarkerFactory;
import org.slf4j.Marker;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
*
*/

package org.eclipse.dataspaceconnector.boot.system;

import org.eclipse.dataspaceconnector.spi.EdcException;
import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
import org.eclipse.dataspaceconnector.spi.system.ConfigurationExtension;
import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext;
import org.eclipse.dataspaceconnector.spi.system.configuration.Config;
import org.eclipse.dataspaceconnector.spi.system.configuration.ConfigFactory;
import org.eclipse.dataspaceconnector.spi.telemetry.Telemetry;
import org.eclipse.dataspaceconnector.spi.types.TypeManager;
package org.eclipse.edc.boot.system;

import org.eclipse.edc.spi.EdcException;
import org.eclipse.edc.spi.monitor.Monitor;
import org.eclipse.edc.spi.system.ConfigurationExtension;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.edc.spi.system.configuration.Config;
import org.eclipse.edc.spi.system.configuration.ConfigFactory;
import org.eclipse.edc.spi.telemetry.Telemetry;
import org.eclipse.edc.spi.types.TypeManager;

import java.time.Clock;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,22 @@
*
*/

package org.eclipse.dataspaceconnector.boot.system;

import org.eclipse.dataspaceconnector.boot.util.TopologicalSort;
import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.BaseExtension;
import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.CoreExtension;
import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Provides;
import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Requires;
import org.eclipse.dataspaceconnector.spi.EdcException;
import org.eclipse.dataspaceconnector.spi.system.ServiceExtension;
import org.eclipse.dataspaceconnector.spi.system.injection.EdcInjectionException;
import org.eclipse.dataspaceconnector.spi.system.injection.InjectionContainer;
import org.eclipse.dataspaceconnector.spi.system.injection.InjectionPoint;
import org.eclipse.dataspaceconnector.spi.system.injection.InjectionPointScanner;
import org.eclipse.dataspaceconnector.spi.system.injection.ProviderMethod;
import org.eclipse.dataspaceconnector.spi.system.injection.ProviderMethodScanner;
package org.eclipse.edc.boot.system;

import org.eclipse.edc.boot.util.CyclicDependencyException;
import org.eclipse.edc.boot.util.TopologicalSort;
import org.eclipse.edc.runtime.metamodel.annotation.BaseExtension;
import org.eclipse.edc.runtime.metamodel.annotation.CoreExtension;
import org.eclipse.edc.runtime.metamodel.annotation.Provides;
import org.eclipse.edc.runtime.metamodel.annotation.Requires;
import org.eclipse.edc.spi.EdcException;
import org.eclipse.edc.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.injection.EdcInjectionException;
import org.eclipse.edc.spi.system.injection.InjectionContainer;
import org.eclipse.edc.spi.system.injection.InjectionPoint;
import org.eclipse.edc.spi.system.injection.InjectionPointScanner;
import org.eclipse.edc.spi.system.injection.ProviderMethod;
import org.eclipse.edc.spi.system.injection.ProviderMethodScanner;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -56,7 +57,7 @@ public class DependencyGraph {
*
* @param loadedExtensions A list of {@link ServiceExtension} instances that were picked up by the {@link ServiceLocator}
* @return A list of {@link InjectionContainer}s that are sorted topologically according to their dependencies.
* @throws org.eclipse.dataspaceconnector.boot.util.CyclicDependencyException when there is a dependency cycle
* @throws CyclicDependencyException when there is a dependency cycle
* @see TopologicalSort
* @see InjectionContainer
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
*
*/

package org.eclipse.dataspaceconnector.boot.system;
package org.eclipse.edc.boot.system;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.OpenTelemetry;
import org.eclipse.dataspaceconnector.boot.system.injection.InjectorImpl;
import org.eclipse.dataspaceconnector.boot.system.injection.lifecycle.ExtensionLifecycleManager;
import org.eclipse.dataspaceconnector.spi.monitor.ConsoleMonitor;
import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
import org.eclipse.dataspaceconnector.spi.monitor.MultiplexingMonitor;
import org.eclipse.dataspaceconnector.spi.system.MonitorExtension;
import org.eclipse.dataspaceconnector.spi.system.ServiceExtension;
import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext;
import org.eclipse.dataspaceconnector.spi.system.injection.InjectionContainer;
import org.eclipse.dataspaceconnector.spi.system.injection.ProviderMethod;
import org.eclipse.dataspaceconnector.spi.system.injection.ProviderMethodScanner;
import org.eclipse.dataspaceconnector.spi.telemetry.Telemetry;
import org.eclipse.edc.boot.system.injection.InjectorImpl;
import org.eclipse.edc.boot.system.injection.lifecycle.ExtensionLifecycleManager;
import org.eclipse.edc.spi.monitor.ConsoleMonitor;
import org.eclipse.edc.spi.monitor.Monitor;
import org.eclipse.edc.spi.monitor.MultiplexingMonitor;
import org.eclipse.edc.spi.system.MonitorExtension;
import org.eclipse.edc.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.edc.spi.system.injection.InjectionContainer;
import org.eclipse.edc.spi.system.injection.ProviderMethod;
import org.eclipse.edc.spi.system.injection.ProviderMethodScanner;
import org.eclipse.edc.spi.telemetry.Telemetry;
import org.jetbrains.annotations.NotNull;

import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
*/

package org.eclipse.dataspaceconnector.boot.system;
package org.eclipse.edc.boot.system;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
*
*/

package org.eclipse.dataspaceconnector.boot.system;
package org.eclipse.edc.boot.system;

import org.eclipse.dataspaceconnector.spi.EdcException;
import org.eclipse.edc.spi.EdcException;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
*
*/

package org.eclipse.dataspaceconnector.boot.system.injection;
package org.eclipse.edc.boot.system.injection;

import org.eclipse.dataspaceconnector.spi.EdcException;
import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext;
import org.eclipse.dataspaceconnector.spi.system.injection.EdcInjectionException;
import org.eclipse.dataspaceconnector.spi.system.injection.InjectionContainer;
import org.eclipse.dataspaceconnector.spi.system.injection.Injector;
import org.eclipse.edc.spi.EdcException;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.edc.spi.system.injection.EdcInjectionException;
import org.eclipse.edc.spi.system.injection.InjectionContainer;
import org.eclipse.edc.spi.system.injection.Injector;

import java.util.Map;
import java.util.function.Supplier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
*
*/

package org.eclipse.dataspaceconnector.boot.system.injection;
package org.eclipse.edc.boot.system.injection;

import org.eclipse.dataspaceconnector.spi.EdcException;
import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext;
import org.eclipse.dataspaceconnector.spi.system.injection.InjectionContainer;
import org.eclipse.dataspaceconnector.spi.system.injection.InjectionPointScanner;
import org.eclipse.dataspaceconnector.spi.system.injection.Injector;
import org.eclipse.dataspaceconnector.spi.system.injection.ObjectFactory;
import org.eclipse.edc.spi.EdcException;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.edc.spi.system.injection.InjectionContainer;
import org.eclipse.edc.spi.system.injection.InjectionPointScanner;
import org.eclipse.edc.spi.system.injection.Injector;
import org.eclipse.edc.spi.system.injection.ObjectFactory;
import org.jetbrains.annotations.NotNull;

import java.lang.reflect.Constructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
*
*/

package org.eclipse.dataspaceconnector.boot.system.injection.lifecycle;
package org.eclipse.edc.boot.system.injection.lifecycle;

import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Inject;
import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Provider;
import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
import org.eclipse.dataspaceconnector.spi.system.ServiceExtension;
import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext;
import org.eclipse.dataspaceconnector.spi.system.injection.InjectionContainer;
import org.eclipse.dataspaceconnector.spi.system.injection.Injector;
import org.eclipse.edc.runtime.metamodel.annotation.Inject;
import org.eclipse.edc.runtime.metamodel.annotation.Provider;
import org.eclipse.edc.spi.monitor.Monitor;
import org.eclipse.edc.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.edc.spi.system.injection.InjectionContainer;
import org.eclipse.edc.spi.system.injection.Injector;

/**
* {@link ServiceExtension} implementors should not be constructed by just invoking their constructors, instead they need to go through
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
*
*/

package org.eclipse.dataspaceconnector.boot.system.injection.lifecycle;
package org.eclipse.edc.boot.system.injection.lifecycle;

import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
import org.eclipse.dataspaceconnector.spi.system.ServiceExtension;
import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext;
import org.eclipse.dataspaceconnector.spi.system.injection.InjectionContainer;
import org.eclipse.dataspaceconnector.spi.system.injection.Injector;
import org.eclipse.edc.spi.monitor.Monitor;
import org.eclipse.edc.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.edc.spi.system.injection.InjectionContainer;
import org.eclipse.edc.spi.system.injection.Injector;

import static java.lang.String.format;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
*
*/

package org.eclipse.dataspaceconnector.boot.system.injection.lifecycle;
package org.eclipse.edc.boot.system.injection.lifecycle;

import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
import org.eclipse.dataspaceconnector.spi.system.ServiceExtension;
import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext;
import org.eclipse.dataspaceconnector.spi.system.injection.InjectionContainer;
import org.eclipse.dataspaceconnector.spi.system.injection.Injector;
import org.eclipse.edc.spi.monitor.Monitor;
import org.eclipse.edc.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.edc.spi.system.injection.InjectionContainer;
import org.eclipse.edc.spi.system.injection.Injector;

/**
* Represents an abstract phase in an {@link ServiceExtension}'s lifecycle. Is used by the {@link ExtensionLifecycleManager} to ensure the correct
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
*
*/

package org.eclipse.dataspaceconnector.boot.system.injection.lifecycle;
package org.eclipse.edc.boot.system.injection.lifecycle;

import org.eclipse.dataspaceconnector.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtension;

/**
* Represents an {@link ServiceExtension}'s lifecycle phase where it's {@linkplain ServiceExtension#prepare()} method is
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
*
*/

package org.eclipse.dataspaceconnector.boot.system.injection.lifecycle;
package org.eclipse.edc.boot.system.injection.lifecycle;

import org.eclipse.dataspaceconnector.spi.system.ServiceExtension;
import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext;
import org.eclipse.dataspaceconnector.spi.system.injection.ProviderMethod;
import org.eclipse.dataspaceconnector.spi.system.injection.ProviderMethodScanner;
import org.eclipse.edc.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.edc.spi.system.injection.ProviderMethod;
import org.eclipse.edc.spi.system.injection.ProviderMethodScanner;

/**
* Represents an {@link ServiceExtension}'s lifecycle phase where all it's provider methods are invoked by the {@link ExtensionLifecycleManager}, and the provided objects are registered into the context.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
*
*/

package org.eclipse.dataspaceconnector.boot.system.injection.lifecycle;
package org.eclipse.edc.boot.system.injection.lifecycle;

import org.eclipse.dataspaceconnector.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtension;

/**
* Represents an {@link ServiceExtension}'s lifecycle phase where it's {@linkplain ServiceExtension#start()} method is invoked by the
Expand Down
Loading

0 comments on commit 22db58d

Please sign in to comment.