diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.db')
13 files changed, 51 insertions, 85 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.db/.settings/org.eclipse.jdt.core.prefs index feea8fbd54..9224c5b4e8 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.server.db/.settings/org.eclipse.jdt.core.prefs @@ -76,7 +76,7 @@ org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java index 04062d935b..e18ec59298 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java @@ -98,10 +98,8 @@ public final class CDODBUtil { return new HorizontalBranchingMappingStrategy(); } - else - { - throw new IllegalArgumentException("Misconfiguration: Branching requires Auditing!"); - } + + throw new IllegalArgumentException("Misconfiguration: Branching requires Auditing!"); } return createHorizontalMappingStrategy(auditing); diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ExternalReferenceManager.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ExternalReferenceManager.java index b06522849a..e35a1b6799 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ExternalReferenceManager.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ExternalReferenceManager.java @@ -226,11 +226,9 @@ public class ExternalReferenceManager extends Lifecycle implements IExternalRefe { return rs.getLong(1); } - else - { - // not found ... - return 0; - } + + // Not found ... + return 0; } catch (SQLException e) { diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SmartPreparedStatementCache.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SmartPreparedStatementCache.java index 689f707af1..15595a04d3 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SmartPreparedStatementCache.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SmartPreparedStatementCache.java @@ -156,11 +156,9 @@ public class SmartPreparedStatementCache extends AbstractPreparedStatementCache { return null; } - else - { - lists[result.getProbability().ordinal()].remove(result); - return result; - } + + lists[result.getProbability().ordinal()].remove(result); + return result; } private class CacheList diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java index 2a1796cfa8..4bd1c666d7 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java @@ -289,11 +289,9 @@ public abstract class AbstractMappingStrategy extends Lifecycle implements IMapp { return CDO_SET_PREFIX + name; } - else - { - return getName(CDO_SET_PREFIX + feature.getName(), TYPE_PREFIX_FEATURE + getMetaDataManager().getMetaID(feature), - getMaxFieldNameLength()); - } + + return getName(CDO_SET_PREFIX + feature.getName(), TYPE_PREFIX_FEATURE + getMetaDataManager().getMetaID(feature), + getMaxFieldNameLength()); } private String getName(String name, String suffix, int maxLength) diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java index 878047864a..b76dc07c25 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java @@ -296,11 +296,9 @@ public abstract class AbstractFeatureMapTableMapping extends BasicAbstractListTa // list is empty - take shortcut return; } - else - { - // subtract amount of items we are going to read now - listSize -= listChunk; - } + + // subtract amount of items we are going to read now + listSize -= listChunk; } if (TRACER.isEnabled()) @@ -407,16 +405,14 @@ public abstract class AbstractFeatureMapTableMapping extends BasicAbstractListTa return -1; } - else - { - int result = resultSet.getInt(1); - if (TRACER.isEnabled()) - { - TRACER.trace("Read list last index = " + result); - } - return result; + int result = resultSet.getInt(1); + if (TRACER.isEnabled()) + { + TRACER.trace("Read list last index = " + result); } + + return result; } catch (SQLException ex) { diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractListTableMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractListTableMapping.java index 38016a7017..9895caacfd 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractListTableMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractListTableMapping.java @@ -221,11 +221,9 @@ public abstract class AbstractListTableMapping extends BasicAbstractListTableMap // list is empty - take shortcut return; } - else - { - // subtract amount of items we are going to read now - listSize -= listChunk; - } + + // subtract amount of items we are going to read now + listSize -= listChunk; } if (TRACER.isEnabled()) @@ -328,16 +326,14 @@ public abstract class AbstractListTableMapping extends BasicAbstractListTableMap return -1; } - else - { - int result = resultSet.getInt(1); - if (TRACER.isEnabled()) - { - TRACER.trace("Read list last index = " + result); //$NON-NLS-1$ - } - return result; + int result = resultSet.getInt(1); + if (TRACER.isEnabled()) + { + TRACER.trace("Read list last index = " + result); //$NON-NLS-1$ } + + return result; } catch (SQLException ex) { diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditFeatureMapTableMappingWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditFeatureMapTableMappingWithRanges.java index 346770d1bf..2dbdc78a57 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditFeatureMapTableMappingWithRanges.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditFeatureMapTableMappingWithRanges.java @@ -523,16 +523,14 @@ public class AuditFeatureMapTableMappingWithRanges extends BasicAbstractListTabl { throw new DBException("count expects exactly one result."); } - else - { - int result = resultSet.getInt(1) - 1; - if (TRACER.isEnabled()) - { - TRACER.trace("Read list last index = " + result); - } - return result; + int result = resultSet.getInt(1) - 1; + if (TRACER.isEnabled()) + { + TRACER.trace("Read list last index = " + result); } + + return result; } catch (SQLException ex) { diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java index 87d2bccb99..e4f7a04c23 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java @@ -30,7 +30,6 @@ import org.eclipse.emf.cdo.eresource.EresourcePackage; import org.eclipse.emf.cdo.server.db.CDODBUtil; import org.eclipse.emf.cdo.server.db.IDBStoreAccessor; import org.eclipse.emf.cdo.server.db.IPreparedStatementCache.ReuseProbability; -import org.eclipse.emf.cdo.server.db.mapping.IClassMapping; import org.eclipse.emf.cdo.server.db.mapping.IClassMappingAuditSupport; import org.eclipse.emf.cdo.server.db.mapping.IClassMappingDeltaSupport; import org.eclipse.emf.cdo.server.db.mapping.IListMappingDeltaSupport; @@ -58,8 +57,8 @@ import java.util.Map; * @author Eike Stepper * @since 2.0 */ -public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping implements IClassMapping, - IClassMappingAuditSupport, IClassMappingDeltaSupport +public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping implements IClassMappingAuditSupport, + IClassMappingDeltaSupport { private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HorizontalAuditClassMapping.class); @@ -435,10 +434,8 @@ public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping continue; } - else - { - stmt.setBoolean(isSetCol++, true); - } + + stmt.setBoolean(isSetCol++, true); } mapping.setValueFromRevision(stmt, col++, revision); diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java index 3c80c6f440..ade35c87b5 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java @@ -22,7 +22,6 @@ import org.eclipse.emf.cdo.eresource.EresourcePackage; import org.eclipse.emf.cdo.server.db.CDODBUtil; import org.eclipse.emf.cdo.server.db.IDBStoreAccessor; import org.eclipse.emf.cdo.server.db.IPreparedStatementCache.ReuseProbability; -import org.eclipse.emf.cdo.server.db.mapping.IClassMapping; import org.eclipse.emf.cdo.server.db.mapping.IClassMappingBranchingSupport; import org.eclipse.emf.cdo.server.db.mapping.IListMapping; import org.eclipse.emf.cdo.server.db.mapping.ITypeMapping; @@ -51,7 +50,7 @@ import java.util.Map; * @author Stefan Winkler * @since 3.0 */ -public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapping implements IClassMapping, +public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapping implements IClassMappingBranchingSupport { private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HorizontalBranchingClassMapping.class); @@ -441,10 +440,8 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp continue; } - else - { - stmt.setBoolean(isSetCol++, true); - } + + stmt.setBoolean(isSetCol++, true); } mapping.setValueFromRevision(stmt, col++, revision); @@ -527,10 +524,8 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp continue; } - else - { - stmt.setBoolean(isSetCol++, true); - } + + stmt.setBoolean(isSetCol++, true); } mapping.setValueFromRevision(stmt, col++, revision); diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java index 331640bd54..7909e4601f 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java @@ -30,7 +30,6 @@ import org.eclipse.emf.cdo.eresource.EresourcePackage; import org.eclipse.emf.cdo.server.db.CDODBUtil; import org.eclipse.emf.cdo.server.db.IDBStoreAccessor; import org.eclipse.emf.cdo.server.db.IPreparedStatementCache.ReuseProbability; -import org.eclipse.emf.cdo.server.db.mapping.IClassMapping; import org.eclipse.emf.cdo.server.db.mapping.IClassMappingDeltaSupport; import org.eclipse.emf.cdo.server.db.mapping.IListMappingDeltaSupport; import org.eclipse.emf.cdo.server.db.mapping.ITypeMapping; @@ -59,8 +58,7 @@ import java.util.Map; * @author Eike Stepper * @since 2.0 */ -public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMapping implements IClassMapping, - IClassMappingDeltaSupport +public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMapping implements IClassMappingDeltaSupport { private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HorizontalNonAuditClassMapping.class); @@ -268,10 +266,8 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi mapping.setDefaultValue(stmt, col++); continue; } - else - { - stmt.setBoolean(isSetCol++, true); - } + + stmt.setBoolean(isSetCol++, true); } mapping.setValueFromRevision(stmt, col++, revision); diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditFeatureMapTableMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditFeatureMapTableMapping.java index f4499db8d4..f04e86c722 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditFeatureMapTableMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditFeatureMapTableMapping.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation * Stefan Winkler - 271444: [DB] Multiple refactorings bug 271444 - * Christopher Albert - 254455: [DB] Support FeatureMaps bug 254455 + * Christopher Albert - 254455: [DB] Support FeatureMaps bug 254455 */ package org.eclipse.emf.cdo.server.internal.db.mapping.horizontal; @@ -28,7 +28,6 @@ import org.eclipse.emf.cdo.common.revision.delta.CDOUnsetFeatureDelta; import org.eclipse.emf.cdo.server.db.CDODBUtil; import org.eclipse.emf.cdo.server.db.IDBStoreAccessor; import org.eclipse.emf.cdo.server.db.IPreparedStatementCache.ReuseProbability; -import org.eclipse.emf.cdo.server.db.mapping.IListMapping; import org.eclipse.emf.cdo.server.db.mapping.IListMappingDeltaSupport; import org.eclipse.emf.cdo.server.db.mapping.IMappingStrategy; import org.eclipse.emf.cdo.server.db.mapping.ITypeMapping; @@ -53,8 +52,7 @@ import java.util.Iterator; * @author Eike Stepper * @since 3.0 */ -public class NonAuditFeatureMapTableMapping extends AbstractFeatureMapTableMapping implements IListMapping, - IListMappingDeltaSupport +public class NonAuditFeatureMapTableMapping extends AbstractFeatureMapTableMapping implements IListMappingDeltaSupport { private static final FieldInfo[] KEY_FIELDS = { new FieldInfo(CDODBSchema.FEATUREMAP_REVISION_ID, DBType.BIGINT) }; diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditListTableMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditListTableMapping.java index 053ae03257..9cfd896757 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditListTableMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditListTableMapping.java @@ -28,7 +28,6 @@ import org.eclipse.emf.cdo.common.revision.delta.CDOUnsetFeatureDelta; import org.eclipse.emf.cdo.server.db.CDODBUtil; import org.eclipse.emf.cdo.server.db.IDBStoreAccessor; import org.eclipse.emf.cdo.server.db.IPreparedStatementCache.ReuseProbability; -import org.eclipse.emf.cdo.server.db.mapping.IListMapping; import org.eclipse.emf.cdo.server.db.mapping.IListMappingDeltaSupport; import org.eclipse.emf.cdo.server.db.mapping.IMappingStrategy; import org.eclipse.emf.cdo.server.internal.db.CDODBSchema; @@ -54,8 +53,7 @@ import java.util.ArrayList; * @author Eike Stepper * @since 2.0 */ -public class NonAuditListTableMapping extends AbstractListTableMapping implements IListMapping, - IListMappingDeltaSupport +public class NonAuditListTableMapping extends AbstractListTableMapping implements IListMappingDeltaSupport { private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, NonAuditListTableMapping.class); |