Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/new data model #36

Merged
merged 22 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
53 changes: 0 additions & 53 deletions kubernetes-biocase.yaml

This file was deleted.

53 changes: 0 additions & 53 deletions kubernetes-dwca.yaml

This file was deleted.

21 changes: 21 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,27 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<sourceDirectory>${basedir}/src/main/resources/json-schema/</sourceDirectory>
<targetPackage>eu.dissco.core.translator.schema</targetPackage>
<generateBuilders>true</generateBuilders>
<includeDynamicBuilders>true</includeDynamicBuilders>
<includeAdditionalProperties>false</includeAdditionalProperties>
</configuration>
<executions>
<execution>
<goals>
<goal>
generate
</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
1 change: 1 addition & 0 deletions src/main/java/eu/dissco/core/translator/Profiles.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package eu.dissco.core.translator;

public class Profiles {

public static final String BIOCASE = "biocase";
public static final String DWCA = "dwca";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class MappingComponent {
void setup() throws DisscoRepositoryException {
var objectNode = repository.retrieveMapping(properties.getSourceSystemId());
var mappingObject = objectNode.get("mapping");
if (mappingObject != null){
if (mappingObject != null) {
mappingObject.iterator().forEachRemaining(node -> node.fields()
.forEachRemaining(field -> fieldMappings.put(field.getKey(), field.getValue().asText())));
}
southeo marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

@Configuration
public class ApplicationConfiguration {

public static final String DATE_STRING = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";

@Bean
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 11 additions & 9 deletions src/main/java/eu/dissco/core/translator/database/jooq/Keys.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 36 additions & 39 deletions src/main/java/eu/dissco/core/translator/database/jooq/Public.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading