Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add pom code style and apply ee4j format #1150

Closed
wants to merge 3 commits into from
Closed

add pom code style and apply ee4j format #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b350df4
add pom spotless and apply spotless changes
olamy Nov 23, 2022
fb28047
cleanup pom
olamy Nov 23, 2022
e9a0c29
use ee4j format with formatter plugin
olamy Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
318 changes: 318 additions & 0 deletions ee4j-eclipse-formatting.xml
View file
Open in desktop

Large diffs are not rendered by default.

71 changes: 71 additions & 0 deletions pom-code-style.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>jakartaee</groupId>
<artifactId>tck</artifactId>
<version>1.0.0-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<sourceDirectory>src</sourceDirectory>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.27.1</version>
<configuration>
<java>
<includes>
<include>src/**/*.java</include>
</includes>
<!--importOrder>
<file></file>
</importOrder-->
<removeUnusedImports />
<palantirJavaFormat />
<!--licenseHeader>
<file></file>
</licenseHeader-->
</java>
<pom>
<sortPom>
<expandEmptyElements>false</expandEmptyElements>
</sortPom>
</pom>
<!--upToDateChecking>
<enabled>true</enabled>
</upToDateChecking-->
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
<phase>validate</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.21.0</version>
<configuration>
<includes>
<include>**/*.java</include>
</includes>
<configFile>${project.basedir}/ee4j-eclipse-formatting.xml</configFile>
</configuration>
</plugin>
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<version>1.4.1</version>
<configuration>
<removeUnused>true</removeUnused>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
75 changes: 36 additions & 39 deletions src/com/sun/ts/lib/deliverable/AbstractDeliverable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,62 +16,59 @@

package com.sun.ts.lib.deliverable;

import com.sun.ts.lib.util.TestUtil;
import com.sun.ts.lib.porting.DeploymentInfo;
import java.util.Map;
import java.util.Hashtable;
import java.util.Map;

/**
* This class serves as an abstract implementation of the DeliverableInterface.
* It can be extended to customize values for a particular deliverable.
* This class serves as an abstract implementation of the DeliverableInterface. It can be extended to customize values
* for a particular deliverable.
*
* @author Kyle Grucci
*/
public abstract class AbstractDeliverable implements DeliverableInterface {
protected Map htTSValidVehicles;
protected Map htTSValidVehicles;

protected Map htValidApps;
protected Map htValidApps;

protected Map htValidRunDirections;
protected Map htValidRunDirections;

public boolean supportsAutoDeployment() {
return true;
}
public boolean supportsAutoDeployment() {
return true;
}

public boolean supportsAutoJMSAdmin() {
return true;
}
public boolean supportsAutoJMSAdmin() {
return true;
}

public Map getValidVehicles() {
if (htTSValidVehicles == null) {
// TS hash table
htTSValidVehicles = new Hashtable();
// add default values
htTSValidVehicles.put("tests.service_eetest.vehicles",
new String[] { "ejb", "servlet", "jsp" });
public Map getValidVehicles() {
if (htTSValidVehicles == null) {
// TS hash table
htTSValidVehicles = new Hashtable();
// add default values
htTSValidVehicles.put("tests.service_eetest.vehicles", new String[] { "ejb", "servlet", "jsp" });
}
return htTSValidVehicles;
}
return htTSValidVehicles;
}

public Map getInteropDirections() {
if (htValidRunDirections == null) {
htValidRunDirections = new Hashtable();
// default for all tests
htValidRunDirections.put("tests.interop", "forward");
public Map getInteropDirections() {
if (htValidRunDirections == null) {
htValidRunDirections = new Hashtable();
// default for all tests
htValidRunDirections.put("tests.interop", "forward");
}
return htValidRunDirections;
}
return htValidRunDirections;
}

public boolean supportsInterop() {
return true;
}
public boolean supportsInterop() {
return true;
}

public String getAdditionalClasspath(String distDir) {
return null;
}
public String getAdditionalClasspath(String distDir) {
return null;
}

public DeploymentInfo getDeploymentInfo(String earFile,
String[] sValidRuntimeInfoFilesArray) {
return null;
}
public DeploymentInfo getDeploymentInfo(String earFile, String[] sValidRuntimeInfoFilesArray) {
return null;
}
}
Loading