diff options
Diffstat (limited to 'container-di')
4 files changed, 6 insertions, 14 deletions
diff --git a/container-di/pom.xml b/container-di/pom.xml index de1b34cbcad..8e89910e247 100644 --- a/container-di/pom.xml +++ b/container-di/pom.xml @@ -16,14 +16,6 @@ <packaging>container-plugin</packaging> <dependencies> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>annotations</artifactId> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>annotations</artifactId> <version>${project.version}</version> diff --git a/container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java b/container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java index add411051c2..440a687a671 100644 --- a/container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java +++ b/container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java @@ -3,15 +3,15 @@ package com.yahoo.container.bundle; import com.yahoo.component.ComponentId; import com.yahoo.component.ComponentSpecification; -import net.jcip.annotations.Immutable; /** * Specifies how a component should be instantiated from a bundle. * + * Immutable + * * @author Tony Vaagenes */ -@Immutable public final class BundleInstantiationSpecification { public final ComponentId id; diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java index cdd886b4672..f55d68ad708 100644 --- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java +++ b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java @@ -17,7 +17,6 @@ import com.yahoo.container.di.componentgraph.cycle.CycleFinder; import com.yahoo.container.di.componentgraph.cycle.Graph; import com.yahoo.log.LogLevel; import com.yahoo.vespa.config.ConfigKey; -import net.jcip.annotations.NotThreadSafe; import java.lang.annotation.Annotation; import java.lang.reflect.ParameterizedType; @@ -42,8 +41,9 @@ import static com.yahoo.container.di.componentgraph.core.Exceptions.removeStackT * @author Tony Vaagenes * @author gjoranv * @author ollivir + * + * Not thread safe. */ -@NotThreadSafe public class ComponentGraph { private static final Logger log = Logger.getLogger(ComponentGraph.class.getName()); diff --git a/container-di/src/main/java/com/yahoo/osgi/provider/model/ComponentModel.java b/container-di/src/main/java/com/yahoo/osgi/provider/model/ComponentModel.java index 2b56f6ebbca..8c501963db3 100644 --- a/container-di/src/main/java/com/yahoo/osgi/provider/model/ComponentModel.java +++ b/container-di/src/main/java/com/yahoo/osgi/provider/model/ComponentModel.java @@ -4,14 +4,14 @@ package com.yahoo.osgi.provider.model; import com.yahoo.component.ComponentId; import com.yahoo.component.ComponentSpecification; import com.yahoo.container.bundle.BundleInstantiationSpecification; -import net.jcip.annotations.Immutable; /** * Describes how a component should be created. * + * Immutable + * * @author gjoranv */ -@Immutable public class ComponentModel { public final BundleInstantiationSpecification bundleInstantiationSpec; |