Merge remote-tracking branch 'origin/master'

.gitlab-ci.yml

@@ -1,3 +1,4 @@
 build:
   script:
+    - mvn -Dmaven.repo.local=/tmp/m2/repository -Duser.home=/tmp checkstyle:check
     - mvn -Dmaven.repo.local=/tmp/m2/repository -Duser.home=/tmp test

pom.xml

@@ -155,6 +155,16 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
             </plugin>
+
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.1</version>
+                <configuration>
+                    <configLocation>${project.build.directory}/../src/test/resources/checkstyle.xml</configLocation>
+                    <failOnViolation>true</failOnViolation>
+                    <violationSeverity>warning</violationSeverity>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/edu/kit/typicalc/model/parser/LambdaLexer.java

@@ -66,7 +66,7 @@ public class LambdaLexer {
                 return new Result<>(t);
             case '\\':
             case 'λ':
-                t = new Token(TokenType.LAMBDA, c+"", pos);
+                t = new Token(TokenType.LAMBDA, c + "", pos);
                 advance();
                 return new Result<>(t);
             default:

src/main/java/edu/kit/typicalc/model/parser/LambdaParser.java

@@ -27,7 +27,7 @@ public class LambdaParser {
      */
     private Token token;
 
-    private static final Set<TokenType> atomStartTokens
+    private static final Set<TokenType> ATOM_START_TOKENS
             = EnumSet.of(TokenType.VARIABLE, TokenType.NUMBER, TokenType.TRUE,
             TokenType.FALSE, TokenType.LP);
 
@@ -97,11 +97,11 @@ public class LambdaParser {
         nextToken();
         Result<VarTerm, ParseError> var = parseVar();
         if (!expect(TokenType.DOT)) {
-            // TODO
+            return new Result<>(null, ParseError.UNEXPECTED_TOKEN);
         }
         Result<LambdaTerm, ParseError> body = parseTerm();
         // TODO: Fehlerbehandlung
-        return new Result(new AbsTerm(var.unwrap(), body.unwrap()));
+        return new Result<>(new AbsTerm(var.unwrap(), body.unwrap()));
     }
 
     /**
@@ -110,7 +110,7 @@ public class LambdaParser {
      */
     private Result<LambdaTerm, ParseError> parseApplication() {
         LambdaTerm left = parseAtom().unwrap(); // TODO: Fehlerbehandlung
-        while (atomStartTokens.contains(token.getType())) {
+        while (ATOM_START_TOKENS.contains(token.getType())) {
             LambdaTerm atom = parseAtom().unwrap(); // TODO: Fehlerbehandlung
             left = new AppTerm(left, atom);
         }

src/main/java/edu/kit/typicalc/model/step/InferenceStep.java

@@ -1,7 +1,11 @@
 package edu.kit.typicalc.model.step;
 
 import edu.kit.typicalc.model.Conclusion;
+<<<<<<< HEAD
 import edu.kit.typicalc.model.Constraint;
+=======
+
+>>>>>>> 0f6c701 (Checkstyle für Maven konfiguriert)
 /**
  * Models one step of the inference tree.
  * Depending on the inference rule that is applied in a step,
@@ -46,4 +50,13 @@ public abstract class InferenceStep {
      * @param stepVisitor the visitor that wants to visit this object
      */
     public abstract void accept(StepVisitor stepVisitor);
+<<<<<<< HEAD
 }
+=======
+
+    public Conclusion getConclusion() {
+        return null; // TODO
+    }
+
+}
+>>>>>>> 0f6c701 (Checkstyle für Maven konfiguriert)

src/main/java/edu/kit/typicalc/model/term/VarTerm.java

@@ -12,8 +12,12 @@ public class VarTerm extends LambdaTerm {
 
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
+		if (this == o) {
-		if (o == null || getClass() != o.getClass()) return false;
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
 		VarTerm varTerm = (VarTerm) o;
 		return Objects.equals(name, varTerm.name);
 	}

src/main/java/edu/kit/typicalc/view/TypicalcI18NProvider.java

@@ -31,7 +31,7 @@ public class TypicalcI18NProvider implements I18NProvider {
 
     @Override
     public String getTranslation(String key, Locale locale, Object... params) {
-        if(key == null) {
+        if (key == null) {
             return StringUtils.EMPTY;
         }
 

src/main/resources/application.properties

@@ -2,6 +2,4 @@ server.port=${PORT:8080}
 logging.level.org.atmosphere = warn
 spring.mustache.check-template-location = false
 
-# To improve the performance during development. 
-# For more information https://vaadin.com/docs/flow/spring/tutorial-spring-configuration.html#special-configuration-parameters
 # vaadin.whitelisted-packages= org/vaadin/example

src/test/resources/checkstyle.xml

@@ -10,14 +10,15 @@
         <property name="tabWidth" value="4"/>
         <module name="JavadocType">
             <property name="scope" value="package"/>
-            <!-->property name="allowUndeclaredRTE" value="true"/-->
+            <property name="severity" value="info"/>
-            <!-->property name="suppressLoadErrors" value="true"/-->
         </module>
         <module name="JavadocMethod">
             <property name="scope" value="package"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="JavadocVariable">
             <property name="scope" value="public"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="ConstantName"/>
         <module name="LocalFinalVariableName"/>
@@ -27,7 +28,6 @@
         <module name="ParameterName"/>
         <module name="StaticVariableName"/>
         <module name="TypeName"/>
-        <module name="AvoidStarImport"/>
         <module name="IllegalImport"/>
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>