46 changes: 29 additions & 17 deletions ...re/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/search/LuceneDocumentFactory.java
View file
Expand Up @@ -41,7 +41,12 @@

import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.Bits;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
import org.eclipse.jdt.core.IJavaElement;
Expand Down Expand Up @@ -75,6 +80,12 @@
*
*/
public class LuceneDocumentFactory {

private static final FieldType STORED_NOT_ANALYZED = new FieldType(TextField.TYPE_STORED);

static {
STORED_NOT_ANALYZED.setTokenized(false);
}

/**
* Returns the Identifier {@link Term} for the given {@link IMarker}.
Expand Down Expand Up @@ -284,6 +295,15 @@ public static Document createDocument(final IJaxrsEndpoint endpoint) {
}
return document;
}

public static boolean isDeleted(IndexReader reader, int docID) {
boolean result = false;
Bits bits = MultiFields.getLiveDocs(reader);
if (bits != null) {
result = !bits.get(docID);
}
return result;
}

/**
* Adds a Field to the given Lucene Document. The generated field will
Expand All @@ -301,7 +321,7 @@ private static void addFieldToDocument(final Document document, final String nam
if (name == null || value == null) {
return;
}
document.add(new Field(name, value, Field.Store.YES, Field.Index.NOT_ANALYZED));
document.add(new Field(name, value, STORED_NOT_ANALYZED));
}

/**
Expand All @@ -321,7 +341,7 @@ private static void addFieldToDocument(final Document document, final String nam
return;
}
for(String value : values) {
document.add(new Field(name, value, Field.Store.YES, Field.Index.NOT_ANALYZED));
document.add(new Field(name, value, STORED_NOT_ANALYZED));
}
}

Expand Down Expand Up @@ -398,8 +418,7 @@ private static Document createJavaApplicationDocument(final JaxrsJavaApplication
* @return the document.
*/
private static Document createParameterAggregatorDocument(final JaxrsParameterAggregator parameterAggregator) {
final Document document = createBaseDocument(parameterAggregator);
return document;
return createBaseDocument(parameterAggregator);
}

/**
Expand All @@ -410,8 +429,7 @@ private static Document createParameterAggregatorDocument(final JaxrsParameterAg
* @return the document.
*/
private static Document createParameterAggregatorFieldDocument(final JaxrsParameterAggregatorField parameterAggregatorField) {
final Document document = createBaseDocument(parameterAggregatorField);
return document;
return createBaseDocument(parameterAggregatorField);
}

/**
Expand Down Expand Up @@ -482,8 +500,7 @@ private static Document createHttpMethodDocument(final JaxrsHttpMethod httpMetho
* @return the document.
*/
private static Document createNameBindingDocument(final JaxrsNameBinding nameBinding) {
final Document document = createBaseDocument(nameBinding);
return document;
return createBaseDocument(nameBinding);
}

/**
Expand Down Expand Up @@ -513,9 +530,7 @@ private static Document createProviderDocument(final JaxrsProvider provider) {
* @return the document.
*/
private static Document createParamConverterProviderDocument(final JaxrsParamConverterProvider paramConverterProvider) {
final Document document = createBaseDocument(paramConverterProvider);

return document;
return createBaseDocument(paramConverterProvider);
}

/**
Expand All @@ -526,8 +541,7 @@ private static Document createParamConverterProviderDocument(final JaxrsParamCon
* @return the document.
*/
private static Document createResourceDocument(final JaxrsResource resource) {
final Document document = createBaseDocument(resource);
return document;
return createBaseDocument(resource);
}

/**
Expand All @@ -538,8 +552,7 @@ private static Document createResourceDocument(final JaxrsResource resource) {
* @return the document.
*/
private static Document createResourceFieldDocument(final JaxrsResourceField resourceField) {
final Document document = createBaseDocument(resourceField);
return document;
return createBaseDocument(resourceField);
}

/**
Expand All @@ -550,8 +563,7 @@ private static Document createResourceFieldDocument(final JaxrsResourceField res
* @return the document.
*/
private static Document createResourcePropertyDocument(final JaxrsResourceProperty resourceProperty) {
final Document document = createBaseDocument(resourceProperty);
return document;
return createBaseDocument(resourceProperty);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF
View file
Expand Up @@ -4,7 +4,7 @@ Bundle-Localization: plugin
Bundle-Name: %PLUGIN_NAME
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-SymbolicName: org.jboss.tools.ws.jaxrs.ui;singleton:=true
Bundle-Version: 2.0.1.qualifier
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxrs.ui.JBossJaxrsUIPlugin
Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.core.runtime;bundle-version="3.7.0",
Expand Down
Binary file added plugins/org.jboss.tools.ws.jaxrs.ui/lib/javax.ws.rs-api-2.0.1.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.ws.jaxrs.ui/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>plugins</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.plugins</groupId>
<artifactId>org.jboss.tools.ws.jaxrs.ui</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.ws.jaxws.core/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.jboss.tools.ws.jaxws.core;singleton:=true
Bundle-Version: 2.0.1.qualifier
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxws.core.JBossJAXWSCorePlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.ws.jaxws.core/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>plugins</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.plugins</groupId>
<artifactId>org.jboss.tools.ws.jaxws.core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.ws.jaxws.ui/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.jboss.tools.ws.jaxws.ui;singleton:=true
Bundle-Version: 2.0.1.qualifier
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxws.ui.JBossJAXWSUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.resources,
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.ws.jaxws.ui/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>plugins</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.plugins</groupId>
<artifactId>org.jboss.tools.ws.jaxws.ui</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.jboss.tools.ws.ui;singleton:=true
Bundle-Version: 2.0.1.qualifier
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.jboss.tools.ws.ui.JBossWSUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.resources;bundle-version="3.7.100",
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.ws.ui/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>plugins</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.plugins</groupId>
<artifactId>org.jboss.tools.ws.ui</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.ws.wise.ui/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JBoss Wise UI Plug-in Wrapper
Bundle-SymbolicName: org.jboss.tools.ws.wise.ui;singleton:=true
Bundle-Version: 2.0.1.qualifier
Bundle-Version: 2.0.100.qualifier
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.ws.wise.ui/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>plugins</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<artifactId>org.jboss.tools.ws.wise.ui</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion plugins/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>ws</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>plugins</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -9,7 +9,7 @@
</parent>
<artifactId>ws</artifactId>
<name>jbosstools-webservices</name>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<tycho.scmUrl>scm:git:https://github.com/jbosstools/jbosstools-webservices.git</tycho.scmUrl>
Expand Down
2 changes: 1 addition & 1 deletion site/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>ws</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>ws.site</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test-framework/org.jboss.tools.ws.reddeer/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: RedDeer API for Webservices UI Tests
Bundle-SymbolicName: org.jboss.tools.ws.reddeer
Bundle-Version: 2.0.1.qualifier
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.jboss.tools.ws.reddeer.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion test-framework/org.jboss.tools.ws.reddeer/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>test-framework</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<artifactId>org.jboss.tools.ws.reddeer</artifactId>
<packaging>eclipse-plugin</packaging>
Expand Down
2 changes: 1 addition & 1 deletion test-framework/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>ws</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>test-framework</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tests/org.jboss.tools.websockets.ui.test/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.websockets.ui.test;singleton:=true
Bundle-Version: 2.0.1.qualifier
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.jboss.tools.websockets.ui.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion tests/org.jboss.tools.websockets.ui.test/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>tests</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.tests</groupId>
<artifactId>org.jboss.tools.websockets.ui.test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.ws.core.test
Bundle-Version: 2.0.1.qualifier
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.jboss.tools.ws.core.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion tests/org.jboss.tools.ws.core.test/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>tests</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.tests</groupId>
<artifactId>org.jboss.tools.ws.core.test</artifactId>
Expand Down
11 changes: 5 additions & 6 deletions tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF
View file
Expand Up @@ -4,7 +4,7 @@ Bundle-Localization: plugin
Bundle-Name: %PLUGIN_NAME
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-SymbolicName: org.jboss.tools.ws.jaxrs.core.test;singleton:=true
Bundle-Version: 2.0.1.qualifier
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxrs.core.JBossJaxrsCoreTestPlugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.ws.jaxrs.core;bundle-version="1.2.2",
Expand Down Expand Up @@ -32,11 +32,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.jboss.tools.common.core;bundle-version="3.5.2",
org.hamcrest.library;bundle-version="1.3.0",
org.jboss.tools.locus.mockito;bundle-version="1.9.5",
org.apache.lucene.core,
org.apache.lucene.analyzers-common,
org.apache.lucene.queryparser,
org.apache.lucene.misc,
org.apache.lucene.analyzers-smartcn,
org.apache.lucene.core;bundle-version="[7.1.0,8.0.0)",
org.apache.lucene.analyzers-common;bundle-version="[7.1.0,8.0.0)",
org.apache.lucene.misc;bundle-version="[7.1.0,8.0.0)",
org.apache.lucene.analyzers-smartcn;bundle-version="[7.1.0,8.0.0)",
org.jboss.tools.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Expand Down
2 changes: 1 addition & 1 deletion tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>tests</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.tests</groupId>
<artifactId>org.jboss.tools.ws.jaxrs.core.test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tests/org.jboss.tools.ws.jaxrs.ui.test/META-INF/MANIFEST.MF
View file
Expand Up @@ -4,7 +4,7 @@ Bundle-Localization: plugin
Bundle-Name: %PLUGIN_NAME
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-SymbolicName: org.jboss.tools.ws.jaxrs.ui.test;singleton:=true
Bundle-Version: 2.0.1.qualifier
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxrs.ui.JBossJaxrsUITestPlugin
Require-Bundle: org.eclipse.core.runtime,
org.jboss.tools.ws.jaxrs.ui,
Expand Down
2 changes: 1 addition & 1 deletion tests/org.jboss.tools.ws.jaxrs.ui.test/pom.xml
View file
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>tests</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.tests</groupId>
<artifactId>org.jboss.tools.ws.jaxrs.ui.test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tests/org.jboss.tools.ws.jaxws.core.test/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.ws.jaxws.core.test
Bundle-Version: 2.0.1.qualifier
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxws.core.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion tests/org.jboss.tools.ws.jaxws.core.test/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>tests</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.tests</groupId>
<artifactId>org.jboss.tools.ws.jaxws.core.test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tests/org.jboss.tools.ws.ui.test/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.ws.ui.test
Bundle-Version: 2.0.1.qualifier
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.jboss.tools.ws.ui.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion tests/org.jboss.tools.ws.ui.test/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>tests</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws.tests</groupId>
<artifactId>org.jboss.tools.ws.ui.test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>ws</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.100-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.ws</groupId>
<artifactId>tests</artifactId>
Expand Down