Skip to content

Commit 1c3d41a

Browse files
RoketFlameRoketFlame
committed
struct: huge refactor, now project include lib (with trees and repositories) and app (GUI)
1 parent 445c8fa commit 1c3d41a

31 files changed

+108
-332
lines changed

‎app/src/main/kotlin/composeApp/App.kt‎

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

‎app/src/main/kotlin/repo/JsonRepository.kt‎ renamed to ‎lib/src/main/kotlin/repository/JsonRepository.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package repo
6+
package repository
77

8-
import JsonNode
9-
import JsonTree
10-
import app.trees.AbstractTree
11-
import app.trees.nodes.AbstractNode
128
import kotlinx.serialization.decodeFromString
139
import kotlinx.serialization.encodeToString
1410
import kotlinx.serialization.json.Json
15-
import repo.serialization.SerializableNode
16-
import repo.serialization.SerializableTree
17-
import repo.serialization.strategies.Serialization
11+
import repository.jsonEntities.JsonNode
12+
import repository.jsonEntities.JsonTree
13+
import repository.serialization.SerializableNode
14+
import repository.serialization.SerializableTree
15+
import repository.serialization.strategies.Serialization
16+
import trees.AbstractTree
17+
import trees.nodes.AbstractNode
1818
import java.io.File
1919
import java.io.FileNotFoundException
2020

‎app/src/main/kotlin/repo/Neo4jRepository.kt‎ renamed to ‎lib/src/main/kotlin/repository/Neo4jRepository.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package repo
6+
package repository
77

8-
import app.trees.AbstractTree
9-
import app.trees.nodes.AbstractNode
108
import org.neo4j.ogm.config.Configuration
119
import org.neo4j.ogm.cypher.ComparisonOperator
1210
import org.neo4j.ogm.cypher.Filter
1311
import org.neo4j.ogm.cypher.Filters
1412
import org.neo4j.ogm.session.SessionFactory
15-
import repo.neo4jEntities.Neo4jNodeEntity
16-
import repo.neo4jEntities.Neo4jTreeEntity
17-
import repo.serialization.SerializableNode
18-
import repo.serialization.SerializableTree
19-
import repo.serialization.strategies.Serialization
13+
import repository.neo4jEntities.Neo4jNodeEntity
14+
import repository.neo4jEntities.Neo4jTreeEntity
15+
import repository.serialization.SerializableNode
16+
import repository.serialization.SerializableTree
17+
import repository.serialization.strategies.Serialization
18+
import trees.AbstractTree
19+
import trees.nodes.AbstractNode
2020

2121
class Neo4jRepo<T : Comparable<T>,
2222
NodeType : AbstractNode<T, NodeType>,
2323
TreeType : AbstractTree<T, NodeType>>(
2424
strategy: Serialization<T, NodeType, TreeType, *>,
2525
configuration: Configuration
2626
) : Repository<T, NodeType, TreeType>(strategy) {
27-
private val sessionFactory = SessionFactory(configuration, "repo")
27+
private val sessionFactory = SessionFactory(configuration, "repository")
2828
private val session = sessionFactory.openSession()
2929

3030
private fun Neo4jNodeEntity.toSerializableNode(): SerializableNode {

‎app/src/main/kotlin/repo/Repository.kt‎ renamed to ‎lib/src/main/kotlin/repository/Repository.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package repo
6+
package repository
77

8-
import app.trees.AbstractTree
9-
import app.trees.nodes.AbstractNode
10-
import repo.serialization.SerializableNode
11-
import repo.serialization.SerializableTree
12-
import repo.serialization.strategies.Serialization
8+
import repository.serialization.SerializableNode
9+
import repository.serialization.SerializableTree
10+
import repository.serialization.strategies.Serialization
11+
import trees.AbstractTree
12+
import trees.nodes.AbstractNode
1313

1414
abstract class Repository<T : Comparable<T>,
1515
NodeType : AbstractNode<T, NodeType>,

‎app/src/main/kotlin/repo/SQLRepository.kt‎ renamed to ‎lib/src/main/kotlin/repository/SQLRepository.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package repo
6+
package repository
77

8-
import NodesTable
9-
import SQLNodeEntity
10-
import SQLTreeEntity
11-
import TreesTable
12-
import app.trees.AbstractTree
13-
import app.trees.nodes.AbstractNode
148
import org.jetbrains.exposed.sql.Database
159
import org.jetbrains.exposed.sql.SchemaUtils
1610
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
1711
import org.jetbrains.exposed.sql.and
1812
import org.jetbrains.exposed.sql.deleteWhere
1913
import org.jetbrains.exposed.sql.transactions.transaction
20-
import repo.serialization.Metadata
21-
import repo.serialization.SerializableNode
22-
import repo.serialization.SerializableTree
23-
import repo.serialization.SerializableValue
24-
import repo.serialization.strategies.Serialization
14+
import repository.serialization.Metadata
15+
import repository.serialization.SerializableNode
16+
import repository.serialization.SerializableTree
17+
import repository.serialization.SerializableValue
18+
import repository.serialization.strategies.Serialization
19+
import repository.sqliteEntities.NodesTable
20+
import repository.sqliteEntities.SQLNodeEntity
21+
import repository.sqliteEntities.SQLTreeEntity
22+
import repository.sqliteEntities.TreesTable
23+
import trees.AbstractTree
24+
import trees.nodes.AbstractNode
2525

2626
class SQLRepository<T : Comparable<T>,
2727
NodeType : AbstractNode<T, NodeType>,

‎app/src/main/kotlin/repo/jsonEntities/JsonNode.kt‎ renamed to ‎lib/src/main/kotlin/repository/jsonEntities/JsonNode.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
package repository.jsonEntities
7+
68
import kotlinx.serialization.Serializable
7-
import repo.serialization.Metadata
8-
import repo.serialization.SerializableValue
9+
import repository.serialization.Metadata
10+
import repository.serialization.SerializableValue
911

1012

1113
@Serializable

‎app/src/main/kotlin/repo/jsonEntities/JsonTree.kt‎ renamed to ‎lib/src/main/kotlin/repository/jsonEntities/JsonTree.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
package repository.jsonEntities
7+
68

79
import kotlinx.serialization.Serializable
8-
import repo.serialization.TypeOfTree
10+
import repository.serialization.TypeOfTree
911

1012
@Serializable
1113
data class JsonTree(

‎app/src/main/kotlin/repo/neo4jEntities/Neo4jNodeEntity.kt‎ renamed to ‎lib/src/main/kotlin/repository/neo4jEntities/Neo4jNodeEntity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package repo.neo4jEntities
6+
package repository.neo4jEntities
77

88
import org.neo4j.ogm.annotation.*
9-
import repo.serialization.Metadata
10-
import repo.serialization.SerializableValue
9+
import repository.serialization.Metadata
10+
import repository.serialization.SerializableValue
1111

1212
@NodeEntity("Node")
1313
class Neo4jNodeEntity(

0 commit comments

Comments
 (0)