Refactor org.memobase to ch.memobase

src/main/kotlin/helpers/DateFacetBuildHelpers.kt → src/main/kotlin/ch/memobase/helpers/DateFacetBuildHelpers.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.memobase.helpers
+package ch.memobase.helpers
 
 import org.apache.logging.log4j.LogManager
 

src/main/kotlin/helpers/DocumentResponseSource.kt → src/main/kotlin/ch/memobase/helpers/DocumentResponseSource.kt

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.memobase.helpers
+package ch.memobase.helpers
 
 data class DocumentResponseSource(
     val id: String,

src/main/kotlin/helpers/ElasticSearchWrapper.kt → src/main/kotlin/ch/memobase/helpers/ElasticSearchWrapper.kt

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.memobase.helpers
+package ch.memobase.helpers
 
 import com.beust.klaxon.Klaxon
 import com.beust.klaxon.KlaxonException
@@ -34,8 +34,8 @@ import org.elasticsearch.index.query.QueryBuilders.boolQuery
 import org.elasticsearch.index.query.QueryBuilders.termQuery
 import org.elasticsearch.search.Scroll
 import org.elasticsearch.search.builder.SearchSourceBuilder
-import org.memobase.model.FacetContainer
-import org.memobase.model.LanguageContainer
+import ch.memobase.model.FacetContainer
+import ch.memobase.model.LanguageContainer
 
 
 /**

src/main/kotlin/helpers/Extract.kt → src/main/kotlin/ch/memobase/helpers/Extract.kt

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.memobase.helpers
+package ch.memobase.helpers
 
 import com.beust.klaxon.JsonArray
 import com.beust.klaxon.JsonObject
 import org.apache.logging.log4j.LogManager
-import org.memobase.model.LanguageContainer
+import ch.memobase.model.LanguageContainer
 
 object Extract {
     private val log = LogManager.getLogger("ExtractHelper")

src/main/kotlin/helpers/FacetBuildHelpers.kt → src/main/kotlin/ch/memobase/helpers/FacetBuildHelpers.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.memobase.helpers
+package ch.memobase.helpers
 
 import com.beust.klaxon.JsonObject
 import org.apache.logging.log4j.LogManager

src/main/kotlin/helpers/Filter.kt → src/main/kotlin/ch/memobase/helpers/Filter.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.memobase.helpers
+package ch.memobase.helpers
 
 import ch.memobase.rdf.EBUCORE
 import com.beust.klaxon.JsonArray

src/main/kotlin/helpers/InstitutionAndRecordSetExtractionHelper.kt → src/main/kotlin/ch/memobase/helpers/InstitutionAndRecordSetExtractionHelper.kt

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.memobase.helpers
+package ch.memobase.helpers
 
 import ch.memobase.rdf.NS
 import com.beust.klaxon.JsonObject

src/main/kotlin/helpers/JsonUtility.kt → src/main/kotlin/ch/memobase/helpers/JsonUtility.kt

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.memobase.helpers
+package ch.memobase.helpers
 
 import ch.memobase.rdf.RICO
 import ch.memobase.rdf.RICO.Types
@@ -25,7 +25,8 @@ import com.beust.klaxon.Klaxon
 import com.beust.klaxon.KlaxonException
 import java.io.StringReader
 import org.apache.logging.log4j.LogManager
-import org.memobase.model.UpdateQuery
+import ch.memobase.model.UpdateQuery
+import ch.memobase.helpers.Constants.CorporateBodyType
 
 object JsonUtility {
 
@@ -63,7 +64,7 @@ object JsonUtility {
                 it[RICO.type.localName] !in listOf(Types.RecordSet.original, Types.RecordSet.related)
             ) {
                 Pair(recordSetTag, it)
-            } else if (it[Constants.atType] == RICO.CorporateBody.uri && it[Constants.ricoType] == Constants.CorporateBodyType.memobaseInstitution) {
+            } else if (it[Constants.atType] == RICO.CorporateBody.uri && it[Constants.ricoType] == CorporateBodyType.memobaseInstitution) {
                 Pair(institutionTag, it)
             } else {
                 Pair(it[Constants.entityId] as String, it)

src/main/kotlin/helpers/LoadFile.kt → src/main/kotlin/ch/memobase/helpers/LoadFile.kt

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.memobase.helpers
+package ch.memobase.helpers
 
 import com.github.doyaaaaaken.kotlincsv.dsl.csvReader
-import org.memobase.model.FacetContainer
-import org.memobase.model.LanguageContainer
+import ch.memobase.model.FacetContainer
+import ch.memobase.model.LanguageContainer
 import java.io.File
 
 object LoadFile {

src/main/kotlin/helpers/TranslationMappers.kt → src/main/kotlin/ch/memobase/helpers/TranslationMappers.kt

@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.memobase.helpers
+package ch.memobase.helpers
 
-import org.memobase.model.FacetContainer
+import ch.memobase.model.FacetContainer
 
 class TranslationMappers(
     institutionTypeLabelsPath: String,

src/main/kotlin/helpers/UpdateQueryBuilder.kt → src/main/kotlin/ch/memobase/helpers/UpdateQueryBuilder.kt

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.memobase.helpers
+package ch.memobase.helpers
 
-import org.memobase.model.FacetContainer
-import org.memobase.model.LanguageContainer
-import org.memobase.model.UpdateQuery
+import ch.memobase.model.FacetContainer
+import ch.memobase.model.LanguageContainer
+import ch.memobase.model.UpdateQuery
 
 class UpdateQueryBuilder {
     private val recordSetFacetTerm = "recordSet.facet"

src/main/kotlin/model/AgentWithRelationContainer.kt → src/main/kotlin/ch/memobase/model/AgentWithRelationContainer.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.memobase.model
+package ch.memobase.model
 
 import com.fasterxml.jackson.annotation.JsonInclude
 

src/main/kotlin/model/DateContainer.kt → src/main/kotlin/ch/memobase/model/DateContainer.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.memobase.model
+package ch.memobase.model
 
 import com.fasterxml.jackson.annotation.JsonInclude
 

src/main/kotlin/model/DocumentsSearchDoc.kt → src/main/kotlin/ch/memobase/model/DocumentsSearchDoc.kt

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.memobase.model
+package ch.memobase.model
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonInclude
-import org.memobase.model.SimpleFacetContainer.Companion
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 data class DocumentsSearchDoc(

src/main/kotlin/model/EnrichedDigitalMetadata.kt → src/main/kotlin/ch/memobase/model/EnrichedDigitalMetadata.kt

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.memobase.model
+package ch.memobase.model
 
 import com.fasterxml.jackson.annotation.JsonInclude
 

src/main/kotlin/model/EnrichedFacetContainer.kt → src/main/kotlin/ch/memobase/model/EnrichedFacetContainer.kt

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.memobase.model
+package ch.memobase.model
 
 import com.fasterxml.jackson.annotation.JsonInclude
 

src/main/kotlin/model/FacetContainer.kt → src/main/kotlin/ch/memobase/model/FacetContainer.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.memobase.model
+package ch.memobase.model
 
 import com.fasterxml.jackson.annotation.JsonInclude
 

src/main/kotlin/model/InstitutionSearchDoc.kt → src/main/kotlin/ch/memobase/model/InstitutionSearchDoc.kt

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.memobase.model
+package ch.memobase.model
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonInclude
-import org.memobase.helpers.Date
+import ch.memobase.helpers.Date
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 data class InstitutionSearchDoc(

src/main/kotlin/model/IntegerRange.kt → src/main/kotlin/ch/memobase/model/IntegerRange.kt

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.memobase.model
+package ch.memobase.model
 
 data class IntegerRange(
         val gte: Int,

src/main/kotlin/model/LanguageContainer.kt → src/main/kotlin/ch/memobase/model/LanguageContainer.kt

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.memobase.model
+package ch.memobase.model
 
 import com.fasterxml.jackson.annotation.JsonInclude
-import org.memobase.helpers.Constants
+import ch.memobase.helpers.Constants
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 data class LanguageContainer(