Skip to content

Commit 41c3558

Browse files
reckartreckart
committed
#4699 - Ability to export all layers as JSON
- Cleaning up code
1 parent 60b2999 commit 41c3558

File tree

24 files changed

+193
-282
lines changed

24 files changed

+193
-282
lines changed

‎inception/inception-export/pom.xml

+5-13
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@
5353
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
5454
<artifactId>inception-model</artifactId>
5555
</dependency>
56-
<dependency>
57-
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
58-
<artifactId>inception-security</artifactId>
59-
</dependency>
6056
<dependency>
6157
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
6258
<artifactId>inception-support</artifactId>
@@ -121,28 +117,24 @@
121117
<groupId>org.dkpro.core</groupId>
122118
<artifactId>dkpro-core-api-segmentation-asl</artifactId>
123119
</dependency>
124-
<dependency>
125-
<groupId>org.dkpro.core</groupId>
126-
<artifactId>dkpro-core-api-lexmorph-asl</artifactId>
127-
</dependency>
128120

129121
<dependency>
130122
<groupId>org.slf4j</groupId>
131123
<artifactId>slf4j-api</artifactId>
132124
</dependency>
133125

134-
<dependency>
135-
<groupId>com.fasterxml.jackson.core</groupId>
136-
<artifactId>jackson-databind</artifactId>
137-
</dependency>
138-
139126

140127
<!-- TEST DEPENDENCIES -->
141128
<dependency>
142129
<groupId>jakarta.persistence</groupId>
143130
<artifactId>jakarta.persistence-api</artifactId>
144131
<scope>test</scope>
145132
</dependency>
133+
<dependency>
134+
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
135+
<artifactId>inception-security</artifactId>
136+
<scope>test</scope>
137+
</dependency>
146138
<dependency>
147139
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
148140
<artifactId>inception-documents-api</artifactId>

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

-107
This file was deleted.

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

+4-29
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-phi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
</dependency>
8888
<dependency>
8989
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
90-
<artifactId>inception-export</artifactId>
90+
<artifactId>inception-schema</artifactId>
9191
</dependency>
9292

9393
<dependency>

‎inception/inception-project-initializers-phi/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/phi/PhiSpanTagSetInitializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package de.tudarmstadt.ukp.inception.project.initializers.phi;
1919

20-
import static de.tudarmstadt.ukp.inception.export.JsonImportUtil.importTagSetFromJson;
20+
import static de.tudarmstadt.ukp.inception.schema.exporters.TagsetImportExportUtils.importTagSetFromJson;
2121
import static java.util.Collections.emptyList;
2222

2323
import java.io.IOException;

‎inception/inception-project-initializers-wikidatalinking/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
</dependency>
9898
<dependency>
9999
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
100-
<artifactId>inception-export</artifactId>
100+
<artifactId>inception-schema</artifactId>
101101
<version>${project.version}</version>
102102
</dependency>
103103
<dependency>

‎inception/inception-project-initializers-wikidatalinking/src/main/java/de/tudarmstadt/ukp/inception/project/initializers/neannotation/NamedEntitySampleDataTagSetInitializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package de.tudarmstadt.ukp.inception.project.initializers.neannotation;
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/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
3030
<artifactId>inception-model</artifactId>
3131
</dependency>
32-
<dependency>
33-
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
34-
<artifactId>inception-export</artifactId>
35-
</dependency>
3632
<dependency>
3733
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
3834
<artifactId>inception-project-api</artifactId>
@@ -45,6 +41,10 @@
4541
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
4642
<artifactId>inception-schema-api</artifactId>
4743
</dependency>
44+
<dependency>
45+
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
46+
<artifactId>inception-schema</artifactId>
47+
</dependency>
4848
<dependency>
4949
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
5050
<artifactId>inception-support</artifactId>

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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+5
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

+1-2
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)