restructured package hierarchie in order to facilitate re-use of edm …

…code
hbz · Feb 15, 2024 · 20b63cb · 20b63cb
1 parent aca8ca6
commit 20b63cb
Show file tree

Hide file tree

Showing 46 changed files with 181 additions and 181 deletions.
diff --git a/.../edm/impl/AggregationElementOperator.java → .../edm/impl/AggregationElementOperator.java b/.../edm/impl/AggregationElementOperator.java → .../edm/impl/AggregationElementOperator.java
@@ -1,4 +1,4 @@
-package de.nrw.hbz.genericSipLoader.edm.impl;
+package de.nrw.hbz.edm.impl;
 
 import java.util.ArrayList;
 import java.util.Hashtable;
@@ -9,12 +9,12 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 
-import de.nrw.hbz.genericSipLoader.edm.model.Aggregation;
-import de.nrw.hbz.genericSipLoader.edm.model.Rdf;
-import de.nrw.hbz.genericSipLoader.edm.model.WebResource;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeResourceAttribute;
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeRdf;
-import de.nrw.hbz.genericSipLoader.util.TimeStampProvider;
+import de.nrw.hbz.edm.model.Aggregation;
+import de.nrw.hbz.edm.model.Rdf;
+import de.nrw.hbz.edm.model.WebResource;
+import de.nrw.hbz.edm.model.deserialize.DeserializeResourceAttribute;
+import de.nrw.hbz.edm.model.serialize.SerializeRdf;
+import de.nrw.hbz.edm.util.TimeStampProvider;
 
 /**
  * A Class to replace Element values and attributes within the EDM Aggregation Core Element. 

diff --git a/...enericSipLoader/edm/impl/ConsoleImpl.java → ...java/de/nrw/hbz/edm/impl/ConsoleImpl.java b/...enericSipLoader/edm/impl/ConsoleImpl.java → ...java/de/nrw/hbz/edm/impl/ConsoleImpl.java
@@ -1,22 +1,22 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.impl;
+package de.nrw.hbz.edm.impl;
 
 import java.util.ArrayList;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import de.nrw.hbz.genericSipLoader.edm.model.Aggregation;
-import de.nrw.hbz.genericSipLoader.edm.model.OaiPmh;
-import de.nrw.hbz.genericSipLoader.edm.model.OaiRecord;
-import de.nrw.hbz.genericSipLoader.edm.model.ProvidedCHO;
-import de.nrw.hbz.genericSipLoader.edm.model.Rdf;
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeAggregation;
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeOaiPmh;
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeProvidedCHO;
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeResourceAttribute;
+import de.nrw.hbz.edm.model.Aggregation;
+import de.nrw.hbz.edm.model.OaiPmh;
+import de.nrw.hbz.edm.model.OaiRecord;
+import de.nrw.hbz.edm.model.ProvidedCHO;
+import de.nrw.hbz.edm.model.Rdf;
+import de.nrw.hbz.edm.model.serialize.SerializeAggregation;
+import de.nrw.hbz.edm.model.serialize.SerializeOaiPmh;
+import de.nrw.hbz.edm.model.serialize.SerializeProvidedCHO;
+import de.nrw.hbz.edm.model.serialize.SerializeResourceAttribute;
 
 /**
  * 

diff --git a/...SipLoader/edm/impl/DeserializeEdmXml.java → ...e/nrw/hbz/edm/impl/DeserializeEdmXml.java b/...SipLoader/edm/impl/DeserializeEdmXml.java → ...e/nrw/hbz/edm/impl/DeserializeEdmXml.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.impl;
+package de.nrw.hbz.edm.impl;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -14,8 +14,8 @@
 import com.fasterxml.jackson.databind.DatabindException;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 
-import de.nrw.hbz.genericSipLoader.edm.model.Rdf;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeRdf;
+import de.nrw.hbz.edm.model.Rdf;
+import de.nrw.hbz.edm.model.deserialize.DeserializeRdf;
 
 /**
  * 

diff --git a/...Loader/edm/impl/DeserializeOaiPmhXml.java → ...rw/hbz/edm/impl/DeserializeOaiPmhXml.java b/...Loader/edm/impl/DeserializeOaiPmhXml.java → ...rw/hbz/edm/impl/DeserializeOaiPmhXml.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.impl;
+package de.nrw.hbz.edm.impl;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -14,8 +14,8 @@
 import com.fasterxml.jackson.databind.DatabindException;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 
-import de.nrw.hbz.genericSipLoader.edm.model.OaiPmh;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeOaiPmh;
+import de.nrw.hbz.edm.model.OaiPmh;
+import de.nrw.hbz.edm.model.deserialize.DeserializeOaiPmh;
 
 /**
  * 

diff --git a/...bz/genericSipLoader/edm/impl/EdmImpl.java → ...ain/java/de/nrw/hbz/edm/impl/EdmImpl.java b/...bz/genericSipLoader/edm/impl/EdmImpl.java → ...ain/java/de/nrw/hbz/edm/impl/EdmImpl.java
@@ -1,9 +1,9 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.impl;
+package de.nrw.hbz.edm.impl;
 
-import de.nrw.hbz.genericSipLoader.edm.model.Rdf;
+import de.nrw.hbz.edm.model.Rdf;
 
 /**
  * 

diff --git a/...genericSipLoader/edm/impl/OaiPmhImpl.java → .../java/de/nrw/hbz/edm/impl/OaiPmhImpl.java b/...genericSipLoader/edm/impl/OaiPmhImpl.java → .../java/de/nrw/hbz/edm/impl/OaiPmhImpl.java
@@ -1,10 +1,10 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.impl;
+package de.nrw.hbz.edm.impl;
 
 
-import de.nrw.hbz.genericSipLoader.edm.model.OaiPmh;
+import de.nrw.hbz.edm.model.OaiPmh;
 
 /**
  * 

diff --git a/...enericSipLoader/edm/impl/QdcProvider.java → ...java/de/nrw/hbz/edm/impl/QdcProvider.java b/...enericSipLoader/edm/impl/QdcProvider.java → ...java/de/nrw/hbz/edm/impl/QdcProvider.java
@@ -1,14 +1,14 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.impl;
+package de.nrw.hbz.edm.impl;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 
-import de.nrw.hbz.genericSipLoader.edm.model.ProvidedCHO;
-import de.nrw.hbz.genericSipLoader.edm.model.Qdc;
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeQdc;
+import de.nrw.hbz.edm.model.ProvidedCHO;
+import de.nrw.hbz.edm.model.Qdc;
+import de.nrw.hbz.edm.model.serialize.SerializeQdc;
 
 /**
  * class that provides a Qualified Dublin Core (QDC) representation mapped from EDM

diff --git a/...icSipLoader/edm/impl/SerializeEdmXml.java → .../de/nrw/hbz/edm/impl/SerializeEdmXml.java b/...icSipLoader/edm/impl/SerializeEdmXml.java → .../de/nrw/hbz/edm/impl/SerializeEdmXml.java
@@ -1,17 +1,16 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.impl;
+package de.nrw.hbz.edm.impl;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeRdf;
-import de.nrw.hbz.genericSipLoader.impl.DipsLoaderImpl;
-import de.nrw.hbz.genericSipLoader.edm.model.Rdf;
+import de.nrw.hbz.edm.model.serialize.SerializeRdf;
+import de.nrw.hbz.edm.model.Rdf;
 
 /**
  * 

diff --git a/...ipLoader/edm/impl/SerializeOaiPmhXml.java → .../nrw/hbz/edm/impl/SerializeOaiPmhXml.java b/...ipLoader/edm/impl/SerializeOaiPmhXml.java → .../nrw/hbz/edm/impl/SerializeOaiPmhXml.java
@@ -1,13 +1,13 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.impl;
+package de.nrw.hbz.edm.impl;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeOaiPmh;
-import de.nrw.hbz.genericSipLoader.edm.model.OaiPmh;
+import de.nrw.hbz.edm.model.serialize.SerializeOaiPmh;
+import de.nrw.hbz.edm.model.OaiPmh;
 
 /**
  * 

diff --git a/...icSipLoader/edm/model/AboutAttribute.java → .../de/nrw/hbz/edm/model/AboutAttribute.java b/...icSipLoader/edm/model/AboutAttribute.java → .../de/nrw/hbz/edm/model/AboutAttribute.java
@@ -1,13 +1,13 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.model;
+package de.nrw.hbz.edm.model;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeAboutAttribute;
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeAboutAttribute;
+import de.nrw.hbz.edm.model.deserialize.DeserializeAboutAttribute;
+import de.nrw.hbz.edm.model.serialize.SerializeAboutAttribute;
 
 /**
  * 

diff --git a/...nericSipLoader/edm/model/Aggregation.java → ...ava/de/nrw/hbz/edm/model/Aggregation.java b/...nericSipLoader/edm/model/Aggregation.java → ...ava/de/nrw/hbz/edm/model/Aggregation.java
@@ -1,11 +1,11 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.model;
+package de.nrw.hbz.edm.model;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeAggregation;
+import de.nrw.hbz.edm.model.deserialize.DeserializeAggregation;
 
 /**
  * 

diff --git a/...genericSipLoader/edm/model/OaiHeader.java → .../java/de/nrw/hbz/edm/model/OaiHeader.java b/...genericSipLoader/edm/model/OaiHeader.java → .../java/de/nrw/hbz/edm/model/OaiHeader.java
@@ -1,4 +1,4 @@
-package de.nrw.hbz.genericSipLoader.edm.model;
+package de.nrw.hbz.edm.model;
 
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;

diff --git a/...nericSipLoader/edm/model/OaiMetadata.java → ...ava/de/nrw/hbz/edm/model/OaiMetadata.java b/...nericSipLoader/edm/model/OaiMetadata.java → ...ava/de/nrw/hbz/edm/model/OaiMetadata.java
@@ -1,13 +1,10 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.model;
+package de.nrw.hbz.edm.model;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeOaiMetadata;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeOaiMetadata;
+import de.nrw.hbz.edm.model.deserialize.DeserializeOaiMetadata;
 
 /**
  * 

diff --git a/...genericSipLoader/edm/model/OaiMethod.java → .../java/de/nrw/hbz/edm/model/OaiMethod.java b/...genericSipLoader/edm/model/OaiMethod.java → .../java/de/nrw/hbz/edm/model/OaiMethod.java
@@ -1,15 +1,14 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.model;
+package de.nrw.hbz.edm.model;
 
 import java.util.ArrayList;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeOaiMethod;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeOaiMethod;
+import de.nrw.hbz.edm.model.deserialize.DeserializeOaiMethod;
 /**
  * 
  */

diff --git a/...bz/genericSipLoader/edm/model/OaiPmh.java → ...ain/java/de/nrw/hbz/edm/model/OaiPmh.java b/...bz/genericSipLoader/edm/model/OaiPmh.java → ...ain/java/de/nrw/hbz/edm/model/OaiPmh.java
@@ -1,16 +1,13 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.model;
+package de.nrw.hbz.edm.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeOaiPmh;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeOaiPmh;
+import de.nrw.hbz.edm.model.deserialize.DeserializeOaiPmh;
 
 /**
  * 

diff --git a/...genericSipLoader/edm/model/OaiRecord.java → .../java/de/nrw/hbz/edm/model/OaiRecord.java b/...genericSipLoader/edm/model/OaiRecord.java → .../java/de/nrw/hbz/edm/model/OaiRecord.java
@@ -1,13 +1,11 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.model;
+package de.nrw.hbz.edm.model;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeOaiRecord;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeOaiRecord;
+import de.nrw.hbz.edm.model.deserialize.DeserializeOaiRecord;
 
 /**
  * 

diff --git a/...nericSipLoader/edm/model/ProvidedCHO.java → ...ava/de/nrw/hbz/edm/model/ProvidedCHO.java b/...nericSipLoader/edm/model/ProvidedCHO.java → ...ava/de/nrw/hbz/edm/model/ProvidedCHO.java
@@ -1,21 +1,13 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.model;
+package de.nrw.hbz.edm.model;
 
 import java.util.ArrayList;
-import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeProvidedCHO;
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeResourceAttribute;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeProvidedCHO;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeRdf;
+import de.nrw.hbz.edm.model.deserialize.DeserializeProvidedCHO;
 
 /**
  * 

diff --git a/...w/hbz/genericSipLoader/edm/model/Qdc.java → src/main/java/de/nrw/hbz/edm/model/Qdc.java b/...w/hbz/genericSipLoader/edm/model/Qdc.java → src/main/java/de/nrw/hbz/edm/model/Qdc.java
@@ -1,11 +1,11 @@
-package de.nrw.hbz.genericSipLoader.edm.model;
+package de.nrw.hbz.edm.model;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeQdc;
+import de.nrw.hbz.edm.model.deserialize.DeserializeQdc;
 
 @JsonDeserialize(as = DeserializeQdc.class)
 // @JsonSerialize(as = SerializeRdf.class)

diff --git a/...w/hbz/genericSipLoader/edm/model/Rdf.java → src/main/java/de/nrw/hbz/edm/model/Rdf.java b/...w/hbz/genericSipLoader/edm/model/Rdf.java → src/main/java/de/nrw/hbz/edm/model/Rdf.java
@@ -1,16 +1,11 @@
-package de.nrw.hbz.genericSipLoader.edm.model;
+package de.nrw.hbz.edm.model;
 
 import java.util.ArrayList;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeRdf;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeRdf;
+import de.nrw.hbz.edm.model.deserialize.DeserializeRdf;
 
 @JsonDeserialize(as = DeserializeRdf.class)
 // @JsonSerialize(as = SerializeRdf.class)

diff --git a/...ipLoader/edm/model/ResourceAttribute.java → .../nrw/hbz/edm/model/ResourceAttribute.java b/...ipLoader/edm/model/ResourceAttribute.java → .../nrw/hbz/edm/model/ResourceAttribute.java
@@ -1,14 +1,12 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.model;
+package de.nrw.hbz.edm.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeResourceAttribute;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeResourceAttribute;
+import de.nrw.hbz.edm.model.deserialize.DeserializeResourceAttribute;
 
 /**
  * 

diff --git a/...nericSipLoader/edm/model/WebResource.java → ...ava/de/nrw/hbz/edm/model/WebResource.java b/...nericSipLoader/edm/model/WebResource.java → ...ava/de/nrw/hbz/edm/model/WebResource.java
@@ -1,22 +1,13 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.model;
+package de.nrw.hbz.edm.model;
 
 import java.util.ArrayList;
-import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeProvidedCHO;
-import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeResourceAttribute;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeProvidedCHO;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeRdf;
-import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeWebResource;
+import de.nrw.hbz.edm.model.deserialize.DeserializeWebResource;
 
 /**
  * 

diff --git a/...eserialize/DeserializeAboutAttribute.java → ...eserialize/DeserializeAboutAttribute.java b/...eserialize/DeserializeAboutAttribute.java → ...eserialize/DeserializeAboutAttribute.java
@@ -1,11 +1,11 @@
 /**
  * 
  */
-package de.nrw.hbz.genericSipLoader.edm.model.deserialize;
+package de.nrw.hbz.edm.model.deserialize;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
-import de.nrw.hbz.genericSipLoader.edm.model.AboutAttribute;
+import de.nrw.hbz.edm.model.AboutAttribute;
 
 /**
  *