diff --git a/ballerina-shell/modules/shell-cli/src/main/java/io/ballerina/shell/cli/handlers/help/BbeRecord.java b/ballerina-shell/modules/shell-cli/src/main/java/io/ballerina/shell/cli/handlers/help/BbeRecord.java index 2e9be6cd2830..2443007f7aa9 100644 --- a/ballerina-shell/modules/shell-cli/src/main/java/io/ballerina/shell/cli/handlers/help/BbeRecord.java +++ b/ballerina-shell/modules/shell-cli/src/main/java/io/ballerina/shell/cli/handlers/help/BbeRecord.java @@ -23,11 +23,11 @@ */ public class BbeRecord { - private String name; - private String url; - private String verifyBuild; - private String verifyOutput; - private String isLearnByExample; + private final String name; + private final String url; + private final String verifyBuild; + private final String verifyOutput; + private final String isLearnByExample; public BbeRecord(String name, String url, String verifyBuild, String verifyOutput, String isLearnByExample) { this.name = name; diff --git a/ballerina-shell/modules/shell-cli/src/main/java/io/ballerina/shell/cli/handlers/help/BbeTitle.java b/ballerina-shell/modules/shell-cli/src/main/java/io/ballerina/shell/cli/handlers/help/BbeTitle.java index 5f84472543f9..0794160832dc 100644 --- a/ballerina-shell/modules/shell-cli/src/main/java/io/ballerina/shell/cli/handlers/help/BbeTitle.java +++ b/ballerina-shell/modules/shell-cli/src/main/java/io/ballerina/shell/cli/handlers/help/BbeTitle.java @@ -25,10 +25,10 @@ */ public class BbeTitle { - private String title; - private String column; - private String category; - private BbeRecord[] samples; + private final String title; + private final String column; + private final String category; + private final BbeRecord[] samples; public BbeTitle(String title, String column, String category, BbeRecord[] samples) { this.title = title; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BLock.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BLock.java index 0541f4ea7a7e..b717de1bfeeb 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BLock.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BLock.java @@ -29,9 +29,9 @@ */ public class BLock { - private ArrayDeque current; + private final ArrayDeque current; - private ArrayDeque waitingForLock; + private final ArrayDeque waitingForLock; public BLock() { this.current = new ArrayDeque<>(); diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BLockStore.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BLockStore.java index ae413a333a0c..15ef82e435b3 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BLockStore.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/BLockStore.java @@ -34,7 +34,7 @@ public class BLockStore { /** * The map of locks inferred. */ - private Map globalLockMap; + private final Map globalLockMap; public BLockStore() { globalLockMap = new ConcurrentHashMap<>(); diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonGenerator.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonGenerator.java index 19b2f59af74d..b9b11d98dad3 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonGenerator.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/JsonGenerator.java @@ -46,7 +46,7 @@ public class JsonGenerator implements Closeable { private static final int DEFAULT_DEPTH = 10; - private Writer writer; + private final Writer writer; private boolean[] levelInit = new boolean[DEFAULT_DEPTH]; @@ -54,15 +54,15 @@ public class JsonGenerator implements Closeable { private boolean fieldActive; - private static boolean[] escChars = new boolean[93]; + private static final boolean[] ESC_CHARS = new boolean[93]; static { - escChars['"'] = true; - escChars['\\'] = true; - escChars['\b'] = true; - escChars['\n'] = true; - escChars['\r'] = true; - escChars['\t'] = true; + ESC_CHARS['"'] = true; + ESC_CHARS['\\'] = true; + ESC_CHARS['\b'] = true; + ESC_CHARS['\n'] = true; + ESC_CHARS['\r'] = true; + ESC_CHARS['\t'] = true; } public JsonGenerator(OutputStream out) { @@ -159,7 +159,7 @@ private void writeStringValue(String value) throws IOException { char[] chs = value.toCharArray(); for (int i = 0; i < count; i++) { ch = chs[i]; - if (ch < escChars.length && escChars[ch]) { + if (ch < ESC_CHARS.length && ESC_CHARS[ch]) { escaped = true; break; } diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableJsonDataSource.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableJsonDataSource.java index 2d4580a13dd7..738ceede7c13 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableJsonDataSource.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableJsonDataSource.java @@ -47,8 +47,8 @@ */ public class TableJsonDataSource implements JsonDataSource { - private BTable tableValue; - private JSONObjectGenerator objGen; + private final BTable tableValue; + private final JSONObjectGenerator objGen; public TableJsonDataSource(BTable tableValue) { this(tableValue, new DefaultJSONObjectGenerator()); diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableOmDataSource.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableOmDataSource.java index 090bec991ec0..86d401f8a7bc 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableOmDataSource.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TableOmDataSource.java @@ -51,9 +51,9 @@ public class TableOmDataSource extends AbstractPushOMDataSource { private static final String DEFAULT_ROOT_WRAPPER = "results"; private static final String DEFAULT_ROW_WRAPPER = "result"; - private TableValueImpl table; - private String rootWrapper; - private String rowWrapper; + private final TableValueImpl table; + private final String rootWrapper; + private final String rowWrapper; public TableOmDataSource(TableValueImpl table, String rootWrapper, String rowWrapper) { this.table = table; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/XmlTreeBuilder.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/XmlTreeBuilder.java index 7a287cdaa070..922215fee5c4 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/XmlTreeBuilder.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/XmlTreeBuilder.java @@ -63,17 +63,17 @@ public class XmlTreeBuilder { // XMLInputFactory2 - private static final XMLInputFactory xmlInputFactory; + private static final XMLInputFactory XML_INPUT_FACTORY; static { - xmlInputFactory = XMLInputFactory.newInstance(); - xmlInputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false); + XML_INPUT_FACTORY = XMLInputFactory.newInstance(); + XML_INPUT_FACTORY.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false); } private XMLStreamReader xmlStreamReader; - private Map namespaces; // xml ns declarations from Bal source [xmlns "http://ns.com" as ns] - private Deque seqDeque; - private Deque> siblingDeque; + private final Map namespaces; // xml ns declarations from Bal source [xmlns "http://ns.com" as ns] + private final Deque seqDeque; + private final Deque> siblingDeque; public XmlTreeBuilder(String str) { this(new StringReader(str)); @@ -89,7 +89,7 @@ public XmlTreeBuilder(Reader stringReader) { seqDeque.push(new XmlSequence(siblings)); try { - xmlStreamReader = xmlInputFactory.createXMLStreamReader(stringReader); + xmlStreamReader = XML_INPUT_FACTORY.createXMLStreamReader(stringReader); } catch (XMLStreamException e) { handleXMLStreamException(e); } diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/exceptions/ConfigException.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/exceptions/ConfigException.java index 1ff6ac54b588..dbf434c134bd 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/exceptions/ConfigException.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/exceptions/ConfigException.java @@ -27,9 +27,9 @@ */ public class ConfigException extends RuntimeException { - private ErrorCodes errorCode; + private final ErrorCodes errorCode; - private Object[] args; + private final Object[] args; public ConfigException(ErrorCodes errorCode, Object... args) { this.errorCode = errorCode; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/diagnostics/RuntimeDiagnostic.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/diagnostics/RuntimeDiagnostic.java index 3f2ccf22c317..868927bce53a 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/diagnostics/RuntimeDiagnostic.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/diagnostics/RuntimeDiagnostic.java @@ -35,9 +35,9 @@ public class RuntimeDiagnostic extends Diagnostic { private final DiagnosticInfo diagnosticInfo; - private Object[] args; + private final Object[] args; - private RuntimeDiagnosticLocation location; + private final RuntimeDiagnosticLocation location; public RuntimeDiagnostic(DiagnosticInfo diagnosticInfo, String location, Object[] args) { this.diagnosticInfo = diagnosticInfo; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/diagnostics/RuntimeDiagnosticLocation.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/diagnostics/RuntimeDiagnosticLocation.java index 10e55ad8220b..243ae95b2fb5 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/diagnostics/RuntimeDiagnosticLocation.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/diagnostics/RuntimeDiagnosticLocation.java @@ -28,7 +28,7 @@ */ public class RuntimeDiagnosticLocation implements Location { - private String location; + private final String location; public RuntimeDiagnosticLocation(String location) { this.location = location; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/diagnostics/RuntimeDiagnosticLog.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/diagnostics/RuntimeDiagnosticLog.java index 7d0e814ceaff..7b08579ffd2e 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/diagnostics/RuntimeDiagnosticLog.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/diagnostics/RuntimeDiagnosticLog.java @@ -32,7 +32,7 @@ */ public class RuntimeDiagnosticLog { - private List diagnosticList = new LinkedList<>(); + private final List diagnosticList = new LinkedList<>(); private int errorCount = 0; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/regexp/CharReader.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/regexp/CharReader.java index edaa88f1e171..1f8a6e8ebbcc 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/regexp/CharReader.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/regexp/CharReader.java @@ -27,9 +27,9 @@ */ public class CharReader { - private char[] charBuffer; + private final char[] charBuffer; private int offset = 0; - private int charBufferLength; + private final int charBufferLength; private int lexemeStartPos; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/regexp/TokenReader.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/regexp/TokenReader.java index 28e12617fa78..5398d386136b 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/regexp/TokenReader.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/regexp/TokenReader.java @@ -28,7 +28,7 @@ public class TokenReader { private static final int BUFFER_SIZE = 20; private final TreeTraverser treeTraverser; - private TokenBuffer tokensAhead = new TokenBuffer(BUFFER_SIZE); + private final TokenBuffer tokensAhead = new TokenBuffer(BUFFER_SIZE); public TokenReader(TreeTraverser treeTraverser) { this.treeTraverser = treeTraverser; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/regexp/TreeTraverser.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/regexp/TreeTraverser.java index 4a7bdfbcaca3..d2ffe5841a35 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/regexp/TreeTraverser.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/regexp/TreeTraverser.java @@ -30,9 +30,9 @@ */ public class TreeTraverser { - private CharReader reader; + private final CharReader reader; private ParserMode mode; - private ArrayDeque modeStack = new ArrayDeque<>(); + private final ArrayDeque modeStack = new ArrayDeque<>(); public TreeTraverser(CharReader charReader) { this.reader = charReader; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/AsyncFunctionCallback.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/AsyncFunctionCallback.java index 1071e91cac47..e2efb600c53d 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/AsyncFunctionCallback.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/AsyncFunctionCallback.java @@ -30,7 +30,7 @@ public abstract class AsyncFunctionCallback implements Callback { private FutureValue future; - private Strand strand; + private final Strand strand; public AsyncFunctionCallback(Strand strand) { this.strand = strand; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/Scheduler.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/Scheduler.java index 699ed781a833..a2d081f95ff9 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/Scheduler.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/scheduling/Scheduler.java @@ -54,7 +54,7 @@ */ public class Scheduler { - private static final PrintStream err = System.err; + private static final PrintStream ERR = System.err; /** * Scheduler does not get killed if the immortal value is true. Specific to services. @@ -66,13 +66,13 @@ public class Scheduler { */ private final BlockingQueue runnableList = new LinkedBlockingDeque<>(); - private static final ThreadLocal strandHolder = ThreadLocal.withInitial(StrandHolder::new); - private static final ConcurrentHashMap currentStrands = new ConcurrentHashMap<>(); + private static final ThreadLocal STRAND_HOLDER = ThreadLocal.withInitial(StrandHolder::new); + private static final ConcurrentHashMap CURRENT_STRANDS = new ConcurrentHashMap<>(); private final Strand previousStrand; private final AtomicInteger totalStrands = new AtomicInteger(); - private static String poolSizeConf = System.getenv(RuntimeConstants.BALLERINA_MAX_POOL_SIZE_ENV_VAR); + private static final String POOL_SIZE_CONF = System.getenv(RuntimeConstants.BALLERINA_MAX_POOL_SIZE_ENV_VAR); /** * This can be changed by setting the BALLERINA_MAX_POOL_SIZE system variable. @@ -84,7 +84,7 @@ public class Scheduler { private Semaphore mainBlockSem; private final RuntimeRegistry runtimeRegistry; - private AtomicReference objectGroup = new AtomicReference<>(); + private final AtomicReference objectGroup = new AtomicReference<>(); private static Strand daemonStrand = null; public static void setDaemonStrand(Strand strand) { @@ -103,13 +103,13 @@ public Scheduler(int numThreads, boolean immortal) { this.numThreads = numThreads; this.immortal = immortal; this.runtimeRegistry = new RuntimeRegistry(this); - this.previousStrand = numThreads == 1 ? strandHolder.get().strand : null; + this.previousStrand = numThreads == 1 ? STRAND_HOLDER.get().strand : null; ItemGroup group = new ItemGroup(); objectGroup.set(group); } public static Strand getStrand() { - Strand strand = strandHolder.get().strand; + Strand strand = STRAND_HOLDER.get().strand; if (strand == null) { throw new IllegalStateException("strand is not accessible from non-strand-worker threads"); } @@ -118,11 +118,11 @@ public static Strand getStrand() { public static Strand getStrandNoException() { // issue #22871 is opened to fix this - return strandHolder.get().strand; + return STRAND_HOLDER.get().strand; } public static Map getCurrentStrands() { - return new HashMap<>(currentStrands); + return new HashMap<>(CURRENT_STRANDS); } /** @@ -320,7 +320,7 @@ private void run() { item = group.get(); try { - strandHolder.get().strand = item.future.strand; + STRAND_HOLDER.get().strand = item.future.strand; result = item.execute(); } catch (Throwable e) { panic = createError(e); @@ -335,7 +335,7 @@ private void run() { RuntimeUtils.printCrashLog(panic); } } finally { - strandHolder.get().strand = previousStrand; + STRAND_HOLDER.get().strand = previousStrand; } postProcess(item, result, panic); group.lock(); @@ -462,7 +462,7 @@ private void cleanUp(Strand justCompleted) { justCompleted.frames = null; justCompleted.waitingContexts = null; - currentStrands.remove(justCompleted.getId()); + CURRENT_STRANDS.remove(justCompleted.getId()); //TODO: more cleanup , eg channels } @@ -511,7 +511,7 @@ public FutureValue createFuture(Strand parent, Callback callback, Map function; - private Object[] params; + private final Function function; + private final Object[] params; final FutureValue future; boolean parked; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFiniteType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFiniteType.java index c232100029f9..3ca2ae443844 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFiniteType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BFiniteType.java @@ -39,8 +39,8 @@ public class BFiniteType extends BType implements FiniteType { public Set valueSpace; - private int typeFlags; - private String originalName; + private final int typeFlags; + private final String originalName; public BFiniteType(String typeName) { this(typeName, new LinkedHashSet<>(), 0); diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BParameterizedType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BParameterizedType.java index d167d3692cd1..ca8a47508c11 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BParameterizedType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BParameterizedType.java @@ -29,8 +29,8 @@ */ public class BParameterizedType extends BType implements ParameterizedType { - private Type paramValueType; - private int paramIndex; + private final Type paramValueType; + private final int paramIndex; public BParameterizedType(Type paramValueType, int paramIndex) { super(null, null, null); diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BStreamType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BStreamType.java index 5b5d7b91389b..049ba7f16452 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BStreamType.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BStreamType.java @@ -35,8 +35,8 @@ */ public class BStreamType extends BType implements StreamType { - private Type constraint; - private Type completionType; + private final Type constraint; + private final Type completionType; /** * Creates a {@link BStreamType} which represents the stream type. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/HandleValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/HandleValue.java index 760191114e8c..42f5ce5c100f 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/HandleValue.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/HandleValue.java @@ -37,7 +37,7 @@ */ public class HandleValue implements BHandle, RefValue { - private Object value; + private final Object value; private BTypedesc typedesc; public HandleValue(Object value) { diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpCharSetRange.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpCharSetRange.java index 9a25df276e46..3cb0e6d121de 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpCharSetRange.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpCharSetRange.java @@ -31,7 +31,7 @@ */ public class RegExpCharSetRange extends RegExpCommonValue { private String lhsCharSetAtom; - private String dash; + private final String dash; private String rhsCharSetAom; public RegExpCharSetRange(String lhsCharSetAtom, String dash, String rhsCharSetAom) { diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpCharacterClass.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpCharacterClass.java index 057cab178ffe..064dd5d56502 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpCharacterClass.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/RegExpCharacterClass.java @@ -31,7 +31,7 @@ */ public class RegExpCharacterClass extends RegExpCommonValue implements RegExpAtom { private String characterClassStart; - private String negation; + private final String negation; private RegExpCharSet reCharSet; private String characterClassEnd; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StreamValue.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StreamValue.java index 685443885294..bf0eb2d4a2ca 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StreamValue.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/StreamValue.java @@ -42,11 +42,11 @@ public class StreamValue implements RefValue, BStream { private BTypedesc typedesc; - private Type type; - private Type constraintType; - private Type completionType; + private final Type type; + private final Type constraintType; + private final Type completionType; private Type iteratorNextReturnType; - private BObject iteratorObj; + private final BObject iteratorObj; /** diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TableValueImpl.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TableValueImpl.java index 540f6371e222..305586506362 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TableValueImpl.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TableValueImpl.java @@ -89,16 +89,16 @@ public class TableValueImpl implements TableValue { private Type type; private TableType tableType; private Type iteratorNextReturnType; - private ConcurrentHashMap>> entries; - private LinkedHashMap> values; + private final ConcurrentHashMap>> entries; + private final LinkedHashMap> values; private String[] fieldNames; private ValueHolder valueHolder; private long maxIntKey = 0; //These are required to achieve the iterator behavior - private Map indexToKeyMap; - private Map keyToIndexMap; - private Map keyValues; + private final Map indexToKeyMap; + private final Map keyToIndexMap; + private final Map keyValues; private long noOfAddedEntries = 0; private boolean nextKeySupported; @@ -594,7 +594,7 @@ public Type getKeyType() { } private class KeyHashValueHolder extends ValueHolder { - private DefaultKeyWrapper keyWrapper; + private final DefaultKeyWrapper keyWrapper; private Type keyType; public KeyHashValueHolder() { diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlItem.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlItem.java index 596a091cbc78..14d4218dcb3a 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlItem.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlItem.java @@ -71,9 +71,9 @@ public final class XmlItem extends XmlValue implements BXmlItem { private QName name; private XmlSequence children; - private AttributeMapValueImpl attributes; + private final AttributeMapValueImpl attributes; // Keep track of probable parents of xml element to detect probable cycles in xml. - private List> probableParents; + private final List> probableParents; public XmlItem(QName name, XmlSequence children, boolean readonly) { this.name = name; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlPi.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlPi.java index 61f8982271fb..8ece7823964d 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlPi.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlPi.java @@ -34,8 +34,8 @@ */ public class XmlPi extends XmlNonElementItem { - private String data; - private String target; + private final String data; + private final String target; public XmlPi(String data, String target) { this.data = data; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlSequence.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlSequence.java index 03347dfa93c6..cca632cf9dd2 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlSequence.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlSequence.java @@ -619,7 +619,7 @@ public boolean isFrozen() { @Override public IteratorValue getIterator() { return new IteratorValue<>() { - Iterator iterator = children.iterator(); + final Iterator iterator = children.iterator(); @Override public boolean hasNext() { diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlText.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlText.java index d1ea4cd8306d..5103c770ebe3 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlText.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/XmlText.java @@ -35,7 +35,7 @@ */ public class XmlText extends XmlNonElementItem { - private String data; + private final String data; public XmlText(String data) { // data is the content of xml comment or text node diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/metrics/PolledGauge.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/metrics/PolledGauge.java index e59bca0886a8..4227b357ae36 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/metrics/PolledGauge.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/metrics/PolledGauge.java @@ -51,8 +51,8 @@ class Builder implements Metric.Builder, PolledGauge> { // Expecting at least 10 tags private final Set tags = new HashSet<>(10); private String description; - private T obj; - private ToDoubleFunction valueFunction; + private final T obj; + private final ToDoubleFunction valueFunction; private Builder(String name, T obj, ToDoubleFunction valueFunction) { this.name = name; diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/metrics/StatisticConfig.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/metrics/StatisticConfig.java index 06510349ef51..8d311ca39de9 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/metrics/StatisticConfig.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/metrics/StatisticConfig.java @@ -103,7 +103,7 @@ public static Builder builder() { */ public static class Builder { - private StatisticConfig config = new StatisticConfig(); + private final StatisticConfig config = new StatisticConfig(); /** * Percentiles to compute and publish. Percentile is in the domain [0,1]. diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/tracer/BSpan.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/tracer/BSpan.java index ee660c46f317..8350ce227bb4 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/tracer/BSpan.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/observability/tracer/BSpan.java @@ -53,8 +53,8 @@ public class BSpan { private static final MapType IMMUTABLE_STRING_MAP_TYPE = TypeCreator.createMapType( PredefinedTypes.TYPE_STRING, true); - private static PropagatingParentContextGetter getter = new PropagatingParentContextGetter(); - private static PropagatingParentContextSetter setter = new PropagatingParentContextSetter(); + private static final PropagatingParentContextGetter GETTER = new PropagatingParentContextGetter(); + private static final PropagatingParentContextSetter SETTER = new PropagatingParentContextSetter(); static class PropagatingParentContextGetter implements TextMapGetter> { @Override @@ -137,7 +137,7 @@ public static BSpan start(Map parentTraceContext, String service Tracer tracer = TracersStore.getInstance().getTracer(serviceName); Context parentContext = TracersStore.getInstance().getPropagators() - .getTextMapPropagator().extract(Context.current(), parentTraceContext, getter); + .getTextMapPropagator().extract(Context.current(), parentTraceContext, GETTER); return start(tracer, parentContext, operationName, isClient); } @@ -165,7 +165,7 @@ public Map extractContextAsHttpHeaders() { if (span != null) { carrierMap = new HashMap<>(); TextMapPropagator propagator = TracersStore.getInstance().getPropagators().getTextMapPropagator(); - propagator.inject(Context.current().with(span), carrierMap, setter); + propagator.inject(Context.current().with(span), carrierMap, SETTER); } else { carrierMap = Collections.emptyMap(); } diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionLocalContext.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionLocalContext.java index 3dad3d68f0e9..bcebf965ab05 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionLocalContext.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionLocalContext.java @@ -34,22 +34,22 @@ */ public class TransactionLocalContext { - private String globalTransactionId; - private String url; - private String protocol; + private final String globalTransactionId; + private final String url; + private final String protocol; private int transactionLevel; - private Map allowedTransactionRetryCounts; - private Map currentTransactionRetryCounts; + private final Map allowedTransactionRetryCounts; + private final Map currentTransactionRetryCounts; private Map transactionContextStore; - private Deque transactionBlockIdStack; - private Deque transactionFailure; - private static final TransactionResourceManager transactionResourceManager = + private final Deque transactionBlockIdStack; + private final Deque transactionFailure; + private static final TransactionResourceManager TRANSACTION_RESOURCE_MANAGER = TransactionResourceManager.getInstance(); private boolean isResourceParticipant; private Object rollbackOnlyError; private Object transactionData; - private BArray transactionId; + private final BArray transactionId; private boolean isTransactional; private TransactionLocalContext(String globalTransactionId, String url, String protocol, Object infoRecord) { @@ -72,7 +72,7 @@ private void validateAndPutTransactionInfo(ByteBuffer transactionIdBytes, Object if (infoRecord == null) { return; } - transactionResourceManager.transactionInfoMap.put(transactionIdBytes, infoRecord); + TRANSACTION_RESOURCE_MANAGER.transactionInfoMap.put(transactionIdBytes, infoRecord); } public static TransactionLocalContext createTransactionParticipantLocalCtx(String globalTransactionId, @@ -160,8 +160,8 @@ public boolean isRetryPossible(Strand context, String transactionId) { public void notifyAbortAndClearTransaction(String transactionBlockId) { transactionContextStore.clear(); - transactionResourceManager.endXATransaction(globalTransactionId, transactionBlockId, true); - transactionResourceManager.notifyAbort(globalTransactionId, transactionBlockId); + TRANSACTION_RESOURCE_MANAGER.endXATransaction(globalTransactionId, transactionBlockId, true); + TRANSACTION_RESOURCE_MANAGER.notifyAbort(globalTransactionId, transactionBlockId); } public void setRollbackOnlyError(Object error) { @@ -181,12 +181,12 @@ public Object getTransactionData() { } public void removeTransactionInfo() { - transactionResourceManager.transactionInfoMap.remove(ByteBuffer.wrap(transactionId.getBytes())); + TRANSACTION_RESOURCE_MANAGER.transactionInfoMap.remove(ByteBuffer.wrap(transactionId.getBytes())); } public void notifyLocalParticipantFailure() { String blockId = transactionBlockIdStack.peek(); - transactionResourceManager.notifyLocalParticipantFailure(globalTransactionId, blockId); + TRANSACTION_RESOURCE_MANAGER.notifyLocalParticipantFailure(globalTransactionId, blockId); } public void notifyLocalRemoteParticipantFailure() { @@ -236,7 +236,7 @@ public void setResourceParticipant(boolean resourceParticipant) { } public Object getInfoRecord() { - return transactionResourceManager.getTransactionRecord(transactionId); + return TRANSACTION_RESOURCE_MANAGER.getTransactionRecord(transactionId); } public boolean isTransactional() { diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java index 743c1dc2fd58..b2787f146f41 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java @@ -45,7 +45,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentSkipListSet; import javax.transaction.HeuristicMixedException; @@ -76,7 +78,7 @@ public class TransactionResourceManager { private static TransactionResourceManager transactionResourceManager = null; - private static UserTransactionManager userTransactionManager = null; + private static UserTransactionManager userTransactionManager = null; private static final StrandMetadata COMMIT_METADATA = new StrandMetadata(BALLERINA_BUILTIN_PKG_PREFIX, TRANSACTION_PACKAGE_NAME, @@ -90,28 +92,24 @@ public class TransactionResourceManager { public static final String TRANSACTION_AUTO_COMMIT_TIMEOUT_KEY = "transactionAutoCommitTimeout"; public static final String TRANSACTION_CLEANUP_TIMEOUT_KEY = "transactionCleanupTimeout"; - private static final Logger log = LoggerFactory.getLogger(TransactionResourceManager.class); - private Map> resourceRegistry; + private static final Logger LOG = LoggerFactory.getLogger(TransactionResourceManager.class); + private final Map> resourceRegistry = new HashMap<>(); private Map trxRegistry; private Map xidRegistry; - private Map>> committedFuncRegistry; - private Map>> abortedFuncRegistry; + private final Map>> committedFuncRegistry = new HashMap<>(); + private final Map>> abortedFuncRegistry = new HashMap<>(); - private ConcurrentSkipListSet failedResourceParticipantSet = new ConcurrentSkipListSet<>(); - private ConcurrentSkipListSet failedLocalParticipantSet = new ConcurrentSkipListSet<>(); - private ConcurrentHashMap> localParticipants = new ConcurrentHashMap<>(); + private final Set failedResourceParticipantSet = new ConcurrentSkipListSet<>(); + private final Set failedLocalParticipantSet = new ConcurrentSkipListSet<>(); + private final ConcurrentMap> localParticipants = new ConcurrentHashMap<>(); - private boolean transactionManagerEnabled; - private static final PrintStream stderr = System.err; + private final boolean transactionManagerEnabled; + private static final PrintStream STDERR = System.err; - Map transactionInfoMap; + final Map transactionInfoMap = new ConcurrentHashMap<>(); private TransactionResourceManager() { - resourceRegistry = new HashMap<>(); - committedFuncRegistry = new HashMap<>(); - abortedFuncRegistry = new HashMap<>(); - transactionInfoMap = new ConcurrentHashMap<>(); transactionManagerEnabled = getTransactionManagerEnabled(); if (transactionManagerEnabled) { trxRegistry = new HashMap<>(); @@ -153,7 +151,7 @@ private void setLogProperties() { try { Files.createDirectory(transactionLogDirectory); } catch (IOException e) { - stderr.println("error: failed to create transaction log directory in " + logDir); + STDERR.println("error: failed to create transaction log directory in " + logDir); } } System.setProperty(ATOMIKOS_LOG_BASE_PROPERTY, logDir); @@ -315,7 +313,7 @@ public boolean prepare(String transactionId, String transactionBlockId) { xaResource.prepare(xid); } } catch (XAException e) { - log.error("error at transaction prepare phase in transaction " + transactionId + LOG.error("error at transaction prepare phase in transaction " + transactionId + ":" + e.getMessage(), e); return false; } @@ -327,7 +325,7 @@ public boolean prepare(String transactionId, String transactionBlockId) { // resource participant reported failure. status = false; } - log.info(String.format("Transaction prepare (participants): %s", status ? "success" : "failed")); + LOG.info(String.format("Transaction prepare (participants): %s", status ? "success" : "failed")); return status; } @@ -351,7 +349,7 @@ public boolean notifyCommit(String transactionId, String transactionBlockId) { } } catch (SystemException | HeuristicMixedException | HeuristicRollbackException | RollbackException e) { - log.error("error when committing transaction " + transactionId + ":" + e.getMessage(), e); + LOG.error("error when committing transaction " + transactionId + ":" + e.getMessage(), e); commitSuccess = false; } } @@ -370,7 +368,7 @@ public boolean notifyCommit(String transactionId, String transactionBlockId) { } } } catch (XAException e) { - log.error("error when committing transaction " + transactionId + ":" + e.getMessage(), e); + LOG.error("error when committing transaction " + transactionId + ":" + e.getMessage(), e); commitSuccess = false; } finally { ctx.close(); @@ -408,7 +406,7 @@ public boolean notifyAbort(String transactionId, String transactionBlockId) { trx.rollback(); } } catch (SystemException e) { - log.error("error when aborting transaction " + transactionId + ":" + e.getMessage(), e); + LOG.error("error when aborting transaction " + transactionId + ":" + e.getMessage(), e); abortSuccess = false; } } @@ -427,7 +425,7 @@ public boolean notifyAbort(String transactionId, String transactionBlockId) { } } } catch (XAException e) { - log.error("error when aborting the transaction " + transactionId + ":" + e.getMessage(), e); + LOG.error("error when aborting the transaction " + transactionId + ":" + e.getMessage(), e); abortSuccess = false; } finally { ctx.close(); @@ -466,7 +464,7 @@ public void beginXATransaction(String transactionId, String transactionBlockId, trxRegistry.put(combinedId, trx); } } catch (SystemException | NotSupportedException e) { - log.error("error in initiating transaction " + transactionId + ":" + e.getMessage(), e); + LOG.error("error in initiating transaction " + transactionId + ":" + e.getMessage(), e); } } else { Xid xid = xidRegistry.get(combinedId); @@ -477,7 +475,7 @@ public void beginXATransaction(String transactionId, String transactionBlockId, try { xaResource.start(xid, TMNOFLAGS); } catch (XAException e) { - log.error("error in starting XA transaction " + transactionId + ":" + e.getMessage(), e); + LOG.error("error in starting XA transaction " + transactionId + ":" + e.getMessage(), e); } } } @@ -610,7 +608,7 @@ void endXATransaction(String transactionId, String transactionBlockId, boolean a trx.delistResource(xaResource, TMSUCCESS); } } catch (IllegalStateException | SystemException e) { - log.error("error in ending the XA transaction " + transactionId + LOG.error("error in ending the XA transaction " + transactionId + ":" + e.getMessage(), e); } } @@ -627,7 +625,7 @@ void endXATransaction(String transactionId, String transactionBlockId, boolean a xaResource.end(xid, abortOnly ? TMFAIL : TMSUCCESS); } } catch (XAException e) { - log.error("error in ending XA transaction " + transactionId + ":" + e.getMessage(), e); + LOG.error("error in ending XA transaction " + transactionId + ":" + e.getMessage(), e); } } } @@ -654,11 +652,11 @@ private String generateCombinedTransactionId(String transactionId, String transa public void notifyResourceFailure(String gTransactionId) { failedResourceParticipantSet.add(gTransactionId); // The resource excepted (uncaught). - log.info("Trx infected callable unit excepted id : " + gTransactionId); + LOG.info("Trx infected callable unit excepted id : " + gTransactionId); } public void notifyLocalParticipantFailure(String gTransactionId, String blockId) { - ConcurrentSkipListSet participantBlockIds = localParticipants.get(gTransactionId); + Set participantBlockIds = localParticipants.get(gTransactionId); if (participantBlockIds != null && participantBlockIds.contains(blockId)) { failedLocalParticipantSet.add(gTransactionId); } diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/DocCommand.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/DocCommand.java index b7ce4a14fb82..6553818388f8 100644 --- a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/DocCommand.java +++ b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/DocCommand.java @@ -55,7 +55,7 @@ public class DocCommand implements BLauncherCmd { private final PrintStream errStream; private Path projectPath; private Path outputPath; - private boolean exitWhenFinish; + private final boolean exitWhenFinish; public DocCommand() { this.projectPath = Paths.get(System.getProperty("user.dir")); diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/PushCommand.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/PushCommand.java index e56bca657100..7718457ee164 100644 --- a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/PushCommand.java +++ b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/PushCommand.java @@ -100,10 +100,10 @@ public class PushCommand implements BLauncherCmd { @CommandLine.Option(names = {"--skip-source-check"}, description = "skip checking if source has changed") private boolean skipSourceCheck; - private Path userDir; - private PrintStream errStream; - private PrintStream outStream; - private boolean exitWhenFinish; + private final Path userDir; + private final PrintStream errStream; + private final PrintStream outStream; + private final boolean exitWhenFinish; public PushCommand() { this.userDir = Paths.get(System.getProperty(ProjectConstants.USER_DIR)); diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/ShellCommand.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/ShellCommand.java index bb33b1acba16..b1e3c51a32a6 100644 --- a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/ShellCommand.java +++ b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/ShellCommand.java @@ -34,7 +34,7 @@ */ @CommandLine.Command(name = SHELL_COMMAND, description = "Run Ballerina interactive REPL") public class ShellCommand implements BLauncherCmd { - private PrintStream errStream; + private final PrintStream errStream; @CommandLine.Option(names = {"--help", "-h", "?"}, hidden = true) private boolean helpFlag; diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/TokenUpdater.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/TokenUpdater.java index 1041b115f7aa..8f37f019c10f 100644 --- a/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/TokenUpdater.java +++ b/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/TokenUpdater.java @@ -43,8 +43,8 @@ */ public final class TokenUpdater { - private static PrintStream errStream = System.err; - private static PrintStream outStream = System.out; + private static final PrintStream ERR_STREAM = System.err; + private static final PrintStream OUT_STREAM = System.out; private TokenUpdater() { } @@ -96,10 +96,10 @@ public void handle(HttpExchange httpExchange) { outputStream.close(); } } catch (IOException e) { - errStream.println("error occurred while closing the output stream: " + e.getMessage()); + ERR_STREAM.println("error occurred while closing the output stream: " + e.getMessage()); } } - outStream.println("token updated"); + OUT_STREAM.println("token updated"); OutputStream os = null; try { @@ -117,7 +117,7 @@ public void handle(HttpExchange httpExchange) { os.close(); } } catch (IOException e) { - errStream.println("error occurred while closing the output stream: " + e.getMessage()); + ERR_STREAM.println("error occurred while closing the output stream: " + e.getMessage()); } } } diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BallerinaModuleID.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BallerinaModuleID.java index 7d0dc68341c5..e7aef19af46c 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BallerinaModuleID.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BallerinaModuleID.java @@ -32,7 +32,7 @@ public class BallerinaModuleID implements ModuleID { private static final String ANON_ORG = "$anon"; - private PackageID moduleID; + private final PackageID moduleID; private Name prefix; public BallerinaModuleID(PackageID moduleID) { diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/NodeFinder.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/NodeFinder.java index e885d26aa376..e3b0c660e6ee 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/NodeFinder.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/NodeFinder.java @@ -216,7 +216,7 @@ class NodeFinder extends BaseVisitor { private LineRange range; private BLangNode enclosingNode; private BLangNode enclosingContainer; - private boolean allowExprStmts; + private final boolean allowExprStmts; NodeFinder(boolean allowExprStmts) { this.allowExprStmts = allowExprStmts; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaAnnotationSymbol.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaAnnotationSymbol.java index 2e1bf8f56b87..353bef7e61c2 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaAnnotationSymbol.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaAnnotationSymbol.java @@ -137,8 +137,8 @@ public static class AnnotationSymbolBuilder extends SymbolBuilder qualifiers = new ArrayList<>(); private TypeSymbol typeDescriptor; private List attachPoints; - private List annots = new ArrayList<>(); - private List annotAttachments = new ArrayList<>(); + private final List annots = new ArrayList<>(); + private final List annotAttachments = new ArrayList<>(); public AnnotationSymbolBuilder(String name, BAnnotationSymbol annotationSymbol, CompilerContext context) { super(name, SymbolKind.ANNOTATION, annotationSymbol, context); diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaConstantSymbol.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaConstantSymbol.java index 9e0a696feecd..4ce757e082fc 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaConstantSymbol.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaConstantSymbol.java @@ -48,7 +48,7 @@ public class BallerinaConstantSymbol extends BallerinaVariableSymbol implements ConstantSymbol { private final BallerinaConstantValue constValue; - private TypeSymbol broaderType; + private final TypeSymbol broaderType; private BallerinaConstantSymbol(String name, List qualifiers, List annots, List annotAttachments, TypeSymbol typeDescriptor, diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaDocumentation.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaDocumentation.java index 3a815fc0d87a..c1f0b6c91b99 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaDocumentation.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaDocumentation.java @@ -32,7 +32,7 @@ */ public class BallerinaDocumentation implements Documentation { - private MarkdownDocAttachment markdownDocAttachment; + private final MarkdownDocAttachment markdownDocAttachment; public BallerinaDocumentation(MarkdownDocAttachment markdownDocAttachment) { this.markdownDocAttachment = markdownDocAttachment; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaEnumSymbol.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaEnumSymbol.java index 0e02faea8e7f..32977e0eb880 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaEnumSymbol.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaEnumSymbol.java @@ -41,8 +41,8 @@ */ public class BallerinaEnumSymbol extends BallerinaTypeDefinitionSymbol implements EnumSymbol { - private List members; - private List annots; + private final List members; + private final List annots; private final List annotAttachments; protected BallerinaEnumSymbol(String name, List members, List qualifiers, diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaModule.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaModule.java index 24f094f6754d..7ac25ae7f3f5 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaModule.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaModule.java @@ -59,7 +59,7 @@ */ public class BallerinaModule extends BallerinaSymbol implements ModuleSymbol { - private BPackageSymbol packageSymbol; + private final BPackageSymbol packageSymbol; private List typeDefs; private List classes; private List functions; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaObjectFieldSymbol.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaObjectFieldSymbol.java index 14ae5d9f7c04..efb5896cb83a 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaObjectFieldSymbol.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaObjectFieldSymbol.java @@ -55,7 +55,7 @@ public class BallerinaObjectFieldSymbol extends BallerinaSymbol implements Objec private TypeSymbol typeDescriptor; private List annots; private String signature; - private boolean deprecated; + private final boolean deprecated; private List annotAttachments; public BallerinaObjectFieldSymbol(CompilerContext context, BField bField, SymbolKind kind) { diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaRecordFieldSymbol.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaRecordFieldSymbol.java index e5962a1116c0..4650cea13be3 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaRecordFieldSymbol.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaRecordFieldSymbol.java @@ -55,7 +55,7 @@ public class BallerinaRecordFieldSymbol extends BallerinaSymbol implements Recor private List annotAttachments; private List qualifiers; private String signature; - private boolean deprecated; + private final boolean deprecated; public BallerinaRecordFieldSymbol(CompilerContext context, BField bField) { super(bField.symbol.getOriginalName().value, SymbolKind.RECORD_FIELD, bField.symbol, context); diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaTypeReferenceTypeSymbol.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaTypeReferenceTypeSymbol.java index 2982cdb8d9cb..e68a1d5e22fd 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaTypeReferenceTypeSymbol.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaTypeReferenceTypeSymbol.java @@ -56,7 +56,7 @@ public class BallerinaTypeReferenceTypeSymbol extends AbstractTypeSymbol impleme private ModuleSymbol module; private Symbol definition; private boolean moduleEvaluated; - private boolean fromIntersectionType; + private final boolean fromIntersectionType; public BSymbol tSymbol; public BType referredType; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaWorkerSymbol.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaWorkerSymbol.java index 213c181d8ff6..6930e8f6ccb8 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaWorkerSymbol.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaWorkerSymbol.java @@ -37,8 +37,8 @@ */ public class BallerinaWorkerSymbol extends BallerinaSymbol implements WorkerSymbol { - private TypeSymbol returnType; - private List annots; + private final TypeSymbol returnType; + private final List annots; private final List annotAttachments; private BallerinaWorkerSymbol(String name, SymbolKind ballerinaSymbolKind, TypeSymbol returnType, diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/type/builders/BallerinaObjectTypeBuilder.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/type/builders/BallerinaObjectTypeBuilder.java index 831998e3df26..ed7387eab7c7 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/type/builders/BallerinaObjectTypeBuilder.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/type/builders/BallerinaObjectTypeBuilder.java @@ -60,7 +60,7 @@ public class BallerinaObjectTypeBuilder implements TypeBuilder.OBJECT { private final TypesFactory typesFactory; private final SymbolTable symTable; - private List qualifiers = new ArrayList<>(); + private final List qualifiers = new ArrayList<>(); private final List objectFieldList = new ArrayList<>(); private final List objectMethodList = new ArrayList<>(); private final List typeInclusions = new ArrayList<>(); diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/BalToolToml.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/BalToolToml.java index f34bc8ee88ca..834ac86feb02 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/BalToolToml.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/BalToolToml.java @@ -27,8 +27,8 @@ * @since 2201.6.0 */ public class BalToolToml { - private TomlDocumentContext balToolTomlContext; - private Package packageInstance; + private final TomlDocumentContext balToolTomlContext; + private final Package packageInstance; private BalToolToml(TomlDocumentContext balToolTomlContext, Package packageInstance) { this.balToolTomlContext = balToolTomlContext; @@ -73,7 +73,7 @@ public BalToolToml.Modifier modify() { */ public static class Modifier { private TomlDocument tomlDocument; - private Package oldPackage; + private final Package oldPackage; private Modifier(BalToolToml oldDocument) { this.tomlDocument = oldDocument.tomlDocument(); diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/BalToolsManifest.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/BalToolsManifest.java index 8164aece980f..8cf67d265bba 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/BalToolsManifest.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/BalToolsManifest.java @@ -108,7 +108,7 @@ public static class Tool { private final String name; private final String version; private Boolean active; - private String repository; + private final String repository; public Tool(String id, String org, String name, String version, Boolean active, String repository) { this.id = id; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/BallerinaToml.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/BallerinaToml.java index 048c67307782..8ba326c3684d 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/BallerinaToml.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/BallerinaToml.java @@ -27,8 +27,8 @@ */ public class BallerinaToml { - private TomlDocumentContext ballerinaTomlContext; - private Package packageInstance; + private final TomlDocumentContext ballerinaTomlContext; + private final Package packageInstance; private BallerinaToml(Package aPackage, TomlDocumentContext ballerinaTomlContext) { this.packageInstance = aPackage; @@ -74,7 +74,7 @@ public BallerinaToml.Modifier modify() { */ public static class Modifier { private TomlDocument tomlDocument; - private Package oldPackage; + private final Package oldPackage; private Modifier(BallerinaToml oldDocument) { this.tomlDocument = oldDocument.tomlDocument(); diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CloudToml.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CloudToml.java index c37a6f1a1f0b..cd20a3c42939 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CloudToml.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CloudToml.java @@ -27,8 +27,8 @@ * @since 2.0.0 */ public class CloudToml { - private TomlDocumentContext cloudTomlContext; - private Package packageInstance; + private final TomlDocumentContext cloudTomlContext; + private final Package packageInstance; private CloudToml(Package aPackage, TomlDocumentContext cloudTomlContext) { this.packageInstance = aPackage; @@ -74,7 +74,7 @@ public CloudToml.Modifier modify() { */ public static class Modifier { private TomlDocument tomlDocument; - private Package oldPackage; + private final Package oldPackage; private Modifier(CloudToml oldDocument) { this.tomlDocument = oldDocument.tomlDocument(); diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CompilerLifecycleManager.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CompilerLifecycleManager.java index 9a60d1d44a67..6e321affe9be 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CompilerLifecycleManager.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CompilerLifecycleManager.java @@ -157,8 +157,8 @@ public void addCodeGenerationCompletedTask(LifecycleListenerInfo lifecycleListen static class CodeGenerationCompletedTask { - private CompilerLifecycleTask lifecycleTask; - private LifecycleListenerInfo lifecycleListenerInfo; + private final CompilerLifecycleTask lifecycleTask; + private final LifecycleListenerInfo lifecycleListenerInfo; public CodeGenerationCompletedTask(CompilerLifecycleTask lifecycleTask, LifecycleListenerInfo lifecycleListenerInfo) { diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CompilerPluginToml.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CompilerPluginToml.java index a05da32ef41a..2f98c0432230 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CompilerPluginToml.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CompilerPluginToml.java @@ -9,8 +9,8 @@ * @since 2.0.0 */ public class CompilerPluginToml { - private TomlDocumentContext compilerPluginTomlContext; - private Package packageInstance; + private final TomlDocumentContext compilerPluginTomlContext; + private final Package packageInstance; private CompilerPluginToml(TomlDocumentContext compilerPluginTomlContext, Package packageInstance) { this.compilerPluginTomlContext = compilerPluginTomlContext; @@ -55,7 +55,7 @@ public CompilerPluginToml.Modifier modify() { */ public static class Modifier { private TomlDocument tomlDocument; - private Package oldPackage; + private final Package oldPackage; private Modifier(CompilerPluginToml oldDocument) { this.tomlDocument = oldDocument.tomlDocument(); diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CompletionManager.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CompletionManager.java index fc84ee51c37d..f25c62f21e86 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CompletionManager.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CompletionManager.java @@ -226,7 +226,7 @@ public CompilerPluginInfo compilerPluginInfo() { */ static class ServiceDeclarationContextValidator extends NodeVisitor { - private CompletionContext context; + private final CompletionContext context; private boolean isValidContext = false; public ServiceDeclarationContextValidator(CompletionContext context) { diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/DependenciesToml.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/DependenciesToml.java index fda74d112167..5ea63acca814 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/DependenciesToml.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/DependenciesToml.java @@ -27,8 +27,8 @@ * @since 2.0.0 */ public class DependenciesToml { - private TomlDocumentContext dependenciesTomlContext; - private Package packageInstance; + private final TomlDocumentContext dependenciesTomlContext; + private final Package packageInstance; private DependenciesToml(Package aPackage, TomlDocumentContext dependenciesTomlContext) { this.packageInstance = aPackage; @@ -72,7 +72,7 @@ public DependenciesToml.Modifier modify() { */ public static class Modifier { private TomlDocument tomlDocument; - private Package oldPackage; + private final Package oldPackage; private Modifier(DependenciesToml oldDocument) { this.tomlDocument = oldDocument.tomlDocument(); diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Document.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Document.java index c34c2517ae5c..59d007d56595 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Document.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Document.java @@ -72,9 +72,9 @@ public Modifier modify() { */ public static class Modifier { private String content; - private String name; - private DocumentId documentId; - private Module oldModule; + private final String name; + private final DocumentId documentId; + private final Module oldModule; private Modifier(Document oldDocument) { this.documentId = oldDocument.documentId(); diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBackend.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBackend.java index 6ecd546befeb..988545aa4033 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBackend.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBackend.java @@ -375,9 +375,6 @@ public void performCodeGen(ModuleContext moduleContext, CompilationCache compila } boolean isRemoteMgtEnabled = moduleContext.project().buildOptions().compilationOptions().remoteManagement(); CompiledJarFile compiledJarFile = jvmCodeGenerator.generate(bLangPackage, isRemoteMgtEnabled); - if (compiledJarFile == null) { - throw new IllegalStateException("Missing generated jar, module: " + moduleContext.moduleName()); - } String jarFileName = getJarFileName(moduleContext) + JAR_FILE_NAME_SUFFIX; try { ByteArrayOutputStream byteStream = compiledJarFile.toByteArrayStream(); diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBalaWriter.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBalaWriter.java index 25aeaefb1914..de039be62732 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBalaWriter.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBalaWriter.java @@ -58,7 +58,7 @@ public class JBallerinaBalaWriter extends BalaWriter { public static final String LIBS = "libs"; public static final String COMPILER_PLUGIN = "compiler-plugin"; public static final String ANNON = "annon"; - private JBallerinaBackend backend; + private final JBallerinaBackend backend; public JBallerinaBalaWriter(JBallerinaBackend backend) { this.backend = backend; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JarResolver.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JarResolver.java index 413f1d5ea7f4..456653b6b70f 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JarResolver.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JarResolver.java @@ -59,7 +59,7 @@ public class JarResolver { private final PackageContext rootPackageContext; private final List diagnosticList; private DiagnosticResult diagnosticResult; - private List providedPlatformLibs; + private final List providedPlatformLibs; private ClassLoader classLoaderWithAllJars; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/MdDocumentContext.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/MdDocumentContext.java index 75584f86ab5f..a5f807086fee 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/MdDocumentContext.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/MdDocumentContext.java @@ -29,9 +29,9 @@ */ class MdDocumentContext { private TextDocument textDocument; - private DocumentId documentId; - private String name; - private String content; + private final DocumentId documentId; + private final String name; + private final String content; private MdDocumentContext(DocumentId documentId, String name, String content) { this.documentId = documentId; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Module.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Module.java index 51b6d7e516cf..f686084bef85 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Module.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Module.java @@ -168,14 +168,14 @@ public Spliterator spliterator() { * Inner class that handles module modifications. */ public static class Modifier { - private ModuleId moduleId; - private ModuleDescriptor moduleDescriptor; + private final ModuleId moduleId; + private final ModuleDescriptor moduleDescriptor; private Map srcDocContextMap; private Map testDocContextMap; - private boolean isDefaultModule; + private final boolean isDefaultModule; private final List dependencies; - private Package packageInstance; - private Project project; + private final Package packageInstance; + private final Project project; private MdDocumentContext moduleMdContext; private Modifier(Module oldModule) { diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/ModuleMd.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/ModuleMd.java index 00ef059c7e3d..43da5eac1d9b 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/ModuleMd.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/ModuleMd.java @@ -60,9 +60,9 @@ public Modifier modify() { */ public static class Modifier { private String content; - private String name; - private DocumentId documentId; - private Module oldModule; + private final String name; + private final DocumentId documentId; + private final Module oldModule; private Modifier(ModuleMd oldDocument) { this.content = oldDocument.mdDocumentContext.content(); diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Package.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Package.java index c92df7c1fcf4..e14063e0348e 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Package.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Package.java @@ -437,13 +437,13 @@ public Spliterator spliterator() { * Inner class that handles package modifications. */ public static class Modifier { - private PackageId packageId; + private final PackageId packageId; private PackageManifest packageManifest; private DependencyManifest dependencyManifest; - private Map moduleContextMap; - private Project project; + private final Map moduleContextMap; + private final Project project; private final DependencyGraph dependencyGraph; - private CompilationOptions compilationOptions; + private final CompilationOptions compilationOptions; private TomlDocumentContext ballerinaTomlContext; private TomlDocumentContext dependenciesTomlContext; private TomlDocumentContext cloudTomlContext; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/PackageMd.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/PackageMd.java index 1cf66c0e10ef..7743cbc537d7 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/PackageMd.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/PackageMd.java @@ -65,9 +65,9 @@ public Modifier modify() { */ public static class Modifier { private String content; - private String name; - private DocumentId documentId; - private Package oldPackage; + private final String name; + private final DocumentId documentId; + private final Package oldPackage; private Modifier(PackageMd oldDocument) { this.content = oldDocument.mdDocumentContext.content(); diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Project.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Project.java index adafba2c0f42..9a8566454c14 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Project.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Project.java @@ -42,7 +42,7 @@ public abstract class Project { protected ProjectEnvironment projectEnvironment; private final ProjectKind projectKind; private Map toolContextMap; - private List compilerPluginContexts; + private final List compilerPluginContexts; protected Project(ProjectKind projectKind, Path projectPath, diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/SettingsToml.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/SettingsToml.java index a1773b761c1d..26b6e58d398f 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/SettingsToml.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/SettingsToml.java @@ -27,7 +27,7 @@ */ public class SettingsToml { - private TomlDocumentContext settingsTomlContext; + private final TomlDocumentContext settingsTomlContext; private SettingsToml(TomlDocumentContext tomlDocumentContext) { this.settingsTomlContext = tomlDocumentContext; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/TomlDocumentContext.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/TomlDocumentContext.java index afa9c4a001a4..84f2d1a5daba 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/TomlDocumentContext.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/TomlDocumentContext.java @@ -25,7 +25,7 @@ * @since 2.0.0 */ public class TomlDocumentContext { - private TomlDocument tomlDocument; + private final TomlDocument tomlDocument; private TomlDocumentContext(TomlDocument tomlDocument) { this.tomlDocument = tomlDocument; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/CompilerPhaseRunner.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/CompilerPhaseRunner.java index 8e810141ba39..5699656bceca 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/CompilerPhaseRunner.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/CompilerPhaseRunner.java @@ -64,7 +64,7 @@ public class CompilerPhaseRunner { private final CompilerPhase compilerPhase; private final DataflowAnalyzer dataflowAnalyzer; private final IsolationAnalyzer isolationAnalyzer; - private boolean isToolingCompilation; + private final boolean isToolingCompilation; public static CompilerPhaseRunner getInstance(CompilerContext context) { diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/DocumentData.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/DocumentData.java index cae039e30032..56ac3738fd4d 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/DocumentData.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/DocumentData.java @@ -25,7 +25,7 @@ public class DocumentData { //TODO: Remove this class and use DocumentConfig for creating a document private final String name; - private String content; + private final String content; private DocumentData(String name, String content) { this.name = name; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/SettingsBuilder.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/SettingsBuilder.java index 9286be7fe364..fefc484a176a 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/SettingsBuilder.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/SettingsBuilder.java @@ -56,10 +56,10 @@ public class SettingsBuilder { private static final String WRITE_TIMEOUT = "writeTimeout"; private static final String CALL_TIMEOUT = "callTimeout"; private static final String MAX_RETRIES = "maxRetries"; - private TomlDocument settingsToml; - private Settings settings; + private final TomlDocument settingsToml; + private final Settings settings; private DiagnosticResult diagnostics; - private List diagnosticList; + private final List diagnosticList; private static final String PROXY = "proxy"; private static final String CENTRAL = "central"; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/bala/BalToolJson.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/bala/BalToolJson.java index d4c390990779..0f41d6a82284 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/bala/BalToolJson.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/bala/BalToolJson.java @@ -25,7 +25,7 @@ * @since 2201.6.0 */ public class BalToolJson { - private String tool_id; + private final String tool_id; private List dependency_paths; public BalToolJson(String tool_id, List dependency_paths) { diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/bala/CompilerPluginJson.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/bala/CompilerPluginJson.java index 319492615782..385373403c32 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/bala/CompilerPluginJson.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/bala/CompilerPluginJson.java @@ -25,8 +25,8 @@ * @since 2.0.0 */ public class CompilerPluginJson { - private String plugin_id; - private String plugin_class; + private final String plugin_id; + private final String plugin_class; private List dependency_paths; public CompilerPluginJson(String pluginId, String pluginClass, List dependencyPaths) { diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/configschema/TypeConverter.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/configschema/TypeConverter.java index 716597db309d..17cdd218c171 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/configschema/TypeConverter.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/configschema/TypeConverter.java @@ -58,7 +58,7 @@ public class TypeConverter { static final String ADDITIONAL_PROPERTIES = "additionalProperties"; static final String TYPE = "type"; // Stores already visited complex types against the type name - private Map visitedTypeMap = new HashMap<>(); + private final Map visitedTypeMap = new HashMap<>(); private VisitedType getVisitedType(String typeName) { if (visitedTypeMap.containsKey(typeName)) { diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/BalToolDescriptor.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/BalToolDescriptor.java index 0fcdfa938ddf..b2c6b8003158 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/BalToolDescriptor.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/BalToolDescriptor.java @@ -49,8 +49,8 @@ public class BalToolDescriptor { private static final String DEPENDENCY = "dependency"; public static final String PATH = "path"; - private BalToolDescriptor.Tool tool; - private List dependencies; + private final BalToolDescriptor.Tool tool; + private final List dependencies; private BalToolDescriptor(BalToolDescriptor.Tool tool, List dependencies) { this.tool = tool; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/CompilerPluginDescriptor.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/CompilerPluginDescriptor.java index bf4a255cd451..693990b375c6 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/CompilerPluginDescriptor.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/CompilerPluginDescriptor.java @@ -40,8 +40,8 @@ public class CompilerPluginDescriptor { private static final String DEPENDENCY = "dependency"; private static final String CLASS = "class"; - private Plugin plugin; - private List dependencies; + private final Plugin plugin; + private final List dependencies; private CompilerPluginDescriptor(Plugin plugin, List dependencies) { this.plugin = plugin; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/Repository.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/Repository.java index dcdba2e542b1..376ff2d979db 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/Repository.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/Repository.java @@ -22,10 +22,10 @@ * @since 2201.8.0 */ public class Repository { - private String id; - private String url; - private String username; - private String password; + private final String id; + private final String url; + private final String username; + private final String password; private Repository(String id, String url, String username, String password) { this.id = id; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/Target.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/Target.java index 61a9ba1bbc60..a2998e1cff76 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/Target.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/Target.java @@ -35,18 +35,18 @@ public class Target { private final Path targetPath; private Path outputPath = null; - private Path cache; - private Path jarCachePath; - private Path balaCachePath; - private Path birCachePath; - private Path testsCachePath; - private Path binPath; - private Path reportPath; - private Path docPath; - private Path nativePath; - private Path nativeConfigPath; - private Path profilerPath; - private Path resourcesPath; + private final Path cache; + private final Path jarCachePath; + private final Path balaCachePath; + private final Path birCachePath; + private final Path testsCachePath; + private final Path binPath; + private final Path reportPath; + private final Path docPath; + private final Path nativePath; + private final Path nativeConfigPath; + private final Path profilerPath; + private final Path resourcesPath; public Target(Path targetPath) throws IOException { this.targetPath = targetPath; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/CodeActionArgument.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/CodeActionArgument.java index b849b3ae88fe..73fb5bb36fa7 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/CodeActionArgument.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/CodeActionArgument.java @@ -28,8 +28,8 @@ public class CodeActionArgument { private static final Gson GSON = new Gson(); - private String key; - private Object value; + private final String key; + private final Object value; private CodeActionArgument(String argumentK, Object value) { this.key = argumentK; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/CodeActionContextImpl.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/CodeActionContextImpl.java index a1c1749faa38..69175474f2b0 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/CodeActionContextImpl.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/CodeActionContextImpl.java @@ -29,7 +29,7 @@ */ public class CodeActionContextImpl extends PositionedActionContextImpl implements CodeActionContext { - private Diagnostic diagnostic; + private final Diagnostic diagnostic; private CodeActionContextImpl(String fileUri, Path filePath, LinePosition cursorPosition, Document document, SemanticModel semanticModel, Diagnostic diagnostic) { diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/CodeActionExecutionContextImpl.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/CodeActionExecutionContextImpl.java index ab1d0c27ccc9..fd98c7959a84 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/CodeActionExecutionContextImpl.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/CodeActionExecutionContextImpl.java @@ -29,7 +29,7 @@ */ public class CodeActionExecutionContextImpl extends PositionedActionContextImpl implements CodeActionExecutionContext { - private List arguments; + private final List arguments; private CodeActionExecutionContextImpl(String fileUri, Path filePath, LinePosition cursorPosition, Document document, SemanticModel semanticModel, diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/DocumentEdit.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/DocumentEdit.java index 673f527ed6b5..02d5f18b7c30 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/DocumentEdit.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/codeaction/DocumentEdit.java @@ -25,8 +25,8 @@ */ public class DocumentEdit { - private String fileUri; - private SyntaxTree modifiedSyntaxTree; + private final String fileUri; + private final SyntaxTree modifiedSyntaxTree; public DocumentEdit(String fileUri, SyntaxTree modifiedSyntaxTree) { this.fileUri = fileUri; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/completion/CompletionException.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/completion/CompletionException.java index 85a5a654db53..50c6bd031c2f 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/completion/CompletionException.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/completion/CompletionException.java @@ -21,7 +21,7 @@ * @since 2201.7.0 */ public class CompletionException extends RuntimeException { - private String providerName; + private final String providerName; public CompletionException(Throwable cause, String providerName) { super(cause); diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/completion/CompletionItem.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/completion/CompletionItem.java index 888f3f4222f3..7770c5e4a9e8 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/completion/CompletionItem.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/plugins/completion/CompletionItem.java @@ -29,12 +29,12 @@ public class CompletionItem { * The label of this completion item. By default, also the text that is inserted when selecting * this completion. */ - private String label; + private final String label; /** * Indicates the priority(sorted position) of the completion item. */ - private Priority priority; + private final Priority priority; /** * An optional array of additional text edits that are applied when selecting this completion. @@ -49,7 +49,7 @@ public class CompletionItem { * A string that should be inserted a document when selecting this completion. * When omitted or empty, the label is used as the insert text for this item. */ - private String insertText; + private final String insertText; public CompletionItem(String label, String insertText, Priority priority) { this.label = label; diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/util/FileUtils.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/util/FileUtils.java index 7aeba0b3936b..fdbd4ce423ed 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/util/FileUtils.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/util/FileUtils.java @@ -340,11 +340,11 @@ public static List getFilesInDirectory(Path directoryPath) { * Copy files to the given destination. */ public static class Copy extends SimpleFileVisitor { - private Path fromPath; - private Path toPath; - private String templateName; - private String packageName; - private StandardCopyOption copyOption; + private final Path fromPath; + private final Path toPath; + private final String templateName; + private final String packageName; + private final StandardCopyOption copyOption; public Copy(Path fromPath, Path toPath, String templateName, String packageName, @@ -402,7 +402,7 @@ public static boolean checkBallerinaTomlInExistingDir(Path startingDir) { * Look for existing Ballerina.toml file in the given directory up to 10 levels. */ public static class BallerinaTomlChecker extends SimpleFileVisitor { - private Path startingPath; + private final Path startingPath; private boolean ballerinaTomlFound = false; public boolean isBallerinaTomlFound() { diff --git a/compiler/ballerina-lang/src/main/java/org/ballerinalang/model/TreeUtils.java b/compiler/ballerina-lang/src/main/java/org/ballerinalang/model/TreeUtils.java index 52e1781686c0..4984e7099f09 100644 --- a/compiler/ballerina-lang/src/main/java/org/ballerinalang/model/TreeUtils.java +++ b/compiler/ballerina-lang/src/main/java/org/ballerinalang/model/TreeUtils.java @@ -27,39 +27,39 @@ */ public final class TreeUtils { - private static Map stringTypeKindMap = new HashMap<>(); + private static final Map STRING_TYPE_KIND_MAP = new HashMap<>(); static { - stringTypeKindMap.put("int", TypeKind.INT); - stringTypeKindMap.put("byte", TypeKind.BYTE); - stringTypeKindMap.put("float", TypeKind.FLOAT); - stringTypeKindMap.put("decimal", TypeKind.DECIMAL); - stringTypeKindMap.put("boolean", TypeKind.BOOLEAN); - stringTypeKindMap.put("string", TypeKind.STRING); - stringTypeKindMap.put("json", TypeKind.JSON); - stringTypeKindMap.put("xml", TypeKind.XML); - stringTypeKindMap.put("stream", TypeKind.STREAM); - stringTypeKindMap.put("table", TypeKind.TABLE); - stringTypeKindMap.put("any", TypeKind.ANY); - stringTypeKindMap.put("anydata", TypeKind.ANYDATA); - stringTypeKindMap.put("map", TypeKind.MAP); - stringTypeKindMap.put("future", TypeKind.FUTURE); - stringTypeKindMap.put("typedesc", TypeKind.TYPEDESC); - stringTypeKindMap.put("error", TypeKind.ERROR); - stringTypeKindMap.put("()", TypeKind.NIL); - stringTypeKindMap.put("null", TypeKind.NIL); - stringTypeKindMap.put("never", TypeKind.NEVER); - stringTypeKindMap.put("channel", TypeKind.CHANNEL); - stringTypeKindMap.put("service", TypeKind.SERVICE); - stringTypeKindMap.put("handle", TypeKind.HANDLE); - stringTypeKindMap.put("readonly", TypeKind.READONLY); + STRING_TYPE_KIND_MAP.put("int", TypeKind.INT); + STRING_TYPE_KIND_MAP.put("byte", TypeKind.BYTE); + STRING_TYPE_KIND_MAP.put("float", TypeKind.FLOAT); + STRING_TYPE_KIND_MAP.put("decimal", TypeKind.DECIMAL); + STRING_TYPE_KIND_MAP.put("boolean", TypeKind.BOOLEAN); + STRING_TYPE_KIND_MAP.put("string", TypeKind.STRING); + STRING_TYPE_KIND_MAP.put("json", TypeKind.JSON); + STRING_TYPE_KIND_MAP.put("xml", TypeKind.XML); + STRING_TYPE_KIND_MAP.put("stream", TypeKind.STREAM); + STRING_TYPE_KIND_MAP.put("table", TypeKind.TABLE); + STRING_TYPE_KIND_MAP.put("any", TypeKind.ANY); + STRING_TYPE_KIND_MAP.put("anydata", TypeKind.ANYDATA); + STRING_TYPE_KIND_MAP.put("map", TypeKind.MAP); + STRING_TYPE_KIND_MAP.put("future", TypeKind.FUTURE); + STRING_TYPE_KIND_MAP.put("typedesc", TypeKind.TYPEDESC); + STRING_TYPE_KIND_MAP.put("error", TypeKind.ERROR); + STRING_TYPE_KIND_MAP.put("()", TypeKind.NIL); + STRING_TYPE_KIND_MAP.put("null", TypeKind.NIL); + STRING_TYPE_KIND_MAP.put("never", TypeKind.NEVER); + STRING_TYPE_KIND_MAP.put("channel", TypeKind.CHANNEL); + STRING_TYPE_KIND_MAP.put("service", TypeKind.SERVICE); + STRING_TYPE_KIND_MAP.put("handle", TypeKind.HANDLE); + STRING_TYPE_KIND_MAP.put("readonly", TypeKind.READONLY); } private TreeUtils() { } public static TypeKind stringToTypeKind(String typeName) { - return stringTypeKindMap.get(typeName); + return STRING_TYPE_KIND_MAP.get(typeName); } } diff --git a/compiler/ballerina-lang/src/main/java/org/ballerinalang/natives/NativeElementRepository.java b/compiler/ballerina-lang/src/main/java/org/ballerinalang/natives/NativeElementRepository.java index 813e654eb227..25ca1197faab 100644 --- a/compiler/ballerina-lang/src/main/java/org/ballerinalang/natives/NativeElementRepository.java +++ b/compiler/ballerina-lang/src/main/java/org/ballerinalang/natives/NativeElementRepository.java @@ -30,9 +30,9 @@ @Deprecated public class NativeElementRepository { - private Map nativeFuncEntries = new HashMap<>(); + private final Map nativeFuncEntries = new HashMap<>(); - private Map nativeActionEntries = new HashMap<>(); + private final Map nativeActionEntries = new HashMap<>(); private static final String ORG_NAME_SEPARATOR = "/"; @@ -69,19 +69,19 @@ public NativeActionDef lookupNativeAction(String pkgName, String connectorName, */ public static class NativeFunctionDef { - private String orgName; + private final String orgName; - private String pkgName; + private final String pkgName; - private String version; + private final String version; - private String callableName; + private final String callableName; - private String className; + private final String className; - private TypeKind[] argTypes; + private final TypeKind[] argTypes; - private TypeKind[] retTypes; + private final TypeKind[] retTypes; public NativeFunctionDef(String orgName, String pkgName, String version, String callableName, TypeKind[] argTypes, @@ -128,7 +128,7 @@ public TypeKind[] getRetTypes() { */ public static class NativeActionDef extends NativeFunctionDef { - private String connectorName; + private final String connectorName; public NativeActionDef(String orgName, String pkgName, String version, String connectorName, String actionDef, TypeKind[] argTypes, TypeKind[] retTypes, String className) { diff --git a/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/AggregatedPackageRepository.java b/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/AggregatedPackageRepository.java index ef865af7b55e..51c8f4f76572 100644 --- a/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/AggregatedPackageRepository.java +++ b/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/AggregatedPackageRepository.java @@ -34,7 +34,7 @@ */ public class AggregatedPackageRepository implements PackageRepository { - private List repos = new ArrayList<>(); + private final List repos = new ArrayList<>(); public void addRepository(PackageRepository repo) { this.repos.add(repo); diff --git a/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/CompositePackageRepository.java b/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/CompositePackageRepository.java index c620e3498119..3728e41755fc 100644 --- a/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/CompositePackageRepository.java +++ b/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/CompositePackageRepository.java @@ -29,7 +29,7 @@ */ public class CompositePackageRepository extends HierarchicalPackageRepository { - private PackageRepository myRepo; + private final PackageRepository myRepo; public CompositePackageRepository(PackageRepository systemRepo, PackageRepository parentRepo, PackageRepository myRepo) { diff --git a/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/HierarchicalPackageRepository.java b/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/HierarchicalPackageRepository.java index bbdc46b35fd0..57fe121e415a 100644 --- a/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/HierarchicalPackageRepository.java +++ b/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/HierarchicalPackageRepository.java @@ -33,9 +33,9 @@ public abstract class HierarchicalPackageRepository implements PackageRepository private static final String BALLERINA_SYSTEM_PKG_PREFIX = "ballerina"; - private PackageRepository systemRepo; + private final PackageRepository systemRepo; - private PackageRepository parentRepo; + private final PackageRepository parentRepo; private Set cachedPackageIds; diff --git a/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/fs/GeneralFSPackageRepository.java b/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/fs/GeneralFSPackageRepository.java index a7ddf1f68c7f..102347a2794e 100644 --- a/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/fs/GeneralFSPackageRepository.java +++ b/compiler/ballerina-lang/src/main/java/org/ballerinalang/repository/fs/GeneralFSPackageRepository.java @@ -268,11 +268,11 @@ public List getPackageSourceEntries() { */ public class FSCompilerInput implements CompilerInput { - private String name; + private final String name; - private byte[] code; + private final byte[] code; - private SyntaxTree tree; + private final SyntaxTree tree; public FSCompilerInput(String name) { this.name = name; diff --git a/compiler/ballerina-lang/src/main/java/org/ballerinalang/toml/model/Manifest.java b/compiler/ballerina-lang/src/main/java/org/ballerinalang/toml/model/Manifest.java index 4e6174a690c7..3e059952d317 100644 --- a/compiler/ballerina-lang/src/main/java/org/ballerinalang/toml/model/Manifest.java +++ b/compiler/ballerina-lang/src/main/java/org/ballerinalang/toml/model/Manifest.java @@ -33,7 +33,7 @@ */ public class Manifest { private Project project = new Project(); - private Map dependencies = new LinkedHashMap<>(); + private final Map dependencies = new LinkedHashMap<>(); public Platform platform = new Platform(); private BuildOptions buildOptions; diff --git a/compiler/ballerina-lang/src/main/java/org/ballerinalang/util/BackendCodeGeneratorProvider.java b/compiler/ballerina-lang/src/main/java/org/ballerinalang/util/BackendCodeGeneratorProvider.java index 280d7d157a43..625dde89f4ac 100644 --- a/compiler/ballerina-lang/src/main/java/org/ballerinalang/util/BackendCodeGeneratorProvider.java +++ b/compiler/ballerina-lang/src/main/java/org/ballerinalang/util/BackendCodeGeneratorProvider.java @@ -29,7 +29,7 @@ */ public class BackendCodeGeneratorProvider { - private static BackendCodeGeneratorProvider provider = new BackendCodeGeneratorProvider(); + private static final BackendCodeGeneratorProvider PROVIDER = new BackendCodeGeneratorProvider(); private final ServiceLoader loader; @@ -46,7 +46,7 @@ private BackendCodeGeneratorProvider() { * @return instance of BackendCodeGeneratorProvider */ public static BackendCodeGeneratorProvider getInstance() { - return provider; + return PROVIDER; } /** diff --git a/compiler/ballerina-lang/src/main/java/org/ballerinalang/util/EmbeddedExecutorProvider.java b/compiler/ballerina-lang/src/main/java/org/ballerinalang/util/EmbeddedExecutorProvider.java index 875f804ce085..9b9bf0c36815 100644 --- a/compiler/ballerina-lang/src/main/java/org/ballerinalang/util/EmbeddedExecutorProvider.java +++ b/compiler/ballerina-lang/src/main/java/org/ballerinalang/util/EmbeddedExecutorProvider.java @@ -9,7 +9,7 @@ * Ballerina package provider class used in package management. */ public class EmbeddedExecutorProvider { - private static EmbeddedExecutorProvider provider = new EmbeddedExecutorProvider(); + private static final EmbeddedExecutorProvider PROVIDER = new EmbeddedExecutorProvider(); private final ServiceLoader loader; @@ -26,7 +26,7 @@ private EmbeddedExecutorProvider() { * @return instance of EmbeddedExecutorProvider */ public static EmbeddedExecutorProvider getInstance() { - return provider; + return PROVIDER; } /** diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/BIRPackageSymbolEnter.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/BIRPackageSymbolEnter.java index ba939e2b7441..7d73b529d8fb 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/BIRPackageSymbolEnter.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/BIRPackageSymbolEnter.java @@ -143,14 +143,14 @@ public class BIRPackageSymbolEnter { private BIRPackageSymbolEnv env; private List structureTypes; // TODO find a better way private BStructureTypeSymbol currentStructure = null; - private LinkedList compositeStack = new LinkedList<>(); + private final LinkedList compositeStack = new LinkedList<>(); private static final int SERVICE_TYPE_TAG = 54; private static final CompilerContext.Key COMPILED_PACKAGE_SYMBOL_ENTER_KEY = new CompilerContext.Key<>(); - private Map globalVarMap = new HashMap<>(); + private final Map globalVarMap = new HashMap<>(); public static BIRPackageSymbolEnter getInstance(CompilerContext context) { BIRPackageSymbolEnter packageReader = context.get(COMPILED_PACKAGE_SYMBOL_ENTER_KEY); @@ -1133,7 +1133,7 @@ private static class UnresolvedType { } private class BIRTypeReader { - private DataInputStream inputStream; + private final DataInputStream inputStream; public BIRTypeReader(DataInputStream inputStream) { this.inputStream = inputStream; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/FileSystemProgramDirectory.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/FileSystemProgramDirectory.java index 90bddfaa827a..e102eade7e43 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/FileSystemProgramDirectory.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/FileSystemProgramDirectory.java @@ -55,7 +55,7 @@ */ public class FileSystemProgramDirectory implements SourceDirectory { private final Path programDirPath; - private static PrintStream outStream = System.out; + private static final PrintStream OUT_STREAM = System.out; public FileSystemProgramDirectory(Path programDirPath) { this.programDirPath = programDirPath; @@ -113,7 +113,7 @@ public Path saveCompiledProgram(InputStream source, String fileName) { // the user Path targetFilePath = Paths.get(fileName); try { - outStream.println(" " + fileName); + OUT_STREAM.println(" " + fileName); Files.copy(source, targetFilePath, StandardCopyOption.REPLACE_EXISTING); return targetFilePath; } catch (DirectoryNotEmptyException e) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/FileSystemProjectDirectory.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/FileSystemProjectDirectory.java index 23509921e643..2d5293d969a6 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/FileSystemProjectDirectory.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/FileSystemProjectDirectory.java @@ -57,7 +57,7 @@ public class FileSystemProjectDirectory extends FileSystemProgramDirectory { private final Path sourceDirPath; private List packageNames; protected boolean scanned = false; - private static PrintStream outStream = System.out; + private static final PrintStream OUT_STREAM = System.out; public FileSystemProjectDirectory(Path projectDirPath) { super(projectDirPath); @@ -132,7 +132,7 @@ public InputStream getLockFileContent() { public Path saveCompiledProgram(InputStream source, String fileName) { Path targetFilePath = ensureAndGetTargetDirPath().resolve(fileName); try { - outStream.println(" ./target/" + fileName); + OUT_STREAM.println(" ./target/" + fileName); Files.copy(source, targetFilePath, StandardCopyOption.REPLACE_EXISTING); return targetFilePath; } catch (DirectoryNotEmptyException e) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/CompiledJarFile.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/CompiledJarFile.java index a22730df10c6..42f16ae881b4 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/CompiledJarFile.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/CompiledJarFile.java @@ -27,7 +27,7 @@ */ public class CompiledJarFile { - public JarEntries jarEntries; + public final JarEntries jarEntries; public CompiledJarFile(String mainClassName) { this.jarEntries = new JarEntries(mainClassName); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/model/BIRNode.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/model/BIRNode.java index 729faf0f4500..11692c5cd081 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/model/BIRNode.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/model/BIRNode.java @@ -825,7 +825,7 @@ public void setMarkdownDocAttachment(MarkdownDocAttachment markdownDocAttachment public static class BIRLockDetailsHolder { //This is the list of recursive locks in the current scope. - private List locks = new ArrayList<>(); + private final List locks = new ArrayList<>(); public boolean isEmpty() { return locks.isEmpty(); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/AnnotationDesugar.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/AnnotationDesugar.java index 6fa8f65020e6..817db44b9bb8 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/AnnotationDesugar.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/AnnotationDesugar.java @@ -136,9 +136,9 @@ public class AnnotationDesugar { private final SymbolTable symTable; private final Types types; private final Names names; - private SymbolResolver symResolver; - private ConstantValueResolver constantValueResolver; - private ClosureGenerator closureGenerator; + private final SymbolResolver symResolver; + private final ConstantValueResolver constantValueResolver; + private final ClosureGenerator closureGenerator; public static AnnotationDesugar getInstance(CompilerContext context) { AnnotationDesugar annotationDesugar = context.get(ANNOTATION_DESUGAR_KEY); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClassClosureDesugar.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClassClosureDesugar.java index ac4477a039a2..bc4bea90d5e9 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClassClosureDesugar.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClassClosureDesugar.java @@ -171,7 +171,7 @@ public class ClassClosureDesugar extends BLangNodeVisitor { private static final String OBJECT_CTOR_FUNCTION_MAP_SYM_NAME = "$map$objectCtor" + UNDERSCORE + "function"; private static final BVarSymbol CLOSURE_MAP_NOT_FOUND; - private int blockClosureMapCount = 1; + private final int blockClosureMapCount = 1; private BLangClassDefinition classDef; private BLangNode result; private SymbolEnv env; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClosureDesugar.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClosureDesugar.java index bedf07625c9d..6bee0b7a6f13 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClosureDesugar.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClosureDesugar.java @@ -205,13 +205,13 @@ public class ClosureDesugar extends BLangNodeVisitor { private static final BVarSymbol CLOSURE_MAP_NOT_FOUND; private SymbolResolver symResolver; - private SymbolTable symTable; + private final SymbolTable symTable; private SymbolEnv env; private BLangNode result; - private Types types; - private Desugar desugar; - private Names names; - private ClassClosureDesugar classClosureDesugar; + private final Types types; + private final Desugar desugar; + private final Names names; + private final ClassClosureDesugar classClosureDesugar; private int funClosureMapCount = 1; private int blockClosureMapCount = 1; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClosureGenerator.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClosureGenerator.java index 201b1ba64020..a8a47807a575 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClosureGenerator.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClosureGenerator.java @@ -223,12 +223,12 @@ public class ClosureGenerator extends BLangNodeVisitor { private static final CompilerContext.Key CLOSURE_GENERATOR_KEY = new CompilerContext.Key<>(); private Queue queue; private Queue annotationClosureReferences; - private SymbolTable symTable; + private final SymbolTable symTable; private SymbolEnv env; private BLangNode result; - private SymbolResolver symResolver; - private AnnotationDesugar annotationDesugar; - private Types types; + private final SymbolResolver symResolver; + private final AnnotationDesugar annotationDesugar; + private final Types types; public static ClosureGenerator getInstance(CompilerContext context) { ClosureGenerator closureGenerator = context.get(CLOSURE_GENERATOR_KEY); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ConstantPropagation.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ConstantPropagation.java index 20e04d2a2f5d..fe98afe78526 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ConstantPropagation.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ConstantPropagation.java @@ -196,7 +196,7 @@ public class ConstantPropagation extends BLangNodeVisitor { new CompilerContext.Key<>(); private BLangNode result; - private Types types; + private final Types types; public static ConstantPropagation getInstance(CompilerContext context) { ConstantPropagation constantPropagation = context.get(CONSTANT_PROPAGATION_KEY); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java index abc04619bc57..d5bf2131d782 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java @@ -376,36 +376,36 @@ public class Desugar extends BLangNodeVisitor { public static final String XML_INTERNAL_GET_ELEMENTS = "getElements"; public static final String XML_GET_CONTENT_OF_TEXT = "getContent"; - private SymbolTable symTable; - private SymbolResolver symResolver; + private final SymbolTable symTable; + private final SymbolResolver symResolver; private final SymbolEnter symbolEnter; - private ClosureDesugar closureDesugar; - private ClosureGenerator closureGenerator; - private QueryDesugar queryDesugar; - private TransactionDesugar transactionDesugar; - private ObservabilityDesugar observabilityDesugar; - private Code2CloudDesugar code2CloudDesugar; - private AnnotationDesugar annotationDesugar; - private Types types; + private final ClosureDesugar closureDesugar; + private final ClosureGenerator closureGenerator; + private final QueryDesugar queryDesugar; + private final TransactionDesugar transactionDesugar; + private final ObservabilityDesugar observabilityDesugar; + private final Code2CloudDesugar code2CloudDesugar; + private final AnnotationDesugar annotationDesugar; + private final Types types; private Names names; - private ServiceDesugar serviceDesugar; + private final ServiceDesugar serviceDesugar; private BLangNode result; - private NodeCloner nodeCloner; - private SemanticAnalyzer semanticAnalyzer; - private BLangAnonymousModelHelper anonModelHelper; - private Unifier unifier; - private MockDesugar mockDesugar; - private ClassClosureDesugar classClosureDesugar; - private LargeMethodSplitter largeMethodSplitter; + private final NodeCloner nodeCloner; + private final SemanticAnalyzer semanticAnalyzer; + private final BLangAnonymousModelHelper anonModelHelper; + private final Unifier unifier; + private final MockDesugar mockDesugar; + private final ClassClosureDesugar classClosureDesugar; + private final LargeMethodSplitter largeMethodSplitter; public Deque enclLocks = new ArrayDeque<>(); private BLangOnFailClause onFailClause; private boolean shouldReturnErrors; private int transactionBlockCount; private BLangLiteral trxBlockId; - private List enclosingOnFailClause = new ArrayList<>(); - private Map enclosingShouldPanic = new HashMap<>(); - private List enclosingShouldContinue = new ArrayList<>(); + private final List enclosingOnFailClause = new ArrayList<>(); + private final Map enclosingShouldPanic = new HashMap<>(); + private final List enclosingShouldContinue = new ArrayList<>(); private BLangSimpleVarRef shouldRetryRef; private SymbolEnv env; @@ -431,8 +431,8 @@ public class Desugar extends BLangNodeVisitor { static boolean isJvmTarget = false; private Map> globalVariablesDependsOn; - private List matchStmtsForPattern = new ArrayList<>(); - private Map declaredVarDef = new HashMap<>(); + private final List matchStmtsForPattern = new ArrayList<>(); + private final Map declaredVarDef = new HashMap<>(); private List inlineXMLNamespaces; private Map stmtsToBePropagatedToQuery = new HashMap<>(); // Reuse the strand annotation in isolated workers and start action diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/MockDesugar.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/MockDesugar.java index d9ce5313f26e..f7432f8b63ea 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/MockDesugar.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/MockDesugar.java @@ -77,7 +77,7 @@ public class MockDesugar { private BLangFunction originalFunction; private BInvokableSymbol importFunction; private String mockFnObjectName; - private String testPackageSymbol = "ballerina/test"; + private final String testPackageSymbol = "ballerina/test"; public static final String MOCK_FUNCTION = "$MOCK_"; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ServiceDesugar.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ServiceDesugar.java index f5a8a18e74e0..da39e5efca41 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ServiceDesugar.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ServiceDesugar.java @@ -77,8 +77,8 @@ public class ServiceDesugar { private final SymbolTable symTable; private final SymbolResolver symResolver; private final Names names; - private DeclarativeAuthDesugar declarativeAuthDesugar; - private TransactionDesugar transactionDesugar; + private final DeclarativeAuthDesugar declarativeAuthDesugar; + private final TransactionDesugar transactionDesugar; private final Types types; public static ServiceDesugar getInstance(CompilerContext context) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/BLangDiagnostic.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/BLangDiagnostic.java index fc049e4a8877..cac6cfa33dd8 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/BLangDiagnostic.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/BLangDiagnostic.java @@ -35,11 +35,11 @@ */ public class BLangDiagnostic extends Diagnostic { - private Location location; - private String msg; - private DiagnosticInfo diagnosticInfo; - private DiagnosticCode diagnosticCode; - private List> properties; + private final Location location; + private final String msg; + private final DiagnosticInfo diagnosticInfo; + private final DiagnosticCode diagnosticCode; + private final List> properties; public BLangDiagnostic(Location location, String msg, DiagnosticInfo diagnosticInfo, DiagnosticCode diagnosticCode) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/BLangDiagnosticLocation.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/BLangDiagnosticLocation.java index 65de23902e81..cdeedcecc5fe 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/BLangDiagnosticLocation.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/BLangDiagnosticLocation.java @@ -33,8 +33,8 @@ */ public class BLangDiagnosticLocation implements Location { - private String filePath; - private int startLine, endLine, startColumn, endColumn, startOffset, length; + private final String filePath; + private final int startLine, endLine, startColumn, endColumn, startOffset, length; @Deprecated public BLangDiagnosticLocation(String filePath, int startLine, int endLine, int startColumn, int endColumn) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/BLangDiagnosticLog.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/BLangDiagnosticLog.java index 6887ac80ed0d..8e4b5940b486 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/BLangDiagnosticLog.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/BLangDiagnosticLog.java @@ -64,9 +64,9 @@ public class BLangDiagnosticLog implements DiagnosticLog { private static final ResourceBundle MESSAGES = ResourceBundle.getBundle("compiler", Locale.getDefault()); private int errorCount = 0; - private PackageCache packageCache; - private TypesFactory typesFactory; - private SymbolFactory symbolFactory; + private final PackageCache packageCache; + private final TypesFactory typesFactory; + private final SymbolFactory symbolFactory; private PackageID currentPackageId; private boolean isMute = false; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/FilterSearch.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/FilterSearch.java index 6ec39ce3a386..97a462a0329e 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/FilterSearch.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/FilterSearch.java @@ -16,7 +16,7 @@ class FilterSearch extends SimpleFileVisitor { private final List excludeDir; - private List pathList = new ArrayList<>(); + private final List pathList = new ArrayList<>(); FilterSearch(List exclude) { this.excludeDir = exclude; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/PathConverter.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/PathConverter.java index 75f58471bf57..fb378e50fe4c 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/PathConverter.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/PathConverter.java @@ -46,8 +46,8 @@ public class PathConverter implements Converter { private final Path root; - private PathMatcher isResourceFile; - private PathMatcher isTestResourceFile; + private final PathMatcher isResourceFile; + private final PathMatcher isTestResourceFile; public PathConverter(Path root) { this.root = root; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/URIConverter.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/URIConverter.java index 11e9db0cf23f..9f341d7f7d3a 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/URIConverter.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/converters/URIConverter.java @@ -43,11 +43,11 @@ */ public class URIConverter implements Converter { - private HomeBalaRepo homeBalaRepo; + private final HomeBalaRepo homeBalaRepo; protected URI base; protected final Map dependencyManifests; private boolean isBuild = true; - private PrintStream errStream = System.err; + private final PrintStream errStream = System.err; public URIConverter(URI base, Map dependencyManifests) { this.base = URI.create(base.toString() + "/modules/"); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/HomeBalaRepo.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/HomeBalaRepo.java index 33bdded07ae9..fdbf9acfa86b 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/HomeBalaRepo.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/HomeBalaRepo.java @@ -46,11 +46,11 @@ * Repo for bala_cache. */ public class HomeBalaRepo implements Repo { - private Path repoLocation; - private ZipConverter zipConverter; - private List supportedPlatforms = Stream.concat( + private final Path repoLocation; + private final ZipConverter zipConverter; + private final List supportedPlatforms = Stream.concat( Arrays.stream(SUPPORTED_PLATFORMS), Stream.of("any")).toList(); - private Map dependencyManifests; + private final Map dependencyManifests; public HomeBalaRepo(Map dependencyManifests) { this.repoLocation = RepoUtils.createAndGetHomeReposPath().resolve(ProjectDirConstants.BALA_CACHE_DIR_NAME); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/HomeBirRepo.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/HomeBirRepo.java index 0d56a2c7bb24..ed23c0a11ec5 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/HomeBirRepo.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/HomeBirRepo.java @@ -34,7 +34,7 @@ * Repo for bir_cache in home repository. */ public class HomeBirRepo implements Repo { - private PathConverter pathConverter; + private final PathConverter pathConverter; public HomeBirRepo() { Path repoLocation = RepoUtils.createAndGetHomeReposPath().resolve(ProjectDirConstants.BIR_CACHE_DIR_NAME + "-" + diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/PathBalaRepo.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/PathBalaRepo.java index 71aa4b38f547..18c718daa940 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/PathBalaRepo.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/PathBalaRepo.java @@ -43,11 +43,11 @@ * Resolve a bala using the path given in the Ballerina.toml. */ public class PathBalaRepo implements Repo { - private static final Pattern semVerPattern = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)"); + private static final Pattern SEM_VER_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)"); private final Manifest manifest; - private Map dependencyManifests; - private ZipConverter zipConverter; + private final Map dependencyManifests; + private final ZipConverter zipConverter; public PathBalaRepo(Manifest manifest, Map dependencyManifests) { this.manifest = manifest; @@ -92,7 +92,7 @@ public Patten calculate(PackageID moduleID) { // update version of the dependency from the current(root) project if (moduleID.version.value.isEmpty() && null != dep.getMetadata().getVersion()) { - Matcher semverMatcher = semVerPattern.matcher(dep.getMetadata().getVersion()); + Matcher semverMatcher = SEM_VER_PATTERN.matcher(dep.getMetadata().getVersion()); if (semverMatcher.matches()) { moduleID.version = new Name(dep.getMetadata().getVersion()); } diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/RemoteRepo.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/RemoteRepo.java index 30dff1fc6042..fe8fbd9ddfed 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/RemoteRepo.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/packaging/repo/RemoteRepo.java @@ -37,7 +37,7 @@ */ public class RemoteRepo extends NonSysRepo { - private Path systemBirRepoPath; + private final Path systemBirRepoPath; public RemoteRepo(Converter converter, Path ballerinaHome) { super(converter); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangAnonymousModelHelper.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangAnonymousModelHelper.java index 59dae677cb68..df2ce5b9ace2 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangAnonymousModelHelper.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangAnonymousModelHelper.java @@ -36,18 +36,18 @@ */ public class BLangAnonymousModelHelper { - private Map anonTypeCount; - private Map anonServiceCount; - private Map anonFunctionCount; - private Map anonForkCount; - private Map distinctTypeIdCount; - private Map rawTemplateTypeCount; - private Map tupleVarCount; - private Map recordVarCount; - private Map errorVarCount; - private Map intersectionRecordCount; - private Map intersectionErrorCount; - private Map> anonTypesNamesPerPkg; + private final Map anonTypeCount; + private final Map anonServiceCount; + private final Map anonFunctionCount; + private final Map anonForkCount; + private final Map distinctTypeIdCount; + private final Map rawTemplateTypeCount; + private final Map tupleVarCount; + private final Map recordVarCount; + private final Map errorVarCount; + private final Map intersectionRecordCount; + private final Map intersectionErrorCount; + private final Map> anonTypesNamesPerPkg; public static final String ANON_PREFIX = "$anon"; private static final String ANON_TYPE = ANON_PREFIX + "Type$"; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangMissingNodesHelper.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangMissingNodesHelper.java index d33bdf6368a3..1d8cd05cb927 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangMissingNodesHelper.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangMissingNodesHelper.java @@ -34,7 +34,7 @@ */ public class BLangMissingNodesHelper { - private Map missingIdentifierCount; + private final Map missingIdentifierCount; private static final String MISSING_NODE_PREFIX = "$missingNode$"; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java index b6abb226d8b9..c2720078ebe2 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java @@ -528,19 +528,19 @@ public class BLangNodeBuilder extends NodeTransformer { private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 10; // -10 was added due to the JVM limitations private static final String IDENTIFIER_LITERAL_PREFIX = "'"; private static final String DOLLAR = "$"; - private BLangDiagnosticLog dlog; - private SymbolTable symTable; + private final BLangDiagnosticLog dlog; + private final SymbolTable symTable; private PackageCache packageCache; - private PackageID packageID; - private String currentCompUnitName; + private final PackageID packageID; + private final String currentCompUnitName; private BLangCompilationUnit currentCompilationUnit; - private BLangAnonymousModelHelper anonymousModelHelper; - private BLangMissingNodesHelper missingNodesHelper; + private final BLangAnonymousModelHelper anonymousModelHelper; + private final BLangMissingNodesHelper missingNodesHelper; /* To keep track of additional statements produced from multi-BLangNode resultant transformations */ - private Deque additionalStatements = new ArrayDeque<>(); + private final Deque additionalStatements = new ArrayDeque<>(); private final Deque anonTypeNameSuffixes = new ArrayDeque<>(); /* To keep track if we are inside a block statment for the use of type definition creation */ private boolean isInLocalContext = false; @@ -550,7 +550,7 @@ public class BLangNodeBuilder extends NodeTransformer { boolean isInCharacterClass = false; boolean inCollectContext = false; - private HashSet constantSet = new HashSet(); + private final HashSet constantSet = new HashSet(); public BLangNodeBuilder(CompilerContext context, PackageID packageID, String entryName) { @@ -6872,7 +6872,7 @@ private class SimpleVarBuilder { private BLangIdentifier name; private BLangType type; private boolean isDeclaredWithVar; - private Set flags = new HashSet<>(); + private final Set flags = new HashSet<>(); private boolean isFinal; private ExpressionNode expr; private Location pos; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CodeAnalyzer.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CodeAnalyzer.java index c8eedc319fef..c6fb52c6530a 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CodeAnalyzer.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CodeAnalyzer.java @@ -4157,9 +4157,9 @@ private static class WorkerActionSystem { public final List alternateWorkerReceives = new ArrayList<>(); public List finshedWorkers = new ArrayList<>(); - private Deque workerActionStateMachines = new ArrayDeque<>(); - private Map workerInteractionEnvironments = new IdentityHashMap<>(); - private Map workerEventIndexMap = new HashMap<>(); + private final Deque workerActionStateMachines = new ArrayDeque<>(); + private final Map workerInteractionEnvironments = new IdentityHashMap<>(); + private final Map workerEventIndexMap = new HashMap<>(); private boolean hasErrors = false; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CompilerPluginRunner.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CompilerPluginRunner.java index bcc47211e0fc..9cda10484059 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CompilerPluginRunner.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/CompilerPluginRunner.java @@ -83,20 +83,20 @@ public class CompilerPluginRunner extends BLangNodeVisitor { private static final CompilerContext.Key COMPILER_PLUGIN_RUNNER_KEY = new CompilerContext.Key<>(); - private SymbolTable symTable; - private PackageCache packageCache; - private SymbolResolver symResolver; - private Names names; + private final SymbolTable symTable; + private final PackageCache packageCache; + private final SymbolResolver symResolver; + private final Names names; private final Types types; - private BLangDiagnosticLog dlog; + private final BLangDiagnosticLog dlog; private Location defaultPos; - private CompilerContext context; - private List pluginList; - private Map> processorMap; - private Map> resourceTypeProcessorMap; - private Map serviceListenerMap; - private List failedPlugins; + private final CompilerContext context; + private final List pluginList; + private final Map> processorMap; + private final Map> resourceTypeProcessorMap; + private final Map serviceListenerMap; + private final List failedPlugins; public static CompilerPluginRunner getInstance(CompilerContext context) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ConstantAnalyzer.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ConstantAnalyzer.java index b8ab21755152..7862a83d301c 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ConstantAnalyzer.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ConstantAnalyzer.java @@ -59,8 +59,8 @@ public class ConstantAnalyzer extends BLangNodeVisitor { private final Names names; private final SymbolTable symTable; private final SymbolResolver symResolver; - private BLangDiagnosticLog dlog; - private Deque expressions = new ArrayDeque<>(); + private final BLangDiagnosticLog dlog; + private final Deque expressions = new ArrayDeque<>(); private ConstantAnalyzer(CompilerContext context) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ConstantTypeChecker.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ConstantTypeChecker.java index 1f1087921e10..19b37c0e15c3 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ConstantTypeChecker.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ConstantTypeChecker.java @@ -135,7 +135,7 @@ public class ConstantTypeChecker extends SimpleBLangNodeAnalyzer(); private BConstantSymbol currentConstSymbol; private BLangConstantValue result; - private BLangDiagnosticLog dlog; + private final BLangDiagnosticLog dlog; private Location currentPos; - private BLangAnonymousModelHelper anonymousModelHelper; + private final BLangAnonymousModelHelper anonymousModelHelper; private SymbolEnv symEnv; - private Names names; - private SymbolTable symTable; - private Types types; + private final Names names; + private final SymbolTable symTable; + private final Types types; private PackageID pkgID; - private Map unresolvedConstants = new HashMap<>(); - private Map constantMap = new HashMap<>(); - private ArrayList resolvingConstants = new ArrayList<>(); - private HashSet unresolvableConstants = new HashSet<>(); - private HashMap createdTypeDefinitions = new HashMap<>(); + private final Map unresolvedConstants = new HashMap<>(); + private final Map constantMap = new HashMap<>(); + private final ArrayList resolvingConstants = new ArrayList<>(); + private final HashSet unresolvableConstants = new HashSet<>(); + private final HashMap createdTypeDefinitions = new HashMap<>(); private Deque anonTypeNameSuffixes = new ArrayDeque<>(); private ConstantValueResolver(CompilerContext context) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DataflowAnalyzer.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DataflowAnalyzer.java index 314ed30d3c29..21f4cae1f2e5 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DataflowAnalyzer.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DataflowAnalyzer.java @@ -261,9 +261,9 @@ public class DataflowAnalyzer extends BLangNodeVisitor { private final SymbolResolver symResolver; private final Names names; private SymbolEnv env; - private SymbolTable symTable; - private BLangDiagnosticLog dlog; - private Types types; + private final SymbolTable symTable; + private final BLangDiagnosticLog dlog; + private final Types types; private Map uninitializedVars; private Map unusedErrorVarsDeclaredWithVar; private Map unusedLocalVariables; @@ -276,7 +276,7 @@ public class DataflowAnalyzer extends BLangNodeVisitor { private boolean definiteFailureReached = false; private static final CompilerContext.Key DATAFLOW_ANALYZER_KEY = new CompilerContext.Key<>(); - private Deque currDependentSymbolDeque; + private final Deque currDependentSymbolDeque; private final GlobalVariableRefAnalyzer globalVariableRefAnalyzer; private DataflowAnalyzer(CompilerContext context) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/IsAnydataUniqueVisitor.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/IsAnydataUniqueVisitor.java index e4915183948f..cbbc0d8417df 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/IsAnydataUniqueVisitor.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/IsAnydataUniqueVisitor.java @@ -46,8 +46,8 @@ */ public class IsAnydataUniqueVisitor implements UniqueTypeVisitor { - private HashSet visited; - private boolean isAnydata; + private final HashSet visited; + private final boolean isAnydata; public IsAnydataUniqueVisitor() { visited = new HashSet<>(); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/IsPureTypeUniqueVisitor.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/IsPureTypeUniqueVisitor.java index b3b001f19f60..ca6528a68796 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/IsPureTypeUniqueVisitor.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/IsPureTypeUniqueVisitor.java @@ -44,8 +44,8 @@ */ public class IsPureTypeUniqueVisitor implements UniqueTypeVisitor { - private HashSet visited; - private boolean isPureType; + private final HashSet visited; + private final boolean isPureType; public IsPureTypeUniqueVisitor() { visited = new HashSet<>(); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolEnter.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolEnter.java index 943baf159e6b..7f76e1127bc4 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolEnter.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolEnter.java @@ -233,14 +233,14 @@ public class SymbolEnter extends BLangNodeVisitor { private Set unresolvedRecordDueToFields; private boolean resolveRecordsUnresolvedDueToFields; private List unresolvedClasses; - private HashSet unknownTypeRefs; - private List importedPackages; + private final HashSet unknownTypeRefs; + private final List importedPackages; private int typePrecedence; private final TypeParamAnalyzer typeParamAnalyzer; - private BLangAnonymousModelHelper anonymousModelHelper; - private BLangMissingNodesHelper missingNodesHelper; - private PackageCache packageCache; - private List intersectionTypes; + private final BLangAnonymousModelHelper anonymousModelHelper; + private final BLangMissingNodesHelper missingNodesHelper; + private final PackageCache packageCache; + private final List intersectionTypes; private Map typeToTypeDef; private SymbolEnv env; @@ -5445,9 +5445,9 @@ public ImportResolveHolder(BLangImportPackage resolved) { */ private static class LocationData { - private String name; - private int row; - private int column; + private final String name; + private final int row; + private final int column; LocationData(String name, int row, int column) { this.name = name; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java index e437397edbf2..2b5d8c67320e 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java @@ -221,8 +221,8 @@ public class TypeChecker extends SimpleBLangNodeAnalyzer { private static final CompilerContext.Key TYPE_CHECKER_KEY = new CompilerContext.Key<>(); - private static Set listLengthModifierFunctions = new HashSet<>(); - private static Map> modifierFunctions = new HashMap<>(); + private static final Set LIST_LENGTH_MODIFIER_FUNCTIONS = new HashSet<>(); + private static final Map> MODIFIER_FUNCTIONS = new HashMap<>(); private static final String LIST_LANG_LIB = "lang.array"; private static final String MAP_LANG_LIB = "lang.map"; @@ -252,12 +252,12 @@ public class TypeChecker extends SimpleBLangNodeAnalyzer() {{ + MODIFIER_FUNCTIONS.put(LIST_LANG_LIB, new HashSet() {{ add("remove"); add("removeAll"); add("setLength"); @@ -269,13 +269,13 @@ public class TypeChecker extends SimpleBLangNodeAnalyzer() {{ + MODIFIER_FUNCTIONS.put(MAP_LANG_LIB, new HashSet() {{ add("remove"); add("removeIfHasKey"); add("removeAll"); }}); - modifierFunctions.put(TABLE_LANG_LIB, new HashSet() {{ + MODIFIER_FUNCTIONS.put(TABLE_LANG_LIB, new HashSet() {{ add("put"); add("add"); add("remove"); @@ -283,11 +283,11 @@ public class TypeChecker extends SimpleBLangNodeAnalyzer() {{ + MODIFIER_FUNCTIONS.put(VALUE_LANG_LIB, new HashSet() {{ add("mergeJson"); }}); - modifierFunctions.put(XML_LANG_LIB, new HashSet() {{ + MODIFIER_FUNCTIONS.put(XML_LANG_LIB, new HashSet() {{ add("setName"); add("setChildren"); add("strip"); @@ -4246,12 +4246,12 @@ private boolean checkInvalidImmutableValueUpdate(BLangInvocation iExpr, BType va String packageId = langLibMethodSymbol.pkgID.name.value; - if (!modifierFunctions.containsKey(packageId)) { + if (!MODIFIER_FUNCTIONS.containsKey(packageId)) { return false; } String funcName = langLibMethodSymbol.name.value; - if (!modifierFunctions.get(packageId).contains(funcName)) { + if (!MODIFIER_FUNCTIONS.get(packageId).contains(funcName)) { return false; } @@ -4289,7 +4289,7 @@ private boolean isFixedLengthList(BType type) { private void checkIllegalStorageSizeChangeMethodCall(BLangInvocation iExpr, BType varRefType, AnalyzerData data) { String invocationName = iExpr.name.getValue(); - if (!listLengthModifierFunctions.contains(invocationName)) { + if (!LIST_LENGTH_MODIFIER_FUNCTIONS.contains(invocationName)) { return; } @@ -9825,8 +9825,8 @@ private FieldInfo(List types, boolean required, boolean readonly) { } private static class TypeSymbolPair { - private BVarSymbol fieldSymbol; - private BType determinedType; + private final BVarSymbol fieldSymbol; + private final BType determinedType; public TypeSymbolPair(BVarSymbol fieldSymbol, BType determinedType) { this.fieldSymbol = fieldSymbol; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeNarrower.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeNarrower.java index 6f51124f5a78..d2ee81e5d206 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeNarrower.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeNarrower.java @@ -69,10 +69,10 @@ public class TypeNarrower extends BLangNodeVisitor { private SymbolEnv env; - private SymbolTable symTable; - private Types types; - private SymbolEnter symbolEnter; - private TypeChecker typeChecker; + private final SymbolTable symTable; + private final Types types; + private final SymbolEnter symbolEnter; + private final TypeChecker typeChecker; private static final CompilerContext.Key TYPE_NARROWER_KEY = new CompilerContext.Key<>(); private TypeNarrower(CompilerContext context) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeParamAnalyzer.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeParamAnalyzer.java index b985d97d8fce..3c7f9f8a9dee 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeParamAnalyzer.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeParamAnalyzer.java @@ -101,11 +101,11 @@ public class TypeParamAnalyzer { private static final CompilerContext.Key TYPE_PARAM_ANALYZER_KEY = new CompilerContext.Key<>(); - private SymbolTable symTable; - private Types types; - private Names names; - private BLangDiagnosticLog dlog; - private BLangAnonymousModelHelper anonymousModelHelper; + private final SymbolTable symTable; + private final Types types; + private final Names names; + private final BLangDiagnosticLog dlog; + private final BLangAnonymousModelHelper anonymousModelHelper; public static TypeParamAnalyzer getInstance(CompilerContext context) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeResolver.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeResolver.java index 2e4e4d944cdb..189a1504468d 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeResolver.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeResolver.java @@ -153,18 +153,18 @@ public class TypeResolver { private final ConstantTypeChecker constantTypeChecker; private final ConstantTypeChecker.ResolveConstantExpressionType resolveConstantExpressionType; private final EffectiveTypePopulator effectiveTypePopulator; - private BLangAnonymousModelHelper anonymousModelHelper; - private BLangMissingNodesHelper missingNodesHelper; + private final BLangAnonymousModelHelper anonymousModelHelper; + private final BLangMissingNodesHelper missingNodesHelper; - private List resolvingTypeDefinitions = new ArrayList<>(); + private final List resolvingTypeDefinitions = new ArrayList<>(); private HashMap intersectionTypeList; public HashSet resolvedConstants = new HashSet<>(); - private ArrayList resolvingConstants = new ArrayList<>(); + private final ArrayList resolvingConstants = new ArrayList<>(); private Deque resolvingModuleDefs; - private HashSet resolvedClassDef = new HashSet<>(); - private Map modTable = new LinkedHashMap<>(); - private Map constantMap = new HashMap<>(); - private HashSet unknownTypeRefs; + private final HashSet resolvedClassDef = new HashSet<>(); + private final Map modTable = new LinkedHashMap<>(); + private final Map constantMap = new HashMap<>(); + private final HashSet unknownTypeRefs; private SymbolEnv pkgEnv; private int currentDepth; private Deque resolvingTypes; @@ -2134,9 +2134,9 @@ private static class ResolverData { * @since 2201.7.0 */ private static class LocationData { - private String name; - private int row; - private int column; + private final String name; + private final int row; + private final int column; LocationData(String name, int row, int column) { this.name = name; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/Types.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/Types.java index 5d90b2db49d6..d2e43b2155ad 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/Types.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/Types.java @@ -164,14 +164,14 @@ public class Types { private static final CompilerContext.Key TYPES_KEY = new CompilerContext.Key<>(); private final Unifier unifier; - private SymbolTable symTable; - private SymbolResolver symResolver; - private BLangDiagnosticLog dlog; - private Names names; + private final SymbolTable symTable; + private final SymbolResolver symResolver; + private final BLangDiagnosticLog dlog; + private final Names names; private int finiteTypeCount = 0; - private BUnionType expandedXMLBuiltinSubtypes; + private final BUnionType expandedXMLBuiltinSubtypes; private final BLangAnonymousModelHelper anonymousModelHelper; - private int recordCount = 0; + private final int recordCount = 0; private SymbolEnv env; private boolean ignoreObjectTypeIds = false; private static final String BASE_16 = "base16"; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/SymbolTable.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/SymbolTable.java index a6c13bb63586..5d3bfba21165 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/SymbolTable.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/SymbolTable.java @@ -223,8 +223,8 @@ public class SymbolTable { public BPackageSymbol langRegexpModuleSymbol; - private Names names; - private Types types; + private final Names names; + private final Types types; public Map pkgEnvMap = new HashMap<>(); public Map predeclaredModules = new HashMap<>(); public Map> immutableTypeMaps = new HashMap<>(); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BAnnotationSymbol.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BAnnotationSymbol.java index 1626372da1d0..dec250ba45d9 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BAnnotationSymbol.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BAnnotationSymbol.java @@ -44,7 +44,7 @@ public class BAnnotationSymbol extends BTypeSymbol implements AnnotationSymbol { public BType attachedType; public Set points; public int maskedPoints; - private List annotationAttachments; + private final List annotationAttachments; public BAnnotationSymbol(Name name, Name originalName, long flags, Set points, PackageID pkgID, BType type, BSymbol owner, Location pos, SymbolOrigin origin) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BClassSymbol.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BClassSymbol.java index 732400f4b0e5..5934db07078c 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BClassSymbol.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BClassSymbol.java @@ -37,7 +37,7 @@ public class BClassSymbol extends BObjectTypeSymbol implements Annotatable { public boolean isServiceDecl; - private List annotationAttachments; + private final List annotationAttachments; public BClassSymbol(long symTag, long flags, Name name, PackageID pkgID, BType type, BSymbol owner, Location pos, SymbolOrigin origin) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BEnumSymbol.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BEnumSymbol.java index 14d7f300c604..3f3a704a787e 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BEnumSymbol.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BEnumSymbol.java @@ -38,7 +38,7 @@ public class BEnumSymbol extends BTypeSymbol implements Annotatable { public List members; - private List annotationAttachments; + private final List annotationAttachments; public BEnumSymbol(List members, long flags, Name name, Name originalName, PackageID pkgID, BType type, BSymbol owner, Location pos, SymbolOrigin origin) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BTypeDefinitionSymbol.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BTypeDefinitionSymbol.java index 001dc4a6368e..96e512269ae0 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BTypeDefinitionSymbol.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/symbols/BTypeDefinitionSymbol.java @@ -37,7 +37,7 @@ public class BTypeDefinitionSymbol extends BSymbol implements Annotatable { public BTypeReferenceType referenceType = null; - private List annAttachments; + private final List annAttachments; public BTypeDefinitionSymbol(long flags, Name name, PackageID pkgID, BType type, BSymbol owner, Location pos, SymbolOrigin origin) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/types/BFiniteType.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/types/BFiniteType.java index 66934c7a5b8f..45c5512ef81f 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/types/BFiniteType.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/model/types/BFiniteType.java @@ -37,7 +37,7 @@ */ public class BFiniteType extends BType implements FiniteType { - private Set valueSpace; + private final Set valueSpace; private boolean nullable = false; public Boolean isAnyData = null; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/BLangAnnotation.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/BLangAnnotation.java index 642055c05fbe..d073ba3818d2 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/BLangAnnotation.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/BLangAnnotation.java @@ -47,7 +47,7 @@ public class BLangAnnotation extends BLangNode implements AnnotationNode { // Parser Flags and Data public Set flagSet; - private Set attachPoints; + private final Set attachPoints; // Semantic Data public BSymbol symbol; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/BLangPackage.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/BLangPackage.java index dfc910334ead..2b53aabcaf12 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/BLangPackage.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/BLangPackage.java @@ -88,7 +88,7 @@ public class BLangPackage extends BLangNode implements PackageNode { private int errorCount; private int warnCount; - private TreeSet diagnostics; + private final TreeSet diagnostics; public ModuleContextDataHolder moduleContextDataHolder; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/BLangTestablePackage.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/BLangTestablePackage.java index 87c9d4a9c3fa..58196fac987d 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/BLangTestablePackage.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/BLangTestablePackage.java @@ -28,7 +28,7 @@ public class BLangTestablePackage extends BLangPackage { public BLangPackage parent; // Semantic Data //Map to maintain all the mock functions - private Map mockFunctionNamesMap = new HashMap<>(); + private final Map mockFunctionNamesMap = new HashMap<>(); private final Map isLegacyMockingMap = new HashMap<>(); public Map getMockFunctionNamesMap() { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/CompilerContext.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/CompilerContext.java index cffafb0282f2..e195e113eea6 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/CompilerContext.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/CompilerContext.java @@ -26,8 +26,8 @@ */ public class CompilerContext { - private Map, Object> props = new HashMap<>(); - private Map, Object> objects = new HashMap<>(); + private final Map, Object> props = new HashMap<>(); + private final Map, Object> objects = new HashMap<>(); public CompilerContext() { } diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/CompilerOptions.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/CompilerOptions.java index f6d596d23ef6..2d83c0be3a92 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/CompilerOptions.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/CompilerOptions.java @@ -33,7 +33,7 @@ public class CompilerOptions { private static final CompilerContext.Key OPTIONS_KEY = new CompilerContext.Key<>(); - private Map optionMap; + private final Map optionMap; public static CompilerOptions getInstance(CompilerContext context) { CompilerOptions options = context.get(OPTIONS_KEY); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/DefaultValueLiteral.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/DefaultValueLiteral.java index 86b7be12438e..9b48f38b575e 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/DefaultValueLiteral.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/DefaultValueLiteral.java @@ -24,8 +24,8 @@ * @since 0.985.0 */ public class DefaultValueLiteral { - private Object defaultValue; - private int literalTypeTag; + private final Object defaultValue; + private final int literalTypeTag; public DefaultValueLiteral(Object defaultValue, int literalTypeTag) { this.defaultValue = defaultValue; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/ProjectDirs.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/ProjectDirs.java index 1ca30d0af7f9..16259a48ed39 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/ProjectDirs.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/ProjectDirs.java @@ -39,20 +39,20 @@ */ public final class ProjectDirs { - private static PathMatcher sourceFileMatcher = FileSystems.getDefault().getPathMatcher( + private static final PathMatcher SOURCE_FILE_MATCHER = FileSystems.getDefault().getPathMatcher( "glob:*" + BLANG_SOURCE_EXT); - private static PathMatcher testFileMatcher = FileSystems.getDefault().getPathMatcher( + private static final PathMatcher TEST_FILE_MATCHER = FileSystems.getDefault().getPathMatcher( "glob:../src/*/tests/**" + BLANG_SOURCE_EXT); - private static PathMatcher testResourceFileMatcher = FileSystems.getDefault().getPathMatcher( + private static final PathMatcher TEST_RESOURCE_FILE_MATCHER = FileSystems.getDefault().getPathMatcher( "glob:../src/*/tests/resources/**" + BLANG_SOURCE_EXT); private ProjectDirs() { } public static boolean isSourceFile(Path path) { - return !Files.isDirectory(path, LinkOption.NOFOLLOW_LINKS) && sourceFileMatcher.matches(path); + return !Files.isDirectory(path, LinkOption.NOFOLLOW_LINKS) && SOURCE_FILE_MATCHER.matches(path); } public static Path getLastComp(Path path) { @@ -124,7 +124,7 @@ public static boolean isTestSource(Path sourcePath, Path sourceRoot, String pkg) Path pkgPath = sourceRoot.resolve(pkg); Path relativizePath = pkgPath.relativize(sourcePath); // Bal files should be inside tests directory but not in test resources - return testFileMatcher.matches(relativizePath) && !testResourceFileMatcher.matches(relativizePath); + return TEST_FILE_MATCHER.matches(relativizePath) && !TEST_RESOURCE_FILE_MATCHER.matches(relativizePath); } /** diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/diagnotic/DiagnosticPos.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/diagnotic/DiagnosticPos.java index f4e3119ef870..5e4419e19a2a 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/diagnotic/DiagnosticPos.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/diagnotic/DiagnosticPos.java @@ -34,9 +34,9 @@ @Deprecated public class DiagnosticPos implements Location { - private LineRange lineRange; - private TextRange textRange; - private PackageID packageID; + private final LineRange lineRange; + private final TextRange textRange; + private final PackageID packageID; public DiagnosticPos(String filePath, PackageID pkgId, int startLine, int endLine, int startColumn, int endColumn) { diff --git a/compiler/ballerina-lang/src/test/java/org/ballerinalang/toml/ManifestProcessorTest.java b/compiler/ballerina-lang/src/test/java/org/ballerinalang/toml/ManifestProcessorTest.java index 830636860cb5..73189ab9ffab 100644 --- a/compiler/ballerina-lang/src/test/java/org/ballerinalang/toml/ManifestProcessorTest.java +++ b/compiler/ballerina-lang/src/test/java/org/ballerinalang/toml/ManifestProcessorTest.java @@ -35,7 +35,7 @@ */ public class ManifestProcessorTest { private static final String OS = System.getProperty("os.name").toLowerCase(Locale.getDefault()); - private String validProjectBlock = """ + private final String validProjectBlock = """ [project] org-name = "foo" version = "1.0.0" diff --git a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/diagnostics/DiagnosticMessageHelper.java b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/diagnostics/DiagnosticMessageHelper.java index 703e43031916..aa69bde97eba 100644 --- a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/diagnostics/DiagnosticMessageHelper.java +++ b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/diagnostics/DiagnosticMessageHelper.java @@ -30,7 +30,7 @@ */ public final class DiagnosticMessageHelper { - private static ResourceBundle messages = ResourceBundle.getBundle( + private static final ResourceBundle MESSAGES = ResourceBundle.getBundle( "syntax_diagnostic_message", Locale.getDefault()); private DiagnosticMessageHelper() { @@ -38,7 +38,7 @@ private DiagnosticMessageHelper() { public static String getDiagnosticMessage(DiagnosticCode diagnosticCode, Object... args) { String msgKey = diagnosticCode.messageKey(); - String msg = messages.getString(msgKey); + String msg = MESSAGES.getString(msgKey); return MessageFormat.format(msg, args); } } diff --git a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/InputReader.java b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/InputReader.java index dcce2ffdf3df..f65d3f4b800a 100644 --- a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/InputReader.java +++ b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/InputReader.java @@ -33,8 +33,8 @@ public class InputReader { private static final int BUFFER_SIZE = 10; - private CharacterBuffer charsAhead = new CharacterBuffer(BUFFER_SIZE); - private Reader reader; + private final CharacterBuffer charsAhead = new CharacterBuffer(BUFFER_SIZE); + private final Reader reader; private int currentChar; InputReader(InputStream inputStream) { diff --git a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/Result.java b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/Result.java index 34f647fe752d..c58bbbfbca40 100644 --- a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/Result.java +++ b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/Result.java @@ -40,7 +40,7 @@ public class Result { /** * List of solutions to recover from the error. */ - private ArrayDeque fixes; + private final ArrayDeque fixes; /** * Represent the end solution to be applied to the next immediate token, to recover from the error. diff --git a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/TokenReader.java b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/TokenReader.java index 8cd0253c6b74..65cd9340bdf6 100644 --- a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/TokenReader.java +++ b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/TokenReader.java @@ -32,8 +32,8 @@ public class TokenReader extends AbstractTokenReader { private static final int BUFFER_SIZE = 20; - private AbstractLexer lexer; - private TokenBuffer tokensAhead = new TokenBuffer(BUFFER_SIZE); + private final AbstractLexer lexer; + private final TokenBuffer tokensAhead = new TokenBuffer(BUFFER_SIZE); private STToken currentToken = null; TokenReader(AbstractLexer lexer) { diff --git a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/incremental/IncrementalParser.java b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/incremental/IncrementalParser.java index 4f8194acbe4c..7f698bed3229 100644 --- a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/incremental/IncrementalParser.java +++ b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/incremental/IncrementalParser.java @@ -64,15 +64,15 @@ private STNode getIfReusable(STNode node, Predicate predicate) { return node; } - private Predicate isModelLevelDeclaration = + private final Predicate isModelLevelDeclaration = kind -> SyntaxKind.IMPORT_DECLARATION.compareTo(kind) <= 0 && SyntaxKind.ENUM_DECLARATION.compareTo(kind) >= 0; - private Predicate isFunctionBody = kind -> + private final Predicate isFunctionBody = kind -> kind == SyntaxKind.FUNCTION_BODY_BLOCK || kind == SyntaxKind.EXTERNAL_FUNCTION_BODY || kind == SyntaxKind.EXPRESSION_FUNCTION_BODY; - private Predicate isStatement = kind -> SyntaxKind.BLOCK_STATEMENT.compareTo(kind) <= 0 && + private final Predicate isStatement = kind -> SyntaxKind.BLOCK_STATEMENT.compareTo(kind) <= 0 && SyntaxKind.INVALID_EXPRESSION_STATEMENT.compareTo(kind) >= 0; } diff --git a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/incremental/UnmodifiedSubtreeSupplier.java b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/incremental/UnmodifiedSubtreeSupplier.java index fa727d728a10..a6cb6bedb8f8 100644 --- a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/incremental/UnmodifiedSubtreeSupplier.java +++ b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/incremental/UnmodifiedSubtreeSupplier.java @@ -25,7 +25,7 @@ * @since 1.3.0 */ public class UnmodifiedSubtreeSupplier { - private HybridNodeStorage hybridNodeStorage; + private final HybridNodeStorage hybridNodeStorage; public UnmodifiedSubtreeSupplier(HybridNodeStorage hybridNodeStorage) { this.hybridNodeStorage = hybridNodeStorage; diff --git a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/tree/STNodeDiagnostic.java b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/tree/STNodeDiagnostic.java index a189a2221148..614a40db03e4 100644 --- a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/tree/STNodeDiagnostic.java +++ b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/tree/STNodeDiagnostic.java @@ -26,8 +26,8 @@ * @since 2.0.0 */ public class STNodeDiagnostic extends IRDiagnostic { - private DiagnosticCode diagnosticCode; - private Object[] args; + private final DiagnosticCode diagnosticCode; + private final Object[] args; STNodeDiagnostic(DiagnosticCode diagnosticCode, Object... args) { this.diagnosticCode = diagnosticCode; diff --git a/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/text/CharReader.java b/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/text/CharReader.java index 377f5a3e4ab4..a61dcb4822c4 100644 --- a/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/text/CharReader.java +++ b/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/text/CharReader.java @@ -26,9 +26,9 @@ */ public class CharReader { - private char[] charBuffer; + private final char[] charBuffer; private int offset = 0; - private int charBufferLength; + private final int charBufferLength; private int lexemeStartPos; diff --git a/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/TreeGenConfig.java b/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/TreeGenConfig.java index 9a74017a8086..56a0046b62ad 100644 --- a/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/TreeGenConfig.java +++ b/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/TreeGenConfig.java @@ -52,10 +52,10 @@ public class TreeGenConfig { public static final String SYNTAX_NODE_METADATA_KEY = "syntax.node.metadata"; private final Properties props; - private static TreeGenConfig instance = new TreeGenConfig(loadConfig()); + private static final TreeGenConfig INSTANCE = new TreeGenConfig(loadConfig()); static TreeGenConfig getInstance() { - return instance; + return INSTANCE; } private TreeGenConfig(Properties props) { diff --git a/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/model/json/SyntaxNode.java b/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/model/json/SyntaxNode.java index 0413ba928257..e17a0ec42848 100644 --- a/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/model/json/SyntaxNode.java +++ b/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/model/json/SyntaxNode.java @@ -27,7 +27,7 @@ */ public class SyntaxNode { private String name; - private List attributes; + private final List attributes; private String kind; private String base; private String type; diff --git a/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/model/json/SyntaxNodeAttribute.java b/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/model/json/SyntaxNodeAttribute.java index 447ec27d53b0..ff22520f7c04 100644 --- a/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/model/json/SyntaxNodeAttribute.java +++ b/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/model/json/SyntaxNodeAttribute.java @@ -25,10 +25,10 @@ * @since 1.3.0 */ public class SyntaxNodeAttribute { - private String name; - private String type; - private String occurrences; - private boolean isOptional; + private final String name; + private final String type; + private final String occurrences; + private final boolean isOptional; public SyntaxNodeAttribute(String name, String type, String occurrences, boolean isOptional) { this.name = name; diff --git a/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/model/json/SyntaxTree.java b/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/model/json/SyntaxTree.java index c3476b9ecae6..14ef6a9f9562 100644 --- a/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/model/json/SyntaxTree.java +++ b/compiler/ballerina-treegen/src/main/java/io/ballerinalang/compiler/internal/treegen/model/json/SyntaxTree.java @@ -25,10 +25,10 @@ * @since 1.3.0 */ public class SyntaxTree { - private String root; - private List nodes; - private String type; - private List fields; + private final String root; + private final List nodes; + private final String type; + private final List fields; public SyntaxTree(String root, List nodes, diff --git a/langlib/lang.error/src/main/java/org/ballerinalang/langlib/error/StackTrace.java b/langlib/lang.error/src/main/java/org/ballerinalang/langlib/error/StackTrace.java index f5acb449a94a..d56787fd387e 100644 --- a/langlib/lang.error/src/main/java/org/ballerinalang/langlib/error/StackTrace.java +++ b/langlib/lang.error/src/main/java/org/ballerinalang/langlib/error/StackTrace.java @@ -115,8 +115,8 @@ public static class CallStack implements BObject { BArray callStack; - private ObjectType type; - private BTypedesc typedesc; + private final ObjectType type; + private final BTypedesc typedesc; public CallStack(ObjectType type) { this.type = type; diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachArrayTests.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachArrayTests.java index e878626babb0..5cd7b167f4ec 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachArrayTests.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachArrayTests.java @@ -37,12 +37,12 @@ public class ForeachArrayTests { private CompileResult program; - private int[] iValues = {1, -3, 5, -30, 4, 11, 25, 10}; - private double[] fValues = {1.123, -3.35244, 5.23, -30.45, 4.32, 11.56, 25.967, 10.345}; - private String[] sValues = {"foo", "bar", "bax", "baz"}; - private boolean[] bValues = {true, false, false, false, true, false}; - private String[] jValues = {"{\"name\":\"bob\", \"age\":10}", "{\"name\":\"tom\", \"age\":16}"}; - private String[] tValues = {"name=bob,age=10", "name=tom,age=16"}; + private final int[] iValues = {1, -3, 5, -30, 4, 11, 25, 10}; + private final double[] fValues = {1.123, -3.35244, 5.23, -30.45, 4.32, 11.56, 25.967, 10.345}; + private final String[] sValues = {"foo", "bar", "bax", "baz"}; + private final boolean[] bValues = {true, false, false, false, true, false}; + private final String[] jValues = {"{\"name\":\"bob\", \"age\":10}", "{\"name\":\"tom\", \"age\":16}"}; + private final String[] tValues = {"name=bob,age=10", "name=tom,age=16"}; @BeforeClass public void setup() { diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachOnFailTests.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachOnFailTests.java index 348415426e06..eec41f3780f7 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachOnFailTests.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachOnFailTests.java @@ -37,13 +37,6 @@ public class ForeachOnFailTests { private CompileResult program; - private int[] iValues = {1, -3, 5, -30, 4, 11, 25, 10}; - private double[] fValues = {1.123, -3.35244, 5.23, -30.45, 4.32, 11.56, 25.967, 10.345}; - private String[] sValues = {"foo", "bar", "bax", "baz"}; - private boolean[] bValues = {true, false, false, false, true, false}; - private String[] jValues = {"{\"name\":\"bob\", \"age\":10}", "{\"name\":\"tom\", \"age\":16}"}; - private String[] tValues = {"name=bob,age=10", "name=tom,age=16"}; - @BeforeClass public void setup() { program = BCompileUtil.compile("test-src/statements/foreach/foreach-on-fail.bal"); diff --git a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachXMLTypedBindingPatternsTests.java b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachXMLTypedBindingPatternsTests.java index cc49b312444c..3c0a78b84666 100644 --- a/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachXMLTypedBindingPatternsTests.java +++ b/langlib/langlib-test/src/test/java/org/ballerinalang/langlib/test/statements/foreach/ForeachXMLTypedBindingPatternsTests.java @@ -33,7 +33,7 @@ public class ForeachXMLTypedBindingPatternsTests { private CompileResult program; - private String expectedXml1 = """ + private final String expectedXml1 = """ 0: bob @@ -42,7 +42,7 @@ public class ForeachXMLTypedBindingPatternsTests { 1131313 \s"""; - private String expectedXml2 = """ + private final String expectedXml2 = """ 0:bob \ 1: NY diff --git a/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/Array.java b/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/Array.java index 1126012cc595..7bb63fbdea8e 100644 --- a/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/Array.java +++ b/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/Array.java @@ -24,7 +24,7 @@ */ public class Array extends KeyValuePair { - private String qName; + private final String qName; public Array(String name, String qName, ValueType valueType) { super(name, valueType); diff --git a/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/KeyValuePair.java b/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/KeyValuePair.java index 9923652424a6..1516ba665e70 100644 --- a/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/KeyValuePair.java +++ b/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/KeyValuePair.java @@ -26,10 +26,10 @@ */ public class KeyValuePair implements TomlNode { - private String key; - private String defaultValue; - private int id; - private ValueType type; + private final String key; + private final String defaultValue; + private final int id; + private final ValueType type; public KeyValuePair(String key, String defaultValue, int id, ValueType type) { this.key = key; diff --git a/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/Table.java b/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/Table.java index 256a4983bb38..cc1da040847e 100644 --- a/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/Table.java +++ b/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/Table.java @@ -24,7 +24,7 @@ */ public class Table implements TomlNode { - private String name; + private final String name; public Table(String name) { this.name = name; diff --git a/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/TableArray.java b/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/TableArray.java index e4fb1742b42a..c841e8d3808b 100644 --- a/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/TableArray.java +++ b/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/toml/visitor/TableArray.java @@ -24,7 +24,7 @@ */ public class TableArray implements TomlNode { - private String name; + private final String name; public TableArray(String name) { this.name = name; diff --git a/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/trace/Message.java b/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/trace/Message.java index 4c4e39389a9d..9c3f1e9c48c3 100644 --- a/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/trace/Message.java +++ b/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/trace/Message.java @@ -22,13 +22,13 @@ */ public class Message { private String id; - private String direction; - private String headers; - private String httpMethod; - private String path; - private String contentType; - private String payload; - private String headerType; + private final String direction; + private final String headers; + private final String httpMethod; + private final String path; + private final String contentType; + private final String payload; + private final String headerType; public Message(String id, String direction, String headers, String httpMethod, String path, String contentType, String payload, String headerType) { diff --git a/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/trace/TraceRecord.java b/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/trace/TraceRecord.java index 626bd8855306..a18cfc5e6c21 100644 --- a/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/trace/TraceRecord.java +++ b/language-server/modules/langserver-commons/src/main/java/org/ballerinalang/langserver/commons/trace/TraceRecord.java @@ -24,15 +24,15 @@ * Model class for trace log. */ public class TraceRecord { - private Message message; - private String rawMessage; - private String id; - private String millis; - private String sequence; - private String logger; - private String sourceClass; - private String sourceMethod; - private String thread; + private final Message message; + private final String rawMessage; + private final String id; + private final String millis; + private final String sequence; + private final String logger; + private final String sourceClass; + private final String sourceMethod; + private final String thread; public TraceRecord(Message message, JsonObject record, String rawMessage) { this.message = message; diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/LSPackageLoader.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/LSPackageLoader.java index 68daa2c7a317..73ef8ab0c2e0 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/LSPackageLoader.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/LSPackageLoader.java @@ -71,10 +71,10 @@ public class LSPackageLoader { public static final LanguageServerContext.Key LS_PACKAGE_LOADER_KEY = new LanguageServerContext.Key<>(); - private List distRepoPackages = new ArrayList<>(); + private final List distRepoPackages = new ArrayList<>(); private final List remoteRepoPackages = new ArrayList<>(); private final List localRepoPackages = new ArrayList<>(); - private List centralPackages = new ArrayList<>(); + private final List centralPackages = new ArrayList<>(); private final LSClientLogger clientLogger; ExtendedLanguageClient languageClient; @@ -83,7 +83,7 @@ public class LSPackageLoader { private boolean initialized = false; - private CentralPackageDescriptorLoader centralPackageDescriptorLoader; + private final CentralPackageDescriptorLoader centralPackageDescriptorLoader; public static LSPackageLoader getInstance(LanguageServerContext context) { LSPackageLoader lsPackageLoader = context.get(LS_PACKAGE_LOADER_KEY); @@ -355,12 +355,12 @@ public List updatePackageMap(DocumentServiceContext context) { */ public static class ModuleInfo { - private PackageOrg packageOrg; + private final PackageOrg packageOrg; private PackageName packageName; - private PackageVersion packageVersion; - private Path sourceRoot; + private final PackageVersion packageVersion; + private final Path sourceRoot; - private String moduleIdentifier; + private final String moduleIdentifier; private boolean isModuleFromCurrentPackage = false; diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/codeaction/FailStatementResolver.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/codeaction/FailStatementResolver.java index 25abda59d1a1..0cacafb2512e 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/codeaction/FailStatementResolver.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/codeaction/FailStatementResolver.java @@ -34,7 +34,7 @@ */ public class FailStatementResolver extends NodeTransformer> { - private Diagnostic diagnostic; + private final Diagnostic diagnostic; public FailStatementResolver(Diagnostic diagnostic) { this.diagnostic = diagnostic; diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/command/visitors/FunctionCallExpressionTypeFinder.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/command/visitors/FunctionCallExpressionTypeFinder.java index eb95da73d1fe..9581bae07469 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/command/visitors/FunctionCallExpressionTypeFinder.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/command/visitors/FunctionCallExpressionTypeFinder.java @@ -97,7 +97,7 @@ public class FunctionCallExpressionTypeFinder extends NodeVisitor { private final SemanticModel semanticModel; - private FunctionCallExpressionNode functionCallExpr; + private final FunctionCallExpressionNode functionCallExpr; private TypeSymbol returnTypeSymbol; private boolean resultFound = false; diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/common/RecordField.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/common/RecordField.java index 1bb7e09d02fd..580898e03825 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/common/RecordField.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/common/RecordField.java @@ -57,8 +57,8 @@ public RecordFieldSymbol getFieldSymbol() { * @since 2201.8.0 */ public static class RecordFieldIdentifier { - private String name; - private TypeSymbol typeSymbol; + private final String name; + private final TypeSymbol typeSymbol; public RecordFieldIdentifier(String name, TypeSymbol typeSymbol) { this.name = name; diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/builder/ResourcePathCompletionUtil.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/builder/ResourcePathCompletionUtil.java index 319d0cd33b78..5889b3bfc3b1 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/builder/ResourcePathCompletionUtil.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/builder/ResourcePathCompletionUtil.java @@ -290,7 +290,7 @@ private static boolean isStringSubtype(TypeSymbol paramType, TypeSymbol stringTy private static class ResourceAccessPathPart { private String computedPathInsertText; - private String computedPathSignature; + private final String computedPathSignature; private String namedPathSignature; private String namedPathInsertText; diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/util/ServiceTemplateGenerator.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/util/ServiceTemplateGenerator.java index 4e6aac2bdf8e..5b3d5ae8f6ca 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/util/ServiceTemplateGenerator.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/util/ServiceTemplateGenerator.java @@ -75,8 +75,6 @@ public class ServiceTemplateGenerator { private static final LanguageServerContext.Key SERVICE_TEMPLATE_GENERATOR_KEY = new LanguageServerContext.Key<>(); - private boolean isInitialized = false; - private ServiceTemplateGenerator(LanguageServerContext context) { context.put(SERVICE_TEMPLATE_GENERATOR_KEY, this); } @@ -180,10 +178,6 @@ private ModuleID getCurrentModuleID(CompletionContext ctx) { return CodeActionModuleId.from(currentOrg, currentModuleName, currentVersion); } - public boolean initialized() { - return this.isInitialized; - } - public static Predicate listenerPredicate() { return symbol -> SymbolUtil.isListener(symbol) && symbol.kind() == SymbolKind.CLASS; } diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/util/AnnotationAttachmentMetaInfo.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/util/AnnotationAttachmentMetaInfo.java index 571686346b72..98fd68ab1b6b 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/util/AnnotationAttachmentMetaInfo.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/util/AnnotationAttachmentMetaInfo.java @@ -28,13 +28,13 @@ */ public class AnnotationAttachmentMetaInfo { - private String attachmentName; + private final String attachmentName; - private Queue fieldQueue; + private final Queue fieldQueue; - private String packageAlias; + private final String packageAlias; - private AnnotationNodeKind attachmentPoint; + private final AnnotationNodeKind attachmentPoint; public AnnotationAttachmentMetaInfo(String attachmentName, Queue fieldQueue, String packageAlias, AnnotationNodeKind attachmentPoint) { diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/contexts/DocumentSymbolContextImpl.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/contexts/DocumentSymbolContextImpl.java index 58936a62a18b..9c73227d368d 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/contexts/DocumentSymbolContextImpl.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/contexts/DocumentSymbolContextImpl.java @@ -38,9 +38,9 @@ public class DocumentSymbolContextImpl extends AbstractDocumentServiceContext im private Boolean labelSupport; private SymbolTagSupportCapabilities supportedTags; private Boolean hierarchicalDocumentSymbolSupport; - private LSClientCapabilities clientCapabilities; - private DocumentSymbolParams params; - private DocumentSymbolCapabilities documentSymbolClientCapabilities; + private final LSClientCapabilities clientCapabilities; + private final DocumentSymbolParams params; + private final DocumentSymbolCapabilities documentSymbolClientCapabilities; boolean deprecatedTagSupport; DocumentSymbolContextImpl(LSOperation operation, String fileUri, WorkspaceManager wsManager, @@ -106,8 +106,8 @@ public boolean deprecatedSupport() { */ protected static class DocumentSymbolContextBuilder extends AbstractContextBuilder { - private DocumentSymbolParams params; - private LSClientCapabilities clientCapabilities; + private final DocumentSymbolParams params; + private final LSClientCapabilities clientCapabilities; public DocumentSymbolContextBuilder(DocumentSymbolParams params, LanguageServerContext serverContext, diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/contexts/LanguageServerContextImpl.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/contexts/LanguageServerContextImpl.java index 434f2c661f78..a240d82cceb2 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/contexts/LanguageServerContextImpl.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/contexts/LanguageServerContextImpl.java @@ -28,8 +28,8 @@ * @since 2.0.0 */ public class LanguageServerContextImpl implements LanguageServerContext { - private Map, Object> props = new HashMap<>(); - private Map, Object> objects = new HashMap<>(); + private final Map, Object> props = new HashMap<>(); + private final Map, Object> objects = new HashMap<>(); public LanguageServerContextImpl() { } diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/documentsymbol/DocumentSymbolResolver.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/documentsymbol/DocumentSymbolResolver.java index 214284ffec30..0991d19d8ffd 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/documentsymbol/DocumentSymbolResolver.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/documentsymbol/DocumentSymbolResolver.java @@ -64,8 +64,8 @@ */ public class DocumentSymbolResolver extends NodeTransformer> { - private List documentSymbolStore; - private DocumentSymbolContext context; + private final List documentSymbolStore; + private final DocumentSymbolContext context; DocumentSymbolResolver(DocumentSymbolContext context) { this.context = context; diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/connector/BallerinaRecordRequest.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/connector/BallerinaRecordRequest.java index 0251084b0104..420de441dcc9 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/connector/BallerinaRecordRequest.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/connector/BallerinaRecordRequest.java @@ -25,11 +25,11 @@ */ public class BallerinaRecordRequest { - private String org; - private String module; - private String version = ""; - private String name; - private Boolean beta; + private final String org; + private final String module; + private final String version; + private final String name; + private final Boolean beta; public BallerinaRecordRequest(String org, String module, String version, String name, Boolean beta) { this.org = org; diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/connector/BallerinaRecordResponse.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/connector/BallerinaRecordResponse.java index 7098b6dbec61..c0c4fbbb2e16 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/connector/BallerinaRecordResponse.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/connector/BallerinaRecordResponse.java @@ -32,7 +32,7 @@ public class BallerinaRecordResponse { private final String version; private final String name; private final String error; - private JsonElement ast; + private final JsonElement ast; private final Boolean beta; public BallerinaRecordResponse(String org, String module, String version, String name, diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/document/visitor/FindNodes.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/document/visitor/FindNodes.java index d5ae9a558af1..de79ecbd87c5 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/document/visitor/FindNodes.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/document/visitor/FindNodes.java @@ -31,10 +31,10 @@ */ public class FindNodes extends NodeVisitor { - private List functionDefinitionNodeList; - private List classDefinitionNodeList; - private List serviceDeclarationNodeList; - private List importDeclarationNodesList; + private final List functionDefinitionNodeList; + private final List classDefinitionNodeList; + private final List serviceDeclarationNodeList; + private final List importDeclarationNodesList; public FindNodes() { this.functionDefinitionNodeList = new ArrayList<>(); diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/document/visitor/UnusedSymbolsVisitor.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/document/visitor/UnusedSymbolsVisitor.java index cefaf6d44a4b..7ee82dbcd997 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/document/visitor/UnusedSymbolsVisitor.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/document/visitor/UnusedSymbolsVisitor.java @@ -46,12 +46,12 @@ */ public class UnusedSymbolsVisitor extends NodeVisitor { - private Map unusedImports = new HashMap<>(); - private Map usedImports = new HashMap<>(); - private Map deleteRanges; - private Map toBeDeletedRanges = new HashMap<>(); - private SemanticModel semanticModel; - private Document srcFile; + private final Map unusedImports = new HashMap<>(); + private final Map usedImports = new HashMap<>(); + private final Map deleteRanges; + private final Map toBeDeletedRanges = new HashMap<>(); + private final SemanticModel semanticModel; + private final Document srcFile; public UnusedSymbolsVisitor(Document srcFile, SemanticModel semanticModel, Map deleteRanges) { diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/packages/PackageObject.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/packages/PackageObject.java index 22958f991696..4023eef2d66a 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/packages/PackageObject.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/packages/PackageObject.java @@ -25,7 +25,7 @@ public class PackageObject { private final String name; private final String filePath; - private List modules = new ArrayList<>(); + private final List modules = new ArrayList<>(); protected PackageObject(String name, String filePath) { this.name = name; diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/references/DocumentationReferenceFinder.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/references/DocumentationReferenceFinder.java index d2ef807ed20c..18fd42f8bbd6 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/references/DocumentationReferenceFinder.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/references/DocumentationReferenceFinder.java @@ -40,7 +40,7 @@ */ public class DocumentationReferenceFinder extends NodeTransformer> { - private Symbol symbol; + private final Symbol symbol; public DocumentationReferenceFinder(Symbol symbol) { this.symbol = symbol; diff --git a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/docsymbol/DocumentSymbolTest.java b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/docsymbol/DocumentSymbolTest.java index b66580ec5896..7d9f055f1d59 100644 --- a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/docsymbol/DocumentSymbolTest.java +++ b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/docsymbol/DocumentSymbolTest.java @@ -45,9 +45,9 @@ public class DocumentSymbolTest { private Endpoint serviceEndpoint; - private Path sourcesPath = new File(getClass().getClassLoader().getResource("docsymbol").getFile()).toPath(); + private final Path sourcesPath = new File(getClass().getClassLoader().getResource("docsymbol").getFile()).toPath(); - private static final Logger log = LoggerFactory.getLogger(DocumentSymbolTest.class); + private static final Logger LOG = LoggerFactory.getLogger(DocumentSymbolTest.class); @BeforeClass public void init() throws Exception { @@ -76,7 +76,7 @@ public void testDocumentSymbol(String config, String source) throws IOException @DataProvider(name = "document-data-provider") public Object[][] documentSymbolDataProvider() { - log.info("Test textDocument/symbol"); + LOG.info("Test textDocument/symbol"); return new Object[][] { {"documentSymbol.json", "docSymbol.bal"}, }; diff --git a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/extensions/connector/ConnectorTest.java b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/extensions/connector/ConnectorTest.java index 4f3f924ea6c7..308ceaff1646 100644 --- a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/extensions/connector/ConnectorTest.java +++ b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/extensions/connector/ConnectorTest.java @@ -31,7 +31,7 @@ */ public class ConnectorTest { private Endpoint serviceEndpoint; - private Path testConnectorFilePath = FileUtils.RES_DIR.resolve("extensions").resolve("connector") + private final Path testConnectorFilePath = FileUtils.RES_DIR.resolve("extensions").resolve("connector") .resolve("TestConnector").resolve("main.bal"); @BeforeClass diff --git a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/extensions/document/SyntaxTreeModifyTest.java b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/extensions/document/SyntaxTreeModifyTest.java index ce3ae235894c..af852d1f988d 100644 --- a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/extensions/document/SyntaxTreeModifyTest.java +++ b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/extensions/document/SyntaxTreeModifyTest.java @@ -40,13 +40,13 @@ public class SyntaxTreeModifyTest { private static final String OS = System.getProperty("os.name").toLowerCase(); private Endpoint serviceEndpoint; - private Path mainFile = FileUtils.RES_DIR.resolve("extensions") + private final Path mainFile = FileUtils.RES_DIR.resolve("extensions") .resolve("document") .resolve("ast") .resolve("modify") .resolve("main.bal"); - private Path mainEmptyFile = FileUtils.RES_DIR.resolve("extensions") + private final Path mainEmptyFile = FileUtils.RES_DIR.resolve("extensions") .resolve("document") .resolve("ast") .resolve("modify") @@ -58,55 +58,55 @@ public class SyntaxTreeModifyTest { // .resolve("modify") // .resolve("mainNats.bal"); - private Path emptyFile = FileUtils.RES_DIR.resolve("extensions") + private final Path emptyFile = FileUtils.RES_DIR.resolve("extensions") .resolve("document") .resolve("ast") .resolve("modify") .resolve("empty.bal"); - private Path mainHttpCallFile = FileUtils.RES_DIR.resolve("extensions") + private final Path mainHttpCallFile = FileUtils.RES_DIR.resolve("extensions") .resolve("document") .resolve("ast") .resolve("modify") .resolve("mainHttpCall.bal"); - private Path mainHttpCallWithPrintFile = FileUtils.RES_DIR.resolve("extensions") + private final Path mainHttpCallWithPrintFile = FileUtils.RES_DIR.resolve("extensions") .resolve("document") .resolve("ast") .resolve("modify") .resolve("mainHttpCallWithPrint.bal"); - private Path removeImport = FileUtils.RES_DIR.resolve("extensions") + private final Path removeImport = FileUtils.RES_DIR.resolve("extensions") .resolve("document") .resolve("ast") .resolve("modify") .resolve("removeImport.bal"); - private Path removeImportExpected = FileUtils.RES_DIR.resolve("extensions") + private final Path removeImportExpected = FileUtils.RES_DIR.resolve("extensions") .resolve("document") .resolve("ast") .resolve("modify") .resolve("removeImportExpected.bal"); - private Path notRemoveIgnoredImports = FileUtils.RES_DIR.resolve("extensions") + private final Path notRemoveIgnoredImports = FileUtils.RES_DIR.resolve("extensions") .resolve("document") .resolve("ast") .resolve("modify") .resolve("notRemoveIgnoredImports.bal"); - private Path notRemoveIgnoredImportsExpected = FileUtils.RES_DIR.resolve("extensions") + private final Path notRemoveIgnoredImportsExpected = FileUtils.RES_DIR.resolve("extensions") .resolve("document") .resolve("ast") .resolve("modify") .resolve("notRemoveIgnoredImportsExpected.bal"); - private Path notRemoveUsedImports = FileUtils.RES_DIR.resolve("extensions") + private final Path notRemoveUsedImports = FileUtils.RES_DIR.resolve("extensions") .resolve("document") .resolve("ast") .resolve("modify") .resolve("notRemoveUsedImports.bal"); - private Path notRemoveUsedImportsExpected = FileUtils.RES_DIR.resolve("extensions") + private final Path notRemoveUsedImportsExpected = FileUtils.RES_DIR.resolve("extensions") .resolve("document") .resolve("ast") .resolve("modify") diff --git a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/extensions/document/VisibleEndpointTest.java b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/extensions/document/VisibleEndpointTest.java index 22c92870549f..797c11ffc2a7 100644 --- a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/extensions/document/VisibleEndpointTest.java +++ b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/extensions/document/VisibleEndpointTest.java @@ -35,12 +35,12 @@ public class VisibleEndpointTest { private Endpoint serviceEndpoint; - private Path nestedVisibleEPsFile = FileUtils.RES_DIR.resolve("extensions") + private final Path nestedVisibleEPsFile = FileUtils.RES_DIR.resolve("extensions") .resolve("document") .resolve("sources") .resolve("nestedVisibleEndpoints.bal"); - private Path transactionVisibleEPsFile = FileUtils.RES_DIR.resolve("extensions") + private final Path transactionVisibleEPsFile = FileUtils.RES_DIR.resolve("extensions") .resolve("document") .resolve("sources") .resolve("visibleEndpointsInTransactions.bal"); diff --git a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/implementation/GotoImplementationTest.java b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/implementation/GotoImplementationTest.java index 3735c4b75bb8..1218c4d702bd 100644 --- a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/implementation/GotoImplementationTest.java +++ b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/implementation/GotoImplementationTest.java @@ -41,8 +41,8 @@ */ public class GotoImplementationTest { private Endpoint serviceEndpoint; - private String configRoot = "implementation" + CommonUtil.FILE_SEPARATOR + "expected"; - private static final Logger log = LoggerFactory.getLogger(GotoImplementationTest.class); + private static final String CONFIG_ROOT = "implementation" + CommonUtil.FILE_SEPARATOR + "expected"; + private static final Logger LOG = LoggerFactory.getLogger(GotoImplementationTest.class); @BeforeClass public void init() { @@ -54,7 +54,7 @@ public void testGotoImplementation(String configPath, String source) { Path sourcePath = FileUtils.RES_DIR.resolve(source); try { TestUtil.openDocument(serviceEndpoint, sourcePath); - JsonObject configJsonObject = FileUtils.fileContentAsObject(configRoot + CommonUtil.FILE_SEPARATOR + JsonObject configJsonObject = FileUtils.fileContentAsObject(CONFIG_ROOT + CommonUtil.FILE_SEPARATOR + configPath); JsonObject position = configJsonObject.getAsJsonObject("position"); Position cursor = new Position(position.get("line").getAsInt(), position.get("col").getAsInt()); @@ -73,7 +73,7 @@ public void testGotoImplementation(String configPath, String source) { @DataProvider(name = "goto-impl-data-provider") public Object[][] dataProvider() { - log.info("Test textDocument/implementation"); + LOG.info("Test textDocument/implementation"); String sourcePath1 = "implementation" + CommonUtil.FILE_SEPARATOR + "source" + CommonUtil.FILE_SEPARATOR + "gotoImplProject" + CommonUtil.FILE_SEPARATOR + "src" + CommonUtil.FILE_SEPARATOR + "pkg1" + CommonUtil.FILE_SEPARATOR + "main.bal"; diff --git a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/lspackageloader/LSPackageLoaderTest.java b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/lspackageloader/LSPackageLoaderTest.java index 33ee64c67167..dc57de36a228 100644 --- a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/lspackageloader/LSPackageLoaderTest.java +++ b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/lspackageloader/LSPackageLoaderTest.java @@ -51,7 +51,7 @@ public class LSPackageLoaderTest extends AbstractLSTest { private final Path testRoot = FileUtils.RES_DIR.resolve("lspackageloader"); private static final Map REMOTE_PROJECTS = Map.of("project3", "main.bal"); - private List remoteRepoPackages = new ArrayList<>(getRemotePackages()); + private final List remoteRepoPackages = new ArrayList<>(getRemotePackages()); @Test(dataProvider = "data-provider") public void test(String source) throws IOException, EventSyncException, WorkspaceDocumentException { diff --git a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/signature/AbstractSignatureHelpTest.java b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/signature/AbstractSignatureHelpTest.java index 8b472bcb8b82..bb3ad13572d7 100644 --- a/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/signature/AbstractSignatureHelpTest.java +++ b/language-server/modules/langserver-core/src/test/java/org/ballerinalang/langserver/signature/AbstractSignatureHelpTest.java @@ -45,13 +45,13 @@ */ public abstract class AbstractSignatureHelpTest { - private final String configDir = "config"; + private static final String CONFIG_DIR = "config"; private Endpoint serviceEndpoint; - private Path testRoot = new File(getClass().getClassLoader().getResource("signature").getFile()).toPath(); + private final Path testRoot = new File(getClass().getClassLoader().getResource("signature").getFile()).toPath(); - private static final Logger log = LoggerFactory.getLogger(AbstractSignatureHelpTest.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractSignatureHelpTest.class); @BeforeClass public void init() throws Exception { @@ -62,7 +62,7 @@ public void init() throws Exception { public void test(String config, String source) throws WorkspaceDocumentException, IOException, InterruptedException { String configJsonPath = - "signature" + File.separator + source + File.separator + configDir + File.separator + config; + "signature" + File.separator + source + File.separator + CONFIG_DIR + File.separator + config; JsonObject configJsonObject = FileUtils.fileContentAsObject(configJsonPath); JsonObject expected = configJsonObject.get("expected").getAsJsonObject(); Path sourcePath = testRoot.resolve(configJsonObject.get("source").getAsString()); @@ -104,7 +104,7 @@ protected Object[][] getConfigsList() { } List skippedTests = this.skipList(); try (Stream configPaths = Files.walk( - this.testRoot.resolve(this.getTestResourceDir()).resolve(this.configDir))) { + this.testRoot.resolve(this.getTestResourceDir()).resolve(this.CONFIG_DIR))) { return configPaths.filter(path -> { File file = path.toFile(); return file.isFile() && file.getName().endsWith(".json") diff --git a/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/BFunction.java b/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/BFunction.java index 613b7b4e60c5..f150c65834c1 100644 --- a/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/BFunction.java +++ b/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/BFunction.java @@ -36,7 +36,7 @@ public abstract class BFunction { private String functionName; private Class declaringClass; private List parameters = new LinkedList<>(); - private List throwables = new LinkedList<>(); + private final List throwables = new LinkedList<>(); private boolean isStatic = true; private String returnType; private String errorType = null; diff --git a/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JConstructor.java b/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JConstructor.java index 6f1b6003eee3..848d1f3cee53 100644 --- a/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JConstructor.java +++ b/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JConstructor.java @@ -38,20 +38,20 @@ */ public class JConstructor extends BFunction { - private Class parentClass; + private final Class parentClass; private String exceptionName; private String shortClassName; private String exceptionConstName; - private Constructor constructor; + private final Constructor constructor; private boolean returnError = false; private boolean hasException = false; // identifies if the Ballerina returns should have an error declared private boolean handleException = false; // identifies if the Java constructor throws an error private boolean javaArraysModule = false; - private List parameters = new ArrayList<>(); - private StringBuilder paramTypes = new StringBuilder(); - private Set importedPackages = new HashSet<>(); + private final List parameters = new ArrayList<>(); + private final StringBuilder paramTypes = new StringBuilder(); + private final Set importedPackages = new HashSet<>(); JConstructor(Constructor c, BindgenEnv env, JClass jClass, String constructorName) { super(BFunctionKind.CONSTRUCTOR, env); diff --git a/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JField.java b/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JField.java index ee5d76f81dc8..c093424a61bd 100644 --- a/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JField.java +++ b/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JField.java @@ -38,12 +38,12 @@ */ public class JField extends BFunction { - private String fieldName; - private String fieldType; + private final String fieldName; + private final String fieldType; private String fieldMethodName; private boolean isArray; - private boolean isStatic; + private final boolean isStatic; private boolean isString; private boolean isStringArray; private boolean isObject = true; @@ -51,7 +51,7 @@ public class JField extends BFunction { private boolean returnError = false; private boolean javaArraysModule = false; - private JParameter fieldObj; + private final JParameter fieldObj; JField(Field field, BFunction.BFunctionKind fieldKind, BindgenEnv env, JClass jClass) { super(fieldKind, env); diff --git a/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JMethod.java b/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JMethod.java index c3fd6d65479e..651da048f805 100644 --- a/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JMethod.java +++ b/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JMethod.java @@ -48,8 +48,8 @@ */ public class JMethod extends BFunction { - private BindgenEnv env; - private boolean isStatic; + private final BindgenEnv env; + private final boolean isStatic; private boolean hasReturn = false; private boolean returnError = false; private boolean objectReturn = false; @@ -59,17 +59,17 @@ public class JMethod extends BFunction { private boolean isStringReturn = false; private boolean isStringArrayReturn = false; private boolean javaArraysModule = false; - private boolean isOptionalReturnTypes; - private String parentPrefix; + private final boolean isOptionalReturnTypes; + private final String parentPrefix; - private Class parentClass; - private Method method; + private final Class parentClass; + private final Method method; private String methodName; - private String unescapedMethodName; + private final String unescapedMethodName; private String returnType; private String exceptionName; private String returnTypeJava; - private String javaMethodName; + private final String javaMethodName; private String exceptionConstName; private String returnComponentType; diff --git a/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JParameter.java b/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JParameter.java index aea2e83bfe0f..680ac2ce474d 100644 --- a/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JParameter.java +++ b/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/model/JParameter.java @@ -40,21 +40,21 @@ */ public class JParameter { - private BindgenEnv env; - private String type; - private String externalType; + private final BindgenEnv env; + private final String type; + private final String externalType; private String shortTypeName; private String componentType; private String fieldName; - private Class parentClass; - private Class parameterClass; + private final Class parentClass; + private final Class parameterClass; private Boolean isObj = false; private Boolean isString = false; private Boolean isObjArray = false; private Boolean isOptional = false; - private boolean modulesFlag; + private final boolean modulesFlag; private Boolean isStringArray = false; private Boolean isPrimitiveArray = false; diff --git a/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/utils/BindgenEnv.java b/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/utils/BindgenEnv.java index 1c03935b7f9f..30bf37655a7b 100644 --- a/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/utils/BindgenEnv.java +++ b/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/utils/BindgenEnv.java @@ -60,14 +60,14 @@ public class BindgenEnv { // Flag depicting whether the current class being generated is a direct class or a dependent class private boolean directJavaClass = true; - private Set classPaths = new HashSet<>(); - private Map aliases = new HashMap<>(); - private Set classListForLooping = new HashSet<>(); - private Set allJavaClasses = new HashSet<>(); - private Set exceptionList = new HashSet<>(); - private Map failedClassGens = new HashMap<>(); - private List failedMethodGens = new ArrayList<>(); - private Set superClasses = new HashSet<>(); + private final Set classPaths = new HashSet<>(); + private final Map aliases = new HashMap<>(); + private final Set classListForLooping = new HashSet<>(); + private final Set allJavaClasses = new HashSet<>(); + private final Set exceptionList = new HashSet<>(); + private final Map failedClassGens = new HashMap<>(); + private final List failedMethodGens = new ArrayList<>(); + private final Set superClasses = new HashSet<>(); public void setModulesFlag(boolean modulesFlag) { this.modulesFlag = modulesFlag; diff --git a/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/utils/BindgenMvnResolver.java b/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/utils/BindgenMvnResolver.java index e5fa19de9197..35e188aba407 100644 --- a/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/utils/BindgenMvnResolver.java +++ b/misc/ballerina-bindgen/src/main/java/org/ballerinalang/bindgen/utils/BindgenMvnResolver.java @@ -50,8 +50,8 @@ */ public class BindgenMvnResolver { - private PrintStream outStream; - private BindgenEnv env; + private final PrintStream outStream; + private final BindgenEnv env; public BindgenMvnResolver(PrintStream outStream, BindgenEnv env) { this.outStream = outStream; diff --git a/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/AbstractTestResource.java b/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/AbstractTestResource.java index 969c739a4b97..d296bcd23d8c 100644 --- a/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/AbstractTestResource.java +++ b/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/AbstractTestResource.java @@ -22,6 +22,7 @@ * * @since 2.0.0 */ +@SuppressWarnings("all") abstract class AbstractTestResource { AbstractTestResource() { diff --git a/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/BindgenCommandTest.java b/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/BindgenCommandTest.java index 730ff7b963bf..f7ee13050584 100644 --- a/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/BindgenCommandTest.java +++ b/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/BindgenCommandTest.java @@ -47,7 +47,7 @@ public class BindgenCommandTest extends BindgenCommandBaseTest { private Path testResources; - private String newLine = System.lineSeparator(); + private final String newLine = System.lineSeparator(); @Override @BeforeClass @@ -333,9 +333,9 @@ public void cleanup() throws IOException { static class Copy extends SimpleFileVisitor { - private Path fromPath; - private Path toPath; - private StandardCopyOption copyOption; + private final Path fromPath; + private final Path toPath; + private final StandardCopyOption copyOption; private Copy(Path fromPath, Path toPath, StandardCopyOption copyOption) { this.fromPath = fromPath; diff --git a/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/FieldsTestResource.java b/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/FieldsTestResource.java index 7a706ea35194..48b4739f85ff 100644 --- a/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/FieldsTestResource.java +++ b/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/FieldsTestResource.java @@ -32,6 +32,7 @@ * * @since 2.0.0 */ +@SuppressWarnings("all") public class FieldsTestResource implements InterfaceTestResource { // Instance primitive fields diff --git a/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/MavenSupportTest.java b/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/MavenSupportTest.java index 861e9685da8b..b5dfdf76058b 100644 --- a/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/MavenSupportTest.java +++ b/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/MavenSupportTest.java @@ -142,9 +142,9 @@ public void cleanup() throws IOException { static class Copy extends SimpleFileVisitor { - private Path fromPath; - private Path toPath; - private StandardCopyOption copyOption; + private final Path fromPath; + private final Path toPath; + private final StandardCopyOption copyOption; private Copy(Path fromPath, Path toPath, StandardCopyOption copyOption) { this.fromPath = fromPath; diff --git a/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/MethodsTestResource.java b/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/MethodsTestResource.java index a9e7a59361fe..16cf2f3a9ae5 100644 --- a/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/MethodsTestResource.java +++ b/misc/ballerina-bindgen/src/test/java/org/ballerinalang/bindgen/MethodsTestResource.java @@ -31,6 +31,7 @@ * * @since 2.0.0 */ +@SuppressWarnings("all") public class MethodsTestResource extends AbstractTestResource implements InterfaceTestResource { // Different instance method combinations diff --git a/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/AIDataMapperCodeActionUtil.java b/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/AIDataMapperCodeActionUtil.java index 616acdca1f52..e9311eab34fc 100644 --- a/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/AIDataMapperCodeActionUtil.java +++ b/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/AIDataMapperCodeActionUtil.java @@ -87,17 +87,17 @@ class AIDataMapperCodeActionUtil { private static final int MAXIMUM_CACHE_SIZE = 100; private static final int RIGHT_SYMBOL_INDEX = 1; private static final int LEFT_SYMBOL_INDEX = 0; - private Cache mappingCache = + private final Cache mappingCache = CacheBuilder.newBuilder().maximumSize(MAXIMUM_CACHE_SIZE).build(); - private HashMap isOptionalMap = new HashMap<>(); - private HashMap leftFieldMap = new HashMap<>(); - private HashMap responseFieldMap = new HashMap<>(); + private final HashMap isOptionalMap = new HashMap<>(); + private final HashMap leftFieldMap = new HashMap<>(); + private final HashMap responseFieldMap = new HashMap<>(); private HashMap restFieldMap = new HashMap<>(); private HashMap> spreadFieldMap = new HashMap<>(); - private HashMap spreadFieldResponseMap = new HashMap<>(); - private ArrayList leftReadOnlyFields = new ArrayList<>(); + private final HashMap spreadFieldResponseMap = new HashMap<>(); + private final ArrayList leftReadOnlyFields = new ArrayList<>(); private ArrayList rightSpecificFieldList = new ArrayList<>(); - private ArrayList optionalRightRecordFields = new ArrayList<>(); + private final ArrayList optionalRightRecordFields = new ArrayList<>(); private static final String SCHEMA = "schema"; private static final String ID = "id"; diff --git a/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/DataMapperNodeVisitor.java b/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/DataMapperNodeVisitor.java index f76c1a6587f9..63949411c07b 100644 --- a/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/DataMapperNodeVisitor.java +++ b/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/DataMapperNodeVisitor.java @@ -52,7 +52,7 @@ public class DataMapperNodeVisitor extends NodeVisitor { public final HashMap restFields; public final HashMap> spreadFields; public final ArrayList specificFieldList; - private String rhsSymbolName; + private final String rhsSymbolName; private SemanticModel model; public DataMapperNodeVisitor(String rhsSymbolName) { diff --git a/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/utils/HttpClientRequest.java b/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/utils/HttpClientRequest.java index ce11ee7706b3..6269a6922480 100644 --- a/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/utils/HttpClientRequest.java +++ b/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/utils/HttpClientRequest.java @@ -91,7 +91,7 @@ private static void setHeadersAndMethod(HttpURLConnection conn, Map defaultResponseBuilder = ((bufferedReader) -> { + private static final CheckedFunction DEFAULT_RESPONSE_BUILDER = ((bufferedReader) -> { String line; StringBuilder sb = new StringBuilder(); while ((line = bufferedReader.readLine()) != null) { diff --git a/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/utils/HttpResponse.java b/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/utils/HttpResponse.java index d1ae709b1ca8..4f04c1161ac0 100644 --- a/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/utils/HttpResponse.java +++ b/misc/ballerinalang-data-mapper/src/main/java/org/ballerinalang/datamapper/utils/HttpResponse.java @@ -19,8 +19,8 @@ * This class is a simple representation of an HTTP response. */ public class HttpResponse { - private String data; - private int responseCode; + private final String data; + private final int responseCode; /** * This method set data and response code of a HTTP request response. diff --git a/misc/ballerinalang-data-mapper/src/test/java/org/ballerinalang/datamapper/util/DataMapperTestUtils.java b/misc/ballerinalang-data-mapper/src/test/java/org/ballerinalang/datamapper/util/DataMapperTestUtils.java index 66d61b34af7a..b78f78730c67 100644 --- a/misc/ballerinalang-data-mapper/src/test/java/org/ballerinalang/datamapper/util/DataMapperTestUtils.java +++ b/misc/ballerinalang-data-mapper/src/test/java/org/ballerinalang/datamapper/util/DataMapperTestUtils.java @@ -43,10 +43,10 @@ */ public final class DataMapperTestUtils { - private static Path sourcesPath = new File(DataMapperTestUtils.class.getClassLoader().getResource("codeaction") - .getFile()).toPath(); - private static final LanguageServerContext serverContext = new LanguageServerContextImpl(); - private static final WorkspaceManager workspaceManager = new BallerinaWorkspaceManager(serverContext); + private static final Path SOURCES_PATH = new File(DataMapperTestUtils.class.getClassLoader() + .getResource("codeaction").getFile()).toPath(); + private static final LanguageServerContext SERVER_CONTEXT = new LanguageServerContextImpl(); + private static final WorkspaceManager WORKSPACE_MANAGER = new BallerinaWorkspaceManager(SERVER_CONTEXT); private DataMapperTestUtils() { } @@ -77,12 +77,12 @@ public static JsonObject getCodeActionResponse(String source, JsonObject configJ throws IOException, WorkspaceDocumentException { // Read expected results - Path sourcePath = sourcesPath.resolve("source").resolve(source); + Path sourcePath = SOURCES_PATH.resolve("source").resolve(source); TestUtil.openDocument(serviceEndpoint, sourcePath); // Filter diagnostics for the cursor position List diagnostics - = TestUtil.compileAndGetDiagnostics(sourcePath, workspaceManager, serverContext); + = TestUtil.compileAndGetDiagnostics(sourcePath, WORKSPACE_MANAGER, SERVER_CONTEXT); List diags = new ArrayList<>(CodeActionUtil.toDiagnostics(diagnostics)); Position pos = new Position(configJsonObject.get("line").getAsInt(), configJsonObject.get("character").getAsInt()); diff --git a/misc/diagram-util/src/main/java/org/ballerinalang/diagramutil/SyntaxTreeMapGenerator.java b/misc/diagram-util/src/main/java/org/ballerinalang/diagramutil/SyntaxTreeMapGenerator.java index b93ccda73a55..a6fa0c61c6b9 100644 --- a/misc/diagram-util/src/main/java/org/ballerinalang/diagramutil/SyntaxTreeMapGenerator.java +++ b/misc/diagram-util/src/main/java/org/ballerinalang/diagramutil/SyntaxTreeMapGenerator.java @@ -75,9 +75,9 @@ */ public class SyntaxTreeMapGenerator extends NodeTransformer { private SemanticModel semanticModel; - private List visibleEpsForEachBlock; - private List visibleEpsForModule; - private List visibleEpsForClass; + private final List visibleEpsForEachBlock; + private final List visibleEpsForModule; + private final List visibleEpsForClass; public SyntaxTreeMapGenerator(SemanticModel semanticModel) { diff --git a/misc/docerina/src/main/java/org/ballerinalang/docgen/docs/BallerinaDocGenerator.java b/misc/docerina/src/main/java/org/ballerinalang/docgen/docs/BallerinaDocGenerator.java index 7652fe3dfeba..2f2e873a667a 100644 --- a/misc/docerina/src/main/java/org/ballerinalang/docgen/docs/BallerinaDocGenerator.java +++ b/misc/docerina/src/main/java/org/ballerinalang/docgen/docs/BallerinaDocGenerator.java @@ -86,7 +86,7 @@ */ public final class BallerinaDocGenerator { - private static final Logger log = LoggerFactory.getLogger(BallerinaDocGenerator.class); + private static final Logger LOG = LoggerFactory.getLogger(BallerinaDocGenerator.class); private static PrintStream out = System.out; public static final String API_DOCS_JSON = "api-docs.json"; @@ -106,7 +106,7 @@ public final class BallerinaDocGenerator { private static final String CENTRAL_REGISTRY_PATH = "/registry"; private static final String CENTRAL_DOC_UI_PATH = "/docs/doc-ui"; - private static Gson gson = new GsonBuilder().registerTypeHierarchyAdapter(Path.class, new PathToJson()) + private static final Gson GSON = new GsonBuilder().registerTypeHierarchyAdapter(Path.class, new PathToJson()) .excludeFieldsWithoutExposeAnnotation().create(); private BallerinaDocGenerator() { @@ -122,7 +122,7 @@ public static void mergeApiDocs(Path apiDocsRoot) { // get all the files from a directory File[] orgFileList = directory.listFiles(); if (orgFileList == null) { - log.error(String.format("docerina: API documentation generation failed. Could not find any packages" + LOG.error(String.format("docerina: API documentation generation failed. Could not find any packages" + " in given path %s", apiDocsRoot)); return; } @@ -146,9 +146,9 @@ public static void mergeApiDocs(Path apiDocsRoot) { Path docJsonPath = Paths.get(versionFile.getAbsolutePath(), API_DOCS_JSON); if (docJsonPath.toFile().exists()) { try (BufferedReader br = Files.newBufferedReader(docJsonPath, StandardCharsets.UTF_8)) { - ApiDocsJson apiDocsJson = gson.fromJson(br, ApiDocsJson.class); + ApiDocsJson apiDocsJson = GSON.fromJson(br, ApiDocsJson.class); if (apiDocsJson.docsData.modules.isEmpty()) { - log.warn("No packages found at: " + docJsonPath.toString()); + LOG.warn("No packages found at: " + docJsonPath.toString()); continue; } apiDocsJson.docsData.modules.forEach(mod -> { @@ -156,7 +156,7 @@ public static void mergeApiDocs(Path apiDocsRoot) { mod.resources .addAll(getResourcePaths(Paths.get(orgFile.getAbsolutePath()))); } catch (IOException e) { - log.error(String.format("API documentation generation failed. Cause: %s" + LOG.error(String.format("API documentation generation failed. Cause: %s" , e.getMessage()), e); return; } @@ -178,7 +178,7 @@ public static void mergeApiDocs(Path apiDocsRoot) { } } catch (IOException e) { - log.error(String.format("API documentation generation failed. Cause: %s", + LOG.error(String.format("API documentation generation failed. Cause: %s", e.getMessage()), e); return; } @@ -192,21 +192,21 @@ public static void mergeApiDocs(Path apiDocsRoot) { writeAPIDocs(moduleLib, apiDocsRoot, true, false); // Create the central Ballerina library index JSON. - String stdIndexJson = gson.toJson(centralLib); + String stdIndexJson = GSON.toJson(centralLib); File stdIndexJsonFile = apiDocsRoot.resolve(CENTRAL_STDLIB_INDEX_JSON).toFile(); try (Writer writer = new OutputStreamWriter(new FileOutputStream(stdIndexJsonFile), StandardCharsets.UTF_8)) { writer.write(new String(stdIndexJson.getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8)); } catch (IOException e) { - log.error("Failed to create {} file.", CENTRAL_STDLIB_INDEX_JSON, e); + LOG.error("Failed to create {} file.", CENTRAL_STDLIB_INDEX_JSON, e); } // Create the central Ballerina library search JSON. - String stdSearchJson = gson.toJson(genSearchJson(moduleLib)); + String stdSearchJson = GSON.toJson(genSearchJson(moduleLib)); File stdSearchJsonFile = apiDocsRoot.resolve(CENTRAL_STDLIB_SEARCH_JSON).toFile(); try (Writer writer = new OutputStreamWriter(new FileOutputStream(stdSearchJsonFile), StandardCharsets.UTF_8)) { writer.write(new String(stdSearchJson.getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8)); } catch (IOException e) { - log.error("Failed to create {} file.", CENTRAL_STDLIB_SEARCH_JSON, e); + LOG.error("Failed to create {} file.", CENTRAL_STDLIB_SEARCH_JSON, e); } } @@ -236,14 +236,14 @@ public static void copyIcon(Project project, Path output, ModuleLibrary moduleLi byte[] iconByteArray = Files.readAllBytes(iconPath); Files.write(output, iconByteArray); } catch (IOException e) { - log.error("Failed to copy icon to the API docs.", e); + LOG.error("Failed to copy icon to the API docs.", e); } } } private static void writeAPIDocs(ModuleLibrary moduleLib, Path output, boolean isMerge, boolean excludeUI) { if (moduleLib.modules.isEmpty()) { - log.error("No modules found to create docs."); + LOG.error("No modules found to create docs."); return; } if (!isMerge && excludeUI) { @@ -315,14 +315,14 @@ private static void copyDocerinaUI(Path output) { try { FileUtils.copyDirectory(sourceDir, output.toFile()); } catch (IOException ex) { - log.error("Failed to copy the API doc UI", ex); + LOG.error("Failed to copy the API doc UI", ex); } } else { try { FileUtils.copyInputStreamToFile(BallerinaDocGenerator.class .getResourceAsStream("/doc-ui/index.html"), output.resolve("index.html").toFile()); } catch (IOException ex) { - log.error("Failed to copy the API doc UI", ex); + LOG.error("Failed to copy the API doc UI", ex); } } } @@ -371,12 +371,12 @@ private static void copyDocUIToProjectDir(Path output, Path zipFilePath) { outputStream.write(buffer, 0, length); } } catch (IOException e) { - log.error("Unable to write to the file" , e); + LOG.error("Unable to write to the file" , e); } } } } catch (IOException e) { - log.error("Error occurred when unzipping file", e); + LOG.error("Error occurred when unzipping file", e); } } @@ -390,7 +390,7 @@ private static void copyResources(List resources, Path output) { try { FileUtils.copyFileToDirectory(resourcePath.toFile(), resourcesDirFile); } catch (IOException e) { - log.error(String.format("docerina: failed to copy [resource] %s into [resources directory] " + LOG.error(String.format("docerina: failed to copy [resource] %s into [resources directory] " + "%s. Cause: %s", resourcePath.toString(), resourcesDirFile.toString(), e.getMessage()), e); } @@ -419,7 +419,7 @@ private static void genApiDocsJson(ModuleLibrary moduleLib, Path destination, bo try { Files.createDirectories(destination); } catch (IOException e) { - log.error("API documentation generation failed when creating directory:", e); + LOG.error("API documentation generation failed when creating directory:", e); } ApiDocsJson apiDocsJson = new ApiDocsJson(); @@ -432,22 +432,22 @@ private static void genApiDocsJson(ModuleLibrary moduleLib, Path destination, bo if (jsFile.exists()) { if (!jsFile.delete()) { - log.error("docerina: failed to delete {}", jsFile.toString()); + LOG.error("docerina: failed to delete {}", jsFile.toString()); } } if (jsonFile.exists()) { if (!jsonFile.delete()) { - log.error("docerina: failed to delete {}", jsonFile.toString()); + LOG.error("docerina: failed to delete {}", jsonFile.toString()); } } - String json = gson.toJson(apiDocsJson); + String json = GSON.toJson(apiDocsJson); if (!excludeUI) { try (Writer writer = new OutputStreamWriter(new FileOutputStream(jsFile), StandardCharsets.UTF_8)) { String js = "var apiDocsJson = " + json + ";"; writer.write(new String(js.getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8)); } catch (IOException e) { - log.error("Failed to create {} file.", API_DOCS_JS, e); + LOG.error("Failed to create {} file.", API_DOCS_JS, e); } } @@ -455,7 +455,7 @@ private static void genApiDocsJson(ModuleLibrary moduleLib, Path destination, bo StandardCharsets.UTF_8)) { writer.write(new String(json.getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8)); } catch (IOException e) { - log.error("Failed to create {} file.", API_DOCS_JSON, e); + LOG.error("Failed to create {} file.", API_DOCS_JSON, e); } } diff --git a/misc/formatter/modules/formatter-core/src/main/java/org/ballerinalang/formatter/core/options/ForceFormattingOptions.java b/misc/formatter/modules/formatter-core/src/main/java/org/ballerinalang/formatter/core/options/ForceFormattingOptions.java index 5fbdf285bd17..817b3fb454f8 100644 --- a/misc/formatter/modules/formatter-core/src/main/java/org/ballerinalang/formatter/core/options/ForceFormattingOptions.java +++ b/misc/formatter/modules/formatter-core/src/main/java/org/ballerinalang/formatter/core/options/ForceFormattingOptions.java @@ -23,7 +23,7 @@ * @since 2201.3.0 */ public class ForceFormattingOptions { - private boolean forceFormatRecordFields; + private final boolean forceFormatRecordFields; private ForceFormattingOptions(boolean forceFormatRecordFields) { this.forceFormatRecordFields = forceFormatRecordFields; diff --git a/misc/formatter/modules/formatter-core/src/main/java/org/ballerinalang/formatter/core/options/ImportFormattingOptions.java b/misc/formatter/modules/formatter-core/src/main/java/org/ballerinalang/formatter/core/options/ImportFormattingOptions.java index bf7f52900ad5..bb51e65a4775 100644 --- a/misc/formatter/modules/formatter-core/src/main/java/org/ballerinalang/formatter/core/options/ImportFormattingOptions.java +++ b/misc/formatter/modules/formatter-core/src/main/java/org/ballerinalang/formatter/core/options/ImportFormattingOptions.java @@ -28,9 +28,9 @@ */ public class ImportFormattingOptions { - private boolean groupImports; - private boolean sortImports; - private boolean removeUnusedImports; + private final boolean groupImports; + private final boolean sortImports; + private final boolean removeUnusedImports; private ImportFormattingOptions(boolean groupImports, boolean sortImports, boolean removeUnusedImports) { this.groupImports = groupImports; diff --git a/misc/formatter/modules/formatter-core/src/main/java/org/ballerinalang/formatter/core/options/IndentFormattingOptions.java b/misc/formatter/modules/formatter-core/src/main/java/org/ballerinalang/formatter/core/options/IndentFormattingOptions.java index f09017aaa04f..ea490e404805 100644 --- a/misc/formatter/modules/formatter-core/src/main/java/org/ballerinalang/formatter/core/options/IndentFormattingOptions.java +++ b/misc/formatter/modules/formatter-core/src/main/java/org/ballerinalang/formatter/core/options/IndentFormattingOptions.java @@ -63,7 +63,7 @@ public static class IndentFormattingOptionsBuilder { private static final String CONTINUATION_INDENT_SIZE = "continuationIndentSize"; private int indentSize = getDefaultInt(FormatSection.INDENT, INDENT_SIZE); private int continuationIndentSize = getDefaultInt(FormatSection.INDENT, CONTINUATION_INDENT_SIZE); - private String wsCharacter = " "; + private static final String WS_CHARACTER = " "; public IndentFormattingOptionsBuilder setIndentSize(int indentSize) { this.indentSize = indentSize; @@ -76,7 +76,7 @@ public IndentFormattingOptionsBuilder setContinuationIndentSize(int continuation } public IndentFormattingOptions build() { - return new IndentFormattingOptions(indentSize, continuationIndentSize, wsCharacter); + return new IndentFormattingOptions(indentSize, continuationIndentSize, WS_CHARACTER); } public IndentFormattingOptions build(Map configs) throws FormatterException { diff --git a/misc/formatter/modules/formatter-core/src/test/java/org/ballerinalang/formatter/core/FormatterTest.java b/misc/formatter/modules/formatter-core/src/test/java/org/ballerinalang/formatter/core/FormatterTest.java index 0a7a8bc25eda..e82553f5969c 100644 --- a/misc/formatter/modules/formatter-core/src/test/java/org/ballerinalang/formatter/core/FormatterTest.java +++ b/misc/formatter/modules/formatter-core/src/test/java/org/ballerinalang/formatter/core/FormatterTest.java @@ -49,7 +49,7 @@ public abstract class FormatterTest { // TODO: Add test cases for syntax error scenarios as well private final Path resourceDirectory = Paths.get("src").resolve("test").resolve("resources").toAbsolutePath(); - private Path buildDirectory = Paths.get("build").toAbsolutePath().normalize(); + private final Path buildDirectory = Paths.get("build").toAbsolutePath().normalize(); private static final String ASSERT_DIR = "assert"; private static final String SOURCE_DIR = "source"; diff --git a/misc/ls-extensions/modules/json-to-record-converter/src/main/java/io/ballerina/converters/JsonToRecordRequest.java b/misc/ls-extensions/modules/json-to-record-converter/src/main/java/io/ballerina/converters/JsonToRecordRequest.java index cbedaed7178a..9908ff4d11d0 100644 --- a/misc/ls-extensions/modules/json-to-record-converter/src/main/java/io/ballerina/converters/JsonToRecordRequest.java +++ b/misc/ls-extensions/modules/json-to-record-converter/src/main/java/io/ballerina/converters/JsonToRecordRequest.java @@ -31,7 +31,7 @@ public class JsonToRecordRequest { private boolean forceFormatRecordFields; private String filePathUri; - private boolean isNullAsOptional; + private final boolean isNullAsOptional; public JsonToRecordRequest(String jsonString, String recordName, boolean isRecordTypeDesc, boolean isClosed, boolean forceFormatRecordFields, String filePathUri, boolean isNullAsOptional) { diff --git a/misc/maven-resolver/src/main/java/org/ballerinalang/maven/MavenResolver.java b/misc/maven-resolver/src/main/java/org/ballerinalang/maven/MavenResolver.java index 3318d4f15199..260c8a1fb736 100644 --- a/misc/maven-resolver/src/main/java/org/ballerinalang/maven/MavenResolver.java +++ b/misc/maven-resolver/src/main/java/org/ballerinalang/maven/MavenResolver.java @@ -57,7 +57,7 @@ */ public class MavenResolver { org.ballerinalang.maven.Dependency rootNode = null; - private List repositories; + private final List repositories; RepositorySystem system; DefaultRepositorySystemSession session; diff --git a/misc/maven-resolver/src/main/java/org/ballerinalang/maven/TransferListener.java b/misc/maven-resolver/src/main/java/org/ballerinalang/maven/TransferListener.java index 63dde289f869..cb3e517c0795 100644 --- a/misc/maven-resolver/src/main/java/org/ballerinalang/maven/TransferListener.java +++ b/misc/maven-resolver/src/main/java/org/ballerinalang/maven/TransferListener.java @@ -32,10 +32,10 @@ */ public class TransferListener extends AbstractTransferListener { private static final String JAR_EXTENSION = "jar"; - private PrintStream out; - private Map downloads = new ConcurrentHashMap<>(); - private Map progressBars = new ConcurrentHashMap<>(); - private Map progresses = new ConcurrentHashMap<>(); + private final PrintStream out; + private final Map downloads = new ConcurrentHashMap<>(); + private final Map progressBars = new ConcurrentHashMap<>(); + private final Map progresses = new ConcurrentHashMap<>(); public TransferListener() { this(System.out); diff --git a/misc/maven-resolver/src/main/java/org/ballerinalang/maven/bala/client/TransferListenerForClient.java b/misc/maven-resolver/src/main/java/org/ballerinalang/maven/bala/client/TransferListenerForClient.java index 4095d9957371..ba38f558ecfc 100644 --- a/misc/maven-resolver/src/main/java/org/ballerinalang/maven/bala/client/TransferListenerForClient.java +++ b/misc/maven-resolver/src/main/java/org/ballerinalang/maven/bala/client/TransferListenerForClient.java @@ -30,10 +30,10 @@ */ public class TransferListenerForClient extends AbstractTransferListener { private static final String BALA_EXTENSION = "bala"; - private PrintStream out; - private Map downloads = new ConcurrentHashMap<>(); - private Map progressBars = new ConcurrentHashMap<>(); - private Map progresses = new ConcurrentHashMap<>(); + private final PrintStream out; + private final Map downloads = new ConcurrentHashMap<>(); + private final Map progressBars = new ConcurrentHashMap<>(); + private final Map progresses = new ConcurrentHashMap<>(); public TransferListenerForClient() { this(System.out); diff --git a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TestProcessor.java b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TestProcessor.java index 58415ce0e3d5..c5bb28854310 100644 --- a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TestProcessor.java +++ b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TestProcessor.java @@ -89,7 +89,7 @@ public class TestProcessor { private static final String FILE_NAME_PERIOD_SEPARATOR = "$$$"; private static final String MODULE_DELIMITER = "§"; - private TesterinaRegistry registry = TesterinaRegistry.getInstance(); + private final TesterinaRegistry registry = TesterinaRegistry.getInstance(); private JarResolver jarResolver; diff --git a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TesterinaRegistry.java b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TesterinaRegistry.java index 0c63f17a4b0c..667658f3dec3 100644 --- a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TesterinaRegistry.java +++ b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TesterinaRegistry.java @@ -36,20 +36,20 @@ public class TesterinaRegistry { private List groups = new ArrayList<>(); private boolean shouldIncludeGroups; private Map testSuites = new HashMap<>(); - private Map mockFunctionSourceMap = new HashMap<>(); + private final Map mockFunctionSourceMap = new HashMap<>(); // This is use to keep track of packages that are already inited. - private List initializedPackages = new ArrayList<>(); + private final List initializedPackages = new ArrayList<>(); /** * This is required to stop the annotation processor from processing annotations upon the compilation of the * service skeleton. This flag will make sure that @{@link TestProcessor}'s methods will skip the * annotation processing once the test suites are compiled. */ private boolean testSuitesCompiled; - private static TesterinaRegistry instance = new TesterinaRegistry(); + private static final TesterinaRegistry INSTANCE = new TesterinaRegistry(); public static TesterinaRegistry getInstance() { - return instance; + return INSTANCE; } public Map getTestSuites() { diff --git a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/io/StringUtils.java b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/io/StringUtils.java index 77a5bf9703bb..29e66bcf2916 100644 --- a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/io/StringUtils.java +++ b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/io/StringUtils.java @@ -51,19 +51,18 @@ public final class StringUtils { private static final String CHAR_PREFIX = "$"; - private static List specialCharacters = new ArrayList<>(Arrays.asList(",", "\\n", "\\r", "\\t", "\n", "\r", - "\t", - "\"", "\\", "!", "`")); - private static List bracketCharacters = new ArrayList<>(Arrays.asList("{", "}", "[", "]", "(", ")")); - private static List regexSpecialCharacters = new ArrayList<>(Arrays.asList("{", "}", "[", "]", "(", ")", - "+", "^", "|")); + private static final List SPECIAL_CHARACTERS = new ArrayList<>( + Arrays.asList(",", "\\n", "\\r", "\\t", "\n", "\r", "\t", "\"", "\\", "!", "`")); + private static final List BRACKET_CHARACTERS = new ArrayList<>(Arrays.asList("{", "}", "[", "]", "(", ")")); + private static final List REGEX_SPECIAL_CHARACTERS = new ArrayList<>( + Arrays.asList("{", "}", "[", "]", "(", ")", "+", "^", "|")); private StringUtils() { } public static Object matchWildcard(BString functionName, BString functionPattern) { - Object encodedFunctionPattern = encode(functionPattern.getValue(), regexSpecialCharacters); - Object encodedFunctionName = encode(functionName.getValue(), regexSpecialCharacters); + Object encodedFunctionPattern = encode(functionPattern.getValue(), REGEX_SPECIAL_CHARACTERS); + Object encodedFunctionName = encode(functionName.getValue(), REGEX_SPECIAL_CHARACTERS); if (encodedFunctionPattern instanceof BError) { return encodedFunctionPattern; @@ -85,13 +84,13 @@ public static Object matchWildcard(BString functionName, BString functionPattern public static Object escapeSpecialCharacters(BString key) { Object updatedKeyOrError = key.getValue(); if (!isBalanced((String) updatedKeyOrError)) { - updatedKeyOrError = encode((String) updatedKeyOrError, bracketCharacters); + updatedKeyOrError = encode((String) updatedKeyOrError, BRACKET_CHARACTERS); } if (updatedKeyOrError instanceof BError) { return updatedKeyOrError; } - updatedKeyOrError = encode((String) updatedKeyOrError, specialCharacters); + updatedKeyOrError = encode((String) updatedKeyOrError, SPECIAL_CHARACTERS); if (updatedKeyOrError instanceof BError) { return updatedKeyOrError; diff --git a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/GenericMockObjectValue.java b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/GenericMockObjectValue.java index 9410493360e5..72b2ab463162 100644 --- a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/GenericMockObjectValue.java +++ b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/GenericMockObjectValue.java @@ -47,10 +47,10 @@ */ public class GenericMockObjectValue implements ObjectValue { - private ObjectValue mockObj; + private final ObjectValue mockObj; - private ObjectType type; - private BTypedesc typedesc; + private final ObjectType type; + private final BTypedesc typedesc; public GenericMockObjectValue(ObjectType type, ObjectValue mockObj) { this.type = type; diff --git a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/MockRegistry.java b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/MockRegistry.java index 7de2c7ab5f7d..791409b87a6c 100644 --- a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/MockRegistry.java +++ b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/mock/MockRegistry.java @@ -30,13 +30,13 @@ public class MockRegistry { public static final String ANY = "__ANY__"; - private static MockRegistry instance = new MockRegistry(); + private static final MockRegistry INSTANCE = new MockRegistry(); public static MockRegistry getInstance() { - return instance; + return INSTANCE; } - private Map casesMap = new HashMap<>(); - private Map memberFuncHitsMap = new HashMap<>(); + private final Map casesMap = new HashMap<>(); + private final Map memberFuncHitsMap = new HashMap<>(); /** * Register a case for object mocking when a sequence of return value is provided. diff --git a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/ModuleCoverage.java b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/ModuleCoverage.java index b641a9b93986..3c06b4bcdcca 100644 --- a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/ModuleCoverage.java +++ b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/ModuleCoverage.java @@ -34,7 +34,7 @@ public class ModuleCoverage { private int coveredLines; private int missedLines; private float coveragePercentage; - private List sourceFiles = new ArrayList<>(); + private final List sourceFiles = new ArrayList<>(); /** * Adds the code snippet from the source file highlighted with covered and missed lines. @@ -211,9 +211,9 @@ public Optional> getEmptyLinesList(String sourceFileName) { * Inner class for the SourceFile in Json. */ private static class SourceFile { - private String name; - private List coveredLines; - private List missedLines; + private final String name; + private final List coveredLines; + private final List missedLines; private List emptyLines; private float coveragePercentage; private String sourceCode; diff --git a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/ModuleStatus.java b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/ModuleStatus.java index 97f76b25fe72..ee38479109a5 100644 --- a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/ModuleStatus.java +++ b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/ModuleStatus.java @@ -31,7 +31,7 @@ public class ModuleStatus { private int passed; private int failed; private int skipped; - private List tests = new ArrayList<>(); + private final List tests = new ArrayList<>(); private static ModuleStatus instance = new ModuleStatus(); @@ -84,8 +84,8 @@ public int getTotalTests() { * Inner class for individual Test object. */ private static class Test { - private String name; - private Status status; + private final String name; + private final Status status; private String failureMessage = ""; public Test(String name, Status status, String failureMessage) { diff --git a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/NormalizedCoverageClass.java b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/NormalizedCoverageClass.java index 39848b1efdee..ed431f902bfe 100644 --- a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/NormalizedCoverageClass.java +++ b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/NormalizedCoverageClass.java @@ -33,9 +33,9 @@ */ public class NormalizedCoverageClass implements IClassCoverage { private final IClassCoverage oldClassCoverage; - private String normalizedPackageName; - private String normalizedClassName; - private Collection updatedMethods = new ArrayList<>(); + private final String normalizedPackageName; + private final String normalizedClassName; + private final Collection updatedMethods = new ArrayList<>(); public NormalizedCoverageClass(IClassCoverage oldClassCoverage, String normalizedPackageName, String normalizedClassName) { diff --git a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/PartialCoverageModifiedSourceFile.java b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/PartialCoverageModifiedSourceFile.java index 95d7eac498b6..d78110346a2e 100644 --- a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/PartialCoverageModifiedSourceFile.java +++ b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/PartialCoverageModifiedSourceFile.java @@ -33,7 +33,7 @@ public class PartialCoverageModifiedSourceFile implements ISourceFileCoverage { private final ISourceFileCoverage oldSourceFile; private final List modifiedLines; - private String normalizedPackageName; + private final String normalizedPackageName; public PartialCoverageModifiedSourceFile(ISourceFileCoverage oldSourcefile, List modifiedLines, String normalizedPackageName) { diff --git a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TestGroup.java b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TestGroup.java index f7add8c1dc2e..ddb15a1701af 100644 --- a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TestGroup.java +++ b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TestGroup.java @@ -30,8 +30,8 @@ public class TestGroup { private int testCount; private int executedCount; - private List beforeGroupsFunctions; - private Map afterGroupsFunctions; + private final List beforeGroupsFunctions; + private final Map afterGroupsFunctions; public TestGroup() { this.testCount = 0; diff --git a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TestSuite.java b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TestSuite.java index 89e9c0463ef6..63a2e7eae5e9 100644 --- a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TestSuite.java +++ b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TestSuite.java @@ -37,8 +37,8 @@ public class TestSuite { private String version; private String packageName; private String moduleName; - private String packageId; - private String testPackageId; + private final String packageId; + private final String testPackageId; private String executeFilePath; private String initFunctionName; @@ -52,14 +52,14 @@ public class TestSuite { private String sourceRootPath; private String sourceFileName; - private Map testUtilityFunctions = new HashMap<>(); - private List beforeSuiteFunctionNames = new ArrayList<>(); - private Map afterSuiteFunctionNames = new TreeMap<>(); - private List beforeEachFunctionNames = new ArrayList<>(); - private List afterEachFunctionNames = new ArrayList<>(); + private final Map testUtilityFunctions = new HashMap<>(); + private final List beforeSuiteFunctionNames = new ArrayList<>(); + private final Map afterSuiteFunctionNames = new TreeMap<>(); + private final List beforeEachFunctionNames = new ArrayList<>(); + private final List afterEachFunctionNames = new ArrayList<>(); private List tests = new ArrayList<>(); - private Map groups = new TreeMap<>(); - private List testExecutionDependencies = new ArrayList<>(); + private final Map groups = new TreeMap<>(); + private final List testExecutionDependencies = new ArrayList<>(); private boolean isReportRequired; private boolean isSingleDDTExecution; diff --git a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TesterinaReport.java b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TesterinaReport.java index 9a7a4adfa518..befb763defee 100644 --- a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TesterinaReport.java +++ b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TesterinaReport.java @@ -31,8 +31,8 @@ */ public class TesterinaReport { - private PrintStream outStream; - private Map testReportOfPackage = new HashMap<>(); + private final PrintStream outStream; + private final Map testReportOfPackage = new HashMap<>(); private boolean failure; private boolean isReportRequired; diff --git a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TesterinaResult.java b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TesterinaResult.java index bbf8d52d98c1..8e7deae9b183 100644 --- a/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TesterinaResult.java +++ b/misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/TesterinaResult.java @@ -22,10 +22,10 @@ * {@link TesterinaResult} represents the result of the Testerina test. */ public class TesterinaResult { - private String testFunctionName; - private boolean isPassed; - private boolean isSkipped; - private String assertFailureMessage; + private final String testFunctionName; + private final boolean isPassed; + private final boolean isSkipped; + private final String assertFailureMessage; public TesterinaResult(String testFunctionName, boolean isPassed, boolean isSkipped, String assertFailureMessage) { this.testFunctionName = testFunctionName; diff --git a/misc/toml-parser/src/main/java/io/ballerina/toml/api/Toml.java b/misc/toml-parser/src/main/java/io/ballerina/toml/api/Toml.java index ac4d8eebb2bf..119311d0ddc5 100644 --- a/misc/toml-parser/src/main/java/io/ballerina/toml/api/Toml.java +++ b/misc/toml-parser/src/main/java/io/ballerina/toml/api/Toml.java @@ -54,7 +54,7 @@ */ public class Toml { - private TomlTableNode rootNode; + private final TomlTableNode rootNode; /** * Creates new Root TOML Node from AST. diff --git a/misc/toml-parser/src/main/java/io/ballerina/toml/internal/parser/InputReader.java b/misc/toml-parser/src/main/java/io/ballerina/toml/internal/parser/InputReader.java index 07dd8189ebfd..3bab9dc32970 100644 --- a/misc/toml-parser/src/main/java/io/ballerina/toml/internal/parser/InputReader.java +++ b/misc/toml-parser/src/main/java/io/ballerina/toml/internal/parser/InputReader.java @@ -33,8 +33,8 @@ public class InputReader { private static final int BUFFER_SIZE = 10; - private CharacterBuffer charsAhead = new CharacterBuffer(BUFFER_SIZE); - private Reader reader; + private final CharacterBuffer charsAhead = new CharacterBuffer(BUFFER_SIZE); + private final Reader reader; private int currentChar; InputReader(InputStream inputStream) { diff --git a/misc/toml-parser/src/main/java/io/ballerina/toml/internal/parser/TokenReader.java b/misc/toml-parser/src/main/java/io/ballerina/toml/internal/parser/TokenReader.java index d4f3af6583c1..93f030849351 100644 --- a/misc/toml-parser/src/main/java/io/ballerina/toml/internal/parser/TokenReader.java +++ b/misc/toml-parser/src/main/java/io/ballerina/toml/internal/parser/TokenReader.java @@ -29,8 +29,8 @@ public class TokenReader extends AbstractTokenReader { private static final int BUFFER_SIZE = 20; - private AbstractLexer lexer; - private TokenBuffer tokensAhead = new TokenBuffer(BUFFER_SIZE); + private final AbstractLexer lexer; + private final TokenBuffer tokensAhead = new TokenBuffer(BUFFER_SIZE); private STToken currentToken = null; TokenReader(AbstractLexer lexer) { diff --git a/misc/toml-parser/src/main/java/io/ballerina/toml/internal/parser/tree/STNodeDiagnostic.java b/misc/toml-parser/src/main/java/io/ballerina/toml/internal/parser/tree/STNodeDiagnostic.java index 2a2d351d0e17..ff04b64cf173 100644 --- a/misc/toml-parser/src/main/java/io/ballerina/toml/internal/parser/tree/STNodeDiagnostic.java +++ b/misc/toml-parser/src/main/java/io/ballerina/toml/internal/parser/tree/STNodeDiagnostic.java @@ -25,8 +25,8 @@ * @since 2.0.0 */ public class STNodeDiagnostic { - private DiagnosticCode diagnosticCode; - private Object[] args; + private final DiagnosticCode diagnosticCode; + private final Object[] args; STNodeDiagnostic(DiagnosticCode diagnosticCode, Object... args) { this.diagnosticCode = diagnosticCode; diff --git a/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/ast/TomlTransformer.java b/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/ast/TomlTransformer.java index 76b33e7890b1..0a4fc46c7203 100644 --- a/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/ast/TomlTransformer.java +++ b/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/ast/TomlTransformer.java @@ -61,7 +61,7 @@ */ public class TomlTransformer extends NodeTransformer { - private DiagnosticLog dlog; + private final DiagnosticLog dlog; public TomlTransformer() { this.dlog = DiagnosticLog.getInstance(); diff --git a/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/LangLibFunctionTest.java b/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/LangLibFunctionTest.java index a53f787555b1..3c11f0e21199 100644 --- a/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/LangLibFunctionTest.java +++ b/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/LangLibFunctionTest.java @@ -77,7 +77,7 @@ */ public class LangLibFunctionTest { - private static List valueLangLib = List.of("clone", "cloneReadOnly", "cloneWithType", + private static final List VALUE_LANG_LIB = List.of("clone", "cloneReadOnly", "cloneWithType", "isReadOnly", "toString", "toBalString", "toJson", "toJsonString", "fromJsonString", "fromJsonFloatString", "fromJsonDecimalString", "fromJsonWithType", "fromJsonStringWithType", "mergeJson"); diff --git a/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/SymbolBIRTest.java b/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/SymbolBIRTest.java index 3dcc761049cc..92fdd37f800b 100644 --- a/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/SymbolBIRTest.java +++ b/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/SymbolBIRTest.java @@ -364,8 +364,8 @@ private List createSymbolInfoList(Object[][] infoArr) { } static class SymbolInfo { - private String name; - private SymbolKind kind; + private final String name; + private final SymbolKind kind; SymbolInfo(String name, SymbolKind kind) { this.name = name; diff --git a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BCompileUtil.java b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BCompileUtil.java index 89cb62d24209..5014b004c5d4 100644 --- a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BCompileUtil.java +++ b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BCompileUtil.java @@ -54,10 +54,11 @@ */ public final class BCompileUtil { - private static final Path testSourcesDirectory = Paths.get("src/test/resources").toAbsolutePath().normalize(); - private static final Path testBuildDirectory = Paths.get("build").toAbsolutePath().normalize(); + private static final Path TEST_SOURCES_DIRECTORY = Paths.get("src/test/resources").toAbsolutePath() + .normalize(); + private static final Path TEST_BUILD_DIRECTORY = Paths.get("build").toAbsolutePath().normalize(); - private static final Logger logger = LoggerFactory.getLogger(BCompileUtil.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BCompileUtil.class); private BCompileUtil() {} @@ -69,7 +70,7 @@ public static Project loadProject(String sourceFilePath) { public static Project loadProject(String sourceFilePath, BuildOptions buildOptions) { Path sourcePath = Paths.get(sourceFilePath); String sourceFileName = sourcePath.getFileName().toString(); - Path sourceRoot = testSourcesDirectory.resolve(sourcePath.getParent()); + Path sourceRoot = TEST_SOURCES_DIRECTORY.resolve(sourcePath.getParent()); Path projectPath = Paths.get(sourceRoot.toString(), sourceFileName); @@ -152,7 +153,7 @@ public static CompileResult compileWithoutInitInvocation(String sourceFilePath) } public static CompileResult compileAndCacheBala(String sourceFilePath) { - return compileAndCacheBala(sourceFilePath, testBuildDirectory.resolve(DIST_CACHE_DIRECTORY)); + return compileAndCacheBala(sourceFilePath, TEST_BUILD_DIRECTORY.resolve(DIST_CACHE_DIRECTORY)); } public static CompileResult compileAndCacheBala(String sourceFilePath, Path repoPath) { @@ -163,7 +164,7 @@ public static CompileResult compileAndCacheBala(String sourceFilePath, Path repo ProjectEnvironmentBuilder projectEnvironmentBuilder) { Path sourcePath = Paths.get(sourceFilePath); String sourceFileName = sourcePath.getFileName().toString(); - Path sourceRoot = testSourcesDirectory.resolve(sourcePath.getParent()); + Path sourceRoot = TEST_SOURCES_DIRECTORY.resolve(sourcePath.getParent()); Path projectPath = Paths.get(sourceRoot.toString(), sourceFileName); return compileAndCacheBala(projectPath, repoPath, projectEnvironmentBuilder); @@ -210,7 +211,7 @@ public static CompileResult compileAndCacheBala(Path projectPath, Path repoPath, private static JBallerinaBackend jBallerinaBackend(Package currentPackage) { PackageCompilation packageCompilation = currentPackage.getCompilation(); if (packageCompilation.diagnosticResult().errorCount() > 0) { - logger.error("compilation failed with errors: " + currentPackage.project().sourceRoot()); + LOGGER.error("compilation failed with errors: " + currentPackage.project().sourceRoot()); } return JBallerinaBackend.from(packageCompilation, JvmTarget.JAVA_17); } @@ -228,7 +229,7 @@ public static void copyBalaToDistRepository(Path srcPath, String org, String pkgName, String version) throws IOException { - Path targetPath = balaCachePath(org, pkgName, version, testBuildDirectory.resolve(DIST_CACHE_DIRECTORY)) + Path targetPath = balaCachePath(org, pkgName, version, TEST_BUILD_DIRECTORY.resolve(DIST_CACHE_DIRECTORY)) .resolve("any"); if (Files.isDirectory(targetPath)) { ProjectUtils.deleteDirectory(targetPath); @@ -280,7 +281,7 @@ private static Path balaCachePath(String org, return balaDirPath; } catch (IOException e) { throw new RuntimeException("error while creating the bala distribution cache directory at " + - testBuildDirectory, e); + TEST_BUILD_DIRECTORY, e); } } @@ -294,7 +295,7 @@ private TestCompilationCache(Project project, Path cacheDirPath) { } private static TestCompilationCache from(Project project) { - Path testCompilationCachePath = testBuildDirectory.resolve(DIST_CACHE_DIRECTORY); + Path testCompilationCachePath = TEST_BUILD_DIRECTORY.resolve(DIST_CACHE_DIRECTORY); return new TestCompilationCache(project, testCompilationCachePath); } } @@ -304,8 +305,8 @@ private static TestCompilationCache from(Project project) { */ public static class BIRCompileResult { - private BIRNode.BIRPackage expectedBIR; - private byte[] actualBIRBinary; + private final BIRNode.BIRPackage expectedBIR; + private final byte[] actualBIRBinary; BIRCompileResult(BIRNode.BIRPackage expectedBIR, byte[] actualBIRBinary) { this.expectedBIR = expectedBIR; diff --git a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/agent/BallerinaServerAgent.java b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/agent/BallerinaServerAgent.java index f6cc39bbdb40..135f02229265 100644 --- a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/agent/BallerinaServerAgent.java +++ b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/agent/BallerinaServerAgent.java @@ -38,7 +38,7 @@ */ public final class BallerinaServerAgent { - private static PrintStream outStream = System.err; + private static final PrintStream OUT_STREAM = System.err; /** * Argument name for exist status. @@ -88,9 +88,9 @@ private BallerinaServerAgent() { * @param instrumentation instance for any instrumentation purposes */ public static void premain(String args, Instrumentation instrumentation) { - outStream.println("*******************************************************"); - outStream.println("Initializing Ballerina server agent with arguments - " + args); - outStream.println("*******************************************************"); + OUT_STREAM.println("*******************************************************"); + OUT_STREAM.println("Initializing Ballerina server agent with arguments - " + args); + OUT_STREAM.println("*******************************************************"); Map inputArgs = decodeAgentArgs(args); @@ -100,7 +100,7 @@ public static void premain(String args, Instrumentation instrumentation) { agentHost = getValue(AGENT_HOST, DEFAULT_AGENT_HOST, inputArgs); agentPort = (int) getValue(AGENT_PORT, DEFAULT_AGENT_PORT, inputArgs); - outStream.println("timeout - " + timeout + " exitStatus - " + exitStatus + OUT_STREAM.println("timeout - " + timeout + " exitStatus - " + exitStatus + " killStatus - " + killStatus + " host - " + agentHost + " port - " + agentPort); if (agentPort == -1) { @@ -126,7 +126,7 @@ public byte[] transform(ClassLoader loader, String className, Class classBein cc.detach(); return byteCode; } catch (Throwable ex) { - outStream.println("Error injecting the start agent code to the server, error - " + OUT_STREAM.println("Error injecting the start agent code to the server, error - " + ex.getMessage()); } } @@ -142,13 +142,13 @@ public byte[] transform(ClassLoader loader, String className, Class classBein * Start the agent server for managing the server. */ public static void startAgentServer() { - outStream.println("Starting Ballerina agent on host - " + agentHost + ", port - " + agentPort); + OUT_STREAM.println("Starting Ballerina agent on host - " + agentHost + ", port - " + agentPort); new Thread(() -> { try { WebServer ws = new WebServer(agentHost, agentPort); // Post endpoint to check the status TODO we may be able to remove this - ws.post("/status", () -> outStream.println("status check")); + ws.post("/status", () -> OUT_STREAM.println("status check")); // Post endpoint to shutdown the server ws.post("/shutdown", BallerinaServerAgent::shutdownServer); @@ -159,14 +159,14 @@ public static void startAgentServer() { // Start the server ws.start(); } catch (Throwable e) { - outStream.println("Error initializing agent server, error - " + e.getMessage()); + OUT_STREAM.println("Error initializing agent server, error - " + e.getMessage()); } }).start(); - outStream.println("Ballerina agent started on host - " + agentHost + ", port - " + agentPort); + OUT_STREAM.println("Ballerina agent started on host - " + agentHost + ", port - " + agentPort); } private static void shutdownServer() { - outStream.println("Shutting down Ballerina server with agent port - " + agentPort); + OUT_STREAM.println("Shutting down Ballerina server with agent port - " + agentPort); new Thread(() -> Runtime.getRuntime().exit(exitStatus)).start(); if (timeout <= 0) { @@ -192,7 +192,7 @@ private static void shutdownServer() { } private static void killServer() { - outStream.println("Killing Ballerina server with agent port - " + agentPort); + OUT_STREAM.println("Killing Ballerina server with agent port - " + agentPort); Thread killThread = new Thread(() -> Runtime.getRuntime().halt(killStatus)); killThread.setDaemon(true); killThread.start(); diff --git a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/context/BMainInstance.java b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/context/BMainInstance.java index 03247beb2e04..67922b8469d9 100644 --- a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/context/BMainInstance.java +++ b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/context/BMainInstance.java @@ -46,14 +46,14 @@ * @since 0.982.0 */ public class BMainInstance implements BMain { - private static final Logger log = LoggerFactory.getLogger(BMainInstance.class); + private static final Logger LOG = LoggerFactory.getLogger(BMainInstance.class); private static final String JAVA_OPTS = "JAVA_OPTS"; private String agentArgs = ""; - private BalServer balServer; + private final BalServer balServer; private static class StreamGobbler extends Thread { - private InputStream inputStream; - private PrintStream printStream; + private final InputStream inputStream; + private final PrintStream printStream; public StreamGobbler(InputStream inputStream, PrintStream printStream) { this.inputStream = inputStream; diff --git a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/context/BServerInstance.java b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/context/BServerInstance.java index 78629188d2f9..2369443141ff 100644 --- a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/context/BServerInstance.java +++ b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/context/BServerInstance.java @@ -46,25 +46,25 @@ * @since 0.982.0 */ public class BServerInstance implements BServer { - private static final Logger log = LoggerFactory.getLogger(BServerInstance.class); + private static final Logger LOG = LoggerFactory.getLogger(BServerInstance.class); private static final String JAVA_OPTS = "JAVA_OPTS"; - private static final String agentHost = "localhost"; - private BalServer balServer; + private static final String AGENT_HOST = "localhost"; + private final BalServer balServer; private int agentPort; private String agentArgs; private boolean agentsAdded = false; private Process process; private ServerLogReader serverInfoLogReader; private ServerLogReader serverErrorLogReader; - private Set tmpInfoLeechers = ConcurrentHashMap.newKeySet(); - private Set tmpErrorLeechers = ConcurrentHashMap.newKeySet(); + private final Set tmpInfoLeechers = ConcurrentHashMap.newKeySet(); + private final Set tmpErrorLeechers = ConcurrentHashMap.newKeySet(); private int[] requiredPorts; - private static InetAddress address; + private static final InetAddress ADDRESS; static { try { - address = InetAddress.getByName(agentHost); + ADDRESS = InetAddress.getByName(AGENT_HOST); } catch (UnknownHostException e) { throw new RuntimeException(e); } @@ -93,7 +93,7 @@ private void configureAgentArgs() throws BallerinaTestException { throw new BallerinaTestException("Cannot start server, Ballerina agent not provided"); } - agentArgs = "-javaagent:" + balAgent + "=host=" + agentHost + ",port=" + agentPort + agentArgs = "-javaagent:" + balAgent + "=host=" + AGENT_HOST + ",port=" + agentPort + ",exitStatus=1,timeout=15000,killStatus=5 "; // add jacoco agent @@ -226,7 +226,7 @@ public void startServer(String sourceRoot, String packagePath, String[] buildArg */ @Override public void shutdownServer() throws BallerinaTestException { - log.info("Stopping server.."); + LOG.info("Stopping server.."); Map headers = new HashMap<>(); headers.put("Content-Type", "text/plain"); try { @@ -236,7 +236,7 @@ public void shutdownServer() throws BallerinaTestException { throw new BallerinaTestException("Error shutting down the server, invalid response - " + response.getData()); } - cleanupServer(address); + cleanupServer(ADDRESS); } catch (IOException e) { throw new BallerinaTestException("Error shutting down the server, error - " + e.getMessage(), e); } @@ -249,7 +249,7 @@ public void shutdownServer() throws BallerinaTestException { */ @Override public void killServer() throws BallerinaTestException { - log.info("Stopping server.."); + LOG.info("Stopping server.."); Map headers = new HashMap<>(); headers.put("Content-Type", "text/plain"); try { @@ -259,7 +259,7 @@ public void killServer() throws BallerinaTestException { throw new BallerinaTestException("Error killing the server, invalid response - " + response.getData()); } - cleanupServer(address); + cleanupServer(ADDRESS); } catch (IOException e) { throw new BallerinaTestException("Error shutting down the server, error - " + e.getMessage(), e); } @@ -268,7 +268,7 @@ public void killServer() throws BallerinaTestException { private void cleanupServer(InetAddress address) { //wait until port to close Utils.waitForPortsToClose(requiredPorts, 30000, address); - log.info("Server Stopped Successfully"); + LOG.info("Server Stopped Successfully"); } private synchronized void addJavaAgents(Map envProperties) { @@ -482,9 +482,9 @@ private void executeJarFile(String jarPath, String[] args, Map e this.requiredPorts = ArrayUtils.addAll(this.requiredPorts, agentPort); //Check whether agent port is available. - Utils.checkPortsAvailability(this.requiredPorts, address); + Utils.checkPortsAvailability(this.requiredPorts, ADDRESS); - log.info("Starting Ballerina server.."); + LOG.info("Starting Ballerina server.."); List runCmdSet = new ArrayList<>(); runCmdSet.add("java"); @@ -513,11 +513,11 @@ private void executeJarFile(String jarPath, String[] args, Map e serverErrorLogReader = new ServerLogReader("errorStream", process.getErrorStream()); tmpErrorLeechers.forEach(leecher -> serverErrorLogReader.addLeecher(leecher)); serverErrorLogReader.start(); - log.info("Waiting for port " + agentPort + " to open"); + LOG.info("Waiting for port " + agentPort + " to open"); long timeout = 1000L * 60 * 10; //TODO: Need to reduce the timeout after build time improvements - Utils.waitForPortsToOpen(new int[]{agentPort}, timeout, false, address); - log.info("Server Started Successfully."); + Utils.waitForPortsToOpen(new int[]{agentPort}, timeout, false, ADDRESS); + LOG.info("Server Started Successfully."); } catch (IOException e) { throw new BallerinaTestException("Error starting services", e); } diff --git a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/context/ServerLogReader.java b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/context/ServerLogReader.java index dab90f45dbfd..1251aeadba3e 100644 --- a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/context/ServerLogReader.java +++ b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/context/ServerLogReader.java @@ -36,11 +36,11 @@ public class ServerLogReader implements Runnable { private static final String STREAM_TYPE_IN = "inputStream"; private static final String STREAM_TYPE_ERROR = "errorStream"; private final Logger log = LoggerFactory.getLogger(ServerLogReader.class); - private String streamType; - private InputStream inputStream; + private final String streamType; + private final InputStream inputStream; private volatile boolean running = true; - private Set leechers = ConcurrentHashMap.newKeySet(); + private final Set leechers = ConcurrentHashMap.newKeySet(); /** * Initialize the reader with reader name and stream to read. diff --git a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/listener/JBallerinaTestInitializer.java b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/listener/JBallerinaTestInitializer.java index c6daa26479f4..8bc3bc3512b3 100644 --- a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/listener/JBallerinaTestInitializer.java +++ b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/listener/JBallerinaTestInitializer.java @@ -33,13 +33,13 @@ */ public class JBallerinaTestInitializer implements ITestListener { - private static Logger log = LoggerFactory.getLogger(JBallerinaTestInitializer.class); + private static final Logger LOG = LoggerFactory.getLogger(JBallerinaTestInitializer.class); @Override public void onStart(ITestContext context) { String property = context.getCurrentXmlTest().getParameter(ENABLE_JBALLERINA_TESTS); if (Boolean.parseBoolean(property)) { - log.info("JBallerina tests initialized..."); + LOG.info("JBallerina tests initialized..."); System.setProperty(ENABLE_JBALLERINA_TESTS, "true"); } } @@ -48,7 +48,7 @@ public void onStart(ITestContext context) { public void onFinish(ITestContext context) { String property = context.getCurrentXmlTest().getParameter(ENABLE_JBALLERINA_TESTS); if (Boolean.parseBoolean(property)) { - log.info("JBallerina tests disabled..."); + LOG.info("JBallerina tests disabled..."); System.clearProperty(ENABLE_JBALLERINA_TESTS); } } diff --git a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/util/HttpClientRequest.java b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/util/HttpClientRequest.java index 284895672721..f0597dc37222 100644 --- a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/util/HttpClientRequest.java +++ b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/util/HttpClientRequest.java @@ -185,19 +185,19 @@ public static HttpResponse doHead(String requestUrl, Map headers private static HttpResponse executeRequestWithoutRequestBody(String method, String requestUrl, Map headers) throws IOException { return executeRequestWithoutRequestBody(method, requestUrl, headers, DEFAULT_READ_TIMEOUT, - defaultResponseBuilder); + DEFAULT_RESPONSE_BUILDER); } private static HttpResponse executeRequestWithoutRequestBody(String method, String requestUrl, Map headers, boolean throwError) throws IOException { return executeRequestWithoutRequestBody(method, requestUrl, headers, DEFAULT_READ_TIMEOUT, - defaultResponseBuilder, throwError); + DEFAULT_RESPONSE_BUILDER, throwError); } private static HttpResponse executeRequestAndPreserveNewline(String method, String requestUrl, Map headers) throws IOException { return executeRequestWithoutRequestBody(method, requestUrl, headers, DEFAULT_READ_TIMEOUT, - preserveNewLineResponseBuilder); + PRESERVE_NEW_LINE_RESPONSE_BUILDER); } private static HttpResponse executeRequestWithoutRequestBody(String method, String requestUrl, @@ -270,7 +270,7 @@ private static void setHeadersAndMethod(HttpURLConnection conn, Map defaultResponseBuilder = ((bufferedReader) -> { + private static final CheckedFunction DEFAULT_RESPONSE_BUILDER = ((bufferedReader) -> { String line; StringBuilder sb = new StringBuilder(); while ((line = bufferedReader.readLine()) != null) { @@ -323,15 +323,16 @@ private static HttpResponse buildResponse(HttpURLConnection conn, return sb.toString(); }); - private static CheckedFunction preserveNewLineResponseBuilder = ((bufferedReader) -> { - String line; - StringBuilder sb = new StringBuilder(); - while ((line = bufferedReader.readLine()) != null) { - sb.append(line); - sb.append(System.lineSeparator()); - } - return sb.toString(); - }); + private static final CheckedFunction PRESERVE_NEW_LINE_RESPONSE_BUILDER = + ((bufferedReader) -> { + String line; + StringBuilder sb = new StringBuilder(); + while ((line = bufferedReader.readLine()) != null) { + sb.append(line); + sb.append(System.lineSeparator()); + } + return sb.toString(); + }); /** * This is a custom functional interface which allows defining a method that throws an IOException. diff --git a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/util/client/ResponseHandler.java b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/util/client/ResponseHandler.java index 30bf1ba6fa44..23e6d6c5cf0e 100644 --- a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/util/client/ResponseHandler.java +++ b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/util/client/ResponseHandler.java @@ -32,7 +32,7 @@ public class ResponseHandler extends ChannelInboundHandlerAdapter { private CountDownLatch latch; private CountDownLatch waitForConnectionClosureLatch; - private LinkedList fullHttpResponses = new LinkedList<>(); + private final LinkedList fullHttpResponses = new LinkedList<>(); private String channelEventMsg; @Override diff --git a/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/data/streaming/TableDataStreamingTestCase.java b/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/data/streaming/TableDataStreamingTestCase.java index 10a681ddc3a9..ca83358446fb 100644 --- a/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/data/streaming/TableDataStreamingTestCase.java +++ b/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/data/streaming/TableDataStreamingTestCase.java @@ -77,8 +77,8 @@ private void setUpDatabase() throws SQLException { @Test(groups = {"brokenOnXMLChange"}, description = "Tests streaming a large amount of data from a table, converted to XML") public void testStreamingLargeXml() throws Exception { - HttpResponse response = HttpClientRequest - .doGet(serverInstance.getServiceURLHttp(servicePort, "dataService/getXmlData"), 60000, responseBuilder); + HttpResponse response = HttpClientRequest.doGet( + serverInstance.getServiceURLHttp(servicePort, "dataService/getXmlData"), 60000, RESPONSE_BUILDER); Assert.assertNotNull(response); Assert.assertEquals(response.getResponseCode(), 200); Assert.assertEquals(Integer.parseInt(response.getData()), 211288909); @@ -88,7 +88,7 @@ public void testStreamingLargeXml() throws Exception { public void testStreamingLargeJson() throws Exception { HttpResponse response = HttpClientRequest .doGet(serverInstance.getServiceURLHttp(servicePort, "dataService/getJsonData"), 60000, - responseBuilder); + RESPONSE_BUILDER); Assert.assertNotNull(response); Assert.assertEquals(response.getResponseCode(), 200); Assert.assertEquals(Integer.parseInt(response.getData()), 208788890); @@ -98,7 +98,7 @@ public void testStreamingLargeJson() throws Exception { public void testStreamingLargeJsonAppended() throws Exception { HttpResponse response = HttpClientRequest .doGet(serverInstance.getServiceURLHttp(servicePort, "dataService/getJsonDataAppended"), 60000, - responseBuilder); + RESPONSE_BUILDER); Assert.assertNotNull(response); Assert.assertEquals(response.getResponseCode(), 200); Assert.assertEquals(Integer.parseInt(response.getData()), 208788925); @@ -108,7 +108,7 @@ public void testStreamingLargeJsonAppended() throws Exception { public void getJosnViaSetJsonPayloadMethod() throws Exception { HttpResponse response = HttpClientRequest .doGet(serverInstance.getServiceURLHttp(servicePort, "dataService/getJosnViaSetJsonPayloadMethod"), - 60000, responseBuilder); + 60000, RESPONSE_BUILDER); Assert.assertNotNull(response); Assert.assertEquals(response.getResponseCode(), 200); Assert.assertEquals(Integer.parseInt(response.getData()), 208788890); @@ -118,7 +118,7 @@ public void getJosnViaSetJsonPayloadMethod() throws Exception { public void getJosnViaGetJsonStringMethod() throws Exception { HttpResponse response = HttpClientRequest .doGet(serverInstance.getServiceURLHttp(servicePort, "dataService/getJosnViaGetJsonStringMethod"), - 60000, responseBuilder); + 60000, RESPONSE_BUILDER); Assert.assertNotNull(response); Assert.assertEquals(response.getResponseCode(), 200); Assert.assertEquals(Integer.parseInt(response.getData()), 20840); @@ -127,7 +127,7 @@ public void getJosnViaGetJsonStringMethod() throws Exception { @Test(groups = {"brokenOnXMLChange"}, description = "Tests the outbound throttling scenario with a slow client") public void testStreamingLargeXMLWithSlowClient() throws Exception { HttpResponse response = HttpClientRequest.doGet( - serverInstance.getServiceURLHttp(servicePort, "dataService/getXmlData"), 60000, slowResponseBuilder); + serverInstance.getServiceURLHttp(servicePort, "dataService/getXmlData"), 60000, SLOW_RESPONSE_BUILDER); Assert.assertNotNull(response); Assert.assertEquals(response.getResponseCode(), 200); Assert.assertEquals(Integer.parseInt(response.getData()), 211288909); @@ -136,7 +136,7 @@ public void testStreamingLargeXMLWithSlowClient() throws Exception { @Test(description = "Tests the outbound throttling scenario with a slow client") public void testStreamingLargeJsonWithSlowClient() throws Exception { HttpResponse response = HttpClientRequest.doGet( - serverInstance.getServiceURLHttp(servicePort, "dataService/getJsonData"), 60000, slowResponseBuilder); + serverInstance.getServiceURLHttp(servicePort, "dataService/getJsonData"), 60000, SLOW_RESPONSE_BUILDER); Assert.assertNotNull(response); Assert.assertEquals(response.getResponseCode(), 200); Assert.assertEquals(Integer.parseInt(response.getData()), 208788890); @@ -174,18 +174,19 @@ private static void insertDummyData(String jdbcUrl, String userName, String pass /** * This reads a buffered stream and returns the number of characters. */ - private static HttpClientRequest.CheckedFunction responseBuilder = ((bufferedReader) -> { - int count = 0; - while (bufferedReader.read() != -1) { - count++; - } - return String.valueOf(count); - }); + private static final HttpClientRequest.CheckedFunction RESPONSE_BUILDER = + (bufferedReader -> { + int count = 0; + while (bufferedReader.read() != -1) { + count++; + } + return String.valueOf(count); + }); /** * This reads a buffered stream and returns the number of characters. */ - private static HttpClientRequest.CheckedFunction slowResponseBuilder = + private static final HttpClientRequest.CheckedFunction SLOW_RESPONSE_BUILDER = ((bufferedReader) -> { int count = 0; while (bufferedReader.read() != -1) { diff --git a/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/util/SQLDBUtils.java b/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/util/SQLDBUtils.java index 6fc74658293c..9e039079730c 100644 --- a/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/util/SQLDBUtils.java +++ b/tests/jballerina-integration-test/src/test/java/org/ballerinalang/test/util/SQLDBUtils.java @@ -124,7 +124,7 @@ private static void initDatabase(String jdbcURL, String username, String passwor * This class represents a file based database used for testing data clients. */ public static class FileBasedTestDatabase extends TestDatabase { - private String dbDirectory; + private final String dbDirectory; public FileBasedTestDatabase(DBType dbType, String databaseScript, String dbDirectory, String dbName) { this.dbDirectory = dbDirectory; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java index d3984351e0f8..bfbc84ec5c68 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/runtime/api/tests/Errors.java @@ -45,7 +45,7 @@ */ public final class Errors { - private static Module errorModule = new Module("testorg", "errors.error_utils", "1"); + private static final Module ERROR_MODULE = new Module("testorg", "errors.error_utils", "1"); private Errors() { } @@ -53,7 +53,7 @@ private Errors() { public static BError getError(BString errorName) { BMap errorDetails = ValueCreator.createMapValue(); errorDetails.put(StringUtils.fromString("cause"), StringUtils.fromString("Person age cannot be negative")); - return ErrorCreator.createError(errorModule, errorName.getValue(), StringUtils.fromString("Invalid age"), + return ErrorCreator.createError(ERROR_MODULE, errorName.getValue(), StringUtils.fromString("Invalid age"), ErrorCreator.createError(StringUtils.fromString("Invalid data given")), errorDetails); } @@ -74,7 +74,7 @@ public static BArray getTypeIds(BError error) { public static BError getDistinctErrorNegative(BString errorName) { BMap errorDetails = ValueCreator.createMapValue(); errorDetails.put(StringUtils.fromString("detail"), "detail error message"); - return ErrorCreator.createError(errorModule, errorName.getValue(), StringUtils.fromString("msg"), + return ErrorCreator.createError(ERROR_MODULE, errorName.getValue(), StringUtils.fromString("msg"), null, errorDetails); } @@ -95,11 +95,11 @@ public static BError getErrorNegative2(BString msg) { String typeIdName = "RuntimeError"; BMap errorDetails = ValueCreator.createMapValue(); errorDetails.put(StringUtils.fromString("detail"), "this is runtime failure"); - return ErrorCreator.createDistinctError(typeIdName, errorModule, msg, errorDetails); + return ErrorCreator.createDistinctError(typeIdName, ERROR_MODULE, msg, errorDetails); } public static BError getDistinctErrorWithNullDetailNegative(BString errorName) { - return ErrorCreator.createError(errorModule, errorName.getValue(), StringUtils.fromString("msg"), + return ErrorCreator.createError(ERROR_MODULE, errorName.getValue(), StringUtils.fromString("msg"), null, null); } @@ -115,12 +115,12 @@ public static BError getErrorWithNullDetailNegative(BString msg) { public static BError getDistinctErrorWithEmptyDetailNegative2(BString msg) { String typeIdName = "RuntimeError"; BMap errorDetails = new MapValueImpl<>(PredefinedTypes.TYPE_ERROR_DETAIL); - return ErrorCreator.createDistinctError(typeIdName, errorModule, msg, errorDetails); + return ErrorCreator.createDistinctError(typeIdName, ERROR_MODULE, msg, errorDetails); } public static BError getDistinctErrorWithNullDetailNegative2(BString msg) { String typeIdName = "RuntimeError"; - return ErrorCreator.createDistinctError(typeIdName, errorModule, msg, (BMap) null); + return ErrorCreator.createDistinctError(typeIdName, ERROR_MODULE, msg, (BMap) null); } public static BError getErrorWithEmptyDetailNegative2(BString msg) { diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/ClassWithDefaultConstructor.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/ClassWithDefaultConstructor.java index 3c4320bd9d63..f68d8d188a31 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/ClassWithDefaultConstructor.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/ClassWithDefaultConstructor.java @@ -26,7 +26,7 @@ * @since 1.0.0 */ public class ClassWithDefaultConstructor extends AbstractClass { - private int a; + private final int a; public ClassWithDefaultConstructor() { a = 11; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/ClassWithTwoParamConstructor.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/ClassWithTwoParamConstructor.java index 93943c42d65e..9954dfdda12c 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/ClassWithTwoParamConstructor.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/ClassWithTwoParamConstructor.java @@ -23,7 +23,7 @@ * @since 1.0.0 */ public class ClassWithTwoParamConstructor { - private String str; + private final String str; public ClassWithTwoParamConstructor(String prefix, String name) { this.str = prefix + name; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/StaticMethods.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/StaticMethods.java index dbbc467a1bd0..54ecd6d1d139 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/StaticMethods.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/nativeimpl/jvm/tests/StaticMethods.java @@ -81,12 +81,12 @@ */ public final class StaticMethods { - private static final BArrayType intArrayType = new BArrayType(PredefinedTypes.TYPE_INT); - private static final BArrayType jsonArrayType = new BArrayType(PredefinedTypes.TYPE_JSON); - private static final BTupleType tupleType = new BTupleType( + private static final BArrayType INT_ARRAY_TYPE = new BArrayType(PredefinedTypes.TYPE_INT); + private static final BArrayType JSON_ARRAY_TYPE = new BArrayType(PredefinedTypes.TYPE_JSON); + private static final BTupleType TUPLE_TYPE = new BTupleType( Arrays.asList(PredefinedTypes.TYPE_INT, PredefinedTypes.TYPE_FLOAT, PredefinedTypes.TYPE_STRING, PredefinedTypes.TYPE_INT, PredefinedTypes.TYPE_STRING)); - private static Module errorModule = new Module("testorg", "distinct_error.errors", "1"); + private static final Module ERROR_MODULE = new Module("testorg", "distinct_error.errors", "1"); private StaticMethods() { } @@ -132,7 +132,7 @@ public static BDecimal getNullInsteadOfBDecimal() { // This scenario is for map value to be passed to interop and return array value. public static ArrayValue getArrayValueFromMap(BString key, MapValue mapValue) { - ArrayValue arrayValue = (ArrayValue) ValueCreator.createArrayValue(intArrayType); + ArrayValue arrayValue = (ArrayValue) ValueCreator.createArrayValue(INT_ARRAY_TYPE); arrayValue.add(0, 1); long fromMap = (long) mapValue.get(key); arrayValue.add(1, fromMap); @@ -276,7 +276,7 @@ public static int[] acceptIntReturnIntArrayThrowsCheckedException(long a) throws public static ArrayValue getArrayValueFromMapWhichThrowsCheckedException(BString key, MapValue mapValue) throws JavaInteropTestCheckedException { - ArrayValue arrayValue = (ArrayValue) ValueCreator.createArrayValue(intArrayType); + ArrayValue arrayValue = (ArrayValue) ValueCreator.createArrayValue(INT_ARRAY_TYPE); arrayValue.add(0, 1); long fromMap = mapValue.getIntValue(key); arrayValue.add(1, fromMap); @@ -320,7 +320,7 @@ public static Object returnDistinctErrorUnionWhichThrowsCheckedException(int fla } else if (flag == 1) { BMap errorDetails = ValueCreator.createMapValue(); errorDetails.put(StringUtils.fromString("detail"), "detail error message"); - return ErrorCreator.createError(errorModule, errorName.getValue(), StringUtils.fromString("error msg"), + return ErrorCreator.createError(ERROR_MODULE, errorName.getValue(), StringUtils.fromString("error msg"), null, errorDetails); } else { return ErrorCreator.createError(StringUtils.fromString("Invalid data given")); @@ -423,7 +423,7 @@ public static String returnStringForBUnionFromJava() { public static TupleValueImpl mockedNativeFuncWithOptionalParams(long a, double b, String c, long d, String e) { - TupleValueImpl tuple = (TupleValueImpl) ValueCreator.createTupleValue(tupleType); + TupleValueImpl tuple = (TupleValueImpl) ValueCreator.createTupleValue(TUPLE_TYPE); tuple.add(0, Long.valueOf(a)); tuple.add(1, Double.valueOf(b)); tuple.add(2, (Object) c); @@ -450,7 +450,7 @@ public static MapValueImpl getJsonObject() { } public static ArrayValue getJsonArray() { - ArrayValue array = (ArrayValue) ValueCreator.createArrayValue(jsonArrayType); + ArrayValue array = (ArrayValue) ValueCreator.createArrayValue(JSON_ARRAY_TYPE); array.add(0, (Object) StringUtils.fromString("John")); return array; } diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/lambda/IterableOperationsTests.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/lambda/IterableOperationsTests.java index adb454daf7c5..7a34bd628fd6 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/lambda/IterableOperationsTests.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/lambda/IterableOperationsTests.java @@ -44,7 +44,7 @@ public class IterableOperationsTests { private CompileResult basic, negative; - private static BString[] values = BStringUtils.getBStringArray(new String[]{"Hello", "World..!", "I", "am", + private static final BString[] VALUES = BStringUtils.getBStringArray(new String[]{"Hello", "World..!", "I", "am", "Ballerina.!!!"}); @BeforeClass @@ -179,25 +179,25 @@ public void testFloat2() { @Test public void testBasicArray1() { - BArray sarray = ValueCreator.createArrayValue(values); + BArray sarray = ValueCreator.createArrayValue(VALUES); Object returns = BRunUtil.invoke(basic, "testBasicArray1", new Object[]{sarray}); Assert.assertNotNull(returns); Assert.assertNotNull(returns); StringBuilder sb = new StringBuilder(); - Arrays.stream(values).forEach(s -> sb.append(s.getValue().toUpperCase(Locale.getDefault())).append(":"). + Arrays.stream(VALUES).forEach(s -> sb.append(s.getValue().toUpperCase(Locale.getDefault())).append(":"). append(s.getValue().toLowerCase(Locale.getDefault())).append(" ")); Assert.assertEquals(returns.toString(), sb.toString().trim()); } @Test public void testBasicArray2() { - BArray sarray = ValueCreator.createArrayValue(values); + BArray sarray = ValueCreator.createArrayValue(VALUES); Object returns = BRunUtil.invoke(basic, "testBasicArray2", new Object[]{sarray}); Assert.assertNotNull(returns); Assert.assertNotNull(returns); StringBuilder sb = new StringBuilder(); - for (int i = 0; i < values.length; i++) { - sb.append(i).append(values[i]).append(" "); + for (int i = 0; i < VALUES.length; i++) { + sb.append(i).append(VALUES[i]).append(" "); } Assert.assertEquals(returns.toString(), sb.toString().trim()); } diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/lambda/IterableOperationsWithVarMutabilityTests.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/lambda/IterableOperationsWithVarMutabilityTests.java index 1bdf6609c64b..a67abdf9f7cf 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/lambda/IterableOperationsWithVarMutabilityTests.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/lambda/IterableOperationsWithVarMutabilityTests.java @@ -40,7 +40,7 @@ public class IterableOperationsWithVarMutabilityTests { private CompileResult compileResult; - private static BString[] values = BStringUtils.getBStringArray(new String[]{"Hello", "World..!", "I", "am", + private static final BString[] VALUES = BStringUtils.getBStringArray(new String[]{"Hello", "World..!", "I", "am", "Ballerina.!!!"}); @BeforeClass @@ -66,21 +66,21 @@ public void testFloat1() { @Test public void testBasicArray1() { - BArray array = ValueCreator.createArrayValue(values); + BArray array = ValueCreator.createArrayValue(VALUES); Object returns = BRunUtil.invoke(compileResult, "testBasicArray1", new Object[]{array}); StringBuilder sb = new StringBuilder(); - Arrays.stream(values).forEach(s -> sb.append(s.getValue().toUpperCase(Locale.getDefault())).append(":"). + Arrays.stream(VALUES).forEach(s -> sb.append(s.getValue().toUpperCase(Locale.getDefault())).append(":"). append(s.getValue().toLowerCase(Locale.getDefault())).append(" ")); Assert.assertEquals(returns.toString(), sb.toString().trim()); } @Test public void testBasicArray2() { - BArray array = ValueCreator.createArrayValue(values); + BArray array = ValueCreator.createArrayValue(VALUES); Object returns = BRunUtil.invoke(compileResult, "testBasicArray2", new Object[]{array}); StringBuilder sb = new StringBuilder(); - for (int i = 0; i < values.length; i++) { - sb.append(i).append(values[i]).append(" "); + for (int i = 0; i < VALUES.length; i++) { + sb.append(i).append(VALUES[i]).append(" "); } Assert.assertEquals(returns.toString(), sb.toString().trim()); } diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/object/ObjectConstructorTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/object/ObjectConstructorTest.java index 5cd589e97a39..43681554b62d 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/object/ObjectConstructorTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/expressions/object/ObjectConstructorTest.java @@ -36,14 +36,14 @@ public class ObjectConstructorTest { private CompileResult compiledConstructedObjects, closures, annotations, multiLevelClosures; - private static String path = "test-src/expressions/object/"; + private static final String PATH = "test-src/expressions/object/"; @BeforeClass public void setup() { - compiledConstructedObjects = BCompileUtil.compile(path + "object_constructor_expression.bal"); - closures = BCompileUtil.compile(path + "object_closures.bal"); - multiLevelClosures = BCompileUtil.compile(path + "object_multilevel_closures.bal"); - annotations = BCompileUtil.compile(path + "object_closures_annotations.bal"); + compiledConstructedObjects = BCompileUtil.compile(PATH + "object_constructor_expression.bal"); + closures = BCompileUtil.compile(PATH + "object_closures.bal"); + multiLevelClosures = BCompileUtil.compile(PATH + "object_multilevel_closures.bal"); + annotations = BCompileUtil.compile(PATH + "object_closures_annotations.bal"); } @DataProvider(name = "ObjectCtorTestFunctionList") diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/primitivetypes/UnionsWithPrimitiveTypesTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/primitivetypes/UnionsWithPrimitiveTypesTest.java index 268ed5ddad04..cc5997ceb812 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/primitivetypes/UnionsWithPrimitiveTypesTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/javainterop/primitivetypes/UnionsWithPrimitiveTypesTest.java @@ -39,14 +39,14 @@ */ public class UnionsWithPrimitiveTypesTest { private CompileResult result; - private boolean aBoolean = true; - private byte aByte = 8; - private short aShort = 567; - private char aChar = 'A'; - private int anInt = 345866; - private long aLong = 42343242; - private float aFloat = 234242423.0f; - private double aDouble = 8781233342322.324234; + private final boolean aBoolean = true; + private final byte aByte = 8; + private final short aShort = 567; + private final char aChar = 'A'; + private final int anInt = 345866; + private final long aLong = 42343242; + private final float aFloat = 234242423.0f; + private final double aDouble = 8781233342322.324234; @BeforeClass public void setup() { diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/ForeachArrayTests.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/ForeachArrayTests.java index f2a64a2a5b3e..07ce943cc081 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/ForeachArrayTests.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/ForeachArrayTests.java @@ -39,11 +39,11 @@ public class ForeachArrayTests { private CompileResult program; - private int[] iValues = {1, -3, 5, -30, 4, 11, 25, 10}; - private double[] fValues = {1.123, -3.35244, 5.23, -30.45, 4.32, 11.56, 25.967, 10.345}; - private String[] sValues = {"foo", "bar", "bax", "baz"}; - private boolean[] bValues = {true, false, false, false, true, false}; - private String[] tValues = {"name=bob,age=10", "name=tom,age=16"}; + private final int[] iValues = {1, -3, 5, -30, 4, 11, 25, 10}; + private final double[] fValues = {1.123, -3.35244, 5.23, -30.45, 4.32, 11.56, 25.967, 10.345}; + private final String[] sValues = {"foo", "bar", "bax", "baz"}; + private final boolean[] bValues = {true, false, false, false, true, false}; + private final String[] tValues = {"name=bob,age=10", "name=tom,age=16"}; @BeforeClass public void setup() { diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/ForeachMapTests.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/ForeachMapTests.java index 533d0596640f..041123e03334 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/ForeachMapTests.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/jvm/ForeachMapTests.java @@ -37,7 +37,7 @@ public class ForeachMapTests { private CompileResult program; - private Map values = new LinkedHashMap<>(); + private final Map values = new LinkedHashMap<>(); @BeforeClass public void setup() { diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/lock/TestThreadPool.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/lock/TestThreadPool.java index 4843e8e05f44..3a82b2cdae2b 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/lock/TestThreadPool.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/lock/TestThreadPool.java @@ -29,15 +29,15 @@ */ public class TestThreadPool { - private static TestThreadPool instance = new TestThreadPool(); + private static final TestThreadPool INSTANCE = new TestThreadPool(); - private ExecutorService executorService = Executors.newFixedThreadPool(500); + private final ExecutorService executorService = Executors.newFixedThreadPool(500); private TestThreadPool() { } public static TestThreadPool getInstance() { - return instance; + return INSTANCE; } public ExecutorService getExecutor() { diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArraySizeDefinitionTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArraySizeDefinitionTest.java index 76ad47c36529..bda44136b923 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArraySizeDefinitionTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArraySizeDefinitionTest.java @@ -31,11 +31,11 @@ */ public class ArraySizeDefinitionTest { - private String sizeMismatchError = "size mismatch in closed array. expected '2', but found '3'"; - private String invalidReferenceExpressionError = "invalid reference expression " + + private final String sizeMismatchError = "size mismatch in closed array. expected '2', but found '3'"; + private final String invalidReferenceExpressionError = "invalid reference expression " + "'intLength' as array size: expected a constant reference expression"; - private String incompatibleTypeError = "incompatible types: expected 'int', found 'string'"; - private String undefinedSymbolError = "undefined symbol 'length'"; + private final String incompatibleTypeError = "incompatible types: expected 'int', found 'string'"; + private final String undefinedSymbolError = "undefined symbol 'length'"; private static final String INVALID_ARRAY_LENGTH_ERROR = "invalid array length: array length should be a non-negative integer"; private static final String SIZE_LIMIT_ERROR = "array length greater that '2147483637' not yet supported"; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/MatchStmtErrorMatchPatternTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/MatchStmtErrorMatchPatternTest.java index 76c213e173bd..7b54ba7b6458 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/MatchStmtErrorMatchPatternTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/MatchStmtErrorMatchPatternTest.java @@ -32,9 +32,9 @@ */ public class MatchStmtErrorMatchPatternTest { private CompileResult result, restPatternResult, resultNegative, moduleResult; - private String patternNotMatched = "pattern will not be matched"; - private String unreachablePattern = "unreachable pattern"; - private String unnecessaryCondition = "unnecessary condition: expression will always evaluate to 'true'"; + private final String patternNotMatched = "pattern will not be matched"; + private final String unreachablePattern = "unreachable pattern"; + private final String unnecessaryCondition = "unnecessary condition: expression will always evaluate to 'true'"; @BeforeClass public void setup() { diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/MatchStmtListMatchPatternTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/MatchStmtListMatchPatternTest.java index ab880a5e2707..47538f951143 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/MatchStmtListMatchPatternTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/MatchStmtListMatchPatternTest.java @@ -34,9 +34,9 @@ public class MatchStmtListMatchPatternTest { private CompileResult result, resultNegative, resultSemanticsNegative, restMatchPatternResult; - private String patternNotMatched = "pattern will not be matched"; - private String unreachablePattern = "unreachable pattern"; - private String unreachableCode = "unreachable code"; + private final String patternNotMatched = "pattern will not be matched"; + private final String unreachablePattern = "unreachable pattern"; + private final String unreachableCode = "unreachable code"; @BeforeClass public void setup() { diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/MatchStmtMappingMatchPatternNegativeTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/MatchStmtMappingMatchPatternNegativeTest.java index 45a95bf479fa..bdef6b92ebf2 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/MatchStmtMappingMatchPatternNegativeTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/MatchStmtMappingMatchPatternNegativeTest.java @@ -31,8 +31,8 @@ public class MatchStmtMappingMatchPatternNegativeTest { private CompileResult negativeResult, warningResult; - private String patternNotMatched = "pattern will not be matched"; - private String unreachablePattern = "unreachable pattern"; + private final String patternNotMatched = "pattern will not be matched"; + private final String unreachablePattern = "unreachable pattern"; @BeforeClass public void setup() { diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/varbindingpatternmatchpattern/ErrorBindingPatternTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/varbindingpatternmatchpattern/ErrorBindingPatternTest.java index 368b171c1913..3db326fd959c 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/varbindingpatternmatchpattern/ErrorBindingPatternTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/varbindingpatternmatchpattern/ErrorBindingPatternTest.java @@ -32,7 +32,7 @@ */ public class ErrorBindingPatternTest { private CompileResult result, restPatternResult, resultNegative; - private String patternNotMatched = "pattern will not be matched"; + private final String patternNotMatched = "pattern will not be matched"; @BeforeClass public void setup() { diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/varbindingpatternmatchpattern/ListBindingPatternTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/varbindingpatternmatchpattern/ListBindingPatternTest.java index fd94b9891d55..9f8ca8f624d4 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/varbindingpatternmatchpattern/ListBindingPatternTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/varbindingpatternmatchpattern/ListBindingPatternTest.java @@ -33,9 +33,9 @@ */ public class ListBindingPatternTest { private CompileResult result, restMatchPatternResult, resultNegative; - private String patternNotMatched = "pattern will not be matched"; - private String unreachablePattern = "unreachable pattern"; - private String unreachableCode = "unreachable code"; + private final String patternNotMatched = "pattern will not be matched"; + private final String unreachablePattern = "unreachable pattern"; + private final String unreachableCode = "unreachable code"; @BeforeClass public void setup() { diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/varbindingpatternmatchpattern/MappingBindingPatternNegativeTest.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/varbindingpatternmatchpattern/MappingBindingPatternNegativeTest.java index 9dfd081bc8a4..120adff24980 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/varbindingpatternmatchpattern/MappingBindingPatternNegativeTest.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/matchstmt/varbindingpatternmatchpattern/MappingBindingPatternNegativeTest.java @@ -33,8 +33,8 @@ @Test public class MappingBindingPatternNegativeTest { private CompileResult warningResult, negativeResult; - private String patternNotMatched = "pattern will not be matched"; - private String unreachablePattern = "unreachable pattern"; + private final String patternNotMatched = "pattern will not be matched"; + private final String unreachablePattern = "unreachable pattern"; @BeforeClass public void setup() { diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/utils/interop/Utils.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/utils/interop/Utils.java index 24eca7db1cab..bb2f4040079b 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/utils/interop/Utils.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/utils/interop/Utils.java @@ -35,14 +35,14 @@ public final class Utils { private static final int CORE_THREAD_POOL_SIZE = 1; - private static ScheduledExecutorService executor = Executors.newScheduledThreadPool(CORE_THREAD_POOL_SIZE); + private static final ScheduledExecutorService EXECUTOR = Executors.newScheduledThreadPool(CORE_THREAD_POOL_SIZE); private Utils() { } public static void sleep(Environment env, long delayMillis) { Future balFuture = env.markAsync(); - executor.schedule(() -> balFuture.complete(null), delayMillis, TimeUnit.MILLISECONDS); + EXECUTOR.schedule(() -> balFuture.complete(null), delayMillis, TimeUnit.MILLISECONDS); } public static void print(Object... values) { diff --git a/tests/testerina-integration-test/src/test/java/org/ballerinalang/testerina/utils/RuntimeApi.java b/tests/testerina-integration-test/src/test/java/org/ballerinalang/testerina/utils/RuntimeApi.java index 48ae9bfe7ad9..6b0a91fa73ce 100644 --- a/tests/testerina-integration-test/src/test/java/org/ballerinalang/testerina/utils/RuntimeApi.java +++ b/tests/testerina-integration-test/src/test/java/org/ballerinalang/testerina/utils/RuntimeApi.java @@ -40,9 +40,9 @@ */ public final class RuntimeApi { - private static final Module objectModule = new Module("testorg", "runtime_api", "1"); - private static final Module recordModule = new Module("testorg", "runtime_api", "1"); - private static Module errorModule = new Module("testorg", "runtime_api", "1"); + private static final Module OBJECT_MODULE = new Module("testorg", "runtime_api", "1"); + private static final Module RECORD_MODULE = new Module("testorg", "runtime_api", "1"); + private static final Module ERROR_MODULE = new Module("testorg", "runtime_api", "1"); private RuntimeApi() { } @@ -53,7 +53,7 @@ public static BMap getRecord(BString recordName) { address.put("city", StringUtils.fromString("Colombo")); address.put("country", StringUtils.fromString("Sri Lanka")); address.put("postalCode", 10250); - return ValueCreator.createRecordValue(recordModule, recordName.getValue(), address); + return ValueCreator.createRecordValue(RECORD_MODULE, recordName.getValue(), address); } public static BMap getTestRecord(BString recordName) { @@ -61,25 +61,25 @@ public static BMap getTestRecord(BString recordName) { address.put("city", StringUtils.fromString("Kandy")); address.put("country", StringUtils.fromString("Sri Lanka")); address.put("postalCode", 10250); - return ValueCreator.createRecordValue(recordModule, recordName.getValue(), address); + return ValueCreator.createRecordValue(RECORD_MODULE, recordName.getValue(), address); } public static BObject getObject(BString objectName) { BMap address = getRecord(StringUtils.fromString("Address")); - return ValueCreator.createObjectValue(objectModule, objectName.getValue(), StringUtils.fromString("Waruna"), + return ValueCreator.createObjectValue(OBJECT_MODULE, objectName.getValue(), StringUtils.fromString("Waruna"), 14, address); } public static BObject getTestObject(BString objectName) { BMap address = getTestRecord(StringUtils.fromString("TestAddress")); - return ValueCreator.createObjectValue(objectModule, objectName.getValue(), StringUtils.fromString("Waruna"), + return ValueCreator.createObjectValue(OBJECT_MODULE, objectName.getValue(), StringUtils.fromString("Waruna"), 14, address); } public static BError getError(BString errorName) { BMap errorDetails = ValueCreator.createMapValue(); errorDetails.put(StringUtils.fromString("cause"), StringUtils.fromString("Person age cannot be negative")); - return ErrorCreator.createError(errorModule, errorName.getValue(), StringUtils.fromString("Invalid age"), + return ErrorCreator.createError(ERROR_MODULE, errorName.getValue(), StringUtils.fromString("Invalid age"), ErrorCreator.createError(StringUtils.fromString("Invalid data given")), errorDetails); }