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
laeubi committed Jan 14, 2025
1 parent 2d0b9ef commit ba1ca70
Show file tree
Hide file tree
Showing 16 changed files with 3,739 additions and 6 deletions.
75 changes: 75 additions & 0 deletions bundles/org.eclipse.equinox.p2.publisher.eclipse/.settings/.api_filters
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.equinox.p2.publisher.eclipse" version="2">
<resource path="src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/BaseDescriptionImpl.java" type="org.eclipse.equinox.internal.p2.publisher.eclipse.bundledescription.BaseDescriptionImpl">
<filter id="574619656">
<message_arguments>
<message_argument value="BaseDescription"/>
<message_argument value="BaseDescriptionImpl"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/BundleDescriptionImpl.java" type="org.eclipse.equinox.internal.p2.publisher.eclipse.bundledescription.BundleDescriptionImpl">
<filter id="574619656">
<message_arguments>
<message_argument value="BundleDescription"/>
<message_argument value="BundleDescriptionImpl"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/BundleSpecificationImpl.java" type="org.eclipse.equinox.internal.p2.publisher.eclipse.bundledescription.BundleSpecificationImpl">
<filter id="574619656">
<message_arguments>
<message_argument value="BundleSpecification"/>
<message_argument value="BundleSpecificationImpl"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/ExportPackageDescriptionImpl.java" type="org.eclipse.equinox.internal.p2.publisher.eclipse.bundledescription.ExportPackageDescriptionImpl">
<filter id="574619656">
<message_arguments>
<message_argument value="ExportPackageDescription"/>
<message_argument value="ExportPackageDescriptionImpl"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/GenericDescriptionImpl.java" type="org.eclipse.equinox.internal.p2.publisher.eclipse.bundledescription.GenericDescriptionImpl">
<filter id="574619656">
<message_arguments>
<message_argument value="GenericDescription"/>
<message_argument value="GenericDescriptionImpl"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/GenericSpecificationImpl.java" type="org.eclipse.equinox.internal.p2.publisher.eclipse.bundledescription.GenericSpecificationImpl">
<filter id="574619656">
<message_arguments>
<message_argument value="GenericSpecification"/>
<message_argument value="GenericSpecificationImpl"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/HostSpecificationImpl.java" type="org.eclipse.equinox.internal.p2.publisher.eclipse.bundledescription.HostSpecificationImpl">
<filter id="574619656">
<message_arguments>
<message_argument value="HostSpecification"/>
<message_argument value="HostSpecificationImpl"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/ImportPackageSpecificationImpl.java" type="org.eclipse.equinox.internal.p2.publisher.eclipse.bundledescription.ImportPackageSpecificationImpl">
<filter id="574619656">
<message_arguments>
<message_argument value="ImportPackageSpecification"/>
<message_argument value="ImportPackageSpecificationImpl"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/VersionConstraintImpl.java" type="org.eclipse.equinox.internal.p2.publisher.eclipse.bundledescription.VersionConstraintImpl">
<filter id="574619656">
<message_arguments>
<message_argument value="VersionConstraint"/>
<message_argument value="VersionConstraintImpl"/>
</message_arguments>
</filter>
</resource>
</component>
1 change: 1 addition & 0 deletions bundles/org.eclipse.equinox.p2.publisher.eclipse/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Import-Package: org.eclipse.equinox.app;version="[1.0.0,2.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
190 changes: 190 additions & 0 deletions .../eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/BaseDescriptionImpl.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
/*******************************************************************************
* 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.internal.p2.publisher.eclipse.bundledescription;

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;

abstract class BaseDescriptionImpl implements BaseDescription {

protected final Object monitor = new Object();

private volatile String name;

private volatile Version version;

private volatile Object userObject;

@Override
public String getName() {
return name;
}

@Override
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;
}

@Override
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);
}

@Override
public Object getUserObject() {
return userObject;
}

@Override
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;
}

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

@Override
public String getNamespace() {
return namespace;
}

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

@Override
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);
}

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

0 comments on commit ba1ca70

Please sign in to comment.