Merge pull request #261 from kit-data-manager/development

PR for v1.0.3

Author: VolkerHartmann

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+## [1.0.3] - date 2024-11-25
+### Fixed
+- Properties for messages now containing URLs as before
+
 ## [1.0.2] - date 2024-11-22
 ### Changed
 - Update python Docker tag to v3.13 
@@ -177,7 +181,8 @@ and mapping of metadata documents delivered by RabbitMQ
 - Mapping of metadata documents with Gemma
 - Ingest to elasticsearch
 
-[Unreleased]: https://github.com/kit-data-manager/indexing-service/compare/v1.0.2...HEAD
+[Unreleased]: https://github.com/kit-data-manager/indexing-service/compare/v1.0.3...HEAD
+[1.0.3]: https://github.com/kit-data-manager/indexing-service/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/kit-data-manager/indexing-service/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/kit-data-manager/indexing-service/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/kit-data-manager/indexing-service/compare/v0.9.0...v1.0.0

CITATION.cff

@@ -19,8 +19,8 @@ authors:
 title: "Indexing and Mapping Service"
 type: software
 abstract: Indexing and Mapping Service is a software for (optional) mapping and indexing metadata documents for (elastic)search.
-version: 1.0.2
-date-released: 2024-11-22
+version: 1.0.3
+date-released: 2024-11-25
 url: "https://github.com/kit-data-manager/indexing-service"
 repository-code:  "https://github.com/kit-data-manager/indexing-service"
 license: Apache-2.0

src/main/java/edu/kit/datamanager/indexer/messagehandler/MetastoreMessageHandler.java

@@ -65,7 +65,6 @@ public class MetastoreMessageHandler implements IMessageHandler {
 
   public static final String RESOURCE_URL = "resolvingUrl";
   public static final String MAPPING_ID = "documentType";
-  private static final String MAPPING_URL_APPENDIX = "/api/v1/schemas/";
 
   MetastoreMessageHandler(ApplicationProperties configuration, MappingService mappingService, IndexingService indexingService) {
     properties = configuration;
@@ -89,13 +88,8 @@ public RESULT handle(BasicMessage message) {
       return RESULT.REJECTED;
     }
 
-    int beginIndex = mappingId.indexOf(MAPPING_URL_APPENDIX);
+    int beginIndex = mappingId.lastIndexOf("/") + 1;
     int endIndex = mappingId.indexOf("?", beginIndex);
-    if (beginIndex > 0) {
-      beginIndex += MAPPING_URL_APPENDIX.length();
-    } else {
-      beginIndex = 0;
-    }
     if (endIndex < 0) {
       endIndex = mappingId.length();
     }
@@ -126,7 +120,8 @@ public RESULT handle(BasicMessage message) {
       }
 
       String jsonDocument = FileUtils.readFileToString(resultPath.toFile(), StandardCharsets.UTF_8);
-      elasticsearchService.uploadToElastic(jsonDocument, index, properties.getElasticsearchType(), resourceUrlAsString);
+      String resourceUrlAsStringWithoutVersion = removeFilterFromUri(resourceUrlAsString);
+      elasticsearchService.uploadToElastic(jsonDocument, index, properties.getElasticsearchType(), resourceUrlAsStringWithoutVersion);
 
     } catch (URISyntaxException ex) {
       String errorMessage = String.format("Error downloading content from '%s': %s", resourceUrlAsString, ex.getMessage());
@@ -148,4 +143,18 @@ public RESULT handle(BasicMessage message) {
   public boolean configure() {
     return true;
   }
+    
+  /**
+   * Remove version and other stuff added to the URI.
+   * @param uri URI of the object.
+   * @return  URI without additional parameter.
+   */
+  public String removeFilterFromUri(String uri) {
+    String strippedUri = null;
+    if (uri != null) {
+      strippedUri = uri.split("\\?", -1)[0];
+    }
+    return strippedUri;
+  }
+
 }