diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-04-02 00:14:15 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2021-04-12 16:12:49 +0200 |
| commit | 7704561c0aa2fcd34f58cb79b8781da97b3019c0 (patch) | |
| tree | ebe88d3170804d6deaf53281e72f9668955c1e29 | |
| parent | cff3a8e44c5fac3e6ab4216bb99d87823262eff0 (diff) | |
Move componentgraph.Provider from container-di to component.
- It was the only PublicApi class in container-di, and is widely
used in the same way as e.g. AbstractComponent from the
component module.
| -rw-r--r-- | component/src/main/java/com/yahoo/container/di/componentgraph/Provider.java (renamed from container-di/src/main/java/com/yahoo/container/di/componentgraph/Provider.java) | 0 | ||||
| -rw-r--r-- | component/src/main/java/com/yahoo/container/di/componentgraph/package-info.java | 12 | ||||
| -rw-r--r-- | container-di/src/main/java/com/yahoo/container/di/componentgraph/package-info.java | 7 |
3 files changed, 12 insertions, 7 deletions
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/Provider.java b/component/src/main/java/com/yahoo/container/di/componentgraph/Provider.java index 3fd3195e5dd..3fd3195e5dd 100644 --- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/Provider.java +++ b/component/src/main/java/com/yahoo/container/di/componentgraph/Provider.java diff --git a/component/src/main/java/com/yahoo/container/di/componentgraph/package-info.java b/component/src/main/java/com/yahoo/container/di/componentgraph/package-info.java new file mode 100644 index 00000000000..054abe9cff9 --- /dev/null +++ b/component/src/main/java/com/yahoo/container/di/componentgraph/package-info.java @@ -0,0 +1,12 @@ +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +/** + * Note that this package also exists in another Vespa module, for historical + * reasons. All Java classes should be kept in this module, and the other + * module's package should remain empty. + */ +@ExportPackage +@PublicApi +package com.yahoo.container.di.componentgraph; + +import com.yahoo.api.annotations.PublicApi; +import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/package-info.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/package-info.java deleted file mode 100644 index 0c11cfb5ba4..00000000000 --- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage -@PublicApi -package com.yahoo.container.di.componentgraph; - -import com.yahoo.api.annotations.PublicApi; -import com.yahoo.osgi.annotation.ExportPackage; |