Multiple Contributions from twalmsley at AOSD Ltd

.gitignore

@@ -1,3 +1,4 @@
+*.png
 .idea
 .vscode
 .project

checkstyle-suppressions.xml

@@ -2,19 +2,20 @@
 <!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD Suppressions 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <suppressions>
-  <!-- global suppressions -->
-  <suppress checks="AvoidStarImport" files="\.java" />
+    <!-- global suppressions -->
+    <suppress checks="AvoidStarImport" files="\.java" />
 
-  <!-- core suppressions -->
-  <suppress checks="AbbreviationAsWordInName" files="UID\.java" />
+    <!-- core suppressions -->
+    <suppress checks="AbbreviationAsWordInName" files="UID\.java" />
 
-  <!-- examples suppressions -->
-  <suppress checks="LineLength" files="ExampleDataObjects.java|ExampleRdl.java|ExampleAssociations.java|MagmaCoreService.java" />
-  <suppress checks="MethodLength" files="ExampleDataObjects.java" />
+    <!-- examples suppressions -->
+    <suppress checks="LineLength"
+        files="ClassServices.java|ExampleDataObjects.java|ExampleRdl.java|ExampleAssociations.java|MagmaCoreService.java" />
+    <suppress checks="MethodLength" files="ExampleDataObjects.java" />
 
-  <!-- hqdm-core suppressions -->
-  <suppress checks="MethodName" files="impl/*" />
-  <suppress checks="TypeName" files="Function_.java" />
-  <suppress checks="ConstantName" files="HQDM.java" />
-  <suppress checks="AbbreviationAsWordInName" files="IRI.java|HQDM.java|RDFS.java|UID.java" />
-</suppressions>
+    <!-- hqdm-core suppressions -->
+    <suppress checks="MethodName" files="impl/*" />
+    <suppress checks="TypeName" files="Function_.java" />
+    <suppress checks="ConstantName" files="HQDM.java" />
+    <suppress checks="AbbreviationAsWordInName" files="IRI.java|HQDM.java|RDFS.java|UID.java" />
+</suppressions>

checkstyles.xml

@@ -39,7 +39,7 @@
 
   <module name="LineLength">
     <property name="fileExtensions" value="java" />
-    <property name="max" value="120" />
+    <property name="max" value="200" />
     <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://" />
   </module>
 
@@ -224,7 +224,7 @@
     </module>
     <module name="AbbreviationAsWordInName">
       <property name="ignoreFinal" value="false" />
-      <property name="allowedAbbreviationLength" value="0" />
+      <property name="allowedAbbreviationLength" value="10" />
       <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
                     PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
                     RECORD_COMPONENT_DEF" />

core/src/main/java/uk/gov/gchq/magmacore/service/MagmaCoreService.java

@@ -211,7 +211,6 @@ public List<? extends Thing> findBySignValue(
      *
      * @param community   The {@link RecognizingLanguageCommunity} that recognizes
      *                    the sign value.
-     * @param pattern     The {@link Pattern} the sign conforms to.
      * @param value       {@link String} the partial sign value to look for.
      * @param pointInTime {@link PointInTime} the point in time we are interested
      *                    in.
@@ -221,7 +220,6 @@ public List<? extends Thing> findBySignValue(
      */
     public List<? extends Thing> findByPartialSignValue(
             final RecognizingLanguageCommunity community,
-            final Pattern pattern,
             final String value,
             final PointInTime pointInTime) throws MagmaCoreException {
 
@@ -235,8 +233,7 @@ public List<? extends Thing> findByPartialSignValue(
         final QueryResultList queryResultList = database
                 .executeQuery(String.format(MagmaCoreServiceQueries.FIND_BY_PARTIAL_SIGN_VALUE_CASE_INSENSITIVE_QUERY,
                         value,
-                        community.getId(),
-                        pattern.getId()));
+                        community.getId()));
 
         // Filter by the pointInTime
         final QueryResultList queryResults = filterByPointInTime(when, queryResultList);
@@ -300,9 +297,11 @@ public List<? extends Thing> findByTypeKindAndSignPattern(
 
         final Instant when = Instant.parse(pointInTimeValue);
 
+        final String queryString = String.format(MagmaCoreServiceQueries.FIND_OBJECTS_BY_TYPE_AND_SIGN_PATTERN,
+                        type, kind, pattern, type, kind, pattern);
+
         final QueryResultList queryResultList = database
-                .executeQuery(String.format(MagmaCoreServiceQueries.FIND_OBJECTS_BY_TYPE_AND_SIGN_PATTERN,
-                        type, kind, pattern, type, kind, pattern));
+                .executeQuery(queryString);
 
         // Filter by the pointInTime
         final QueryResultList queryResults = filterByPointInTime(when, queryResultList);
@@ -669,6 +668,7 @@ private static SignPatternDto toSignPatternDto(final QueryResult qr) {
      * @return {@link Thing} that was found.
      * @throws RuntimeException If no or multiple results were found.
      */
+    @SuppressWarnings("unchecked")
     public <T extends Thing> T findByEntityName(final String entityName) {
         final List<Thing> searchResult = findByPredicateIriAndValue(HQDM.ENTITY_NAME, entityName);
 
@@ -688,6 +688,7 @@ public <T extends Thing> T findByEntityName(final String entityName) {
      * @param predicate the predicate {@link IRI}
      * @return a List of {@link Thing} that were found.
      */
+    @SuppressWarnings("unchecked")
     public <T extends Thing> List<T> findByPredicateIriOnly(final IRI predicate) {
         return (List<T>) database.findByPredicateIriOnly(predicate);
     }
@@ -700,6 +701,7 @@ public <T extends Thing> List<T> findByPredicateIriOnly(final IRI predicate) {
      * @param value     The value of the predicate.
      * @return a List of {@link Thing} that were found.
      */
+    @SuppressWarnings("unchecked")
     public <T extends Thing> List<T> findByPredicateIriAndValue(final IRI predicate, final Object value) {
         return (List<T>) database.findByPredicateIriAndValue(predicate, value);
     }