diff options
| author | Thomas Watson | 2019-03-25 15:59:39 +0000 |
|---|---|---|
| committer | Thomas Watson | 2019-03-26 13:19:04 +0000 |
| commit | b8ef56795cacdff976ba95a295f678a60f2dab57 (patch) | |
| tree | d8d447752aef14860f33f94e50103b225ba7c464 /bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox | |
| parent | eef56d7fab3c18eefe1c226d8eca0e979143e5ed (diff) | |
| download | rt.equinox.bundles-b8ef56795cacdff976ba95a295f678a60f2dab57.tar.gz rt.equinox.bundles-b8ef56795cacdff976ba95a295f678a60f2dab57.tar.xz rt.equinox.bundles-b8ef56795cacdff976ba95a295f678a60f2dab57.zip | |
Bug 545788 - [metatype] provide caching of metatype informationI20190327-1800I20190326-2305I20190326-1800
Change-Id: If76fa973a32f1dedded57211370c64bd5d81c7cf
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox')
13 files changed, 904 insertions, 332 deletions
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Activator.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Activator.java index 17ec1587a..446523df5 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Activator.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Activator.java @@ -13,13 +13,13 @@ *******************************************************************************/ package org.eclipse.equinox.metatype.impl; +import java.io.IOException; import java.util.Dictionary; import java.util.Hashtable; import javax.xml.parsers.SAXParserFactory; import org.eclipse.equinox.metatype.EquinoxMetaTypeService; import org.osgi.framework.*; import org.osgi.service.cm.ManagedService; -import org.osgi.service.log.LogService; import org.osgi.service.metatype.MetaTypeProvider; import org.osgi.service.metatype.MetaTypeService; import org.osgi.util.tracker.ServiceTracker; @@ -64,7 +64,7 @@ public class Activator implements BundleActivator { } // Do this first to make logging available as early as possible. lsTracker.open(); - lsTracker.log(LogService.LOG_DEBUG, "====== Meta Type Service starting ! ====="); //$NON-NLS-1$ + lsTracker.log(LogTracker.LOG_DEBUG, "====== Meta Type Service starting ! ====="); //$NON-NLS-1$ // Do this next to make MetaTypeProviders available as early as possible. mtpTracker.open(); // Do this last because it may result in the MetaTypeService being registered. @@ -84,7 +84,7 @@ public class Activator implements BundleActivator { mtpTracker = metaTypeProviderTracker; lsTracker = logServiceTracker; } - lsTracker.log(LogService.LOG_DEBUG, "====== Meta Type Service stopping ! ====="); //$NON-NLS-1$ + lsTracker.log(LogTracker.LOG_DEBUG, "====== Meta Type Service stopping ! ====="); //$NON-NLS-1$ spfTracker.close(); mtpTracker.close(); // Do this last to leave logging available as long as possible. @@ -228,6 +228,11 @@ public class Activator implements BundleActivator { service = metaTypeService = new MetaTypeServiceImpl(saxParserFactory, logService, mtpTracker); } bundleCtx.addBundleListener(service); + try { + service.load(bundleCtx, logService, mtpTracker); + } catch (IOException e) { + logService.log(LogTracker.LOG_ERROR, "Error loading cached metatype info.", e); //$NON-NLS-1$ + } ServiceRegistration<?> registration = bundleCtx.registerService(new String[] {MetaTypeService.class.getName(), EquinoxMetaTypeService.class.getName()}, service, properties); synchronized (this) { metaTypeServiceRegistration = registration; @@ -252,6 +257,11 @@ public class Activator implements BundleActivator { private void unregisterMetaTypeService(ServiceRegistration<?> registration, MetaTypeServiceImpl service) { registration.unregister(); bundleCtx.removeBundleListener(service); + try { + service.save(bundleCtx); + } catch (IOException e) { + logService.log(LogTracker.LOG_ERROR, "Error saving metatype cache.", e); //$NON-NLS-1$ + } } } } diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/AttributeDefinitionImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/AttributeDefinitionImpl.java index ad2c00965..7334b3eff 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/AttributeDefinitionImpl.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/AttributeDefinitionImpl.java @@ -13,32 +13,37 @@ *******************************************************************************/ package org.eclipse.equinox.metatype.impl; +import java.io.IOException; +import java.math.BigDecimal; +import java.math.BigInteger; import java.util.*; import org.eclipse.equinox.metatype.EquinoxAttributeDefinition; +import org.eclipse.equinox.metatype.impl.Persistence.Reader; +import org.eclipse.equinox.metatype.impl.Persistence.Writer; import org.eclipse.osgi.util.NLS; -import org.osgi.service.log.LogService; +import org.osgi.service.metatype.AttributeDefinition; /** * Implementation of AttributeDefintion */ public class AttributeDefinitionImpl extends LocalizationElement implements EquinoxAttributeDefinition, Cloneable { - String _name; - String _id; - String _description; - int _cardinality = 0; - int _dataType; - Object _minValue = null; - Object _maxValue = null; - boolean _isRequired = true; - - String[] _defaults = null; - Vector<String> _values = new Vector<String>(7); - Vector<String> _labels = new Vector<String>(7); + private final String _name; + private final String _id; + private final String _description; + private final int _cardinality; + private final int _dataType; + private final Object _minValue; + private final Object _maxValue; + private final boolean _isRequired; private final LogTracker logger; private final ExtendableHelper helper; + private volatile String[] _defaults = null; + private volatile ArrayList<String> _values = new ArrayList<String>(7); + private volatile ArrayList<String> _labels = new ArrayList<String>(7); + /** * Constructor of class AttributeDefinitionImpl. */ @@ -63,21 +68,21 @@ public class AttributeDefinitionImpl extends LocalizationElement implements Equi /* * */ - public synchronized Object clone() { + public Object clone() { AttributeDefinitionImpl ad = new AttributeDefinitionImpl(_id, _name, _description, _dataType, _cardinality, _minValue, _maxValue, _isRequired, getLocalization(), logger, helper); - if (_defaults != null) { - ad.setDefaultValue(_defaults.clone()); - } - if ((_labels != null) && (_values != null)) { - @SuppressWarnings("unchecked") - Vector<String> labels = (Vector<String>) _labels.clone(); - @SuppressWarnings("unchecked") - Vector<String> values = (Vector<String>) _values.clone(); - ad.setOption(labels, values, false); + String[] curDefaults = _defaults; + if (curDefaults != null) { + ad.setDefaultValue(curDefaults.clone()); } + @SuppressWarnings("unchecked") + ArrayList<String> labels = (ArrayList<String>) _labels.clone(); + @SuppressWarnings("unchecked") + ArrayList<String> values = (ArrayList<String>) _values.clone(); + ad.setOption(labels, values, false); + return ad; } @@ -90,13 +95,6 @@ public class AttributeDefinitionImpl extends LocalizationElement implements Equi return getLocalized(_name); } - /** - * Method to set the name of AttributeDefinition. - */ - void setName(String name) { - this._name = name; - } - /* * (non-Javadoc) * @@ -106,13 +104,6 @@ public class AttributeDefinitionImpl extends LocalizationElement implements Equi return _id; } - /** - * Method to set the ID of AttributeDefinition. - */ - void setID(String id) { - this._id = id; - } - /* * (non-Javadoc) * @@ -122,13 +113,6 @@ public class AttributeDefinitionImpl extends LocalizationElement implements Equi return getLocalized(_description); } - /** - * Method to set the description of AttributeDefinition. - */ - void setDescription(String description) { - this._description = description; - } - /* * (non-Javadoc) * @@ -138,13 +122,6 @@ public class AttributeDefinitionImpl extends LocalizationElement implements Equi return _cardinality; } - /** - * Method to set the cardinality of AttributeDefinition. - */ - void setCardinality(int cardinality) { - this._cardinality = cardinality; - } - /* * (non-Javadoc) * @@ -155,26 +132,12 @@ public class AttributeDefinitionImpl extends LocalizationElement implements Equi } /** - * Method to set the data type of AttributeDefinition. - */ - void setType(int type) { - this._dataType = type; - } - - /** * Method to get the required flag of AttributeDefinition. */ boolean isRequired() { return _isRequired; } - /** - * Method to set the required flag of AttributeDefinition. - */ - void setRequired(boolean isRequired) { - this._isRequired = isRequired; - } - /* * (non-Javadoc) * @@ -182,15 +145,14 @@ public class AttributeDefinitionImpl extends LocalizationElement implements Equi */ public String[] getOptionLabels() { - if ((_labels == null) || (_labels.size() == 0)) { + List<String> curLabels = _labels; + if (curLabels.isEmpty()) { return null; } - String[] returnedLabels = new String[_labels.size()]; - Enumeration<String> labelKeys = _labels.elements(); + String[] returnedLabels = new String[curLabels.size()]; int i = 0; - while (labelKeys.hasMoreElements()) { - String labelKey = labelKeys.nextElement(); + for (String labelKey : curLabels) { returnedLabels[i] = getLocalized(labelKey); i++; } @@ -203,41 +165,47 @@ public class AttributeDefinitionImpl extends LocalizationElement implements Equi * @see org.osgi.service.metatype.AttributeDefinition#getOptionValues() */ public String[] getOptionValues() { + List<String> curValues = _values; - if ((_values == null) || (_values.size() == 0)) { + if (curValues.isEmpty()) { return null; } - return _values.toArray(new String[_values.size()]); + return curValues.toArray(MetaTypeInformationImpl.emptyStringArray); } /** * Method to set the Option values of AttributeDefinition. */ - void setOption(Vector<String> labels, Vector<String> values, boolean needValidation) { + void setOption(ArrayList<String> labels, ArrayList<String> values, boolean needValidation) { if ((labels == null) || (values == null)) { - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.NULL_OPTIONS, getID())); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.NULL_OPTIONS, getID())); return; } if (labels.size() != values.size()) { - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.INCONSISTENT_OPTIONS, getID())); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.INCONSISTENT_OPTIONS, getID())); return; } - _labels = labels; - _values = values; if (needValidation) { - for (int index = 0; index < _values.size(); index++) { - ValueTokenizer vt = new ValueTokenizer(_values.get(index), logger); - _values.set(index, vt.getValuesAsString()); + for (int index = 0; index < values.size(); index++) { + ValueTokenizer vt = new ValueTokenizer(values.get(index), logger); + values.set(index, vt.getValuesAsString()); String reason = vt.validate(this); if ((reason != null) && reason.length() > 0) { - logger.log(LogService.LOG_WARNING, NLS.bind(MetaTypeMsg.INVALID_OPTIONS, new Object[] {_values.get(index), getID(), reason})); - _labels.remove(index); - _values.remove(index); + logger.log(LogTracker.LOG_WARNING, NLS.bind(MetaTypeMsg.INVALID_OPTIONS, new Object[] {values.get(index), getID(), reason})); + labels.remove(index); + values.remove(index); index--; // Because this one has been removed. } } } + _labels = labels; + _values = values; + } + + boolean containsInvalidValue(String value) { + List<String> curValues = _values; + return !curValues.isEmpty() && !curValues.contains(value); } /* @@ -257,7 +225,7 @@ public class AttributeDefinitionImpl extends LocalizationElement implements Equi ValueTokenizer vt = new ValueTokenizer(defaults_str, logger); String reason = vt.validate(this); if ((reason != null) && reason.length() > 0) { - logger.log(LogService.LOG_WARNING, NLS.bind(MetaTypeMsg.INVALID_DEFAULTS, new Object[] {vt.getValuesAsString(), getID(), reason})); + logger.log(LogTracker.LOG_WARNING, NLS.bind(MetaTypeMsg.INVALID_DEFAULTS, new Object[] {vt.getValuesAsString(), getID(), reason})); return; } String[] defaults = vt.getValuesAsArray(); @@ -277,20 +245,6 @@ public class AttributeDefinitionImpl extends LocalizationElement implements Equi _defaults = defaults; } - /** - * Method to set the validation value - min of AttributeDefinition. - */ - void setMinValue(Object minValue) { - this._minValue = minValue; - } - - /** - * Method to set the validation value - max of AttributeDefinition. - */ - void setMaxValue(Object maxValue) { - this._maxValue = maxValue; - } - /* * (non-Javadoc) * In order to be valid, a value must pass all of the following tests. @@ -324,4 +278,198 @@ public class AttributeDefinitionImpl extends LocalizationElement implements Equi public String getMin() { return _minValue == null ? null : String.valueOf(_minValue); } + + Object getMaxValue() { + return _maxValue; + } + + Object getMinValue() { + return _minValue; + } + + void getStrings(Set<String> strings) { + String[] curDefaults = _defaults; + if (curDefaults != null) { + for (String string : curDefaults) { + strings.add(string); + } + } + strings.add(_description); + strings.add(_id); + strings.add(_name); + strings.add(getLocalization()); + for (String string : _values) { + strings.add(string); + } + + for (String string : _labels) { + strings.add(string); + } + helper.getStrings(strings); + if (getType() == AttributeDefinition.STRING || getType() == AttributeDefinition.PASSWORD) { + if (_maxValue != null) { + strings.add(getMax()); + } + if (_minValue != null) { + strings.add(getMin()); + } + } + } + + public static AttributeDefinitionImpl load(Reader reader, LogTracker logger) throws IOException { + String id = reader.readString(); + String description = reader.readString(); + String name = reader.readString(); + int type = reader.readInt(); + int cardinality = reader.readInt(); + boolean isRequired = reader.readBoolean(); + String localization = reader.readString(); + + String[] defaults = null; + if (reader.readBoolean()) { + int numDefaults = reader.readInt(); + defaults = new String[numDefaults]; + for (int i = 0; i < numDefaults; i++) { + defaults[i] = reader.readString(); + } + } + int numLabels = reader.readInt(); + ArrayList<String> labels = new ArrayList<>(numLabels); + for (int i = 0; i < numLabels; i++) { + labels.add(reader.readString()); + } + int numValues = reader.readInt(); + ArrayList<String> values = new ArrayList<>(); + for (int i = 0; i < numValues; i++) { + values.add(reader.readString()); + } + ExtendableHelper helper = ExtendableHelper.load(reader); + Object min = readMinMax(type, reader); + Object max = readMinMax(type, reader); + + AttributeDefinitionImpl result = new AttributeDefinitionImpl(id, name, description, type, cardinality, min, max, isRequired, localization, logger, helper); + result.setDefaultValue(defaults); + result.setOption(labels, values, false); + return result; + } + + public void write(Writer writer) throws IOException { + writer.writeString(_id); + writer.writeString(_description); + writer.writeString(_name); + writer.writeInt(_dataType); + writer.writeInt(_cardinality); + writer.writeBoolean(_isRequired); + writer.writeString(getLocalization()); + String[] curDefaults = _defaults; + if (curDefaults == null) { + writer.writeBoolean(false); + } else { + writer.writeBoolean(true); + writer.writeInt(curDefaults.length); + for (String defaultValue : curDefaults) { + writer.writeString(defaultValue); + } + } + List<String> curLabels = _labels; + writer.writeInt(curLabels.size()); + for (String label : curLabels) { + writer.writeString(label); + } + List<String> curValues = _values; + writer.writeInt(curValues.size()); + for (String value : curValues) { + writer.writeString(value); + } + helper.write(writer); + writeMinMax(_minValue, writer); + writeMinMax(_maxValue, writer); + } + + @SuppressWarnings("deprecation") + private static Object readMinMax(int dataType, Reader reader) throws IOException { + boolean isNull = reader.readBoolean(); + if (isNull) { + return null; + } + switch (dataType) { + // PASSWORD should be treated like STRING. + case AttributeDefinition.PASSWORD : + case AttributeDefinition.STRING : + return reader.readString(); + case AttributeDefinition.LONG : + return reader.readLong(); + case AttributeDefinition.INTEGER : + return reader.readInt(); + case AttributeDefinition.SHORT : + return reader.readShort(); + case AttributeDefinition.CHARACTER : + return reader.readCharacter(); + case AttributeDefinition.BYTE : + return reader.readByte(); + case AttributeDefinition.DOUBLE : + return reader.readDouble(); + case AttributeDefinition.FLOAT : + return reader.readFloat(); + case AttributeDefinition.BIGINTEGER : + return new BigInteger(reader.readString()); + case AttributeDefinition.BIGDECIMAL : + return new BigDecimal(reader.readString()); + case AttributeDefinition.BOOLEAN : + return reader.readBoolean(); + default : + return reader.readString(); + } + } + + @SuppressWarnings("deprecation") + private void writeMinMax(Object v, Writer writer) throws IOException { + if (v == null) { + writer.writeBoolean(true); + return; + } + writer.writeBoolean(false); + switch (_dataType) { + // PASSWORD should be treated like STRING. + case AttributeDefinition.PASSWORD : + case AttributeDefinition.STRING : + writer.writeString((String) v); + return; + case AttributeDefinition.LONG : + writer.writeLong((Long) v); + return; + case AttributeDefinition.INTEGER : + writer.writeInt((Integer) v); + return; + case AttributeDefinition.SHORT : + writer.writeShort((Short) v); + return; + case AttributeDefinition.CHARACTER : + writer.writeCharacter((Character) v); + return; + case AttributeDefinition.BYTE : + writer.writeByte((Byte) v); + return; + case AttributeDefinition.DOUBLE : + writer.writeDouble((Double) v); + return; + case AttributeDefinition.FLOAT : + writer.writeFloat((Float) v); + return; + case AttributeDefinition.BIGINTEGER : + writer.writeString(v.toString()); + return; + case AttributeDefinition.BIGDECIMAL : + writer.writeString(v.toString()); + return; + case AttributeDefinition.BOOLEAN : + writer.writeBoolean((Boolean) v); + return; + default : + // Unknown data type + writer.writeString(String.valueOf(v)); + return; + } + } + } diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/DataParser.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/DataParser.java index 340740d54..f0faf0e3c 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/DataParser.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/DataParser.java @@ -21,7 +21,6 @@ import java.util.*; import javax.xml.parsers.SAXParser; import org.eclipse.osgi.util.NLS; import org.osgi.framework.Bundle; -import org.osgi.service.log.LogService; import org.osgi.service.metatype.AttributeDefinition; import org.xml.sax.*; import org.xml.sax.helpers.DefaultHandler; @@ -79,15 +78,15 @@ public class DataParser { protected XMLReader _dp_xmlReader; // DesignateHanders in DataParser class - Vector<DesignateHandler> _dp_designateHandlers = new Vector<DesignateHandler>(7); + List<DesignateHandler> _dp_designateHandlers = new ArrayList<>(7); // ObjectClassDefinitions in DataParser class w/ corresponding reference keys - Hashtable<String, ObjectClassDefinitionImpl> _dp_OCDs = new Hashtable<String, ObjectClassDefinitionImpl>(7); + Map<String, ObjectClassDefinitionImpl> _dp_OCDs = new HashMap<>(7); // Localization in DataParser class String _dp_localization; // Default visibility to avoid a plethora of synthetic accessor method warnings. final LogTracker logger; - final Collection<Designate> designates = new ArrayList<Designate>(7); + final Collection<Designate> designates = new ArrayList<>(7); /* * Constructor of class DataParser. @@ -109,7 +108,7 @@ public class DataParser { _dp_xmlReader.setErrorHandler(new MyErrorHandler(System.err)); InputStream is = _dp_url.openStream(); InputSource isource = new InputSource(is); - logger.log(LogService.LOG_DEBUG, "Starting to parse " + _dp_url); //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Starting to parse " + _dp_url); //$NON-NLS-1$ _dp_xmlReader.parse(isource); return designates; } @@ -117,6 +116,7 @@ public class DataParser { /* * Convert String for expected data type. */ + @SuppressWarnings("deprecation") static Object convert(String value, int type) { if (value == null) { @@ -225,13 +225,13 @@ public class DataParser { public void startElement(String uri, String localName, String qName, Attributes attributes) { - logger.log(LogService.LOG_DEBUG, "Here is AbstractHandler:startElement():" //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is AbstractHandler:startElement():" //$NON-NLS-1$ + qName); String name = getName(localName, qName); if (name.equalsIgnoreCase(METADATA)) { new MetaDataHandler(this).init(name, attributes); } else { - logger.log(LogService.LOG_WARNING, NLS.bind(MetaTypeMsg.UNEXPECTED_ELEMENT, new Object[] {name, attributes.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_WARNING, NLS.bind(MetaTypeMsg.UNEXPECTED_ELEMENT, new Object[] {name, attributes.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); } } @@ -251,7 +251,7 @@ public class DataParser { public void init(String name, Attributes attributes) { - logger.log(LogService.LOG_DEBUG, "Here is MetaDataHandler():init()"); //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is MetaDataHandler():init()"); //$NON-NLS-1$ super.init(name, attributes); _dp_localization = attributes.getValue(LOCALIZATION); if (_dp_localization == null) { @@ -263,42 +263,39 @@ public class DataParser { public void startElement(String uri, String localName, String qName, Attributes atts) { - logger.log(LogService.LOG_DEBUG, "Here is MetaDataHandler:startElement():" //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is MetaDataHandler:startElement():" //$NON-NLS-1$ + qName); String name = getName(localName, qName); if (name.equalsIgnoreCase(DESIGNATE)) { DesignateHandler designateHandler = new DesignateHandler(this); designateHandler.init(name, atts); if (designateHandler._isParsedDataValid) { - _dp_designateHandlers.addElement(designateHandler); + _dp_designateHandlers.add(designateHandler); } } else if (name.equalsIgnoreCase(OCD)) { OcdHandler ocdHandler = new OcdHandler(this); ocdHandler.init(name, atts, _dp_OCDs); } else { - logger.log(LogService.LOG_WARNING, NLS.bind(MetaTypeMsg.UNEXPECTED_ELEMENT, new Object[] {name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_WARNING, NLS.bind(MetaTypeMsg.UNEXPECTED_ELEMENT, new Object[] {name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); } } protected void finished() { - logger.log(LogService.LOG_DEBUG, "Here is MetaDataHandler():finished()"); //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is MetaDataHandler():finished()"); //$NON-NLS-1$ if (_dp_designateHandlers.size() == 0) { // Schema defines at least one DESIGNATE is required. _isParsedDataValid = false; - logger.log(LogService.LOG_WARNING, NLS.bind(MetaTypeMsg.MISSING_ELEMENT, new Object[] {DESIGNATE, METADATA, elementId, _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_WARNING, NLS.bind(MetaTypeMsg.MISSING_ELEMENT, new Object[] {DESIGNATE, METADATA, elementId, _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); return; } - Enumeration<DesignateHandler> designateHandlerKeys = _dp_designateHandlers.elements(); - while (designateHandlerKeys.hasMoreElements()) { - DesignateHandler dh = designateHandlerKeys.nextElement(); + for (DesignateHandler dh : _dp_designateHandlers) { ObjectClassDefinitionImpl ocd = _dp_OCDs.get(dh._ocdref); if (ocd != null) { designates.add(new Designate.Builder(ocd).bundle(dh._bundle_val).factoryPid(dh._factory_val).merge(dh._merge_val).pid(dh._pid_val).optional(dh._optional_val).build()); } else { - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.OCD_REF_NOT_FOUND, new Object[] {dh._pid_val, dh._factory_val, dh._ocdref, _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); - + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.OCD_REF_NOT_FOUND, new Object[] {dh._pid_val, dh._factory_val, dh._ocdref, _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); } } } @@ -309,28 +306,28 @@ public class DataParser { */ private class OcdHandler extends AbstractHandler { - Hashtable<String, ObjectClassDefinitionImpl> _parent_OCDs_hashtable; + Map<String, ObjectClassDefinitionImpl> _parent_OCDs; // This ID "_refID" is only used for reference by Designate element, // not the PID or FPID of this OCD. String _refID; ObjectClassDefinitionImpl _ocd; - Vector<AttributeDefinitionImpl> _ad_vector = new Vector<AttributeDefinitionImpl>(7); + List<AttributeDefinitionImpl> _ads = new ArrayList<AttributeDefinitionImpl>(7); List<Icon> icons = new ArrayList<Icon>(5); public OcdHandler(ContentHandler handler) { super(handler); } - public void init(String name, Attributes atts, Hashtable<String, ObjectClassDefinitionImpl> ocds_hashtable) { + public void init(String name, Attributes atts, Map<String, ObjectClassDefinitionImpl> ocds_hashtable) { - logger.log(LogService.LOG_DEBUG, "Here is OcdHandler():init()"); //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is OcdHandler():init()"); //$NON-NLS-1$ super.init(name, atts); - _parent_OCDs_hashtable = ocds_hashtable; + _parent_OCDs = ocds_hashtable; collectExtensionAttributes(atts); String ocd_name_val = atts.getValue(NAME); if (ocd_name_val == null) { _isParsedDataValid = false; - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {NAME, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {NAME, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); return; } @@ -342,7 +339,7 @@ public class DataParser { _refID = atts.getValue(ID); if (_refID == null) { _isParsedDataValid = false; - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {ID, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {ID, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); return; } @@ -351,7 +348,7 @@ public class DataParser { public void startElement(String uri, String localName, String qName, Attributes atts) { - logger.log(LogService.LOG_DEBUG, "Here is OcdHandler:startElement():" //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is OcdHandler:startElement():" //$NON-NLS-1$ + qName); if (!_isParsedDataValid) return; @@ -359,29 +356,27 @@ public class DataParser { String name = getName(localName, qName); if (name.equalsIgnoreCase(AD)) { AttributeDefinitionHandler attributeDefHandler = new AttributeDefinitionHandler(this); - attributeDefHandler.init(name, atts, _ad_vector); + attributeDefHandler.init(name, atts, _ads); } else if (name.equalsIgnoreCase(ICON)) { IconHandler iconHandler = new IconHandler(this); iconHandler.init(name, atts); if (iconHandler._isParsedDataValid) icons.add(iconHandler._icon); } else { - logger.log(LogService.LOG_WARNING, NLS.bind(MetaTypeMsg.UNEXPECTED_ELEMENT, new Object[] {name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_WARNING, NLS.bind(MetaTypeMsg.UNEXPECTED_ELEMENT, new Object[] {name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); } } protected void finished() { - logger.log(LogService.LOG_DEBUG, "Here is OcdHandler():finished()"); //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is OcdHandler():finished()"); //$NON-NLS-1$ if (!_isParsedDataValid) return; // OCD gets all parsed ADs. - Enumeration<AttributeDefinitionImpl> adKey = _ad_vector.elements(); - while (adKey.hasMoreElements()) { - AttributeDefinitionImpl ad = adKey.nextElement(); - _ocd.addAttributeDefinition(ad, ad._isRequired); + for (AttributeDefinitionImpl ad : _ads) { + _ocd.addAttributeDefinition(ad, ad.isRequired()); } _ocd.setIcons(icons); - _parent_OCDs_hashtable.put(_refID, _ocd); + _parent_OCDs.put(_refID, _ocd); } } @@ -398,12 +393,12 @@ public class DataParser { public void init(String name, Attributes atts) { - logger.log(LogService.LOG_DEBUG, "Here is IconHandler:init()"); //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is IconHandler:init()"); //$NON-NLS-1$ super.init(name, atts); String icon_resource_val = atts.getValue(RESOURCE); if (icon_resource_val == null) { _isParsedDataValid = false; - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {RESOURCE, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {RESOURCE, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); return; } @@ -427,9 +422,9 @@ public class DataParser { AttributeDefinitionImpl _ad; int _dataType; - Vector<AttributeDefinitionImpl> _parent_ADs_vector; - Vector<String> _optionLabel_vector = new Vector<String>(7); - Vector<String> _optionValue_vector = new Vector<String>(7); + List<AttributeDefinitionImpl> _parent_ADs; + ArrayList<String> _optionLabels = new ArrayList<>(7); + ArrayList<String> _optionValues = new ArrayList<>(7); private String ad_defaults_str; @@ -437,11 +432,11 @@ public class DataParser { super(handler); } - public void init(String name, Attributes atts, Vector<AttributeDefinitionImpl> ad_vector) { + public void init(String name, Attributes atts, List<AttributeDefinitionImpl> ads) { - logger.log(LogService.LOG_DEBUG, "Here is AttributeDefinitionHandler():init()"); //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is AttributeDefinitionHandler():init()"); //$NON-NLS-1$ super.init(name, atts); - _parent_ADs_vector = ad_vector; + _parent_ADs = ads; collectExtensionAttributes(atts); String ad_name_val = atts.getValue(NAME); if (ad_name_val == null) { @@ -456,14 +451,14 @@ public class DataParser { String ad_id_val = atts.getValue(ID); if (ad_id_val == null) { _isParsedDataValid = false; - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {ID, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {ID, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); return; } String ad_type_val = atts.getValue(TYPE); if (ad_type_val == null) { _isParsedDataValid = false; - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {TYPE, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {TYPE, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); return; } if (ad_type_val.equalsIgnoreCase(STRING)) { @@ -488,7 +483,7 @@ public class DataParser { _dataType = AttributeDefinition.PASSWORD; } else { _isParsedDataValid = false; - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.INVALID_TYPE, new Object[] {ad_type_val, ad_id_val, _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.INVALID_TYPE, new Object[] {ad_type_val, ad_id_val, _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); return; } @@ -528,7 +523,7 @@ public class DataParser { public void startElement(String uri, String localName, String qName, Attributes atts) { - logger.log(LogService.LOG_DEBUG, "Here is AttributeDefinitionHandler:startElement():" //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is AttributeDefinitionHandler:startElement():" //$NON-NLS-1$ + qName); if (!_isParsedDataValid) return; @@ -539,34 +534,34 @@ public class DataParser { optionHandler.init(name, atts); if (optionHandler._isParsedDataValid) { // Only add valid Option - _optionLabel_vector.addElement(optionHandler._label_val); - _optionValue_vector.addElement(optionHandler._value_val); + _optionLabels.add(optionHandler._label_val); + _optionValues.add(optionHandler._value_val); } } else { - logger.log(LogService.LOG_WARNING, NLS.bind(MetaTypeMsg.UNEXPECTED_ELEMENT, new Object[] {name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_WARNING, NLS.bind(MetaTypeMsg.UNEXPECTED_ELEMENT, new Object[] {name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); } } protected void finished() { - logger.log(LogService.LOG_DEBUG, "Here is AttributeDefinitionHandler():finished()"); //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is AttributeDefinitionHandler():finished()"); //$NON-NLS-1$ if (!_isParsedDataValid) return; - int numOfValues = _optionValue_vector.size(); - _ad.setOption(_optionLabel_vector, _optionValue_vector, true); + int numOfValues = _optionValues.size(); + _ad.setOption(_optionLabels, _optionValues, true); String[] values = _ad.getOptionValues(); if (values == null) values = new String[0]; if (numOfValues != values.length) - logger.log(LogService.LOG_WARNING, NLS.bind(MetaTypeMsg.INVALID_OPTIONS_XML, new Object[] {elementId, _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_WARNING, NLS.bind(MetaTypeMsg.INVALID_OPTIONS_XML, new Object[] {elementId, _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); if (ad_defaults_str != null) { _ad.setDefaultValue(ad_defaults_str, true); if (_ad.getDefaultValue() == null) - logger.log(LogService.LOG_WARNING, NLS.bind(MetaTypeMsg.INVALID_DEFAULTS_XML, new Object[] {ad_defaults_str, elementId, _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_WARNING, NLS.bind(MetaTypeMsg.INVALID_DEFAULTS_XML, new Object[] {ad_defaults_str, elementId, _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); } - _parent_ADs_vector.addElement(_ad); + _parent_ADs.add(_ad); } } @@ -584,68 +579,24 @@ public class DataParser { public void init(String name, Attributes atts) { - logger.log(LogService.LOG_DEBUG, "Here is OptionHandler:init()"); //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is OptionHandler:init()"); //$NON-NLS-1$ super.init(name, atts); _label_val = atts.getValue(LABEL); if (_label_val == null) { _isParsedDataValid = false; - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {LABEL, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {LABEL, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); return; } _value_val = atts.getValue(VALUE); if (_value_val == null) { _isParsedDataValid = false; - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {VALUE, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {VALUE, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); return; } } } - // /** - // * Handler for the Simple Value element. - // */ - // private class SimpleValueHandler extends AbstractHandler { - // - // StringBuffer _buffer = new StringBuffer(); - // Vector _parent_value_vector; - // String _elementName; - // - // public SimpleValueHandler(ContentHandler handler) { - // super(handler); - // } - // - // public void init(String name, Attributes atts, Vector value_vector) - // throws SAXException { - // - // Logging.log(LogService.LOG_DEBUG, - // "Here is SimpleValueHandler():init()"); //$NON-NLS-1$ - // _elementName = name; - // _parent_value_vector = value_vector; - // } - // - // protected void finished() throws SAXException { - // - // Logging.log(LogService.LOG_DEBUG, - // "Here is SimpleValueHandler():finished()"); //$NON-NLS-1$ - // if (_parent_value_vector != null) { - // _parent_value_vector.addElement(_buffer.toString()); - // } - // } - // - // public void characters(char buf[], int offset, int len) - // throws SAXException { - // - // Logging.log(LogService.LOG_DEBUG, - // "Here is SimpleValueHandler(" //$NON-NLS-1$ - // + _elementName - // + "):characters():[" //$NON-NLS-1$ - // + new String(buf, offset, len) - // + "]"); //$NON-NLS-1$ - // _buffer.append(new String(buf, offset, len)); - // } - // } - /** * Handler for the Designate element. */ @@ -665,13 +616,13 @@ public class DataParser { } public void init(String name, Attributes atts) { - logger.log(LogService.LOG_DEBUG, "Here is DesignateHandler():init()"); //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is DesignateHandler():init()"); //$NON-NLS-1$ super.init(name, atts); _pid_val = atts.getValue(PID); _factory_val = atts.getValue(FACTORY); if (_pid_val == null && _factory_val == null) { _isParsedDataValid = false; - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_DESIGNATE_PID_AND_FACTORYPID, new Object[] {elementId, _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_DESIGNATE_PID_AND_FACTORYPID, new Object[] {elementId, _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); return; } @@ -701,7 +652,7 @@ public class DataParser { public void startElement(String uri, String localName, String qName, Attributes atts) { - logger.log(LogService.LOG_DEBUG, "Here is DesignateHandler:startElement():" //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is DesignateHandler:startElement():" //$NON-NLS-1$ + qName); if (!_isParsedDataValid) return; @@ -714,20 +665,20 @@ public class DataParser { _ocdref = objectHandler._ocdref; } } else { - logger.log(LogService.LOG_WARNING, NLS.bind(MetaTypeMsg.UNEXPECTED_ELEMENT, new Object[] {name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_WARNING, NLS.bind(MetaTypeMsg.UNEXPECTED_ELEMENT, new Object[] {name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); } } protected void finished() { - logger.log(LogService.LOG_DEBUG, "Here is DesignateHandler():finished()"); //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is DesignateHandler():finished()"); //$NON-NLS-1$ if (!_isParsedDataValid) return; if (_ocdref == null) { _isParsedDataValid = false; // Schema defines at least one OBJECT is required. - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ELEMENT, new Object[] {OBJECT, DESIGNATE, elementId, _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ELEMENT, new Object[] {OBJECT, DESIGNATE, elementId, _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); return; } @@ -747,19 +698,19 @@ public class DataParser { public void init(String name, Attributes atts) { - logger.log(LogService.LOG_DEBUG, "Here is ObjectHandler():init()"); //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is ObjectHandler():init()"); //$NON-NLS-1$ super.init(name, atts); _ocdref = atts.getValue(OCDREF); if (_ocdref == null) { _isParsedDataValid = false; - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {OCDREF, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {OCDREF, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); return; } } public void startElement(String uri, String localName, String qName, Attributes atts) { - logger.log(LogService.LOG_DEBUG, "Here is ObjectHandler:startElement():" //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is ObjectHandler:startElement():" //$NON-NLS-1$ + qName); if (!_isParsedDataValid) return; @@ -770,7 +721,7 @@ public class DataParser { attributeHandler.init(name, atts); // The ATTRIBUTE element is only used by RFC94, do nothing for it here. } else { - logger.log(LogService.LOG_WARNING, NLS.bind(MetaTypeMsg.UNEXPECTED_ELEMENT, new Object[] {name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_WARNING, NLS.bind(MetaTypeMsg.UNEXPECTED_ELEMENT, new Object[] {name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); } } } @@ -791,19 +742,19 @@ public class DataParser { public void init(String name, Attributes atts) { - logger.log(LogService.LOG_DEBUG, "Here is AttributeHandler():init()"); //$NON-NLS-1$ + logger.log(LogTracker.LOG_DEBUG, "Here is AttributeHandler():init()"); //$NON-NLS-1$ super.init(name, atts); _adref_val = atts.getValue(ADREF); if (_adref_val == null) { _isParsedDataValid = false; - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {ADREF, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {ADREF, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); return; } _content_val = atts.getValue(CONTENT); if (_content_val == null) { _isParsedDataValid = false; - logger.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {CONTENT, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); + logger.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.MISSING_ATTRIBUTE, new Object[] {CONTENT, name, atts.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()})); return; } } diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ExtendableHelper.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ExtendableHelper.java index 5bc9858b8..fc3d85d9a 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ExtendableHelper.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ExtendableHelper.java @@ -13,28 +13,72 @@ *******************************************************************************/ package org.eclipse.equinox.metatype.impl; +import java.io.IOException; import java.util.*; +import java.util.Map.Entry; import org.eclipse.equinox.metatype.Extendable; +import org.eclipse.equinox.metatype.impl.Persistence.Reader; +import org.eclipse.equinox.metatype.impl.Persistence.Writer; public class ExtendableHelper implements Extendable { - private final Map<String, Map<String, String>> attributes; + private final Map<String, Map<String, String>> extensions; public ExtendableHelper() { this(Collections.<String, Map<String, String>> emptyMap()); } - public ExtendableHelper(Map<String, Map<String, String>> attributes) { - if (attributes == null) + public ExtendableHelper(Map<String, Map<String, String>> extensions) { + if (extensions == null) throw new NullPointerException(); - this.attributes = attributes; + this.extensions = extensions; } public Map<String, String> getExtensionAttributes(String schema) { - return Collections.unmodifiableMap(attributes.get(schema)); + return Collections.unmodifiableMap(extensions.get(schema)); } public Set<String> getExtensionUris() { - return Collections.unmodifiableSet(attributes.keySet()); + return Collections.unmodifiableSet(extensions.keySet()); + } + + void getStrings(Set<String> strings) { + for (Entry<String, Map<String, String>> e1 : extensions.entrySet()) { + strings.add(e1.getKey()); + for (Entry<String, String> e2 : e1.getValue().entrySet()) { + strings.add(e2.getKey()); + strings.add(e2.getValue()); + } + } + } + + public static ExtendableHelper load(Reader reader) throws IOException { + Map<String, Map<String, String>> extensions = new HashMap<>(); + int numExtensions = reader.readInt(); + for (int i = 0; i < numExtensions; i++) { + String extKey = reader.readString(); + int numAttrs = reader.readInt(); + Map<String, String> extensionAttrs = new HashMap<>(); + for (int j = 0; j < numAttrs; j++) { + String attrKey = reader.readString(); + String attrValue = reader.readString(); + extensionAttrs.put(attrKey, attrValue); + } + extensions.put(extKey, extensionAttrs); + } + return new ExtendableHelper(extensions); + } + + public void write(Writer writer) throws IOException { + writer.writeInt(extensions.size()); + for (Entry<String, Map<String, String>> extensionEntry : extensions.entrySet()) { + writer.writeString(extensionEntry.getKey()); + Map<String, String> extensionAttrs = extensionEntry.getValue(); + writer.writeInt(extensionAttrs.size()); + for (Entry<String, String> attrs : extensionAttrs.entrySet()) { + writer.writeString(attrs.getKey()); + writer.writeString(attrs.getValue()); + } + } } } diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Icon.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Icon.java index a55d9c8d9..db7d514cd 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Icon.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Icon.java @@ -13,6 +13,10 @@ *******************************************************************************/ package org.eclipse.equinox.metatype.impl; +import java.io.IOException; +import java.util.Set; +import org.eclipse.equinox.metatype.impl.Persistence.Reader; +import org.eclipse.equinox.metatype.impl.Persistence.Writer; import org.osgi.framework.Bundle; /** @@ -21,13 +25,13 @@ import org.osgi.framework.Bundle; class Icon implements Cloneable { private final String _fileName; - private final Integer _size; + private final int _size; private final Bundle _bundle; /** * Constructor of class Icon. */ - public Icon(String fileName, Integer size, Bundle bundle) { + public Icon(String fileName, int size, Bundle bundle) { this._fileName = fileName; this._size = size; @@ -60,4 +64,19 @@ class Icon implements Cloneable { Bundle getIconBundle() { return _bundle; } + + void getStrings(Set<String> strings) { + strings.add(_fileName); + } + + public static Icon load(Reader reader, Bundle b) throws IOException { + int size = reader.readInt(); + String fileName = reader.readString(); + return new Icon(fileName, size, b); + } + + public void write(Writer writer) throws IOException { + writer.writeInt(_size); + writer.writeString(_fileName); + } } diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/LogTracker.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/LogTracker.java index 041125ed3..8877eac39 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/LogTracker.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/LogTracker.java @@ -27,6 +27,19 @@ import org.osgi.util.tracker.ServiceTracker; */ public class LogTracker extends ServiceTracker<LogService, LogService> { + + @SuppressWarnings("deprecation") + final static int LOG_ERROR = LogService.LOG_ERROR; + + @SuppressWarnings("deprecation") + final static int LOG_WARNING = LogService.LOG_WARNING; + + @SuppressWarnings("deprecation") + final static int LOG_INFO = LogService.LOG_INFO; + + @SuppressWarnings("deprecation") + final static int LOG_DEBUG = LogService.LOG_DEBUG; + /** LogService interface class name */ protected final static String clazz = "org.osgi.service.log.LogService"; //$NON-NLS-1$ @@ -63,7 +76,7 @@ public class LogTracker extends ServiceTracker<LogService, LogService> { } @SuppressWarnings("deprecation") - public synchronized void log(ServiceReference<?> reference, int level, String message, Throwable exception) { + public void log(ServiceReference<?> reference, int level, String message, Throwable exception) { ServiceReference<LogService>[] references = getServiceReferences(); if (references != null) { @@ -94,7 +107,6 @@ public class LogTracker extends ServiceTracker<LogService, LogService> { * @param throwable Log exception or null if none. * @param reference ServiceReference associated with message or null if none. */ - @SuppressWarnings("deprecation") protected void noLogService(int level, String message, Throwable throwable, ServiceReference<?> reference) { if (out != null) { synchronized (out) { @@ -104,22 +116,22 @@ public class LogTracker extends ServiceTracker<LogService, LogService> { out.print(timestamp + " "); //$NON-NLS-1$ switch (level) { - case LogService.LOG_DEBUG : { + case LOG_DEBUG : { out.print(LogTrackerMsg.Debug); break; } - case LogService.LOG_INFO : { + case LOG_INFO : { out.print(LogTrackerMsg.Info); break; } - case LogService.LOG_WARNING : { + case LOG_WARNING : { out.print(LogTrackerMsg.Warning); break; } - case LogService.LOG_ERROR : { + case LOG_ERROR : { out.print(LogTrackerMsg.Error); break; diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeInformationImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeInformationImpl.java index 67c90759d..e0453276a 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeInformationImpl.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeInformationImpl.java @@ -13,11 +13,14 @@ *******************************************************************************/ package org.eclipse.equinox.metatype.impl; -import java.util.Enumeration; -import java.util.Vector; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; import javax.xml.parsers.SAXParser; import org.eclipse.equinox.metatype.EquinoxMetaTypeInformation; -import org.osgi.framework.Bundle; +import org.eclipse.equinox.metatype.impl.Persistence.Writer; +import org.osgi.framework.*; /** * Implementation of MetaTypeProvider @@ -30,6 +33,7 @@ import org.osgi.framework.Bundle; * <p> */ public class MetaTypeInformationImpl extends MetaTypeProviderImpl implements EquinoxMetaTypeInformation { + static final String[] emptyStringArray = new String[0]; /** * Constructor of class MetaTypeInformationImpl. @@ -38,6 +42,10 @@ public class MetaTypeInformationImpl extends MetaTypeProviderImpl implements Equ super(bundle, parser, logger); } + public MetaTypeInformationImpl(Bundle bundle, LogTracker logger, Map<String, ObjectClassDefinitionImpl> pidOCDs, Map<String, ObjectClassDefinitionImpl> fPidOCDs) { + super(bundle, logger, pidOCDs, fPidOCDs); + } + /* * (non-Javadoc) * @@ -45,19 +53,10 @@ public class MetaTypeInformationImpl extends MetaTypeProviderImpl implements Equ */ public String[] getPids() { - if (_allPidOCDs.size() == 0) { - return new String[0]; - } - - Vector<String> pids = new Vector<String>(7); - Enumeration<String> e = _allPidOCDs.keys(); - while (e.hasMoreElements()) { - pids.addElement(e.nextElement()); + if (_allPidOCDs.isEmpty()) { + return emptyStringArray; } - - String[] retvalue = new String[pids.size()]; - pids.toArray(retvalue); - return retvalue; + return _allPidOCDs.keySet().toArray(emptyStringArray); } /* @@ -66,17 +65,10 @@ public class MetaTypeInformationImpl extends MetaTypeProviderImpl implements Equ * @see org.osgi.service.metatype.MetaTypeInformation#getFactoryPids() */ public String[] getFactoryPids() { - if (_allFPidOCDs.size() == 0) { - return new String[0]; - } - Vector<String> fpids = new Vector<String>(7); - Enumeration<String> e = _allFPidOCDs.keys(); - while (e.hasMoreElements()) { - fpids.addElement(e.nextElement()); + if (_allFPidOCDs.isEmpty()) { + return emptyStringArray; } - String[] retvalue = new String[fpids.size()]; - fpids.toArray(retvalue); - return retvalue; + return _allFPidOCDs.keySet().toArray(emptyStringArray); } /* @@ -87,4 +79,54 @@ public class MetaTypeInformationImpl extends MetaTypeProviderImpl implements Equ public Bundle getBundle() { return this._bundle; } + + static MetaTypeInformationImpl load(BundleContext systemContext, LogTracker log, Persistence.Reader reader) throws IOException { + long id = reader.readLong(); + Bundle b = systemContext.getBundle(id); + boolean valid = true; + if (b == null) { + valid = false; + // just use the system bundle for load purposes + b = systemContext.getBundle(Constants.SYSTEM_BUNDLE_LOCATION); + } + + long lastModified = reader.readLong(); + if (lastModified != b.getLastModified()) { + valid = false; + } + Map<String, ObjectClassDefinitionImpl> allPidOCDs = new HashMap<>(); + int numPidOCDs = reader.readInt(); + for (int i = 0; i < numPidOCDs; i++) { + String key = reader.readString(); + ObjectClassDefinitionImpl ocd = ObjectClassDefinitionImpl.load(b, log, reader); + allPidOCDs.put(key, ocd); + } + Map<String, ObjectClassDefinitionImpl> allFPidOCDs = new HashMap<>(); + int numFPidOCDs = reader.readInt(); + for (int i = 0; i < numFPidOCDs; i++) { + String key = reader.readString(); + ObjectClassDefinitionImpl ocd = ObjectClassDefinitionImpl.load(b, log, reader); + allFPidOCDs.put(key, ocd); + } + + return !valid ? null : new MetaTypeInformationImpl(b, log, allPidOCDs, allFPidOCDs); + } + + void write(Writer writer) throws IOException { + writer.writeLong(getBundle().getBundleId()); + writer.writeLong(getBundle().getLastModified()); + + writer.writeInt(_allPidOCDs.size()); + for (Entry<String, ObjectClassDefinitionImpl> entry : _allPidOCDs.entrySet()) { + writer.writeString(entry.getKey()); + entry.getValue().write(writer); + } + + writer.writeInt(_allFPidOCDs.size()); + for (Entry<String, ObjectClassDefinitionImpl> entry : _allFPidOCDs.entrySet()) { + writer.writeString(entry.getKey()); + entry.getValue().write(writer); + } + } + } diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeProviderImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeProviderImpl.java index 58dfc50d5..fe33eaa12 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeProviderImpl.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeProviderImpl.java @@ -15,12 +15,12 @@ package org.eclipse.equinox.metatype.impl; import java.net.URL; import java.util.*; +import java.util.Map.Entry; import javax.xml.parsers.SAXParser; import org.eclipse.equinox.metatype.EquinoxObjectClassDefinition; import org.eclipse.osgi.util.NLS; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; -import org.osgi.service.log.LogService; import org.osgi.service.metatype.MetaTypeProvider; import org.osgi.service.metatype.MetaTypeService; @@ -38,13 +38,13 @@ public class MetaTypeProviderImpl implements MetaTypeProvider { public static final String RESOURCE_FILE_EXT = ".properties"; //$NON-NLS-1$ public static final char DIRECTORY_SEP = '/'; - Bundle _bundle; + final Bundle _bundle; - Hashtable<String, ObjectClassDefinitionImpl> _allPidOCDs = new Hashtable<String, ObjectClassDefinitionImpl>(7); - Hashtable<String, ObjectClassDefinitionImpl> _allFPidOCDs = new Hashtable<String, ObjectClassDefinitionImpl>(7); + final Map<String, ObjectClassDefinitionImpl> _allPidOCDs; + final Map<String, ObjectClassDefinitionImpl> _allFPidOCDs; String[] _locales; - boolean _isThereMeta = false; + final boolean _isThereMeta; // Give access to subclasses. protected final LogTracker logger; @@ -56,15 +56,24 @@ public class MetaTypeProviderImpl implements MetaTypeProvider { this._bundle = bundle; this.logger = logger; - + this._allPidOCDs = new HashMap<>(); + this._allFPidOCDs = new HashMap<>(); // read all bundle's metadata files and build internal data structures _isThereMeta = readMetaFiles(bundle, parser); if (!_isThereMeta) { - logger.log(LogService.LOG_DEBUG, NLS.bind(MetaTypeMsg.METADATA_NOT_FOUND, bundle.getSymbolicName(), bundle.getBundleId())); + logger.log(LogTracker.LOG_DEBUG, NLS.bind(MetaTypeMsg.METADATA_NOT_FOUND, bundle.getSymbolicName(), bundle.getBundleId())); } } + public MetaTypeProviderImpl(Bundle bundle, LogTracker logger, Map<String, ObjectClassDefinitionImpl> pidOCDs, Map<String, ObjectClassDefinitionImpl> fPidOCDs) { + this._bundle = bundle; + this.logger = logger; + this._isThereMeta = true; + this._allPidOCDs = pidOCDs; + this._allFPidOCDs = fPidOCDs; + } + /** * This method should do the following: * <p> - Obtain a SAX parser from the XML Parser Service: @@ -107,7 +116,7 @@ public class MetaTypeProviderImpl implements MetaTypeProvider { } } } catch (Exception e) { - logger.log(LogService.LOG_WARNING, NLS.bind(MetaTypeMsg.METADATA_FILE_PARSE_ERROR, new Object[] {entry, bundle.getBundleId(), bundle.getSymbolicName()}), e); + logger.log(LogTracker.LOG_WARNING, NLS.bind(MetaTypeMsg.METADATA_FILE_PARSE_ERROR, new Object[] {entry, bundle.getBundleId(), bundle.getSymbolicName()}), e); } } return result; @@ -167,19 +176,15 @@ public class MetaTypeProviderImpl implements MetaTypeProvider { public synchronized String[] getLocales() { if (_locales != null) return checkForDefault(_locales); - Vector<String> localizationFiles = new Vector<String>(7); + List<String> localizationFiles = new ArrayList<String>(7); // get all the localization resources for PIDS - Enumeration<ObjectClassDefinitionImpl> ocds = _allPidOCDs.elements(); - while (ocds.hasMoreElements()) { - ObjectClassDefinitionImpl ocd = ocds.nextElement(); + for (ObjectClassDefinitionImpl ocd : _allPidOCDs.values()) { String localization = ocd.getLocalization(); if (localization != null && !localizationFiles.contains(localization)) localizationFiles.add(localization); } // get all the localization resources for FPIDS - ocds = _allFPidOCDs.elements(); - while (ocds.hasMoreElements()) { - ObjectClassDefinitionImpl ocd = ocds.nextElement(); + for (ObjectClassDefinitionImpl ocd : _allFPidOCDs.values()) { String localization = ocd.getLocalization(); if (localization != null && !localizationFiles.contains(localization)) localizationFiles.add(localization); @@ -187,9 +192,7 @@ public class MetaTypeProviderImpl implements MetaTypeProvider { if (localizationFiles.size() == 0) localizationFiles.add(getBundleLocalization(_bundle)); Vector<String> locales = new Vector<String>(7); - Enumeration<String> eLocalizationFiles = localizationFiles.elements(); - while (eLocalizationFiles.hasMoreElements()) { - String localizationFile = eLocalizationFiles.nextElement(); + for (String localizationFile : localizationFiles) { int iSlash = localizationFile.lastIndexOf(DIRECTORY_SEP); String baseDir; String baseFileName; @@ -230,4 +233,15 @@ public class MetaTypeProviderImpl implements MetaTypeProvider { return null; return locales; } + + void getStrings(Set<String> strings) { + for (Entry<String, ObjectClassDefinitionImpl> entry : _allPidOCDs.entrySet()) { + strings.add(entry.getKey()); + entry.getValue().getStrings(strings); + } + for (Entry<String, ObjectClassDefinitionImpl> entry : _allFPidOCDs.entrySet()) { + strings.add(entry.getKey()); + entry.getValue().getStrings(strings); + } + } } diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeProviderTracker.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeProviderTracker.java index 77a922db8..97f662470 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeProviderTracker.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeProviderTracker.java @@ -22,7 +22,6 @@ import org.eclipse.osgi.util.NLS; import org.osgi.framework.*; import org.osgi.service.cm.ManagedService; import org.osgi.service.cm.ManagedServiceFactory; -import org.osgi.service.log.LogService; import org.osgi.service.metatype.*; import org.osgi.util.tracker.ServiceTracker; @@ -158,7 +157,7 @@ public class MetaTypeProviderTracker implements EquinoxMetaTypeInformation { e = ase; } } - log.log(LogService.LOG_WARNING, NLS.bind(MetaTypeMsg.INVALID_PID_METATYPE_PROVIDER_IGNORED, new Object[] {_bundle.getSymbolicName(), _bundle.getBundleId(), name, value}), e); + log.log(LogTracker.LOG_WARNING, NLS.bind(MetaTypeMsg.INVALID_PID_METATYPE_PROVIDER_IGNORED, new Object[] {_bundle.getSymbolicName(), _bundle.getBundleId(), name, value}), e); return new String[0]; } diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeServiceImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeServiceImpl.java index 8d9c5366d..a87275e3d 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeServiceImpl.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeServiceImpl.java @@ -13,15 +13,18 @@ *******************************************************************************/ package org.eclipse.equinox.metatype.impl; +import java.io.*; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.Hashtable; +import java.util.*; import javax.xml.parsers.*; import org.eclipse.equinox.metatype.EquinoxMetaTypeInformation; import org.eclipse.equinox.metatype.EquinoxMetaTypeService; +import org.eclipse.equinox.metatype.impl.Persistence.Reader; +import org.eclipse.equinox.metatype.impl.Persistence.Writer; import org.eclipse.osgi.util.NLS; import org.osgi.framework.*; -import org.osgi.service.log.LogService; +import org.osgi.service.metatype.MetaTypeInformation; import org.osgi.util.tracker.ServiceTracker; import org.xml.sax.SAXException; @@ -29,7 +32,7 @@ import org.xml.sax.SAXException; * Implementation of MetaTypeService */ public class MetaTypeServiceImpl implements EquinoxMetaTypeService, SynchronousBundleListener { - + private static String CACHE_FILE = "metaTypeCache"; //$NON-NLS-1$ SAXParserFactory _parserFactory; private Hashtable<Long, EquinoxMetaTypeInformation> _mtps = new Hashtable<Long, EquinoxMetaTypeInformation>(7); @@ -71,7 +74,7 @@ public class MetaTypeServiceImpl implements EquinoxMetaTypeService, SynchronousB try { impl = new MetaTypeInformationImpl(b, newParser(), loggerTemp); } catch (Exception e) { - loggerTemp.log(LogService.LOG_ERROR, NLS.bind(MetaTypeMsg.METADATA_PARSE_ERROR, b.getBundleId(), b.getSymbolicName()), e); + loggerTemp.log(LogTracker.LOG_ERROR, NLS.bind(MetaTypeMsg.METADATA_PARSE_ERROR, b.getBundleId(), b.getSymbolicName()), e); } if (impl == null || !impl._isThereMeta) return new MetaTypeProviderTracker(b, loggerTemp, tracker); @@ -135,4 +138,66 @@ public class MetaTypeServiceImpl implements EquinoxMetaTypeService, SynchronousB break; } } + + void load(BundleContext context, LogTracker log, ServiceTracker<Object, Object> tracker) throws IOException { + File cache = context.getDataFile(CACHE_FILE); + // using system context to see all bundles by the ID + BundleContext systemContext = context.getBundle(Constants.SYSTEM_BUNDLE_LOCATION).getBundleContext(); + if (cache.isFile()) { + try (Reader reader = new Reader(new DataInputStream(new BufferedInputStream(new FileInputStream(cache))))) { + + int numService = reader.readInt(); + for (int i = 0; i < numService; i++) { + long id = reader.readLong(); + Bundle b = systemContext.getBundle(id); + if (b != null) { + _mtps.put(b.getBundleId(), new MetaTypeProviderTracker(b, log, tracker)); + } + } + + reader.readIndexedStrings(); + + int numXML = reader.readInt(); + for (int i = 0; i < numXML; i++) { + MetaTypeInformationImpl info = MetaTypeInformationImpl.load(systemContext, log, reader); + if (info != null) { + _mtps.put(info.getBundle().getBundleId(), info); + } + } + } + } + } + + void save(BundleContext context) throws IOException { + File cache = context.getDataFile(CACHE_FILE); + try (Writer writer = new Writer(new DataOutputStream(new BufferedOutputStream(new FileOutputStream(cache))))) { + List<MetaTypeInformation> serviceInfos = new ArrayList<>(); + List<MetaTypeInformationImpl> xmlInfos = new ArrayList<>(); + synchronized (_mtps) { + for (MetaTypeInformation info : _mtps.values()) { + if (info instanceof MetaTypeInformationImpl) { + xmlInfos.add((MetaTypeInformationImpl) info); + } else { + serviceInfos.add(info); + } + } + } + + writer.writeInt(serviceInfos.size()); + for (MetaTypeInformation info : serviceInfos) { + writer.writeLong(info.getBundle().getBundleId()); + } + + Set<String> strings = new HashSet<>(); + for (MetaTypeInformationImpl info : xmlInfos) { + info.getStrings(strings); + } + writer.writeIndexedStrings(strings); + + writer.writeInt(xmlInfos.size()); + for (MetaTypeInformationImpl info : xmlInfos) { + info.write(writer); + } + } + } } diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ObjectClassDefinitionImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ObjectClassDefinitionImpl.java index f5907d05c..a4636fb31 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ObjectClassDefinitionImpl.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ObjectClassDefinitionImpl.java @@ -19,6 +19,7 @@ import java.net.URL; import java.util.*; import org.eclipse.equinox.metatype.EquinoxAttributeDefinition; import org.eclipse.equinox.metatype.EquinoxObjectClassDefinition; +import org.eclipse.equinox.metatype.impl.Persistence.Writer; import org.osgi.framework.Bundle; /** @@ -35,12 +36,11 @@ public class ObjectClassDefinitionImpl extends LocalizationElement implements Eq private final String _id; private final String _description; private final int _type; - private final Vector<AttributeDefinitionImpl> _required = new Vector<AttributeDefinitionImpl>(7); - private final Vector<AttributeDefinitionImpl> _optional = new Vector<AttributeDefinitionImpl>(7); + private final List<AttributeDefinitionImpl> _required = new ArrayList<>(7); + private final List<AttributeDefinitionImpl> _optional = new ArrayList<>(7); private final ExtendableHelper helper; - // @GuardedBy("this") - private List<Icon> icons; + private volatile List<Icon> icons = null; /* * Constructor of class ObjectClassDefinitionImpl. @@ -64,19 +64,18 @@ public class ObjectClassDefinitionImpl extends LocalizationElement implements Eq /* * */ - public synchronized Object clone() { + public Object clone() { ObjectClassDefinitionImpl ocd = new ObjectClassDefinitionImpl(_name, _description, _id, _type, getLocalization(), helper); - for (int i = 0; i < _required.size(); i++) { - AttributeDefinitionImpl ad = _required.elementAt(i); + for (AttributeDefinitionImpl ad : _required) { ocd.addAttributeDefinition((AttributeDefinitionImpl) ad.clone(), true); } - for (int i = 0; i < _optional.size(); i++) { - AttributeDefinitionImpl ad = _optional.elementAt(i); + for (AttributeDefinitionImpl ad : _optional) { ocd.addAttributeDefinition((AttributeDefinitionImpl) ad.clone(), false); } - if (icons != null) + if (icons != null) { ocd.setIcons(new ArrayList<Icon>(icons)); + } return ocd; } @@ -127,15 +126,13 @@ public class ObjectClassDefinitionImpl extends LocalizationElement implements Eq case ALL : default : atts = new EquinoxAttributeDefinition[_required.size() + _optional.size()]; - Enumeration<AttributeDefinitionImpl> e = _required.elements(); int i = 0; - while (e.hasMoreElements()) { - atts[i] = e.nextElement(); + for (AttributeDefinitionImpl attr : _required) { + atts[i] = attr; i++; } - e = _optional.elements(); - while (e.hasMoreElements()) { - atts[i] = e.nextElement(); + for (AttributeDefinitionImpl attr : _optional) { + atts[i] = attr; i++; } return atts; @@ -148,9 +145,9 @@ public class ObjectClassDefinitionImpl extends LocalizationElement implements Eq void addAttributeDefinition(AttributeDefinitionImpl ad, boolean isRequired) { if (isRequired) { - _required.addElement(ad); + _required.add(ad); } else { - _optional.addElement(ad); + _optional.add(ad); } } @@ -159,7 +156,7 @@ public class ObjectClassDefinitionImpl extends LocalizationElement implements Eq * * @see org.osgi.service.metatype.ObjectClassDefinition#getIcon(int) */ - public synchronized InputStream getIcon(int sizeHint) throws IOException { + public InputStream getIcon(int sizeHint) throws IOException { // The parameter simply represents a requested size. This method should never return null if an // icon exists. // Temporary icon to hold the requested size for use in binary search comparator. @@ -206,7 +203,7 @@ public class ObjectClassDefinitionImpl extends LocalizationElement implements Eq return null; } - synchronized void setIcons(List<Icon> icons) { + void setIcons(List<Icon> icons) { // Do nothing if icons is null or empty. if (icons == null || icons.isEmpty()) return; @@ -222,15 +219,10 @@ public class ObjectClassDefinitionImpl extends LocalizationElement implements Eq */ void setResourceBundle(String assignedLocale, Bundle bundle) { setLocaleAndBundle(assignedLocale, bundle); - Enumeration<AttributeDefinitionImpl> allADReqs = _required.elements(); - while (allADReqs.hasMoreElements()) { - AttributeDefinitionImpl ad = allADReqs.nextElement(); + for (AttributeDefinitionImpl ad : _required) { ad.setLocaleAndBundle(assignedLocale, bundle); } - - Enumeration<AttributeDefinitionImpl> allADOpts = _optional.elements(); - while (allADOpts.hasMoreElements()) { - AttributeDefinitionImpl ad = allADOpts.nextElement(); + for (AttributeDefinitionImpl ad : _optional) { ad.setLocaleAndBundle(assignedLocale, bundle); } } @@ -242,4 +234,74 @@ public class ObjectClassDefinitionImpl extends LocalizationElement implements Eq public Set<String> getExtensionUris() { return helper.getExtensionUris(); } + + void getStrings(Set<String> strings) { + helper.getStrings(strings); + strings.add(_description); + strings.add(_id); + strings.add(_name); + strings.add(getLocalization()); + @SuppressWarnings("hiding") + List<Icon> icons = this.icons; + if (icons != null) { + for (Icon icon : icons) { + icon.getStrings(strings); + } + } + } + + static ObjectClassDefinitionImpl load(Bundle b, LogTracker logger, Persistence.Reader reader) throws IOException { + String description = reader.readString(); + String id = reader.readString(); + String name = reader.readString(); + int type = reader.readInt(); + String localization = reader.readString(); + ExtendableHelper helper = ExtendableHelper.load(reader); + ObjectClassDefinitionImpl result = new ObjectClassDefinitionImpl(name, description, id, type, localization, helper); + + int numIcons = reader.readInt(); + List<Icon> icons = null; + if (numIcons > 0) { + icons = new ArrayList<>(numIcons); + for (int i = 0; i < numIcons; i++) { + icons.add(Icon.load(reader, b)); + } + } + result.setIcons(icons); + + int numRequired = reader.readInt(); + for (int i = 0; i < numRequired; i++) { + result.addAttributeDefinition(AttributeDefinitionImpl.load(reader, logger), true); + } + int numOptional = reader.readInt(); + for (int i = 0; i < numOptional; i++) { + result.addAttributeDefinition(AttributeDefinitionImpl.load(reader, logger), false); + } + + return result; + } + + void write(Writer writer) throws IOException { + writer.writeString(_description); + writer.writeString(_id); + writer.writeString(_name); + writer.writeInt(_type); + writer.writeString(getLocalization()); + helper.write(writer); + List<Icon> curIcons = this.icons; + writer.writeInt(curIcons == null ? 0 : curIcons.size()); + if (curIcons != null) { + for (Icon icon : curIcons) { + icon.write(writer); + } + } + writer.writeInt(_required.size()); + for (AttributeDefinitionImpl ad : _required) { + ad.write(writer); + } + writer.writeInt(_optional.size()); + for (AttributeDefinitionImpl ad : _optional) { + ad.write(writer); + } + } } diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Persistence.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Persistence.java new file mode 100644 index 000000000..da3212b10 --- /dev/null +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Persistence.java @@ -0,0 +1,206 @@ +package org.eclipse.equinox.metatype.impl; + +import java.io.*; +import java.util.*; + +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation. + * + * 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 + *******************************************************************************/ + +public class Persistence { + + private static final String UTF_8 = "UTF-8"; //$NON-NLS-1$ + private static final byte NULL = 0; + private static final byte OBJECT = 1; + private static final byte INDEX = 2; + private static final byte LONG_STRING = 3; + + private Persistence() { + } + + public static class Reader implements Closeable { + private final Map<Integer, String> readStringCache = new HashMap<>(); + private final DataInputStream in; + + public Reader(DataInputStream in) { + this.in = in; + } + + public void readIndexedStrings() throws IOException { + int num = in.readInt(); + for (int i = 0; i < num; i++) { + readIndexedString(); + } + } + + private String readIndexedString() throws IOException { + String string = readString(); + readStringCache.put(Integer.valueOf(in.readInt()), string); + return string; + } + + public String readString() throws IOException { + byte type = in.readByte(); + if (type == INDEX) { + int index = in.readInt(); + return readStringCache.get(index); + } + if (type == NULL) { + return null; + } + String string; + if (type == LONG_STRING) { + int length = in.readInt(); + byte[] data = new byte[length]; + in.readFully(data); + string = new String(data, UTF_8); + } else { + string = in.readUTF(); + } + + return string; + } + + public long readLong() throws IOException { + return in.readLong(); + } + + public int readInt() throws IOException { + return in.readInt(); + } + + @Override + public void close() throws IOException { + in.close(); + } + + public boolean readBoolean() throws IOException { + return in.readBoolean(); + } + + public short readShort() throws IOException { + return in.readShort(); + } + + public char readCharacter() throws IOException { + return in.readChar(); + } + + public byte readByte() throws IOException { + return in.readByte(); + } + + public double readDouble() throws IOException { + return readDouble(); + } + + public float readFloat() throws IOException { + return in.readFloat(); + } + } + + public static class Writer implements Closeable { + private final Map<String, Integer> writeStringCache = new HashMap<>(); + private final DataOutputStream out; + + public Writer(DataOutputStream out) { + this.out = out; + } + + public void writeIndexedStrings(Set<String> strings) throws IOException { + strings.remove(null); // do not index null + out.writeInt(strings.size()); + for (String string : strings) { + writeIndexedString(string); + } + } + + private void writeIndexedString(String string) throws IOException { + writeString(string); + addToIndex(string); + } + + public void writeString(String string) throws IOException { + Integer index = string != null ? writeStringCache.get(string) : null; + if (index != null) { + out.writeByte(INDEX); + out.writeInt(index); + return; + } + + if (string == null) + out.writeByte(NULL); + else { + byte[] data = string.getBytes(UTF_8); + + if (data.length > 65535) { + out.writeByte(LONG_STRING); + out.writeInt(data.length); + out.write(data); + } else { + out.writeByte(OBJECT); + out.writeUTF(string); + } + } + } + + private void addToIndex(String string) throws IOException { + if (string == null) { + throw new NullPointerException(); + } + Integer cur = writeStringCache.get(string); + if (cur != null) + throw new IllegalStateException("String is already in the write table: " + string); //$NON-NLS-1$ + Integer index = writeStringCache.size(); + writeStringCache.put(string, index); + out.writeInt(index.intValue()); + } + + @Override + public void close() throws IOException { + out.close(); + } + + public void writeInt(int v) throws IOException { + out.writeInt(v); + } + + public void writeLong(long v) throws IOException { + out.writeLong(v); + } + + public void writeBoolean(boolean v) throws IOException { + out.writeBoolean(v); + } + + public void writeShort(Short v) throws IOException { + out.writeShort(v); + } + + public void writeCharacter(Character v) throws IOException { + out.writeChar(v); + } + + public void writeByte(Byte v) throws IOException { + out.writeByte(v); + } + + public void writeDouble(Double v) throws IOException { + out.writeDouble(v); + } + + public void writeFloat(Float v) throws IOException { + out.writeFloat(v); + } + } +} diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ValueTokenizer.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ValueTokenizer.java index ef6f2fd5c..014eb5050 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ValueTokenizer.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ValueTokenizer.java @@ -17,7 +17,6 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.*; import org.eclipse.osgi.util.NLS; -import org.osgi.service.log.LogService; import org.osgi.service.metatype.AttributeDefinition; public class ValueTokenizer { @@ -114,7 +113,7 @@ public class ValueTokenizer { } /* - * Method to return values as Vector. + * Method to return values as collection. */ public Collection<String> getValues() { return Collections.unmodifiableList(values); @@ -150,20 +149,21 @@ public class ValueTokenizer { try { // All or nothing. If either min or max is not null and cannot be // parsed as an integer, do the string comparison instead. - Integer min = ad._minValue == null ? null : Integer.valueOf((String) ad._minValue); - Integer max = ad._maxValue == null ? null : Integer.valueOf((String) ad._maxValue); + Integer min = ad.getMinValue() == null ? null : Integer.valueOf((String) ad.getMinValue()); + Integer max = ad.getMaxValue() == null ? null : Integer.valueOf((String) ad.getMaxValue()); if (min != null && value.length() < min) return true; if (max != null && value.length() > max) return true; } catch (NumberFormatException e) { // Either min or max was not an integer. Do a string comparison. - if ((ad._minValue != null && value.compareTo((String) ad._minValue) < 0) || (ad._maxValue != null && value.compareTo((String) ad._maxValue) > 0)) + if ((ad.getMinValue() != null && value.compareTo((String) ad.getMinValue()) < 0) || (ad.getMaxValue() != null && value.compareTo((String) ad.getMaxValue()) > 0)) return true; } return false; } + @SuppressWarnings("deprecation") public String validate(AttributeDefinitionImpl ad) { // An empty list means the original value was null. Null is never valid. if (values.isEmpty()) { @@ -187,37 +187,37 @@ public class ValueTokenizer { for (Iterator<String> i = values.iterator(); i.hasNext();) { s = i.next(); // If options were declared and the value does not match one of them, the value is not valid. - if (!ad._values.isEmpty() && !ad._values.contains(s)) { + if (ad.containsInvalidValue(s)) { return NLS.bind(MetaTypeMsg.VALUE_OUT_OF_OPTION, s); } // Check the type. Also check the range if min or max were declared. boolean rangeError = false; - switch (ad._dataType) { + switch (ad.getType()) { case AttributeDefinition.PASSWORD : case AttributeDefinition.STRING : rangeError = validateString(ad, s); break; case AttributeDefinition.INTEGER : Integer intVal = Integer.valueOf(s); - if (ad._minValue != null && intVal.compareTo((Integer) ad._minValue) < 0) { + if (ad.getMinValue() != null && intVal.compareTo((Integer) ad.getMinValue()) < 0) { rangeError = true; - } else if (ad._maxValue != null && intVal.compareTo((Integer) ad._maxValue) > 0) { + } else if (ad.getMaxValue() != null && intVal.compareTo((Integer) ad.getMaxValue()) > 0) { rangeError = true; } break; case AttributeDefinition.LONG : Long longVal = Long.valueOf(s); - if (ad._minValue != null && longVal.compareTo((Long) ad._minValue) < 0) { + if (ad.getMinValue() != null && longVal.compareTo((Long) ad.getMinValue()) < 0) { rangeError = true; - } else if (ad._maxValue != null && longVal.compareTo((Long) ad._maxValue) > 0) { + } else if (ad.getMaxValue() != null && longVal.compareTo((Long) ad.getMaxValue()) > 0) { rangeError = true; } break; case AttributeDefinition.DOUBLE : Double doubleVal = Double.valueOf(s); - if (ad._minValue != null && doubleVal.compareTo((Double) ad._minValue) < 0) { + if (ad.getMinValue() != null && doubleVal.compareTo((Double) ad.getMinValue()) < 0) { rangeError = true; - } else if (ad._maxValue != null && doubleVal.compareTo((Double) ad._maxValue) > 0) { + } else if (ad.getMaxValue() != null && doubleVal.compareTo((Double) ad.getMaxValue()) > 0) { rangeError = true; } break; @@ -227,49 +227,49 @@ public class ValueTokenizer { break; case AttributeDefinition.CHARACTER : Character charVal = Character.valueOf(s.charAt(0)); - if (ad._minValue != null && charVal.compareTo((Character) ad._minValue) < 0) { + if (ad.getMinValue() != null && charVal.compareTo((Character) ad.getMinValue()) < 0) { rangeError = true; - } else if (ad._maxValue != null && charVal.compareTo((Character) ad._maxValue) > 0) { + } else if (ad.getMaxValue() != null && charVal.compareTo((Character) ad.getMaxValue()) > 0) { rangeError = true; } break; case AttributeDefinition.FLOAT : Float floatVal = Float.valueOf(s); - if (ad._minValue != null && floatVal.compareTo((Float) ad._minValue) < 0) { + if (ad.getMinValue() != null && floatVal.compareTo((Float) ad.getMinValue()) < 0) { rangeError = true; - } else if (ad._maxValue != null && floatVal.compareTo((Float) ad._maxValue) > 0) { + } else if (ad.getMaxValue() != null && floatVal.compareTo((Float) ad.getMaxValue()) > 0) { rangeError = true; } break; case AttributeDefinition.SHORT : Short shortVal = Short.valueOf(s); - if (ad._minValue != null && shortVal.compareTo((Short) ad._minValue) < 0) { + if (ad.getMinValue() != null && shortVal.compareTo((Short) ad.getMinValue()) < 0) { rangeError = true; - } else if (ad._maxValue != null && shortVal.compareTo((Short) ad._maxValue) > 0) { + } else if (ad.getMaxValue() != null && shortVal.compareTo((Short) ad.getMaxValue()) > 0) { rangeError = true; } break; case AttributeDefinition.BYTE : Byte byteVal = Byte.valueOf(s); - if (ad._minValue != null && byteVal.compareTo((Byte) ad._minValue) < 0) { + if (ad.getMinValue() != null && byteVal.compareTo((Byte) ad.getMinValue()) < 0) { rangeError = true; - } else if (ad._maxValue != null && byteVal.compareTo((Byte) ad._maxValue) > 0) { + } else if (ad.getMaxValue() != null && byteVal.compareTo((Byte) ad.getMaxValue()) > 0) { rangeError = true; } break; case AttributeDefinition.BIGDECIMAL : BigDecimal bigDecVal = new BigDecimal(s); - if (ad._minValue != null && bigDecVal.compareTo((BigDecimal) ad._minValue) < 0) { + if (ad.getMinValue() != null && bigDecVal.compareTo((BigDecimal) ad.getMinValue()) < 0) { rangeError = true; - } else if (ad._maxValue != null && bigDecVal.compareTo((BigDecimal) ad._maxValue) > 0) { + } else if (ad.getMaxValue() != null && bigDecVal.compareTo((BigDecimal) ad.getMaxValue()) > 0) { rangeError = true; } break; case AttributeDefinition.BIGINTEGER : BigInteger bigIntVal = new BigInteger(s); - if (ad._minValue != null && bigIntVal.compareTo((BigInteger) ad._minValue) < 0) { + if (ad.getMinValue() != null && bigIntVal.compareTo((BigInteger) ad.getMinValue()) < 0) { rangeError = true; - } else if (ad._maxValue != null && bigIntVal.compareTo((BigInteger) ad._maxValue) > 0) { + } else if (ad.getMaxValue() != null && bigIntVal.compareTo((BigInteger) ad.getMaxValue()) > 0) { rangeError = true; } break; @@ -286,7 +286,7 @@ public class ValueTokenizer { return NLS.bind(MetaTypeMsg.VALUE_NOT_A_NUMBER, s); } catch (Exception e) { String message = NLS.bind(MetaTypeMsg.EXCEPTION_MESSAGE, e.getClass().getName(), e.getMessage()); - logger.log(LogService.LOG_DEBUG, message, e); + logger.log(LogTracker.LOG_DEBUG, message, e); return message; } } |