Skip to content

Commit e2bfa77

Browse files
SimonEismannSimonEismann
authored
Merge pull request #229 from SimonEismann/development
2 parents 8201731 + 8b87b88 commit e2bfa77

File tree

68 files changed

+589
-204
lines changed

Some content is hidden

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

68 files changed

+589
-204
lines changed

‎.gitpod.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This configuration file was automatically generated by Gitpod.
2+
# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
3+
# and commit this file to your remote git repository to share the goodness with others.
4+
5+
tasks:
6+
- init: mvn install -DskipTests=false
7+
8+

‎.vscode/settings.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "automatic",
3+
"java.configuration.runtimes": [
4+
{
5+
"name": "JavaSE-11",
6+
"path": "/home/gitpod/.sdkman/candidates/java/11.0.16.fx-zulu",
7+
}
8+
]
9+
}

‎interfaces/tools.descartes.teastore.entities/.classpath

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,34 @@
1010
<attributes>
1111
<attribute name="optional" value="true"/>
1212
<attribute name="maven.pomderived" value="true"/>
13+
<attribute name="test" value="true"/>
1314
</attributes>
1415
</classpathentry>
15-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
16+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
1617
<attributes>
1718
<attribute name="maven.pomderived" value="true"/>
1819
</attributes>
1920
</classpathentry>
2021
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
2122
<attributes>
2223
<attribute name="maven.pomderived" value="true"/>
23-
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
24+
</attributes>
25+
</classpathentry>
26+
<classpathentry kind="src" path="target/generated-sources/annotations">
27+
<attributes>
28+
<attribute name="optional" value="true"/>
29+
<attribute name="maven.pomderived" value="true"/>
30+
<attribute name="ignore_optional_problems" value="true"/>
31+
<attribute name="m2e-apt" value="true"/>
32+
</attributes>
33+
</classpathentry>
34+
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
35+
<attributes>
36+
<attribute name="optional" value="true"/>
37+
<attribute name="maven.pomderived" value="true"/>
38+
<attribute name="ignore_optional_problems" value="true"/>
39+
<attribute name="m2e-apt" value="true"/>
40+
<attribute name="test" value="true"/>
2441
</attributes>
2542
</classpathentry>
2643
<classpathentry kind="output" path="target/classes"/>

‎interfaces/tools.descartes.teastore.entities/.project

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,15 @@
4545
<nature>org.jboss.tools.jst.web.kb.kbnature</nature>
4646
<nature>org.jboss.tools.cdi.core.cdinature</nature>
4747
</natures>
48+
<filteredResources>
49+
<filter>
50+
<id>1660218548944</id>
51+
<name></name>
52+
<type>30</type>
53+
<matcher>
54+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
55+
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
56+
</matcher>
57+
</filter>
58+
</filteredResources>
4859
</projectDescription>

‎interfaces/tools.descartes.teastore.entities/.settings/org.eclipse.core.resources.prefs

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

‎interfaces/tools.descartes.teastore.entities/.settings/org.eclipse.jdt.core.prefs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=1.8
6+
org.eclipse.jdt.core.compiler.compliance=11
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1010
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
1112
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1213
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
13-
org.eclipse.jdt.core.compiler.source=1.8
14+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
15+
org.eclipse.jdt.core.compiler.processAnnotations=disabled
16+
org.eclipse.jdt.core.compiler.release=disabled
17+
org.eclipse.jdt.core.compiler.source=11

‎interfaces/tools.descartes.teastore.entities/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<url>http://descartes.tools</url>
88

99
<properties>
10+
<maven.compiler.plugin.version>3.8.0</maven.compiler.plugin.version>
1011
<maven.compiler.source>11</maven.compiler.source>
1112
<maven.compiler.target>11</maven.compiler.target>
1213
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎pom.xml

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,31 @@
3232
</modules>
3333

3434
<build>
35-
<plugins>
36-
<plugin>
37-
<groupId>org.apache.maven.plugins</groupId>
38-
<artifactId>maven-checkstyle-plugin</artifactId>
39-
<version>3.0.0</version>
40-
<executions>
41-
<execution>
42-
<id>validate</id>
43-
<phase>validate</phase>
44-
<configuration>
45-
<configLocation>limbo_checkstyle.xml</configLocation>
46-
<encoding>UTF-8</encoding>
47-
<consoleOutput>true</consoleOutput>
48-
<failsOnError>true</failsOnError>
49-
<linkXRef>false</linkXRef>
50-
<violationSeverity>warning</violationSeverity>
51-
</configuration>
52-
<goals>
53-
<goal>check</goal>
54-
</goals>
55-
</execution>
56-
</executions>
57-
</plugin>
58-
</plugins>
35+
<pluginManagement>
36+
<plugins>
37+
<plugin>
38+
<groupId>org.apache.maven.plugins</groupId>
39+
<artifactId>maven-checkstyle-plugin</artifactId>
40+
<version>3.0.0</version>
41+
<executions>
42+
<execution>
43+
<id>validate</id>
44+
<phase>validate</phase>
45+
<configuration>
46+
<configLocation>limbo_checkstyle.xml</configLocation>
47+
<encoding>UTF-8</encoding>
48+
<consoleOutput>true</consoleOutput>
49+
<failsOnError>true</failsOnError>
50+
<linkXRef>false</linkXRef>
51+
<violationSeverity>warning</violationSeverity>
52+
</configuration>
53+
<goals>
54+
<goal>check</goal>
55+
</goals>
56+
</execution>
57+
</executions>
58+
</plugin>
59+
</plugins>
60+
</pluginManagement>
5961
</build>
6062
</project>

‎services/tools.descartes.teastore.auth/.classpath

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
<attributes>
1111
<attribute name="optional" value="true"/>
1212
<attribute name="maven.pomderived" value="true"/>
13+
<attribute name="test" value="true"/>
1314
</attributes>
1415
</classpathentry>
15-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
16+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
1617
<attributes>
1718
<attribute name="maven.pomderived" value="true"/>
1819
</attributes>
@@ -30,28 +31,44 @@
3031
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
3132
<attributes>
3233
<attribute name="maven.pomderived" value="true"/>
33-
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
3434
</attributes>
3535
</classpathentry>
36-
<classpathentry combineaccessrules="false" kind="src" path="/tools.descartes.teastore.entities">
36+
<classpathentry combineaccessrules="false" kind="src" path="/entities">
3737
<attributes>
3838
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
3939
</attributes>
4040
</classpathentry>
41-
<classpathentry combineaccessrules="false" kind="src" path="/tools.descartes.teastore.persistence">
41+
<classpathentry combineaccessrules="false" kind="src" path="/persistence">
4242
<attributes>
4343
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
4444
</attributes>
4545
</classpathentry>
46-
<classpathentry combineaccessrules="false" kind="src" path="/tools.descartes.teastore.registry">
46+
<classpathentry combineaccessrules="false" kind="src" path="/registry">
4747
<attributes>
4848
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
4949
</attributes>
5050
</classpathentry>
51-
<classpathentry combineaccessrules="false" kind="src" path="/tools.descartes.teastore.registryclient">
51+
<classpathentry combineaccessrules="false" kind="src" path="/registryclient">
5252
<attributes>
5353
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
5454
</attributes>
5555
</classpathentry>
56+
<classpathentry kind="src" path="target/generated-sources/annotations">
57+
<attributes>
58+
<attribute name="optional" value="true"/>
59+
<attribute name="maven.pomderived" value="true"/>
60+
<attribute name="ignore_optional_problems" value="true"/>
61+
<attribute name="m2e-apt" value="true"/>
62+
</attributes>
63+
</classpathentry>
64+
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
65+
<attributes>
66+
<attribute name="optional" value="true"/>
67+
<attribute name="maven.pomderived" value="true"/>
68+
<attribute name="ignore_optional_problems" value="true"/>
69+
<attribute name="m2e-apt" value="true"/>
70+
<attribute name="test" value="true"/>
71+
</attributes>
72+
</classpathentry>
5673
<classpathentry kind="output" path="target/classes"/>
5774
</classpath>

‎services/tools.descartes.teastore.auth/.project

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,15 @@
4646
<nature>org.jboss.tools.cdi.core.cdinature</nature>
4747
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
4848
</natures>
49+
<filteredResources>
50+
<filter>
51+
<id>1660218548935</id>
52+
<name></name>
53+
<type>30</type>
54+
<matcher>
55+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
56+
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
57+
</matcher>
58+
</filter>
59+
</filteredResources>
4960
</projectDescription>

‎services/tools.descartes.teastore.auth/.settings/org.eclipse.jdt.core.prefs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4-
org.eclipse.jdt.core.compiler.compliance=1.8
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
4+
org.eclipse.jdt.core.compiler.compliance=11
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
6+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
67
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
78
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
8-
org.eclipse.jdt.core.compiler.source=1.8
9+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
10+
org.eclipse.jdt.core.compiler.processAnnotations=disabled
11+
org.eclipse.jdt.core.compiler.release=disabled
12+
org.eclipse.jdt.core.compiler.source=11

‎services/tools.descartes.teastore.auth/src/test/java/tools/descartes/teastore/auth/security/ConstantKeyProviderTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import org.junit.Assert;
44
import org.junit.Test;
55

6-
import tools.descartes.teastore.auth.security.ConstantKeyProvider;
76
import tools.descartes.teastore.entities.message.SessionBlob;
87

98
/**

‎services/tools.descartes.teastore.auth/src/test/java/tools/descartes/teastore/auth/security/ShaSecurityProviderTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import org.junit.Assert;
44
import org.junit.Test;
55

6-
import tools.descartes.teastore.auth.security.ShaSecurityProvider;
76
import tools.descartes.teastore.entities.message.SessionBlob;
87

98
/**

‎services/tools.descartes.teastore.image/.classpath

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
<attributes>
1111
<attribute name="optional" value="true"/>
1212
<attribute name="maven.pomderived" value="true"/>
13+
<attribute name="test" value="true"/>
1314
</attributes>
1415
</classpathentry>
1516
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
1617
<attributes>
1718
<attribute name="maven.pomderived" value="true"/>
1819
</attributes>
1920
</classpathentry>
20-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
21+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
2122
<attributes>
2223
<attribute name="maven.pomderived" value="true"/>
2324
</attributes>
@@ -35,18 +36,34 @@
3536
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
3637
<attributes>
3738
<attribute name="maven.pomderived" value="true"/>
38-
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
3939
</attributes>
4040
</classpathentry>
41-
<classpathentry combineaccessrules="false" kind="src" path="/tools.descartes.teastore.entities">
41+
<classpathentry combineaccessrules="false" kind="src" path="/entities">
4242
<attributes>
4343
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
4444
</attributes>
4545
</classpathentry>
46-
<classpathentry combineaccessrules="false" kind="src" path="/tools.descartes.teastore.registryclient">
46+
<classpathentry combineaccessrules="false" kind="src" path="/registryclient">
4747
<attributes>
4848
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
4949
</attributes>
5050
</classpathentry>
51+
<classpathentry kind="src" path="target/generated-sources/annotations">
52+
<attributes>
53+
<attribute name="optional" value="true"/>
54+
<attribute name="maven.pomderived" value="true"/>
55+
<attribute name="ignore_optional_problems" value="true"/>
56+
<attribute name="m2e-apt" value="true"/>
57+
</attributes>
58+
</classpathentry>
59+
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
60+
<attributes>
61+
<attribute name="optional" value="true"/>
62+
<attribute name="maven.pomderived" value="true"/>
63+
<attribute name="ignore_optional_problems" value="true"/>
64+
<attribute name="m2e-apt" value="true"/>
65+
<attribute name="test" value="true"/>
66+
</attributes>
67+
</classpathentry>
5168
<classpathentry kind="output" path="target/classes"/>
5269
</classpath>

‎services/tools.descartes.teastore.image/.project

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,24 @@
3939
</buildCommand>
4040
</buildSpec>
4141
<natures>
42+
<nature>org.eclipse.jdt.core.javanature</nature>
4243
<nature>org.eclipse.m2e.core.maven2Nature</nature>
4344
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
4445
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
4546
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
46-
<nature>org.eclipse.jdt.core.javanature</nature>
4747
<nature>org.jboss.tools.jst.web.kb.kbnature</nature>
4848
<nature>org.jboss.tools.cdi.core.cdinature</nature>
4949
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
5050
</natures>
51+
<filteredResources>
52+
<filter>
53+
<id>1660218548947</id>
54+
<name></name>
55+
<type>30</type>
56+
<matcher>
57+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
58+
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
59+
</matcher>
60+
</filter>
61+
</filteredResources>
5162
</projectDescription>

‎services/tools.descartes.teastore.image/.settings/org.eclipse.jdt.core.prefs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4-
org.eclipse.jdt.core.compiler.compliance=1.8
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
4+
org.eclipse.jdt.core.compiler.compliance=11
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
6+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
67
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
78
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
8-
org.eclipse.jdt.core.compiler.source=1.8
9+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
10+
org.eclipse.jdt.core.compiler.processAnnotations=disabled
11+
org.eclipse.jdt.core.compiler.release=disabled
12+
org.eclipse.jdt.core.compiler.source=11

‎services/tools.descartes.teastore.image/src/test/java/tools/descartes/teastore/image/TestImageDB.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727

2828
import tools.descartes.teastore.entities.ImageSize;
2929
import tools.descartes.teastore.entities.ImageSizePreset;
30-
import tools.descartes.teastore.image.ImageDB;
31-
import tools.descartes.teastore.image.ImageDBKey;
3230

3331
public class TestImageDB {
3432

@@ -48,7 +46,7 @@ public class TestImageDB {
4846

4947
@Before
5048
public void initialize() {
51-
MockitoAnnotations.initMocks(this);
49+
MockitoAnnotations.openMocks(this);
5250
when(mockedProductKey.isProductKey()).thenReturn(true);
5351
when(mockedProductKey.getProductID()).thenReturn(PRODUCT_ID);
5452
when(mockedProductKey.getWebUIName()).thenReturn(null);

‎services/tools.descartes.teastore.image/src/test/java/tools/descartes/teastore/image/TestImageDBKey.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020

2121
import org.junit.Test;
2222

23-
import tools.descartes.teastore.image.ImageDBKey;
24-
2523
public class TestImageDBKey {
2624

2725
private static final long TEST_PRODUCT_KEY = 120;

0 commit comments

Comments
 (0)