conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
=======
void applyAbsolutePositionIfNeeded(LayoutContext layoutContext) {
if (isAbsolutePosition()) {
applyAbsolutePosition(layoutContext instanceof PositionedLayoutContext ? ((PositionedLayoutContext) layoutContext).getParentOccupiedArea().getBBox() : layoutContext.getArea().getBBox());
}
}
void preparePositionedRendererAndAreaForLayout(IRenderer childPositionedRenderer, Rectangle fullBbox, Rectangle parentBbox) {
Float left = getPropertyAsFloat(childPositionedRenderer, Property.LEFT);
Float right = getPropertyAsFloat(childPositionedRenderer, Property.RIGHT);
Float top = getPropertyAsFloat(childPositionedRenderer, Property.TOP);
Float bottom = getPropertyAsFloat(childPositionedRenderer, Property.BOTTOM);
childPositionedRenderer.setParent(this);
adjustPositionedRendererLayoutBoxWidth(childPositionedRenderer, fullBbox, left, right);
if (Integer.valueOf(LayoutPosition.ABSOLUTE).equals(childPositionedRenderer.<Integer>getProperty(Property.POSITION))) {
updateMinHeightForAbsolutelyPositionedRenderer(childPositionedRenderer, parentBbox, top, bottom);
}
}
private void updateMinHeightForAbsolutelyPositionedRenderer(IRenderer renderer, Rectangle parentRendererBox, Float top, Float bottom) {
if (top != null && bottom != null && !renderer.hasProperty(Property.HEIGHT)) {
Float currentMaxHeight = getPropertyAsFloat(renderer, Property.MAX_HEIGHT);
Float currentMinHeight = getPropertyAsFloat(renderer, Property.MIN_HEIGHT);
float resolvedMinHeight = Math.max(0, parentRendererBox.getTop() - (float) top - parentRendererBox.getBottom() - (float) bottom);
if (currentMinHeight != null) {
resolvedMinHeight = Math.max(resolvedMinHeight, (float) currentMinHeight);
}
if (currentMaxHeight != null) {
resolvedMinHeight = Math.min(resolvedMinHeight, (float) currentMaxHeight);
}
renderer.setProperty(Property.MIN_HEIGHT, resolvedMinHeight);
}
}
private void adjustPositionedRendererLayoutBoxWidth(IRenderer renderer, Rectangle fullBbox, Float left, Float right) {
if (left != null) {
fullBbox.setWidth(fullBbox.getWidth() - (float) left).setX(fullBbox.getX() + (float) left);
}
if (right != null) {
fullBbox.setWidth(fullBbox.getWidth() - (float) right);
}
if (left == null && right == null && !renderer.hasProperty(Property.WIDTH)) {
// Other, non-block renderers won't occupy full width anyway
MinMaxWidth minMaxWidth = renderer instanceof BlockRenderer ? ((BlockRenderer) renderer).getMinMaxWidth(MinMaxWidthUtils.getMax()) : null;
if (minMaxWidth != null && minMaxWidth.getMaxWidth() < fullBbox.getWidth()) {
fullBbox.setWidth(minMaxWidth.getMaxWidth() + AbstractRenderer.EPS);
}
}
}
private static float calculatePaddingBorderWidth(AbstractRenderer renderer) {
Rectangle dummy = new Rectangle(0, 0);
renderer.applyBorderBox(dummy, true);
renderer.applyPaddings(dummy, true);
return dummy.getWidth();
}
private static float calculatePaddingBorderHeight(AbstractRenderer renderer) {
Rectangle dummy = new Rectangle(0, 0);
renderer.applyBorderBox(dummy, true);
renderer.applyPaddings(dummy, true);
return dummy.getHeight();
}
/**
* This method creates {@link AffineTransform} instance that could be used
* to transform content inside the occupied area,
* considering the centre of the occupiedArea as the origin of a coordinate system for transformation.
*
* @return {@link AffineTransform} that transforms the content and places it inside occupied area.
*/
private AffineTransform createTransformationInsideOccupiedArea() {
Rectangle backgroundArea = applyMargins(occupiedArea.clone().getBBox(), false);
float x = backgroundArea.getX();
float y = backgroundArea.getY();
float height = backgroundArea.getHeight();
float width = backgroundArea.getWidth();
AffineTransform transform = AffineTransform.getTranslateInstance(-1 * (x + width / 2), -1 * (y + height / 2));
transform.preConcatenate(Transform.getAffineTransform(this.<Transform>getProperty(Property.TRANSFORM), width, height));
transform.preConcatenate(AffineTransform.getTranslateInstance(x + width / 2, y + height / 2));
return transform;
}
protected void beginTranformationIfApplied(PdfCanvas canvas) {
if (this.<Transform>getProperty(Property.TRANSFORM) != null) {
AffineTransform transform = createTransformationInsideOccupiedArea();
canvas.saveState().concatMatrix(transform);
}
}
protected void endTranformationIfApplied(PdfCanvas canvas) {
if (this.<Transform>getProperty(Property.TRANSFORM) != null) {
canvas.restoreState();
}
}
>>>>>>>
void applyAbsolutePositionIfNeeded(LayoutContext layoutContext) {
if (isAbsolutePosition()) {
applyAbsolutePosition(layoutContext instanceof PositionedLayoutContext ? ((PositionedLayoutContext) layoutContext).getParentOccupiedArea().getBBox() : layoutContext.getArea().getBBox());
}
}
void preparePositionedRendererAndAreaForLayout(IRenderer childPositionedRenderer, Rectangle fullBbox, Rectangle parentBbox) {
Float left = getPropertyAsFloat(childPositionedRenderer, Property.LEFT);
Float right = getPropertyAsFloat(childPositionedRenderer, Property.RIGHT);
Float top = getPropertyAsFloat(childPositionedRenderer, Property.TOP);
Float bottom = getPropertyAsFloat(childPositionedRenderer, Property.BOTTOM);
childPositionedRenderer.setParent(this);
adjustPositionedRendererLayoutBoxWidth(childPositionedRenderer, fullBbox, left, right);
if (Integer.valueOf(LayoutPosition.ABSOLUTE).equals(childPositionedRenderer.<Integer>getProperty(Property.POSITION))) {
updateMinHeightForAbsolutelyPositionedRenderer(childPositionedRenderer, parentBbox, top, bottom);
}
}
private void updateMinHeightForAbsolutelyPositionedRenderer(IRenderer renderer, Rectangle parentRendererBox, Float top, Float bottom) {
if (top != null && bottom != null && !renderer.hasProperty(Property.HEIGHT)) {
Float currentMaxHeight = getPropertyAsFloat(renderer, Property.MAX_HEIGHT);
Float currentMinHeight = getPropertyAsFloat(renderer, Property.MIN_HEIGHT);
float resolvedMinHeight = Math.max(0, parentRendererBox.getTop() - (float) top - parentRendererBox.getBottom() - (float) bottom);
if (currentMinHeight != null) {
resolvedMinHeight = Math.max(resolvedMinHeight, (float) currentMinHeight);
}
if (currentMaxHeight != null) {
resolvedMinHeight = Math.min(resolvedMinHeight, (float) currentMaxHeight);
}
renderer.setProperty(Property.MIN_HEIGHT, resolvedMinHeight);
}
}
private void adjustPositionedRendererLayoutBoxWidth(IRenderer renderer, Rectangle fullBbox, Float left, Float right) {
if (left != null) {
fullBbox.setWidth(fullBbox.getWidth() - (float) left).setX(fullBbox.getX() + (float) left);
}
if (right != null) {
fullBbox.setWidth(fullBbox.getWidth() - (float) right);
}
if (left == null && right == null && !renderer.hasProperty(Property.WIDTH)) {
// Other, non-block renderers won't occupy full width anyway
MinMaxWidth minMaxWidth = renderer instanceof BlockRenderer ? ((BlockRenderer) renderer).getMinMaxWidth(MinMaxWidthUtils.getMax()) : null;
if (minMaxWidth != null && minMaxWidth.getMaxWidth() < fullBbox.getWidth()) {
fullBbox.setWidth(minMaxWidth.getMaxWidth() + AbstractRenderer.EPS);
}
}
}
private static float calculatePaddingBorderWidth(AbstractRenderer renderer) {
Rectangle dummy = new Rectangle(0, 0);
renderer.applyBorderBox(dummy, true);
renderer.applyPaddings(dummy, true);
return dummy.getWidth();
}
private static float calculatePaddingBorderHeight(AbstractRenderer renderer) {
Rectangle dummy = new Rectangle(0, 0);
renderer.applyBorderBox(dummy, true);
renderer.applyPaddings(dummy, true);
return dummy.getHeight();
}
/**
* This method creates {@link AffineTransform} instance that could be used
* to transform content inside the occupied area,
* considering the centre of the occupiedArea as the origin of a coordinate system for transformation.
*
* @return {@link AffineTransform} that transforms the content and places it inside occupied area.
*/
private AffineTransform createTransformationInsideOccupiedArea() {
Rectangle backgroundArea = applyMargins(occupiedArea.clone().getBBox(), false);
float x = backgroundArea.getX();
float y = backgroundArea.getY();
float height = backgroundArea.getHeight();
float width = backgroundArea.getWidth();
AffineTransform transform = AffineTransform.getTranslateInstance(-1 * (x + width / 2), -1 * (y + height / 2));
transform.preConcatenate(Transform.getAffineTransform(this.<Transform>getProperty(Property.TRANSFORM), width, height));
transform.preConcatenate(AffineTransform.getTranslateInstance(x + width / 2, y + height / 2));
return transform;
}
protected void beginTranformationIfApplied(PdfCanvas canvas) {
if (this.<Transform>getProperty(Property.TRANSFORM) != null) {
AffineTransform transform = createTransformationInsideOccupiedArea();
canvas.saveState().concatMatrix(transform);
}
}
protected void endTranformationIfApplied(PdfCanvas canvas) {
if (this.<Transform>getProperty(Property.TRANSFORM) != null) {
canvas.restoreState();
}
} |
<<<<<<<
public <T1> T1 getProperty(Property key) {
=======
public <T> T getProperty(int key) {
>>>>>>>
public <T1> T1 getProperty(int key) {
<<<<<<<
if (parent != null && INHERITED_PROPERTIES[key.ordinal()] && (property = parent.getProperty(key)) != null) {
return (T1) property;
=======
if (parent != null && Property.isPropertyInherited(key) && (property = parent.getProperty(key)) != null) {
return (T) property;
>>>>>>>
if (parent != null && Property.isPropertyInherited(key) && (property = parent.getProperty(key)) != null) {
return (T1) property;
<<<<<<<
public void setProperty(Property property, Object value) {
=======
public <T extends IRenderer> T setProperty(int property, Object value) {
>>>>>>>
public void setProperty(int property, Object value) {
<<<<<<<
public <T1> T1 getDefaultProperty(Property property) {
=======
public <T> T getDefaultProperty(int property) {
>>>>>>>
public <T1> T1 getDefaultProperty(int property) {
<<<<<<<
case POSITION:
return (T1) Integer.valueOf(LayoutPosition.STATIC);
=======
case Property.POSITION:
return (T) Integer.valueOf(LayoutPosition.STATIC);
>>>>>>>
case Property.POSITION:
return (T1) Integer.valueOf(LayoutPosition.STATIC); |
<<<<<<<
import com.itextpdf.layout.property.AreaBreakType;
import com.itextpdf.layout.property.FloatPropertyValue;
import com.itextpdf.layout.property.OverflowPropertyValue;
import com.itextpdf.layout.property.Property;
import com.itextpdf.layout.property.VerticalAlignment;
=======
import com.itextpdf.layout.property.AreaBreakType;
import com.itextpdf.layout.property.FloatPropertyValue;
import com.itextpdf.layout.property.Property;
import com.itextpdf.layout.property.VerticalAlignment;
import com.itextpdf.layout.property.ClearPropertyValue;
import com.itextpdf.layout.property.UnitValue;
>>>>>>>
import com.itextpdf.layout.property.AreaBreakType;
import com.itextpdf.layout.property.FloatPropertyValue;
import com.itextpdf.layout.property.OverflowPropertyValue;
import com.itextpdf.layout.property.Property;
import com.itextpdf.layout.property.VerticalAlignment;
import com.itextpdf.layout.property.ClearPropertyValue;
import com.itextpdf.layout.property.UnitValue;
<<<<<<<
List<IRenderer> overflowRendererChildren = new ArrayList<>();
overflowRendererChildren.add(result.getOverflowRenderer());
overflowRendererChildren.addAll(childRenderers.subList(childPos + 1, childRenderers.size()));
overflowRenderer.childRenderers = overflowRendererChildren;
if (hasProperty(Property.MAX_HEIGHT)) {
overflowRenderer.updateMaxHeight(retrieveMaxHeight() - occupiedArea.getBBox().getHeight());
}
if (hasProperty(Property.MIN_HEIGHT)) {
overflowRenderer.updateMinHeight(retrieveMinHeight() - occupiedArea.getBBox().getHeight());
}
if (hasProperty(Property.HEIGHT)) {
overflowRenderer.updateHeight(retrieveHeight() - occupiedArea.getBBox().getHeight());
}
if (wasHeightClipped) {
Logger logger = LoggerFactory.getLogger(TableRenderer.class);
logger.warn(LogMessageConstant.CLIP_ELEMENT);
occupiedArea.getBBox()
.moveDown((float) blockMaxHeight - occupiedArea.getBBox().getHeight())
.setHeight((float) blockMaxHeight);
}
=======
>>>>>>>
<<<<<<<
Float maxHeight = retrieveMaxHeight();
if (maxHeight != null) {
overflowRenderer.updateMaxHeight(maxHeight - occupiedArea.getBBox().getHeight());
}
Float minHeight = retrieveMinHeight();
if (minHeight != null) {
overflowRenderer.updateMinHeight(minHeight - occupiedArea.getBBox().getHeight());
}
Float height = retrieveHeight();
if (height != null) {
overflowRenderer.updateHeight(height - occupiedArea.getBBox().getHeight());
}
if (wasHeightClipped) {
occupiedArea.getBBox()
.moveDown((float) blockMaxHeight - occupiedArea.getBBox().getHeight())
.setHeight((float) blockMaxHeight);
Logger logger = LoggerFactory.getLogger(TableRenderer.class);
logger.warn(LogMessageConstant.CLIP_ELEMENT);
}
=======
updateHeightsOnSplit(wasHeightClipped, overflowRenderer);
correctPositionedLayout(layoutBox);
>>>>>>>
updateHeightsOnSplit(wasHeightClipped, overflowRenderer);
<<<<<<<
applyAbsolutePositionIfNeeded(layoutContext);
LayoutArea editedArea = FloatingHelper.adjustResultOccupiedAreaForFloatAndClear(this, layoutContext.getFloatRendererAreas(), layoutContext.getArea().getBBox(), clearHeightCorrection, marginsCollapsingEnabled);
=======
>>>>>>>
applyAbsolutePositionIfNeeded(layoutContext); |
<<<<<<<
import com.itextpdf.io.LogMessageConstant;
import com.itextpdf.io.font.PdfEncodings;
=======
import com.itextpdf.io.font.PdfEncodings;
>>>>>>>
import com.itextpdf.io.LogMessageConstant;
import com.itextpdf.io.font.PdfEncodings;
<<<<<<<
* the specific trigger event defined by {@param key}. See ISO-320001 12.6.3, "Trigger Events".
*
* @param key a {@link PdfName} that denotes a type of the additional action to set.
=======
* the specific trigger event defined by {@code key}. See ISO-320001 12.6.3, "Trigger Events".
* @param key a {@link PdfName} that denotes a type of the additional action to set.
>>>>>>>
* the specific trigger event defined by {@code key}. See ISO-320001 12.6.3, "Trigger Events".
*
* @param key a {@link PdfName} that denotes a type of the additional action to set. |
<<<<<<<
import com.itextpdf.kernel.pdf.tagutils.WaitingTagsManager;
=======
import com.itextpdf.layout.Document;
>>>>>>>
import com.itextpdf.layout.Document;
import com.itextpdf.kernel.pdf.tagutils.WaitingTagsManager; |
<<<<<<<
if (marginsCollapsingEnabled && result.getStatus() != LayoutResult.NOTHING) {
marginsCollapseHandler.endChildMarginsHandling(layoutBox);
}
if (FloatingHelper.isRendererFloating(childRenderer)) {
waitingFloatsSplitRenderers.put(childPos, result.getStatus() == LayoutResult.PARTIAL ? result.getSplitRenderer() : null);
waitingOverflowFloatRenderers.add(result.getOverflowRenderer());
break;
}
if (marginsCollapsingEnabled && !isCellRenderer) {
marginsCollapseHandler.endMarginsCollapse(layoutBox);
=======
if (marginsCollapsingEnabled) {
if (result.getStatus() != LayoutResult.NOTHING) {
marginsCollapseHandler.endChildMarginsHandling(layoutBox);
}
marginsCollapseHandler.endMarginsCollapse(layoutBox);
>>>>>>>
if (marginsCollapsingEnabled && result.getStatus() != LayoutResult.NOTHING) {
marginsCollapseHandler.endChildMarginsHandling(layoutBox);
}
if (FloatingHelper.isRendererFloating(childRenderer)) {
waitingFloatsSplitRenderers.put(childPos, result.getStatus() == LayoutResult.PARTIAL ? result.getSplitRenderer() : null);
waitingOverflowFloatRenderers.add(result.getOverflowRenderer());
break;
}
if (marginsCollapsingEnabled) {
marginsCollapseHandler.endMarginsCollapse(layoutBox); |
<<<<<<<
ListSymbolPosition symbolPosition = getProperty(Property.LIST_SYMBOL_POSITION);
if (symbolPosition == ListSymbolPosition.INSIDE) {
if (childRenderers.size() > 0 && childRenderers.get(0) instanceof ParagraphRenderer) {
ParagraphRenderer paragraphRenderer = (ParagraphRenderer) childRenderers.get(0);
Float symbolIndent = this.getPropertyAsFloat(Property.LIST_SYMBOL_INDENT);
if (symbolIndent != null) {
symbolRenderer.setProperty(Property.MARGIN_RIGHT, symbolIndent);
}
paragraphRenderer.childRenderers.add(0, symbolRenderer);
symbolAddedInside = true;
} else if (childRenderers.size() > 0 && childRenderers.get(0) instanceof ImageRenderer) {
IRenderer paragraphRenderer = new Paragraph().setMargin(0).createRendererSubTree();
Float symbolIndent = this.getPropertyAsFloat(Property.LIST_SYMBOL_INDENT);
if (symbolIndent != null) {
symbolRenderer.setProperty(Property.MARGIN_RIGHT, symbolIndent);
}
paragraphRenderer.addChild(symbolRenderer);
paragraphRenderer.addChild(childRenderers.get(0));
childRenderers.set(0, paragraphRenderer);
symbolAddedInside = true;
}
if (!symbolAddedInside) {
IRenderer paragraphRenderer = new Paragraph().setMargin(0).createRendererSubTree();
Float symbolIndent = this.getPropertyAsFloat(Property.LIST_SYMBOL_INDENT);
if (symbolIndent != null) {
symbolRenderer.setProperty(Property.MARGIN_RIGHT, symbolIndent);
}
paragraphRenderer.addChild(symbolRenderer);
childRenderers.add(0, paragraphRenderer);
symbolAddedInside = true;
}
}
return super.layout(layoutContext);
=======
LayoutResult result = super.layout(layoutContext);
if (LayoutResult.PARTIAL == result.getStatus()) {
result.getOverflowRenderer().deleteOwnProperty(Property.MIN_HEIGHT);
}
return result;
>>>>>>>
ListSymbolPosition symbolPosition = getProperty(Property.LIST_SYMBOL_POSITION);
if (symbolPosition == ListSymbolPosition.INSIDE) {
if (childRenderers.size() > 0 && childRenderers.get(0) instanceof ParagraphRenderer) {
ParagraphRenderer paragraphRenderer = (ParagraphRenderer) childRenderers.get(0);
Float symbolIndent = this.getPropertyAsFloat(Property.LIST_SYMBOL_INDENT);
if (symbolIndent != null) {
symbolRenderer.setProperty(Property.MARGIN_RIGHT, symbolIndent);
}
paragraphRenderer.childRenderers.add(0, symbolRenderer);
symbolAddedInside = true;
} else if (childRenderers.size() > 0 && childRenderers.get(0) instanceof ImageRenderer) {
IRenderer paragraphRenderer = new Paragraph().setMargin(0).createRendererSubTree();
Float symbolIndent = this.getPropertyAsFloat(Property.LIST_SYMBOL_INDENT);
if (symbolIndent != null) {
symbolRenderer.setProperty(Property.MARGIN_RIGHT, symbolIndent);
}
paragraphRenderer.addChild(symbolRenderer);
paragraphRenderer.addChild(childRenderers.get(0));
childRenderers.set(0, paragraphRenderer);
symbolAddedInside = true;
}
if (!symbolAddedInside) {
IRenderer paragraphRenderer = new Paragraph().setMargin(0).createRendererSubTree();
Float symbolIndent = this.getPropertyAsFloat(Property.LIST_SYMBOL_INDENT);
if (symbolIndent != null) {
symbolRenderer.setProperty(Property.MARGIN_RIGHT, symbolIndent);
}
paragraphRenderer.addChild(symbolRenderer);
childRenderers.add(0, paragraphRenderer);
symbolAddedInside = true;
}
}
LayoutResult result = super.layout(layoutContext);
if (LayoutResult.PARTIAL == result.getStatus()) {
result.getOverflowRenderer().deleteOwnProperty(Property.MIN_HEIGHT);
}
return result; |
<<<<<<<
if (document != null && document.getPdfVersion().compareTo(PdfVersion.PDF_2_0) >= 0) {
LoggerFactory.getLogger(getClass()).error(LogMessageConstant.NEED_APPEARANCES_DEPRECATED_IN_PDF20);
getPdfObject().remove(PdfName.NeedAppearances);
return this;
} else {
return put(PdfName.NeedAppearances, new PdfBoolean(needAppearances));
}
=======
return put(PdfName.NeedAppearances, PdfBoolean.valueOf(needAppearances));
>>>>>>>
if (document != null && document.getPdfVersion().compareTo(PdfVersion.PDF_2_0) >= 0) {
LoggerFactory.getLogger(getClass()).error(LogMessageConstant.NEED_APPEARANCES_DEPRECATED_IN_PDF20);
getPdfObject().remove(PdfName.NeedAppearances);
return this;
} else {
return put(PdfName.NeedAppearances, PdfBoolean.valueOf(needAppearances));
} |
<<<<<<<
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Method;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import static com.android.builder.model.AndroidProject.FD_INTERMEDIATES;
=======
>>>>>>>
import static com.android.builder.model.AndroidProject.FD_INTERMEDIATES;
<<<<<<<
ProcessOutputHandler processOutputHandler) throws IOException, InterruptedException, ProcessException {
=======
ProcessOutputHandler processOutputHandler, boolean awb)
throws IOException, InterruptedException, ProcessException {
>>>>>>>
ProcessOutputHandler processOutputHandler, boolean awb)
throws IOException, InterruptedException, ProcessException {
<<<<<<<
dex.writeTo(dexFile);
} else {
=======
multiDexer.dexMerge(dexs, outDexFolder);
} else {
DexMerger dexMerger = new DexMerger(dexs.toArray(new Dex[0]),
CollisionPolicy.KEEP_FIRST,
new DxContext());
Dex dex = dexMerger.merge();
File dexFile = new File(outDexFolder, "classes.dex");
dex.writeTo(dexFile);
}
} else {
>>>>>>>
multiDexer.dexMerge(dexs, outDexFolder);
} else {
DexMerger dexMerger = new DexMerger(dexs.toArray(new Dex[0]),
CollisionPolicy.KEEP_FIRST,
new DxContext());
Dex dex = dexMerger.merge();
File dexFile = new File(outDexFolder, "classes.dex");
dex.writeTo(dexFile);
}
} else { |
<<<<<<<
import org.bouncycastle.asn1.esf.SignaturePolicyIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
=======
>>>>>>>
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<<<<<<<
setDigestParamToSigRefIfNeeded(reference);
=======
if (document.getPdfVersion().compareTo(PdfVersion.PDF_1_6) < 0) {
reference.put(PdfName.DigestValue, new PdfString("aa"));
PdfArray loc = new PdfArray();
loc.add(new PdfNumber(0));
loc.add(new PdfNumber(0));
reference.put(PdfName.DigestLocation, loc);
reference.put(PdfName.DigestMethod, PdfName.MD5);
}
>>>>>>>
setDigestParamToSigRefIfNeeded(reference);
<<<<<<<
setDigestParamToSigRefIfNeeded(reference);
=======
reference.put(PdfName.DigestValue, new PdfString("aa"));
PdfArray loc = new PdfArray();
loc.add(new PdfNumber(0));
loc.add(new PdfNumber(0));
reference.put(PdfName.DigestLocation, loc);
reference.put(PdfName.DigestMethod, PdfName.MD5);
>>>>>>>
setDigestParamToSigRefIfNeeded(reference); |
<<<<<<<
updateHeightsOnSplit(wasHeightClipped, overflowRenderer);
correctFixedLayout(layoutBox);
=======
updateHeightsOnSplit(wasHeightClipped, splitRenderer, overflowRenderer);
correctPositionedLayout(layoutBox);
>>>>>>>
updateHeightsOnSplit(wasHeightClipped, splitRenderer, overflowRenderer);
correctFixedLayout(layoutBox); |
<<<<<<<
public T setVerticalAlignment(Property.VerticalAlignment verticalAlignment) {
setProperty(Property.VERTICAL_ALIGNMENT, verticalAlignment);
return (T) this;
=======
public T setVerticalAlignment(VerticalAlignment verticalAlignment) {
return setProperty(Property.VERTICAL_ALIGNMENT, verticalAlignment);
>>>>>>>
public T setVerticalAlignment(VerticalAlignment verticalAlignment) {
setProperty(Property.VERTICAL_ALIGNMENT, verticalAlignment);
return (T) this; |
<<<<<<<
columnWidths = calculateScaledColumnWidths(tableModel, (float) tableWidth, leftTableBorderWidth, rightTableBorderWidth);
=======
// Float blockHeight = retrieveHeight();
Float blockMaxHeight = retrieveMaxHeight();
if (null != blockMaxHeight && blockMaxHeight < layoutBox.getHeight()
&& !Boolean.TRUE.equals(getPropertyAsBoolean(Property.FORCED_PLACEMENT))) {
layoutBox.moveUp(layoutBox.getHeight()-blockMaxHeight).setHeight(blockMaxHeight);
}
float layoutBoxHeight = layoutBox.getHeight();
>>>>>>>
// Float blockHeight = retrieveHeight();
Float blockMaxHeight = retrieveMaxHeight();
if (null != blockMaxHeight && blockMaxHeight < layoutBox.getHeight()
&& !Boolean.TRUE.equals(getPropertyAsBoolean(Property.FORCED_PLACEMENT))) {
layoutBox.moveUp(layoutBox.getHeight()-blockMaxHeight).setHeight(blockMaxHeight);
}
float layoutBoxHeight = layoutBox.getHeight();
<<<<<<<
=======
// complete table with empty cells
CellRenderer[] lastAddedRow;
// if (0 != rows.size() && null != rows.get(rows.size() - 1)) {
// lastAddedRow = rows.get(rows.size() - 1);
// int colIndex = 0;
// while (colIndex < lastAddedRow.length && null != lastAddedRow[colIndex]) {
// colIndex += (int) lastAddedRow[colIndex].getPropertyAsInteger(Property.COLSPAN);
// }
// // complete row if it's not already complete ot totally empty
// if (0 != colIndex && lastAddedRow.length != colIndex) {
// while (colIndex < lastAddedRow.length) {
// Cell emptyCell = new Cell();
// emptyCell.setBorder(Border.NO_BORDER);
// ((Table) this.getModelElement()).addCell(emptyCell);
// this.addChild(emptyCell.getRenderer());
// colIndex++;
// }
// }
// }
>>>>>>>
<<<<<<<
for (int j = col; j < col + cellOverflow.getPropertyAsInteger(Property.COLSPAN); j++) {
horizontalBorders.get(!hasContent && splits[col].getStatus() == LayoutResult.PARTIAL ? row : row+1).set(j, getBorders()[2]);
}
=======
Border newBorder = getBorders()[2] == null
? cellOverflow.getModelElement().hasProperty(Property.BORDER_BOTTOM) && null == cellOverflow.getModelElement().<Border>getProperty(Property.BORDER_BOTTOM)
? null
: (Border) cellOverflow.getModelElement().<Border>getDefaultProperty(Property.BORDER)
: getBorders()[2];
for (int j = col; j < col + cellOverflow.getPropertyAsInteger(Property.COLSPAN); j++) {
horizontalBorders.get(row + 1).set(j, newBorder);
}
>>>>>>>
for (int j = col; j < col + cellOverflow.getPropertyAsInteger(Property.COLSPAN); j++) {
horizontalBorders.get(!hasContent && splits[col].getStatus() == LayoutResult.PARTIAL ? row : row+1).set(j, getBorders()[2]);
}
<<<<<<<
} else if (currentRow[col] != null) {
if (hasContent) {
columnsWithCellToBeEnlarged[col] = true;
}
for (int j = col; j < col + currentRow[col].getPropertyAsInteger(Property.COLSPAN); j++) {
horizontalBorders.get(row + 1).set(j, getBorders()[2]);
}
=======
} else if (hasContent && currentRow[col] != null) {
columnsWithCellToBeEnlarged[col] = true;
Border newBorder = getBorders()[2] == null
? currentRow[col].getModelElement().hasProperty(Property.BORDER_BOTTOM) && null == currentRow[col].getModelElement().<Border>getProperty(Property.BORDER_BOTTOM)
? null
: (Border) currentRow[col].getModelElement().getDefaultProperty(Property.BORDER)
: getBorders()[2];
for (int j = col; j < col + currentRow[col].getPropertyAsInteger(Property.COLSPAN); j++) {
horizontalBorders.get(row + 1).set(j, newBorder);
}
>>>>>>>
} else if (currentRow[col] != null) {
if (hasContent) {
columnsWithCellToBeEnlarged[col] = true;
}
for (int j = col; j < col + currentRow[col].getPropertyAsInteger(Property.COLSPAN); j++) {
horizontalBorders.get(row + 1).set(j, getBorders()[2]);
} |
<<<<<<<
import com.itextpdf.kernel.colors.Color;
import com.itextpdf.kernel.colors.DeviceGray;
=======
import com.itextpdf.kernel.color.ColorConstants;
import com.itextpdf.kernel.color.DeviceGray;
>>>>>>>
import com.itextpdf.kernel.colors.ColorConstants;
import com.itextpdf.kernel.colors.DeviceGray;
<<<<<<<
doc.add(new Table(UnitValue.createPercentArray(1)).useAllAvailableWidth().setBorder(new SolidBorder(Color.ORANGE, 2)).addCell("Is my occupied area correct?"));
=======
doc.add(new Table(1).setBorder(new SolidBorder(ColorConstants.ORANGE, 2)).addCell("Is my occupied area correct?"));
>>>>>>>
doc.add(new Table(UnitValue.createPercentArray(1)).useAllAvailableWidth().setBorder(new SolidBorder(ColorConstants.ORANGE, 2)).addCell("Is my occupied area correct?"));
<<<<<<<
doc.add(new Table(UnitValue.createPercentArray(1)).useAllAvailableWidth().setBorder(new SolidBorder(Color.ORANGE, 2)).addCell("Is my occupied area correct?"));
=======
doc.add(new Table(1).setBorder(new SolidBorder(ColorConstants.ORANGE, 2)).addCell("Is my occupied area correct?"));
>>>>>>>
doc.add(new Table(UnitValue.createPercentArray(1)).useAllAvailableWidth().setBorder(new SolidBorder(ColorConstants.ORANGE, 2)).addCell("Is my occupied area correct?"));
<<<<<<<
doc.add(new Table(UnitValue.createPercentArray(1)).useAllAvailableWidth().setBorder(new SolidBorder(Color.ORANGE, 2)).addCell("Is my occupied area correct?"));
=======
doc.add(new Table(1).setBorder(new SolidBorder(ColorConstants.ORANGE, 2)).addCell("Is my occupied area correct?"));
>>>>>>>
doc.add(new Table(UnitValue.createPercentArray(1)).useAllAvailableWidth().setBorder(new SolidBorder(ColorConstants.ORANGE, 2)).addCell("Is my occupied area correct?"));
<<<<<<<
doc.add(new Table(UnitValue.createPercentArray(1)).useAllAvailableWidth().setBorder(new SolidBorder(Color.ORANGE, 2)).addCell("Is my occupied area correct?"));
=======
doc.add(new Table(1).setBorder(new SolidBorder(ColorConstants.ORANGE, 2)).addCell("Is my occupied area correct?"));
>>>>>>>
doc.add(new Table(UnitValue.createPercentArray(1)).useAllAvailableWidth().setBorder(new SolidBorder(ColorConstants.ORANGE, 2)).addCell("Is my occupied area correct?"));
<<<<<<<
doc.add(new Table(UnitValue.createPercentArray(1)).useAllAvailableWidth().setBorder(new SolidBorder(Color.ORANGE, 2)).addCell("Is my occupied area correct?"));
=======
doc.add(new Table(1).setBorder(new SolidBorder(ColorConstants.ORANGE, 2)).addCell("Is my occupied area correct?"));
>>>>>>>
doc.add(new Table(UnitValue.createPercentArray(1)).useAllAvailableWidth().setBorder(new SolidBorder(ColorConstants.ORANGE, 2)).addCell("Is my occupied area correct?")); |
<<<<<<<
private final Nation nation;
=======
private final Dune dune;
>>>>>>>
private final Nation nation;
private final Dune dune;
<<<<<<<
this.nation = new Nation(this);
=======
this.dune = new Dune(this);
>>>>>>>
this.nation = new Nation(this);
this.dune = new Dune(this);
<<<<<<<
public Nation nation() {
return nation;
}
=======
public Dune dune() {
return dune;
}
>>>>>>>
public Nation nation() {
return nation;
}
public Dune dune() {
return dune;
} |
<<<<<<<
private final Nation nation;
=======
private final PrincessBride princessBride;
private final Buffy buffy;
private final Relationships relationships;
>>>>>>>
private final PrincessBride princessBride;
private final Buffy buffy;
private final Relationships relationships;
private final Nation nation;
<<<<<<<
this.nation = new Nation(this);
=======
this.princessBride = new PrincessBride(this);
this.buffy = new Buffy(this);
this.relationships = new Relationships(this);
>>>>>>>
this.princessBride = new PrincessBride(this);
this.buffy = new Buffy(this);
this.relationships = new Relationships(this);
this.nation = new Nation(this);
<<<<<<<
public Nation nation() {
return nation;
}
=======
public PrincessBride princessBride() {
return princessBride;
}
public Relationships relationships() {
return relationships;
}
>>>>>>>
public PrincessBride princessBride() {
return princessBride;
}
public Relationships relationships() {
return relationships;
}
public Nation nation() {
return nation;
} |
<<<<<<<
private final Photography photography;
=======
private final Basketball basketball;
>>>>>>>
private final Photography photography;
private final Basketball basketball;
<<<<<<<
this.photography = new Photography(this);
=======
this.basketball = new Basketball(this);
>>>>>>>
this.photography = new Photography(this);
this.basketball = new Basketball(this);
<<<<<<<
public Photography photography() {
return photography;
}
=======
public Basketball basketball() { return basketball; }
>>>>>>>
public Photography photography() {
return photography;
}
public Basketball basketball() { return basketball; } |
<<<<<<<
private final Educator educator;
=======
private final Shakespeare shakespeare;
>>>>>>>
private final Educator educator;
private final Shakespeare shakespeare;
<<<<<<<
this.educator = new Educator(proxiedFakeValueService);
=======
this.shakespeare = new Shakespeare(randomService);
>>>>>>>
this.educator = new Educator(proxiedFakeValueService);
this.shakespeare = new Shakespeare(randomService);
<<<<<<<
public Educator educator() {
return educator;
}
=======
public Shakespeare shakespeare() {
return shakespeare;
}
>>>>>>>
public Educator educator() {
return educator;
}
public Shakespeare shakespeare() {
return shakespeare;
} |
<<<<<<<
/**
* Generates a String that matches the given regular expression,
*/
public String regexify(String regex) {
return fakeValuesService.regexify(regex);
}
=======
public App app() {
return app;
}
>>>>>>>
/**
* Generates a String that matches the given regular expression,
*/
public String regexify(String regex) {
return fakeValuesService.regexify(regex);
}
public App app() {
return app;
} |
<<<<<<<
private final Disease disease;
=======
private final Basketball basketball;
>>>>>>>
private final Disease disease;
private final Basketball basketball;
<<<<<<<
this.disease = new Disease(this);
=======
this.basketball = new Basketball(this);
>>>>>>>
this.disease = new Disease(this);
this.basketball = new Basketball(this);
<<<<<<<
public Disease disease() {return disease; }
=======
public Basketball basketball() { return basketball; }
>>>>>>>
public Disease disease() {return disease; }
public Basketball basketball() { return basketball; } |
<<<<<<<
private final Animal animal;
private final BackToTheFuture backToTheFuture;
private final PrincessBride princessBride;
private final Buffy buffy;
private final Relationships relationships;
private final Nation nation;
private final Dune dune;
private final AquaTeenHungerForce aquaTeenHungerForce;
private final ProgrammingLanguage programmingLanguage;
private final Kaamelott kaamelott;
private final BojackHorseman bojackHorseman;
private final Disease disease;
private final Basketball basketball;
=======
private final Barcode barcode;
>>>>>>>
private final Animal animal;
private final BackToTheFuture backToTheFuture;
private final PrincessBride princessBride;
private final Buffy buffy;
private final Relationships relationships;
private final Nation nation;
private final Dune dune;
private final AquaTeenHungerForce aquaTeenHungerForce;
private final ProgrammingLanguage programmingLanguage;
private final Kaamelott kaamelott;
private final BojackHorseman bojackHorseman;
private final Disease disease;
private final Basketball basketball;
private final Barcode barcode;
<<<<<<<
this.animal = new Animal(this);
this.backToTheFuture = new BackToTheFuture(this);
this.princessBride = new PrincessBride(this);
this.buffy = new Buffy(this);
this.relationships = new Relationships(this);
this.nation = new Nation(this);
this.dune = new Dune(this);
this.aquaTeenHungerForce = new AquaTeenHungerForce(this);
this.programmingLanguage = new ProgrammingLanguage(this);
this.kaamelott = new Kaamelott(this);
this.bojackHorseman = new BojackHorseman(this);
this.disease = new Disease(this);
this.basketball = new Basketball(this);
=======
this.barcode = new Barcode(this);
>>>>>>>
this.animal = new Animal(this);
this.backToTheFuture = new BackToTheFuture(this);
this.princessBride = new PrincessBride(this);
this.buffy = new Buffy(this);
this.relationships = new Relationships(this);
this.nation = new Nation(this);
this.dune = new Dune(this);
this.aquaTeenHungerForce = new AquaTeenHungerForce(this);
this.programmingLanguage = new ProgrammingLanguage(this);
this.kaamelott = new Kaamelott(this);
this.bojackHorseman = new BojackHorseman(this);
this.disease = new Disease(this);
this.basketball = new Basketball(this);
this.barcode = new Barcode(this); |
<<<<<<<
testAllMethodsThatReturnStringsActuallyReturnStrings(faker.nation());
=======
testAllMethodsThatReturnStringsActuallyReturnStrings(faker.dune());
>>>>>>>
testAllMethodsThatReturnStringsActuallyReturnStrings(faker.nation());
testAllMethodsThatReturnStringsActuallyReturnStrings(faker.dune()); |
<<<<<<<
private final CountryService countryService;
=======
private final DateAndTime dateAndTime;
>>>>>>>
private final CountryService countryService;
private final DateAndTime dateAndTime;
<<<<<<<
this.countryService = new CountryService(fakeValuesService, randomService);
=======
this.dateAndTime = new DateAndTime(randomService);
>>>>>>>
this.countryService = new CountryService(fakeValuesService, randomService);
this.dateAndTime = new DateAndTime(randomService); |
<<<<<<<
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
=======
import org.fusesource.mqtt.client.*;
>>>>>>>
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.fusesource.mqtt.client.*; |
<<<<<<<
import jrds.mockobjects.GenerateProbe;
import jrds.mockobjects.MokeProbe;
import jrds.store.ExtractInfo;
import junit.framework.Assert;
=======
>>>>>>>
<<<<<<<
ExtractInfo ei = ExtractInfo.get().make(pr.getBegin(), pr.getEnd());
DataProcessor dp = p.extract(ei);
=======
RrdDb db = new RrdDb(p.getRrdName());
FetchData fd = db.createFetchRequest(ConsolFun.AVERAGE, begin, end).fetchData();
DataProcessor dp = new DataProcessor(begin, end);
dp.addDatasource("shade", fd);
dp.setFetchRequestResolution(Full.STEP);
dp.processData();
>>>>>>>
ExtractInfo ei = ExtractInfo.get().make(pr.getBegin(), pr.getEnd());
DataProcessor dp = p.extract(ei);
<<<<<<<
Assert.assertTrue("datasource shade not found", ppm.containsKey("shade"));
Assert.assertTrue("datasource shade not found", ppm.containsKey("sun"));
=======
>>>>>>>
Assert.assertTrue("datasource shade not found", ppm.containsKey("shade"));
Assert.assertTrue("datasource shade not found", ppm.containsKey("sun")); |
<<<<<<<
import jrds.starter.HostStarter;
=======
>>>>>>>
import jrds.starter.HostStarter;
<<<<<<<
HostInfo host = p.getHost();
if(host != null)
env.put("host", host.getName());
String probename=p.getName();
//It might be called just for evaluate probename
//So no problem if it's null
if(probename != null)
env.put("probename", probename);
String label = p.getLabel();
if(label != null) {
env.put("label", label);
}
for(PropertyDescriptor bean: p.getPd().getBeans()) {
Method getter = bean.getReadMethod();
if(getter != null) {
try {
Object val = getter.invoke(p);
env.put("attr." + bean.getName(), val);
env.put("attr." + bean.getName() + ".signature", stringSignature(val.toString()));
} catch (Exception e) {
}
}
}
=======
RdsHost host = p.getHost();
check(host, indexes, values, evaluate.host);
check(p, indexes, values, evaluate.probename);
check(p, indexes, values, evaluate.label);
>>>>>>>
HostInfo host = p.getHost();
check(host, indexes, values, evaluate.host);
check(p, indexes, values, evaluate.probename);
check(p, indexes, values, evaluate.label);
<<<<<<<
if( o instanceof HostStarter) {
env.put("host", ((HostStarter) o).getName());
}
if( o instanceof HostInfo) {
env.put("host", ((HostInfo) o).getName());
=======
if( o instanceof RdsHost) {
check(o, indexes, values, evaluate.host);
>>>>>>>
if( o instanceof HostStarter) {
check(((HostStarter)o).getHost(), indexes, values, evaluate.host);
}
if( o instanceof HostInfo) {
check(o, indexes, values, evaluate.host);
<<<<<<<
ProbeDesc pd = (ProbeDesc) o;
env.put("probedesc.name", pd.getName());
}
=======
check(o, indexes, values, evaluate.probedesc_name);
}
>>>>>>>
check(o, indexes, values, evaluate.probedesc_name);
} |
<<<<<<<
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.Collections;
=======
import java.beans.PropertyDescriptor;
import java.lang.reflect.Constructor;
import java.util.Collections;
>>>>>>>
import java.beans.PropertyDescriptor;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.util.Collections;
<<<<<<<
import jrds.store.ExtractInfo;
=======
import jrds.configuration.HostBuilder;
import jrds.factories.ArgFactory;
>>>>>>>
import jrds.configuration.HostBuilder;
import jrds.factories.ArgFactory;
import jrds.store.ExtractInfo;
<<<<<<<
import org.rrd4j.data.DataProcessor;
import org.rrd4j.data.Plottable;
import org.rrd4j.graph.RrdGraphDef;
=======
import org.apache.log4j.Logger;
>>>>>>>
import org.apache.log4j.Logger;
import org.rrd4j.data.DataProcessor;
import org.rrd4j.data.Plottable;
<<<<<<<
//Exceptions can't happen, it was checked at configuration time
=======
>>>>>>>
<<<<<<<
public DataProcessor getPlottedDate(ExtractInfo ei) throws IOException {
Map<String, ? extends Plottable> pmap = Collections.emptyMap();
if(customData != null)
pmap = customData;
DataProcessor dp = gd.getPlottedDatas(probe, ei, pmap);
dp.processData();
return dp;
}
=======
public Map<String, String> getBeans() {
return beans;
}
public void setBeans(Map<String, String> beans) {
this.beans = beans;
}
>>>>>>>
public DataProcessor getPlottedDate(ExtractInfo ei) throws IOException {
Map<String, ? extends Plottable> pmap = Collections.emptyMap();
if(customData != null)
pmap = customData;
DataProcessor dp = gd.getPlottedDatas(probe, ei, pmap);
dp.processData();
return dp;
}
public Map<String, String> getBeans() {
return beans;
}
public void setBeans(Map<String, String> beans) {
this.beans = beans;
} |
<<<<<<<
@SuppressWarnings("unchecked")
private void parseSnmp(JrdsElement node, StarterNode p, HostInfo host) {
=======
/**
* A compatibility method, snmp starter should be managed as a connection
* @param node
* @param p
* @param host
*/
private void parseSnmp(JrdsElement node, StarterNode p, RdsHost host) {
>>>>>>>
@SuppressWarnings("unchecked")
/**
* A compatibility method, snmp starter should be managed as a connection
* @param node
* @param p
* @param host
*/
private void parseSnmp(JrdsElement node, StarterNode p, HostInfo host) { |
<<<<<<<
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.eventhandler.Event;
=======
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.common.registry.GameData;
>>>>>>>
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.eventhandler.Event;
import net.minecraftforge.fml.common.registry.GameData;
<<<<<<<
=======
* Gets the integer ID for the specified item stack.
* If the item stack is not linked to any ore, this will return -1 and no new entry will be created.
*
* @param stack The item stack of the ore.
* @return A number representing the ID for this ore type, or -1 if couldn't find it.
*/
@Deprecated // Use getOreIds below for more accuracy
public static int getOreID(ItemStack stack)
{
if (stack == null || stack.getItem() == null) return -1;
// HACK: use the registry name's ID. It is unique and it knows about substitutions. Fallback to a -1 value (what Item.getIDForItem would have returned) in the case where the registry is not aware of the item yet
// IT should be noted that -1 will fail the gate further down, if an entry already exists with value -1 for this name. This is what is broken and being warned about.
// APPARENTLY it's quite common to do this. OreDictionary should be considered alongside Recipes - you can't make them properly until you've registered with the game.
String registryName = stack.getItem().delegate.name();
int id;
if (registryName == null)
{
FMLLog.log(Level.DEBUG, "Attempted to find the oreIDs for an unregistered object (%s). This won't work very well.", stack);
return -1;
}
else
{
id = GameData.getItemRegistry().getId(registryName);
}
List<Integer> ids = stackToId.get(id); //Try the wildcard first
if (ids == null || ids.size() == 0)
{
ids = stackToId.get(id | ((stack.getItemDamage() + 1) << 16)); // Mow the Meta specific one, +1 so that meta 0 is significant
}
return (ids != null && ids.size() > 0) ? ids.get(0) : -1;
}
/**
>>>>>>>
<<<<<<<
=======
* Retrieves the List of items that are registered to this ore type at this instant.
* If the flag is TRUE, then it will create the list as empty if it did not exist.
*
* This option should be used by modders who are doing blanket scans in postInit.
* It greatly reduces clutter in the OreDictionary is the responsible and proper
* way to use the dictionary in a large number of cases.
*
* The other function above is utilized in OreRecipe and is required for the
* operation of that code.
*
* @param name The ore name, directly calls getOreID if the flag is TRUE
* @param alwaysCreateEntry Flag - should a new entry be created if empty
* @return An arraylist containing ItemStacks registered for this ore
*/
public static List<ItemStack> getOres(String name, boolean alwaysCreateEntry)
{
if (alwaysCreateEntry) {
return getOres(getOreID(name));
}
return nameToId.get(name) != null ? getOres(getOreID(name)) : EMPTY_LIST;
}
/**
* Returns whether or not an oreName exists in the dictionary.
* This function can be used to safely query the Ore Dictionary without
* adding needless clutter to the underlying map structure.
*
* Please use this when possible and appropriate.
*
* @param name The ore name
* @return Whether or not that name is in the Ore Dictionary.
*/
public static boolean doesOreNameExist(String name)
{
return nameToId.get(name) != null;
}
/**
>>>>>>>
<<<<<<<
if ("Unknown".equals(name)) return; //prevent bad IDs.
=======
if (name == null || name.isEmpty() || "Unknown".equals(name)) return; //prevent bad IDs.
if (ore == null || ore.getItem() == null)
{
FMLLog.bigWarning("Invalid registration attempt for an Ore Dictionary item with name %s has occurred. The registration has been denied to prevent crashes. The mod responsible for the registration needs to correct this.", name);
return; //prevent bad ItemStacks.
}
>>>>>>>
if ("Unknown".equals(name)) return; //prevent bad IDs.
if (ore == null || ore.getItem() == null)
{
FMLLog.bigWarning("Invalid registration attempt for an Ore Dictionary item with name %s has occurred. The registration has been denied to prevent crashes. The mod responsible for the registration needs to correct this.", name);
return; //prevent bad ItemStacks.
} |
<<<<<<<
fmlData.func_74782_a("ModList", list);
// name <-> id mappings
=======
fmlData.setTag("ModList", list);
>>>>>>>
fmlData.setTag("ModList", list);
// name <-> id mappings
<<<<<<<
fmlData.func_74782_a("ItemData", dataList);
// blocked ids
fmlData.func_74783_a("BlockedItemIds", GameData.getBlockedIds());
// block aliases
NBTTagList blockAliasList = new NBTTagList();
for (Entry<String, String> entry : GameData.getBlockRegistry().getAliases().entrySet())
{
NBTTagCompound tag = new NBTTagCompound();
tag.func_74778_a("K", entry.getKey());
tag.func_74778_a("V", entry.getValue());
blockAliasList.func_74742_a(tag);
}
fmlData.func_74782_a("BlockAliases", blockAliasList);
// item aliases
NBTTagList itemAliasList = new NBTTagList();
for (Entry<String, String> entry : GameData.getItemRegistry().getAliases().entrySet())
{
NBTTagCompound tag = new NBTTagCompound();
tag.func_74778_a("K", entry.getKey());
tag.func_74778_a("V", entry.getValue());
itemAliasList.func_74742_a(tag);
}
fmlData.func_74782_a("ItemAliases", itemAliasList);
=======
fmlData.setTag("ItemData", dataList);
>>>>>>>
fmlData.setTag("ItemData", dataList);
// blocked ids
fmlData.setIntArray("BlockedItemIds", GameData.getBlockedIds());
// block aliases
NBTTagList blockAliasList = new NBTTagList();
for (Entry<String, String> entry : GameData.getBlockRegistry().getAliases().entrySet())
{
NBTTagCompound tag = new NBTTagCompound();
tag.setString("K", entry.getKey());
tag.setString("V", entry.getValue());
blockAliasList.appendTag(tag);
}
fmlData.setTag("BlockAliases", blockAliasList);
// item aliases
NBTTagList itemAliasList = new NBTTagList();
for (Entry<String, String> entry : GameData.getItemRegistry().getAliases().entrySet())
{
NBTTagCompound tag = new NBTTagCompound();
tag.setString("K", entry.getKey());
tag.setString("V", entry.getValue());
itemAliasList.appendTag(tag);
}
fmlData.setTag("ItemAliases", itemAliasList);
<<<<<<<
// name <-> id mappings
NBTTagList list = tag.func_150295_c("ItemData", 10);
=======
NBTTagList list = tag.getTagList("ItemData", (byte)10);
>>>>>>>
// name <-> id mappings
NBTTagList list = tag.getTagList("ItemData", 10); |
<<<<<<<
import com.taobao.android.builder.hook.dex.DexByteCodeConverterHook;
=======
import com.taobao.android.builder.tools.FileNameUtils;
>>>>>>>
import com.taobao.android.builder.hook.dex.DexByteCodeConverterHook;
import com.taobao.android.builder.tools.FileNameUtils;
<<<<<<<
@NonNull
public DexByteCodeConverter getDexByteCodeConverter() {
if (!buildType.equals("release")){
return super.getDexByteCodeConverter();
}
if (dexByteCodeConverter == null){
dexByteCodeConverter = new DexByteCodeConverterHook(getLogger(), defaultBuilder.getTargetInfo(), javaProcessExecutor, verboseExec);
}
return dexByteCodeConverter;
}
=======
public static interface MultiDexer {
public Collection<File> repackageJarList(Collection<File> files) throws IOException;
public void dexMerge(List<Dex> dexList, File outDexFolder) throws IOException;
}
>>>>>>>
@NonNull
public DexByteCodeConverter getDexByteCodeConverter() {
if (!buildType.equals("release")){
return super.getDexByteCodeConverter();
}
if (dexByteCodeConverter == null){
dexByteCodeConverter = new DexByteCodeConverterHook(getLogger(), defaultBuilder.getTargetInfo(), javaProcessExecutor, verboseExec);
}
return dexByteCodeConverter;
}
public static interface MultiDexer {
public Collection<File> repackageJarList(Collection<File> files) throws IOException;
public void dexMerge(List<Dex> dexList, File outDexFolder) throws IOException;
} |
<<<<<<<
this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 100, this.field_146295_m - 38, I18n.func_135052_a("gui.done")));
=======
this.buttonList.add(new GuiButton(1, this.width / 2 - 75, this.height - 38, I18n.format("gui.done")));
>>>>>>>
this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height - 38, I18n.format("gui.done"))); |
<<<<<<<
public void setExtensions(List<GeneratorExtension> extensions) {
this.extensions=extensions;
}
=======
public String getRestIFPackageName() {
return restIFPackageName;
}
public void setRestIFPackageName(String restIFPackageName) {
this.restIFPackageName = restIFPackageName;
}
public String getInterfaceNameSuffix() {
return interfaceNameSuffix;
}
public void setInterfaceNameSuffix(String interfaceNameSuffix) {
this.interfaceNameSuffix = interfaceNameSuffix;
}
>>>>>>>
public void setExtensions(List<GeneratorExtension> extensions) {
this.extensions=extensions;
}
public String getRestIFPackageName() {
return restIFPackageName;
}
public void setRestIFPackageName(String restIFPackageName) {
this.restIFPackageName = restIFPackageName;
}
public String getInterfaceNameSuffix() {
return interfaceNameSuffix;
}
public void setInterfaceNameSuffix(String interfaceNameSuffix) {
this.interfaceNameSuffix = interfaceNameSuffix;
} |
<<<<<<<
boolean generateClientProxy = false;
boolean useTitlePropertyForSchemaNames=false;
String modelPackageName = "model";
String asyncResourceTrait = null;
String customAnnotator = null;
List<GeneratorExtension> extensions = null;
Map<String,String> jsonMapperConfiguration = new HashMap<String, String>();
=======
String modelPackageName = "model";
String restIFPackageName = "resource";
String interfaceNameSuffix = "Resource";
>>>>>>>
boolean generateClientProxy = false;
boolean useTitlePropertyForSchemaNames=false;
String modelPackageName = "model";
String asyncResourceTrait = null;
String customAnnotator = null;
List<GeneratorExtension> extensions = null;
Map<String,String> jsonMapperConfiguration = new HashMap<String, String>();
String restIFPackageName = "resource";
String interfaceNameSuffix = "Resource";
<<<<<<<
else if(argName.equals("generateClientProxy")){
generateClientProxy = Boolean.parseBoolean(argValue);
}
else if(argName.equals("useTitlePropertyForSchemaNames")){
useTitlePropertyForSchemaNames = Boolean.parseBoolean(argValue);
}
else if(argName.equals("modelPackageName")){
modelPackageName = argValue;
}
else if(argName.equals("asyncResourceTrait")){
asyncResourceTrait = argValue;
}
else if(argName.equals("customAnnotator")){
customAnnotator = argValue;
}
else if(argName.equals("extensions")){
extensions = new ArrayList<GeneratorExtension>();
String[] extensionClasses = argValue.split(",");
for(String s: extensionClasses) {
s = s.trim();
try {
extensions.add((GeneratorExtension) Class.forName(s).newInstance());
} catch (Exception e) {
throw new RuntimeException("unknown extension " + s);
}
}
}
else if(argName.startsWith("jsonschema2pojo.")) {
String name = argName.substring("jsonschema2pojo.".length());
jsonMapperConfiguration.put(name, argValue);
}
=======
else if(argName.equals("modelPackageName")){
modelPackageName = argValue;
}
else if(argName.equals("restIFPackageName")){
restIFPackageName = argValue;
}
else if(argName.equals("interfaceNameSuffix")){
interfaceNameSuffix = argValue;
}
>>>>>>>
else if(argName.equals("generateClientProxy")){
generateClientProxy = Boolean.parseBoolean(argValue);
}
else if(argName.equals("useTitlePropertyForSchemaNames")){
useTitlePropertyForSchemaNames = Boolean.parseBoolean(argValue);
}
else if(argName.equals("modelPackageName")){
modelPackageName = argValue;
}
else if(argName.equals("restIFPackageName")){
restIFPackageName = argValue;
}
else if(argName.equals("interfaceNameSuffix")){
interfaceNameSuffix = argValue;
}
else if(argName.equals("asyncResourceTrait")){
asyncResourceTrait = argValue;
}
else if(argName.equals("customAnnotator")){
customAnnotator = argValue;
}
else if(argName.equals("extensions")){
extensions = new ArrayList<GeneratorExtension>();
String[] extensionClasses = argValue.split(",");
for(String s: extensionClasses) {
s = s.trim();
try {
extensions.add((GeneratorExtension) Class.forName(s).newInstance());
} catch (Exception e) {
throw new RuntimeException("unknown extension " + s);
}
}
}
else if(argName.startsWith("jsonschema2pojo.")) {
String name = argName.substring("jsonschema2pojo.".length());
jsonMapperConfiguration.put(name, argValue);
}
<<<<<<<
configuration.setGenerateClientInterface(generateClientProxy);
configuration.setEmptyResponseReturnVoid(mapToVoid);
configuration.setUseTitlePropertyWhenPossible(useTitlePropertyForSchemaNames);
configuration.setModelPackageName(modelPackageName);
configuration.setAsyncResourceTrait(asyncResourceTrait);
if (extensions!=null) configuration.setExtensions(extensions);
if(!jsonMapperConfiguration.isEmpty()) configuration.setJsonMapperConfiguration(jsonMapperConfiguration);
if(customAnnotator!=null && !customAnnotator.trim().isEmpty()){
try {
configuration.setCustomAnnotator((Class)Class.forName(customAnnotator));
} catch (ClassNotFoundException e) {}
}
=======
configuration.setModelPackageName(modelPackageName);
configuration.setRestIFPackageName(restIFPackageName);
configuration.setInterfaceNameSuffix(interfaceNameSuffix);
>>>>>>>
configuration.setGenerateClientInterface(generateClientProxy);
configuration.setEmptyResponseReturnVoid(mapToVoid);
configuration.setUseTitlePropertyWhenPossible(useTitlePropertyForSchemaNames);
configuration.setModelPackageName(modelPackageName);
configuration.setRestIFPackageName(restIFPackageName);
configuration.setInterfaceNameSuffix(interfaceNameSuffix);
configuration.setAsyncResourceTrait(asyncResourceTrait);
if (extensions!=null) configuration.setExtensions(extensions);
if(!jsonMapperConfiguration.isEmpty()) configuration.setJsonMapperConfiguration(jsonMapperConfiguration);
if(customAnnotator!=null && !customAnnotator.trim().isEmpty()){
try {
configuration.setCustomAnnotator((Class)Class.forName(customAnnotator));
} catch (ClassNotFoundException e) {}
} |
<<<<<<<
if (parameterName!=null){
bodyType.setExample("examples/" + parameterName + ".xml");
bodyType.setExampleOrigin("examples/" + parameterName
+ ".xml");
}
=======
bodyType.setExample(EXAMPLES_FOLDER + parameterName + XML_FILE_EXT);
bodyType.setExampleOrigin(EXAMPLES_FOLDER + parameterName
+ XML_FILE_EXT);
>>>>>>>
if (parameterName!=null){
bodyType.setExample(EXAMPLES_FOLDER + parameterName + XML_FILE_EXT);
bodyType.setExampleOrigin(EXAMPLES_FOLDER + parameterName
+ XML_FILE_EXT);
}
<<<<<<<
bodyType.setSchema(parameterName + "-jsonshema");
if (parameterName!=null){
bodyType.setExample("examples/" + parameterName + ".json");
bodyType.setExampleOrigin("examples/" + parameterName
+ ".json");
}
=======
bodyType.setSchema(returnName + "-jsonshema");
bodyType.setExample(EXAMPLES_FOLDER + returnName + JSON_FILE_EXT);
bodyType.setExampleOrigin(EXAMPLES_FOLDER + returnName
+ JSON_FILE_EXT);
>>>>>>>
bodyType.setSchema(parameterName + "-jsonshema");
if (parameterName!=null){
bodyType.setExample(EXAMPLES_FOLDER + returnName + JSON_FILE_EXT);
bodyType.setExampleOrigin(EXAMPLES_FOLDER + returnName
+ JSON_FILE_EXT);
}
<<<<<<<
if (returnName!=null){
mimeType.setExample("examples/" + returnName + ".xml");
mimeType.setExampleOrigin("examples/" + returnName
+ ".xml");
}
=======
mimeType.setExample(EXAMPLES_FOLDER + returnName + XML_FILE_EXT);
mimeType.setExampleOrigin(EXAMPLES_FOLDER + returnName
+ XML_FILE_EXT);
>>>>>>>
if (returnName!=null){
mimeType.setExample(EXAMPLES_FOLDER + returnName + XML_FILE_EXT);
mimeType.setExampleOrigin(EXAMPLES_FOLDER + returnName
+ XML_FILE_EXT);
}
<<<<<<<
if (returnName!=null){
mimeType.setExample("examples/" + returnName + ".json");
mimeType.setExampleOrigin("examples/" + returnName
+ ".json");
}
=======
mimeType.setExample(EXAMPLES_FOLDER + returnName + JSON_FILE_EXT);
mimeType.setExampleOrigin(EXAMPLES_FOLDER + returnName
+ JSON_FILE_EXT);
>>>>>>>
if (returnName!=null){
mimeType.setExample(EXAMPLES_FOLDER + returnName + JSON_FILE_EXT);
mimeType.setExampleOrigin(EXAMPLES_FOLDER + returnName
+ JSON_FILE_EXT);
} |
<<<<<<<
Field pathListField = findField(original, "pathList");
pathListField.setAccessible(true);
Object originPathListObject = pathListField.get(original);
Field definingContextField = findField(originPathListObject, "definingContext");
definingContextField.set(originPathListObject, loader);
Field loadPathList = findField(loader, "pathList");
//just use PathClassloader's pathList
loadPathList.set(loader, originPathListObject);
=======
Field pathListField = findField(original, "pathList");
pathListField.setAccessible(true);
Object originPathListObject = pathListField.get(original);
//
Field definingContextField = findField(originPathListObject, "definingContext");
definingContextField.set(originPathListObject, loader);
//
Field loadPathList = findField(loader, "pathList");
//just use PathClassloader's pathList
loadPathList.set(loader, originPathListObject);
>>>>>>>
Field pathListField = findField(original, "pathList");
pathListField.setAccessible(true);
Object originPathListObject = pathListField.get(original);
//
Field definingContextField = findField(originPathListObject, "definingContext");
definingContextField.set(originPathListObject, loader);
Field loadPathList = findField(loader, "pathList");
//just use PathClassloader's pathList
loadPathList.set(loader, originPathListObject); |
<<<<<<<
/* ... for static adopt() method, doing low-level copies from foreign objects */
import javax.xml.stream.XMLEventWriter;
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
import org.xml.sax.ext.LexicalHandler;
=======
/* ... for Adjusting API for Source / Result */
import java.io.StringReader;
import javax.xml.parsers.ParserConfigurationException;
import org.postgresql.pljava.Adjusting;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
>>>>>>>
/* ... for static adopt() method, doing low-level copies from foreign objects */
import javax.xml.stream.XMLEventWriter;
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
import org.xml.sax.ext.LexicalHandler;
/* ... for Adjusting API for Source / Result */
import java.io.StringReader;
import javax.xml.parsers.ParserConfigurationException;
import org.postgresql.pljava.Adjusting;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException; |
<<<<<<<
Queue<Vertex<Snippet>> snippetQueue = new LinkedList<>();
=======
List<VertexPair<Snippet>> snippetVPairs =
new ArrayList<VertexPair<Snippet>>();
>>>>>>>
List<VertexPair<Snippet>> snippetVPairs = new ArrayList<>();
<<<<<<<
Map<String, Vertex<Snippet>> provider = new HashMap<>();
/**
* Set of provides/requires labels for which at least one consumer has
* been seen. An instance field for the same reason as {@code provider}.
*/
Set<String> consumer = new HashSet<>();
=======
Map<String, VertexPair<Snippet>> provider =
new HashMap<String, VertexPair<Snippet>>();
>>>>>>>
Map<String, VertexPair<Snippet>> provider = new HashMap<>();
<<<<<<<
Vertex<Snippet> v = new Vertex<>( snip);
snippetQueue.add( v);
=======
VertexPair<Snippet> v = new VertexPair<Snippet>( snip);
snippetVPairs.add( v);
>>>>>>>
VertexPair<Snippet> v = new VertexPair<>( snip);
snippetVPairs.add( v);
<<<<<<<
Queue<Vertex<Snippet>> q = new LinkedList<>();
for ( Iterator<Vertex<Snippet>> it = snippetQueue.iterator() ;
it.hasNext() ; )
=======
Queue<Vertex<Snippet>> fwdReady;
Queue<Vertex<Snippet>> revReady;
if ( reproducible )
>>>>>>>
Queue<Vertex<Snippet>> fwdReady;
Queue<Vertex<Snippet>> revReady;
if ( reproducible )
<<<<<<<
protoMappings = new ArrayList<>();
=======
protoMappings = new ArrayList<Map.Entry<TypeMirror, String>>();
>>>>>>>
protoMappings = new ArrayList<>();
<<<<<<<
List<Vertex<Map.Entry<Class<?>, String>>> vs = new ArrayList<>(
=======
List<Vertex<Map.Entry<TypeMirror, String>>> vs =
new ArrayList<Vertex<Map.Entry<TypeMirror, String>>>(
>>>>>>>
List<Vertex<Map.Entry<TypeMirror, String>>> vs = new ArrayList<>(
<<<<<<<
for ( Map.Entry<Class<?>, String> me : protoMappings )
vs.add( new Vertex<>( me));
=======
for ( Map.Entry<TypeMirror, String> me : protoMappings )
vs.add( new Vertex<Map.Entry<TypeMirror, String>>( me));
>>>>>>>
for ( Map.Entry<TypeMirror, String> me : protoMappings )
vs.add( new Vertex<Map.Entry<TypeMirror, String>>( me));
<<<<<<<
Queue<Vertex<Map.Entry<Class<?>, String>>> q = new LinkedList<>();
for ( Vertex<Map.Entry<Class<?>, String>> v : vs )
=======
Queue<Vertex<Map.Entry<TypeMirror, String>>> q;
if ( reproducible )
{
q = new PriorityQueue<Vertex<Map.Entry<TypeMirror, String>>>(
11, new TypeTiebreaker());
}
else
{
q = new LinkedList<Vertex<Map.Entry<TypeMirror, String>>>();
}
for ( Vertex<Map.Entry<TypeMirror, String>> v : vs )
>>>>>>>
Queue<Vertex<Map.Entry<TypeMirror, String>>> q;
if ( reproducible )
{
q = new PriorityQueue<>( 11, new TypeTiebreaker());
}
else
{
q = new LinkedList<>();
}
for ( Vertex<Map.Entry<TypeMirror, String>> v : vs )
<<<<<<<
finalMappings = new ArrayList<>( protoMappings.size());
=======
>>>>>>> |
<<<<<<<
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
=======
import javax.xml.parsers.SAXParserFactory;
>>>>>>>
import javax.xml.parsers.SAXParserFactory;
<<<<<<<
if ( null == sourceClass
|| Source.class == sourceClass
|| Adjusting.XML.Source.class.equals(sourceClass) )
sourceClass = preferredSourceClass(sourceClass);
=======
Class<? extends T> sc = sourceClass;
if ( null == sc
|| Source.class == sc
|| Adjusting.XML.Source.class.equals(sc) )
sc = preferredSourceClass(sc);
>>>>>>>
Class<? extends T> sc = sourceClass;
if ( null == sc
|| Source.class == sc
|| Adjusting.XML.Source.class.equals(sc) )
sc = preferredSourceClass(sc);
<<<<<<<
/**
* Return a {@code Class<? extends Result>} object representing the most
* natural or preferred presentation if the caller has left it
* unspecified.
*<p>
* Override if the preferred flavor is not {@code SAXResult.class},
* which this implementation returns.
* @param resultClass Either null, Result, or Adjusting.XML.Result.
* @return A preferred flavor of Adjusting.XML.Result, if resultClass is
* Adjusting.XML.Result, otherwise the corresponding flavor of ordinary
* Result.
*/
@SuppressWarnings("unchecked")
protected <T extends Result> Class<T> preferredResultClass(
Class<T> resultClass)
{
return Adjusting.XML.Result.class == resultClass
? (Class<T>)AdjustingSAXResult.class
: (Class<T>)SAXResult.class;
}
=======
/**
* Return a {@code Class<? extends Result>} object representing the most
* natural or preferred presentation if the caller has left it
* unspecified.
*<p>
* Override if the preferred flavor is not {@code SAXResult.class},
* which this implementation returns.
* @param resultClass Either null, Result, or Adjusting.XML.Result.
* @return A preferred flavor of Adjusting.XML.Result, if resultClass is
* Adjusting.XML.Result, otherwise the corresponding flavor of ordinary
* Result.
*/
@SuppressWarnings("unchecked")
protected <T extends Result> Class<? extends T> preferredResultClass(
Class<T> resultClass)
{
return Adjusting.XML.Result.class == resultClass
? (Class<? extends T>)AdjustingSAXResult.class
: (Class<? extends T>)SAXResult.class;
}
>>>>>>>
/**
* Return a {@code Class<? extends Result>} object representing the most
* natural or preferred presentation if the caller has left it
* unspecified.
*<p>
* Override if the preferred flavor is not {@code SAXResult.class},
* which this implementation returns.
* @param resultClass Either null, Result, or Adjusting.XML.Result.
* @return A preferred flavor of Adjusting.XML.Result, if resultClass is
* Adjusting.XML.Result, otherwise the corresponding flavor of ordinary
* Result.
*/
@SuppressWarnings("unchecked")
protected <T extends Result> Class<? extends T> preferredResultClass(
Class<T> resultClass)
{
return Adjusting.XML.Result.class == resultClass
? (Class<? extends T>)AdjustingSAXResult.class
: (Class<? extends T>)SAXResult.class;
}
<<<<<<<
if ( null == resultClass
|| Result.class == resultClass
|| Adjusting.XML.Result.class == resultClass )
resultClass = preferredResultClass(resultClass);
=======
Class<? extends T> rc = resultClass;
if ( null == rc
|| Result.class == rc
|| Adjusting.XML.Result.class == rc )
rc = preferredResultClass(rc);
>>>>>>>
Class<? extends T> rc = resultClass;
if ( null == rc
|| Result.class == rc
|| Adjusting.XML.Result.class == rc )
rc = preferredResultClass(rc);
<<<<<<<
if ( null == xr )
{
SAXParserFactory spf = SAXParserFactory.newInstance();
spf.setNamespaceAware(true);
xr = spf.newSAXParser().getXMLReader();
}
=======
>>>>>>>
<<<<<<<
try
{
SAXParserFactory spf = SAXParserFactory.newInstance();
spf.setNamespaceAware(true);
m_xr = spf.newSAXParser().getXMLReader();
}
catch ( ParserConfigurationException e )
{
throw new SAXException(e.getMessage(), e);
}
if ( wrapped )
m_xr = new SAXUnwrapFilter(m_xr);
=======
m_wrapped = wrapped;
m_spf = SAXParserFactory.newInstance();
m_spf.setNamespaceAware(true);
>>>>>>>
m_wrapped = wrapped;
m_spf = SAXParserFactory.newInstance();
m_spf.setNamespaceAware(true); |
<<<<<<<
"(?<=[\\r\\n])Name: ((?:.|(?:\\r\\n?+|\\n) )++)(?:(?:\\r\\n?+|\\n))" +
"(?:[^\\r\\n]++(?:\\r\\n?+|\\n)(?![\\r\\n]))*" +
"SQLJDeploymentDescriptor: (?:(?:\\r\\n?+|\\r) )*+TRUE(?!\\S)",
=======
"(?<=[\\r\\n])Name: ((?:.|(?:\\r\\n?+|\\n) )++)(?:\\r\\n?+|\\n)" +
"(?:[^\\r\\n]++(?:\\r\\n?+|\\n)(?![\\r\\n]))*" +
"SQLJDeploymentDescriptor: (?:(?:\\r\\n?+|\\r) )*+TRUE(?!\\S)",
>>>>>>>
"(?<=[\\r\\n])Name: ((?:.|(?:\\r\\n?+|\\n) )++)(?:\\r\\n?+|\\n)" +
"(?:[^\\r\\n]++(?:\\r\\n?+|\\n)(?![\\r\\n]))*" +
"SQLJDeploymentDescriptor: (?:(?:\\r\\n?+|\\r) )*+TRUE(?!\\S)",
<<<<<<<
=======
stmt = SQLUtils.getDefaultConnection().prepareStatement(
"DELETE FROM sqlj.typemap_entry " +
"WHERE sqlName OPERATOR(pg_catalog.=) ?");
>>>>>>>
<<<<<<<
=======
stmt = SQLUtils
.getDefaultConnection()
.prepareStatement(
"SELECT r.jarName" +
" FROM" +
" sqlj.jar_repository r" +
" INNER JOIN sqlj.classpath_entry c" +
" ON r.jarId OPERATOR(pg_catalog.=) c.jarId" +
" WHERE c.schemaName OPERATOR(pg_catalog.=) ?" +
" ORDER BY c.ordinal");
>>>>>>>
<<<<<<<
try(PreparedStatement stmt = SQLUtils.getDefaultConnection()
.prepareStatement(
"SELECT jarId FROM sqlj.jar_repository WHERE jarName = ?"))
=======
stmt = SQLUtils.getDefaultConnection().prepareStatement(
"SELECT jarId FROM sqlj.jar_repository " +
"WHERE jarName OPERATOR(pg_catalog.=) ?");
try
>>>>>>>
try(PreparedStatement stmt = SQLUtils.getDefaultConnection()
.prepareStatement(
"SELECT jarId FROM sqlj.jar_repository " +
"WHERE jarName OPERATOR(pg_catalog.=) ?"))
<<<<<<<
try(PreparedStatement stmt = SQLUtils.getDefaultConnection()
.prepareStatement(
"DELETE FROM sqlj.classpath_entry WHERE schemaName = ?"))
=======
stmt = SQLUtils.getDefaultConnection().prepareStatement(
"DELETE FROM sqlj.classpath_entry " +
"WHERE schemaName OPERATOR(pg_catalog.=) ?");
try
>>>>>>>
try(PreparedStatement stmt = SQLUtils.getDefaultConnection()
.prepareStatement(
"DELETE FROM sqlj.classpath_entry " +
"WHERE schemaName OPERATOR(pg_catalog.=) ?"))
<<<<<<<
+ " WHERE t.oid = ? AND n.oid = t.typnamespace"))
=======
+ " WHERE t.oid OPERATOR(pg_catalog.=) ?"
+ " AND n.oid OPERATOR(pg_catalog.=) t.typnamespace");
try
>>>>>>>
+ " WHERE t.oid OPERATOR(pg_catalog.=) ?"
+ " AND n.oid OPERATOR(pg_catalog.=) t.typnamespace"))
<<<<<<<
"SELECT jarId, jarOwner FROM sqlj.jar_repository"+
" WHERE jarName = ?"))
=======
"SELECT jarId, jarOwner FROM sqlj.jar_repository " +
"WHERE jarName OPERATOR(pg_catalog.=) ?");
try
>>>>>>>
"SELECT jarId, jarOwner FROM sqlj.jar_repository"+
" WHERE jarName OPERATOR(pg_catalog.=) ?"))
<<<<<<<
"SELECT oid FROM pg_catalog.pg_namespace WHERE nspname = ?"))
=======
"SELECT oid FROM pg_catalog.pg_namespace " +
"WHERE nspname OPERATOR(pg_catalog.=) ?");
try
>>>>>>>
"SELECT oid FROM pg_catalog.pg_namespace " +
"WHERE nspname OPERATOR(pg_catalog.=) ?")) |
<<<<<<<
static final SchemaVariant REL_1_6_0 = REL_1_5_0;
=======
static final SchemaVariant REL_1_5_7 = REL_1_5_0;
>>>>>>>
static final SchemaVariant REL_1_6_0 = REL_1_5_0;
static final SchemaVariant REL_1_5_7 = REL_1_5_0; |
<<<<<<<
=======
>>>>>>>
<<<<<<<
if (username.equals("") || password.equals("") || !vld) {
=======
if(username.equals("") || password.equals("") || !vld){
>>>>>>>
if(username.equals("") || password.equals("") || !vld){
<<<<<<<
// If there is no url, try to load an url :
=======
>>>>>>>
<<<<<<<
connect();
// Post the shared url :
postLink(url[0], sharedTitle, url[2], url[3]);
} catch (IOException | NullPointerException e) {
=======
NetworkManager manager = new NetworkManager(urlShaarli, username, password);
manager.retrieveLoginToken();
manager.login();
manager.postLink(url[0], sharedTitle, url[2], url[3], privateShare);
} catch (IOException | NullPointerException e){
>>>>>>>
NetworkManager manager = new NetworkManager(urlShaarli, username, password);
manager.retrieveLoginToken();
manager.login();
manager.postLink(url[0], sharedTitle, url[2], url[3], privateShare);
} catch (IOException | NullPointerException e){
<<<<<<<
private String getToken() throws IOException {
final String loginFormUrl = urlShaarli.concat("?do=login");
Connection.Response loginFormPage = Jsoup.connect(loginFormUrl)
.method(Connection.Method.GET)
.execute();
Document loginPageDoc = loginFormPage.parse();
Element tokenElement = loginPageDoc.body().select("input[name=token]").first();
cookies = loginFormPage.cookies();
return tokenElement.attr("value");
}
private void connect() throws IOException {
final String loginUrl = urlShaarli;
token = getToken();
// The actual request
Connection.Response loginPage = Jsoup.connect(loginUrl)
.followRedirects(true)
.method(Connection.Method.POST)
.cookies(cookies)
.data("login", username)
.data("password", password)
.data("token", token)
.data("returnurl", urlShaarli)
.execute();
cookies = loginPage.cookies();
Document document = loginPage.parse();
Element logoutElement = document.body().select("a[href=?do=logout]").first();
logoutElement.attr("href"); // If this fails, you're not connected
}
private void postLink(String url, String title, String description, String tags)
throws IOException {
String encodedShareUrl = URLEncoder.encode(url, "UTF-8");
// Get a token and a date :
final String postFormUrl = urlShaarli + "?post=" + encodedShareUrl;
Connection.Response formPage = Jsoup.connect(postFormUrl)
.followRedirects(true)
.cookies(cookies)
.timeout(10000)
.execute();
// cookies = formPage.cookies();
Document formPageDoc = formPage.parse();
// String debug = formPage.body();
Element tokenElement = formPageDoc.body().select("input[name=token]").first();
token = tokenElement.attr("value");
Element dateElement = formPageDoc.body().select("input[name=lf_linkdate]").first();
String date = dateElement.attr("value"); // The server date
if (title.equals("")) {
Element titleElement = formPageDoc.body().select("input[name=lf_title]").first();
title = titleElement.attr("value"); // The title given by shaarli
}
// The post request :
final String postUrl = urlShaarli + "?post=" + encodedShareUrl;
Connection postPageConn = Jsoup.connect(postUrl)
.method(Connection.Method.POST)
.cookies(cookies)
.timeout(10000)
.data("save_edit", "Save")
.data("token", token)
.data("lf_tags", tags)
.data("lf_linkdate", date)
.data("lf_url", url)
.data("lf_title", title)
.data("lf_description", description);
if (privateShare) postPageConn.data("lf_private", "on");
postPageConn.execute(); // Then we post
// String debug = postPage.body();
}
=======
>>>>>>> |
<<<<<<<
=======
import java.io.IOException;
import java.net.Socket;
import java.util.logging.Level;
>>>>>>> |
<<<<<<<
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
=======
>>>>>>>
<<<<<<<
appVariantContext.getVariantConfiguration().getProguardFiles(true, new ArrayList<>()));
=======
appVariantContext.getVariantConfiguration().getBuildType().getProguardFiles());
>>>>>>>
appVariantContext.getVariantConfiguration().getBuildType().getProguardFiles()); |
<<<<<<<
closePool();
pool = new OResourcePool<String, OrientBaseGraph>(iMax, new OResourcePoolListener<String, OrientBaseGraph>() {
@Override
public OrientBaseGraph createNewResource(final String iKey, final Object... iAdditionalArgs) {
final OrientBaseGraph g;
if (transactional)
g = new OrientGraph(getDatabase(), user, password, settings) {
@Override
public void shutdown() {
if (pool != null) {
getRawGraph().getLocalCache().clear();
pool.returnResource(this);
} else
super.shutdown();
}
};
else
g = new OrientGraphNoTx(getDatabase(), user, password, settings) {
@Override
public void shutdown() {
if (pool != null) {
getRawGraph().getLocalCache().clear();
pool.returnResource(this);
ODatabaseRecordThreadLocal.INSTANCE.remove();
} else
super.shutdown();
}
};
initGraph(g);
return g;
}
=======
if (pool != null)
pool.close();
>>>>>>>
closePool(); |
<<<<<<<
@Override
=======
@Override
public String restoreFileById(long fileId) throws IOException {
final int intId = extractFileId(fileId);
filesLock.acquireWriteLock();
try {
for (Map.Entry<String, Integer> entry : nameIdMap.entrySet()) {
if (entry.getValue() == -intId) {
addFile(entry.getKey(), fileId);
return entry.getKey();
}
}
} finally {
filesLock.releaseWriteLock();
}
return null;
}
>>>>>>>
@Override
public String restoreFileById(long fileId) throws IOException {
final int intId = extractFileId(fileId);
filesLock.acquireWriteLock();
try {
for (Map.Entry<String, Integer> entry : nameIdMap.entrySet()) {
if (entry.getValue() == -intId) {
addFile(entry.getKey(), fileId);
return entry.getKey();
}
}
} finally {
filesLock.releaseWriteLock();
}
return null;
}
@Override |
<<<<<<<
* OHotAlignmentNotPossibleException is raised because it's not possible to recover the database state.
*
* @throws OHotAlignmentNotPossibleException
=======
* OHotAlignmentNotPossibleExeption is raised because it's not possible to recover the database state.
*
* @throws OHotAlignmentNotPossibleExeption
>>>>>>>
* OHotAlignmentNotPossibleExeption is raised because it's not possible to recover the database state.
*
* @throws OHotAlignmentNotPossibleException |
<<<<<<<
//if (appVariantContext.getVariantData().getScope().getInstantRunBuildContext().isInInstantRunMode()) {
// throw new GradleException(
// "atlas plgin is not compatible with instant run， plese turn it off in your ide！");
//}
tAndroidBuilder.setBuildType(appVariantContext.getBuildType().getName());
new AwbProguradHook().hookProguardTask(appVariantContext);
=======
>>>>>>>
//if (appVariantContext.getVariantData().getScope().getInstantRunBuildContext().isInInstantRunMode()) {
// throw new GradleException(
// "atlas plgin is not compatible with instant run， plese turn it off in your ide！");
//}
tAndroidBuilder.setBuildType(appVariantContext.getBuildType().getName());
// new AwbProguradHook().hookProguardTask(appVariantContext); |
<<<<<<<
import com.orientechnologies.orient.core.db.record.ridbag.ORidBag;
=======
import com.orientechnologies.orient.core.db.record.OTrackedList;
>>>>>>>
import com.orientechnologies.orient.core.db.record.ridbag.ORidBag;
import com.orientechnologies.orient.core.db.record.OTrackedList;
<<<<<<<
final ORidBag bag = new ORidBag();
bag.add((OIdentifiable) found);
bag.add(iTo);
out = bag;
} else if (found instanceof ORidBag) {
=======
final OProperty prop = iFromVertex.getSchemaClass().getProperty(iFieldName);
final Collection coll;
if (prop != null && "true".equalsIgnoreCase(prop.getCustom("ordered")))
coll = new OTrackedList<Object>(iFromVertex);
else
coll = new OMVRBTreeRIDSet(iFromVertex);
coll.add(found);
coll.add(iTo);
out = coll;
} else if (found instanceof OMVRBTreeRIDSet) {
>>>>>>>
if (found.equals(iTo))
// SAME LINK, SKIP IT
return found;
final OProperty prop = iFromVertex.getSchemaClass().getProperty(iFieldName);
if (prop != null && "true".equalsIgnoreCase(prop.getCustom("ordered"))) {
final Collection coll = new OTrackedList<Object>(iFromVertex);
coll.add(found);
coll.add(iTo);
out = coll;
} else {
final ORidBag bag = new ORidBag();
bag.add((OIdentifiable) found);
bag.add(iTo);
out = bag;
}
} else if (found instanceof ORidBag) {
<<<<<<<
=======
} else if (curr.getSchemaClass().isSubClassOf(OrientEdgeType.CLASS_NAME)) {
// EDGE
if (curr.getSchemaClass().isSubClassOf(OrientEdgeType.CLASS_NAME)) {
final Direction direction = getConnectionDirection(iFieldName, useVertexFieldsForEdgeLabels);
// EDGE, REMOVE THE EDGE
if (iVertexToRemove.equals(OrientEdge.getConnection(curr, direction.opposite()))) {
it.remove();
if (iAlsoInverse)
removeInverseEdge(iVertex, iFieldName, iVertexToRemove, curr, useVertexFieldsForEdgeLabels);
found = true;
break;
}
}
>>>>>>> |
<<<<<<<
=======
public Object visit(OparseScript node, Object data);
public Object visit(OString node, Object data);
>>>>>>>
public Object visit(OparseScript node, Object data);
public Object visit(OString node, Object data);
<<<<<<<
=======
public Object visit(OStatementSemicolon node, Object data);
public Object visit(OStatementInternal node, Object data);
public Object visit(OExpressionStatement node, Object data);
public Object visit(OQueryStatement node, Object data);
>>>>>>>
public Object visit(OStatementSemicolon node, Object data);
public Object visit(OStatementInternal node, Object data);
public Object visit(OExpressionStatement node, Object data);
public Object visit(OQueryStatement node, Object data);
<<<<<<<
=======
public Object visit(OMatchStatement node, Object data);
>>>>>>>
public Object visit(OMatchStatement node, Object data);
<<<<<<<
=======
public Object visit(OUpdateEdgeStatement node, Object data);
>>>>>>>
public Object visit(OUpdateEdgeStatement node, Object data);
<<<<<<<
=======
public Object visit(OMoveVertexStatement node, Object data);
>>>>>>>
public Object visit(OMoveVertexStatement node, Object data);
<<<<<<<
=======
public Object visit(ONestedProjection node, Object data);
public Object visit(ONestedProjectionItem node, Object data);
>>>>>>>
public Object visit(ONestedProjection node, Object data);
public Object visit(ONestedProjectionItem node, Object data);
<<<<<<<
=======
public Object visit(OArrayConcatExpression node, Object data);
public Object visit(OArrayConcatExpressionElement node, Object data);
>>>>>>>
public Object visit(OArrayConcatExpression node, Object data);
public Object visit(OArrayConcatExpressionElement node, Object data);
<<<<<<<
=======
public Object visit(OClusterList node, Object data);
>>>>>>>
public Object visit(OClusterList node, Object data);
<<<<<<<
=======
public Object visit(OIndexName node, Object data);
>>>>>>>
public Object visit(OIndexName node, Object data);
<<<<<<<
=======
public Object visit(ONearOperator node, Object data);
public Object visit(OWithinOperator node, Object data);
public Object visit(OScAndOperator node, Object data);
>>>>>>>
public Object visit(ONearOperator node, Object data);
public Object visit(OWithinOperator node, Object data);
public Object visit(OScAndOperator node, Object data);
<<<<<<<
=======
public Object visit(ORightBinaryCondition node, Object data);
>>>>>>>
public Object visit(ORightBinaryCondition node, Object data);
<<<<<<<
=======
public Object visit(OContainsAnyCondition node, Object data);
>>>>>>>
public Object visit(OContainsAnyCondition node, Object data);
<<<<<<<
=======
public Object visit(OUnwind node, Object data);
>>>>>>>
public Object visit(OUnwind node, Object data);
<<<<<<<
=======
public Object visit(OBatch node, Object data);
>>>>>>>
public Object visit(OBatch node, Object data); |
<<<<<<<
// ConventionMappingHelper.map(dexTask, "dexBaseFile", new Callable<File>() {
// @Override
// public File call() {
// if (!awbBundle.getManifest().exists()) {
// return null;
// }
// return appVariantOutputContext.getVariantContext().apContext.getBaseAwb(awbBundle.getAwbSoName());
// }
// });
=======
// ConventionMappingHelper.map(dexTask, "dexBaseFile", new Callable<File>() {
// @Override
// public File call() {
// if (!awbBundle.getManifest().exists()) {
// return null;
// }
// return appVariantOutputContext.apContext.getBaseAwb(awbBundle.getAwbSoName());
// }
// });
>>>>>>>
// ConventionMappingHelper.map(dexTask, "dexBaseFile", new Callable<File>() {
// @Override
// public File call() {
// if (!awbBundle.getManifest().exists()) {
// return null;
// }
// }
// }); |
<<<<<<<
import com.orientechnologies.common.concur.resource.OSharedResourceAdaptiveExternal;
import com.orientechnologies.orient.core.Orient;
import com.orientechnologies.orient.core.config.OGlobalConfiguration;
import com.orientechnologies.orient.core.id.ORID;
import com.orientechnologies.orient.core.record.ORecordInternal;
=======
>>>>>>>
import com.orientechnologies.common.concur.resource.OSharedResourceAdaptiveExternal;
import com.orientechnologies.orient.core.config.OGlobalConfiguration;
import com.orientechnologies.orient.core.id.ORID;
import com.orientechnologies.orient.core.record.ORecordInternal;
<<<<<<<
public ORecordInternal<?> get(final ORID id) {
if (!isEnabled())
return null;
lock.acquireExclusiveLock();
try {
return cache.get(id);
} finally {
lock.releaseExclusiveLock();
}
}
@Override
public ORecordInternal<?> put(final ORecordInternal<?> record) {
if (!isEnabled())
return null;
if (!Orient.instance().getMemoryWatchDog().isMemoryAvailable())
return null;
lock.acquireExclusiveLock();
try {
return cache.put(record.getIdentity(), record);
} finally {
lock.releaseExclusiveLock();
}
}
@Override
public ORecordInternal<?> remove(final ORID id) {
if (!isEnabled())
return null;
lock.acquireExclusiveLock();
try {
return cache.remove(id);
} finally {
lock.releaseExclusiveLock();
}
}
@Override
=======
>>>>>>>
public ORecordInternal<?> get(final ORID id) {
if (!isEnabled())
return null;
lock.acquireExclusiveLock();
try {
return cache.get(id);
} finally {
lock.releaseExclusiveLock();
}
}
@Override
public ORecordInternal<?> put(final ORecordInternal<?> record) {
if (!isEnabled())
return null;
lock.acquireExclusiveLock();
try {
return cache.put(record.getIdentity(), record);
} finally {
lock.releaseExclusiveLock();
}
}
@Override
public ORecordInternal<?> remove(final ORID id) {
if (!isEnabled())
return null;
lock.acquireExclusiveLock();
try {
return cache.remove(id);
} finally {
lock.releaseExclusiveLock();
}
}
@Override |
<<<<<<<
//设置values.xml
File valuesXml = new File(resDir, "values/values.xml");
try {
removeStringValue(valuesXml, "ttid");
} catch (Exception e) {
throw new RuntimeException(e);
}
AtlasBuildContext.sBuilderAdapter.apkInjectInfoCreator.injectTpatchValuesRes(appVariantContext, valuesXml);
=======
//设置values.xml
File valuesXml = new File(resDir, "values/values.xml");
AtlasBuildContext.sBuilderAdapter.apkInjectInfoCreator.injectTpatchValuesRes(appVariantContext, valuesXml);
try {
removeStringValue(valuesXml, "config_channel");
removeStringValue(valuesXml, "ttid");
removeStringValue(valuesXml, "config_channel");
} catch (Exception e) {
throw new RuntimeException(e);
}
>>>>>>>
//设置values.xml
File valuesXml = new File(resDir, "values/values.xml");
AtlasBuildContext.sBuilderAdapter.apkInjectInfoCreator.injectTpatchValuesRes(appVariantContext, valuesXml);
try {
removeStringValue(valuesXml, "ttid");
removeStringValue(valuesXml, "config_channel");
} catch (Exception e) {
throw new RuntimeException(e);
} |
<<<<<<<
import com.orientechnologies.orient.core.metadata.schema.OClass;
=======
import com.orientechnologies.orient.core.index.ORuntimeKeyIndexDefinition;
import com.orientechnologies.orient.core.index.OSimpleKeyIndexDefinition;
import com.orientechnologies.orient.core.intent.OIntentMassiveInsert;
>>>>>>>
import com.orientechnologies.orient.core.index.ORuntimeKeyIndexDefinition;
import com.orientechnologies.orient.core.index.OSimpleKeyIndexDefinition;
import com.orientechnologies.orient.core.intent.OIntentMassiveInsert;
import com.orientechnologies.orient.core.metadata.schema.OClass;
<<<<<<<
public class OAbstractLocalHashIndex<T> extends OSharedResourceAdaptive implements OIndexInternal<T> {
public static final String TYPE_ID = OClass.INDEX_TYPE.HASH.toString();
=======
public abstract class OAbstractLocalHashIndex<T> extends OSharedResourceAdaptive implements OIndexInternal<T>, OCloseable {
private static final String CONFIG_CLUSTERS = "clusters";
private static final String CONFIG_MAP_RID = "mapRid";
>>>>>>>
public abstract class OAbstractLocalHashIndex<T> extends OSharedResourceAdaptive implements OIndexInternal<T>, OCloseable {
public static final String TYPE_ID = OClass.INDEX_TYPE.HASH.toString();
private static final String CONFIG_CLUSTERS = "clusters";
private static final String CONFIG_MAP_RID = "mapRid";
<<<<<<<
return OClass.INDEX_TYPE.HASH.toString();
=======
return type;
>>>>>>>
return null; // To change body of implemented methods use File | Settings | File Templates. |
<<<<<<<
=======
import com.taobao.android.builder.extension.factory.MultiDexConfigFactory;
>>>>>>>
import com.taobao.android.builder.extension.factory.MultiDexConfigFactory;
<<<<<<<
public Logger getLogger() {
return logger;
}
public Project getProject() {
return project;
}
=======
public NamedDomainObjectContainer<MultiDexConfig> getMultiDexConfigs() {
return multiDexConfigs;
}
public void setMultiDexConfigs(
NamedDomainObjectContainer<MultiDexConfig> multiDexConfigs) {
this.multiDexConfigs = multiDexConfigs;
}
>>>>>>>
public Logger getLogger() {
return logger;
}
public Project getProject() {
return project;
}
public NamedDomainObjectContainer<MultiDexConfig> getMultiDexConfigs() {
return multiDexConfigs;
}
public void setMultiDexConfigs(
NamedDomainObjectContainer<MultiDexConfig> multiDexConfigs) {
this.multiDexConfigs = multiDexConfigs;
} |
<<<<<<<
=======
import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.Future;
import java.util.concurrent.ThreadPoolExecutor;
>>>>>>>
<<<<<<<
if (filter(record))
if (!handleResult(record))
// END OF EXECUTION
=======
if (filter(record, evaluateRecords))
if (!handleResult(record, true))
// LIMIT REACHED
>>>>>>>
if (filter(record, evaluateRecords))
if (!handleResult(record))
// LIMIT REACHED
<<<<<<<
protected boolean handleResult(final OIdentifiable iRecord) {
=======
/**
* Handles the record in result.
*
* @param iRecord
* Record to handle
* @param iCloneIt
* Clone the record
* @return false if limit has been reached, otherwise true
*/
protected boolean handleResult(final OIdentifiable iRecord, final boolean iCloneIt) {
lastRecord = null;
>>>>>>>
/**
* Handles the record in result.
*
* @param iRecord
* Record to handle
* @return false if limit has been reached, otherwise true
*/
protected boolean handleResult(final OIdentifiable iRecord) {
<<<<<<<
protected void parseIndexSearchResult(final Collection<ODocument> entries) {
for (final ODocument document : entries) {
final boolean continueResultParsing = handleResult(document);
if (!continueResultParsing)
break;
}
}
=======
>>>>>>>
<<<<<<<
Entry<Object, OIdentifiable> entryRecord = cursor.next(needsToFetch);
if (needsToFetch > 0)
needsToFetch--;
cursorLoop: while (entryRecord != null) {
final OIdentifiable identifiable = entryRecord.getValue();
final ORecord record = identifiable.getRecord();
if (record instanceof ORecordSchemaAware<?>) {
final ORecordSchemaAware<?> recordSchemaAware = (ORecordSchemaAware<?>) record;
final Map<OClass, String> targetClasses = parsedTarget.getTargetClasses();
if ((targetClasses != null) && (!targetClasses.isEmpty())) {
for (OClass targetClass : targetClasses.keySet()) {
if (!targetClass.isSuperClassOf(recordSchemaAware.getSchemaClass()))
continue cursorLoop;
}
}
}
if (compiledFilter == null || !evaluateRecords || evaluateRecord(record)) {
if (!handleResult(record))
break;
}
entryRecord = cursor.next(needsToFetch);
if (needsToFetch > 0)
needsToFetch--;
}
=======
cursor.setPrefetchSize(needsToFetch);
fetchFromTarget(cursor, evaluateRecords);
//
// Entry<Object, OIdentifiable> entryRecord = cursor.nextEntry();
// if (needsToFetch > 0)
// needsToFetch--;
//
// while (entryRecord != null) {
// final OIdentifiable identifiable = entryRecord.getValue();
// final ORecord record = identifiable.getRecord();
//
// if (!executeSearchRecord(record, evaluateRecords))
// // LIMIT REACHED
// break;
//
// entryRecord = cursor.nextEntry();
//
// if (needsToFetch > 0)
// needsToFetch--;
// }
>>>>>>>
cursor.setPrefetchSize(needsToFetch);
fetchFromTarget(cursor, evaluateRecords);
//
// Entry<Object, OIdentifiable> entryRecord = cursor.nextEntry();
// if (needsToFetch > 0)
// needsToFetch--;
//
// while (entryRecord != null) {
// final OIdentifiable identifiable = entryRecord.getValue();
// final ORecord record = identifiable.getRecord();
//
// if (!executeSearchRecord(record, evaluateRecords))
// // LIMIT REACHED
// break;
//
// entryRecord = cursor.nextEntry();
//
// if (needsToFetch > 0)
// needsToFetch--;
// }
<<<<<<<
if (!handleResult(doc))
=======
if (!handleResult(doc, false))
// LIMIT REACHED
>>>>>>>
if (!handleResult(doc))
// LIMIT REACHED
<<<<<<<
handleResult(createIndexEntryAsDocument(keyValue, r.getIdentity()));
else
=======
if (!handleResult(createIndexEntryAsDocument(keyValue, r.getIdentity()), true))
// LIMIT REACHED
break;
} else {
>>>>>>>
if (!handleResult(createIndexEntryAsDocument(keyValue, r.getIdentity())))
// LIMIT REACHED
break;
} else {
<<<<<<<
handleResult(createIndexEntryAsDocument(keyValue, ((OIdentifiable) res).getIdentity()));
=======
handleResult(createIndexEntryAsDocument(keyValue, ((OIdentifiable) res).getIdentity()), true);
}
>>>>>>>
handleResult(createIndexEntryAsDocument(keyValue, ((OIdentifiable) res).getIdentity()));
} |
<<<<<<<
previousValidation = ((ODatabaseDocument) ownerDb).isValidationEnabled();
if (previousValidation)
((ODatabaseDocument) ownerDb).setValidationEnabled(false);
=======
if (disableValidation) {
previousValidation = ((ODatabaseRecord) ownerDb).isValidationEnabled();
if (previousValidation)
((ODatabaseRecord) ownerDb).setValidationEnabled(false);
}
>>>>>>>
if (disableValidation) {
previousValidation = ((ODatabaseDocument) ownerDb).isValidationEnabled();
if (previousValidation)
((ODatabaseDocument) ownerDb).setValidationEnabled(false);
}
<<<<<<<
if (ownerDb instanceof ODatabaseDocument) {
((ODatabaseDocument) ownerDb).setRetainRecords(previousRetainRecords);
((ODatabaseDocument) ownerDb).setValidationEnabled(previousValidation);
=======
if (ownerDb instanceof ODatabaseRecord) {
((ODatabaseRecord) ownerDb).setRetainRecords(previousRetainRecords);
if (disableValidation)
((ODatabaseRecord) ownerDb).setValidationEnabled(previousValidation);
>>>>>>>
if (ownerDb instanceof ODatabaseDocument) {
((ODatabaseDocument) ownerDb).setRetainRecords(previousRetainRecords);
if (disableValidation)
((ODatabaseDocument) ownerDb).setValidationEnabled(previousValidation); |
<<<<<<<
protected final boolean useSBTreeRIDSet;
public OIndexMultiValues(final String type, OIndexEngine<Set<OIdentifiable>> indexEngine) {
super(type, indexEngine);
OStorage storage = ODatabaseRecordThreadLocal.INSTANCE.get().getStorage();
useSBTreeRIDSet = storage.getType().equals(OEngineLocalPaginated.NAME)
&& OGlobalConfiguration.INDEX_NOTUNIQUE_USE_SBTREE_CONTAINER_BY_DEFAULT.getValueAsBoolean();
=======
public OIndexMultiValues(final String type, String algorithm, OIndexEngine<Set<OIdentifiable>> indexEngine) {
super(type, algorithm, indexEngine);
>>>>>>>
protected final boolean useSBTreeRIDSet;
public OIndexMultiValues(final String type, String algorithm, OIndexEngine<Set<OIdentifiable>> indexEngine) {
super(type, algorithm, indexEngine);
OStorage storage = ODatabaseRecordThreadLocal.INSTANCE.get().getStorage();
useSBTreeRIDSet = storage.getType().equals(OEngineLocalPaginated.NAME)
&& OGlobalConfiguration.INDEX_NOTUNIQUE_USE_SBTREE_CONTAINER_BY_DEFAULT.getValueAsBoolean(); |
<<<<<<<
long firstPageMemoryPointer = diskCache.loadAndLockForWrite(fileId, firstPageIndex);
=======
int deleteContentSize;
long firstPageMemoryPointer = diskCache.loadForWrite(fileId, firstPageIndex);
>>>>>>>
long firstPageMemoryPointer = diskCache.loadForWrite(fileId, firstPageIndex);
<<<<<<<
long pagePointer = diskCache.loadAndLockForWrite(fileId, pageIndex);
int recordSizesDiff;
=======
long pagePointer = diskCache.loadForWrite(fileId, pageIndex);
>>>>>>>
long pagePointer = diskCache.loadForWrite(fileId, pageIndex);
int recordSizesDiff; |
<<<<<<<
public void getEntriesMajor(Object iRangeFrom, final boolean isInclusive, boolean ascOrder,
final IndexEntriesResultListener entriesResultListener) {
checkForRebuild();
iRangeFrom = getCollatingValue(iRangeFrom);
acquireSharedLock();
try {
indexEngine.getEntriesMajor(iRangeFrom, isInclusive, ascOrder, MultiValuesTransformer.INSTANCE,
new OIndexEngine.EntriesResultListener() {
@Override
public boolean addResult(ODocument entry) {
return entriesResultListener.addResult(entry);
}
});
} finally {
releaseSharedLock();
}
}
public void getEntriesMinor(Object iRangeTo, boolean isInclusive, boolean ascOrder,
final IndexEntriesResultListener entriesResultListener) {
checkForRebuild();
iRangeTo = getCollatingValue(iRangeTo);
acquireSharedLock();
try {
indexEngine.getEntriesMinor(iRangeTo, isInclusive, ascOrder, MultiValuesTransformer.INSTANCE,
new OIndexEngine.EntriesResultListener() {
@Override
public boolean addResult(ODocument entry) {
return entriesResultListener.addResult(entry);
}
});
} finally {
releaseSharedLock();
}
}
public void getEntriesBetween(Object iRangeFrom, Object iRangeTo, boolean inclusive, boolean ascOrder,
final IndexEntriesResultListener indexEntriesResultListener) {
checkForRebuild();
iRangeFrom = getCollatingValue(iRangeFrom);
iRangeTo = getCollatingValue(iRangeTo);
final OType[] types = getDefinition().getTypes();
if (types.length == 1) {
iRangeFrom = OType.convert(iRangeFrom, types[0].getDefaultJavaType());
iRangeTo = OType.convert(iRangeTo, types[0].getDefaultJavaType());
}
acquireSharedLock();
try {
indexEngine.getEntriesBetween(iRangeFrom, iRangeTo, inclusive, ascOrder, MultiValuesTransformer.INSTANCE,
new OIndexEngine.EntriesResultListener() {
@Override
public boolean addResult(ODocument entry) {
return indexEntriesResultListener.addResult(entry);
}
});
} finally {
releaseSharedLock();
}
}
public void getEntries(Collection<?> iKeys, IndexEntriesResultListener resultListener) {
checkForRebuild();
final List<Object> sortedKeys = new ArrayList<Object>(iKeys);
Collections.sort(sortedKeys, ODefaultComparator.INSTANCE);
acquireSharedLock();
try {
for (Object key : sortedKeys) {
key = getCollatingValue(key);
final Set<OIdentifiable> values = indexEngine.get(key);
if (values == null)
continue;
if (!values.isEmpty()) {
for (final OIdentifiable value : values) {
final ODocument document = new ODocument();
document.field("key", key);
document.field("rid", value.getIdentity());
document.unsetDirty();
if (!resultListener.addResult(document))
return;
}
}
}
} finally {
releaseSharedLock();
}
}
=======
>>>>>>>
<<<<<<<
acquireSharedLock();
try {
return new OSharedResourceIterator<OIdentifiable>(this, new OMultiCollectionIterator<OIdentifiable>(
indexEngine.valuesIterator()));
} finally {
releaseSharedLock();
}
}
=======
>>>>>>> |
<<<<<<<
import io.gravitee.am.common.exception.authentication.BadCredentialsException;
import io.gravitee.am.common.exception.authentication.InternalAuthenticationServiceException;
import io.gravitee.am.common.exception.authentication.UsernameNotFoundException;
=======
import io.gravitee.am.service.exception.authentication.BadCredentialsException;
import io.gravitee.am.service.exception.authentication.InternalAuthenticationServiceException;
import io.gravitee.am.service.exception.authentication.UsernameNotFoundException;
import io.gravitee.common.service.AbstractService;
>>>>>>>
import io.gravitee.am.common.exception.authentication.BadCredentialsException;
import io.gravitee.am.common.exception.authentication.InternalAuthenticationServiceException;
import io.gravitee.am.common.exception.authentication.UsernameNotFoundException;
import io.gravitee.common.service.AbstractService; |
<<<<<<<
public Completable resetPassword(String domain, String userId, String password, io.gravitee.am.identityprovider.api.User principal) {
return resetPassword(ReferenceType.DOMAIN, domain, userId, password, principal);
}
@Override
public Completable sendRegistrationConfirmation(ReferenceType referenceType, String referenceId, String userId, io.gravitee.am.identityprovider.api.User principal) {
return findById(referenceType, referenceId, userId)
.map(user -> {
=======
public Completable sendRegistrationConfirmation(String userId, io.gravitee.am.identityprovider.api.User principal) {
return findById(userId)
.switchIfEmpty(Maybe.error(new UserNotFoundException(userId)))
.flatMapCompletable(user -> {
>>>>>>>
public Completable resetPassword(String domain, String userId, String password, io.gravitee.am.identityprovider.api.User principal) {
return resetPassword(ReferenceType.DOMAIN, domain, userId, password, principal);
}
@Override
public Completable sendRegistrationConfirmation(ReferenceType referenceType, String referenceId, String userId, io.gravitee.am.identityprovider.api.User principal) {
return findById(referenceType, referenceId, userId)
.flatMapCompletable(user -> {
<<<<<<<
return user;
})
.doOnSuccess(user -> new Thread(() -> completeUserRegistration(user)).start())
.doOnSuccess(user1 -> auditService.report(AuditBuilder.builder(UserAuditBuilder.class).principal(principal).type(EventType.REGISTRATION_CONFIRMATION_REQUESTED).user(user1)))
.doOnError(throwable -> auditService.report(AuditBuilder.builder(UserAuditBuilder.class).principal(principal).type(EventType.REGISTRATION_CONFIRMATION_REQUESTED).throwable(throwable)))
.toCompletable();
=======
// fetch the client
return checkClient(user.getDomain(), user.getClient())
.map(Optional::of)
.defaultIfEmpty(Optional.empty())
.doOnSuccess(optClient -> new Thread(() -> completeUserRegistration(user, optClient.orElse(null))).start())
.doOnSuccess(__ -> auditService.report(AuditBuilder.builder(UserAuditBuilder.class).principal(principal).type(EventType.REGISTRATION_CONFIRMATION_REQUESTED).user(user)))
.doOnError(throwable -> auditService.report(AuditBuilder.builder(UserAuditBuilder.class).principal(principal).type(EventType.REGISTRATION_CONFIRMATION_REQUESTED).throwable(throwable)))
.toSingle()
.toCompletable();
});
>>>>>>>
// fetch the client
return checkClient(user.getReferenceId(), user.getClient())
.map(Optional::of)
.defaultIfEmpty(Optional.empty())
.doOnSuccess(optClient -> new Thread(() -> completeUserRegistration(user, optClient.orElse(null))).start())
.doOnSuccess(__ -> auditService.report(AuditBuilder.builder(UserAuditBuilder.class).principal(principal).type(EventType.REGISTRATION_CONFIRMATION_REQUESTED).user(user)))
.doOnError(throwable -> auditService.report(AuditBuilder.builder(UserAuditBuilder.class).principal(principal).type(EventType.REGISTRATION_CONFIRMATION_REQUESTED).throwable(throwable)))
.ignoreElement();
});
<<<<<<<
final String redirectUrl = getUserRegistrationUri(user.getReferenceId(), redirectUri) + "?token=" + token;
=======
// building the redirectUrl
StringBuilder sb = new StringBuilder();
sb
.append(getUserRegistrationUri(user.getDomain(), redirectUri))
.append("?token=")
.append(token);
if (client != null) {
sb
.append("&client_id=")
.append(client.getClientId());
}
String redirectUrl = sb.toString();
>>>>>>>
// building the redirectUrl
StringBuilder sb = new StringBuilder();
sb
.append(getUserRegistrationUri(user.getReferenceId(), redirectUri))
.append("?token=")
.append(token);
if (client != null) {
sb
.append("&client_id=")
.append(client.getSettings().getOauth().getClientId());
}
String redirectUrl = sb.toString(); |
<<<<<<<
public PRIORITY getPriority() {
return PRIORITY.LAST;
}
@Override
public void onCreate(final ODatabaseInternal iDatabase) {
=======
public PRIORITY getPriority() {
return PRIORITY.LAST;
}
@Override
public void onCreate(final ODatabase iDatabase) {
>>>>>>>
public PRIORITY getPriority() {
return PRIORITY.LAST;
}
@Override
public PRIORITY getPriority() {
return PRIORITY.LAST;
}
@Override
public void onCreate(final ODatabaseInternal iDatabase) { |
<<<<<<<
if (Thread.interrupted())
throw new OCommandExecutionException("The select execution has been interrupted");
if (!iContext.checkTimeout())
=======
if (!checkInterruption()) {
>>>>>>>
if (!checkInterruption()) {
<<<<<<<
final Object fieldValue = doc.field(firstField);
if (fieldValue == null || !(fieldValue instanceof Iterable)) {
result.addAll(unwind(doc, nextFields, iContext));
=======
Object fieldValue = doc.field(firstField);
if (fieldValue == null || !(fieldValue instanceof Iterable) || fieldValue instanceof ODocument) {
result.addAll(unwind(doc, nextFields));
>>>>>>>
Object fieldValue = doc.field(firstField);
if (fieldValue == null || !(fieldValue instanceof Iterable) || fieldValue instanceof ODocument) {
result.addAll(unwind(doc, nextFields, iContext)); |
<<<<<<<
public ODatabasePool cachedPool(String database, String user, String password) {
return cachedPool(database, user, password, null);
}
/**
* Retrieve cached database pool with given username and password
* @param database database name
* @param user user name
* @param password user password
* @param config OrientDB config for pool if need create it (in case if there is no cached pool)
* @return cached {@link ODatabasePool}
*/
public ODatabasePool cachedPool(String database, String user, String password, OrientDBConfig config) {
ODatabasePoolInternal internalPool = internal.cachedPool(database, user, password, config);
ODatabasePool pool = cachedPools.get(internalPool);
if (pool != null) {
return pool;
}
return cachedPools.computeIfAbsent(internalPool, key -> new ODatabasePool(this, internalPool));
}
public OrientDBInternal getInternal() {
=======
OrientDBInternal getInternal() {
>>>>>>>
public ODatabasePool cachedPool(String database, String user, String password) {
return cachedPool(database, user, password, null);
}
/**
* Retrieve cached database pool with given username and password
* @param database database name
* @param user user name
* @param password user password
* @param config OrientDB config for pool if need create it (in case if there is no cached pool)
* @return cached {@link ODatabasePool}
*/
public ODatabasePool cachedPool(String database, String user, String password, OrientDBConfig config) {
ODatabasePoolInternal internalPool = internal.cachedPool(database, user, password, config);
ODatabasePool pool = cachedPools.get(internalPool);
if (pool != null) {
return pool;
}
return cachedPools.computeIfAbsent(internalPool, key -> new ODatabasePool(this, internalPool));
}
OrientDBInternal getInternal() { |
<<<<<<<
import com.orientechnologies.orient.core.command.OCommandExecutor;
import com.orientechnologies.orient.core.exception.OCommandExecutionException;
import com.orientechnologies.orient.core.sql.parser.OMatchStatement;
=======
import com.orientechnologies.orient.core.exception.OCommandExecutionException;
>>>>>>>
<<<<<<<
commands.put(OMatchStatement.KEYWORD_MATCH, OMatchStatement.class);
=======
commands.put(OCommandExecutorSQLOptimizeDatabase.KEYWORD_OPTIMIZE, OCommandExecutorSQLOptimizeDatabase.class);
>>>>>>>
commands.put(OMatchStatement.KEYWORD_MATCH, OMatchStatement.class);
commands.put(OCommandExecutorSQLOptimizeDatabase.KEYWORD_OPTIMIZE, OCommandExecutorSQLOptimizeDatabase.class); |
<<<<<<<
import io.gravitee.am.common.oidc.StandardClaims;
import io.gravitee.am.jwt.JWTBuilder;
=======
>>>>>>>
import io.gravitee.am.common.oidc.StandardClaims; |
<<<<<<<
if (minimumClusters <= 1)
clusterIds[0] = database.addCluster(className);
=======
if (minimumClusters <= 1) {
clusterIds[0] = database.getClusterIdByName(className);
if (clusterIds[0] == -1)
clusterIds[0] = database.addCluster(CLUSTER_TYPE.PHYSICAL.toString(), className, null, null);
}
>>>>>>>
if (minimumClusters <= 1) {
clusterIds[0] = database.getClusterIdByName(className);
if (clusterIds[0] == -1)
clusterIds[0] = database.addCluster(className);
} |
<<<<<<<
.antMatchers("/auth/authorize", "/auth/login", "/auth/cockpit", "/auth/login/callback", "/auth/logout", "/auth/completeProfile", "/auth/assets/**")
=======
.antMatchers("/auth/authorize", "/auth/login", "/auth/login/callback", "/auth/logout", "/auth/assets/**")
>>>>>>>
.antMatchers("/auth/authorize", "/auth/login", "/auth/cockpit", "/auth/login/callback", "/auth/logout", "/auth/assets/**") |
<<<<<<<
import java.util.concurrent.atomic.AtomicBoolean;
import com.orientechnologies.common.concur.resource.OResourcePool;
import com.orientechnologies.common.concur.resource.OResourcePoolListener;
import com.orientechnologies.common.log.OLogManager;
import com.orientechnologies.orient.core.Orient;
import com.orientechnologies.orient.core.db.ODatabaseComplex;
import com.orientechnologies.orient.core.db.ODatabaseInternal;
import com.orientechnologies.orient.core.db.ODatabaseLifecycleListener;
import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
=======
import com.orientechnologies.orient.core.Orient;
import com.orientechnologies.orient.core.db.ODatabase;
import com.orientechnologies.orient.core.db.ODatabaseComplex;
import com.orientechnologies.orient.core.db.ODatabaseLifecycleListener;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentPool;
>>>>>>>
import java.util.concurrent.atomic.AtomicBoolean;
import com.orientechnologies.common.concur.resource.OResourcePool;
import com.orientechnologies.common.concur.resource.OResourcePoolListener;
import com.orientechnologies.common.log.OLogManager;
import com.orientechnologies.orient.core.Orient;
import com.orientechnologies.orient.core.db.ODatabaseComplex;
import com.orientechnologies.orient.core.db.ODatabaseInternal;
import com.orientechnologies.orient.core.db.ODatabaseLifecycleListener;
import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
import com.orientechnologies.orient.core.Orient;
import com.orientechnologies.orient.core.db.ODatabase;
import com.orientechnologies.orient.core.db.ODatabaseComplex;
import com.orientechnologies.orient.core.db.ODatabaseLifecycleListener;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentPool;
<<<<<<<
import com.orientechnologies.orient.core.db.record.ODatabaseRecordInternal;
=======
import com.orientechnologies.orient.core.db.record.ODatabaseRecord;
>>>>>>>
import com.orientechnologies.orient.core.db.record.ODatabaseRecord;
import com.orientechnologies.orient.core.db.record.ODatabaseRecordInternal;
<<<<<<<
public class OrientGraphFactory extends OrientConfigurableGraph implements ODatabaseLifecycleListener {
protected final String url;
protected final String user;
protected final String password;
protected volatile OResourcePool<String, OrientBaseGraph> pool;
protected volatile boolean transactional = true;
protected boolean leaveGraphsOpen = true;
protected OIntent intent;
protected AtomicBoolean used = new AtomicBoolean(false);
=======
public class OrientGraphFactory implements ODatabaseLifecycleListener {
protected final String url;
protected final String user;
protected final String password;
protected volatile ODatabaseDocumentPool pool;
protected volatile boolean transactional = true;
>>>>>>>
public class OrientGraphFactory extends OrientConfigurableGraph implements ODatabaseLifecycleListener {
protected final String url;
protected final String user;
protected final String password;
protected volatile OResourcePool<String, OrientBaseGraph> pool;
protected volatile boolean transactional = true;
protected boolean leaveGraphsOpen = true;
protected OIntent intent;
protected AtomicBoolean used = new AtomicBoolean(false);
<<<<<<<
Orient.instance().addDbLifecycleListener(this);
}
public boolean isLeaveGraphsOpen() {
return leaveGraphsOpen;
}
public void setLeaveGraphsOpen(boolean leaveGraphsOpen) {
this.leaveGraphsOpen = leaveGraphsOpen;
=======
Orient.instance().addDbLifecycleListener(this);
>>>>>>>
Orient.instance().addDbLifecycleListener(this);
}
public boolean isLeaveGraphsOpen() {
return leaveGraphsOpen;
}
public void setLeaveGraphsOpen(boolean leaveGraphsOpen) {
this.leaveGraphsOpen = leaveGraphsOpen;
<<<<<<<
closePool();
pool = null;
Orient.instance().removeDbLifecycleListener(this);
}
@Override
public PRIORITY getPriority() {
return PRIORITY.FIRST;
=======
if (pool != null) {
pool.close();
pool = null;
}
Orient.instance().removeDbLifecycleListener(this);
>>>>>>>
closePool();
pool = null;
Orient.instance().removeDbLifecycleListener(this);
}
@Override
public PRIORITY getPriority() {
return PRIORITY.FIRST;
<<<<<<<
public void declareIntent(final OIntent iIntent) {
intent = iIntent;
}
@Override
public void onCreate(final ODatabaseInternal iDatabase) {
if (iDatabase instanceof ODatabaseRecordInternal) {
final ODatabaseComplex<?> db = ((ODatabaseRecordInternal) iDatabase).getDatabaseOwner();
if (db instanceof ODatabaseDocumentTx)
OrientBaseGraph.checkForGraphSchema((ODatabaseDocumentTx) db);
}
}
@Override
public void onOpen(final ODatabaseInternal iDatabase) {
if (iDatabase instanceof ODatabaseRecordInternal) {
final ODatabaseComplex<?> db = ((ODatabaseRecordInternal) iDatabase).getDatabaseOwner();
if (db instanceof ODatabaseDocumentTx)
OrientBaseGraph.checkForGraphSchema((ODatabaseDocumentTx) db);
}
}
@Override
public void onClose(final ODatabaseInternal iDatabase) {
}
protected void closePool() {
if (pool != null) {
final OResourcePool<String, OrientBaseGraph> closingPool = pool;
pool = null;
int usedResources = 0;
// CLOSE ALL THE INSTANCES
for (OrientExtendedGraph g : closingPool.getResources()) {
usedResources++;
g.shutdown();
}
OLogManager.instance().debug(this, "Maximum used resources: %d", usedResources);
closingPool.close();
}
}
protected void initGraph(final OrientBaseGraph g) {
if (used.compareAndSet(false, true)) {
// EXECUTE ONLY ONCE
final ODatabaseDocumentTx db = g.getRawGraph();
boolean txActive = db.getTransaction().isActive();
if (txActive)
// COMMIT TX BEFORE ANY SCHEMA CHANGES
db.commit();
g.checkForGraphSchema(db);
if (txActive)
// REOPEN IT AGAIN
db.begin();
}
if (intent != null)
g.declareIntent(intent.copy());
}
@Override
=======
public void onCreate(final ODatabase iDatabase) {
if (iDatabase instanceof ODatabaseRecord) {
final ODatabaseComplex<?> db = ((ODatabaseRecord) iDatabase).getDatabaseOwner();
if (db instanceof ODatabaseDocumentTx)
OrientBaseGraph.checkForGraphSchema((ODatabaseDocumentTx) db);
}
}
@Override
public void onOpen(final ODatabase iDatabase) {
if (iDatabase instanceof ODatabaseRecord) {
final ODatabaseComplex<?> db = ((ODatabaseRecord) iDatabase).getDatabaseOwner();
if (db instanceof ODatabaseDocumentTx)
OrientBaseGraph.checkForGraphSchema((ODatabaseDocumentTx) db);
}
}
@Override
public void onClose(final ODatabase iDatabase) {
}
@Override
>>>>>>>
public void onCreate(final ODatabase iDatabase) {
if (iDatabase instanceof ODatabaseRecord) {
final ODatabaseComplex<?> db = ((ODatabaseRecord) iDatabase).getDatabaseOwner();
if (db instanceof ODatabaseDocumentTx)
OrientBaseGraph.checkForGraphSchema((ODatabaseDocumentTx) db);
}
}
@Override
public void onOpen(final ODatabase iDatabase) {
if (iDatabase instanceof ODatabaseRecord) {
final ODatabaseComplex<?> db = ((ODatabaseRecord) iDatabase).getDatabaseOwner();
if (db instanceof ODatabaseDocumentTx)
OrientBaseGraph.checkForGraphSchema((ODatabaseDocumentTx) db);
}
}
@Override
public void onClose(final ODatabase iDatabase) {
}
@Override
public void declareIntent(final OIntent iIntent) {
intent = iIntent;
}
@Override
public void onCreate(final ODatabaseInternal iDatabase) {
if (iDatabase instanceof ODatabaseRecordInternal) {
final ODatabaseComplex<?> db = ((ODatabaseRecordInternal) iDatabase).getDatabaseOwner();
if (db instanceof ODatabaseDocumentTx)
OrientBaseGraph.checkForGraphSchema((ODatabaseDocumentTx) db);
}
}
@Override
public void onOpen(final ODatabaseInternal iDatabase) {
if (iDatabase instanceof ODatabaseRecordInternal) {
final ODatabaseComplex<?> db = ((ODatabaseRecordInternal) iDatabase).getDatabaseOwner();
if (db instanceof ODatabaseDocumentTx)
OrientBaseGraph.checkForGraphSchema((ODatabaseDocumentTx) db);
}
}
@Override
public void onClose(final ODatabaseInternal iDatabase) {
}
protected void closePool() {
if (pool != null) {
final OResourcePool<String, OrientBaseGraph> closingPool = pool;
pool = null;
int usedResources = 0;
// CLOSE ALL THE INSTANCES
for (OrientExtendedGraph g : closingPool.getResources()) {
usedResources++;
g.shutdown();
}
OLogManager.instance().debug(this, "Maximum used resources: %d", usedResources);
closingPool.close();
}
}
protected void initGraph(final OrientBaseGraph g) {
if (used.compareAndSet(false, true)) {
// EXECUTE ONLY ONCE
final ODatabaseDocumentTx db = g.getRawGraph();
boolean txActive = db.getTransaction().isActive();
if (txActive)
// COMMIT TX BEFORE ANY SCHEMA CHANGES
db.commit();
g.checkForGraphSchema(db);
if (txActive)
// REOPEN IT AGAIN
db.begin();
}
if (intent != null)
g.declareIntent(intent.copy());
}
@Override |
<<<<<<<
import io.gravitee.am.model.Application;
=======
import io.gravitee.am.model.Certificate;
import io.gravitee.am.model.Client;
>>>>>>>
import io.gravitee.am.model.Certificate;
import io.gravitee.am.model.Application;
<<<<<<<
import io.gravitee.am.model.oidc.Client;
import io.gravitee.am.repository.management.api.ApplicationRepository;
=======
import io.gravitee.am.repository.management.api.CertificateRepository;
import io.gravitee.am.repository.management.api.ClientRepository;
>>>>>>>
import io.gravitee.am.model.oidc.Client;
import io.gravitee.am.repository.management.api.ApplicationRepository;
import io.gravitee.am.repository.management.api.CertificateRepository;
<<<<<<<
when(applicationRepository.findAll()).thenReturn(Single.just(Collections.emptyList()));
=======
when(clientRepository.findAll()).thenReturn(Single.just(Collections.emptySet()));
when(certificateRepository.findAll()).thenReturn(Single.just(Collections.emptySet()));
>>>>>>>
when(applicationRepository.findAll()).thenReturn(Single.just(Collections.emptyList()));
when(certificateRepository.findAll()).thenReturn(Single.just(Collections.emptySet()));
<<<<<<<
when(applicationRepository.findAll()).thenReturn(Single.just(Collections.emptyList()));
=======
when(clientRepository.findAll()).thenReturn(Single.just(Collections.emptySet()));
when(certificateRepository.findAll()).thenReturn(Single.just(Collections.emptySet()));
>>>>>>>
when(applicationRepository.findAll()).thenReturn(Single.just(Collections.emptyList()));
when(certificateRepository.findAll()).thenReturn(Single.just(Collections.emptySet()));
<<<<<<<
when(applicationRepository.findAll()).thenReturn(Single.just(Collections.emptyList()));
=======
when(clientRepository.findAll()).thenReturn(Single.just(Collections.emptySet()));
when(certificateRepository.findAll()).thenReturn(Single.just(Collections.emptySet()));
>>>>>>>
when(applicationRepository.findAll()).thenReturn(Single.just(Collections.emptyList()));
when(certificateRepository.findAll()).thenReturn(Single.just(Collections.emptySet()));
<<<<<<<
when(applicationRepository.findAll()).thenReturn(Single.just(Collections.emptyList()));
when(applicationRepository.findById("client-1")).thenReturn(Maybe.just(new Application()));
=======
when(clientRepository.findAll()).thenReturn(Single.just(Collections.emptySet()));
when(certificateRepository.findAll()).thenReturn(Single.just(Collections.emptySet()));
when(clientRepository.findById("client-1")).thenReturn(Maybe.just(new Client()));
>>>>>>>
when(applicationRepository.findAll()).thenReturn(Single.just(Collections.emptyList()));
when(certificateRepository.findAll()).thenReturn(Single.just(Collections.emptySet()));
when(applicationRepository.findById("client-1")).thenReturn(Maybe.just(new Application())); |
<<<<<<<
private String referenceType;
private String referenceId;
=======
private String registrationUserUri;
private String registrationAccessToken;
private String domain;
>>>>>>>
private String registrationUserUri;
private String registrationAccessToken;
private String referenceType;
private String referenceId;
<<<<<<<
public String getReferenceType() {
return referenceType;
=======
public String getRegistrationUserUri() {
return registrationUserUri;
}
public void setRegistrationUserUri(String registrationUserUri) {
this.registrationUserUri = registrationUserUri;
}
public String getRegistrationAccessToken() {
return registrationAccessToken;
}
public void setRegistrationAccessToken(String registrationAccessToken) {
this.registrationAccessToken = registrationAccessToken;
}
public String getDomain() {
return domain;
>>>>>>>
public String getRegistrationUserUri() {
return registrationUserUri;
}
public void setRegistrationUserUri(String registrationUserUri) {
this.registrationUserUri = registrationUserUri;
}
public String getRegistrationAccessToken() {
return registrationAccessToken;
}
public void setRegistrationAccessToken(String registrationAccessToken) {
this.registrationAccessToken = registrationAccessToken;
}
public String getReferenceType() {
return referenceType; |
<<<<<<<
import com.orientechnologies.orient.server.distributed.impl.task.OTransactionPhase1Task;
=======
import com.orientechnologies.orient.server.distributed.impl.coordinator.transaction.OIndexKeyChange;
import com.orientechnologies.orient.server.distributed.impl.coordinator.transaction.OIndexKeyOperation;
import com.orientechnologies.orient.server.distributed.impl.coordinator.transaction.OIndexOperationRequest;
>>>>>>>
import com.orientechnologies.orient.server.distributed.impl.task.OTransactionPhase1Task;
import com.orientechnologies.orient.server.distributed.impl.coordinator.transaction.OIndexKeyChange;
import com.orientechnologies.orient.server.distributed.impl.coordinator.transaction.OIndexKeyOperation;
import com.orientechnologies.orient.server.distributed.impl.coordinator.transaction.OIndexOperationRequest;
<<<<<<<
private void resolveTracking(ORecordOperation change) {
boolean detectedChange = false;
List<OClassIndexManager.IndexChange> changes = new ArrayList<>();
if (change.getRecordContainer() instanceof ORecord && change.getRecord() instanceof ODocument) {
detectedChange = true;
=======
private void resolveTracking(ORecordOperation change, boolean onlyExecutorCase) {
if (change.getRecord() instanceof ODocument) {
>>>>>>>
private void resolveTracking(ORecordOperation change, boolean onlyExecutorCase) {
List<OClassIndexManager.IndexChange> changes = new ArrayList<>();
if (change.getRecordContainer() instanceof ORecord && change.getRecord() instanceof ODocument) {
<<<<<<<
OClassIndexManager.processIndexOnUpdate(database, updateDoc, changes);
=======
if (onlyExecutorCase) {
OClassIndexManager.processIndexOnUpdate(database, doc, changes);
}
>>>>>>>
if (onlyExecutorCase) {
OClassIndexManager.processIndexOnUpdate(database, updateDoc, changes);
}
<<<<<<<
} else if (change.getRecordContainer() instanceof ODocumentDelta) {
detectedChange = true;
switch (change.getType()) {
case ORecordOperation.UPDATED:
ODocumentDelta deltaRecord = (ODocumentDelta) change.getRecordContainer();
ODocument original = database.load(deltaRecord.getIdentity());
if (original == null)
throw new ORecordNotFoundException(deltaRecord.getIdentity());
original = original.mergeDelta(deltaRecord);
ODocument updateDoc = original;
OLiveQueryHook.addOp(updateDoc, ORecordOperation.UPDATED, database);
OLiveQueryHookV2.addOp(updateDoc, ORecordOperation.UPDATED, database);
OImmutableClass clazz = ODocumentInternal.getImmutableSchemaClass(updateDoc);
if (clazz != null) {
OClassIndexManager.processIndexOnUpdate(database, updateDoc, changes);
if (clazz.isFunction()) {
database.getSharedContext().getFunctionLibrary().updatedFunction(updateDoc);
Orient.instance().getScriptManager().close(database.getName());
}
if (clazz.isSequence()) {
((OSequenceLibraryProxy) database.getMetadata().getSequenceLibrary()).getDelegate()
.onSequenceUpdated(database, updateDoc);
}
}
break;
}
}
if (detectedChange) {
for (OClassIndexManager.IndexChange indexChange : changes) {
addIndexEntry(indexChange.index, indexChange.index.getName(), indexChange.operation, indexChange.key, indexChange.value);
=======
if (onlyExecutorCase) {
for (OClassIndexManager.IndexChange indexChange : changes) {
addIndexEntry(indexChange.index, indexChange.index.getName(), indexChange.operation, indexChange.key, indexChange.value);
}
>>>>>>>
} else if (change.getRecordContainer() instanceof ODocumentDelta) {
switch (change.getType()) {
case ORecordOperation.UPDATED:
ODocumentDelta deltaRecord = (ODocumentDelta) change.getRecordContainer();
ODocument original = database.load(deltaRecord.getIdentity());
if (original == null)
throw new ORecordNotFoundException(deltaRecord.getIdentity());
original = original.mergeDelta(deltaRecord);
ODocument updateDoc = original;
OLiveQueryHook.addOp(updateDoc, ORecordOperation.UPDATED, database);
OLiveQueryHookV2.addOp(updateDoc, ORecordOperation.UPDATED, database);
OImmutableClass clazz = ODocumentInternal.getImmutableSchemaClass(updateDoc);
if (clazz != null) {
if (onlyExecutorCase) {
OClassIndexManager.processIndexOnUpdate(database, updateDoc, changes);
}
if (clazz.isFunction()) {
database.getSharedContext().getFunctionLibrary().updatedFunction(updateDoc);
Orient.instance().getScriptManager().close(database.getName());
}
if (clazz.isSequence()) {
((OSequenceLibraryProxy) database.getMetadata().getSequenceLibrary()).getDelegate()
.onSequenceUpdated(database, updateDoc);
}
}
break;
}
}
if (onlyExecutorCase) {
for (OClassIndexManager.IndexChange indexChange : changes) {
addIndexEntry(indexChange.index, indexChange.index.getName(), indexChange.operation, indexChange.key, indexChange.value); |
<<<<<<<
import io.gravitee.am.repository.management.api.search.FilterCriteria;
=======
import io.gravitee.am.model.membership.MemberType;
>>>>>>>
import io.gravitee.am.model.membership.MemberType;
import io.gravitee.am.repository.management.api.search.FilterCriteria; |
<<<<<<<
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.Callable;
=======
>>>>>>>
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.Callable;
<<<<<<<
import com.orientechnologies.orient.core.storage.ORawBuffer;
import com.orientechnologies.orient.core.storage.ORecordCallback;
import com.orientechnologies.orient.core.storage.ORecordMetadata;
import com.orientechnologies.orient.core.storage.OStorageEmbedded;
import com.orientechnologies.orient.core.storage.OStorageOperationResult;
import com.orientechnologies.orient.core.storage.OStorageProxy;
=======
import com.orientechnologies.orient.core.storage.ORawBuffer;
import com.orientechnologies.orient.core.storage.ORecordCallback;
import com.orientechnologies.orient.core.storage.ORecordMetadata;
import com.orientechnologies.orient.core.storage.OStorage;
import com.orientechnologies.orient.core.storage.OStorageEmbedded;
import com.orientechnologies.orient.core.storage.OStorageOperationResult;
import com.orientechnologies.orient.core.storage.OStorageProxy;
>>>>>>>
import com.orientechnologies.orient.core.storage.ORawBuffer;
import com.orientechnologies.orient.core.storage.ORecordCallback;
import com.orientechnologies.orient.core.storage.ORecordMetadata;
import com.orientechnologies.orient.core.storage.OStorage;
import com.orientechnologies.orient.core.storage.OStorageEmbedded;
import com.orientechnologies.orient.core.storage.OStorageOperationResult;
import com.orientechnologies.orient.core.storage.OStorageProxy; |
<<<<<<<
private boolean forcePKCE;
=======
private List<String> postLogoutRedirectUris;
>>>>>>>
private boolean forcePKCE;
private List<String> postLogoutRedirectUris;
<<<<<<<
public boolean isForcePKCE() {
return forcePKCE;
}
public void setForcePKCE(boolean forcePKCE) {
this.forcePKCE = forcePKCE;
}
=======
public List<String> getPostLogoutRedirectUris() {
return postLogoutRedirectUris;
}
public void setPostLogoutRedirectUris(List<String> postLogoutRedirectUris) {
this.postLogoutRedirectUris = postLogoutRedirectUris;
}
>>>>>>>
public boolean isForcePKCE() {
return forcePKCE;
}
public void setForcePKCE(boolean forcePKCE) {
this.forcePKCE = forcePKCE;
}
public List<String> getPostLogoutRedirectUris() {
return postLogoutRedirectUris;
}
public void setPostLogoutRedirectUris(List<String> postLogoutRedirectUris) {
this.postLogoutRedirectUris = postLogoutRedirectUris;
} |
<<<<<<<
int getLimit();
=======
@Deprecated
public int getLimit();
>>>>>>>
int getLimit();
<<<<<<<
OCommandRequest setLimit(int iLimit);
=======
@Deprecated
public OCommandRequest setLimit(int iLimit);
>>>>>>>
@Deprecated
OCommandRequest setLimit(int iLimit);
<<<<<<<
long getTimeoutTime();
=======
@Deprecated
public long getTimeoutTime();
>>>>>>>
@Deprecated
long getTimeoutTime();
<<<<<<<
TIMEOUT_STRATEGY getTimeoutStrategy();
=======
@Deprecated
public TIMEOUT_STRATEGY getTimeoutStrategy();
>>>>>>>
@Deprecated
TIMEOUT_STRATEGY getTimeoutStrategy();
<<<<<<<
void setTimeout(long timeout, TIMEOUT_STRATEGY strategy);
=======
@Deprecated
public void setTimeout(long timeout, TIMEOUT_STRATEGY strategy);
>>>>>>>
@Deprecated
void setTimeout(long timeout, TIMEOUT_STRATEGY strategy);
<<<<<<<
String getFetchPlan();
=======
@Deprecated
public String getFetchPlan();
>>>>>>>
@Deprecated
String getFetchPlan();
<<<<<<<
<RET extends OCommandRequest> RET setFetchPlan(String iFetchPlan);
=======
@Deprecated
public <RET extends OCommandRequest> RET setFetchPlan(String iFetchPlan);
>>>>>>>
@Deprecated
<RET extends OCommandRequest> RET setFetchPlan(String iFetchPlan); |
<<<<<<<
long getTimeout();
String getSyntax();
=======
/**
* Returns true if the command must be executed on local node on distributed configuration.
*/
boolean isLocalExecution();
>>>>>>>
long getTimeout();
String getSyntax();
/**
* Returns true if the command must be executed on local node on distributed configuration.
*/
boolean isLocalExecution(); |
<<<<<<<
private ReferenceType referenceType;
private String referenceId;
=======
private String registrationUserUri;
private String registrationAccessToken;
private String domain;
>>>>>>>
private String registrationUserUri;
private String registrationAccessToken;
private ReferenceType referenceType;
private String referenceId;
<<<<<<<
this.referenceType = other.referenceType;
this.referenceId = other.referenceId;
=======
this.registrationUserUri = other.registrationUserUri;
this.registrationAccessToken = other.registrationAccessToken;
this.domain = other.domain;
>>>>>>>
this.registrationUserUri = other.registrationUserUri;
this.registrationAccessToken = other.registrationAccessToken;
this.referenceType = other.referenceType;
this.referenceId = other.referenceId;
<<<<<<<
public ReferenceType getReferenceType() {
return referenceType;
=======
public String getRegistrationUserUri() {
return registrationUserUri;
}
public void setRegistrationUserUri(String registrationUserUri) {
this.registrationUserUri = registrationUserUri;
}
public String getRegistrationAccessToken() {
return registrationAccessToken;
}
public void setRegistrationAccessToken(String registrationAccessToken) {
this.registrationAccessToken = registrationAccessToken;
}
public String getDomain() {
return domain;
>>>>>>>
public String getRegistrationUserUri() {
return registrationUserUri;
}
public void setRegistrationUserUri(String registrationUserUri) {
this.registrationUserUri = registrationUserUri;
}
public String getRegistrationAccessToken() {
return registrationAccessToken;
}
public void setRegistrationAccessToken(String registrationAccessToken) {
this.registrationAccessToken = registrationAccessToken;
}
public ReferenceType getReferenceType() {
return referenceType; |
<<<<<<<
private boolean flowsInherited;
=======
private List<String> postLogoutRedirectUris;
>>>>>>>
private List<String> postLogoutRedirectUris;
private boolean flowsInherited;
<<<<<<<
this.flowsInherited = other.flowsInherited;
=======
this.postLogoutRedirectUris = other.postLogoutRedirectUris;
>>>>>>>
this.postLogoutRedirectUris = other.postLogoutRedirectUris;
this.flowsInherited = other.flowsInherited;
<<<<<<<
public boolean isFlowsInherited() {
return flowsInherited;
}
public void setFlowsInherited(boolean flowsInherited) {
this.flowsInherited = flowsInherited;
}
=======
public List<String> getPostLogoutRedirectUris() {
return postLogoutRedirectUris;
}
public void setPostLogoutRedirectUris(List<String> postLogoutRedirectUris) {
this.postLogoutRedirectUris = postLogoutRedirectUris;
}
>>>>>>>
public List<String> getPostLogoutRedirectUris() {
return postLogoutRedirectUris;
}
public void setPostLogoutRedirectUris(List<String> postLogoutRedirectUris) {
this.postLogoutRedirectUris = postLogoutRedirectUris;
}
public boolean isFlowsInherited() {
return flowsInherited;
}
public void setFlowsInherited(boolean flowsInherited) {
this.flowsInherited = flowsInherited;
} |
<<<<<<<
return Observable.fromIterable(client.getIdentities())
.flatMapMaybe(authProvider -> authenticate0(client, authentication, authProvider, preAuthenticated))
=======
return Observable.fromIterable(identities)
.flatMapMaybe(authProvider -> authenticate0(client, authentication, authProvider))
>>>>>>>
return Observable.fromIterable(identities)
.flatMapMaybe(authProvider -> authenticate0(client, authentication, authProvider, preAuthenticated))
<<<<<<<
return preAuthentication(client, authentication.getPrincipal().toString(), source);
}
private Completable postAuthentication(Client client, Authentication authentication, String source, UserAuthentication userAuthentication) {
return postAuthentication(client, authentication.getPrincipal().toString(), source, userAuthentication);
}
private Completable preAuthentication(Client client, String username, String source) {
final AccountSettings accountSettings = getAccountSettings(domain, client);
=======
final AccountSettings accountSettings = AccountSettings.getInstance(domain, client);
>>>>>>>
return preAuthentication(client, authentication.getPrincipal().toString(), source);
}
private Completable postAuthentication(Client client, Authentication authentication, String source, UserAuthentication userAuthentication) {
return postAuthentication(client, authentication.getPrincipal().toString(), source, userAuthentication);
}
private Completable preAuthentication(Client client, String username, String source) {
final AccountSettings accountSettings = AccountSettings.getInstance(domain, client);
<<<<<<<
private Completable postAuthentication(Client client, String username, String source, UserAuthentication userAuthentication) {
final AccountSettings accountSettings = getAccountSettings(domain, client);
=======
private Completable postAuthentication(Client client, Authentication authentication, String source, UserAuthentication userAuthentication) {
final AccountSettings accountSettings = AccountSettings.getInstance(domain, client);
>>>>>>>
private Completable postAuthentication(Client client, String username, String source, UserAuthentication userAuthentication) {
final AccountSettings accountSettings = AccountSettings.getInstance(domain, client); |
<<<<<<<
import io.gravitee.am.model.Application;
import io.gravitee.am.model.ReferenceType;
=======
import io.gravitee.am.model.Client;
import io.gravitee.am.model.Domain;
>>>>>>>
import io.gravitee.am.model.Application;
import io.gravitee.am.model.ReferenceType;
import io.gravitee.am.model.Domain;
<<<<<<<
import io.gravitee.am.service.ApplicationService;
=======
import io.gravitee.am.model.account.AccountSettings;
>>>>>>>
import io.gravitee.am.model.application.ApplicationSettings;
import io.gravitee.am.service.ApplicationService;
import io.gravitee.am.model.account.AccountSettings;
<<<<<<<
import io.gravitee.am.service.LoginAttemptService;
import io.gravitee.am.service.RoleService;
=======
import io.gravitee.am.service.*;
>>>>>>>
import io.gravitee.am.service.LoginAttemptService;
import io.gravitee.am.service.RoleService;
import io.gravitee.am.service.*;
<<<<<<<
private ApplicationService applicationService;
=======
private DomainService domainService;
@Mock
private ClientService clientService;
>>>>>>>
private DomainService domainService;
@Mock
private ApplicationService applicationService;
<<<<<<<
when(applicationService.findById(newUser.getClient())).thenReturn(Maybe.empty());
when(applicationService.findByDomainAndClientId(domain, newUser.getClient())).thenReturn(Maybe.empty());
=======
when(commonUserService.findByDomainAndUsernameAndSource(anyString(), anyString(), anyString())).thenReturn(Maybe.empty());
when(clientService.findById(newUser.getClient())).thenReturn(Maybe.empty());
when(clientService.findByDomainAndClientId(domain, newUser.getClient())).thenReturn(Maybe.empty());
>>>>>>>
when(commonUserService.findByDomainAndUsernameAndSource(anyString(), anyString(), anyString())).thenReturn(Maybe.empty());
when(applicationService.findById(newUser.getClient())).thenReturn(Maybe.empty());
when(applicationService.findByDomainAndClientId(domain, newUser.getClient())).thenReturn(Maybe.empty()); |
<<<<<<<
/**
* Ensure usage of the Authorization Code Flow with Proof Key for Code Exchange (PKCE)
* especially for SPA and Native apps
*/
private boolean forcePKCE;
=======
/**
* Array of URLs supplied by the RP to which it MAY request that the End-User's User Agent be redirected using the post_logout_redirect_uri parameter after a logout has been performed.
*/
private List<String> postLogoutRedirectUris;
>>>>>>>
/**
* Ensure usage of the Authorization Code Flow with Proof Key for Code Exchange (PKCE)
* especially for SPA and Native apps
*/
private boolean forcePKCE;
/**
* Array of URLs supplied by the RP to which it MAY request that the End-User's User Agent be redirected using the post_logout_redirect_uri parameter after a logout has been performed.
*/
private List<String> postLogoutRedirectUris;
<<<<<<<
this.forcePKCE = other.forcePKCE;
=======
this.postLogoutRedirectUris = other.postLogoutRedirectUris;
>>>>>>>
this.forcePKCE = other.forcePKCE;
this.postLogoutRedirectUris = other.postLogoutRedirectUris;
<<<<<<<
public boolean isForcePKCE() {
return forcePKCE;
}
public void setForcePKCE(boolean forcePKCE) {
this.forcePKCE = forcePKCE;
}
=======
public List<String> getPostLogoutRedirectUris() {
return postLogoutRedirectUris;
}
public void setPostLogoutRedirectUris(List<String> postLogoutRedirectUris) {
this.postLogoutRedirectUris = postLogoutRedirectUris;
}
>>>>>>>
public boolean isForcePKCE() {
return forcePKCE;
}
public void setForcePKCE(boolean forcePKCE) {
this.forcePKCE = forcePKCE;
}
public List<String> getPostLogoutRedirectUris() {
return postLogoutRedirectUris;
}
public void setPostLogoutRedirectUris(List<String> postLogoutRedirectUris) {
this.postLogoutRedirectUris = postLogoutRedirectUris;
} |
<<<<<<<
import io.gravitee.am.gateway.core.manager.ClientManager;
import io.gravitee.am.model.oidc.Client;
=======
import io.gravitee.am.gateway.core.manager.EntityManager;
import io.gravitee.am.model.Client;
>>>>>>>
import io.gravitee.am.gateway.core.manager.EntityManager;
import io.gravitee.am.model.oidc.Client; |
<<<<<<<
import android.util.Log;
=======
import java.lang.ref.WeakReference;
import java.net.URISyntaxException;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
>>>>>>>
import android.util.Log;
import java.lang.ref.WeakReference;
import java.net.URISyntaxException;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List; |
<<<<<<<
=======
import io.gravitee.am.identityprovider.github.GithubIdentityProviderMapper;
import io.gravitee.am.identityprovider.github.GithubIdentityProviderRoleMapper;
import io.gravitee.am.service.http.WebClientBuilder;
>>>>>>>
import io.gravitee.am.service.http.WebClientBuilder; |
<<<<<<<
=======
import java.util.Collections;
import java.util.HashMap;
>>>>>>>
import java.util.HashMap; |
<<<<<<<
return userService.findById(referenceType, referenceId, id);
=======
return userService.findById(referenceType, referenceId, id)
.map(this::setInternalStatus);
>>>>>>>
return userService.findById(referenceType, referenceId, id)
.map(this::setInternalStatus);
<<<<<<<
=======
private void completeUserRegistration(User user, Application client) {
final String templateName = getTemplateName(user);
io.gravitee.am.model.Email email = emailManager.getEmail(templateName, registrationSubject, expireAfter);
Email email1 = buildEmail(user, client, email, "/confirmRegistration", "registrationUrl");
emailService.send(email1, user);
}
private Email buildEmail(User user, Application client, io.gravitee.am.model.Email email, String redirectUri, String redirectUriName) {
Map<String, Object> params = prepareEmail(user, client, email.getExpiresAfter(), redirectUri, redirectUriName);
Email email1 = new EmailBuilder()
.to(user.getEmail())
.from(email.getFrom())
.fromName(email.getFromName())
.subject(email.getSubject())
.template(email.getTemplate())
.params(params)
.build();
return email1;
}
private Map<String, Object> prepareEmail(User user, Application client, int expiresAfter, String redirectUri, String redirectUriName) {
final String token = getUserRegistrationToken(user, expiresAfter);
// building the redirectUrl
StringBuilder sb = new StringBuilder();
sb
.append(getUserRegistrationUri(user.getReferenceId(), redirectUri))
.append("?token=")
.append(token);
if (client != null) {
sb
.append("&client_id=")
.append(client.getSettings().getOauth().getClientId());
}
String redirectUrl = sb.toString();
Map<String, Object> params = new HashMap<>();
params.put("user", user);
params.put(redirectUriName, redirectUrl);
params.put("token", token);
params.put("expireAfterSeconds", expiresAfter);
return params;
}
private String getUserRegistrationUri(String domain, String redirectUri) {
String entryPoint = gatewayUrl;
if (entryPoint != null && entryPoint.endsWith("/")) {
entryPoint = entryPoint.substring(0, entryPoint.length() - 1);
}
return entryPoint + "/" + domain + redirectUri;
}
>>>>>>> |
<<<<<<<
if (child.getTag() == null || !(child.getTag() instanceof ItemInfo)) {
String msg = "Drag started with a view that has no tag set. This "
+ "will cause a crash (issue 11627249) down the line. "
+ "View: " + child + " tag: " + child.getTag();
throw new IllegalStateException(msg);
}
mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(),
=======
DragView dv = mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(),
>>>>>>>
if (child.getTag() == null || !(child.getTag() instanceof ItemInfo)) {
String msg = "Drag started with a view that has no tag set. This "
+ "will cause a crash (issue 11627249) down the line. "
+ "View: " + child + " tag: " + child.getTag();
throw new IllegalStateException(msg);
}
DragView dv = mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(), |
<<<<<<<
import java.util.ArrayList;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLServerSocketFactory;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
import io.netty.util.AttributeKey;
=======
>>>>>>>
import java.util.ArrayList;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLServerSocketFactory;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
import io.netty.util.AttributeKey;
<<<<<<<
if (channel == null) {
=======
closeSocket();
super.disconnect();
}
public void closeSocket() {
if (session == null) {
>>>>>>>
closeSocket();
}
public void closeSocket() {
if (channel == null) {
<<<<<<<
@Override
public String getName() {
return "LanLink";
}
@Override
public BasePairingHandler getPairingHandler(Device device, BasePairingHandler.PairingHandlerCallback callback) {
return new LanPairingHandler(device, callback);
}
@Override
public void addPackageReceiver(PackageReceiver pr) {
super.addPackageReceiver(pr);
BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
@Override
public void onServiceStart(BackgroundService service) {
Device device = service.getDevice(getDeviceId());
if (device == null) return;
if (!device.isPaired()) return;
// If the device is already paired due to other link, just send a pairing request to get required attributes for this link
if (device.publicKey == null) {
device.requestPairing();
}
}
});
=======
public LanLink(IoSession session, String deviceId, BaseLinkProvider linkProvider, ConnectionStarted connectionSource) {
super(deviceId, linkProvider, connectionSource);
this.session = session;
>>>>>>>
@Override
public String getName() {
return "LanLink";
}
@Override
public BasePairingHandler getPairingHandler(Device device, BasePairingHandler.PairingHandlerCallback callback) {
return new LanPairingHandler(device, callback);
}
@Override
public void addPackageReceiver(PackageReceiver pr) {
super.addPackageReceiver(pr);
BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
@Override
public void onServiceStart(BackgroundService service) {
Device device = service.getDevice(getDeviceId());
if (device == null) return;
if (!device.isPaired()) return;
// If the device is already paired due to other link, just send a pairing request to get required attributes for this link
if (device.publicKey == null) {
device.requestPairing();
}
}
});
<<<<<<<
ChannelFuture future = channel.writeAndFlush(np.serialize()).sync();
if (!future.isSuccess()) {
Log.e("KDE/sendPackage", "!future.isWritten()");
callback.sendFailure(future.cause());
=======
WriteFuture future = session.write(np.serialize());
future.awaitUninterruptibly();
if (!future.isWritten()) {
//Log.e("KDE/sendPackage", "!future.isWritten()");
callback.sendFailure(future.getException());
>>>>>>>
ChannelFuture future = channel.writeAndFlush(np.serialize()).sync();
if (!future.isSuccess()) {
Log.e("KDE/sendPackage", "!future.isWritten()");
callback.sendFailure(future.cause()); |
<<<<<<<
import org.kde.kdeconnect.Backends.BasePairingHandler;
=======
import org.kde.kdeconnect.Helpers.ObjectsHelper;
import org.kde.kdeconnect.UserInterface.MaterialActivity;
>>>>>>>
import org.kde.kdeconnect.Backends.BasePairingHandler;
<<<<<<<
import java.util.Map;
=======
import java.util.HashSet;
>>>>>>>
import java.util.HashSet;
import java.util.Map;
<<<<<<<
=======
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.CopyOnWriteArrayList;
>>>>>>>
import java.util.concurrent.CopyOnWriteArrayList;
<<<<<<<
private DeviceType deviceType;
private PairStatus pairStatus;
private ArrayList<PairingCallback> pairingCallback = new ArrayList<PairingCallback>();
private Map<String, BasePairingHandler> pairingHandlers = new HashMap<String, BasePairingHandler>();
private final ArrayList<BaseLink> links = new ArrayList<BaseLink>();
private final HashMap<String, Plugin> plugins = new HashMap<String, Plugin>();
private final HashMap<String, Plugin> failedPlugins = new HashMap<String, Plugin>();
private final SharedPreferences settings;
=======
>>>>>>> |
<<<<<<<
private final ArrayList<ConnectionReceiver> connectionReceivers = new ArrayList<ConnectionReceiver>();
protected BasePairingHandler pairingHandler;
public BasePairingHandler getPairingHandler() {
return pairingHandler;
}
=======
private final CopyOnWriteArrayList<ConnectionReceiver> connectionReceivers = new CopyOnWriteArrayList<>();
>>>>>>>
private final CopyOnWriteArrayList<ConnectionReceiver> connectionReceivers = new CopyOnWriteArrayList<>();
protected BasePairingHandler pairingHandler;
public BasePairingHandler getPairingHandler() {
return pairingHandler;
} |
<<<<<<<
public LoopbackLink(Context context, BaseLinkProvider linkProvider) {
super(context, "loopback", linkProvider);
}
@Override
public String getName() {
return "LoopbackLink";
}
@Override
public BasePairingHandler getPairingHandler(Device device, BasePairingHandler.PairingHandlerCallback callback) {
return new LoopbackPairingHandler(device, callback);
=======
public LoopbackLink(BaseLinkProvider linkProvider) {
super("loopback", linkProvider, ConnectionStarted.Remotely);
>>>>>>>
public LoopbackLink(Context context, BaseLinkProvider linkProvider) {
super(context, "loopback", linkProvider, ConnectionStarted.Remotely);
}
@Override
public String getName() {
return "LoopbackLink";
}
@Override
public BasePairingHandler getPairingHandler(Device device, BasePairingHandler.PairingHandlerCallback callback) {
return new LoopbackPairingHandler(device, callback); |
<<<<<<<
=======
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.future.IoFuture;
import org.apache.mina.core.future.IoFutureListener;
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.textline.LineDelimiter;
import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.kde.kdeconnect.Backends.BaseLink;
>>>>>>>
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.future.IoFuture;
import org.apache.mina.core.future.IoFutureListener;
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.textline.LineDelimiter;
import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.kde.kdeconnect.Backends.BaseLink;
<<<<<<<
import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
=======
import org.kde.kdeconnect.Helpers.DeviceHelper;
>>>>>>>
import org.kde.kdeconnect.Helpers.DeviceHelper;
import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
<<<<<<<
private final HashMap<String, LanLink> visibleComputers = new HashMap<String, LanLink>();
private final LongSparseArray<LanLink> nioLinks = new LongSparseArray<LanLink>();
private final LongSparseArray<Channel> nioChannels = new LongSparseArray<Channel>();
=======
private final HashMap<String, LanLink> visibleComputers = new HashMap<>();
private final LongSparseArray<LanLink> nioSessions = new LongSparseArray<>();
private final LongSparseArray<NioSocketConnector> nioConnectors = new LongSparseArray<>();
>>>>>>>
private final HashMap<String, LanLink> visibleComputers = new HashMap<String, LanLink>();
private final LongSparseArray<LanLink> nioLinks = new LongSparseArray<LanLink>();
private final LongSparseArray<Channel> nioChannels = new LongSparseArray<Channel>();
<<<<<<<
if (message.isEmpty()) {
Log.e("KDE/LanLinkProvider", "Empty package received");
=======
String theMessage = (String) message;
if (theMessage.isEmpty()) {
Log.w("KDE/LanLinkProvider","Empty package received");
>>>>>>>
if (message.isEmpty()) {
Log.e("KDE/LanLinkProvider", "Empty package received");
<<<<<<<
NetworkPackage myIdentityPackage = NetworkPackage.createIdentityPackage(context);
if (np.getString("deviceId").equals(myIdentityPackage.getString("deviceId"))) {
=======
String myId = DeviceHelper.getDeviceId(context);
if (np.getString("deviceId").equals(myId)) {
>>>>>>>
String myId = DeviceHelper.getDeviceId(context);
if (np.getString("deviceId").equals(myId)) {
<<<<<<<
=======
LanLink link = new LanLink(session, np.getString("deviceId"), LanLinkProvider.this, BaseLink.ConnectionStarted.Locally);
nioSessions.put(session.getId(),link);
//Log.e("KDE/LanLinkProvider","nioSessions.size(): " + nioSessions.size());
addLink(np, link);
>>>>>>>
<<<<<<<
final LanLink link = new LanLink(context, channel, identityPackage.getString("deviceId"), LanLinkProvider.this);
NetworkPackage np2 = NetworkPackage.createIdentityPackage(context);
link.sendPackage(np2,new Device.SendPackageStatusCallback() {
=======
final LanLink link = new LanLink(session, identityPackage.getString("deviceId"), LanLinkProvider.this, BaseLink.ConnectionStarted.Remotely);
new Thread(new Runnable() {
>>>>>>>
final LanLink link = new LanLink(context, channel, identityPackage.getString("deviceId"), LanLinkProvider.this, BaseLink.ConnectionStarted.Remotely);
NetworkPackage np2 = NetworkPackage.createIdentityPackage(context);
link.sendPackage(np2,new Device.SendPackageStatusCallback() {
<<<<<<<
if (link.getStartTime() < oldLink.getStartTime()) {
// New link is not so new, it just took more time to be establish successfully and get here
link.disconnect();
connectionLost(link);
} else {
Log.i("KDE/LanLinkProvider", "Removing old connection to same device");
oldLink.disconnect();
connectionLost(oldLink);
}
=======
Log.i("KDE/LanLinkProvider","Removing old connection to same device");
oldLink.closeSocket();
connectionLost(oldLink);
>>>>>>>
if (link.getStartTime() < oldLink.getStartTime()) {
// New link is not so new, it just took more time to be establish successfully and get here
link.closeSocket();
connectionLost(link);
} else {
Log.i("KDE/LanLinkProvider", "Removing old connection to same device");
oldLink.closeSocket();
connectionLost(oldLink);
} |
<<<<<<<
import io.gravitee.am.model.*;
=======
import io.gravitee.am.model.*;
import io.gravitee.am.model.account.AccountSettings;
>>>>>>>
import io.gravitee.am.model.*;
import io.gravitee.am.model.account.AccountSettings;
<<<<<<<
@Override
public Single<User> enrollFactors(String userId, List<EnrolledFactor> factors, io.gravitee.am.identityprovider.api.User principal) {
return userService.findById(userId)
=======
public void setExpireAfter(Integer expireAfter) {
this.expireAfter = expireAfter;
}
private Single<User> assignRoles0(String userId, List<String> roles, io.gravitee.am.identityprovider.api.User principal, boolean revoke) {
return findById(userId)
>>>>>>>
@Override
public Single<User> enrollFactors(String userId, List<EnrolledFactor> factors, io.gravitee.am.identityprovider.api.User principal) {
return userService.findById(userId)
<<<<<<<
private Maybe<Application> checkClient(String domain, String client) {
return applicationService.findById(client)
.switchIfEmpty(Maybe.defer(() -> applicationService.findByDomainAndClientId(domain, client)))
=======
private Maybe<Client> checkClient(String domain, String client) {
if (client == null) {
return Maybe.empty();
}
return clientService.findById(client)
.switchIfEmpty(Maybe.defer(() -> clientService.findByDomainAndClientId(domain, client)))
>>>>>>>
private Maybe<Application> checkClient(String domain, String client) {
if (client == null) {
return Maybe.empty();
}
return applicationService.findById(client)
.switchIfEmpty(Maybe.defer(() -> applicationService.findByDomainAndClientId(domain, client)))
<<<<<<<
final String token = jwtBuilder.setClaims(claims).compact();
String entryPoint = gatewayUrl;
if (entryPoint != null && entryPoint.endsWith("/")) {
entryPoint = entryPoint.substring(0, entryPoint.length() - 1);
}
String redirectUrl = entryPoint + "/" + user.getReferenceId() + redirectUri + "?token=" + token;
Map<String, Object> params = new HashMap<>();
params.put("user", user);
params.put(redirectUriName, redirectUrl);
params.put("token", token);
params.put("expireAfterSeconds", expiresAfter);
return params;
=======
return jwtBuilder.setClaims(claims).compact();
>>>>>>>
return jwtBuilder.setClaims(claims).compact(); |
<<<<<<<
import com.alibaba.otter.canal.parse.inbound.mysql.tablemeta.HistoryTableMetaCache;
=======
import com.alibaba.otter.canal.meta.FileMixedMetaManager;
>>>>>>>
import com.alibaba.otter.canal.parse.inbound.mysql.tablemeta.HistoryTableMetaCache;
import com.alibaba.otter.canal.meta.FileMixedMetaManager; |
<<<<<<<
import com.alibaba.otter.canal.client.adapter.CanalOuterAdapter;
import com.alibaba.otter.canal.client.adapter.support.CanalClientConfig;
import com.alibaba.otter.canal.client.adapter.support.CanalOuterAdapterConfiguration;
import com.alibaba.otter.canal.client.adapter.support.ExtensionLoader;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
=======
>>>>>>>
import com.alibaba.otter.canal.client.adapter.CanalOuterAdapter;
import com.alibaba.otter.canal.client.adapter.support.CanalClientConfig;
import com.alibaba.otter.canal.client.adapter.support.CanalOuterAdapterConfiguration;
import com.alibaba.otter.canal.client.adapter.support.ExtensionLoader;
<<<<<<<
=======
boolean flatMessage = this.canalClientConfig.getFlatMessage();
// if (zkHosts == null && sa == null) {
// throw new RuntimeException("Blank config property: canalServerHost or
// zookeeperHosts");
// }
>>>>>>> |
<<<<<<<
private Map<ServerType,Long> memoryConfig = new HashMap<ServerType,Long>();
private boolean jdwpEnabled = false;
private String instanceName = "miniInstance";
private File libDir;
private File confDir;
private File zooKeeperDir;
private File accumuloDir;
private File logDir;
private File walogDir;
private Integer zooKeeperPort;
private long defaultMemorySize = 128 * 1024 * 1024;
private boolean initialized = false;
private boolean useMiniDFS = false;
=======
private boolean runGC = false;
>>>>>>>
private Map<ServerType,Long> memoryConfig = new HashMap<ServerType,Long>();
private boolean jdwpEnabled = false;
private String instanceName = "miniInstance";
private File libDir;
private File confDir;
private File zooKeeperDir;
private File accumuloDir;
private File logDir;
private File walogDir;
private Integer zooKeeperPort;
private long defaultMemorySize = 128 * 1024 * 1024;
private boolean initialized = false;
private boolean useMiniDFS = false;
private boolean runGC = false;
<<<<<<<
/**
* Calling this method is optional. A random port is generated by default
*
* @param zooKeeperPort
* A valid (and unused) port to use for the zookeeper
*
* @since 1.6.0
*/
public MiniAccumuloConfig setZooKeeperPort(int zooKeeperPort) {
this.zooKeeperPort = zooKeeperPort;
return this;
}
/**
* Sets the amount of memory to use in the master process. Calling this method is optional. Default memory is 128M
*
* @param serverType
* the type of server to apply the memory settings
* @param memory
* amount of memory to set
*
* @param memoryUnit
* the units for which to apply with the memory size
*
* @since 1.6.0
*/
public MiniAccumuloConfig setMemory(ServerType serverType, long memory, MemoryUnit memoryUnit) {
this.memoryConfig.put(serverType, memoryUnit.toBytes(memory));
return this;
}
/**
* Sets the default memory size to use. This value is also used when a ServerType has not been configured explicitly. Calling this method is optional. Default
* memory is 128M
*
* @param memory
* amount of memory to set
*
* @param memoryUnit
* the units for which to apply with the memory size
*
* @since 1.6.0
*/
public MiniAccumuloConfig setDefaultMemory(long memory, MemoryUnit memoryUnit) {
this.defaultMemorySize = memoryUnit.toBytes(memory);
return this;
}
/**
* @return a copy of the site config
*/
public Map<String,String> getSiteConfig() {
return new HashMap<String,String>(siteConfig);
}
/**
* @return name of configured instance
*
* @since 1.6.0
*/
public String getInstanceName() {
return instanceName;
}
/**
* @return The configured zookeeper port
*
* @since 1.6.0
*/
public int getZooKeeperPort() {
return zooKeeperPort;
}
File getLibDir() {
return libDir;
}
File getConfDir() {
return confDir;
}
File getZooKeeperDir() {
return zooKeeperDir;
}
File getAccumuloDir() {
return accumuloDir;
}
public File getLogDir() {
return logDir;
}
File getWalogDir() {
return walogDir;
}
/**
* @param serverType
* get configuration for this server type
*
* @return memory configured in bytes, returns default if this server type is not configured
*
* @since 1.6.0
*/
public long getMemory(ServerType serverType) {
return memoryConfig.containsKey(serverType) ? memoryConfig.get(serverType) : defaultMemorySize;
}
/**
* @return memory configured in bytes
*
* @since 1.6.0
*/
public long getDefaultMemory() {
return defaultMemorySize;
}
/**
* @return zookeeper connection string
*
* @since 1.6.0
*/
public String getZooKeepers() {
return siteConfig.get(Property.INSTANCE_ZK_HOST.getKey());
}
/**
* @return the base directory of the cluster configuration
*/
public File getDir() {
return dir;
}
/**
* @return the root password of this cluster configuration
*/
public String getRootPassword() {
return rootPassword;
}
/**
* @return the number of tservers configured for this cluster
*/
public int getNumTservers() {
return numTservers;
}
/**
* @return is the current configuration in jdwpEnabled mode?
*
* @since 1.6.0
*/
public boolean isJDWPEnabled() {
return jdwpEnabled;
}
/**
* @param jdwpEnabled
* should the processes run remote jdwpEnabled servers?
* @return the current instance
*
* @since 1.6.0
*/
public MiniAccumuloConfig setJDWPEnabled(boolean jdwpEnabled) {
this.jdwpEnabled = jdwpEnabled;
return this;
}
public boolean useMiniDFS() {
return useMiniDFS;
}
public void useMiniDFS(boolean useMiniDFS) {
this.useMiniDFS = useMiniDFS;
}
=======
/**
* Whether or not the Accumulo garbage collector proces will run
* @return
*/
public boolean shouldRunGC() {
return runGC;
}
/**
* Sets if the Accumulo garbage collector process should run
* @param shouldRunGC
*/
public void runGC(boolean shouldRunGC) {
runGC = shouldRunGC;
}
>>>>>>>
/**
* Calling this method is optional. A random port is generated by default
*
* @param zooKeeperPort
* A valid (and unused) port to use for the zookeeper
*
* @since 1.6.0
*/
public MiniAccumuloConfig setZooKeeperPort(int zooKeeperPort) {
this.zooKeeperPort = zooKeeperPort;
return this;
}
/**
* Sets the amount of memory to use in the master process. Calling this method is optional. Default memory is 128M
*
* @param serverType
* the type of server to apply the memory settings
* @param memory
* amount of memory to set
*
* @param memoryUnit
* the units for which to apply with the memory size
*
* @since 1.6.0
*/
public MiniAccumuloConfig setMemory(ServerType serverType, long memory, MemoryUnit memoryUnit) {
this.memoryConfig.put(serverType, memoryUnit.toBytes(memory));
return this;
}
/**
* Sets the default memory size to use. This value is also used when a ServerType has not been configured explicitly. Calling this method is optional. Default
* memory is 128M
*
* @param memory
* amount of memory to set
*
* @param memoryUnit
* the units for which to apply with the memory size
*
* @since 1.6.0
*/
public MiniAccumuloConfig setDefaultMemory(long memory, MemoryUnit memoryUnit) {
this.defaultMemorySize = memoryUnit.toBytes(memory);
return this;
}
/**
* @return a copy of the site config
*/
public Map<String,String> getSiteConfig() {
return new HashMap<String,String>(siteConfig);
}
/**
* @return name of configured instance
*
* @since 1.6.0
*/
public String getInstanceName() {
return instanceName;
}
/**
* @return The configured zookeeper port
*
* @since 1.6.0
*/
public int getZooKeeperPort() {
return zooKeeperPort;
}
File getLibDir() {
return libDir;
}
File getConfDir() {
return confDir;
}
File getZooKeeperDir() {
return zooKeeperDir;
}
File getAccumuloDir() {
return accumuloDir;
}
public File getLogDir() {
return logDir;
}
File getWalogDir() {
return walogDir;
}
/**
* @param serverType
* get configuration for this server type
*
* @return memory configured in bytes, returns default if this server type is not configured
*
* @since 1.6.0
*/
public long getMemory(ServerType serverType) {
return memoryConfig.containsKey(serverType) ? memoryConfig.get(serverType) : defaultMemorySize;
}
/**
* @return memory configured in bytes
*
* @since 1.6.0
*/
public long getDefaultMemory() {
return defaultMemorySize;
}
/**
* @return zookeeper connection string
*
* @since 1.6.0
*/
public String getZooKeepers() {
return siteConfig.get(Property.INSTANCE_ZK_HOST.getKey());
}
/**
* @return the base directory of the cluster configuration
*/
public File getDir() {
return dir;
}
/**
* @return the root password of this cluster configuration
*/
public String getRootPassword() {
return rootPassword;
}
/**
* @return the number of tservers configured for this cluster
*/
public int getNumTservers() {
return numTservers;
}
/**
* @return is the current configuration in jdwpEnabled mode?
*
* @since 1.6.0
*/
public boolean isJDWPEnabled() {
return jdwpEnabled;
}
/**
* @param jdwpEnabled
* should the processes run remote jdwpEnabled servers?
* @return the current instance
*
* @since 1.6.0
*/
public MiniAccumuloConfig setJDWPEnabled(boolean jdwpEnabled) {
this.jdwpEnabled = jdwpEnabled;
return this;
}
public boolean useMiniDFS() {
return useMiniDFS;
}
public void useMiniDFS(boolean useMiniDFS) {
this.useMiniDFS = useMiniDFS;
}
/**
* Whether or not the Accumulo garbage collector proces will run
* @return
*/
public boolean shouldRunGC() {
return runGC;
}
/**
* Sets if the Accumulo garbage collector process should run
* @param shouldRunGC
*/
public void runGC(boolean shouldRunGC) {
runGC = shouldRunGC;
} |
<<<<<<<
import uk.ac.bbsrc.tgac.miso.core.data.Index;
=======
>>>>>>>
import uk.ac.bbsrc.tgac.miso.core.data.Index;
<<<<<<<
import uk.ac.bbsrc.tgac.miso.core.data.impl.LibraryDilution;
=======
>>>>>>>
import uk.ac.bbsrc.tgac.miso.core.data.impl.LibraryDilution;
<<<<<<<
private void collectIndices(StringBuilder render, Dilution dilution) {
for (Index index : dilution.getLibrary().getIndices()) {
render.append(index.getPosition());
render.append(": ");
render.append(index.getLabel());
render.append("<br/>");
}
}
public JSONObject createElementSelectDataTable(HttpSession session, JSONObject json) {
if (json.has("platform") && !isStringEmptyOrNull(json.getString("platform"))) {
try {
String platform = json.getString("platform");
long poolId = json.has("poolId") ? json.getLong("poolId") : 0L;
JSONObject j = new JSONObject();
JSONArray arr = new JSONArray();
for (LibraryDilution libraryDilution : requestManager.listAllLibraryDilutionsByPlatform((PlatformType.get(platform)))) {
JSONArray pout = new JSONArray();
pout.add(libraryDilution.getName());
pout.add(libraryDilution.getConcentration().toString());
pout.add(String.format("<a href='/miso/library/%d'>%s (%s)</a>", libraryDilution.getLibrary().getId(),
libraryDilution.getLibrary().getAlias(), libraryDilution.getLibrary().getName()));
pout.add(String.format("<a href='/miso/sample/%d'>%s (%s)</a>", libraryDilution.getLibrary().getSample().getId(),
libraryDilution.getLibrary().getSample().getAlias(), libraryDilution.getLibrary().getSample().getName()));
StringBuilder indices = new StringBuilder();
collectIndices(indices, libraryDilution);
pout.add(indices.toString());
pout.add(libraryDilution.getLibrary().isLowQuality() ? "⚠" : "");
pout.add("<div style='cursor:inherit;' onclick=\"Pool.search.poolSearchSelectElement(" + poolId + ", '" + libraryDilution.getId()
+ "', '" + libraryDilution.getName() + "')\"><span class=\"ui-icon ui-icon-plusthick\"></span></div>");
arr.add(pout);
}
j.put("poolelements", arr);
return j;
} catch (IOException e) {
log.debug("Failed", e);
return JSONUtils.SimpleJSONError("Failed: " + e.getMessage());
}
} else {
return JSONUtils.SimpleJSONError("No platform specified");
}
}
=======
>>>>>>> |
<<<<<<<
public final static AttributesDefinition orcidDefinition = new OrcidAttributesDefinition();
=======
public final static AttributesDefinition bitbucketDefinition = new BitbucketAttributesDefinition();
>>>>>>>
public final static AttributesDefinition bitbucketDefinition = new BitbucketAttributesDefinition();
public final static AttributesDefinition orcidDefinition = new OrcidAttributesDefinition(); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.