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 2021/04/22 15:49:14 UTC
[isis] branch master updated: ISIS-2614: rename
IsisModuleExtCorsImpl -> IsisModuleExtCors
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 51029c7 ISIS-2614: rename IsisModuleExtCorsImpl -> IsisModuleExtCors
51029c7 is described below
commit 51029c734429265d52432f3074919c2533ba5f9e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 22 17:49:01 2021 +0200
ISIS-2614: rename IsisModuleExtCorsImpl -> IsisModuleExtCors
---
.../relnotes/modules/ROOT/pages/2021/2.0.0-M6/mignotes.adoc | 4 ++++
examples/demo/web/src/main/java/demoapp/web/DemoAppManifest.java | 4 ++--
.../cors/impl/{IsisModuleExtCorsImpl.java => IsisModuleExtCors.java} | 5 +----
.../apache/isis/extensions/cors/impl/IsisModuleExtCorsImplTest.java | 4 ++--
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M6/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M6/mignotes.adoc
index 1f6c15e..0d4110b 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M6/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M6/mignotes.adoc
@@ -35,10 +35,14 @@ there is no counterpart for _Collection_
== Other Changes
+Module `IsisModuleExtCorsImpl` was renamed to `IsisModuleExtCors`.
+
Module `IsisModuleExtModelAnnotation` was removed and is no longer required.
Service `BookmarkService` has been improved, such that its methods return `Optional<?>` instead of nullable objects.
+
+
== Extensions
=== SecMan
diff --git a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifest.java b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifest.java
index 639691b..1c84a1a 100644
--- a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifest.java
+++ b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifest.java
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.extensions.commandreplay.primary.IsisModuleExtCommandReplayPrimary;
import org.apache.isis.extensions.commandreplay.secondary.IsisModuleExtCommandReplaySecondary;
-import org.apache.isis.extensions.cors.impl.IsisModuleExtCorsImpl;
+import org.apache.isis.extensions.cors.impl.IsisModuleExtCors;
import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanEncryptionJbcrypt;
import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
@@ -73,7 +73,7 @@ import demoapp.web.security.PrototypeActionsVisibilityAdvisor;
IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,
// CORS
- IsisModuleExtCorsImpl.class,
+ IsisModuleExtCors.class,
IsisModuleTestingH2ConsoleUi.class, // enables the H2 console menu item
IsisModuleExtExcelDownloadUi.class, // allows for collection download as excel
diff --git a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCors.java
similarity index 96%
rename from extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java
rename to extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCors.java
index 74cb3dc..e681713 100644
--- a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java
+++ b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCors.java
@@ -19,9 +19,7 @@
package org.apache.isis.extensions.cors.impl;
import java.util.Collections;
-import java.util.Map;
-import javax.inject.Named;
import javax.servlet.Filter;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -43,10 +41,9 @@ import lombok.extern.log4j.Log4j2;
* @since 2.0 {@index}
*/
@Configuration
-@Named("isis.ext.cors.WebModuleServerCors")
@Qualifier("CORS")
@Log4j2
-public class IsisModuleExtCorsImpl {
+public class IsisModuleExtCors {
@Bean
public FilterRegistrationBean<Filter> createCorsFilterRegistration(
diff --git a/extensions/vro/cors/impl/src/test/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImplTest.java b/extensions/vro/cors/impl/src/test/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImplTest.java
index b8ffcd9..6f9047b 100644
--- a/extensions/vro/cors/impl/src/test/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImplTest.java
+++ b/extensions/vro/cors/impl/src/test/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImplTest.java
@@ -45,10 +45,10 @@ class IsisModuleExtCorsImplTest {
@Test
void defaultIsisConfiguration_shouldYieldCorsUrlPatternWithWildcard() {
// given
- val isisModuleExtCorsImpl = new IsisModuleExtCorsImpl();
+ val isisModuleExtCors = new IsisModuleExtCors();
// when
- val filterRegistration = isisModuleExtCorsImpl.createCorsFilterRegistration(isisDefaultConfiguration, restEasyConfiguration);
+ val filterRegistration = isisModuleExtCors.createCorsFilterRegistration(isisDefaultConfiguration, restEasyConfiguration);
// then
assertTrue(filterRegistration.getUrlPatterns().contains("/restful/*"));