From 778894b29b13831115c19ff13285541a10ab2d30 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Tue, 6 Apr 2021 14:19:35 +0200 Subject: Revert "Gjoranv/merge di into core (rebased)" --- .../bundle/BundleInstantiationSpecification.java | 86 ------- .../com/yahoo/container/bundle/MockBundle.java | 264 --------------------- .../com/yahoo/container/bundle/package-info.java | 5 - 3 files changed, 355 deletions(-) delete mode 100644 container-core/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java delete mode 100644 container-core/src/main/java/com/yahoo/container/bundle/MockBundle.java delete mode 100644 container-core/src/main/java/com/yahoo/container/bundle/package-info.java (limited to 'container-core/src/main/java/com/yahoo/container/bundle') diff --git a/container-core/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java b/container-core/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java deleted file mode 100644 index 0fb8a99a957..00000000000 --- a/container-core/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.container.bundle; - -import com.yahoo.component.ComponentId; -import com.yahoo.component.ComponentSpecification; - - -/** - * Specifies how a component should be instantiated from a bundle. - * - * Immutable - * - * @author Tony Vaagenes - */ -public final class BundleInstantiationSpecification { - - public final ComponentId id; - public final ComponentSpecification classId; - public final ComponentSpecification bundle; - - public BundleInstantiationSpecification(ComponentSpecification id, ComponentSpecification classId, ComponentSpecification bundle) { - this.id = id.toId(); - this.classId = (classId != null) ? classId : id.withoutNamespace(); - this.bundle = (bundle != null) ? bundle : this.classId; - } - - // Must only be used when classId != null, otherwise the id must be handled as a ComponentSpecification - // (since converting a spec string to a ComponentId and then to a ComponentSpecification causes loss of information). - public BundleInstantiationSpecification(ComponentId id, ComponentSpecification classId, ComponentSpecification bundle) { - this(id.toSpecification(), classId, bundle); - assert (classId!= null); - } - - private static final String defaultInternalBundle = "container-search-and-docproc"; - - private static BundleInstantiationSpecification getInternalSpecificationFromString(String idSpec, String classSpec) { - return new BundleInstantiationSpecification( - new ComponentSpecification(idSpec), - (classSpec == null || classSpec.isEmpty())? null : new ComponentSpecification(classSpec), - new ComponentSpecification(defaultInternalBundle)); - } - - public static BundleInstantiationSpecification getInternalSearcherSpecification(ComponentSpecification idSpec, - ComponentSpecification classSpec) { - return new BundleInstantiationSpecification(idSpec, classSpec, new ComponentSpecification(defaultInternalBundle)); - } - - // TODO: These are the same for now because they are in the same bundle. - public static BundleInstantiationSpecification getInternalHandlerSpecificationFromStrings(String idSpec, String classSpec) { - return getInternalSpecificationFromString(idSpec, classSpec); - } - - public static BundleInstantiationSpecification getInternalProcessingSpecificationFromStrings(String idSpec, String classSpec) { - return getInternalSpecificationFromString(idSpec, classSpec); - } - - public static BundleInstantiationSpecification getInternalSearcherSpecificationFromStrings(String idSpec, String classSpec) { - return getInternalSpecificationFromString(idSpec, classSpec); - } - - public static BundleInstantiationSpecification getFromStrings(String idSpec, String classSpec, String bundleSpec) { - return new BundleInstantiationSpecification( - new ComponentSpecification(idSpec), - (classSpec == null || classSpec.isEmpty())? null : new ComponentSpecification(classSpec), - (bundleSpec == null || bundleSpec.isEmpty())? null : new ComponentSpecification(bundleSpec)); - } - - /** - * Return a new instance of the specification with bundle name altered - * - * @param bundleName the new name of the bundle - * @return the new instance of the specification - */ - public BundleInstantiationSpecification inBundle(String bundleName) { - return new BundleInstantiationSpecification(this.id, this.classId, new ComponentSpecification(bundleName)); - } - - public String getClassName() { - return classId.getName(); - } - - public BundleInstantiationSpecification nestInNamespace(ComponentId namespace) { - return new BundleInstantiationSpecification(id.nestInNamespace(namespace), classId, bundle); - } - -} diff --git a/container-core/src/main/java/com/yahoo/container/bundle/MockBundle.java b/container-core/src/main/java/com/yahoo/container/bundle/MockBundle.java deleted file mode 100644 index a6524b41886..00000000000 --- a/container-core/src/main/java/com/yahoo/container/bundle/MockBundle.java +++ /dev/null @@ -1,264 +0,0 @@ -// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.container.bundle; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.Version; -import org.osgi.framework.wiring.BundleCapability; -import org.osgi.framework.wiring.BundleRequirement; -import org.osgi.framework.wiring.BundleRevision; -import org.osgi.framework.wiring.BundleWire; -import org.osgi.framework.wiring.BundleWiring; -import org.osgi.resource.Capability; -import org.osgi.resource.Requirement; -import org.osgi.resource.Wire; - -import java.io.File; -import java.io.InputStream; -import java.net.URL; -import java.security.cert.X509Certificate; -import java.util.Collection; -import java.util.Collections; -import java.util.Dictionary; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; - -/** - * @author gjoranv - * @author ollivir - */ -public class MockBundle implements Bundle, BundleWiring { - public static final String SymbolicName = "mock-bundle"; - public static final Version BundleVersion = new Version(1, 0, 0); - - private static final Class bundleWiringClass = BundleWiring.class; - - @Override - public int getState() { - return Bundle.ACTIVE; - } - - @Override - public void start(int options) { - } - - @Override - public void start() { - } - - @Override - public void stop(int options) { - } - - @Override - public void stop() { - } - - @Override - public void update(InputStream input) { - } - - @Override - public void update() { - } - - @Override - public void uninstall() { - } - - @Override - public Dictionary getHeaders(String locale) { - return getHeaders(); - } - - @Override - public String getSymbolicName() { - return SymbolicName; - } - - @Override - public Version getVersion() { - return BundleVersion; - } - - @Override - public String getLocation() { - return getSymbolicName(); - } - - @Override - public long getBundleId() { - return 0L; - } - - @Override - public Dictionary getHeaders() { - return new Hashtable<>(); - } - - @Override - public ServiceReference[] getRegisteredServices() { - return new ServiceReference[0]; - } - - @Override - public ServiceReference[] getServicesInUse() { - return getRegisteredServices(); - } - - @Override - public boolean hasPermission(Object permission) { - return true; - } - - @Override - public URL getResource(String name) { - throw new UnsupportedOperationException(); - } - - @Override - public Class loadClass(String name) { - throw new UnsupportedOperationException(); - } - - @Override - public Enumeration getResources(String name) { - throw new UnsupportedOperationException(); - } - - @Override - public Enumeration getEntryPaths(String path) { - throw new UnsupportedOperationException(); - } - - @Override - public URL getEntry(String path) { - throw new UnsupportedOperationException(); - } - - @Override - public Enumeration findEntries(String path, String filePattern, boolean recurse) { - return Collections.emptyEnumeration(); - } - - - @Override - public long getLastModified() { - return 1L; - } - - @Override - public BundleContext getBundleContext() { - throw new UnsupportedOperationException(); - } - - @Override - public Map> getSignerCertificates(int signersType) { - return Collections.emptyMap(); - } - - @SuppressWarnings("unchecked") - @Override - public T adapt(Class type) { - if (type.equals(bundleWiringClass)) { - return (T) this; - } else { - throw new UnsupportedOperationException(); - } - } - - @Override - public File getDataFile(String filename) { - return null; - } - - @Override - public int compareTo(Bundle o) { - return Long.compare(getBundleId(), o.getBundleId()); - } - - - //TODO: replace with mockito - @Override - public List findEntries(String p1, String p2, int p3) { - throw new UnsupportedOperationException(); - } - - @Override - public List getRequiredResourceWires(String p1) { - throw new UnsupportedOperationException(); - } - - @Override - public List getResourceCapabilities(String p1) { - throw new UnsupportedOperationException(); - } - - @Override - public boolean isCurrent() { - throw new UnsupportedOperationException(); - } - - @Override - public List getRequiredWires(String p1) { - throw new UnsupportedOperationException(); - } - - @Override - public List getCapabilities(String p1) { - throw new UnsupportedOperationException(); - } - - @Override - public List getProvidedResourceWires(String p1) { - throw new UnsupportedOperationException(); - } - - @Override - public List getProvidedWires(String p1) { - throw new UnsupportedOperationException(); - } - - @Override - public BundleRevision getRevision() { - throw new UnsupportedOperationException(); - } - - @Override - public List getResourceRequirements(String p1) { - throw new UnsupportedOperationException(); - } - - @Override - public boolean isInUse() { - throw new UnsupportedOperationException(); - } - - @Override - public Collection listResources(String p1, String p2, int p3) { - return Collections.emptyList(); - } - - @Override - public ClassLoader getClassLoader() { - return MockBundle.class.getClassLoader(); - } - - @Override - public List getRequirements(String p1) { - throw new UnsupportedOperationException(); - } - - @Override - public BundleRevision getResource() { - throw new UnsupportedOperationException(); - } - - @Override - public Bundle getBundle() { - throw new UnsupportedOperationException(); - } -} diff --git a/container-core/src/main/java/com/yahoo/container/bundle/package-info.java b/container-core/src/main/java/com/yahoo/container/bundle/package-info.java deleted file mode 100644 index c9707371626..00000000000 --- a/container-core/src/main/java/com/yahoo/container/bundle/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage -package com.yahoo.container.bundle; - -import com.yahoo.osgi.annotation.ExportPackage; -- cgit v1.2.3