Skip to content

Commit

Permalink
Merge pull request #1002 from apache/7.0.x/WW-5411-delete-deprecated
Browse files Browse the repository at this point in the history 
WW-5411 Delete more deprecated code
  • Loading branch information
@kusalk
kusalk committed Jul 25, 2024
2 parents c5dfe61 + aec78dd commit fe49781
Show file tree
Hide file tree
Showing 101 changed files with 355 additions and 2,080 deletions.
23 changes: 13 additions & 10 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.io.Serial;
import java.io.Serializable;
import java.util.Arrays;
import java.util.Date;
Expand All @@ -41,6 +42,7 @@
@Service
public class TestDataProvider implements Serializable, InitializingBean {

@Serial
private static final long serialVersionUID = 1L;
private static final Logger log = LogManager.getLogger(TestDataProvider.class);

Expand All @@ -64,9 +66,9 @@ public class TestDataProvider implements Serializable, InitializingBean {
};

public static final Employee[] TEST_EMPLOYEES = {
new Employee(new Long(1), "Alan", "Smithee", new Date(), new Float(2000f), true, POSITIONS[0],
new Employee(1L, "Alan", "Smithee", new Date(), 2000f, true, POSITIONS[0],
TEST_SKILLS[0], null, "alan", LEVELS[0], "Nice guy"),
new Employee(new Long(2), "Robert", "Robson", new Date(), new Float(10000f), false, POSITIONS[1],
new Employee(2L, "Robert", "Robson", new Date(), 10000f, false, POSITIONS[1],
TEST_SKILLS[1], Arrays.asList(TEST_SKILLS).subList(1, TEST_SKILLS.length), "rob", LEVELS[1], "Smart guy")
};

Expand All @@ -78,27 +80,27 @@ public class TestDataProvider implements Serializable, InitializingBean {

protected void addTestSkills() {
try {
for (int i = 0, j = TEST_SKILLS.length; i < j; i++) {
skillDao.merge(TEST_SKILLS[i]);
}
for (Skill testSkill : TEST_SKILLS) {
skillDao.merge(testSkill);
}
if (log.isInfoEnabled()) {
log.info("TestDataProvider - [addTestSkills]: Added test skill data.");
}
} catch (StorageException e) {
log.error("TestDataProvider - [addTestSkills]: Exception catched: " + e.getMessage());
log.error("TestDataProvider - [addTestSkills]: Exception caught: {}", e.getMessage());
}
}

protected void addTestEmployees() {
try {
for (int i = 0, j = TEST_EMPLOYEES.length; i < j; i++) {
employeeDao.merge(TEST_EMPLOYEES[i]);
}
for (Employee testEmployee : TEST_EMPLOYEES) {
employeeDao.merge(testEmployee);
}
if (log.isInfoEnabled()) {
log.info("TestDataProvider - [addTestEmployees]: Added test employee data.");
}
} catch (StorageException e) {
log.error("TestDataProvider - [addTestEmployees]: Exception catched: " + e.getMessage());
log.error("TestDataProvider - [addTestEmployees]: Exception caught: {}", e.getMessage());
}
}

Expand All @@ -107,6 +109,7 @@ protected void addTestData() {
addTestEmployees();
}

@Override
public void afterPropertiesSet() throws Exception {
addTestData();
}
Expand Down
29 changes: 9 additions & 20 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Hangman.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,40 +20,29 @@
*/
package org.apache.struts2.showcase.hangman;

import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

public class Hangman implements Serializable {

@Serial
private static final long serialVersionUID = 8566954355839652509L;

private Vocab vocab;
private final Vocab vocab;

private Boolean win = false;

private int guessLeft = 5;
public List<Character> charactersAvailable;
public final List<Character> charactersAvailable;
public List<Character> charactersGuessed;

public Hangman(Vocab vocab) {
// Arrays.asList(...) returns List that doesn't support remove(), hence
// we wrap it with an ArrayList to avoid UnsupportedOperationException
// when doing a remove()
charactersAvailable = new ArrayList<Character>(Arrays.asList(
new Character[]{
Character.valueOf('A'), Character.valueOf('B'), Character.valueOf('C'),
Character.valueOf('D'), Character.valueOf('E'), Character.valueOf('F'),
Character.valueOf('G'), Character.valueOf('H'), Character.valueOf('I'),
Character.valueOf('J'), Character.valueOf('K'), Character.valueOf('L'),
Character.valueOf('M'), Character.valueOf('N'), Character.valueOf('O'),
Character.valueOf('P'), Character.valueOf('Q'), Character.valueOf('R'),
Character.valueOf('S'), Character.valueOf('T'), Character.valueOf('U'),
Character.valueOf('V'), Character.valueOf('W'), Character.valueOf('X'),
Character.valueOf('Y'), Character.valueOf('Z')
}));
charactersGuessed = new ArrayList<Character>();
charactersAvailable = new ArrayList<>(List.of(
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'));
charactersGuessed = new ArrayList<>();
this.vocab = vocab;
}

Expand Down Expand Up @@ -98,7 +87,7 @@ public Integer guessLeft() {

public List<Character> getCharactersAvailable() {
synchronized (charactersAvailable) {
return new ArrayList<Character>(charactersAvailable);
return new ArrayList<>(charactersAvailable);
//return charactersAvailable;
}
}
Expand Down
31 changes: 11 additions & 20 deletions apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Vocab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,19 @@
*/
package org.apache.struts2.showcase.hangman;

import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;

public class Vocab implements Serializable {

@Serial
private static final long serialVersionUID = 1L;

private String vocab;
private String hint;
private final String vocab;
private final String hint;
private Character[] characters; // character this vocab is made up of

public Vocab(String vocab, String hint) {
Expand All @@ -52,40 +54,29 @@ public String getHint() {
public Boolean containCharacter(Character character) {
assert (character != null);

return (vocab.contains(character.toString())) ? true : false;
return vocab.contains(character.toString());
}

public Character[] inCharacters() {
if (characters == null) {
char[] c = vocab.toCharArray();
characters = new Character[c.length];
for (int a = 0; a < c.length; a++) {
characters[a] = Character.valueOf(c[a]);
characters[a] = c[a];
}
}
return characters;
}

public boolean containsAllCharacter(List<Character> charactersGuessed) {
Character[] chars = inCharacters();
List<Character> tmpChars = Arrays.asList(chars);
return charactersGuessed.containsAll(tmpChars);
return new HashSet<>(charactersGuessed).containsAll(Arrays.asList(inCharacters()));
}

public static void main(String args[]) throws Exception {
public static void main(String[] args) throws Exception {
Vocab v = new Vocab("JAVA", "a java word");

List<Character> list1 = new ArrayList<Character>();
list1.add(new Character('J'));
list1.add(new Character('V'));

List<Character> list2 = new ArrayList<Character>();
list2.add(new Character('J'));
list2.add(new Character('V'));
list2.add(new Character('A'));

System.out.println(v.containsAllCharacter(list1));
System.out.println(v.containsAllCharacter(list2));
System.out.println(v.containsAllCharacter(List.of('J', 'V')));
System.out.println(v.containsAllCharacter(List.of('J', 'V', 'A')));

}
}
8 changes: 6 additions & 2 deletions core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@
import org.apache.struts2.StrutsConstants;

import java.io.Serializable;
import java.util.*;
import java.util.Collection;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;

/**
* Provides a default implementation for the most common actions.
Expand Down Expand Up @@ -160,7 +164,7 @@ public String getFormatted(String key, String expr) {
} else {
final ValueStack valueStack = ActionContext.getContext().getValueStack();
final Object val = valueStack.findValue(expr);
return getText(key, Arrays.asList(val));
return getText(key, List.of(val));
}
}

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/opensymphony/xwork2/DefaultTextProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public String getText(String key, String defaultValue, List<?> args) {

return format.format(params);
}
return text;
return text;
}

public String getText(String key, String defaultValue, String[] args) {
Expand Down Expand Up @@ -136,7 +136,7 @@ public String getText(String key, String defaultValue, List<?> args, ValueStack

public String getText(String key, String defaultValue, String[] args, ValueStack stack) {
//we're not using the value stack here
List<Object> values = new ArrayList<Object>(Arrays.asList(args));
List<Object> values = new ArrayList<>(Arrays.asList(args));
return getText(key, defaultValue, values);
}

Expand Down
84 changes: 11 additions & 73 deletions core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,6 @@ public AbstractMatcher(PatternMatcher<?> helper, boolean appendNamedParameters)
this.appendNamedParameters = appendNamedParameters;
}

/**
* Creates a matcher with {@link #appendNamedParameters} set to true to keep backward compatibility
*
* @param helper an instance of {@link PatternMatcher}
* @deprecated use @{link {@link AbstractMatcher(PatternMatcher, boolean)} instead
*/
@Deprecated
public AbstractMatcher(PatternMatcher<?> helper) {
this(helper, true);
}

/**
* <p>
* Finds and precompiles the wildcard patterns. Patterns will be evaluated
Expand All @@ -108,7 +97,7 @@ public void addPattern(String name, E target, boolean looseMatch) {
Object pattern;

if (!wildcard.isLiteral(name)) {
if (looseMatch && (name.length() > 0) && (name.charAt(0) == '/')) {
if (looseMatch && (!name.isEmpty()) && (name.charAt(0) == '/')) {
name = name.substring(1);
}

Expand Down Expand Up @@ -142,14 +131,14 @@ public void freeze() {
public E match(String potentialMatch) {
E config = null;

if (compiledPatterns.size() > 0) {
if (!compiledPatterns.isEmpty()) {
LOG.debug("Attempting to match '{}' to a wildcard pattern, {} available", potentialMatch, compiledPatterns.size());

Map<String, String> vars = new LinkedHashMap<>();
for (Mapping<E> m : compiledPatterns) {
if (wildcard.match(vars, potentialMatch, m.getPattern())) {
LOG.debug("Value matches pattern '{}'", m.getOriginalPattern());
config = convert(potentialMatch, m.getTarget(), vars);
if (wildcard.match(vars, potentialMatch, m.pattern())) {
LOG.debug("Value matches pattern '{}'", m.originalPattern());
config = convert(potentialMatch, m.target(), vars);
break;
}
}
Expand Down Expand Up @@ -216,7 +205,7 @@ protected String convertParam(String val, Map<String, String> vars) {

Matcher wildcardMatcher = WILDCARD_PATTERN.matcher(val);

StringBuffer result = new StringBuffer();
StringBuilder result = new StringBuilder();
while (wildcardMatcher.find()) {
wildcardMatcher.appendReplacement(result, vars.getOrDefault(wildcardMatcher.group(1), ""));
}
Expand All @@ -228,62 +217,11 @@ protected String convertParam(String val, Map<String, String> vars) {
/**
* <p> Stores a compiled wildcard pattern and the object it came
* from. </p>
*
* @param originalPattern <p> The original pattern. </p>
* @param pattern <p> The compiled pattern. </p>
* @param target <p> The original object. </p>
*/
private static class Mapping<E> implements Serializable {
/**
* <p> The original pattern. </p>
*/
private final String original;


/**
* <p> The compiled pattern. </p>
*/
private final Object pattern;

/**
* <p> The original object. </p>
*/
private final E config;

/**
* <p> Contructs a read-only Mapping instance. </p>
*
* @param original The original pattern
* @param pattern The compiled pattern
* @param config The original object
*/
public Mapping(String original, Object pattern, E config) {
this.original = original;
this.pattern = pattern;
this.config = config;
}

/**
* <p> Gets the compiled wildcard pattern. </p>
*
* @return The compiled pattern
*/
public Object getPattern() {
return this.pattern;
}

/**
* <p> Gets the object that contains the pattern. </p>
*
* @return The associated object
*/
public E getTarget() {
return this.config;
}

/**
* <p> Gets the original wildcard pattern. </p>
*
* @return The original pattern
*/
public String getOriginalPattern() {
return this.original;
}
private record Mapping<E>(String originalPattern, Object pattern, E target) implements Serializable {
}
}
3 changes: 0 additions & 3 deletions core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,4 @@ public interface TypeConverter {

Object NO_CONVERSION_POSSIBLE = "ognl.NoConversionPossible";

@Deprecated
String TYPE_CONVERTER_CONTEXT_KEY = "_typeConverter";

}
Loading

0 comments on commit fe49781

Please sign in to comment.