Skip to content

Commit 8c66822

Browse files
author
lisa.walter
committed
refactor(analysis): move filter (#3990)
1 parent 4614f12 commit 8c66822

File tree

89 files changed

+71
-74
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+71
-74
lines changed

Diff for: ‎analysis/filter/EdgeFilter/README.md renamed to ‎analysis/analysers/filter/EdgeFilter/README.md

Diff for: ‎analysis/filter/EdgeFilter/build.gradle.kts renamed to ‎analysis/analysers/filter/EdgeFilter/build.gradle.kts

File renamed without changes.

Diff for: ‎analysis/filter/EdgeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/edgefilter/EdgeFilter.kt renamed to ‎analysis/analysers/filter/EdgeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/edgefilter/EdgeFilter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.edgefilter
1+
package de.maibornwolff.codecharta.analysers.filter.edgefilter
22

33
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.InteractiveParser
44
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.ParserDialogInterface

Diff for: ‎analysis/filter/EdgeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/edgefilter/EdgeProjectBuilder.kt renamed to ‎analysis/analysers/filter/EdgeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/edgefilter/EdgeProjectBuilder.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.edgefilter
1+
package de.maibornwolff.codecharta.analysers.filter.edgefilter
22

33
import de.maibornwolff.codecharta.model.AttributeDescriptor
44
import de.maibornwolff.codecharta.model.AttributeType

Diff for: ‎analysis/filter/EdgeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/edgefilter/ParserDialog.kt renamed to ‎analysis/analysers/filter/EdgeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/edgefilter/ParserDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.edgefilter
1+
package de.maibornwolff.codecharta.analysers.filter.edgefilter
22

33
import com.varabyte.kotter.runtime.RunScope
44
import com.varabyte.kotter.runtime.Session

Diff for: ‎analysis/filter/EdgeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/edgefilter/EdgeFilterTest.kt renamed to ‎analysis/analysers/filter/EdgeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/edgefilter/EdgeFilterTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package de.maibornwolff.codecharta.filter.edgefilter
1+
package de.maibornwolff.codecharta.analysers.filter.edgefilter
22

3-
import de.maibornwolff.codecharta.filter.edgefilter.EdgeFilter.Companion.main
3+
import de.maibornwolff.codecharta.analysers.filter.edgefilter.EdgeFilter.Companion.main
44
import de.maibornwolff.codecharta.util.InputHelper
55
import io.mockk.every
66
import io.mockk.mockkObject

Diff for: ‎analysis/filter/EdgeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/edgefilter/ParserDialogTest.kt renamed to ‎analysis/analysers/filter/EdgeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/edgefilter/ParserDialogTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package de.maibornwolff.codecharta.filter.edgefilter
1+
package de.maibornwolff.codecharta.analysers.filter.edgefilter
22

33
import com.varabyte.kotter.foundation.input.Keys
44
import com.varabyte.kotter.runtime.RunScope
55
import com.varabyte.kotter.runtime.terminal.inmemory.press
66
import com.varabyte.kotter.runtime.terminal.inmemory.type
77
import com.varabyte.kotterx.test.foundation.testSession
8-
import de.maibornwolff.codecharta.filter.edgefilter.ParserDialog.Companion.collectParserArgs
8+
import de.maibornwolff.codecharta.analysers.filter.edgefilter.ParserDialog.Companion.collectParserArgs
99
import io.mockk.every
1010
import io.mockk.mockkObject
1111
import org.assertj.core.api.Assertions.assertThat

Diff for: ‎analysis/filter/EdgeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/edgefilter/ProjectMergerTest.kt renamed to ‎analysis/analysers/filter/EdgeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/edgefilter/ProjectMergerTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.edgefilter
1+
package de.maibornwolff.codecharta.analysers.filter.edgefilter
22

33
import de.maibornwolff.codecharta.model.AttributeDescriptor
44
import de.maibornwolff.codecharta.model.Node

Diff for: ‎analysis/filter/EdgeFilter/src/test/resources/coupling-empty-nodes.json renamed to ‎analysis/analysers/filter/EdgeFilter/src/test/resources/coupling-empty-nodes.json

File renamed without changes.

Diff for: ‎analysis/filter/EdgeFilter/src/test/resources/coupling.cc.json renamed to ‎analysis/analysers/filter/EdgeFilter/src/test/resources/coupling.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/EdgeFilter/src/test/resources/coupling.json renamed to ‎analysis/analysers/filter/EdgeFilter/src/test/resources/coupling.json

File renamed without changes.

Diff for: ‎analysis/filter/EdgeFilter/src/test/resources/empty-but-descriptors.json renamed to ‎analysis/analysers/filter/EdgeFilter/src/test/resources/empty-but-descriptors.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/README.md renamed to ‎analysis/analysers/filter/MergeFilter/README.md

Diff for: ‎analysis/filter/MergeFilter/build.gradle.kts renamed to ‎analysis/analysers/filter/MergeFilter/build.gradle.kts

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/LargeMerge.kt renamed to ‎analysis/analysers/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/LargeMerge.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.mergefilter
1+
package de.maibornwolff.codecharta.analysers.filter.mergefilter
22

33
import de.maibornwolff.codecharta.model.BlacklistItem
44
import de.maibornwolff.codecharta.model.Edge

Diff for: ‎analysis/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/LeafNodeMergerStrategy.kt renamed to ‎analysis/analysers/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/LeafNodeMergerStrategy.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.mergefilter
1+
package de.maibornwolff.codecharta.analysers.filter.mergefilter
22

33
import de.maibornwolff.codecharta.model.MutableNode
44
import de.maibornwolff.codecharta.model.Path

Diff for: ‎analysis/analysers/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/MergeException.kt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package de.maibornwolff.codecharta.analysers.filter.mergefilter
2+
3+
class MergeException(s: String) : RuntimeException(s)

Diff for: ‎analysis/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/MergeFilter.kt renamed to ‎analysis/analysers/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/MergeFilter.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package de.maibornwolff.codecharta.filter.mergefilter
1+
package de.maibornwolff.codecharta.analysers.filter.mergefilter
22

3+
import de.maibornwolff.codecharta.analysers.filter.mergefilter.ParserDialog.Companion.askForceMerge
4+
import de.maibornwolff.codecharta.analysers.filter.mergefilter.ParserDialog.Companion.requestMimoFileSelection
5+
import de.maibornwolff.codecharta.analysers.filter.mergefilter.mimo.Mimo
36
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.InteractiveParser
47
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.ParserDialogInterface
58
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.runInTerminalSession
69
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.util.CodeChartaConstants
7-
import de.maibornwolff.codecharta.filter.mergefilter.ParserDialog.Companion.askForceMerge
8-
import de.maibornwolff.codecharta.filter.mergefilter.ParserDialog.Companion.requestMimoFileSelection
9-
import de.maibornwolff.codecharta.filter.mergefilter.mimo.Mimo
1010
import de.maibornwolff.codecharta.model.Project
1111
import de.maibornwolff.codecharta.serialization.ProjectDeserializer
1212
import de.maibornwolff.codecharta.serialization.ProjectSerializer

Diff for: ‎analysis/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/NodeMergerStrategy.kt renamed to ‎analysis/analysers/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/NodeMergerStrategy.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.mergefilter
1+
package de.maibornwolff.codecharta.analysers.filter.mergefilter
22

33
import de.maibornwolff.codecharta.model.MutableNode
44

Diff for: ‎analysis/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/ParserDialog.kt renamed to ‎analysis/analysers/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/ParserDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.mergefilter
1+
package de.maibornwolff.codecharta.analysers.filter.mergefilter
22

33
import com.varabyte.kotter.runtime.RunScope
44
import com.varabyte.kotter.runtime.Session

Diff for: ‎analysis/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/ProjectMerger.kt renamed to ‎analysis/analysers/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/ProjectMerger.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.mergefilter
1+
package de.maibornwolff.codecharta.analysers.filter.mergefilter
22

33
import de.maibornwolff.codecharta.model.AttributeDescriptor
44
import de.maibornwolff.codecharta.model.AttributeType

Diff for: ‎analysis/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/RecursiveNodeMergerStrategy.kt renamed to ‎analysis/analysers/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/RecursiveNodeMergerStrategy.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.mergefilter
1+
package de.maibornwolff.codecharta.analysers.filter.mergefilter
22

33
import de.maibornwolff.codecharta.model.MutableNode
44
import de.maibornwolff.codecharta.util.Logger

Diff for: ‎analysis/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/mimo/Mimo.kt renamed to ‎analysis/analysers/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/mimo/Mimo.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package de.maibornwolff.codecharta.filter.mergefilter.mimo
1+
package de.maibornwolff.codecharta.analysers.filter.mergefilter.mimo
22

3+
import de.maibornwolff.codecharta.analysers.filter.mergefilter.ParserDialog
34
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.runInTerminalSession
4-
import de.maibornwolff.codecharta.filter.mergefilter.ParserDialog
55
import de.maibornwolff.codecharta.util.Logger
66
import java.io.File
77

Diff for: ‎analysis/filter/MergeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/mergefilter/LeafNodeMergerTest.kt renamed to ‎analysis/analysers/filter/MergeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/mergefilter/LeafNodeMergerTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.mergefilter
1+
package de.maibornwolff.codecharta.analysers.filter.mergefilter
22

33
import de.maibornwolff.codecharta.model.MutableNode
44
import de.maibornwolff.codecharta.model.NodeType

Diff for: ‎analysis/filter/MergeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/mergefilter/MergeFilterTest.kt renamed to ‎analysis/analysers/filter/MergeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/mergefilter/MergeFilterTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package de.maibornwolff.codecharta.filter.mergefilter
1+
package de.maibornwolff.codecharta.analysers.filter.mergefilter
22

33
import com.varabyte.kotter.runtime.Session
44
import com.varabyte.kotterx.test.foundation.testSession
5+
import de.maibornwolff.codecharta.analysers.filter.mergefilter.MergeFilter.Companion.main
56
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.runInTerminalSession
6-
import de.maibornwolff.codecharta.filter.mergefilter.MergeFilter.Companion.main
77
import de.maibornwolff.codecharta.serialization.ProjectDeserializer
88
import io.mockk.every
99
import io.mockk.mockkObject

Diff for: ‎analysis/filter/MergeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/mergefilter/ParserDialogTest.kt renamed to ‎analysis/analysers/filter/MergeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/mergefilter/ParserDialogTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package de.maibornwolff.codecharta.filter.mergefilter
1+
package de.maibornwolff.codecharta.analysers.filter.mergefilter
22

33
import com.varabyte.kotter.foundation.input.Keys
44
import com.varabyte.kotter.runtime.RunScope
55
import com.varabyte.kotter.runtime.terminal.inmemory.press
66
import com.varabyte.kotter.runtime.terminal.inmemory.type
77
import com.varabyte.kotterx.test.foundation.testSession
8-
import de.maibornwolff.codecharta.filter.mergefilter.ParserDialog.Companion.collectParserArgs
9-
import de.maibornwolff.codecharta.filter.mergefilter.ParserDialog.Companion.testCallback
8+
import de.maibornwolff.codecharta.analysers.filter.mergefilter.ParserDialog.Companion.collectParserArgs
9+
import de.maibornwolff.codecharta.analysers.filter.mergefilter.ParserDialog.Companion.testCallback
1010
import io.mockk.every
1111
import io.mockk.mockkObject
1212
import io.mockk.unmockkAll

Diff for: ‎analysis/filter/MergeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/mergefilter/ProjectMergerTest.kt renamed to ‎analysis/analysers/filter/MergeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/mergefilter/ProjectMergerTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.mergefilter
1+
package de.maibornwolff.codecharta.analysers.filter.mergefilter
22

33
import de.maibornwolff.codecharta.model.AttributeDescriptor
44
import de.maibornwolff.codecharta.model.Project

Diff for: ‎analysis/filter/MergeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/mergefilter/RecursiveNodeMergerTest.kt renamed to ‎analysis/analysers/filter/MergeFilter/src/test/kotlin/de/maibornwolff/codecharta/filter/mergefilter/RecursiveNodeMergerTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.mergefilter
1+
package de.maibornwolff.codecharta.analysers.filter.mergefilter
22

33
import de.maibornwolff.codecharta.model.MutableNode
44
import de.maibornwolff.codecharta.model.NodeType

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/descriptorTest1.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/descriptorTest1.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/descriptorTest2.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/descriptorTest2.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/largeMerge/duplicate/customRootFailure.cc.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/largeMerge/duplicate/customRootFailure.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/largeMerge/duplicate/testProject.beta.cc.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/largeMerge/duplicate/testProject.beta.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/largeMerge/testEdges1.cc.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/largeMerge/testEdges1.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/largeMerge/testProject.alpha.cc.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/largeMerge/testProject.alpha.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/mergeFolderNoOverlap/file1_no_overlap.cc.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/mergeFolderNoOverlap/file1_no_overlap.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/mergeFolderNoOverlap/file2_no_overlap.cc.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/mergeFolderNoOverlap/file2_no_overlap.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/mergeFolderTest/.doNotScan renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/mergeFolderTest/.doNotScan

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/mergeFolderTest/file1.cc.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/mergeFolderTest/file1.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/mergeFolderTest/file2.cc.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/mergeFolderTest/file2.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/mergeFolderTest/invalid.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/mergeFolderTest/invalid.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/mimoFileSelection/testProject.alpha.cc.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/mimoFileSelection/testProject.alpha.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/mimoFileSelection/testProject.beta.cc.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/mimoFileSelection/testProject.beta.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/mimoFileSelection/testProjectX.notIncl.cc.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/mimoFileSelection/testProjectX.notIncl.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/mimoOverlap/prefix.file1_no_overlap.cc.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/mimoOverlap/prefix.file1_no_overlap.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/mimoOverlap/prefix.file2_no_overlap.cc.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/mimoOverlap/prefix.file2_no_overlap.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/test.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/test.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/test2.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/test2.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/testEdges1.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/testEdges1.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/testEdges2.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/testEdges2.json

File renamed without changes.

Diff for: ‎analysis/filter/MergeFilter/src/test/resources/testProject.invalid.cc.json renamed to ‎analysis/analysers/filter/MergeFilter/src/test/resources/testProject.invalid.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/StructureModifier/README.md renamed to ‎analysis/analysers/filter/StructureModifier/README.md

Diff for: ‎analysis/filter/StructureModifier/build.gradle.kts renamed to ‎analysis/analysers/filter/StructureModifier/build.gradle.kts

File renamed without changes.

Diff for: ‎analysis/filter/StructureModifier/src/main/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/FolderMover.kt renamed to ‎analysis/analysers/filter/StructureModifier/src/main/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/FolderMover.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.structuremodifier
1+
package de.maibornwolff.codecharta.analysers.filter.structuremodifier
22

33
import de.maibornwolff.codecharta.model.AttributeDescriptor
44
import de.maibornwolff.codecharta.model.AttributeType

Diff for: ‎analysis/filter/StructureModifier/src/main/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/MetricRenamer.kt renamed to ‎analysis/analysers/filter/StructureModifier/src/main/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/MetricRenamer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.structuremodifier
1+
package de.maibornwolff.codecharta.analysers.filter.structuremodifier
22

33
import de.maibornwolff.codecharta.model.AttributeDescriptor
44
import de.maibornwolff.codecharta.model.AttributeType

Diff for: ‎analysis/filter/StructureModifier/src/main/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/NodeRemover.kt renamed to ‎analysis/analysers/filter/StructureModifier/src/main/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/NodeRemover.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.structuremodifier
1+
package de.maibornwolff.codecharta.analysers.filter.structuremodifier
22

33
import de.maibornwolff.codecharta.model.AttributeDescriptor
44
import de.maibornwolff.codecharta.model.AttributeType

Diff for: ‎analysis/filter/StructureModifier/src/main/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/ParserDialog.kt renamed to ‎analysis/analysers/filter/StructureModifier/src/main/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/ParserDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.structuremodifier
1+
package de.maibornwolff.codecharta.analysers.filter.structuremodifier
22

33
import com.varabyte.kotter.runtime.RunScope
44
import com.varabyte.kotter.runtime.Session

Diff for: ‎analysis/filter/StructureModifier/src/main/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/StructureModifier.kt renamed to ‎analysis/analysers/filter/StructureModifier/src/main/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/StructureModifier.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.structuremodifier
1+
package de.maibornwolff.codecharta.analysers.filter.structuremodifier
22

33
import de.maibornwolff.codecharta.analysers.tools.inspection.ProjectStructurePrinter
44
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.InteractiveParser

Diff for: ‎analysis/filter/StructureModifier/src/main/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/StructureModifierAction.kt renamed to ‎analysis/analysers/filter/StructureModifier/src/main/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/StructureModifierAction.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.structuremodifier
1+
package de.maibornwolff.codecharta.analysers.filter.structuremodifier
22

33
enum class StructureModifierAction(
44
val descripton: String

Diff for: ‎analysis/filter/StructureModifier/src/main/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/SubProjectExtractor.kt renamed to ‎analysis/analysers/filter/StructureModifier/src/main/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/SubProjectExtractor.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.structuremodifier
1+
package de.maibornwolff.codecharta.analysers.filter.structuremodifier
22

33
import de.maibornwolff.codecharta.model.AttributeDescriptor
44
import de.maibornwolff.codecharta.model.AttributeType

Diff for: ‎analysis/filter/StructureModifier/src/test/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/FolderMoverTest.kt renamed to ‎analysis/analysers/filter/StructureModifier/src/test/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/FolderMoverTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.structuremodifier
1+
package de.maibornwolff.codecharta.analysers.filter.structuremodifier
22

33
import de.maibornwolff.codecharta.model.Project
44
import de.maibornwolff.codecharta.serialization.ProjectDeserializer

Diff for: ‎analysis/filter/StructureModifier/src/test/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/MetricRenamerTest.kt renamed to ‎analysis/analysers/filter/StructureModifier/src/test/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/MetricRenamerTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.structuremodifier
1+
package de.maibornwolff.codecharta.analysers.filter.structuremodifier
22

33
import de.maibornwolff.codecharta.model.MutableNode
44
import de.maibornwolff.codecharta.model.Project

Diff for: ‎analysis/filter/StructureModifier/src/test/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/NodeRemoverTest.kt renamed to ‎analysis/analysers/filter/StructureModifier/src/test/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/NodeRemoverTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.structuremodifier
1+
package de.maibornwolff.codecharta.analysers.filter.structuremodifier
22

33
import de.maibornwolff.codecharta.model.Project
44
import de.maibornwolff.codecharta.serialization.ProjectDeserializer

Diff for: ‎analysis/filter/StructureModifier/src/test/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/ParserDialogTest.kt renamed to ‎analysis/analysers/filter/StructureModifier/src/test/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/ParserDialogTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package de.maibornwolff.codecharta.filter.structuremodifier
1+
package de.maibornwolff.codecharta.analysers.filter.structuremodifier
22

33
import com.varabyte.kotter.foundation.input.Keys
44
import com.varabyte.kotter.runtime.RunScope
55
import com.varabyte.kotter.runtime.Session
66
import com.varabyte.kotter.runtime.terminal.inmemory.press
77
import com.varabyte.kotter.runtime.terminal.inmemory.type
88
import com.varabyte.kotterx.test.foundation.testSession
9+
import de.maibornwolff.codecharta.analysers.filter.structuremodifier.ParserDialog.Companion.collectParserArgs
910
import de.maibornwolff.codecharta.analysers.tools.inquirer.myPromptList
10-
import de.maibornwolff.codecharta.filter.structuremodifier.ParserDialog.Companion.collectParserArgs
1111
import io.mockk.every
1212
import io.mockk.mockkObject
1313
import io.mockk.mockkStatic

Diff for: ‎analysis/filter/StructureModifier/src/test/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/PipedInputTestHelper.kt renamed to ‎analysis/analysers/filter/StructureModifier/src/test/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/PipedInputTestHelper.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package de.maibornwolff.codecharta.filter.structuremodifier
1+
package de.maibornwolff.codecharta.analysers.filter.structuremodifier
22

3-
import de.maibornwolff.codecharta.filter.structuremodifier.StructureModifier.Companion.mainWithInOut
3+
import de.maibornwolff.codecharta.analysers.filter.structuremodifier.StructureModifier.Companion.mainWithInOut
44
import java.io.ByteArrayInputStream
55
import java.io.ByteArrayOutputStream
66
import java.io.InputStream

Diff for: ‎analysis/filter/StructureModifier/src/test/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/StructureModifierTest.kt renamed to ‎analysis/analysers/filter/StructureModifier/src/test/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/StructureModifierTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.structuremodifier
1+
package de.maibornwolff.codecharta.analysers.filter.structuremodifier
22

33
import de.maibornwolff.codecharta.serialization.ProjectDeserializer
44
import de.maibornwolff.codecharta.util.InputHelper

Diff for: ‎analysis/filter/StructureModifier/src/test/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/SubProjectExtractorTest.kt renamed to ‎analysis/analysers/filter/StructureModifier/src/test/kotlin/de/maibornwolff/codecharta/filter/structuremodifier/SubProjectExtractorTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.maibornwolff.codecharta.filter.structuremodifier
1+
package de.maibornwolff.codecharta.analysers.filter.structuremodifier
22

33
import de.maibornwolff.codecharta.model.Project
44
import de.maibornwolff.codecharta.serialization.ProjectDeserializer

Diff for: ‎analysis/filter/StructureModifier/src/test/resources/invalid_project.cc.json renamed to ‎analysis/analysers/filter/StructureModifier/src/test/resources/invalid_project.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/StructureModifier/src/test/resources/merged_project.cc.json renamed to ‎analysis/analysers/filter/StructureModifier/src/test/resources/merged_project.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/StructureModifier/src/test/resources/sample_project.cc.json renamed to ‎analysis/analysers/filter/StructureModifier/src/test/resources/sample_project.cc.json

File renamed without changes.

Diff for: ‎analysis/filter/StructureModifier/src/test/resources/test_attributeDescriptors.cc.json renamed to ‎analysis/analysers/filter/StructureModifier/src/test/resources/test_attributeDescriptors.cc.json

File renamed without changes.

Diff for: ‎analysis/analysers/tools/Inquirer/src/main/kotlin/de/maibornwolff/codecharta/analysers/tools/inquirer/InputValidator.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ class InputValidator {
1111
file.exists() && file.isFile && isFileCorrectType
1212
}
1313

14-
fun isFileOrFolderValid(
15-
inputType: InputType,
16-
fileExtensionList: List<FileExtension>
17-
): (String) -> Boolean = { input ->
14+
fun isFileOrFolderValid(inputType: InputType, fileExtensionList: List<FileExtension>): (String) -> Boolean = { input ->
1815
val objectToVerify = File(input)
1916
objectToVerify.exists() && when (inputType) {
2017
InputType.FOLDER -> {

Diff for: ‎analysis/analysers/tools/ccsh/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ dependencies {
1515
":import:CodeMaatImporter",
1616
":import:CoverageImporter",
1717
":import:CSVImporter",
18-
":filter:StructureModifier",
18+
":analysers:filter:StructureModifier",
1919
":parser:SVNLogParser",
2020
":import:SonarImporter",
2121
":parser:SourceCodeParser",
2222
":import:TokeiImporter",
23-
":filter:MergeFilter",
24-
":filter:EdgeFilter",
23+
":analysers:filter:MergeFilter",
24+
":analysers:filter:EdgeFilter",
2525
":analysers:tools:ValidationTool",
2626
":analysers:exporters:CSVExporter",
2727
":parser:GitLogParser",

Diff for: ‎analysis/analysers/tools/ccsh/src/main/kotlin/de/maibornwolff/codecharta/analysers/tools/ccsh/Ccsh.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package de.maibornwolff.codecharta.analysers.tools.ccsh
22

33
import de.maibornwolff.codecharta.analysers.exporters.csv.CSVExporter
4+
import de.maibornwolff.codecharta.analysers.filter.edgefilter.EdgeFilter
5+
import de.maibornwolff.codecharta.analysers.filter.mergefilter.MergeFilter
6+
import de.maibornwolff.codecharta.analysers.filter.structuremodifier.StructureModifier
47
import de.maibornwolff.codecharta.analysers.tools.ccsh.parser.InteractiveDialog
58
import de.maibornwolff.codecharta.analysers.tools.ccsh.parser.InteractiveParserSuggestion
69
import de.maibornwolff.codecharta.analysers.tools.ccsh.parser.ParserService
@@ -9,9 +12,6 @@ import de.maibornwolff.codecharta.analysers.tools.inspection.InspectionTool
912
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.runInTerminalSession
1013
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.util.CodeChartaConstants
1114
import de.maibornwolff.codecharta.analysers.tools.validation.ValidationTool
12-
import de.maibornwolff.codecharta.filter.edgefilter.EdgeFilter
13-
import de.maibornwolff.codecharta.filter.mergefilter.MergeFilter
14-
import de.maibornwolff.codecharta.filter.structuremodifier.StructureModifier
1515
import de.maibornwolff.codecharta.importer.codemaat.CodeMaatImporter
1616
import de.maibornwolff.codecharta.importer.coverage.CoverageImporter
1717
import de.maibornwolff.codecharta.importer.csv.CSVImporter

Diff for: ‎analysis/analysers/tools/ccsh/src/test/kotlin/de/maibornwolff/codecharta/ccsh/parser/repository/PicocliParserRepositoryTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package de.maibornwolff.codecharta.ccsh.parser.repository
22

33
import de.maibornwolff.codecharta.analysers.exporters.csv.CSVExporter
4+
import de.maibornwolff.codecharta.analysers.filter.edgefilter.EdgeFilter
5+
import de.maibornwolff.codecharta.analysers.filter.mergefilter.MergeFilter
6+
import de.maibornwolff.codecharta.analysers.filter.structuremodifier.StructureModifier
47
import de.maibornwolff.codecharta.analysers.tools.ccsh.Ccsh
58
import de.maibornwolff.codecharta.analysers.tools.ccsh.parser.repository.PicocliParserRepository
69
import de.maibornwolff.codecharta.analysers.tools.inspection.InspectionTool
710
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.InteractiveParser
811
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.ParserDialogInterface
912
import de.maibornwolff.codecharta.analysers.tools.validation.ValidationTool
10-
import de.maibornwolff.codecharta.filter.edgefilter.EdgeFilter
11-
import de.maibornwolff.codecharta.filter.mergefilter.MergeFilter
12-
import de.maibornwolff.codecharta.filter.structuremodifier.StructureModifier
1313
import de.maibornwolff.codecharta.importer.codemaat.CodeMaatImporter
1414
import de.maibornwolff.codecharta.importer.csv.CSVImporter
1515
import de.maibornwolff.codecharta.importer.sonar.SonarImporterMain

Diff for: ‎analysis/filter/MergeFilter/src/main/kotlin/de/maibornwolff/codecharta/filter/mergefilter/MergeException.kt

-3
This file was deleted.

Diff for: ‎analysis/import/CoverageImporter/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dependencies {
33
implementation(project(":analysers:tools:Inquirer"))
44
implementation(project(":analysers:tools:InteractiveParser"))
55
implementation(project(":analysers:tools:PipeableParser"))
6-
implementation(project(":filter:MergeFilter"))
6+
implementation(project(":analysers:filter:MergeFilter"))
77

88
implementation(libs.picocli)
99
implementation(libs.kotter)

Diff for: ‎analysis/import/CoverageImporter/src/main/kotlin/de/maibornwolff/codecharta/importer/coverage/CoverageImporter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package de.maibornwolff.codecharta.importer.coverage
22

3+
import de.maibornwolff.codecharta.analysers.filter.mergefilter.MergeFilter
34
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.InteractiveParser
45
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.ParserDialogInterface
56
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.util.CodeChartaConstants
67
import de.maibornwolff.codecharta.analysers.tools.pipeableparser.PipeableParser
7-
import de.maibornwolff.codecharta.filter.mergefilter.MergeFilter
88
import de.maibornwolff.codecharta.model.AttributeDescriptor
99
import de.maibornwolff.codecharta.model.AttributeGenerator
1010
import de.maibornwolff.codecharta.model.ProjectBuilder

Diff for: ‎analysis/import/SonarImporter/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dependencies {
22
implementation(project(":model"))
33
implementation(project(":analysers:tools:Inquirer"))
4-
implementation(project(":filter:MergeFilter"))
4+
implementation(project(":analysers:filter:MergeFilter"))
55
implementation(project(":analysers:tools:InteractiveParser"))
66

77
implementation(libs.rxjava2)

Diff for: ‎analysis/import/SonarImporter/src/main/kotlin/de/maibornwolff/codecharta/importer/sonar/SonarImporterMain.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package de.maibornwolff.codecharta.importer.sonar
22

3+
import de.maibornwolff.codecharta.analysers.filter.mergefilter.MergeFilter
34
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.InteractiveParser
45
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.ParserDialogInterface
56
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.util.CodeChartaConstants
6-
import de.maibornwolff.codecharta.filter.mergefilter.MergeFilter
77
import de.maibornwolff.codecharta.importer.sonar.dataaccess.SonarMeasuresAPIDatasource
88
import de.maibornwolff.codecharta.importer.sonar.dataaccess.SonarMetricsAPIDatasource
99
import de.maibornwolff.codecharta.importer.sonar.dataaccess.SonarVersionAPIDatasource

Diff for: ‎analysis/parser/GitLogParser/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dependencies {
22
implementation(project(":model"))
33
implementation(project(":analysers:tools:Inquirer"))
4-
implementation(project(":filter:MergeFilter"))
4+
implementation(project(":analysers:filter:MergeFilter"))
55
implementation(project(":analysers:tools:InteractiveParser"))
66
implementation(project(":analysers:tools:PipeableParser"))
77

Diff for: ‎analysis/parser/GitLogParser/src/main/kotlin/de/maibornwolff/codecharta/parser/gitlogparser/GitLogParser.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package de.maibornwolff.codecharta.parser.gitlogparser
22

3+
import de.maibornwolff.codecharta.analysers.filter.mergefilter.MergeFilter
34
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.InteractiveParser
45
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.ParserDialogInterface
56
import de.maibornwolff.codecharta.analysers.tools.interactiveparser.util.CodeChartaConstants
67
import de.maibornwolff.codecharta.analysers.tools.pipeableparser.PipeableParser
78
import de.maibornwolff.codecharta.analysers.tools.pipeableparser.PipeableParserSyncFlag
8-
import de.maibornwolff.codecharta.filter.mergefilter.MergeFilter
99
import de.maibornwolff.codecharta.model.AttributeDescriptor
1010
import de.maibornwolff.codecharta.model.AttributeGenerator
1111
import de.maibornwolff.codecharta.model.Project

0 commit comments

Comments
 (0)