iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BAEL-1835] Fixing indent and organization

Browse Source
This commit is contained in:
dupirefr 2018-07-07 10:27:28 +02:00
parent b9e6222ced
commit 60702c111c
5 changed files with 115 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
maven-java-kotlin/pom.xml
View File

@ -2,95 +2,95 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>parent-modules</artifactId> <artifactId>parent-modules</artifactId>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>maven-java-kotlin</artifactId> <artifactId>maven-java-kotlin</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<kotlin.version>1.2.51</kotlin.version> <kotlin.version>1.2.51</kotlin.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId> <artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
<executions> <executions>
<execution> <execution>
<id>compile</id> <id>compile</id>
<goals> <goals>
<goal>compile</goal> <goal>compile</goal>
</goals> </goals>
<configuration> <configuration>
<sourceDirs> <sourceDirs>
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir> <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/main/java</sourceDir> <sourceDir>${project.basedir}/src/main/java</sourceDir>
</sourceDirs> </sourceDirs>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>test-compile</id> <id>test-compile</id>
<goals> <goals>
<goal>test-compile</goal> <goal>test-compile</goal>
</goals> </goals>
<configuration> <configuration>
<sourceDirs> <sourceDirs>
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir> <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/test/java</sourceDir> <sourceDir>${project.basedir}/src/test/java</sourceDir>
</sourceDirs> </sourceDirs>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version> <version>3.1</version>
<configuration> <configuration>
<source>${java.version}</source> <source>${java.version}</source>
<target>${java.version}</target> <target>${java.version}</target>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>default-compile</id> <id>default-compile</id>
<phase>none</phase> <phase>none</phase>
</execution> </execution>
<execution> <execution>
<id>default-testCompile</id> <id>default-testCompile</id>
<phase>none</phase> <phase>none</phase>
</execution> </execution>
<execution> <execution>
<id>java-compile</id> <id>java-compile</id>
<phase>compile</phase> <phase>compile</phase>
<goals> <goals>
<goal>compile</goal> <goal>compile</goal>
</goals> </goals>
</execution> </execution>
<execution> <execution>
<id>java-test-compile</id> <id>java-test-compile</id>
<phase>test-compile</phase> <phase>test-compile</phase>
<goals> <goals>
<goal>testCompile</goal> <goal>testCompile</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

31
maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
View File

@ -1,25 +1,26 @@
package com.baeldung.mavenjavakotlin; package com.baeldung.mavenjavakotlin;
import com.baeldung.mavenjavakotlin.services.JavaService; import com.baeldung.mavenjavakotlin.services.JavaService;
import com.baeldung.mavenjavakotlin.services.KotlinService;
public class Application { public class Application {
private static final String JAVA = "java"; private static final String JAVA = "java";
private static final String KOTLIN = "kotlin"; private static final String KOTLIN = "kotlin";
public static void main(String[] args) { public static void main(String[] args) {
String language = args[0]; String language = args[0];
switch (language) { switch (language) {
case JAVA: case JAVA:
new JavaService().sayHello(); new JavaService().sayHello();
break; break;
case KOTLIN: case KOTLIN:
new KotlinService().sayHello(); new KotlinService().sayHello();
break; break;
default: default:
// Do nothing // Do nothing
break; break;
}
} }
}
} }

6
maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java
View File

@ -2,8 +2,8 @@ package com.baeldung.mavenjavakotlin.services;
public class JavaService { public class JavaService {
public void sayHello() { public void sayHello() {
System.out.println("Java says 'Hello World!'"); System.out.println("Java says 'Hello World!'");
} }
} }

9
maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/KotlinService.kt
View File

@ -1,9 +0,0 @@
package com.baeldung.mavenjavakotlin
class KotlinService {
fun sayHello() {
System.out.println("Kotlin says 'Hello World!'")
}
}

9
maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/services/KotlinService.kt Normal file
View File

@ -0,0 +1,9 @@
package com.baeldung.mavenjavakotlin.services
class KotlinService {
fun sayHello() {
System.out.println("Kotlin says 'Hello World!'")
}
}