inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-14 17:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Race condition in test & clean up long class names

Browse Source
This commit is contained in:
alandavis
2022-08-12 07:15:09 +01:00
parent fc2fa12c1f
commit 29fa2086af
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engines/base/src/main/java/org/alfresco/transform/base/registry/AdditionalTransformConfigResources.java → engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFiles.java
View File

@@ -36,10 +36,10 @@ import java.util.Map;
@Configuration
@ConfigurationProperties(prefix = "transform")
public class AdditionalTransformConfigResources
public class TransformConfigFiles
{
// Populated with file paths from Spring Boot properties such as transform.config.<engineName> or
// environment variables like TRANSFORM_CONFIG_<engineName>.
// Populated from Spring Boot properties or such as transform.config.<engineName> or environment variables like
// TRANSFORM_CONFIG_<engineName>.
private final Map<String, String> config = new HashMap<>();
public List<Resource> retrieveResources()

4
engines/base/src/main/java/org/alfresco/transform/base/registry/AdditionalTransformConfigResourcesHistoric.java → engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFilesHistoric.java
View File

@@ -40,11 +40,11 @@ import java.util.Map;
import static org.alfresco.transform.base.registry.TransformConfigFromFiles.retrieveResource;
/**
* Similar to {@link AdditionalTransformConfigResources} but uses the names historically used by the t-router.
* Similar to {@link TransformConfigFiles} but uses the names historically used by the t-router.
*/
@Configuration
@ConfigurationProperties(prefix = "transformer.routes")
public class AdditionalTransformConfigResourcesHistoric
public class TransformConfigFilesHistoric
{
// Populated with file paths from Spring Boot properties such as transformer.routes.additional.<engineName> or
// environment variables like TRANSFORMER_ROUTES_ADDITIONAL_<engineName>.

8
engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFromFiles.java
View File

@@ -51,9 +51,9 @@ public class TransformConfigFromFiles
@Autowired
private List<TransformConfigSource> transformConfigSources;
@Autowired
private AdditionalTransformConfigResources additionalTransformConfigResources;
private TransformConfigFiles transformConfigFiles;
@Autowired
private AdditionalTransformConfigResourcesHistoric additionalTransformConfigResourcesHistoric;
private TransformConfigFilesHistoric transformConfigFilesHistoric;
@Autowired
private TransformConfigResourceReader transformConfigResourceReader;
@@ -61,8 +61,8 @@ public class TransformConfigFromFiles
public void initFileConfig()
{
final List<Resource> resources = new ArrayList<>();
resources.addAll(additionalTransformConfigResources.retrieveResources());
resources.addAll(additionalTransformConfigResourcesHistoric.retrieveResources());
resources.addAll(transformConfigFiles.retrieveResources());
resources.addAll(transformConfigFilesHistoric.retrieveResources());
resources.forEach(resource ->
{
String filename = resource.getFilename();

6
engines/base/src/test/java/org/alfresco/transform/base/registry/TransformRegistryRefreshTest.java
View File

@@ -38,16 +38,16 @@ public class TransformRegistryRefreshTest
@Autowired
private TransformConfigFromFiles transformConfigFromFiles;
@Autowired
private AdditionalTransformConfigResources additionalTransformConfigResources;
private TransformConfigFiles transformConfigFiles;
@Test
public void checkRegistryRefreshes() throws InterruptedException
{
verify(transformRegistry, atLeast(1)).retrieveConfig();
assertEquals(4, transformRegistry.getTransformConfig().getTransformers().size());
verify(transformRegistry, atLeast(1)).retrieveConfig();
// As we can't change the content of a classpath resource, lets change what is read.
ReflectionTestUtils.setField(additionalTransformConfigResources, "config", ImmutableMap.of(
ReflectionTestUtils.setField(transformConfigFiles, "config", ImmutableMap.of(
"a", "config/addA2B.json",
"foo", "config/addB2C.json"));
transformConfigFromFiles.initFileConfig();

18
engines/base/src/test/java/org/alfresco/transform/base/registry/TransformRegistryTest.java
View File

@@ -59,17 +59,17 @@ public class TransformRegistryTest
@Autowired
private TransformConfigFromFiles transformConfigFromFiles;
@Autowired
private AdditionalTransformConfigResources additionalTransformConfigResources;
private TransformConfigFiles transformConfigFiles;
@Autowired
private AdditionalTransformConfigResourcesHistoric additionalTransformConfigResourcesHistoric;
private TransformConfigFilesHistoric transformConfigFilesHistoric;
@AfterEach
private void after()
{
transformConfigSources.clear();
ReflectionTestUtils.setField(transformConfigFromTransformEngines, "transformEngines", Collections.emptyList());
ReflectionTestUtils.setField(additionalTransformConfigResources, "config", Collections.emptyMap());
ReflectionTestUtils.setField(additionalTransformConfigResourcesHistoric, "additional", Collections.emptyMap());
ReflectionTestUtils.setField(transformConfigFiles, "config", Collections.emptyMap());
ReflectionTestUtils.setField(transformConfigFilesHistoric, "additional", Collections.emptyMap());
transformRegistry.retrieveConfig();
}
@@ -117,7 +117,7 @@ public class TransformRegistryTest
{
ReflectionTestUtils.setField(transformConfigFromTransformEngines, "transformEngines", ImmutableList.of(
new FakeTransformEngineWithOneCustomTransformer()));
ReflectionTestUtils.setField(additionalTransformConfigResources, "config", ImmutableMap.of(
ReflectionTestUtils.setField(transformConfigFiles, "config", ImmutableMap.of(
"a", "config/addA2B.json",
"foo", "config/addB2C.json"));
@@ -133,7 +133,7 @@ public class TransformRegistryTest
{
ReflectionTestUtils.setField(transformConfigFromTransformEngines, "transformEngines", ImmutableList.of(
new FakeTransformEngineWithOneCustomTransformer()));
ReflectionTestUtils.setField(additionalTransformConfigResourcesHistoric, "additional", ImmutableMap.of(
ReflectionTestUtils.setField(transformConfigFilesHistoric, "additional", ImmutableMap.of(
"a", "config/addA2B.json",
"foo", "config/addB2C.json"));
@@ -149,9 +149,9 @@ public class TransformRegistryTest
{
ReflectionTestUtils.setField(transformConfigFromTransformEngines, "transformEngines", ImmutableList.of(
new FakeTransformEngineWithOneCustomTransformer()));
ReflectionTestUtils.setField(additionalTransformConfigResourcesHistoric, "TRANSFORMER_ROUTES_FROM_CLASSPATH",
ReflectionTestUtils.setField(transformConfigFilesHistoric, "TRANSFORMER_ROUTES_FROM_CLASSPATH",
"config/removePdf2JpgAndAddA2Z.json"); // checking it is ignored
ReflectionTestUtils.setField(additionalTransformConfigResourcesHistoric, "transformerRoutesExternalFile",
ReflectionTestUtils.setField(transformConfigFilesHistoric, "transformerRoutesExternalFile",
"config/addA2B.json");
transformConfigFromTransformEngines.initTransformEngineConfig();
@@ -166,7 +166,7 @@ public class TransformRegistryTest
{
ReflectionTestUtils.setField(transformConfigFromTransformEngines, "transformEngines", ImmutableList.of(
new FakeTransformEngineWithOneCustomTransformer()));
ReflectionTestUtils.setField(additionalTransformConfigResourcesHistoric, "TRANSFORMER_ROUTES_FROM_CLASSPATH",
ReflectionTestUtils.setField(transformConfigFilesHistoric, "TRANSFORMER_ROUTES_FROM_CLASSPATH",
"config/removePdf2JpgAndAddA2Z.json");
transformConfigFromTransformEngines.initTransformEngineConfig();