Skip to content

Commit

Permalink
Embed the required StateFactory implementations
Browse files Browse the repository at this point in the history
Currently P2 has the BundleDescription in its API where the only
implementation is in the discouraged osgi.compatibility fragment, but
actually P2 does not really need a full implementation, it is just using
that to parse manifest headers and generate metadata from it.

This embeds a stripped down version of the actual implementation in the
p2.publisher.eclipse that allows to create implementation objects
without rely on the compatibility fragment anymore.
  • Loading branch information
laeubi committed Feb 9, 2024
1 parent fd70696 commit cc618f7
Show file tree
Hide file tree
Showing 20 changed files with 4,647 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,15 @@ Import-Package: org.eclipse.equinox.app;version="[1.0.0,2.0.0)",
org.eclipse.equinox.simpleconfigurator.manipulator;version="[2.0.0,3.0.0)",
org.eclipse.equinox.spi.p2.publisher,
org.eclipse.osgi.framework.util,
org.eclipse.osgi.internal.framework,
org.eclipse.osgi.internal.messages,
org.eclipse.osgi.service.datalocation;version="1.3.0",
org.eclipse.osgi.service.environment;version="1.1.0",
org.eclipse.osgi.service.pluginconversion;version="1.0.0",
org.eclipse.osgi.service.resolver;version="1.5.0",
org.eclipse.osgi.util;version="1.1.0",
org.osgi.framework;version="1.3.0",
org.osgi.framework.namespace;version="[1.2.0,2.0.0]",
org.osgi.framework.wiring;version="1.2.0",
org.osgi.resource;version="1.0.0",
org.osgi.service.application;version="1.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.eclipse.equinox.p2.metadata.expression.IMatchExpression;
import org.eclipse.equinox.p2.publisher.*;
import org.eclipse.equinox.p2.publisher.actions.*;
import org.eclipse.equinox.p2.publisher.eclipse.statefactory.StateObjectFactoryImpl;
import org.eclipse.equinox.p2.query.IQueryResult;
import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
Expand Down Expand Up @@ -749,7 +750,8 @@ public static Map<Locale, Map<String, String>> getHostLocalizations(File bundleL
public static BundleDescription createBundleDescription(Dictionary<String, String> enhancedManifest,
File bundleLocation) {
try {
BundleDescription descriptor = StateObjectFactory.defaultFactory.createBundleDescription(null,
;
BundleDescription descriptor = new StateObjectFactoryImpl().createBundleDescription(null,
enhancedManifest, bundleLocation == null ? null : bundleLocation.getAbsolutePath(), 1); // TODO Do
// we need
// to have a
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
/*******************************************************************************
* Copyright (c) 2004, 2016 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
* Rob Harrop - SpringSource Inc. (bug 247522)
*******************************************************************************/
package org.eclipse.equinox.p2.publisher.eclipse.statefactory;

import java.util.*;
import java.util.Map.Entry;
import org.eclipse.osgi.service.resolver.BaseDescription;
import org.osgi.framework.Version;
import org.osgi.framework.wiring.BundleCapability;
import org.osgi.framework.wiring.BundleRevision;

public abstract class BaseDescriptionImpl implements BaseDescription {

protected final Object monitor = new Object();

private volatile String name;

private volatile Version version;

private volatile Object userObject;

public String getName() {
return name;
}

public Version getVersion() {
synchronized (this.monitor) {
if (version == null)
return Version.emptyVersion;
return version;
}
}

protected void setName(String name) {
this.name = name;
}

protected void setVersion(Version version) {
this.version = version;
}

static <V> String toString(Map<String, V> map, boolean directives) {
if (map.size() == 0)
return ""; //$NON-NLS-1$
String assignment = directives ? ":=" : "="; //$NON-NLS-1$//$NON-NLS-2$
Set<Entry<String, V>> set = map.entrySet();
StringBuilder sb = new StringBuilder();
for (Entry<String, V> entry : set) {
sb.append("; "); //$NON-NLS-1$
String key = entry.getKey();
Object value = entry.getValue();
if (value instanceof List) {
@SuppressWarnings("unchecked")
List<Object> list = (List<Object>) value;
if (list.size() == 0)
continue;
Object component = list.get(0);
String className = component.getClass().getName();
String type = className.substring(className.lastIndexOf('.') + 1);
sb.append(key).append(':').append("List<").append(type).append(">").append(assignment).append('"'); //$NON-NLS-1$ //$NON-NLS-2$
for (Object object : list)
sb.append(object).append(',');
sb.setLength(sb.length() - 1);
sb.append('"');
} else {
String type = ""; //$NON-NLS-1$
if (!(value instanceof String)) {
String className = value.getClass().getName();
type = ":" + className.substring(className.lastIndexOf('.') + 1); //$NON-NLS-1$
}
sb.append(key).append(type).append(assignment).append('"').append(value).append('"');
}
}
return sb.toString();
}

String getInternalNameSpace() {
return null;
}

public BaseDescription getFragmentDeclaration() {
return null;
}

public BundleCapability getCapability() {
return getCapability(null);
}

BundleCapability getCapability(String namespace) {
BaseDescriptionImpl fragmentDeclaration = (BaseDescriptionImpl) getFragmentDeclaration();
if (fragmentDeclaration != null)
return fragmentDeclaration.getCapability(namespace);
if (namespace == null)
namespace = getInternalNameSpace();
if (namespace == null)
return null;
return new BaseCapability(namespace);
}

public Object getUserObject() {
return userObject;
}

public void setUserObject(Object userObject) {
this.userObject = userObject;
}

public class BaseCapability implements BundleCapability {
private final String namespace;

public BaseCapability(String namespace) {
super();
this.namespace = namespace;
}

public BundleRevision getRevision() {
return getSupplier();
}

public String getNamespace() {
return namespace;
}

public Map<String, String> getDirectives() {
return getDeclaredDirectives();
}

public Map<String, Object> getAttributes() {
Map<String, Object> attrs = getDeclaredAttributes();
String internalName = BaseDescriptionImpl.this.getInternalNameSpace();
if (namespace.equals(internalName))
return attrs;
// we are doing an alias, must remove internal Name and add alias
attrs = new HashMap<>(attrs);
Object nameValue = attrs.remove(internalName);
if (nameValue != null)
attrs.put(namespace, nameValue);
return Collections.unmodifiableMap(attrs);
}

@Override
public int hashCode() {
return System.identityHashCode(BaseDescriptionImpl.this);
}

public BaseDescriptionImpl getBaseDescription() {
return BaseDescriptionImpl.this;
}

@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (!(obj instanceof BaseCapability))
return false;
return (((BaseCapability) obj).getBaseDescription() == BaseDescriptionImpl.this) && namespace.equals(((BaseCapability) obj).getNamespace());
}

@Override
public String toString() {
return getNamespace() + BaseDescriptionImpl.toString(getAttributes(), false) + BaseDescriptionImpl.toString(getDirectives(), true);
}

public BundleRevision getResource() {
return getRevision();
}
}
}
Loading

0 comments on commit cc618f7

Please sign in to comment.