#368 reset mongodb collection names

server/src/main/scala/kpn/database/base/DatabaseImpl.scala

@@ -50,111 +50,111 @@ class DatabaseImpl(val database: MongoDatabase) extends Database {
  }
 
  override def networks: DatabaseCollection[NetworkDoc] = {
- new DatabaseCollectionImpl(database.getCollection[NetworkDoc]("old-networks"))
+ new DatabaseCollectionImpl(database.getCollection[NetworkDoc]("networks"))
  }
 
  override def networkInfos: DatabaseCollection[NetworkInfoDoc] = {
- new DatabaseCollectionImpl(database.getCollection[NetworkInfoDoc]("old-network-infos"))
+ new DatabaseCollectionImpl(database.getCollection[NetworkInfoDoc]("network-infos"))
  }
 
  override def nodes: DatabaseCollection[NodeDoc] = {
- new DatabaseCollectionImpl(database.getCollection[NodeDoc]("old-nodes"))
+ new DatabaseCollectionImpl(database.getCollection[NodeDoc]("nodes"))
  }
 
  override def orphanNodes: DatabaseCollection[OrphanNodeDoc] = {
- new DatabaseCollectionImpl(database.getCollection[OrphanNodeDoc]("old-orphan-nodes"))
+ new DatabaseCollectionImpl(database.getCollection[OrphanNodeDoc]("orphan-nodes"))
  }
 
  override def routes: DatabaseCollection[RouteDoc] = {
- new DatabaseCollectionImpl(database.getCollection[RouteDoc]("old-routes"))
+ new DatabaseCollectionImpl(database.getCollection[RouteDoc]("routes"))
  }
 
  override def orphanRoutes: DatabaseCollection[OrphanRouteDoc] = {
- new DatabaseCollectionImpl(database.getCollection[OrphanRouteDoc]("old-orphan-routes"))
+ new DatabaseCollectionImpl(database.getCollection[OrphanRouteDoc]("orphan-routes"))
  }
 
  override def networkChanges: DatabaseCollection[NetworkChange] = {
- new DatabaseCollectionImpl(database.getCollection[NetworkChange]("old-network-changes"))
+ new DatabaseCollectionImpl(database.getCollection[NetworkChange]("network-changes"))
  }
 
  override def networkInfoChanges: DatabaseCollection[NetworkInfoChange] = {
- new DatabaseCollectionImpl(database.getCollection[NetworkInfoChange]("old-network-info-changes"))
+ new DatabaseCollectionImpl(database.getCollection[NetworkInfoChange]("network-info-changes"))
  }
 
  override def routeChanges: DatabaseCollection[RouteChange] = {
- new DatabaseCollectionImpl(database.getCollection[RouteChange]("old-route-changes"))
+ new DatabaseCollectionImpl(database.getCollection[RouteChange]("route-changes"))
  }
 
  override def nodeChanges: DatabaseCollection[NodeChange] = {
- new DatabaseCollectionImpl(database.getCollection[NodeChange]("old-node-changes"))
+ new DatabaseCollectionImpl(database.getCollection[NodeChange]("node-changes"))
  }
 
  override def changeSetComments: DatabaseCollection[ChangeSetComment] = {
- new DatabaseCollectionImpl(database.getCollection[ChangeSetComment]("old-changeset-comments"))
+ new DatabaseCollectionImpl(database.getCollection[ChangeSetComment]("changeset-comments"))
  }
 
  override def changes: DatabaseCollection[ChangeSetSummary] = {
- new DatabaseCollectionImpl(database.getCollection[ChangeSetSummary]("old-changes"))
+ new DatabaseCollectionImpl(database.getCollection[ChangeSetSummary]("changes"))
  }
 
  override def nodeNetworkRefs: DatabaseCollection[NodeNetworkRef] = {
- new DatabaseCollectionImpl(database.getCollection[NodeNetworkRef]("old-node-network-refs"))
+ new DatabaseCollectionImpl(database.getCollection[NodeNetworkRef]("node-network-refs"))
  }
 
  override def routeNetworkRefs: DatabaseCollection[RouteNetworkRef] = {
- new DatabaseCollectionImpl(database.getCollection[RouteNetworkRef]("old-route-network-refs"))
+ new DatabaseCollectionImpl(database.getCollection[RouteNetworkRef]("route-network-refs"))
  }
 
  override def changeSets: DatabaseCollection[ChangeSetInfo] = {
- new DatabaseCollectionImpl(database.getCollection[ChangeSetInfo]("old-changesets"))
+ new DatabaseCollectionImpl(database.getCollection[ChangeSetInfo]("changesets"))
  }
 
  override def pois: DatabaseCollection[Poi] = {
- new DatabaseCollectionImpl(database.getCollection[Poi]("old-pois"))
+ new DatabaseCollectionImpl(database.getCollection[Poi]("pois"))
  }
 
  override def poiStates: DatabaseCollection[PoiState] = {
- new DatabaseCollectionImpl(database.getCollection[PoiState]("old-poi-states"))
+ new DatabaseCollectionImpl(database.getCollection[PoiState]("poi-states"))
  }
 
  override def tasks: DatabaseCollection[Task] = {
  new DatabaseCollectionImpl(database.getCollection[Task]("tasks"))
  }
 
  override def monitorGroups: DatabaseCollection[MonitorGroup] = {
- new DatabaseCollectionImpl(database.getCollection[MonitorGroup]("old-monitor-groups"))
+ new DatabaseCollectionImpl(database.getCollection[MonitorGroup]("monitor-groups"))
  }
 
  override def monitorRoutes: DatabaseCollection[MonitorRoute] = {
- new DatabaseCollectionImpl(database.getCollection[MonitorRoute]("old-monitor-routes"))
+ new DatabaseCollectionImpl(database.getCollection[MonitorRoute]("monitor-routes"))
  }
 
  override def monitorRouteReferences: DatabaseCollection[MonitorRouteReference] = {
- new DatabaseCollectionImpl(database.getCollection[MonitorRouteReference]("old-monitor-route-references"))
+ new DatabaseCollectionImpl(database.getCollection[MonitorRouteReference]("monitor-route-references"))
  }
 
  override def monitorRouteStates: DatabaseCollection[MonitorRouteState] = {
- new DatabaseCollectionImpl(database.getCollection[MonitorRouteState]("old-monitor-route-states"))
+ new DatabaseCollectionImpl(database.getCollection[MonitorRouteState]("monitor-route-states"))
  }
 
  override def monitorRouteChanges: DatabaseCollection[MonitorRouteChange] = {
- new DatabaseCollectionImpl(database.getCollection[MonitorRouteChange]("old-monitor-route-changes"))
+ new DatabaseCollectionImpl(database.getCollection[MonitorRouteChange]("monitor-route-changes"))
  }
 
  override def monitorRouteChangeGeometries: DatabaseCollection[MonitorRouteChangeGeometry] = {
- new DatabaseCollectionImpl(database.getCollection[MonitorRouteChangeGeometry]("old-monitor-route-change-geometries"))
+ new DatabaseCollectionImpl(database.getCollection[MonitorRouteChangeGeometry]("monitor-route-change-geometries"))
  }
 
  override def monitorRelations: DatabaseCollection[MonitorRelation] = {
- new DatabaseCollectionImpl(database.getCollection[MonitorRelation]("old-monitor-relations"))
+ new DatabaseCollectionImpl(database.getCollection[MonitorRelation]("monitor-relations"))
  }
 
  override def monitorTasks: DatabaseCollection[MonitorTask] = {
  new DatabaseCollectionImpl(database.getCollection[MonitorTask]("monitor-tasks"))
  }
 
  override def statistics: DatabaseCollection[StatisticLongValues] = {
- new DatabaseCollectionImpl(database.getCollection[StatisticLongValues]("old-statistics"))
+ new DatabaseCollectionImpl(database.getCollection[StatisticLongValues]("statistics"))
  }
 
  override def status: DatabaseCollection[WithStringId] = {

server/src/main/scala/kpn/database/base/OldDatabase.scala

@@ -0,0 +1,104 @@
+package kpn.database.base
+
+import kpn.api.base.WithStringId
+import kpn.api.common.ChangeSetSummary
+import kpn.api.common.PoiState
+import kpn.api.common.changes.ChangeSetInfo
+import kpn.api.common.changes.details.NetworkInfoChange
+import kpn.api.common.changes.details.NodeChange
+import kpn.api.common.changes.details.RouteChange
+import kpn.api.common.common.User
+import kpn.api.common.poi.Poi
+import kpn.core.doc.ChangeSetComment
+import kpn.core.doc.NetworkDoc
+import kpn.core.doc.NetworkInfoDoc
+import kpn.core.doc.NodeDoc
+import kpn.core.doc.NodeNetworkRef
+import kpn.core.doc.OrphanNodeDoc
+import kpn.core.doc.OrphanRouteDoc
+import kpn.core.doc.RouteDoc
+import kpn.core.doc.RouteNetworkRef
+import kpn.core.doc.Task
+import kpn.database.actions.statistics.StatisticLongValues
+import kpn.server.analyzer.engine.changes.data.Blacklist
+import kpn.server.analyzer.engine.changes.network.NetworkChange
+import kpn.server.monitor.domain.MonitorGroup
+import kpn.server.monitor.domain.MonitorRelation
+import kpn.server.monitor.domain.MonitorRoute
+import kpn.server.monitor.domain.MonitorRouteChange
+import kpn.server.monitor.domain.MonitorRouteChangeGeometry
+import kpn.server.monitor.domain.MonitorRouteReference
+import kpn.server.monitor.domain.MonitorRouteState
+import kpn.server.monitor.domain.MonitorTask
+import org.mongodb.scala.MongoCollection
+
+import scala.reflect.ClassTag
+
+trait OldDatabase {
+
+ def getCollection[T: ClassTag](collectionName: String): MongoCollection[T]
+
+ def empty: DatabaseCollection[Any]
+
+ def networks: DatabaseCollection[NetworkDoc]
+
+ def networkInfos: DatabaseCollection[NetworkInfoDoc]
+
+ def nodes: DatabaseCollection[NodeDoc]
+
+ def orphanNodes: DatabaseCollection[OrphanNodeDoc]
+
+ def routes: DatabaseCollection[RouteDoc]
+
+ def orphanRoutes: DatabaseCollection[OrphanRouteDoc]
+
+ def networkChanges: DatabaseCollection[NetworkChange]
+
+ def networkInfoChanges: DatabaseCollection[NetworkInfoChange]
+
+ def routeChanges: DatabaseCollection[RouteChange]
+
+ def nodeChanges: DatabaseCollection[NodeChange]
+
+ def changeSetComments: DatabaseCollection[ChangeSetComment]
+
+ def changes: DatabaseCollection[ChangeSetSummary]
+
+ def nodeNetworkRefs: DatabaseCollection[NodeNetworkRef]
+
+ def routeNetworkRefs: DatabaseCollection[RouteNetworkRef]
+
+ def changeSets: DatabaseCollection[ChangeSetInfo]
+
+ def pois: DatabaseCollection[Poi]
+
+ def poiStates: DatabaseCollection[PoiState]
+
+ def tasks: DatabaseCollection[Task]
+
+ def monitorGroups: DatabaseCollection[MonitorGroup]
+
+ def monitorRoutes: DatabaseCollection[MonitorRoute]
+
+ def monitorRouteReferences: DatabaseCollection[MonitorRouteReference]
+
+ def monitorRouteStates: DatabaseCollection[MonitorRouteState]
+
+ def monitorRouteChanges: DatabaseCollection[MonitorRouteChange]
+
+ def monitorRouteChangeGeometries: DatabaseCollection[MonitorRouteChangeGeometry]
+
+ def monitorRelations: DatabaseCollection[MonitorRelation]
+
+ def monitorTasks: DatabaseCollection[MonitorTask]
+
+ def statistics: DatabaseCollection[StatisticLongValues]
+
+ def status: DatabaseCollection[WithStringId]
+
+ def blacklists: DatabaseCollection[Blacklist]
+
+ def dropDatabase(): Unit
+
+ def users: DatabaseCollection[User]
+}