You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/09/30 10:42:36 UTC
[isis] branch v2 updated: ISIS-2158: minor: renaming SSE classes
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 84a5498 ISIS-2158: minor: renaming SSE classes
84a5498 is described below
commit 84a5498c9fb2d6202652967a0260befc6a4eb50a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Sep 30 12:42:29 2019 +0200
ISIS-2158: minor: renaming SSE classes
---
.../src/main/java/org/apache/isis/extensions/sse/IsisBootSse.java | 4 ++--
.../main/java/org/apache/isis/extensions/sse/api/SseSource.java | 2 +-
.../isis/extensions/sse/facets/SseAnnotationFacetFactory.java | 2 +-
.../sse/facets/{ObserveFacet.java => SseObserveFacet.java} | 2 +-
.../{ObserveFacetAbstract.java => SseObserveFacetAbstract.java} | 6 +++---
...ion.java => SseObserveFacetForServerSentEventsAnnotation.java} | 8 ++++----
.../sse/markup/ListeningMarkupPanelFactoriesForWicket.java | 4 ++--
.../{EventStreamServiceDefault.java => SseServiceDefault.java} | 2 +-
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/IsisBootSse.java b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/IsisBootSse.java
index 6889fd6..1546638 100644
--- a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/IsisBootSse.java
+++ b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/IsisBootSse.java
@@ -21,12 +21,12 @@ package org.apache.isis.extensions.sse;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.sse.services.EventStreamServiceDefault;
+import org.apache.isis.extensions.sse.services.SseServiceDefault;
import org.apache.isis.extensions.sse.webapp.WebModuleServerSentEvents;
@Configuration
@Import({
- EventStreamServiceDefault.class,
+ SseServiceDefault.class,
WebModuleServerSentEvents.class
})
public class IsisBootSse {
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java
index ed13cf9..aa00cbe 100644
--- a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java
+++ b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java
@@ -42,7 +42,7 @@ public interface SseSource {
public static final class Noop implements SseSource {
@Override
- public void run(SseChannel eventStream) {
+ public void run(SseChannel channel) {
// just do nothing
}
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java
index 1e909b4..a44b39d 100644
--- a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java
+++ b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java
@@ -50,7 +50,7 @@ implements MetaModelValidatorRefiner {
// else search for @???(observe=...)
final List<ServerSentEvents> annots = Annotations.getAnnotations(method, ServerSentEvents.class);
- ObserveFacet facet = ObserveFacetForSseAnnotation.create(annots, holder);
+ SseObserveFacet facet = SseObserveFacetForServerSentEventsAnnotation.create(annots, holder);
FacetUtil.addFacet(facet);
}
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/ObserveFacet.java b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java
similarity index 95%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/ObserveFacet.java
rename to extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java
index facb0e7..720f9ef 100644
--- a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/ObserveFacet.java
+++ b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java
@@ -26,7 +26,7 @@ import org.apache.isis.metamodel.facets.SingleClassValueFacet;
/**
* Corresponds to <tt>@???(observe=...)</tt> annotation in the Isis programming model.
*/
-public interface ObserveFacet extends SingleClassValueFacet {
+public interface SseObserveFacet extends SingleClassValueFacet {
Class<? extends SseSource> getEventStreamType();
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/ObserveFacetAbstract.java b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java
similarity index 90%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/ObserveFacetAbstract.java
rename to extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java
index 9c5b49b..59bdc27 100644
--- a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/ObserveFacetAbstract.java
+++ b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java
@@ -26,15 +26,15 @@ import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-public abstract class ObserveFacetAbstract extends SingleClassValueFacetAbstract implements ObserveFacet {
+public abstract class SseObserveFacetAbstract extends SingleClassValueFacetAbstract implements SseObserveFacet {
private Class<? extends SseSource> eventStreamType;
public static Class<? extends Facet> type() {
- return ObserveFacet.class;
+ return SseObserveFacet.class;
}
- public ObserveFacetAbstract(
+ public SseObserveFacetAbstract(
final Class<? extends SseSource> eventStreamType,
final FacetHolder holder) {
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/ObserveFacetForSseAnnotation.java b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java
similarity index 84%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/ObserveFacetForSseAnnotation.java
rename to extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java
index 996427f..f3e9d65 100644
--- a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/ObserveFacetForSseAnnotation.java
+++ b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java
@@ -30,9 +30,9 @@ import org.apache.isis.metamodel.facetapi.FacetHolder;
* @since 2.0
*
*/
-public class ObserveFacetForSseAnnotation extends ObserveFacetAbstract {
+public class SseObserveFacetForServerSentEventsAnnotation extends SseObserveFacetAbstract {
- public static ObserveFacet create(
+ public static SseObserveFacet create(
final List<ServerSentEvents> properties,
final FacetHolder holder) {
@@ -40,12 +40,12 @@ public class ObserveFacetForSseAnnotation extends ObserveFacetAbstract {
.map(ServerSentEvents::observe)
.filter(SseSource::isObservable)
.findFirst()
- .map(eventStreamType -> new ObserveFacetForSseAnnotation(
+ .map(eventStreamType -> new SseObserveFacetForServerSentEventsAnnotation(
eventStreamType, holder))
.orElse(null);
}
- private ObserveFacetForSseAnnotation(
+ private SseObserveFacetForServerSentEventsAnnotation(
Class<? extends SseSource> eventStreamType,
FacetHolder holder) {
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java
index ddef1d4..0bfc9c3 100644
--- a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java
+++ b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.sse.markup;
import org.apache.isis.applib.value.LocalResourcePath;
-import org.apache.isis.extensions.sse.facets.ObserveFacet;
+import org.apache.isis.extensions.sse.facets.SseObserveFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupPanelFactories;
@@ -58,7 +58,7 @@ public class ListeningMarkupPanelFactoriesForWicket {
// -- HELPER
private LocalResourcePath getEventStreamResource(ScalarModel scalarModel) {
- val observeFacet = scalarModel.getFacet(ObserveFacet.class);
+ val observeFacet = scalarModel.getFacet(SseObserveFacet.class);
return observeFacet!=null
? observeFacet.getEventStreamResource()
: null;
diff --git a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/services/EventStreamServiceDefault.java b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
similarity index 99%
rename from extensions/sse/src/main/java/org/apache/isis/extensions/sse/services/EventStreamServiceDefault.java
rename to extensions/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
index 93a6215..078ecf7 100644
--- a/extensions/sse/src/main/java/org/apache/isis/extensions/sse/services/EventStreamServiceDefault.java
+++ b/extensions/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
@@ -58,7 +58,7 @@ import lombok.extern.log4j.Log4j2;
*
*/
@Service @Log4j2
-public class EventStreamServiceDefault implements SseService {
+public class SseServiceDefault implements SseService {
@Inject TransactionService transactionService;