Author: timothyjward
Date: Mon Jul 13 15:18:13 2015
New Revision: 1690716
URL: http://svn.apache.org/r1690716
Log:
Add ASL v2 headers to the async service
Modified:
aries/trunk/async/async-api/src/main/java/org/osgi/service/async/Async.java
aries/trunk/async/async-api/src/main/java/org/osgi/service/async/delegate/AsyncDelegate.java
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/Activator.java
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/AsyncService.java
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/AsyncServiceFactory.java
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/FireAndForgetWork.java
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/MethodCall.java
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/TrackingInvocationHandler.java
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/Work.java
aries/trunk/async/async-impl/src/test/java/org/apache/aries/async/impl/AsyncServiceTest.java
aries/trunk/async/promise-api/pom.xml
aries/trunk/async/promise-api/src/main/java/org/apache/aries/async/promise/PromiseImpl.java
aries/trunk/async/promise-api/src/main/java/org/osgi/util/function/Function.java
aries/trunk/async/promise-api/src/main/java/org/osgi/util/function/Predicate.java
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Deferred.java
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/FailedPromisesException.java
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Failure.java
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Promise.java
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Promises.java
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Success.java
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/CallbackTest.java
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/ChainTest.java
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/DeferredTest.java
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/FunctionTest.java
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/PromisesTest.java
Modified:
aries/trunk/async/async-api/src/main/java/org/osgi/service/async/Async.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/async-api/src/main/java/org/osgi/service/async/Async.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
--- aries/trunk/async/async-api/src/main/java/org/osgi/service/async/Async.java
(original)
+++ aries/trunk/async/async-api/src/main/java/org/osgi/service/async/Async.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance 2015. 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.osgi.service.async;
import org.osgi.annotation.versioning.ProviderType;
Modified:
aries/trunk/async/async-api/src/main/java/org/osgi/service/async/delegate/AsyncDelegate.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/async-api/src/main/java/org/osgi/service/async/delegate/AsyncDelegate.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/async-api/src/main/java/org/osgi/service/async/delegate/AsyncDelegate.java
(original)
+++
aries/trunk/async/async-api/src/main/java/org/osgi/service/async/delegate/AsyncDelegate.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance 2015. 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.osgi.service.async.delegate;
import java.lang.reflect.Method;
Modified:
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/Activator.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/Activator.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/Activator.java
(original)
+++
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/Activator.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.aries.async.impl;
import java.security.AccessController;
Modified:
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/AsyncService.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/AsyncService.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/AsyncService.java
(original)
+++
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/AsyncService.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.aries.async.impl;
import java.lang.reflect.Method;
Modified:
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/AsyncServiceFactory.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/AsyncServiceFactory.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/AsyncServiceFactory.java
(original)
+++
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/AsyncServiceFactory.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.aries.async.impl;
import java.util.concurrent.ExecutorService;
Modified:
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/FireAndForgetWork.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/FireAndForgetWork.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/FireAndForgetWork.java
(original)
+++
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/FireAndForgetWork.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.aries.async.impl;
import java.lang.reflect.InvocationTargetException;
Modified:
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/MethodCall.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/MethodCall.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/MethodCall.java
(original)
+++
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/MethodCall.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.aries.async.impl;
import java.lang.reflect.Method;
Modified:
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/TrackingInvocationHandler.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/TrackingInvocationHandler.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/TrackingInvocationHandler.java
(original)
+++
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/TrackingInvocationHandler.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.aries.async.impl;
import java.lang.reflect.InvocationHandler;
Modified:
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/Work.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/Work.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/Work.java
(original)
+++
aries/trunk/async/async-impl/src/main/java/org/apache/aries/async/impl/Work.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.aries.async.impl;
import java.lang.reflect.InvocationTargetException;
Modified:
aries/trunk/async/async-impl/src/test/java/org/apache/aries/async/impl/AsyncServiceTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/async-impl/src/test/java/org/apache/aries/async/impl/AsyncServiceTest.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/async-impl/src/test/java/org/apache/aries/async/impl/AsyncServiceTest.java
(original)
+++
aries/trunk/async/async-impl/src/test/java/org/apache/aries/async/impl/AsyncServiceTest.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.aries.async.impl;
import static org.junit.Assert.assertTrue;
Modified: aries/trunk/async/promise-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/pom.xml?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
--- aries/trunk/async/promise-api/pom.xml (original)
+++ aries/trunk/async/promise-api/pom.xml Mon Jul 13 15:18:13 2015
@@ -66,6 +66,11 @@
<version>1.0.0</version>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>6.0.1</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified:
aries/trunk/async/promise-api/src/main/java/org/apache/aries/async/promise/PromiseImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/src/main/java/org/apache/aries/async/promise/PromiseImpl.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/promise-api/src/main/java/org/apache/aries/async/promise/PromiseImpl.java
(original)
+++
aries/trunk/async/promise-api/src/main/java/org/apache/aries/async/promise/PromiseImpl.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.aries.async.promise;
import org.osgi.util.function.Function;
Modified:
aries/trunk/async/promise-api/src/main/java/org/osgi/util/function/Function.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/src/main/java/org/osgi/util/function/Function.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/promise-api/src/main/java/org/osgi/util/function/Function.java
(original)
+++
aries/trunk/async/promise-api/src/main/java/org/osgi/util/function/Function.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance 2015. 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.osgi.util.function;
/**
@@ -8,7 +23,7 @@ package org.osgi.util.function;
* @param <T> The type of the function input.
* @param <R> The type of the function output.
*/
-//@org.osgi.annotation.versioning.ConsumerType
[email protected]
public interface Function<T, R> {
/**
Modified:
aries/trunk/async/promise-api/src/main/java/org/osgi/util/function/Predicate.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/src/main/java/org/osgi/util/function/Predicate.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/promise-api/src/main/java/org/osgi/util/function/Predicate.java
(original)
+++
aries/trunk/async/promise-api/src/main/java/org/osgi/util/function/Predicate.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance 2015. 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.osgi.util.function;
/**
@@ -7,7 +22,7 @@ package org.osgi.util.function;
*
* @param <T> The type of the predicate input.
*/
-//@org.osgi.annotation.versioning.ConsumerType
[email protected]
public interface Predicate<T> {
/**
* Evaluates this predicate on the specified argument.
Modified:
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Deferred.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Deferred.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Deferred.java
(original)
+++
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Deferred.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance 2015. 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.osgi.util.promise;
import org.apache.aries.async.promise.PromiseImpl;
Modified:
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/FailedPromisesException.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/FailedPromisesException.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/FailedPromisesException.java
(original)
+++
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/FailedPromisesException.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance 2015. 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.osgi.util.promise;
import java.util.Collection;
Modified:
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Failure.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Failure.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Failure.java
(original)
+++
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Failure.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance 2015. 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.osgi.util.promise;
/**
@@ -7,7 +22,7 @@ package org.osgi.util.promise;
* <p>
* This is a functional interface and can be used as the assignment target for
a lambda expression or method reference.
*/
-//@org.osgi.annotation.versioning.ConsumerType
[email protected]
public interface Failure {
/**
* Failure callback for a Promise.
Modified:
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Promise.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Promise.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Promise.java
(original)
+++
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Promise.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance 2015. 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.osgi.util.promise;
import org.osgi.util.function.Function;
@@ -43,7 +58,7 @@ import java.lang.reflect.InvocationTarge
*
* @param <T> The value type associated with this Promise.
*/
-//@org.osgi.annotation.versioning.ProviderType
[email protected]
public interface Promise<T> {
/**
* Returns whether this Promise has been resolved.
Modified:
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Promises.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Promises.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Promises.java
(original)
+++
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Promises.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance 2015. 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.osgi.util.promise;
import java.util.ArrayList;
Modified:
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Success.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Success.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Success.java
(original)
+++
aries/trunk/async/promise-api/src/main/java/org/osgi/util/promise/Success.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance 2015. 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.osgi.util.promise;
/**
@@ -10,7 +25,7 @@ package org.osgi.util.promise;
* @param <T> The value type of the resolved Promise passed as input to this
callback.
* @param <R> The value type of the returned Promise from this callback.
*/
-//@org.osgi.annotation.versioning.ConsumerType
[email protected]
public interface Success<T,R> {
/**
* Success callback for a Promise.
Modified:
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/CallbackTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/CallbackTest.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/CallbackTest.java
(original)
+++
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/CallbackTest.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.aries.async.promise.test;
import org.osgi.util.promise.Deferred;
Modified:
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/ChainTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/ChainTest.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/ChainTest.java
(original)
+++
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/ChainTest.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.aries.async.promise.test;
import org.junit.Test;
Modified:
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/DeferredTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/DeferredTest.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/DeferredTest.java
(original)
+++
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/DeferredTest.java
Mon Jul 13 15:18:13 2015
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.aries.async.promise.test;
import org.osgi.util.promise.Deferred;
Modified:
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/FunctionTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/FunctionTest.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/FunctionTest.java
(original)
+++
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/FunctionTest.java
Mon Jul 13 15:18:13 2015
@@ -1,5 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.aries.async.promise.test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.NoSuchElementException;
+
import org.junit.Test;
import org.osgi.util.function.Function;
import org.osgi.util.function.Predicate;
@@ -7,12 +30,6 @@ import org.osgi.util.promise.Deferred;
import org.osgi.util.promise.Promise;
import org.osgi.util.promise.Promises;
-import java.util.NoSuchElementException;
-import java.util.concurrent.CountDownLatch;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
public class FunctionTest {
@Test
Modified:
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/PromisesTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/PromisesTest.java?rev=1690716&r1=1690715&r2=1690716&view=diff
==============================================================================
---
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/PromisesTest.java
(original)
+++
aries/trunk/async/promise-api/src/test/java/org/apache/aries/async/promise/test/PromisesTest.java
Mon Jul 13 15:18:13 2015
@@ -1,16 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.aries.async.promise.test;
-import org.osgi.util.promise.Deferred;
-import org.osgi.util.promise.FailedPromisesException;
-import org.osgi.util.promise.Promise;
-import org.osgi.util.promise.Promises;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import static org.junit.Assert.*;
+import org.junit.Test;
+import org.osgi.util.promise.Deferred;
+import org.osgi.util.promise.FailedPromisesException;
+import org.osgi.util.promise.Promise;
+import org.osgi.util.promise.Promises;
public class PromisesTest {
@@ -57,7 +77,6 @@ public class PromisesTest {
Promise<List<String>> latch = null;
if (!preResolve) {
- @SuppressWarnings("unchecked")
Promise<List<String>> latch2 = Promises.all(pv);
latch = latch2;
@@ -80,7 +99,6 @@ public class PromisesTest {
}
if (preResolve) {
- @SuppressWarnings("unchecked")
Promise<List<String>> latch2 = Promises.all(pv);
latch = latch2;
}
