Skip to content

Commit 85b1450

Browse files
committed
#4699 - Ability to export all layers as JSON
- Cleaning up code
1 parent 1b47cf5 commit 85b1450

File tree

17 files changed

+178
-260
lines changed

17 files changed

+178
-260
lines changed

inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/TagsetImportExportUtils.java

Lines changed: 0 additions & 107 deletions
This file was deleted.

inception/inception-model-export/src/main/java/de/tudarmstadt/ukp/clarin/webanno/export/model/ExportedAnnotationLayer.java

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,9 @@ public class ExportedAnnotationLayer
9191
@JsonProperty("multiple_tokens")
9292
private boolean multipleTokens;
9393

94-
@JsonProperty("project_name")
95-
private String projectName;
96-
9794
@JsonProperty("linked_list_behavior")
9895
private boolean linkedListBehavior;
9996

100-
@JsonProperty("on_click_javascript_action")
101-
private String onClickJavascriptAction;
102-
10397
@JsonProperty("traits")
10498
private String traits;
10599

@@ -315,16 +309,6 @@ public void setAttachFeature(ExportedAnnotationFeatureReference attachFeature)
315309
this.attachFeature = attachFeature;
316310
}
317311

318-
public String isProjectName()
319-
{
320-
return projectName;
321-
}
322-
323-
public void setProjectName(String projectName)
324-
{
325-
this.projectName = projectName;
326-
}
327-
328312
public boolean isLinkedListBehavior()
329313
{
330314
return linkedListBehavior;
@@ -345,16 +329,6 @@ public void setReadonly(boolean aReadonly)
345329
readonly = aReadonly;
346330
}
347331

348-
public String getOnClickJavascriptAction()
349-
{
350-
return onClickJavascriptAction;
351-
}
352-
353-
public void setOnClickJavascriptAction(String onClickAction)
354-
{
355-
this.onClickJavascriptAction = onClickAction;
356-
}
357-
358332
public String getTraits()
359333
{
360334
return traits;
@@ -371,14 +345,15 @@ public boolean equals(final Object other)
371345
if (!(other instanceof ExportedAnnotationLayer)) {
372346
return false;
373347
}
374-
ExportedAnnotationLayer castOther = (ExportedAnnotationLayer) other;
348+
349+
var castOther = (ExportedAnnotationLayer) other;
375350
return new EqualsBuilder().append(name, castOther.name).append(type, castOther.type)
376-
.append(projectName, castOther.projectName).isEquals();
351+
.isEquals();
377352
}
378353

379354
@Override
380355
public int hashCode()
381356
{
382-
return new HashCodeBuilder().append(name).append(type).append(projectName).toHashCode();
357+
return new HashCodeBuilder().append(name).append(type).toHashCode();
383358
}
384359
}

inception/inception-project-initializers/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
4646
<artifactId>inception-schema-api</artifactId>
4747
</dependency>
48+
<dependency>
49+
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
50+
<artifactId>inception-schema</artifactId>
51+
</dependency>
4852
<dependency>
4953
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
5054
<artifactId>inception-support</artifactId>

inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceRelationTagSetInitializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package de.tudarmstadt.ukp.clarin.webanno.project.initializers;
1919

20-
import static de.tudarmstadt.ukp.inception.export.JsonImportUtil.importTagSetFromJson;
20+
import static de.tudarmstadt.ukp.inception.schema.exporters.TagsetImportExportUtils.importTagSetFromJson;
2121

2222
import java.io.IOException;
2323
import java.util.Collections;

inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/CoreferenceTypeTagSetInitializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package de.tudarmstadt.ukp.clarin.webanno.project.initializers;
1919

20-
import static de.tudarmstadt.ukp.inception.export.JsonImportUtil.importTagSetFromJson;
20+
import static de.tudarmstadt.ukp.inception.schema.exporters.TagsetImportExportUtils.importTagSetFromJson;
2121

2222
import java.io.IOException;
2323
import java.util.Collections;

inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/DependencyTypeTagSetInitializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package de.tudarmstadt.ukp.clarin.webanno.project.initializers;
1919

20-
import static de.tudarmstadt.ukp.inception.export.JsonImportUtil.importTagSetFromJson;
20+
import static de.tudarmstadt.ukp.inception.schema.exporters.TagsetImportExportUtils.importTagSetFromJson;
2121

2222
import java.io.IOException;
2323
import java.util.Collections;

inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/NamedEntityTagSetInitializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package de.tudarmstadt.ukp.clarin.webanno.project.initializers;
1919

20-
import static de.tudarmstadt.ukp.inception.export.JsonImportUtil.importTagSetFromJson;
20+
import static de.tudarmstadt.ukp.inception.schema.exporters.TagsetImportExportUtils.importTagSetFromJson;
2121

2222
import java.io.IOException;
2323
import java.util.Collections;

inception/inception-project-initializers/src/main/java/de/tudarmstadt/ukp/clarin/webanno/project/initializers/PartOfSpeechTagSetInitializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package de.tudarmstadt.ukp.clarin.webanno.project.initializers;
1919

20-
import static de.tudarmstadt.ukp.inception.export.JsonImportUtil.importTagSetFromJson;
20+
import static de.tudarmstadt.ukp.inception.schema.exporters.TagsetImportExportUtils.importTagSetFromJson;
2121

2222
import java.io.IOException;
2323
import java.util.Collections;

inception/inception-schema/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@
9595
<artifactId>inception-constraints</artifactId>
9696
</dependency>
9797

98+
<dependency>
99+
<groupId>com.fasterxml.jackson.core</groupId>
100+
<artifactId>jackson-databind</artifactId>
101+
</dependency>
102+
98103
<!-- Spring dependencies -->
99104

100105
<dependency>

inception/inception-schema/src/main/java/de/tudarmstadt/ukp/inception/schema/exporters/LayerExporter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ private ExportedAnnotationLayer exportLayerDetails(
141141
exLayer.setValidationMode(aLayer.getValidationMode());
142142
exLayer.setLinkedListBehavior(aLayer.isLinkedListBehavior());
143143
exLayer.setName(aLayer.getName());
144-
exLayer.setProjectName(aLayer.getProject().getName());
145144
exLayer.setType(aLayer.getType());
146145
exLayer.setUiName(aLayer.getUiName());
147146
exLayer.setTraits(aLayer.getTraits());
@@ -153,7 +152,7 @@ private ExportedAnnotationLayer exportLayerDetails(
153152
// Export features
154153
var exFeatures = new ArrayList<ExportedAnnotationFeature>();
155154
for (var feature : annotationService.listAnnotationFeature(aLayer)) {
156-
ExportedAnnotationFeature exFeature = exportFeatureDetails(feature);
155+
var exFeature = exportFeatureDetails(feature);
157156
exFeatures.add(exFeature);
158157

159158
if (aFeatureToExFeature != null) {

0 commit comments

Comments
 (0)