Fix/karodiss

.gitattributes

@@ -1 +1,2 @@
 gradlew eol=lf
+*.jar filter=lfs diff=lfs merge=lfs -text

build.gradle

@@ -27,11 +27,16 @@ repositories {
 
 dependencies {
     implementation group: 'jpl', name: 'jpl', version: '7.4.0'
+    // implementation 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.3'
+    implementation 'com.sun.xml.bind:jaxb-impl:2.2.11'
+    implementation 'com.sun.xml.bind:jaxb-core:2.2.11'
+    implementation 'org.glassfish.jersey.media:jersey-media-jaxb:2.30.1'
+
     compile fileTree(dir: 'libs', includes: ['*.jar'])
 
 	compile('org.springframework.boot:spring-boot-starter-web')
-//    compile('org.eclipse.winery:org.eclipse.winery.repository.client:2.0.0-SNAPSHOT')
-//    compile('org.eclipse.winery:org.eclipse.winery.model.tosca:2.0.0-SNAPSHOT')
+//    compile('com.github.opentosca.winery:org.eclipse.winery.repository.client:ustutt-9b6bd07e7a-1')
+//    compile('com.github.opentosca.winery:org.eclipse.winery.model.tosca:ustutt-9b6bd07e7a-1')
 	testCompile('org.springframework.boot:spring-boot-starter-test')
     compile 'com.vladsch.flexmark:flexmark-all:0.32.18'
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,3 +1,4 @@
+#Mon Dec 05 13:35:54 CET 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

pattern_prologfiles/patternhelper.pl

@@ -7,7 +7,7 @@
 	member(H1, S1),
 	member(Component_2, S2),
 	member(H2, S2),
-	Location_1 \= Location_2.
+	Location_1 \== Location_2.
 
 component_in_restricted_environment(Component_1) :-
     property(P, inboundcommunication, false),

pattern_prologfiles/patterns.pl

@@ -11,11 +11,6 @@
     component_in_restricted_environment(Channel));
     direct_communication(Component_1, Component_2)).
 
-distributed_messaging(Component_1, Component_2) :-
-    messaging_communication(Channel, Component_1, Component_2),
-    components_in_different_locations(Component_1, Component_2),
-    hybrid_environment(Component_1, Component_2).
-
 insecure_public_communication(Component_1, Component_2) :-
 	property(Relation_ID, sensitivedata, true),
 	relation(Relation_ID, Component_1, Component_2),

src/main/java/io/github/saatkamp/TopologyProblemRecognizer/PrologChecker.java

@@ -86,8 +86,18 @@ public List<ProblemFindings> checkTopology(String topologyID) throws IOException
                         finding.add(componentFinding);
                         logger.info("This is the result for Variable {}: {}", entry.getKey(), prologNames.decode(entry.getValue().toString()));
                     }
-                    findings.addFinding(finding);
+
+                    boolean doesNotContainNewEntry = findings.getFindings().stream().noneMatch(existingFinding -> {
+                        return existingFinding.stream().allMatch(entry -> {
+                           return finding.contains(entry);
+                        });
+                                            });
+
+                    if(doesNotContainNewEntry) {
+                        findings.addFinding(finding);
+                    }
                 }
+
                 problemFindings.add(findings);
             } else {
                 logger.info("problem {} is not contained in topology", problemQuery);
@@ -154,6 +164,11 @@ public List<SolutionInputData> findSolutions(String serviceTemplateID, String pa
                 solutions.add(solutionInputData);
 
             } else {
+                //Quickfix -otherwise decoded component-ids are stored as "encoded names" in the nameHashMap
+                occurrence.stream().forEach(finding -> {
+                    String encodedComponentId = prologNames.decode(finding.getComponentId());
+                    finding.setComponentId(encodedComponentId);
+                });
                 logger.info("problem {} is not contained in topology", solutionQuery);
             }
         }