Author: tv
Date: Sun Aug 26 09:50:05 2018
New Revision: 1839180
URL: http://svn.apache.org/viewvc?rev=1839180&view=rev
Log:
More Java 8 practice
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AbstractAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CombinedPreparedStatementPart.java
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java?rev=1839180&r1=1839179&r2=1839180&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
Sun Aug 26 09:50:05 2018
@@ -370,8 +370,7 @@ public class TorqueInstance
+ handle + " as Adapter");
// add Id generators
- for (IDMethod idMethod
- : IDGeneratorFactory.ID_GENERATOR_METHODS)
+ for (IDMethod idMethod :
IDGeneratorFactory.ID_GENERATOR_METHODS)
{
database.addIdGenerator(
idMethod,
@@ -704,10 +703,7 @@ public class TorqueInstance
*/
private void startIdBrokers()
{
- for (IDBroker idBroker : idBrokers)
- {
- idBroker.start();
- }
+ idBrokers.forEach(IDBroker::start);
}
/**
@@ -857,7 +853,7 @@ public class TorqueInstance
idBrokers.forEach(IDBroker::stop);
// shut down the cache managers
- managers.values().forEach(AbstractBaseManager<?>::dispose);
+ managers.values().forEach(AbstractBaseManager::dispose);
managers.clear();
// shut down the data source factories
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AbstractAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AbstractAdapter.java?rev=1839180&r1=1839179&r2=1839180&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AbstractAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AbstractAdapter.java
Sun Aug 26 09:50:05 2018
@@ -254,7 +254,7 @@ public abstract class AbstractAdapter im
* Whether to use the MINUS operator instead of the EXCEPT operator.
*
* As most databases do not need to replace the EXCEPT operator
- * by the MINUS operator, this implementationalways returns
+ * by the MINUS operator, this implementation always returns
* <code>false</code>.
* This behaviour can be overwritten in subclasses.
*
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java?rev=1839180&r1=1839179&r2=1839180&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java
Sun Aug 26 09:50:05 2018
@@ -215,11 +215,8 @@ public class OracleAdapter extends Abstr
// No replacements need to take place because double aliases
// are not allowed anyway
// So alias names will be retained
- for (ListIterator<String> columnIt = selectColumns.listIterator();
- columnIt.hasNext();)
+ for (String selectColumn : selectColumns)
{
- String selectColumn = columnIt.next();
-
// check for sql function
if ((selectColumn.indexOf('(') != -1)
|| (selectColumn.indexOf(')') != -1))
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java?rev=1839180&r1=1839179&r2=1839180&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
Sun Aug 26 09:50:05 2018
@@ -263,12 +263,9 @@ public class Criteria implements Seriali
aliases = new HashMap<String, Object>(toCopy.aliases);
fetchSize = toCopy.fetchSize;
setOperator = toCopy.setOperator;
- setCriteriaParts = new ArrayList<Criteria>(
- toCopy.setCriteriaParts.size());
- for (Criteria setCriteriaPart : toCopy.setCriteriaParts)
- {
- setCriteriaParts.add(new Criteria(setCriteriaPart));
- }
+ setCriteriaParts = new
ArrayList<Criteria>(toCopy.setCriteriaParts.size());
+ toCopy.setCriteriaParts.forEach(setCriteriaPart ->
+ setCriteriaParts.add(new Criteria(setCriteriaPart)));
}
/**
@@ -784,10 +781,7 @@ public class Criteria implements Seriali
{
if (isComposite())
{
- for (Criteria criteria : setCriteriaParts)
- {
- criteria.setIgnoreCase(true);
- }
+ setCriteriaParts.forEach(criteria -> criteria.setIgnoreCase(true));
}
else
{
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java?rev=1839180&r1=1839179&r2=1839180&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criterion.java
Sun Aug 26 09:50:05 2018
@@ -198,10 +198,7 @@ public class Criterion implements Serial
if (toCopy.parts != null)
{
this.parts = new ArrayList<Criterion>(toCopy.parts.size());
- for (Criterion part : toCopy.parts)
- {
- this.parts.add(new Criterion(part));
- }
+ toCopy.parts.forEach(part -> this.parts.add(new Criterion(part)));
}
this.conjunction = toCopy.conjunction;
}
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java?rev=1839180&r1=1839179&r2=1839180&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java
Sun Aug 26 09:50:05 2018
@@ -417,7 +417,7 @@ public abstract class AbstractBaseManage
// start a new list where we will replace the id's with om's
Map<ObjectKey, T> omsMap = new HashMap<ObjectKey, T>();
List<ObjectKey> newIds = new ArrayList<ObjectKey>(ids.size());
- for (ObjectKey key : ids)
+ ids.forEach(key ->
{
T om = null;
if (fromCache)
@@ -432,7 +432,7 @@ public abstract class AbstractBaseManage
{
omsMap.put(key, om);
}
- }
+ });
if (newIds.size() > 0)
{
@@ -447,10 +447,7 @@ public abstract class AbstractBaseManage
}
}
- for (ObjectKey key : ids)
- {
- oms.add(omsMap.get(key));
- }
+ ids.forEach(key -> oms.add(omsMap.get(key)));
}
return oms;
}
@@ -552,7 +549,7 @@ public abstract class AbstractBaseManage
*/
public void addCacheListenerImpl(final CacheListener<?> listener)
{
- for (Column key : listener.getInterestedFields())
+ listener.getInterestedFields().forEach(key ->
{
// Peer.column names are the fields
if (validFields.contains(key))
@@ -567,7 +564,7 @@ public abstract class AbstractBaseManage
listeners.addIfAbsent(listener);
}
- }
+ });
}
/**
@@ -585,7 +582,7 @@ public abstract class AbstractBaseManage
List<CacheListener<?>> listeners = listenersMap.get(column);
if (listeners != null)
{
- for (CacheListener<?> cl : listeners)
+ listeners.forEach(cl ->
{
@SuppressWarnings("unchecked")
CacheListener<TT> listener = (CacheListener<TT>) cl;
@@ -605,7 +602,7 @@ public abstract class AbstractBaseManage
// object was refreshed
listener.refreshedObject(om);
}
- }
+ });
}
}
@@ -641,7 +638,7 @@ public abstract class AbstractBaseManage
setRegion(region);
}
}
- catch (Exception e)
+ catch (TorqueException e)
{
log.error("Cache could not be initialized for region '"
+ region + "' after deserialization");
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CombinedPreparedStatementPart.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CombinedPreparedStatementPart.java?rev=1839180&r1=1839179&r2=1839180&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CombinedPreparedStatementPart.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/sql/whereclausebuilder/CombinedPreparedStatementPart.java
Sun Aug 26 09:50:05 2018
@@ -63,7 +63,7 @@ public class CombinedPreparedStatementPa
{
if (toAdd == null)
{
- throw new NullPointerException("toAdd must notbe null");
+ throw new NullPointerException("toAdd must not be null");
}
parts.add(toAdd);
}
@@ -81,7 +81,7 @@ public class CombinedPreparedStatementPa
/**
* Adds a PreparedStatementPart to the list of contained
PreparedStatementParts,
- * which contains only the given sreplacementql.
+ * which contains only the given replacement.
*
* @param toAdd the replacement to add, not null.
*/
@@ -96,10 +96,7 @@ public class CombinedPreparedStatementPa
public String getSqlAsString()
{
StringBuilder result = new StringBuilder();
- for (PreparedStatementPart part : parts)
- {
- result.append(part.getSqlAsString());
- }
+ parts.forEach(part -> result.append(part.getSqlAsString()));
return result.toString();
}
@@ -112,10 +109,7 @@ public class CombinedPreparedStatementPa
public List<Object> getPreparedStatementReplacements()
{
List<Object> result = new ArrayList<Object>();
- for (PreparedStatementPart part : parts)
- {
- result.addAll(part.getPreparedStatementReplacements());
- }
+ parts.forEach(part ->
result.addAll(part.getPreparedStatementReplacements()));
return Collections.unmodifiableList(result);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
