You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2019/01/23 21:00:38 UTC
svn commit: r1851981 - in /aries/trunk/cdi/cdi-extra: ./
src/main/java/org/apache/aries/cdi/extra/propertytypes/
Author: rotty3000
Date: Wed Jan 23 21:00:38 2019
New Revision: 1851981
URL: http://svn.apache.org/viewvc?rev=1851981&view=rev
Log:
[CDI] make all extra annotations instantiable
Signed-off-by: Raymond Auge <ro...@apache.org>
Added:
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceDescription.java
- copied, changed from r1851775, aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceRanking.java
- copied, changed from r1851775, aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceVendor.java
- copied, changed from r1851775, aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContextSelect.java
Modified:
aries/trunk/cdi/cdi-extra/pom.xml
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventDelivery.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventFilter.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventTopics.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ExportedService.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContext.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContextSelect.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterAsyncSupported.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterDispatcher.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterName.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterPattern.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterRegex.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterServlet.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardListener.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardResource.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletAsyncSupported.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletErrorPage.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletMultipart.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletName.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletPattern.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardTarget.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JSONRequired.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationSelect.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtension.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtensionSelect.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsMediaType.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsName.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsResource.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsWhiteboardTarget.java
Modified: aries/trunk/cdi/cdi-extra/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/pom.xml?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/pom.xml (original)
+++ aries/trunk/cdi/cdi-extra/pom.xml Wed Jan 23 21:00:38 2019
@@ -48,6 +48,10 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxrs_2.1_spec</artifactId>
<version>1.1</version>
<scope>provided</scope>
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventDelivery.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventDelivery.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventDelivery.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventDelivery.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2018, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
@@ -39,6 +43,27 @@ import org.osgi.service.event.annotation
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface EventDelivery {
+
+ public static final class Literal extends AnnotationLiteral<EventDelivery> implements EventDelivery {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String[] value) {
+ return new Literal(value);
+ }
+
+ private Literal(String[] value) {
+ _value = value;
+ }
+
+ @Override
+ public String[] value() {
+ return _value;
+ }
+
+ private final String[] _value;
+ }
+
/**
* Service property specifying the {@code Event} delivery qualities
* requested by an {@link EventHandler} service.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventFilter.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventFilter.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventFilter.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventFilter.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2018, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
@@ -39,6 +43,27 @@ import org.osgi.service.event.annotation
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface EventFilter {
+
+ public static final class Literal extends AnnotationLiteral<EventFilter> implements EventFilter {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String value) {
+ return new Literal(value);
+ }
+
+ private Literal(String value) {
+ _value = value;
+ }
+
+ @Override
+ public String value() {
+ return _value;
+ }
+
+ private final String _value;
+ }
+
/**
* Service property specifying the {@code Event} filter to an
* {@link EventHandler} service.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventTopics.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventTopics.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventTopics.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventTopics.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2018, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
@@ -39,6 +43,27 @@ import org.osgi.service.event.annotation
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface EventTopics {
+
+ public static final class Literal extends AnnotationLiteral<EventTopics> implements EventTopics {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String[] value) {
+ return new Literal(value);
+ }
+
+ private Literal(String[] value) {
+ _value = value;
+ }
+
+ @Override
+ public String[] value() {
+ return _value;
+ }
+
+ private final String[] _value;
+ }
+
/**
* Service property specifying the {@code Event} topics of interest to an
* {@link EventHandler} service.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ExportedService.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ExportedService.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ExportedService.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ExportedService.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2016, 2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2016, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.framework.Constants;
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.cdi.annotations.FactoryComponent;
@@ -40,6 +44,72 @@ import org.osgi.service.cdi.annotations.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface ExportedService {
+
+ public static final class Literal extends AnnotationLiteral<ExportedService> implements ExportedService {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(
+ Class<?>[] service_exported_interfaces,
+ String[] service_exported_configs,
+ String[] service_exported_intents,
+ String[] service_exported_intents_extra,
+ String[] service_intents) {
+
+ return new Literal(
+ service_exported_interfaces,
+ service_exported_configs,
+ service_exported_intents,
+ service_exported_intents_extra,
+ service_intents);
+ }
+
+ public Literal(
+ Class<?>[] service_exported_interfaces,
+ String[] service_exported_configs,
+ String[] service_exported_intents,
+ String[] service_exported_intents_extra,
+ String[] service_intents) {
+
+ this.service_exported_interfaces = service_exported_interfaces;
+ this.service_exported_configs = service_exported_configs;
+ this.service_exported_intents = service_exported_intents;
+ this.service_exported_intents_extra = service_exported_intents_extra;
+ this.service_intents = service_intents;
+ }
+
+ @Override
+ public String[] service_exported_configs() {
+ return service_exported_configs;
+ }
+
+ @Override
+ public String[] service_exported_intents() {
+ return service_exported_intents;
+ }
+
+ @Override
+ public String[] service_exported_intents_extra() {
+ return service_exported_intents_extra;
+ }
+
+ @Override
+ public Class<?>[] service_exported_interfaces() {
+ return service_exported_interfaces;
+ }
+
+ @Override
+ public String[] service_intents() {
+ return service_intents;
+ }
+
+ private final Class< ? >[] service_exported_interfaces;
+ private final String[] service_exported_configs;
+ private final String[] service_exported_intents;
+ private final String[] service_exported_intents_extra;
+ private final String[] service_intents;
+ }
+
/**
* Service property marking the service for export. It defines the
* interfaces under which the service can be exported.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContext.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContext.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContext.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContext.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
@@ -44,6 +46,34 @@ import org.osgi.service.http.whiteboard.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardContext {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardContext> implements HttpWhiteboardContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String name, String path) {
+ return new Literal(name, path);
+ }
+
+ private Literal(String name, String path) {
+ _name = name;
+ _path = path;
+ }
+
+ @Override
+ public String name() {
+ return _name;
+ }
+
+ @Override
+ public String path() {
+ return _path;
+ }
+
+ private final String _name;
+ private final String _path;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContextSelect.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContextSelect.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContextSelect.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContextSelect.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
@@ -39,6 +41,27 @@ import org.osgi.service.cdi.annotations.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardContextSelect {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardContextSelect> implements HttpWhiteboardContextSelect {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String value) {
+ return new Literal(value);
+ }
+
+ private Literal(String value) {
+ _value = value;
+ }
+
+ @Override
+ public String value() {
+ return _value;
+ }
+
+ private final String _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterAsyncSupported.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterAsyncSupported.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterAsyncSupported.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterAsyncSupported.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
@@ -37,6 +41,27 @@ import org.osgi.service.cdi.annotations.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardFilterAsyncSupported {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardFilterAsyncSupported> implements HttpWhiteboardFilterAsyncSupported {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(boolean value) {
+ return new Literal(value);
+ }
+
+ private Literal(boolean value) {
+ _value = value;
+ }
+
+ @Override
+ public boolean asyncSupported() {
+ return _value;
+ }
+
+ private final boolean _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterDispatcher.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterDispatcher.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterDispatcher.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterDispatcher.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,15 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
import javax.servlet.DispatcherType;
import org.osgi.service.cdi.annotations.BeanPropertyType;
@@ -39,6 +42,27 @@ import org.osgi.service.cdi.annotations.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardFilterDispatcher {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardFilterDispatcher> implements HttpWhiteboardFilterDispatcher {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(DispatcherType[] value) {
+ return new Literal(value);
+ }
+
+ private Literal(DispatcherType[] value) {
+ _value = value;
+ }
+
+ @Override
+ public DispatcherType[] value() {
+ return _value;
+ }
+
+ private final DispatcherType[] _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterName.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterName.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterName.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterName.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
@@ -37,6 +41,27 @@ import org.osgi.service.cdi.annotations.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardFilterName {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardFilterName> implements HttpWhiteboardFilterName {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String value) {
+ return new Literal(value);
+ }
+
+ private Literal(String value) {
+ _value = value;
+ }
+
+ @Override
+ public String value() {
+ return _value;
+ }
+
+ private final String _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterPattern.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterPattern.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterPattern.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterPattern.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
@@ -41,6 +43,27 @@ import org.osgi.service.http.whiteboard.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardFilterPattern {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardFilterPattern> implements HttpWhiteboardFilterPattern {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String[] value) {
+ return new Literal(value);
+ }
+
+ private Literal(String[] value) {
+ _value = value;
+ }
+
+ @Override
+ public String[] value() {
+ return _value;
+ }
+
+ private final String[] _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterRegex.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterRegex.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterRegex.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterRegex.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
@@ -41,6 +43,27 @@ import org.osgi.service.http.whiteboard.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardFilterRegex {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardFilterRegex> implements HttpWhiteboardFilterRegex {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String[] value) {
+ return new Literal(value);
+ }
+
+ private Literal(String[] value) {
+ _value = value;
+ }
+
+ @Override
+ public String[] value() {
+ return _value;
+ }
+
+ private final String[] _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterServlet.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterServlet.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterServlet.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterServlet.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
@@ -41,6 +43,27 @@ import org.osgi.service.http.whiteboard.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardFilterServlet {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardFilterServlet> implements HttpWhiteboardFilterServlet {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String[] value) {
+ return new Literal(value);
+ }
+
+ private Literal(String[] value) {
+ _value = value;
+ }
+
+ @Override
+ public String[] value() {
+ return _value;
+ }
+
+ private final String[] _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardListener.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardListener.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardListener.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardListener.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
@@ -41,6 +43,15 @@ import org.osgi.service.http.whiteboard.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardListener {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardListener> implements HttpWhiteboardListener {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal INSTANCE = new Literal();
+
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardResource.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardResource.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardResource.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardResource.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
@@ -42,6 +44,34 @@ import org.osgi.service.http.whiteboard.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardResource {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardResource> implements HttpWhiteboardResource {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String[] pattern, String prefix) {
+ return new Literal(pattern, prefix);
+ }
+
+ private Literal(String[] pattern, String path) {
+ _pattern = pattern;
+ _prefix = path;
+ }
+
+ @Override
+ public String[] pattern() {
+ return _pattern;
+ }
+
+ @Override
+ public String prefix() {
+ return _prefix;
+ }
+
+ private final String[] _pattern;
+ private final String _prefix;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletAsyncSupported.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletAsyncSupported.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletAsyncSupported.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletAsyncSupported.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
@@ -37,6 +41,27 @@ import org.osgi.service.cdi.annotations.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardServletAsyncSupported {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardServletAsyncSupported> implements HttpWhiteboardServletAsyncSupported {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(boolean value) {
+ return new Literal(value);
+ }
+
+ private Literal(boolean value) {
+ _value = value;
+ }
+
+ @Override
+ public boolean asyncSupported() {
+ return _value;
+ }
+
+ private final boolean _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletErrorPage.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletErrorPage.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletErrorPage.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletErrorPage.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
@@ -41,6 +43,27 @@ import org.osgi.service.http.whiteboard.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardServletErrorPage {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardServletErrorPage> implements HttpWhiteboardServletErrorPage {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String[] errorPage) {
+ return new Literal(errorPage);
+ }
+
+ private Literal(String[] errorPage) {
+ _errorPage = errorPage;
+ }
+
+ @Override
+ public String[] errorPage() {
+ return _errorPage;
+ }
+
+ private final String[] _errorPage;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletMultipart.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletMultipart.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletMultipart.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletMultipart.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
@@ -50,6 +54,67 @@ import org.osgi.service.cdi.annotations.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardServletMultipart {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardServletMultipart> implements HttpWhiteboardServletMultipart {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(
+ boolean enabled,
+ int fileSizeThreshold,
+ String location,
+ long maxFileSize,
+ long maxRequestSize) {
+
+ return new Literal(enabled, fileSizeThreshold, location, maxFileSize, maxRequestSize);
+ }
+
+ public Literal(
+ boolean enabled,
+ int fileSizeThreshold,
+ String location,
+ long maxFileSize,
+ long maxRequestSize) {
+
+ _enabled = enabled;
+ _fileSizeThreshold = fileSizeThreshold;
+ _location = location;
+ _maxFileSize = maxFileSize;
+ _maxRequestSize = maxRequestSize;
+ }
+
+ @Override
+ public boolean enabled() {
+ return _enabled;
+ }
+
+ @Override
+ public int fileSizeThreshold() {
+ return _fileSizeThreshold;
+ }
+
+ @Override
+ public String location() {
+ return _location;
+ }
+
+ @Override
+ public long maxFileSize() {
+ return _maxFileSize;
+ }
+
+ @Override
+ public long maxRequestSize() {
+ return _maxRequestSize;
+ }
+
+ private final boolean _enabled;
+ private final int _fileSizeThreshold;
+ private final String _location;
+ private final long _maxFileSize;
+ private final long _maxRequestSize;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletName.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletName.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletName.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletName.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
@@ -41,6 +43,27 @@ import org.osgi.service.http.whiteboard.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardServletName {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardServletName> implements HttpWhiteboardServletName {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String value) {
+ return new Literal(value);
+ }
+
+ private Literal(String value) {
+ _value = value;
+ }
+
+ @Override
+ public String value() {
+ return _value;
+ }
+
+ private final String _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletPattern.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletPattern.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletPattern.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletPattern.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
@@ -41,6 +43,27 @@ import org.osgi.service.http.whiteboard.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardServletPattern {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardServletPattern> implements HttpWhiteboardServletPattern {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String[] value) {
+ return new Literal(value);
+ }
+
+ private Literal(String[] value) {
+ _value = value;
+ }
+
+ @Override
+ public String[] value() {
+ return _value;
+ }
+
+ private final String[] _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardTarget.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardTarget.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardTarget.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardTarget.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
@@ -37,6 +41,27 @@ import org.osgi.service.cdi.annotations.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardTarget {
+
+ public static final class Literal extends AnnotationLiteral<HttpWhiteboardTarget> implements HttpWhiteboardTarget {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String value) {
+ return new Literal(value);
+ }
+
+ private Literal(String value) {
+ _value = value;
+ }
+
+ @Override
+ public String value() {
+ return _value;
+ }
+
+ private final String _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JSONRequired.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JSONRequired.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JSONRequired.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JSONRequired.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,6 +27,8 @@ import static org.osgi.resource.Namespac
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.annotation.bundle.Requirement;
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants;
@@ -52,6 +54,27 @@ import org.osgi.service.jaxrs.whiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface JSONRequired {
+
+ public static final class Literal extends AnnotationLiteral<JSONRequired> implements JSONRequired {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String osgi_jaxrs_extension_select) {
+ return new Literal(osgi_jaxrs_extension_select);
+ }
+
+ private Literal(String osgi_jaxrs_extension_select) {
+ _osgi_jaxrs_extension_select = osgi_jaxrs_extension_select;
+ }
+
+ @Override
+ public String osgi_jaxrs_extension_select() {
+ return _osgi_jaxrs_extension_select;
+ }
+
+ private final String _osgi_jaxrs_extension_select;
+ }
+
/**
* A filter requiring an <code>osgi.jaxrs.media.type</code> of
* <code>application/json</code>
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.jaxrs.whiteboard.annotations.RequireJaxrsWhiteboard;
@@ -41,6 +43,27 @@ import org.osgi.service.jaxrs.whiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface JaxrsApplicationBase {
+
+ public static final class Literal extends AnnotationLiteral<JaxrsApplicationBase> implements JaxrsApplicationBase {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String value) {
+ return new Literal(value);
+ }
+
+ private Literal(String value) {
+ _value = value;
+ }
+
+ @Override
+ public String value() {
+ return _value;
+ }
+
+ private final String _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationSelect.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationSelect.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationSelect.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationSelect.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
@@ -37,6 +41,27 @@ import org.osgi.service.cdi.annotations.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface JaxrsApplicationSelect {
+
+ public static final class Literal extends AnnotationLiteral<JaxrsApplicationSelect> implements JaxrsApplicationSelect {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String value) {
+ return new Literal(value);
+ }
+
+ private Literal(String value) {
+ _value = value;
+ }
+
+ @Override
+ public String value() {
+ return _value;
+ }
+
+ private final String _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtension.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtension.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtension.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtension.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.jaxrs.whiteboard.annotations.RequireJaxrsWhiteboard;
@@ -40,6 +42,15 @@ import org.osgi.service.jaxrs.whiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface JaxrsExtension {
+
+ public static final class Literal extends AnnotationLiteral<JaxrsExtension> implements JaxrsExtension {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal INSTANCE = new Literal();
+
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtensionSelect.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtensionSelect.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtensionSelect.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtensionSelect.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
@@ -37,6 +41,27 @@ import org.osgi.service.cdi.annotations.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface JaxrsExtensionSelect {
+
+ public static final class Literal extends AnnotationLiteral<JaxrsExtensionSelect> implements JaxrsExtensionSelect {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String[] value) {
+ return new Literal(value);
+ }
+
+ private Literal(String[] value) {
+ _value = value;
+ }
+
+ @Override
+ public String[] value() {
+ return _value;
+ }
+
+ private final String[] _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsMediaType.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsMediaType.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsMediaType.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsMediaType.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
@@ -37,6 +41,27 @@ import org.osgi.service.cdi.annotations.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface JaxrsMediaType {
+
+ public static final class Literal extends AnnotationLiteral<JaxrsMediaType> implements JaxrsMediaType {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String[] value) {
+ return new Literal(value);
+ }
+
+ private Literal(String[] value) {
+ _value = value;
+ }
+
+ @Override
+ public String[] value() {
+ return _value;
+ }
+
+ private final String[] _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsName.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsName.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsName.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsName.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
@@ -35,6 +39,27 @@ import org.osgi.service.cdi.annotations.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface JaxrsName {
+
+ public static final class Literal extends AnnotationLiteral<JaxrsName> implements JaxrsName {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String value) {
+ return new Literal(value);
+ }
+
+ private Literal(String value) {
+ _value = value;
+ }
+
+ @Override
+ public String value() {
+ return _value;
+ }
+
+ private final String _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsResource.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsResource.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsResource.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsResource.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.jaxrs.whiteboard.annotations.RequireJaxrsWhiteboard;
@@ -39,6 +41,15 @@ import org.osgi.service.jaxrs.whiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface JaxrsResource {
+
+ public static final class Literal extends AnnotationLiteral<JaxrsResource> implements JaxrsResource {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal INSTANCE = new Literal();
+
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsWhiteboardTarget.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsWhiteboardTarget.java?rev=1851981&r1=1851980&r2=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsWhiteboardTarget.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsWhiteboardTarget.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
package org.apache.aries.cdi.extra.propertytypes;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
@@ -37,6 +41,27 @@ import org.osgi.service.cdi.annotations.
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface JaxrsWhiteboardTarget {
+
+ public static final class Literal extends AnnotationLiteral<JaxrsWhiteboardTarget> implements JaxrsWhiteboardTarget {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String value) {
+ return new Literal(value);
+ }
+
+ private Literal(String value) {
+ _value = value;
+ }
+
+ @Override
+ public String value() {
+ return _value;
+ }
+
+ private final String _value;
+ }
+
/**
* Prefix for the property name. This value is prepended to each property
* name.
Copied: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceDescription.java (from r1851775, aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java)
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceDescription.java?p2=aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceDescription.java&p1=aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java&r1=1851775&r2=1851981&rev=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceDescription.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,41 +18,54 @@ package org.apache.aries.cdi.extra.prope
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.osgi.framework.Constants;
import org.osgi.service.cdi.annotations.BeanPropertyType;
-import org.osgi.service.jaxrs.whiteboard.annotations.RequireJaxrsWhiteboard;
/**
- * Component Property Type for the {@code osgi.jaxrs.application.base} service
- * property.
+ * Bean Property Type for the {@code service.description} service property.
* <p>
- * This annotation can be used on a JAX-RS resource or extension to declare the
- * value of the
- * {@link org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants#JAX_RS_APPLICATION_BASE}
- * service property.
+ * This annotation can be used as defined by {@link BeanPropertyType} to declare
+ * the value the {@link Constants#SERVICE_DESCRIPTION} service property.
*/
@BeanPropertyType
-@RequireJaxrsWhiteboard
@Retention(RUNTIME)
-@Target({FIELD, METHOD, TYPE})
-public @interface JaxrsApplicationBase {
- /**
- * Prefix for the property name. This value is prepended to each property
- * name.
- */
- String PREFIX_ = "osgi.";
+@Target({ TYPE, FIELD, METHOD, PARAMETER })
+public @interface ServiceDescription {
+
+ public static final class Literal extends AnnotationLiteral<ServiceDescription> implements ServiceDescription {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String value) {
+ return new Literal(value);
+ }
+
+ private Literal(String value) {
+ _value = value;
+ }
+
+ @Override
+ public String value() {
+ return _value;
+ }
+
+ private final String _value;
+ }
/**
- * Service property providing a base context URI for a JAX-RS whiteboard
- * application.
+ * Service property identifying a service's description.
*
- * @return The base URI for this application.
- * @see org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants#JAX_RS_APPLICATION_BASE
+ * @return The service description.
+ * @see Constants#SERVICE_DESCRIPTION
*/
String value();
}
Copied: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceRanking.java (from r1851775, aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java)
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceRanking.java?p2=aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceRanking.java&p1=aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java&r1=1851775&r2=1851981&rev=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceRanking.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,41 +18,54 @@ package org.apache.aries.cdi.extra.prope
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.osgi.framework.Constants;
import org.osgi.service.cdi.annotations.BeanPropertyType;
-import org.osgi.service.jaxrs.whiteboard.annotations.RequireJaxrsWhiteboard;
/**
- * Component Property Type for the {@code osgi.jaxrs.application.base} service
- * property.
+ * Bean Property Type for the {@code service.ranking} service property.
* <p>
- * This annotation can be used on a JAX-RS resource or extension to declare the
- * value of the
- * {@link org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants#JAX_RS_APPLICATION_BASE}
- * service property.
+ * This annotation can be used as defined by {@link BeanPropertyType} to declare
+ * the value of the {@link Constants#SERVICE_RANKING} service property.
*/
@BeanPropertyType
-@RequireJaxrsWhiteboard
@Retention(RUNTIME)
-@Target({FIELD, METHOD, TYPE})
-public @interface JaxrsApplicationBase {
- /**
- * Prefix for the property name. This value is prepended to each property
- * name.
- */
- String PREFIX_ = "osgi.";
+@Target({ TYPE, FIELD, METHOD, PARAMETER })
+public @interface ServiceRanking {
+
+ public static final class Literal extends AnnotationLiteral<ServiceRanking> implements ServiceRanking {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(int value) {
+ return new Literal(value);
+ }
+
+ private Literal(int value) {
+ _value = value;
+ }
+
+ @Override
+ public int value() {
+ return _value;
+ }
+
+ private final int _value;
+ }
/**
- * Service property providing a base context URI for a JAX-RS whiteboard
- * application.
+ * Service property identifying a service's ranking.
*
- * @return The base URI for this application.
- * @see org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants#JAX_RS_APPLICATION_BASE
+ * @return The service ranking.
+ * @see Constants#SERVICE_RANKING
*/
- String value();
+ int value();
}
Copied: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceVendor.java (from r1851775, aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContextSelect.java)
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceVendor.java?p2=aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceVendor.java&p1=aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContextSelect.java&r1=1851775&r2=1851981&rev=1851981&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContextSelect.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceVendor.java Wed Jan 23 21:00:38 2019
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2017, 2018). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2017, 2019). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,40 +18,54 @@ package org.apache.aries.cdi.extra.prope
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.osgi.framework.Constants;
import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
- * Component Property Type for the {@code osgi.http.whiteboard.context.select}
- * service property.
+ * Bean Property Type for the {@code service.vendor} service property.
* <p>
- * This annotation can be used on a Http Whiteboard component to declare the
- * value of the
- * {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_CONTEXT_SELECT
- * HTTP_WHITEBOARD_CONTEXT_SELECT} service property.
+ * This annotation can be used as defined by {@link BeanPropertyType} to declare
+ * the value of the {@link Constants#SERVICE_VENDOR} service property.
*/
@BeanPropertyType
@Retention(RUNTIME)
-@Target({FIELD, METHOD, TYPE})
-public @interface HttpWhiteboardContextSelect {
- /**
- * Prefix for the property name. This value is prepended to each property
- * name.
- */
- String PREFIX_ = "osgi.";
+@Target({ TYPE, FIELD, METHOD, PARAMETER })
+public @interface ServiceVendor {
+
+ public static final class Literal extends AnnotationLiteral<ServiceVendor> implements ServiceVendor {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final Literal of(String value) {
+ return new Literal(value);
+ }
+
+ private Literal(String value) {
+ _value = value;
+ }
+
+ @Override
+ public String value() {
+ return _value;
+ }
+
+ private final String _value;
+ }
/**
- * Service property identifying the select property of a Http Whiteboard
- * component.
+ * Service property identifying a service's vendor.
*
- * @return The filter expression.
- * @see org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_CONTEXT_SELECT
- * HTTP_WHITEBOARD_CONTEXT_SELECT
+ * @return The service vendor.
+ * @see Constants#SERVICE_VENDOR
*/
String value();
}