This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0759b31956 Improved: Reducing scope of variables in
org.apache.ofbiz.datafile package (OFBIZ-10481)
0759b31956 is described below
commit 0759b3195634afa327b1f7b58719da748677da59
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Sep 27 12:22:51 2022 +0200
Improved: Reducing scope of variables in org.apache.ofbiz.datafile package
(OFBIZ-10481)
Thanks: Pradhan Yash Sharma for the patch
---
.../src/main/java/org/apache/ofbiz/datafile/DataFile.java | 12 ++++++------
.../java/org/apache/ofbiz/datafile/DataFileException.java | 4 ++--
.../main/java/org/apache/ofbiz/datafile/ModelDataFile.java | 2 +-
.../java/org/apache/ofbiz/datafile/ModelDataFileReader.java | 6 +++---
.../src/main/java/org/apache/ofbiz/datafile/Record.java | 6 +++---
.../main/java/org/apache/ofbiz/datafile/RecordIterator.java | 6 +++---
6 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java
b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java
index b81919a081..342243625d 100644
--- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java
+++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFile.java
@@ -55,7 +55,7 @@ public class DataFile {
* @throws DataFileException Exception thown for various errors, generally
has a nested exception
* @return A new DataFile object with the specified file pre-loaded
*/
- public static DataFile readFile(URL fileUrl, URL definitionUrl, String
dataFileName) throws DataFileException {
+ static DataFile readFile(URL fileUrl, URL definitionUrl, String
dataFileName) throws DataFileException {
DataFile dataFile = makeDataFile(definitionUrl, dataFileName);
dataFile.readDataFile(fileUrl);
@@ -98,7 +98,7 @@ public class DataFile {
* Gets model data file.
* @return the model data file
*/
- public ModelDataFile getModelDataFile() {
+ private ModelDataFile getModelDataFile() {
return modelDataFile;
}
@@ -132,7 +132,7 @@ public class DataFile {
* @param fileUrl The URL that the file will be loaded from
* @throws DataFileException Exception thown for various errors, generally
has a nested exception
*/
- public void readDataFile(URL fileUrl) throws DataFileException {
+ private void readDataFile(URL fileUrl) throws DataFileException {
if (fileUrl == null) {
throw new IllegalStateException("File URL is null, cannot load
file");
}
@@ -163,7 +163,7 @@ public class DataFile {
* @param locationInfo Text information about where the data came from for
exception messages
* @throws DataFileException Exception thown for various errors, generally
has a nested exception
*/
- public void readDataFile(InputStream dataFileStream, String locationInfo)
throws DataFileException {
+ private void readDataFile(InputStream dataFileStream, String locationInfo)
throws DataFileException {
if (modelDataFile == null) {
throw new IllegalStateException("DataFile model is null, cannot
load file");
}
@@ -195,7 +195,7 @@ public class DataFile {
* @return the record iterator
* @throws DataFileException the data file exception
*/
- public RecordIterator makeRecordIterator(InputStream dataFileStream,
String locationInfo) throws DataFileException {
+ private RecordIterator makeRecordIterator(InputStream dataFileStream,
String locationInfo) throws DataFileException {
return new RecordIterator(dataFileStream, this.modelDataFile,
locationInfo);
}
@@ -247,7 +247,7 @@ public class DataFile {
* @param records the records
* @throws DataFileException the data file exception
*/
- protected void writeRecords(OutputStream outStream, List<Record> records)
throws DataFileException {
+ private void writeRecords(OutputStream outStream, List<Record> records)
throws DataFileException {
for (Record record : records) {
String line = record.writeLineString(modelDataFile);
diff --git
a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFileException.java
b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFileException.java
index 9fb616df27..e88992707b 100644
---
a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFileException.java
+++
b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/DataFileException.java
@@ -30,11 +30,11 @@ public class DataFileException extends GeneralException {
super();
}
- public DataFileException(String str) {
+ DataFileException(String str) {
super(str);
}
- public DataFileException(String str, Throwable nested) {
+ DataFileException(String str, Throwable nested) {
super(str, nested);
}
}
diff --git
a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFile.java
b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFile.java
index 8c647e6894..142ac60ca0 100644
---
a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFile.java
+++
b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFile.java
@@ -94,7 +94,7 @@ public class ModelDataFile {
* @param recordName the record name
* @return the model record
*/
- public ModelRecord getModelRecord(String recordName) {
+ ModelRecord getModelRecord(String recordName) {
for (ModelRecord curRecord: records) {
if (curRecord.getName().equals(recordName)) {
diff --git
a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java
b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java
index 660fe741a3..c771917368 100644
---
a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java
+++
b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java
@@ -43,7 +43,7 @@ public final class ModelDataFileReader {
private static final String MODULE = ModelDataFileReader.class.getName();
private static final UtilCache<URL, ModelDataFileReader> READERS =
UtilCache.createUtilCache("ModelDataFile", true);
- public static ModelDataFileReader getModelDataFileReader(URL readerURL)
throws DataFileException {
+ static ModelDataFileReader getModelDataFileReader(URL readerURL) throws
DataFileException {
ModelDataFileReader reader = READERS.get(readerURL);
if (reader == null) {
if (Debug.infoOn()) {
@@ -61,7 +61,7 @@ public final class ModelDataFileReader {
private final URL readerURL;
private final Map<String, ModelDataFile> modelDataFiles;
- public ModelDataFileReader(URL readerURL) throws DataFileException {
+ private ModelDataFileReader(URL readerURL) throws DataFileException {
this.readerURL = readerURL;
this.modelDataFiles =
Collections.unmodifiableMap(createModelDataFiles());
}
@@ -284,7 +284,7 @@ public final class ModelDataFileReader {
* @return An DataFile object describing the specified dataFile of the
specified
* descriptor file.
*/
- public ModelDataFile getModelDataFile(String dataFileName) {
+ ModelDataFile getModelDataFile(String dataFileName) {
return this.modelDataFiles.get(dataFileName);
}
diff --git
a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java
b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java
index 75f5376f92..1f74cccd06 100644
--- a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java
+++ b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/Record.java
@@ -355,7 +355,7 @@ public class Record implements Serializable {
* @param name the name
* @return the fixed string
*/
- public String getFixedString(String name) {
+ private String getFixedString(String name) {
if (name == null) {
return null;
}
@@ -440,7 +440,7 @@ public class Record implements Serializable {
* @return the string
* @throws DataFileException the data file exception
*/
- public String writeLineString(ModelDataFile modelDataFile) throws
DataFileException {
+ String writeLineString(ModelDataFile modelDataFile) throws
DataFileException {
ModelRecord modelRecord = getModelRecord();
boolean isFixedRecord =
ModelDataFile.SEP_FIXED_RECORD.equals(modelDataFile.getSeparatorStyle());
boolean isFixedLength =
ModelDataFile.SEP_FIXED_LENGTH.equals(modelDataFile.getSeparatorStyle());
@@ -588,7 +588,7 @@ public class Record implements Serializable {
* @throws DataFileException Exception thown for various errors, generally
has a nested exception
* @return return the Record Object created
*/
- public static Record createRecord(String line, int lineNum, ModelRecord
modelRecord) throws DataFileException {
+ static Record createRecord(String line, int lineNum, ModelRecord
modelRecord) throws DataFileException {
Record record = new Record(modelRecord);
for (ModelField modelField : modelRecord.getFields()) {
diff --git
a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java
b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java
index 3d94d1b6de..a1ec2cb3d3 100644
---
a/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java
+++
b/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java
@@ -97,7 +97,7 @@ public class RecordIterator {
* @return the next line
* @throws DataFileException the data file exception
*/
- protected boolean getNextLine() throws DataFileException {
+ private boolean getNextLine() throws DataFileException {
this.nextLine = null;
this.nextRecord = null;
@@ -148,7 +148,7 @@ public class RecordIterator {
* Gets current line number.
* @return the current line number
*/
- public int getCurrentLineNumber() {
+ private int getCurrentLineNumber() {
return this.nextLineNum - 1;
}
@@ -251,7 +251,7 @@ public class RecordIterator {
* @throws DataFileException Exception thown for various errors, generally
has a nested exception
* @return return the ModelRecord Object found
*/
- protected static ModelRecord findModelForLine(String line, int lineNum,
ModelDataFile modelDataFile) throws DataFileException {
+ private static ModelRecord findModelForLine(String line, int lineNum,
ModelDataFile modelDataFile) throws DataFileException {
ModelRecord modelRecord = null;
for (ModelRecord curModelRecord : modelDataFile.getRecords()) {
