mockedConstructionSolrClientBuilder;
+ private Http2SolrClient solrClient;
@BeforeEach
void setUp() throws Exception {
- mockedConstructionSolrClientBuilder = Mockito.mockConstruction(HttpSolrClient.Builder.class,
+ mockedConstructionSolrClientBuilder = Mockito.mockConstruction(Http2SolrClient.Builder.class,
(builder, context) -> {
- solrClient = Mockito.mock(HttpSolrClient.class);
- Mockito.when(builder.withHttpClient(any())).thenReturn(builder);
+ solrClient = Mockito.mock(Http2SolrClient.class);
Mockito.when(builder.build()).thenReturn(solrClient);
});
solrProxy = new SolrProxyTenantAware(
@@ -65,13 +64,26 @@ void setUp() throws Exception {
solrSearchEngineManager.setSolrProxy(solrProxy);
solrSearchEngineManager.setContentManager(contentManager);
solrSearchEngineManager.setLangManager(langManager);
- solrSearchEngineManager.setCacheInfoManager(cacheInfoManager);
+ solrSearchEngineManager.setCacheWrapper(cacheWrapper);
}
@AfterEach
void tearDown() {
mockedConstructionSolrClientBuilder.close();
}
+
+ @Test
+ void shouldReleaseCacheWhenrefreshService() throws Throwable {
+ this.solrSearchEngineManager.refresh();
+ Mockito.verify(cacheWrapper, Mockito.times(1)).release();
+ }
+
+ @Test
+ void shouldExecuteNotifyWithInternalError() {
+ PublicContentChangedEvent event = new PublicContentChangedEvent();
+ event.setContentId("ART123");
+ Assertions.assertDoesNotThrow(() -> this.solrSearchEngineManager.updateFromPublicContentChanged(event));
+ }
@Test
void shouldRollbackIndexStatusIfReloadThreadDoesNotStart() throws Exception {
diff --git a/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/AbstractControllerIntegrationTest.java b/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/AbstractControllerIntegrationTest.java
index 347c1ebf68..0c88b3b183 100644
--- a/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/AbstractControllerIntegrationTest.java
+++ b/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/AbstractControllerIntegrationTest.java
@@ -21,6 +21,7 @@
import com.agiletec.aps.system.services.user.UserDetails;
import org.entando.entando.TestEntandoJndiUtils;
import org.entando.entando.aps.system.services.oauth2.IApiOAuth2TokenManager;
+import org.entando.entando.plugins.jpsolr.SolrTestUtils;
import org.entando.entando.web.AuthRequestBuilder;
import org.entando.entando.web.common.interceptor.EntandoOauth2Interceptor;
import org.entando.entando.web.utils.OAuth2TestUtils;
@@ -39,8 +40,12 @@
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.filter.CorsFilter;
+import org.testcontainers.containers.GenericContainer;
+import uk.org.webcompere.systemstubs.environment.EnvironmentVariables;
+import uk.org.webcompere.systemstubs.jupiter.SystemStub;
+import uk.org.webcompere.systemstubs.jupiter.SystemStubsExtension;
-@ExtendWith(SpringExtension.class)
+@ExtendWith({SystemStubsExtension.class, SpringExtension.class})
@ContextConfiguration(locations = {
"classpath*:spring/testpropertyPlaceholder.xml",
"classpath*:spring/baseSystemConfig.xml",
@@ -53,7 +58,7 @@
"classpath*:spring/web/**.xml",})
@WebAppConfiguration(value = "")
public abstract class AbstractControllerIntegrationTest {
-
+
protected MockMvc mockMvc;
private String accessToken;
@@ -76,9 +81,15 @@ public abstract class AbstractControllerIntegrationTest {
@Autowired
@InjectMocks
protected EntandoOauth2Interceptor entandoOauth2Interceptor;
+
+ private static GenericContainer solrContainer;
+ @SystemStub
+ private static EnvironmentVariables environmentVariables;
+
@BeforeAll
public static void setup() throws Exception {
+ solrContainer = SolrTestUtils.startContainer(solrContainer, environmentVariables);
TestEntandoJndiUtils.setupJndi();
}
diff --git a/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/content/AdvContentSearchControllerTest.java b/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/content/AdvContentSearchControllerTest.java
index 1cc7a37ff1..982ee432c1 100644
--- a/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/content/AdvContentSearchControllerTest.java
+++ b/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/content/AdvContentSearchControllerTest.java
@@ -37,7 +37,6 @@
import java.util.List;
import java.util.Map;
import org.entando.entando.plugins.jacms.aps.system.services.content.IContentService;
-import org.entando.entando.plugins.jpsolr.SolrTestExtension;
import org.entando.entando.plugins.jpsolr.aps.system.solr.ISolrSearchEngineManager;
import org.entando.entando.plugins.jpsolr.web.AbstractControllerIntegrationTest;
import org.entando.entando.web.utils.OAuth2TestUtils;
@@ -47,7 +46,6 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.ResultActions;
@@ -55,7 +53,6 @@
/**
* @author E.Santoboni
*/
-@ExtendWith(SolrTestExtension.class)
class AdvContentSearchControllerTest extends AbstractControllerIntegrationTest {
@Autowired
diff --git a/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/content/SearchByDoubleFiltersControllerTest.java b/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/content/SearchByDoubleFiltersControllerTest.java
index 30c7329169..49616cbb5b 100644
--- a/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/content/SearchByDoubleFiltersControllerTest.java
+++ b/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/content/SearchByDoubleFiltersControllerTest.java
@@ -36,7 +36,6 @@
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.entando.entando.plugins.jpsolr.SolrTestExtension;
import org.entando.entando.plugins.jpsolr.aps.system.solr.ISolrSearchEngineManager;
import org.entando.entando.plugins.jpsolr.web.AbstractControllerIntegrationTest;
import org.entando.entando.web.utils.OAuth2TestUtils;
@@ -45,14 +44,12 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.web.servlet.ResultActions;
/**
* @author E.Santoboni
*/
-@ExtendWith(SolrTestExtension.class)
public class SearchByDoubleFiltersControllerTest extends AbstractControllerIntegrationTest {
private static final String TEXT_FOR_TEST = "Entando is the leading modular application platform for building enterprise applications on Kubernetes";
diff --git a/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/content/SearchByResourceControllerTest.java b/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/content/SearchByResourceControllerTest.java
index e26825251b..8d4ed58be5 100644
--- a/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/content/SearchByResourceControllerTest.java
+++ b/solr-plugin/src/test/java/org/entando/entando/plugins/jpsolr/web/content/SearchByResourceControllerTest.java
@@ -58,11 +58,6 @@ public class SearchByResourceControllerTest extends AbstractControllerIntegratio
@Autowired
private IResourceManager resourceManager;
- @BeforeAll
- public static void setup() throws Exception {
- AbstractControllerIntegrationTest.setup();
- }
-
@Override
@BeforeEach
public void setUp() throws Exception {
diff --git a/versioning-plugin/README.md b/versioning-plugin/README.md
index 637c0b188e..b3c443f772 100644
--- a/versioning-plugin/README.md
+++ b/versioning-plugin/README.md
@@ -19,18 +19,6 @@ This plugin adds new administration interfaces related to the content tracking;
Please also be aware that a resource referenced by older versions of the content cannot be deleted to avoid inconsistency on restore.
Though the plugin installation is not difficult at all, we are going to modify the system tables, so a backup of your database is highly recommended. Furthermore, you may be required to customize the scripts to your needs before installation.
-**Installation**
-
-In order to install the Versioning Plugin, you must insert the following dependency in the pom.xml file of your project:
-```
-
- org.entando.entando.plugins
- entando-plugin-jpversioning
- ${entando.version}
- war
-
-```
-
**Configuration**
You can access to Versioning Plugin’s functionality through the usual left menu: _Plugins_ -> _Versioning_ in the Administration Area.
diff --git a/versioning-plugin/pom.xml b/versioning-plugin/pom.xml
index 1c61641b55..46ec437ce2 100644
--- a/versioning-plugin/pom.xml
+++ b/versioning-plugin/pom.xml
@@ -4,7 +4,7 @@
org.entando
app-engine
- 7.3.0
+ 7.3.1
entando-plugin-jpversioning
org.entando.entando.plugins
diff --git a/versioning-plugin/src/main/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/VersioningManager.java b/versioning-plugin/src/main/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/VersioningManager.java
index 232e5783d2..60956e8a3e 100644
--- a/versioning-plugin/src/main/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/VersioningManager.java
+++ b/versioning-plugin/src/main/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/VersioningManager.java
@@ -44,6 +44,7 @@
import com.agiletec.plugins.jacms.aps.system.services.content.model.ContentRecordVO;
import com.agiletec.plugins.jpversioning.aps.system.JpversioningSystemConstants;
import java.io.IOException;
+import java.util.Optional;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.commons.lang3.StringUtils;
import org.xml.sax.SAXException;
@@ -63,8 +64,8 @@ public void init() throws Exception {
@Override
public void initTenantAware() throws Exception {
- String deleteMidVersions = this.getConfigManager().getParam(JpversioningSystemConstants.CONFIG_PARAM_DELETE_MID_VERSIONS);
- this.setDeleteMidVersions("true".equalsIgnoreCase(deleteMidVersions));
+ this.setDeleteMidVersions(Optional.ofNullable(this.getConfigManager().getParam(JpversioningSystemConstants.CONFIG_PARAM_DELETE_MID_VERSIONS))
+ .map(Boolean::parseBoolean).orElse(Boolean.TRUE));
}
@Before("execution(* com.agiletec.plugins.jacms.aps.system.services.content.IContentManager.saveContent(..)) && args(content)")
diff --git a/versioning-plugin/src/main/webapp/WEB-INF/plugins/jpversioning/apsadmin/jsp/config/versioningSysConfig.jsp b/versioning-plugin/src/main/webapp/WEB-INF/plugins/jpversioning/apsadmin/jsp/config/versioningSysConfig.jsp
index 356ce907a4..207ba9e947 100644
--- a/versioning-plugin/src/main/webapp/WEB-INF/plugins/jpversioning/apsadmin/jsp/config/versioningSysConfig.jsp
+++ b/versioning-plugin/src/main/webapp/WEB-INF/plugins/jpversioning/apsadmin/jsp/config/versioningSysConfig.jsp
@@ -77,10 +77,16 @@
- " id=""
+
+
+
+
+
+
+ " id=""
name="" />
- " id="ch_" class="bootstrap-switch"
- checked="checked" />
+ " id="ch_" class="bootstrap-switch"
+ checked="checked" />
diff --git a/versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/TestVersioningDAO.java b/versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/VersioningDAOTest.java
similarity index 99%
rename from versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/TestVersioningDAO.java
rename to versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/VersioningDAOTest.java
index aae6048300..caeeee9973 100644
--- a/versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/TestVersioningDAO.java
+++ b/versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/VersioningDAOTest.java
@@ -43,7 +43,7 @@
/**
* @author G.Cocco
*/
-public class TestVersioningDAO extends BaseTestCase {
+class VersioningDAOTest extends BaseTestCase {
@Test
void testGetVersions() throws Throwable {
diff --git a/versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/TestVersioningManager.java b/versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/VersioningManagerIntegrationTest.java
similarity index 97%
rename from versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/TestVersioningManager.java
rename to versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/VersioningManagerIntegrationTest.java
index e443263c05..6905bb07b7 100644
--- a/versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/TestVersioningManager.java
+++ b/versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/VersioningManagerIntegrationTest.java
@@ -47,17 +47,19 @@
import java.util.Map;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @author G.Cocco
*/
-public class TestVersioningManager extends BaseTestCase {
+class VersioningManagerIntegrationTest extends BaseTestCase {
private ConfigInterface configManager;
private IContentManager contentManager;
private IVersioningManager versioningManager;
private JpversioningTestHelper helper;
+ @Test
void testGetVersions() throws Throwable {
List versions = this.versioningManager.getVersions("CNG12");
assertNull(versions);
@@ -66,6 +68,7 @@ void testGetVersions() throws Throwable {
this.checkVersionIds(new long[]{1, 2, 3}, versions);
}
+ @Test
void testGetLastVersions() throws Throwable {
List versions = this.versioningManager.getLastVersions("CNG", null);
assertTrue(versions.isEmpty());
@@ -74,6 +77,7 @@ void testGetLastVersions() throws Throwable {
this.checkVersionIds(new long[]{3}, versions);
}
+ @Test
void testGetVersion() throws Throwable {
ContentVersion contentVersion = this.versioningManager.getVersion(10000);
assertNull(contentVersion);
@@ -92,6 +96,7 @@ void testGetVersion() throws Throwable {
assertEquals("admin", contentVersion.getUsername());
}
+ @Test
void testGetLastVersion() throws Throwable {
ContentVersion contentVersion = this.versioningManager.getLastVersion("CNG12");
assertNull(contentVersion);
@@ -109,6 +114,7 @@ void testGetLastVersion() throws Throwable {
assertEquals("mainEditor", contentVersion.getUsername());
}
+ @Test
void testSaveGetDeleteVersion() throws Throwable {
((VersioningManager) this.versioningManager).saveContentVersion("ART102");
ContentVersion contentVersion = this.versioningManager.getLastVersion("ART102");
@@ -128,7 +134,8 @@ void testSaveGetDeleteVersion() throws Throwable {
assertNull(this.versioningManager.getLastVersion("ART102"));
}
- public void deleteWorkVersions() throws Throwable {
+ @Test
+ void deleteWorkVersions() throws Throwable {
List versions = this.versioningManager.getVersions("ART1");
this.checkVersionIds(new long[]{1, 2, 3}, versions);
this.versioningManager.deleteWorkVersions("ART1", 0);
@@ -145,11 +152,13 @@ private void checkVersionIds(long[] expected, List received) {
}
}
+ @Test
void testContentVersionToIgnore_1() throws Exception {
this.testContentVersionToIgnore(false, true);
this.testContentVersionToIgnore(true, true);
}
+ @Test
void testContentVersionToIgnore_2() throws Exception {
this.testContentVersionToIgnore(false, false);
this.testContentVersionToIgnore(true, false);
diff --git a/versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/VersioningManagerTest.java b/versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/VersioningManagerTest.java
new file mode 100644
index 0000000000..82e63566a4
--- /dev/null
+++ b/versioning-plugin/src/test/java/com/agiletec/plugins/jpversioning/aps/system/services/versioning/VersioningManagerTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2024-Present Entando Inc. (http://www.entando.com) All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package com.agiletec.plugins.jpversioning.aps.system.services.versioning;
+
+import com.agiletec.aps.system.services.baseconfig.ConfigInterface;
+import com.agiletec.plugins.jpversioning.aps.system.JpversioningSystemConstants;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class VersioningManagerTest {
+
+ @Mock
+ private ConfigInterface configManager;
+
+ @InjectMocks
+ private VersioningManager versioningManager;
+
+ @Test
+ void checkRightConfiguration() throws Exception {
+ this.checkRightConfiguration(null, true);
+ this.checkRightConfiguration("false", false);
+ this.checkRightConfiguration("true", true);
+ this.checkRightConfiguration("True", true);
+ this.checkRightConfiguration("TRUE", true);
+ this.checkRightConfiguration("False", false);
+ this.checkRightConfiguration("FALSE", false);
+ }
+
+ private void checkRightConfiguration(String deleteMidVersion, boolean expected) throws Exception {
+ String paramName = JpversioningSystemConstants.CONFIG_PARAM_DELETE_MID_VERSIONS;
+ Mockito.when(configManager.getParam(paramName)).thenReturn(deleteMidVersion);
+ versioningManager.init();
+ Assertions.assertEquals(expected, versioningManager.isDeleteMidVersions());
+ }
+
+}
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 268f1e3685..8d10971ce9 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -5,7 +5,7 @@
org.entando
app-engine
- 7.3.0
+ 7.3.1
org.entando.entando
webapp
@@ -826,7 +826,7 @@
3.0.0
- 11
+ 17
@@ -837,8 +837,8 @@
org.apache.maven.plugins
maven-compiler-plugin
- 11
- 11
+ 17
+ 17
diff --git a/webapp/src/main/webapp/META-INF/context.xml b/webapp/src/main/webapp/META-INF/context.xml
new file mode 100644
index 0000000000..1e49cf5ea3
--- /dev/null
+++ b/webapp/src/main/webapp/META-INF/context.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/webapp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/webapp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
deleted file mode 100644
index 66dc3f16b9..0000000000
--- a/webapp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file