Skip to content

Commit 05b562b

Browse files
author
Brian Oliver
committed
Resolves Issue ORACLETOOLS-14: Removal of Notified class (http://java.net/jira/browse/ORACLETOOLS-14)
1 parent 1eadc20 commit 05b562b

File tree

3 files changed

+3
-476
lines changed

3 files changed

+3
-476
lines changed

oracle-tools-core/src/main/java/com/oracle/tools/deferred/DeferredHelper.java

+3-34
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public static Deferred<Boolean> deferred(AtomicBoolean atomic)
109109
*/
110110
public static <T> Deferred<T> ensured(Deferred<T> deferred)
111111
{
112-
return deferred instanceof Notified || deferred instanceof Ensured ? deferred : new Ensured<T>(deferred);
112+
return deferred instanceof Ensured ? deferred : new Ensured<T>(deferred);
113113
}
114114

115115

@@ -126,7 +126,7 @@ public static <T> Deferred<T> ensured(Deferred<T> deferred,
126126
long totalRetryDuration,
127127
TimeUnit totalRetryDurationUnits)
128128
{
129-
return deferred instanceof Notified || deferred instanceof Ensured ? deferred : new Ensured<T>(deferred,
129+
return deferred instanceof Ensured ? deferred : new Ensured<T>(deferred,
130130
totalRetryDuration,
131131
totalRetryDurationUnits);
132132
}
@@ -149,7 +149,7 @@ public static <T> Deferred<T> ensured(Deferred<T> deferred,
149149
long totalRetryDuration,
150150
TimeUnit totalRetryDurationUnits)
151151
{
152-
return deferred instanceof Notified || deferred instanceof Ensured ? deferred : new Ensured<T>(deferred,
152+
return deferred instanceof Ensured ? deferred : new Ensured<T>(deferred,
153153
retryDelayDuration,
154154
retryDelayDurationUnits,
155155
totalRetryDuration,
@@ -284,37 +284,6 @@ public static <T> Cached<T> cached(Deferred<T> deferred)
284284
}
285285

286286

287-
/**
288-
* Obtains a {@link Notified} for the specified object.
289-
*
290-
* @param object the object that must be notified before it is available
291-
*
292-
* @return a {@link Notified}
293-
*/
294-
public static <T> Deferred<T> notified(T object)
295-
{
296-
return new Notified<T>(object);
297-
}
298-
299-
300-
/**
301-
* Obtains a {@link Notified} for the specified object.
302-
*
303-
* @param object the object that must be notified before
304-
* it is available
305-
* @param totalRetryDuration the maximum duration to wait to notification
306-
* @param totalRetryDurationUnits the {@link TimeUnit}s for the duration
307-
*
308-
* @return a {@link Notified}
309-
*/
310-
public static <T> Deferred<T> notified(T object,
311-
long totalRetryDuration,
312-
TimeUnit totalRetryDurationUnits)
313-
{
314-
return new Notified<T>(object, totalRetryDuration, totalRetryDurationUnits);
315-
}
316-
317-
318287
/**
319288
* Obtains a {@link Deferred} representation of a Java Future.
320289
*

oracle-tools-core/src/main/java/com/oracle/tools/deferred/Notified.java

-211
This file was deleted.

0 commit comments

Comments
 (0)