Skip to content

Commit 3301aa8

Browse files
andrusandrus
committed
Renaming ResultSet and PreparedStatement descriptors
1 parent a9f0fc0 commit 3301aa8

76 files changed

Lines changed: 409 additions & 392 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslator.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
****************************************************************/
1919
package org.apache.cayenne.crypto.batch;
2020

21-
import org.apache.cayenne.access.translator.ParameterBinding;
22-
import org.apache.cayenne.access.translator.batch.BatchParameterBinding;
21+
import org.apache.cayenne.access.jdbc.PSParameter;
22+
import org.apache.cayenne.access.jdbc.PSBatchParameter;
2323
import org.apache.cayenne.access.translator.batch.BatchTranslator;
2424
import org.apache.cayenne.access.translator.batch.TranslatedBatch;
2525
import org.apache.cayenne.crypto.transformer.BindingsTransformer;
@@ -55,12 +55,12 @@ public TranslatedBatch translate(T query, DbAdapter adapter) {
5555
: translated;
5656
}
5757

58-
private static ParameterBinding[] transform(
59-
BatchParameterBinding[] template,
58+
private static PSParameter[] transform(
59+
PSBatchParameter[] template,
6060
BatchQueryRow row,
6161
TranslatedBatch translated,
6262
BindingsTransformer encryptor) {
63-
ParameterBinding[] updated = translated.binder().bind(template, row);
63+
PSParameter<?>[] updated = translated.binder().bind(template, row);
6464
encryptor.transform(updated);
6565
return updated;
6666
}

‎cayenne-crypto/src/main/java/org/apache/cayenne/crypto/reader/CryptoRowReaderFactoryDecorator.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.sql.ResultSet;
2222
import java.util.Map;
2323

24-
import org.apache.cayenne.access.jdbc.ColumnDescriptor;
24+
import org.apache.cayenne.access.jdbc.RSColumn;
2525
import org.apache.cayenne.access.jdbc.reader.DefaultRowReaderFactory;
2626
import org.apache.cayenne.access.jdbc.reader.RowReader;
2727
import org.apache.cayenne.access.types.ExtendedType;
@@ -59,42 +59,42 @@ public CryptoRowReaderFactoryDecorator(@Inject TransformerFactory transformerFac
5959
}
6060

6161
@Override
62-
public RowReader<?> rowReader(ColumnDescriptor[] columns, QueryMetadata queryMetadata, DbAdapter adapter) {
62+
public RowReader<?> rowReader(RSColumn[] columns, QueryMetadata queryMetadata, DbAdapter adapter) {
6363
return super.rowReader(encryptedColumns(columns, adapter.getExtendedTypes()), queryMetadata, adapter);
6464
}
6565

6666
@Override
67-
protected RowReader<?> createScalarRowReader(ColumnDescriptor[] columns, QueryMetadata queryMetadata,
67+
protected RowReader<?> createScalarRowReader(RSColumn[] columns, QueryMetadata queryMetadata,
6868
ScalarResultSegment segment) {
6969
RowReader<?> scalarRowReader = super
7070
.createScalarRowReader(columns, queryMetadata, segment);
7171
return new DecoratedScalarRowReader(columns[segment.getColumnOffset()], scalarRowReader);
7272
}
7373

7474
@Override
75-
protected RowReader<?> createEntityRowReader(ColumnDescriptor[] columns, QueryMetadata queryMetadata,
75+
protected RowReader<?> createEntityRowReader(RSColumn[] columns, QueryMetadata queryMetadata,
7676
EntityResultSegment resultMetadata) {
7777
RowReader<?> entityRowReader = super
7878
.createEntityRowReader(columns, queryMetadata, resultMetadata);
7979
return new DecoratedEntityRowReader(columns, entityRowReader, resultMetadata);
8080
}
8181

8282
@Override
83-
protected RowReader<?> createFullRowReader(ColumnDescriptor[] columns, QueryMetadata queryMetadata) {
83+
protected RowReader<?> createFullRowReader(RSColumn[] columns, QueryMetadata queryMetadata) {
8484
RowReader<?> fullRowReader = super
8585
.createFullRowReader(columns, queryMetadata);
8686
return new DecoratedFullRowReader(columns, fullRowReader);
8787
}
8888

89-
protected ColumnDescriptor[] encryptedColumns(ColumnDescriptor[] columns, ExtendedTypeMap typeMap) {
89+
protected RSColumn[] encryptedColumns(RSColumn[] columns, ExtendedTypeMap typeMap) {
9090

9191
// need to tweak the columns to ensure encrypted columns are read as binary or char, even if the plain Java
9292
// type is not a byte[] / String
9393

94-
ColumnDescriptor[] encrypted = new ColumnDescriptor[columns.length];
94+
RSColumn[] encrypted = new RSColumn[columns.length];
9595

9696
for (int i = 0; i < columns.length; i++) {
97-
ColumnDescriptor column = columns[i];
97+
RSColumn column = columns[i];
9898
DbAttribute attribute = column.attribute();
9999

100100
ExtendedType type = column.type();
@@ -112,7 +112,7 @@ protected ColumnDescriptor[] encryptedColumns(ColumnDescriptor[] columns, Extend
112112

113113
encrypted[i] = type == column.type()
114114
? column
115-
: new ColumnDescriptor(column.name(), column.dataRowKey(), column.jdbcType(), type, attribute);
115+
: new RSColumn(column.name(), column.dataRowKey(), column.jdbcType(), type, attribute);
116116
}
117117

118118
return encrypted;
@@ -123,7 +123,7 @@ private class DecoratedScalarRowReader implements RowReader<Object> {
123123
private final ValueDecryptor valueDecryptor;
124124
private final BytesDecryptor bytesDecryptor;
125125

126-
DecoratedScalarRowReader(ColumnDescriptor descriptor, RowReader<?> delegateReader) {
126+
DecoratedScalarRowReader(RSColumn descriptor, RowReader<?> delegateReader) {
127127
this.delegateReader = delegateReader;
128128
if(descriptor.attribute() != null && columnMapper.isEncrypted(descriptor.attribute())) {
129129
this.valueDecryptor = valueTransformerFactory.decryptor(descriptor.attribute());
@@ -146,15 +146,15 @@ public Object readRow(ResultSet resultSet) {
146146

147147
private abstract class DecoratedEntityFullRowReader implements RowReader<Object> {
148148

149-
final ColumnDescriptor[] columns;
149+
final RSColumn[] columns;
150150
final RowReader<?> delegateReader;
151151
final EntityResultSegment resultMetadata;
152152
boolean decryptorCompiled;
153153
MapTransformer decryptor;
154154

155-
DecoratedEntityFullRowReader(ColumnDescriptor[] columns,
156-
RowReader<?> delegateReader,
157-
EntityResultSegment resultMetadata) {
155+
DecoratedEntityFullRowReader(RSColumn[] columns,
156+
RowReader<?> delegateReader,
157+
EntityResultSegment resultMetadata) {
158158
this.columns = columns;
159159
this.delegateReader = delegateReader;
160160
this.resultMetadata = resultMetadata;
@@ -180,7 +180,7 @@ public Object readRow(ResultSet resultSet) {
180180

181181
private class DecoratedEntityRowReader extends DecoratedEntityFullRowReader {
182182

183-
DecoratedEntityRowReader(ColumnDescriptor[] columns,
183+
DecoratedEntityRowReader(RSColumn[] columns,
184184
RowReader<?> delegateReader,
185185
EntityResultSegment resultMetadata) {
186186
super(columns, delegateReader, resultMetadata);
@@ -190,12 +190,12 @@ void ensureDecryptorCompiled(Object row) {
190190
if (!decryptorCompiled) {
191191
int offset = resultMetadata.getColumnOffset();
192192
int fieldsSize = resultMetadata.getFields().size();
193-
ColumnDescriptor[] columnDescriptors =
194-
new ColumnDescriptor[fieldsSize];
193+
RSColumn[] columns =
194+
new RSColumn[fieldsSize];
195195
for(int i = offset, j = 0; i < offset + fieldsSize; i++) {
196-
columnDescriptors[j++] = columns[i];
196+
columns[j++] = this.columns[i];
197197
}
198-
decryptor = transformerFactory.decryptor(columnDescriptors, row);
198+
decryptor = transformerFactory.decryptor(columns, row);
199199
decryptorCompiled = true;
200200
}
201201
}
@@ -208,7 +208,7 @@ public Object readRow(ResultSet resultSet) {
208208

209209
private class DecoratedFullRowReader extends DecoratedEntityFullRowReader {
210210

211-
DecoratedFullRowReader(ColumnDescriptor[] columns,
211+
DecoratedFullRowReader(RSColumn[] columns,
212212
RowReader<?> delegateReader) {
213213
super(columns, delegateReader, null);
214214
}

‎cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/BindingsTransformer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
****************************************************************/
1919
package org.apache.cayenne.crypto.transformer;
2020

21-
import org.apache.cayenne.access.translator.ParameterBinding;
21+
import org.apache.cayenne.access.jdbc.PSParameter;
2222

2323
/**
2424
* @since 4.0
2525
*/
2626
public interface BindingsTransformer {
2727

28-
void transform(ParameterBinding[] bindings);
28+
void transform(PSParameter<?>[] bindings);
2929
}

‎cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
****************************************************************/
1919
package org.apache.cayenne.crypto.transformer;
2020

21-
import org.apache.cayenne.access.translator.ParameterBinding;
21+
import org.apache.cayenne.access.jdbc.PSParameter;
2222
import org.apache.cayenne.access.types.ExtendedType;
2323
import org.apache.cayenne.access.types.ExtendedTypeMap;
2424
import org.apache.cayenne.crypto.transformer.bytes.BytesEncryptor;
@@ -29,35 +29,36 @@
2929
*/
3030
public class DefaultBindingsTransformer implements BindingsTransformer {
3131

32-
private int[] positions;
33-
private ValueEncryptor[] transformers;
34-
private BytesEncryptor encryptor;
35-
private ExtendedTypeMap extendedTypeMap;
32+
private final int[] positions;
33+
private final ValueEncryptor[] transformers;
34+
private final BytesEncryptor encryptor;
35+
private final ExtendedTypeMap extendedTypeMap;
3636

37-
public DefaultBindingsTransformer(int[] positions,
38-
ValueEncryptor[] transformers,
39-
BytesEncryptor encryptor,
40-
ExtendedTypeMap extendedTypeMap) {
37+
public DefaultBindingsTransformer(
38+
int[] positions,
39+
ValueEncryptor[] transformers,
40+
BytesEncryptor encryptor,
41+
ExtendedTypeMap extendedTypeMap) {
4142
this.positions = positions;
4243
this.transformers = transformers;
4344
this.encryptor = encryptor;
4445
this.extendedTypeMap = extendedTypeMap;
4546
}
4647

4748
@Override
48-
public void transform(ParameterBinding[] bindings) {
49+
public void transform(PSParameter<?>[] bindings) {
4950

5051
int len = positions.length;
5152

5253
for (int i = 0; i < len; i++) {
53-
ParameterBinding b = bindings[positions[i]];
54+
PSParameter<?> b = bindings[positions[i]];
5455
Object transformed = transformers[i].encrypt(encryptor, b.value());
5556

56-
ExtendedType extendedType = transformed != null
57+
ExtendedType<?> extendedType = transformed != null
5758
? extendedTypeMap.getRegisteredType(transformed.getClass())
5859
: extendedTypeMap.getDefaultType();
5960

60-
bindings[positions[i]] = new ParameterBinding(b.jdbcType(), b.scale(), b.attribute(),
61+
bindings[positions[i]] = new PSParameter(b.jdbcType(), b.scale(), b.attribute(),
6162
b.statementPosition(), transformed, extendedType);
6263
}
6364
}

‎cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultTransformerFactory.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
****************************************************************/
1919
package org.apache.cayenne.crypto.transformer;
2020

21-
import org.apache.cayenne.access.jdbc.ColumnDescriptor;
22-
import org.apache.cayenne.access.translator.batch.BatchParameterBinding;
21+
import org.apache.cayenne.access.jdbc.RSColumn;
22+
import org.apache.cayenne.access.jdbc.PSBatchParameter;
2323
import org.apache.cayenne.access.types.ExtendedTypeMap;
2424
import org.apache.cayenne.crypto.map.ColumnMapper;
2525
import org.apache.cayenne.crypto.transformer.bytes.BytesTransformerFactory;
@@ -50,7 +50,7 @@ public DefaultTransformerFactory(@Inject ColumnMapper columnMapper,
5050
}
5151

5252
@Override
53-
public MapTransformer decryptor(ColumnDescriptor[] columns, Object sampleRow) {
53+
public MapTransformer decryptor(RSColumn[] columns, Object sampleRow) {
5454

5555
if (!(sampleRow instanceof Map)) {
5656
return null;
@@ -79,7 +79,7 @@ public MapTransformer decryptor(ColumnDescriptor[] columns, Object sampleRow) {
7979

8080
for (int i = 0; i < dlen; i++) {
8181

82-
ColumnDescriptor cd = columns[cryptoColumns.get(i)];
82+
RSColumn cd = columns[cryptoColumns.get(i)];
8383
mapKeys[i] = cd.dataRowKey();
8484
transformers[i] = transformerFactory.decryptor(cd.attribute());
8585
}
@@ -91,7 +91,7 @@ public MapTransformer decryptor(ColumnDescriptor[] columns, Object sampleRow) {
9191
}
9292

9393
@Override
94-
public BindingsTransformer encryptor(BatchParameterBinding[] bindings, ExtendedTypeMap extendedTypeMap) {
94+
public BindingsTransformer encryptor(PSBatchParameter[] bindings, ExtendedTypeMap extendedTypeMap) {
9595
int len = bindings.length;
9696
List<Integer> cryptoColumns = null;
9797

@@ -116,7 +116,7 @@ public BindingsTransformer encryptor(BatchParameterBinding[] bindings, ExtendedT
116116

117117
for (int i = 0; i < dlen; i++) {
118118
int pos = cryptoColumns.get(i);
119-
BatchParameterBinding b = bindings[pos];
119+
PSBatchParameter b = bindings[pos];
120120
positions[i] = pos;
121121
transformers[i] = transformerFactory.encryptor(b.attribute());
122122
}

‎cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/TransformerFactory.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
****************************************************************/
1919
package org.apache.cayenne.crypto.transformer;
2020

21-
import org.apache.cayenne.access.jdbc.ColumnDescriptor;
22-
import org.apache.cayenne.access.translator.batch.BatchParameterBinding;
21+
import org.apache.cayenne.access.jdbc.RSColumn;
22+
import org.apache.cayenne.access.jdbc.PSBatchParameter;
2323
import org.apache.cayenne.access.types.ExtendedTypeMap;
2424

2525
/**
@@ -30,7 +30,7 @@
3030
*/
3131
public interface TransformerFactory {
3232

33-
BindingsTransformer encryptor(BatchParameterBinding[] bindings, ExtendedTypeMap extendedTypeMap);
33+
BindingsTransformer encryptor(PSBatchParameter[] bindings, ExtendedTypeMap extendedTypeMap);
3434

35-
MapTransformer decryptor(ColumnDescriptor[] columns, Object sampleRow);
35+
MapTransformer decryptor(RSColumn[] columns, Object sampleRow);
3636
}

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/DefaultValueForNullProvider.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@
2424
import java.util.List;
2525
import java.util.Map;
2626

27-
import org.apache.cayenne.access.translator.ParameterBinding;
27+
import org.apache.cayenne.access.jdbc.PSParameter;
2828
import org.apache.cayenne.map.DbAttribute;
2929
import org.apache.cayenne.map.DbEntity;
3030

3131
public class DefaultValueForNullProvider implements ValueForNullProvider {
3232

33-
private Map<String, ParameterBinding> values = new HashMap<>();
33+
private Map<String, PSParameter> values = new HashMap<>();
3434

3535
public void set(DbEntity entity, DbAttribute column, Object value, int type) {
3636
// the binding is only ever read for its value (inlined into the UPDATE below), never bound to a
3737
// statement, so the position is irrelevant here
38-
ParameterBinding binding = new ParameterBinding(type, column.getAttributePrecision(), null, 1, value, null);
38+
PSParameter binding = new PSParameter(type, column.getAttributePrecision(), null, 1, value, null);
3939
values.put(createKey(entity, column), binding);
4040
}
4141

42-
protected ParameterBinding get(DbEntity entity, DbAttribute column) {
42+
protected PSParameter get(DbEntity entity, DbAttribute column) {
4343
return values.get(createKey(entity, column));
4444
}
4545

4646
public List<String> createSql(DbEntity entity, DbAttribute column) {
47-
ParameterBinding value = get(entity, column);
47+
PSParameter value = get(entity, column);
4848
if (value == null) {
4949
return Collections.emptyList();
5050
}

‎cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/token/ValueForNullIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package org.apache.cayenne.dbsync.merge.token;
2121

2222
import org.apache.cayenne.Persistent;
23-
import org.apache.cayenne.access.translator.ParameterBinding;
23+
import org.apache.cayenne.access.jdbc.PSParameter;
2424
import org.apache.cayenne.dbsync.merge.DataMapMerger;
2525
import org.apache.cayenne.dbsync.merge.MergeCase;
2626
import org.apache.cayenne.exp.Expression;
@@ -101,11 +101,11 @@ protected DataMapMerger.Builder merger() {
101101
return super.merger().valueForNullProvider(new DefaultValueForNullProvider() {
102102

103103
@Override
104-
protected ParameterBinding get(DbEntity entity, DbAttribute column) {
104+
protected PSParameter get(DbEntity entity, DbAttribute column) {
105105
int type = column.getType();
106106
switch (type) {
107107
case Types.VARCHAR:
108-
return new ParameterBinding(type, -1, null, 1, DEFAULT_VALUE_STRING, null);
108+
return new PSParameter(type, -1, null, 1, DEFAULT_VALUE_STRING, null);
109109
default:
110110
throw new AssertionError("should not get here");
111111
}

‎cayenne-velocity/src/main/java/org/apache/cayenne/velocity/BindDirective.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.Collection;
2525
import java.util.Iterator;
2626

27-
import org.apache.cayenne.access.translator.ParameterBinding;
27+
import org.apache.cayenne.access.jdbc.PSParameter;
2828
import org.apache.cayenne.access.types.ExtendedType;
2929
import org.apache.cayenne.access.types.ExtendedTypeMap;
3030
import org.apache.cayenne.dba.DbAdapter;
@@ -84,7 +84,7 @@ public int getType() {
8484

8585
/**
8686
* Extracts the value of the object property to render and passes control to
87-
* {@link #render(InternalContextAdapter, Writer, ParameterBinding)} to do
87+
* {@link #render(InternalContextAdapter, Writer, PSParameter)} to do
8888
* the actual rendering.
8989
*/
9090
@Override
@@ -166,13 +166,13 @@ protected Object getChild(InternalContextAdapter context, Node node, int i) thro
166166
protected void bind(InternalContextAdapter context, int jdbcType, int scale, Object value) {
167167

168168
@SuppressWarnings("unchecked")
169-
Collection<ParameterBinding> bindings = (Collection<ParameterBinding>)
169+
Collection<PSParameter> bindings = (Collection<PSParameter>)
170170
context.getInternalUserContext().get(VelocitySQLTemplateTranslator.BINDINGS_LIST_KEY);
171171

172172
if (bindings != null) {
173173
// a binding's statement position is its 1-based ordinal among the bound parameters; the
174174
// ExtendedType is resolved from the value via the adapter
175-
bindings.add(new ParameterBinding(jdbcType, scale, null,
175+
bindings.add(new PSParameter(jdbcType, scale, null,
176176
bindings.size() + 1, value, extendedType(context, value)));
177177
}
178178
}

0 commit comments

Comments
 (0)