MERGE PREP: Renamed ResourceSet.resource() to .get()

rickbw · rickbw · commit 0315df67f14c · 2015-06-13T14:31:14.000-07:00
...to match the convention in branch "master".
diff --git a/src/main/java/crud/core/ReadableResourceSet.java b/src/main/java/crud/core/ReadableResourceSet.java
@@ -40,7 +40,7 @@ public interface ReadableResourceSet<K, E> extends ResourceSet<K, E> {
      *              {@link ReadableResourceSet}.
      */
     @Override
-    public @Nonnull ReadableResource<E> resource(@Nonnull K key, @Nonnull Session session);
+    public @Nonnull ReadableResource<E> get(@Nonnull K key, @Nonnull Session session);
 
 
     /**
diff --git a/src/main/java/crud/core/ResourceSet.java b/src/main/java/crud/core/ResourceSet.java
@@ -46,7 +46,7 @@ public interface ResourceSet<K, E> {
      *              obtained from a {@link DataBus} compatible with this
      *              {@link WritableResourceSet}.
      */
-    public @Nonnull Resource resource(@Nonnull K key, @Nonnull Session session);
+    public @Nonnull Resource get(@Nonnull K key, @Nonnull Session session);
 
 
     /**
diff --git a/src/main/java/crud/core/WritableResourceSet.java b/src/main/java/crud/core/WritableResourceSet.java
@@ -42,7 +42,7 @@ public interface WritableResourceSet<K, E, R> extends ResourceSet<K, E> {
      *              {@link WritableResourceSet}.
      */
     @Override
-    public @Nonnull WritableResource<E, R> resource(@Nonnull K key, @Nonnull Session session);
+    public @Nonnull WritableResource<E, R> get(@Nonnull K key, @Nonnull Session session);
 
 
     /**
diff --git a/src/main/java/crud/jdbc/ReadableTable.java b/src/main/java/crud/jdbc/ReadableTable.java
@@ -27,7 +27,7 @@ public ReadableTable(final ReadableResourceSet.Id<StatementTemplate, ResultSetRo
     }
 
     @Override
-    public ReadableResource<ResultSetRow> resource(final StatementTemplate query, final Session session) {
+    public ReadableResource<ResultSetRow> get(final StatementTemplate query, final Session session) {
         final JdbcSession jdbcSession = (JdbcSession) session;
         return jdbcSession.readableResource(query);
     }
diff --git a/src/main/java/crud/jdbc/WritableTable.java b/src/main/java/crud/jdbc/WritableTable.java
@@ -28,7 +28,7 @@ public WritableTable(final WritableResourceSet.Id<StatementTemplate, StatementPa
     }
 
     @Override
-    public WritableResource<StatementParameters, Integer> resource(final StatementTemplate query, final Session session) {
+    public WritableResource<StatementParameters, Integer> get(final StatementTemplate query, final Session session) {
         final JdbcSession jdbcSession = (JdbcSession) session;
         return jdbcSession.writableResource(query);
     }
diff --git a/src/main/java/crud/jms/MessageConsumingResourceSet.java b/src/main/java/crud/jms/MessageConsumingResourceSet.java
@@ -48,7 +48,7 @@ public ReadableResourceSet.Id<String, M> getId() {
 
     @Override
     @SuppressWarnings("resource")
-    public ReadableResource<M> resource(final String key, final Session session) {
+    public ReadableResource<M> get(final String key, final Session session) {
         final SessionWrapper sessionImpl = (SessionWrapper) session;
         final javax.jms.Session realSession = sessionImpl.getDelegate();
         try {
diff --git a/src/main/java/crud/jms/MessageProducingResourceSet.java b/src/main/java/crud/jms/MessageProducingResourceSet.java
@@ -53,7 +53,7 @@ public WritableResourceSet.Id<String, M, Void> getId() {
 
     @SuppressWarnings("resource")
     @Override
-    public WritableResource<M, Void> resource(final String key, final Session session) {
+    public WritableResource<M, Void> get(final String key, final Session session) {
         if (!key.isEmpty()) {
             log.warn("Ignoring key {}", key);
         }
diff --git a/src/main/java/crud/sync/SyncReadableResourceSet.java b/src/main/java/crud/sync/SyncReadableResourceSet.java
@@ -41,11 +41,11 @@ public SyncReadableResourceSet(@Nonnull final ReadableResourceSet<K, E> delegate
     }
 
     /**
-     * @see ReadableResourceSet#resource(Object, Session)
+     * @see ReadableResourceSet#get(Object, Session)
      */
     @Override
-    public @Nonnull SyncReadableResource<E> resource(@Nonnull final K key, @Nonnull final SyncSession session) {
-        final ReadableResource<E> delegateSource = getDelegate().resource(key, session.getDelegate());
+    public @Nonnull SyncReadableResource<E> get(@Nonnull final K key, @Nonnull final SyncSession session) {
+        final ReadableResource<E> delegateSource = getDelegate().get(key, session.getDelegate());
         return new SyncReadableResource<>(delegateSource);
     }
 
diff --git a/src/main/java/crud/sync/SyncResourceSet.java b/src/main/java/crud/sync/SyncResourceSet.java
@@ -32,9 +32,9 @@ public abstract class SyncResourceSet<K, E, D extends ResourceSet<K, E>>
     public abstract @Nonnull ResourceSet.Id<K, E> getId();
 
     /**
-     * @see ResourceSet#resource(Object, Session)
+     * @see ResourceSet#get(Object, Session)
      */
-    public abstract @Nonnull SyncResource<?> resource(
+    public abstract @Nonnull SyncResource<?> get(
             @Nonnull final K key,
             @Nonnull final SyncSession session);
 
diff --git a/src/main/java/crud/sync/SyncWritableResourceSet.java b/src/main/java/crud/sync/SyncWritableResourceSet.java
@@ -41,11 +41,11 @@ public SyncWritableResourceSet(@Nonnull final WritableResourceSet<K, E, R> deleg
     }
 
     /**
-     * @see WritableResourceSet#resource(Object, Session)
+     * @see WritableResourceSet#get(Object, Session)
      */
     @Override
-    public @Nonnull SyncWritableResource<E, R> resource(@Nonnull final K key, @Nonnull final SyncSession session) {
-        final WritableResource<E, R> delegate = getDelegate().resource(key, session.getDelegate());
+    public @Nonnull SyncWritableResource<E, R> get(@Nonnull final K key, @Nonnull final SyncSession session) {
+        final WritableResource<E, R> delegate = getDelegate().get(key, session.getDelegate());
         return new SyncWritableResource<>(delegate);
     }
 
diff --git a/src/test/java/crud/core/example/DataSourceExampleApp.java b/src/test/java/crud/core/example/DataSourceExampleApp.java
@@ -57,7 +57,7 @@ public static void main(final String... args) throws Exception {
                         break;
                     }
 
-                    try (SyncReadableResource<String> echoDataSource = echoResourceSet.resource(echoMe, session)) {
+                    try (SyncReadableResource<String> echoDataSource = echoResourceSet.get(echoMe, session)) {
                         for (final String value : echoDataSource.read()) {
                             System.out.println("You typed: " + value);
                         }
diff --git a/src/test/java/crud/core/example/EchoReadableResourceSet.java b/src/test/java/crud/core/example/EchoReadableResourceSet.java
@@ -27,7 +27,7 @@ public EchoReadableResourceSet(final ReadableResourceSet.Id<T, T> id) {
     }
 
     @Override
-    public ReadableResource<T> resource(final T key, final Session session) {
+    public ReadableResource<T> get(final T key, final Session session) {
         return new EchoReadableResource<>(((ExampleSession) session).worker(), key);
     }
 
diff --git a/src/test/java/crud/core/example/PrintingResourceSet.java b/src/test/java/crud/core/example/PrintingResourceSet.java
@@ -29,7 +29,7 @@ public PrintingResourceSet(final WritableResourceSet.Id<Writer, String, Integer>
     }
 
     @Override
-    public WritableResource<String, Integer> resource(final Writer writer, final Session session) {
+    public WritableResource<String, Integer> get(final Writer writer, final Session session) {
         return new PrintingWritableResource(writer, ((ExampleSession) session).worker());
     }
 
diff --git a/src/test/java/crud/core/example/WritableResourceExampleApp.java b/src/test/java/crud/core/example/WritableResourceExampleApp.java
@@ -62,7 +62,7 @@ public static void main(final String... args) throws Exception {
                         break;
                     }
 
-                    try (SyncWritableResource<String, Integer> echoDataSource = echoResourcesSet.resource(writer, session)) {
+                    try (SyncWritableResource<String, Integer> echoDataSource = echoResourcesSet.get(writer, session)) {
                         for (final Integer nBytes : echoDataSource.write(echoMe)) {
                             // Expect just one
                             System.out.println("Printed " + nBytes + " bytes.");

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public ReadableTable(final ReadableResourceSet.Id<StatementTemplate, ResultSetRo`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`30`		`- public ReadableResource<ResultSetRow> resource(final StatementTemplate query, final Session session) {`
	`30`	`+ public ReadableResource<ResultSetRow> get(final StatementTemplate query, final Session session) {`
`31`	`31`	`final JdbcSession jdbcSession = (JdbcSession) session;`
`32`	`32`	`return jdbcSession.readableResource(query);`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public WritableTable(final WritableResourceSet.Id<StatementTemplate, StatementPa`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`
`31`		`- public WritableResource<StatementParameters, Integer> resource(final StatementTemplate query, final Session session) {`
	`31`	`+ public WritableResource<StatementParameters, Integer> get(final StatementTemplate query, final Session session) {`
`32`	`32`	`final JdbcSession jdbcSession = (JdbcSession) session;`
`33`	`33`	`return jdbcSession.writableResource(query);`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public WritableResourceSet.Id<String, M, Void> getId() {`
`53`	`53`
`54`	`54`	`@SuppressWarnings("resource")`
`55`	`55`	`@Override`
`56`		`- public WritableResource<M, Void> resource(final String key, final Session session) {`
	`56`	`+ public WritableResource<M, Void> get(final String key, final Session session) {`
`57`	`57`	`if (!key.isEmpty()) {`
`58`	`58`	`log.warn("Ignoring key {}", key);`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,11 @@ public SyncReadableResourceSet(@Nonnull final ReadableResourceSet<K, E> delegate`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`
`44`		`- * @see ReadableResourceSet#resource(Object, Session)`
	`44`	`+ * @see ReadableResourceSet#get(Object, Session)`
`45`	`45`	`*/`
`46`	`46`	`@Override`
`47`		`- public @Nonnull SyncReadableResource<E> resource(@Nonnull final K key, @Nonnull final SyncSession session) {`
`48`		`- final ReadableResource<E> delegateSource = getDelegate().resource(key, session.getDelegate());`
	`47`	`+ public @Nonnull SyncReadableResource<E> get(@Nonnull final K key, @Nonnull final SyncSession session) {`
	`48`	`+ final ReadableResource<E> delegateSource = getDelegate().get(key, session.getDelegate());`
`49`	`49`	`return new SyncReadableResource<>(delegateSource);`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,11 @@ public SyncWritableResourceSet(@Nonnull final WritableResourceSet<K, E, R> deleg`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`
`44`		`- * @see WritableResourceSet#resource(Object, Session)`
	`44`	`+ * @see WritableResourceSet#get(Object, Session)`
`45`	`45`	`*/`
`46`	`46`	`@Override`
`47`		`- public @Nonnull SyncWritableResource<E, R> resource(@Nonnull final K key, @Nonnull final SyncSession session) {`
`48`		`- final WritableResource<E, R> delegate = getDelegate().resource(key, session.getDelegate());`
	`47`	`+ public @Nonnull SyncWritableResource<E, R> get(@Nonnull final K key, @Nonnull final SyncSession session) {`
	`48`	`+ final WritableResource<E, R> delegate = getDelegate().get(key, session.getDelegate());`
`49`	`49`	`return new SyncWritableResource<>(delegate);`
`50`	`50`	`}`
`51`	`51`