conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc;
=======
import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseUniversalElectrical;
>>>>>>>
import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseUniversalElectrical;
import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc;
<<<<<<<
import micdoodle8.mods.galacticraft.core.tile.TileEntityUniversalElectrical;
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
=======
>>>>>>>
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; |
<<<<<<<
public class TileEntityTerraformer extends TileBaseElectricBlockWithInventory implements ISidedInventory, IDisableableMachine, IBubbleProvider, IFluidHandler, IFluidHandlerWrapper
=======
public class TileEntityTerraformer extends TileBaseElectricBlockWithInventory implements ISidedInventory, IDisableableMachine, IBubbleProviderColored, IFluidHandler
>>>>>>>
public class TileEntityTerraformer extends TileBaseElectricBlockWithInventory implements ISidedInventory, IDisableableMachine, IBubbleProviderColored, IFluidHandler, IFluidHandlerWrapper |
<<<<<<<
WorldUtil.forceMoveEntityToPos(this.getPassengers().get(0), (WorldServer) this.worldObj, new Vector3(this.targetVec.getX() + 0.5F, this.targetVec.getY() + 800, this.targetVec.getZ() + 0.5F));
=======
WorldUtil.forceMoveEntityToPos(this.riddenByEntity, (WorldServer) this.worldObj, new Vector3(this.targetVec.getX() + 0.5F, this.targetVec.getY() + 800, this.targetVec.getZ() + 0.5F), false);
>>>>>>>
WorldUtil.forceMoveEntityToPos(this.getPassengers().get(0), (WorldServer) this.worldObj, new Vector3(this.targetVec.getX() + 0.5F, this.targetVec.getY() + 800, this.targetVec.getZ() + 0.5F), false);
<<<<<<<
if (!this.getPassengers().isEmpty() && !this.worldObj.isRemote)
=======
if (!this.worldObj.isRemote)
>>>>>>>
if (!this.worldObj.isRemote) |
<<<<<<<
model.setInvisible(false);
switch (slotIn)
{
case HEAD:
model.bipedRightLeg.showModel = true;
model.bipedLeftLeg.showModel = true;
break;
case CHEST:
model.bipedRightLeg.showModel = true;
model.bipedLeftLeg.showModel = true;
break;
case LEGS:
model.bipedBody.showModel = true;
model.bipedRightArm.showModel = true;
model.bipedLeftArm.showModel = true;
break;
case FEET:
model.bipedHead.showModel = true;
model.bipedHeadwear.showModel = true;
}
}
@Override
public ItemStack getItemStackFromSlot(EntityLivingBase living, EntityEquipmentSlot slotIn)
{
PlayerGearData gearData = ModelPlayerGC.getGearData((EntityPlayer) living);
=======
PlayerGearData gearData = GalacticraftCore.proxy.getGearData((EntityPlayer) entitylivingbaseIn);
>>>>>>>
model.setInvisible(false);
switch (slotIn)
{
case HEAD:
model.bipedRightLeg.showModel = true;
model.bipedLeftLeg.showModel = true;
break;
case CHEST:
model.bipedRightLeg.showModel = true;
model.bipedLeftLeg.showModel = true;
break;
case LEGS:
model.bipedBody.showModel = true;
model.bipedRightArm.showModel = true;
model.bipedLeftArm.showModel = true;
break;
case FEET:
model.bipedHead.showModel = true;
model.bipedHeadwear.showModel = true;
}
}
@Override
public ItemStack getItemStackFromSlot(EntityLivingBase living, EntityEquipmentSlot slotIn)
{
PlayerGearData gearData = GalacticraftCore.proxy.getGearData((EntityPlayer) living); |
<<<<<<<
String DEFAULT_STATUS = "default.status";
=======
static final String DEFAULT_STATUS = "default.status";
/**
* Default type to use (in order to avoid putting it in all files)
*/
static final String DEFAULT_TYPE = "default.type";
>>>>>>>
String DEFAULT_STATUS = "default.status";
/**
* Default type to use (in order to avoid putting it in all files)
*/
String DEFAULT_TYPE = "default.type";
<<<<<<<
String POSTS_PER_PAGE = "index.posts_per_page";
}
=======
static final String POSTS_PER_PAGE = "index.posts_per_page";
}
>>>>>>>
String POSTS_PER_PAGE = "index.posts_per_page";
} |
<<<<<<<
CompatibilityManager.forceLoadChunks(worldNew);
ChunkPos pair = worldNew.getChunkFromChunkCoords(spawnPos.intX(), spawnPos.intZ()).getChunkCoordIntPair();
=======
ChunkCoordIntPair pair = worldNew.getChunkFromChunkCoords(spawnPos.intX() >> 4, spawnPos.intZ() >> 4).getChunkCoordIntPair();
>>>>>>>
CompatibilityManager.forceLoadChunks(worldNew);
ChunkPos pair = worldNew.getChunkFromChunkCoords(spawnPos.intX() >> 4, spawnPos.intZ() >> 4).getChunkCoordIntPair(); |
<<<<<<<
IBlockState state = this.worldProvider.world.getBlockState(this.oneSSBlock);
if (state.getBlock().getMaterial(state) != Material.AIR)
=======
IBlockState state = this.worldProvider.worldObj.getBlockState(this.oneSSBlock);
if (state.getMaterial() != Material.AIR)
>>>>>>>
IBlockState state = this.worldProvider.world.getBlockState(this.oneSSBlock);
if (state.getMaterial() != Material.AIR) |
<<<<<<<
if (this.posY > (this.world.provider instanceof IExitHeight ? ((IExitHeight) this.world.provider).getYCoordinateToTeleport() : 1200))
=======
if (this.posY > (this.worldObj.provider instanceof IExitHeight ? ((IExitHeight) this.worldObj.provider).getYCoordinateToTeleport() : 1200) && this.launchPhase != EnumLaunchPhase.LANDING.ordinal())
>>>>>>>
if (this.posY > (this.world.provider instanceof IExitHeight ? ((IExitHeight) this.world.provider).getYCoordinateToTeleport() : 1200) && this.launchPhase != EnumLaunchPhase.LANDING.ordinal())
<<<<<<<
else if (this.posY > (this.world.provider instanceof IExitHeight ? ((IExitHeight) this.world.provider).getYCoordinateToTeleport() : 1200) + 100)
=======
else if (this.posY > (this.worldObj.provider instanceof IExitHeight ? ((IExitHeight) this.worldObj.provider).getYCoordinateToTeleport() : 1200) + (this.launchPhase == EnumLaunchPhase.LANDING.ordinal() ? 355 : 100))
>>>>>>>
else if (this.posY > (this.world.provider instanceof IExitHeight ? ((IExitHeight) this.world.provider).getYCoordinateToTeleport() : 1200) + (this.launchPhase == EnumLaunchPhase.LANDING.ordinal() ? 355 : 100)) |
<<<<<<<
IBlockState stateAbove = this.world.getBlockState(getPos().up());
if (stateAbove.getBlock().getMaterial(stateAbove) == Material.AIR && stateAbove.getBlock() != GCBlocks.breatheableAir && stateAbove.getBlock() != GCBlocks.brightBreatheableAir)
=======
IBlockState stateAbove = this.worldObj.getBlockState(getPos().up());
if (stateAbove.getMaterial() == Material.AIR && stateAbove.getBlock() != GCBlocks.breatheableAir && stateAbove.getBlock() != GCBlocks.brightBreatheableAir)
>>>>>>>
IBlockState stateAbove = this.world.getBlockState(getPos().up());
if (stateAbove.getMaterial() == Material.AIR && stateAbove.getBlock() != GCBlocks.breatheableAir && stateAbove.getBlock() != GCBlocks.brightBreatheableAir) |
<<<<<<<
boolean successJEI = false;
if ((doMetalsToOreDict || doMetalsToGC || doSilicon) && GCCoreUtil.getEffectiveSide() == Side.CLIENT && CompatibilityManager.modJEILoaded)
{
successJEI = GalacticraftJEI.refreshJEIpre();
}
=======
>>>>>>>
<<<<<<<
NonNullList<Object> input1 = NonNullList.create();
input1.add(new ItemStack(Items.DIAMOND));
input1.add(silicon);
input1.add(silicon);
input1.add(new ItemStack(Items.REDSTONE));
input1.add(new ItemStack(Items.DYE, 1, 4));
CircuitFabricatorRecipes.addRecipe(solarPanels, input1);
NonNullList<Object> input2 = NonNullList.create();
input2.add(new ItemStack(Items.DIAMOND));
input2.add(silicon);
input2.add(silicon);
input2.add(new ItemStack(Items.REDSTONE));
input2.add(new ItemStack(Blocks.REDSTONE_TORCH));
CircuitFabricatorRecipes.addRecipe(basicWafers, input2);
NonNullList<Object> input3 = NonNullList.create();
input3.add(new ItemStack(Items.DIAMOND));
input3.add(silicon);
input3.add(silicon);
input3.add(new ItemStack(Items.REDSTONE));
input3.add(new ItemStack(Items.REPEATER));
CircuitFabricatorRecipes.addRecipe(advancedWafers, input3);
}
// Update Ingot Compressor recipes for steel plate
CompressorRecipes.removeRecipe(new ItemStack(GCItems.basicItem, 1, 9));
boolean steelDone = false;
if (OreDictionary.getOres("ingotSteel").size() > 0)
{
CompressorRecipes.addShapelessRecipe(new ItemStack(GCItems.basicItem, 1, 9), "ingotSteel", "ingotSteel");
steelDone = true;
}
if (!ConfigManagerCore.hardMode || !steelDone)
{
CompressorRecipes.addShapelessRecipe(new ItemStack(GCItems.basicItem, 1, 9), Items.COAL, new ItemStack(GCItems.basicItem, 1, 11), Items.COAL);
}
else
{
CompressorRecipes.addShapelessAdventure(new ItemStack(GCItems.basicItem, 1, 9), Items.COAL, new ItemStack(GCItems.basicItem, 1, 11), Items.COAL);
=======
if (needNewList)
{
List<ItemStack> newList = new ArrayList<>(1 + silicons.size());
newList.add((ItemStack) siliconGC);
if (silicons.size() > 0) newList.addAll(silicons);
silicons = newList;
}
CircuitFabricatorRecipes.replaceRecipeIngredient(siliconGC, silicons);
>>>>>>>
if (needNewList)
{
List<ItemStack> newList = new ArrayList<>(1 + silicons.size());
newList.add((ItemStack) siliconGC);
if (silicons.size() > 0) newList.addAll(silicons);
silicons = newList;
}
CircuitFabricatorRecipes.replaceRecipeIngredient(siliconGC, silicons);
<<<<<<<
if (successJEI)
{
GalacticraftJEI.refreshJEIpost();
}
=======
>>>>>>> |
<<<<<<<
}
else if (stats.getLastParachuteInSlot() == null || forceSend)
{
if (stats.isUsingParachute())
=======
else if (GCPlayer.lastParachuteInSlot == null || forceSend)
{
GCPlayerHandler.sendGearUpdatePacket(player, EnumModelPacket.ADD_PARACHUTE, GCPlayer.parachuteInSlot.getItemDamage());
}
else if (GCPlayer.parachuteInSlot.getItemDamage() != GCPlayer.lastParachuteInSlot.getItemDamage())
>>>>>>>
else if (forceSend || stats.getLastParachuteInSlot() == null || stats.getParachuteInSlot().getItemDamage() != stats.getLastParachuteInSlot().getItemDamage())
<<<<<<<
}
else if (stats.getParachuteInSlot().getItemDamage() != stats.getLastParachuteInSlot().getItemDamage())
{
int gearID = GalacticraftRegistry.findMatchingGearID(stats.getParachuteInSlot(), EnumExtendedInventorySlot.PARACHUTE);
if (gearID >= 0)
{
GCPlayerHandler.sendGearUpdatePacket(player, EnumModelPacketType.ADD, EnumExtendedInventorySlot.PARACHUTE, stats.getParachuteInSlot().getItemDamage());
}
=======
>>>>>>> |
<<<<<<<
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
=======
>>>>>>>
import net.minecraft.util.math.BlockPos;
<<<<<<<
@Override
public int getField(int id)
{
return 0;
}
@Override
public void setField(int id, int value)
{
}
@Override
public int getFieldCount()
{
return 0;
}
@Override
public void clear()
{
}
@Override
public ITextComponent getDisplayName()
{
return null;
}
=======
>>>>>>> |
<<<<<<<
=======
import net.minecraftforge.fml.common.registry.GameRegistry;
>>>>>>>
<<<<<<<
private static boolean modIc2Loaded = Loader.isModLoaded(modidIC2);
private static boolean modBCraftEnergyLoaded = Loader.isModLoaded("buildcraftenergy");
=======
public static boolean modJEILoaded = Loader.isModLoaded("JEI");
public static boolean modIc2Loaded = Loader.isModLoaded("IC2");
private static boolean modBCraftEnergyLoaded = Loader.isModLoaded("BuildCraft|Energy");
>>>>>>>
public static boolean modJEILoaded = Loader.isModLoaded("jei");
private static boolean modIc2Loaded = Loader.isModLoaded(modidIC2);
private static boolean modBCraftEnergyLoaded = Loader.isModLoaded("buildcraftenergy"); |
<<<<<<<
GalacticraftCore.packetPipeline.sendToServer(new PacketSimple(PacketSimple.EnumSimplePacket.S_REQUEST_OVERWORLD_IMAGE, FMLClientHandler.instance().getClient().world.provider.getDimension(), new Object[] {}));
=======
GalacticraftCore.packetPipeline.sendToServer(new PacketSimple(PacketSimple.EnumSimplePacket.S_REQUEST_OVERWORLD_IMAGE, GCCoreUtil.getDimensionID(FMLClientHandler.instance().getClient().theWorld), new Object[] {}));
ClientProxyCore.overworldTextureRequestSent = true;
>>>>>>>
GalacticraftCore.packetPipeline.sendToServer(new PacketSimple(PacketSimple.EnumSimplePacket.S_REQUEST_OVERWORLD_IMAGE, GCCoreUtil.getDimensionID(FMLClientHandler.instance().getClient().world), new Object[] {}));
ClientProxyCore.overworldTextureRequestSent = true;
<<<<<<<
World world = WorldUtil.getProviderForDimensionServer(ConfigManagerCore.idDimensionOverworld).world;
if (world == null)
=======
World overworld = WorldUtil.getProviderForDimensionServer(ConfigManagerCore.idDimensionOverworld).worldObj;
if (overworld == null)
>>>>>>>
World overworld = WorldUtil.getProviderForDimensionServer(ConfigManagerCore.idDimensionOverworld).world;
if (overworld == null) |
<<<<<<<
if (worldclient.provider instanceof IGalacticraftWorldProvider && ((IGalacticraftWorldProvider) worldclient.provider).getCelestialBody().atmosphere.size() == 0 && event.getState().getBlock().getMaterial(event.getState()) == Material.AIR && !((IGalacticraftWorldProvider) worldclient.provider).hasBreathableAtmosphere())
=======
if (worldclient.provider instanceof IGalacticraftWorldProvider && ((IGalacticraftWorldProvider) worldclient.provider).hasNoAtmosphere() && event.block.getMaterial() == Material.air && !((IGalacticraftWorldProvider) worldclient.provider).hasBreathableAtmosphere())
>>>>>>>
if (worldclient.provider instanceof IGalacticraftWorldProvider && ((IGalacticraftWorldProvider) worldclient.provider).hasNoAtmosphere() && event.getState().getBlock().getMaterial(event.getState()) == Material.AIR && !((IGalacticraftWorldProvider) worldclient.provider).hasBreathableAtmosphere()) |
<<<<<<<
public String toString()
=======
@Override
public String call() throws Exception
>>>>>>>
@Override
public String toString()
<<<<<<<
public String toString()
=======
@Override
public String call() throws Exception
>>>>>>>
@Override
public String toString() |
<<<<<<<
this.resetMonsterListByMode(ConfigManagerCore.challengeMode || ConfigManagerCore.challengeMobDropsAndSpawning);
Biome.registerBiome(ConfigManagerCore.biomeIDbase + 2, GalacticraftPlanets.TEXTURE_PREFIX + this.getBiomeName(), this);
=======
this.resetMonsterListByMode(ConfigManagerCore.challengeMobDropsAndSpawning);
>>>>>>>
this.resetMonsterListByMode(ConfigManagerCore.challengeMobDropsAndSpawning);
Biome.registerBiome(ConfigManagerCore.biomeIDbase + 2, GalacticraftPlanets.TEXTURE_PREFIX + this.getBiomeName(), this); |
<<<<<<<
for (int i = 0; i < probe.getSizeInventory(); ++i)
{
// Clear contents
probe.setInventorySlotContents(i, ItemStack.EMPTY);
}
// TODO
// ChestGenHooks info = ChestGenHooks.getInfo(BlockCrashedProbe.CRASHED_PROBE);
//
// WeightedRandomChestContent.generateChestContents(rand, info.getItems(rand), probe, info.getCount(rand));
=======
probe.setLootTable(LootHandlerGC.TABLE_CRASHED_PROBE, rand.nextLong());
>>>>>>>
for (int i = 0; i < probe.getSizeInventory(); ++i)
{
// Clear contents
probe.setInventorySlotContents(i, ItemStack.EMPTY);
}
probe.setLootTable(LootHandlerGC.TABLE_CRASHED_PROBE, rand.nextLong()); |
<<<<<<<
MinecraftForge.EVENT_BUS.post(new GCCoreEventPopulate.Pre(this.world, random, chunkPos));
this.genStandardOre(18, this.aluminumGen, 0, 60, random);
this.genStandardOre(24, this.copperGen, 0, 60, random);
this.genStandardOre(18, this.galenaGen, 0, 60, random);
this.genStandardOre(26, this.quartzGen, 0, 60, random);
this.genStandardOre(4, this.siliconGen, 0, 60, random);
this.genStandardOre(22, this.tinGen, 0, 60, random);
MinecraftForge.EVENT_BUS.post(new GCCoreEventPopulate.Post(this.world, random, chunkPos));
=======
MinecraftForge.EVENT_BUS.post(new GCCoreEventPopulate.Pre(this.worldObj, random, chunkPos));
if (!ConfigManagerVenus.disableAluminumGen) this.genStandardOre(18, this.aluminumGen, 0, 60, random);
if (!ConfigManagerVenus.disableCopperGen) this.genStandardOre(24, this.copperGen, 0, 60, random);
if (!ConfigManagerVenus.disableGalenaGen) this.genStandardOre(18, this.galenaGen, 0, 60, random);
if (!ConfigManagerVenus.disableQuartzGen) this.genStandardOre(26, this.quartzGen, 0, 60, random);
if (!ConfigManagerVenus.disableSiliconGen) this.genStandardOre(4, this.siliconGen, 0, 60, random);
if (!ConfigManagerVenus.disableTinGen) this.genStandardOre(22, this.tinGen, 0, 60, random);
MinecraftForge.EVENT_BUS.post(new GCCoreEventPopulate.Post(this.worldObj, random, chunkPos));
>>>>>>>
MinecraftForge.EVENT_BUS.post(new GCCoreEventPopulate.Pre(this.world, random, chunkPos));
if (!ConfigManagerVenus.disableAluminumGen) this.genStandardOre(18, this.aluminumGen, 0, 60, random);
if (!ConfigManagerVenus.disableCopperGen) this.genStandardOre(24, this.copperGen, 0, 60, random);
if (!ConfigManagerVenus.disableGalenaGen) this.genStandardOre(18, this.galenaGen, 0, 60, random);
if (!ConfigManagerVenus.disableQuartzGen) this.genStandardOre(26, this.quartzGen, 0, 60, random);
if (!ConfigManagerVenus.disableSiliconGen) this.genStandardOre(4, this.siliconGen, 0, 60, random);
if (!ConfigManagerVenus.disableTinGen) this.genStandardOre(22, this.tinGen, 0, 60, random);
MinecraftForge.EVENT_BUS.post(new GCCoreEventPopulate.Post(this.world, random, chunkPos)); |
<<<<<<<
prop.setComment("Dimension ID for Venus");
prop.setLanguageKey("gc.configgui.dimensionIDVenus").setRequiresMcRestart(true);
=======
prop.comment = "Dimension ID for Venus";
prop.setLanguageKey("gc.configgui.dimension_id_venus").setRequiresMcRestart(true);
>>>>>>>
prop.setComment("Dimension ID for Venus");
prop.setLanguageKey("gc.configgui.dimension_id_venus").setRequiresMcRestart(true); |
<<<<<<<
//Scan area for player entities and light up
if (this.detection == null)
{
this.detection = new AxisAlignedBB(this.getPos().getX() + 0.9D, this.getPos().getY() + 0.75D, this.getPos().getZ() + 0.9D, this.getPos().getX() + 1.1D, this.getPos().getY() + 1.85D, this.getPos().getZ() + 1.1D);
}
final List<Entity> list = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, detection);
=======
this.detection = AxisAlignedBB.fromBounds(this.getPos().getX() + 0.9D, this.getPos().getY() + 0.75D, this.getPos().getZ() + 0.9D, this.getPos().getX() + 1.1D, this.getPos().getY() + 1.85D, this.getPos().getZ() + 1.1D);
}
final List<Entity> list = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, detection);
>>>>>>>
this.detection = new AxisAlignedBB(this.getPos().getX() + 0.9D, this.getPos().getY() + 0.75D, this.getPos().getZ() + 0.9D, this.getPos().getX() + 1.1D, this.getPos().getY() + 1.85D, this.getPos().getZ() + 1.1D);
}
final List<Entity> list = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, detection);
<<<<<<<
// If this player is within the box
EntityPlayerSP p = FMLClientHandler.instance().getClientPlayerEntity();
GCPlayerStatsClient stats = GCPlayerStatsClient.get(p);
if (list.contains(p) && !stats.getPlatformControlled() && p.getRidingEntity() == null)
=======
// If this player is within the box
EntityPlayerSP p = FMLClientHandler.instance().getClientPlayerEntity();
GCPlayerStatsClient stats = GCPlayerStatsClient.get(p);
if (list.contains(p) && !stats.getPlatformControlled() && p.ridingEntity == null)
{
//TODO: PlayerAPI version of this
if (p.movementInput.sneak)
>>>>>>>
// If this player is within the box
EntityPlayerSP p = FMLClientHandler.instance().getClientPlayerEntity();
GCPlayerStatsClient stats = GCPlayerStatsClient.get(p);
if (list.contains(p) && !stats.getPlatformControlled() && p.getRidingEntity() == null)
{
if (p.movementInput.sneak)
<<<<<<<
TileEntity te = this.worldObj.getTileEntity(this.pos.up(canAscend));
if (te instanceof TileEntityPlatform)
{
p.motionY = 0D;
TileEntityPlatform tep = (TileEntityPlatform) te;
stats.startPlatformAscent(tep, this, this.pos.getY() + canAscend + BlockPlatform.HEIGHT + 0.01D);
this.startMove(tep);
tep.startMove(this);
}
=======
p.motionY = 0D;
TileEntityPlatform tep = (TileEntityPlatform) te;
stats.startPlatformAscent(tep, this, this.pos.getY() + canAscend + BlockPlatform.HEIGHT);
this.startMove(tep);
tep.startMove(this);
>>>>>>>
p.motionY = 0D;
TileEntityPlatform tep = (TileEntityPlatform) te;
stats.startPlatformAscent(tep, this, this.pos.getY() + canAscend + BlockPlatform.HEIGHT + 0.01D);
this.startMove(tep);
tep.startMove(this); |
<<<<<<<
import net.minecraft.util.NonNullList;
import net.minecraft.util.text.ITextComponent;
=======
>>>>>>>
import net.minecraft.util.NonNullList; |
<<<<<<<
float radius = 5;
ViewGroup rootView = builder.getDecorView().findViewById(android.R.id.content);
Drawable windowBackground = builder.getDecorView().getBackground();
CustomBlurDialogue blurDialogueOptional = view.findViewById(R.id.blurview_optional);
blurDialogueOptional.create(builder.getDecorView(), radius);
=======
if (builder.getMessageOptional() != null)
{
TextView messageOptional = view.findViewById(R.id.permissions_optional_text);
messageOptional.setText(builder.getMessageOptional());
}
>>>>>>>
float radius = 5;
ViewGroup rootView = builder.getDecorView().findViewById(android.R.id.content);
Drawable windowBackground = builder.getDecorView().getBackground();
CustomBlurDialogue blurDialogueOptional = view.findViewById(R.id.blurview_optional);
blurDialogueOptional.create(builder.getDecorView(), radius);
if (builder.getMessageOptional() != null)
{
TextView messageOptional = view.findViewById(R.id.permissions_optional_text);
messageOptional.setText(builder.getMessageOptional());
}
<<<<<<<
public View getDecorView() {
return decorView;
}
public Builder setDecorView(View decorView) {
this.decorView = decorView;
return this;
}
=======
/**
* The Dialog Fragment is extremely picky about the `Activity` passed into the builder.
* If the improper Activity is passed, the dialogue will crash!
* Here's how to pass the proper Activity in the following cases:
* Activity - construct with `ClassName.this`
* Fragment - construct with `getActivity()`
* ViewHolder - construct with `getActivity().getApplicationContext()`
* Do not attempt to construct the dialogue with `getContext()`.
* The Builder requires an Activity and passing a Context does not work!
* @param context - pass the Dialogue's parent activity.
* @return
*/
>>>>>>> |
<<<<<<<
// defines the latest read message
private String mReadReceiptEventId;
// the read marker event id
private String mReadMarkerEventId;
=======
// defines the latest read event id
public String mLatestReadEventId;
>>>>>>>
// defines the latest read message
private String mReadReceiptEventId;
// the read marker event id
private String mReadMarkerEventId;
<<<<<<<
* Create a room summary
*
* @param roomId the room id
* @param name the room display name
* @param topic the topic
* @param event the latest received event
*/
public RoomSummary(String roomId, String name, String topic, Event event) {
mLatestReceivedEvent = event;
mRoomId = roomId;
mName = name;
mTopic = topic;
}
/**
=======
>>>>>>>
* Create a room summary
*
* @param roomId the room id
* @param name the room display name
* @param topic the topic
* @param event the latest received event
*/
public RoomSummary(String roomId, String name, String topic, Event event) {
mLatestReceivedEvent = event;
mRoomId = roomId;
mName = name;
mTopic = topic;
}
/**
<<<<<<<
* @return true if the room summay must be highlighted
*/
public boolean isHighlighted() {
return mIsHighlighted || isInvited();
}
/**
* Set the highlight status.
*
* @param isHighlighted the new highlight status.
* @return true if there is an update
*/
public boolean setHighlighted(boolean isHighlighted) {
boolean isUpdated = (mIsHighlighted != isHighlighted);
mIsHighlighted = isHighlighted;
return isUpdated;
}
/**
* Set the user ID of the person who invited the user to this room.
*
* @param inviterUserId The user ID of the inviter
* @return This summary for chaining calls.
*/
public RoomSummary setInviterUserId(String inviterUserId) {
mInviterUserId = inviterUserId;
return this;
}
/**
* Set the read receipt event Id
*
* @param eventId the read receipt event id.
*/
public void setReadReceiptEventId(String eventId) {
mReadReceiptEventId = eventId;
}
/**
* @return the read receipt event id
*/
public String getReadReceiptEventId() {
return mReadReceiptEventId;
}
/**
* Set the read marker event Id
=======
* Update the latest read event Id
>>>>>>>
* Set the read receipt event Id
*
* @param eventId the read receipt event id.
*/
public void setReadReceiptEventId(String eventId) {
mReadReceiptEventId = eventId;
}
/**
* @return the read receipt event id
*/
public String getReadReceiptEventId() {
return mReadReceiptEventId;
}
/**
* Set the read marker event Id |
<<<<<<<
=======
*
* @author Jonathan Bullock <a href="mailto:[email protected]">[email protected]</a>
>>>>>>>
<<<<<<<
private final String USAGE_PREFIX = "Usage: jbake";
private final String ALT_USAGE_PREFIX = " or jbake";
private Baker baker;
private JettyServer jettyServer;
private BakeWatcher watcher;
private JBakeConfigurationFactory configurationFactory;
/**
* Default constructor.
*/
public Main() {
this(new Baker(), new JettyServer(), new BakeWatcher());
}
/**
* Optional constructor to externalize dependencies.
*
* @param baker A {@link Baker} instance
* @param jetty A {@link JettyServer} instance
* @param watcher A {@link BakeWatcher} instance
*/
protected Main(Baker baker, JettyServer jetty, BakeWatcher watcher) {
this.baker = baker;
this.jettyServer = jetty;
this.watcher = watcher;
this.configurationFactory = new JBakeConfigurationFactory();
}
/**
* Runs the app with the given arguments.
*
* @param args Application arguments
*/
public static void main(final String[] args) {
try {
new Main().run(args);
} catch (final JBakeException e) {
System.err.println(e.getMessage());
e.printStackTrace(System.err);
System.exit(1);
} catch (final Throwable e) {
System.err.println("An unexpected error occurred: " + e.getMessage());
System.exit(2);
}
}
protected void run(String[] args) {
SLF4JBridgeHandler.removeHandlersForRootLogger();
SLF4JBridgeHandler.install();
LaunchOptions res = parseArguments(args);
final JBakeConfiguration config;
try {
if (res.isRunServer()) {
config = getJBakeConfigurationFactory().createJettyJbakeConfiguration(res.getSource(), res.getDestination(), res.isClearCache());
} else {
config = getJBakeConfigurationFactory().createDefaultJbakeConfiguration(res.getSource(), res.getDestination(), res.isClearCache());
}
} catch (final ConfigurationException e) {
throw new JBakeException("Configuration error: " + e.getMessage(), e);
}
run(res, config);
}
protected void run(LaunchOptions res, JBakeConfiguration config) {
System.out.println("JBake " + config.getVersion() + " (" + config.getBuildTimeStamp() + ") [http://jbake.org]");
System.out.println();
if (res.isHelpNeeded()) {
printUsage(res);
// Help was requested, so we are done here
return;
}
if (res.isBake()) {
baker.bake(config);
}
if (res.isInit()) {
initStructure(res.getTemplate(), config);
}
if (res.isRunServer()) {
watcher.start(config);
// TODO: short term fix until bake, server, init commands no longer share underlying values (such as source/dest)
if (res.isBake()) {
// bake and server commands have been run together
if (res.getDestination() != null) {
// use the destination provided via the commandline
runServer(res.getDestination(), config.getServerPort());
} else if (!res.getSource().getPath().equals(".")) {
// use the source folder provided via the commandline
runServer(res.getSource(), config.getServerPort());
} else {
// use the default DESTINATION_FOLDER value
runServer(config.getDestinationFolder(), config.getServerPort());
}
} else {
// use the default destination folder
runServer(config.getDestinationFolder(), config.getServerPort());
}
}
}
private LaunchOptions parseArguments(String[] args) {
LaunchOptions res = new LaunchOptions();
CmdLineParser parser = new CmdLineParser(res);
try {
parser.parseArgument(args);
} catch (final CmdLineException e) {
printUsage(res);
throw new JBakeException("Invalid commandline arguments: " + e.getMessage(), e);
}
return res;
}
private void printUsage(Object options) {
CmdLineParser parser = new CmdLineParser(options);
StringWriter sw = new StringWriter();
sw.append(USAGE_PREFIX + "\n");
sw.append(ALT_USAGE_PREFIX + " <source> <destination>\n");
sw.append(ALT_USAGE_PREFIX + " [OPTION]... [<value>...]\n\n");
sw.append("Options:");
System.out.println(sw.toString());
parser.getProperties().withUsageWidth(100);
parser.printUsage(System.out);
}
private void runServer(File path, int port) {
jettyServer.run(path.getPath(), String.valueOf(port));
}
private void initStructure(String type, JBakeConfiguration config) {
=======
private final String USAGE_PREFIX = "Usage: jbake";
private final String ALT_USAGE_PREFIX = " or jbake";
/**
* Runs the app with the given arguments.
*
* @param args Application arguments
*/
public static void main(final String[] args) {
try {
new Main().run(args);
} catch (final JBakeException e) {
System.err.println(e.getMessage());
e.printStackTrace();
System.exit(1);
} catch (final Throwable e) {
System.err.println("An unexpected error occurred: " + e.getMessage());
e.printStackTrace();
System.exit(2);
}
}
private Baker baker;
private JettyServer jettyServer;
private BakeWatcher watcher;
/**
* Default constructor.
*/
public Main() {
this(new Baker(), new JettyServer(), new BakeWatcher());
}
/**
* Optional constructor to externalize dependencies.
*
* @param baker A {@link Baker} instance
* @param jetty A {@link JettyServer} instance
* @param watcher A {@link BakeWatcher} instance
*/
protected Main(Baker baker, JettyServer jetty, BakeWatcher watcher) {
this.baker = baker;
this.jettyServer = jetty;
this.watcher = watcher;
}
protected void run(String[] args) {
SLF4JBridgeHandler.removeHandlersForRootLogger();
SLF4JBridgeHandler.install();
LaunchOptions res = parseArguments( args );
final CompositeConfiguration config;
try {
config = ConfigUtil.load( res.getSource(), res.isRunServer() );
} catch( final ConfigurationException e ) {
throw new JBakeException( "Configuration error: " + e.getMessage(), e );
}
run(res, config);
}
protected void run(LaunchOptions res, CompositeConfiguration config) {
System.out.println("JBake " + config.getString(Keys.VERSION) + " (" + config.getString(Keys.BUILD_TIMESTAMP) + ") [http://jbake.org]");
System.out.println();
if (res.isHelpNeeded()) {
printUsage(res);
// Help was requested, so we are done here
return;
}
if (res.isBake()) {
ConfigUtil.displayLegacyConfigFileWarningIfRequired();
baker.bake(res, config);
}
if (res.isInit()) {
initStructure(config, res.getTemplate(), res.getSourceValue());
}
if (res.isRunServer()) {
ConfigUtil.displayLegacyConfigFileWarningIfRequired();
watcher.start(res, config);
// TODO: short term fix until bake, server, init commands no longer share underlying values (such as source/dest)
if (res.isBake()) {
// bake and server commands have been run together
if (res.getDestination() != null) {
// use the destination provided via the commandline
runServer( res.getDestination().getPath(), config.getString( Keys.SERVER_PORT ));
} else if (!res.getSource().getPath().equals(".")) {
// use the source folder provided via the commandline
runServer( res.getSource().getPath(), config.getString( Keys.SERVER_PORT ));
} else {
// use the default DESTINATION_FOLDER value
runServer(config.getString( Keys.DESTINATION_FOLDER ), config.getString(Keys.SERVER_PORT));
}
} else {
// server command run on it's own
if (!res.getSource().getPath().equals(".")) {
runServer( res.getSource().getPath(), config.getString( Keys.SERVER_PORT ));
} else {
// use the default destination folder
runServer( config.getString( Keys.DESTINATION_FOLDER ), config.getString( Keys.SERVER_PORT ) );
}
}
}
}
private LaunchOptions parseArguments(String[] args) {
LaunchOptions res = new LaunchOptions();
CmdLineParser parser = new CmdLineParser(res);
try {
parser.parseArgument(args);
} catch (final CmdLineException e) {
printUsage(res);
throw new JBakeException("Invalid commandline arguments: " + e.getMessage(), e);
}
return res;
}
private void printUsage(Object options) {
CmdLineParser parser = new CmdLineParser(options);
StringWriter sw = new StringWriter();
sw.append(USAGE_PREFIX + "\n");
sw.append(ALT_USAGE_PREFIX + " <source> <destination>\n");
sw.append(ALT_USAGE_PREFIX + " [OPTION]... [<value>...]\n\n");
sw.append("Options:");
System.out.println(sw.toString());
parser.getProperties().withUsageWidth(100);
parser.printUsage(System.out);
}
private void runServer(String path, String port) {
jettyServer.run(path, port);
}
private void initStructure(CompositeConfiguration config, String type, String source) {
>>>>>>>
private final String USAGE_PREFIX = "Usage: jbake";
private final String ALT_USAGE_PREFIX = " or jbake";
private Baker baker;
private JettyServer jettyServer;
private BakeWatcher watcher;
private JBakeConfigurationFactory configurationFactory;
/**
* Default constructor.
*/
public Main() {
this(new Baker(), new JettyServer(), new BakeWatcher());
}
/**
* Optional constructor to externalize dependencies.
*
* @param baker A {@link Baker} instance
* @param jetty A {@link JettyServer} instance
* @param watcher A {@link BakeWatcher} instance
*/
protected Main(Baker baker, JettyServer jetty, BakeWatcher watcher) {
this.baker = baker;
this.jettyServer = jetty;
this.watcher = watcher;
this.configurationFactory = new JBakeConfigurationFactory();
}
/**
* Runs the app with the given arguments.
*
* @param args Application arguments
*/
public static void main(final String[] args) {
try {
new Main().run(args);
} catch (final JBakeException e) {
System.err.println(e.getMessage());
e.printStackTrace();
System.exit(1);
} catch (final Throwable e) {
System.err.println("An unexpected error occurred: " + e.getMessage());
e.printStackTrace();
System.exit(2);
}
}
protected void run(String[] args) {
SLF4JBridgeHandler.removeHandlersForRootLogger();
SLF4JBridgeHandler.install();
LaunchOptions res = parseArguments(args);
final JBakeConfiguration config;
try {
if (res.isRunServer()) {
config = getJBakeConfigurationFactory().createJettyJbakeConfiguration(res.getSource(), res.getDestination(), res.isClearCache());
} else {
config = getJBakeConfigurationFactory().createDefaultJbakeConfiguration(res.getSource(), res.getDestination(), res.isClearCache());
}
} catch (final ConfigurationException e) {
throw new JBakeException("Configuration error: " + e.getMessage(), e);
}
run(res, config);
}
protected void run(LaunchOptions res, JBakeConfiguration config) {
System.out.println("JBake " + config.getVersion() + " (" + config.getBuildTimeStamp() + ") [http://jbake.org]");
System.out.println();
if (res.isHelpNeeded()) {
printUsage(res);
// Help was requested, so we are done here
return;
}
if (res.isBake()) {
baker.bake(config);
}
if (res.isInit()) {
initStructure(res.getTemplate(), config);
}
if (res.isRunServer()) {
watcher.start(config);
// TODO: short term fix until bake, server, init commands no longer share underlying values (such as source/dest)
if (res.isBake()) {
// bake and server commands have been run together
if (res.getDestination() != null) {
// use the destination provided via the commandline
runServer(res.getDestination(), config.getServerPort());
} else if (!res.getSource().getPath().equals(".")) {
// use the source folder provided via the commandline
runServer(res.getSource(), config.getServerPort());
} else {
// use the default DESTINATION_FOLDER value
runServer(config.getDestinationFolder(), config.getServerPort());
}
} else {
// use the default destination folder
runServer(config.getDestinationFolder(), config.getServerPort());
}
}
}
private LaunchOptions parseArguments(String[] args) {
LaunchOptions res = new LaunchOptions();
CmdLineParser parser = new CmdLineParser(res);
try {
parser.parseArgument(args);
} catch (final CmdLineException e) {
printUsage(res);
throw new JBakeException("Invalid commandline arguments: " + e.getMessage(), e);
}
return res;
}
private void printUsage(Object options) {
CmdLineParser parser = new CmdLineParser(options);
StringWriter sw = new StringWriter();
sw.append(USAGE_PREFIX + "\n");
sw.append(ALT_USAGE_PREFIX + " <source> <destination>\n");
sw.append(ALT_USAGE_PREFIX + " [OPTION]... [<value>...]\n\n");
sw.append("Options:");
System.out.println(sw.toString());
parser.getProperties().withUsageWidth(100);
parser.printUsage(System.out);
}
private void runServer(File path, int port) {
jettyServer.run(path.getPath(), String.valueOf(port));
}
private void initStructure(String type, JBakeConfiguration config) { |
<<<<<<<
client.loginWithPassword(username, password, new LoginApiClient.ApiCallback<Credentials>() {
=======
// TODO: This client should check that it can use u/p login on this home server!!!
client.loginWithPassword(username, password, new LoginApiClient.LoginCallback() {
>>>>>>>
// TODO: This client should check that it can use u/p login on this home server!!!
client.loginWithPassword(username, password, new LoginApiClient.ApiCallback<Credentials>() { |
<<<<<<<
=======
import android.util.Log;
import org.matrix.androidsdk.MXDataHandler;
>>>>>>>
<<<<<<<
=======
import org.matrix.androidsdk.rest.model.RoomMember;
import org.matrix.androidsdk.rest.model.RoomResponse;
>>>>>>>
<<<<<<<
public interface EventsThreadListener {
/**
* Called with the response of the initial sync.
* @param response the response
*/
public void onInitialSyncComplete(InitialSyncResponse response);
/**
* Called every time events come down the stream.
* @param events the events
*/
public void onEventsReceived(List<Event> events);
}
=======
public class EventsThreadListener implements IEventsThreadListener {
private MXDataHandler mData;
public EventsThreadListener(MXDataHandler data) {
mData = data;
}
@Override
public void onInitialSyncComplete(InitialSyncResponse response) {
// Handle presence events
mData.handleEvents(response.presence);
// Convert rooms from response
for (RoomResponse roomResponse : response.rooms) {
if (roomResponse.state != null) {
// Handle state events
mData.handleEvents(roomResponse.state);
}
if (roomResponse.messages != null && roomResponse.roomId != null) {
// handle messages / pagination token
mData.handleTokenResponse(roomResponse.roomId, roomResponse.messages);
}
if (RoomMember.MEMBERSHIP_INVITE.equals(roomResponse.membership)) {
mData.handleInvite(roomResponse.roomId, roomResponse.inviter);
}
}
mData.onInitialSyncComplete();
}
@Override
public void onEventsReceived(List<Event> events) {
mData.handleEvents(events);
}
}
>>>>>>>
public interface EventsThreadListener {
/**
* Called with the response of the initial sync.
* @param response the response
*/
public void onInitialSyncComplete(InitialSyncResponse response);
/**
* Called every time events come down the stream.
* @param events the events
*/
public void onEventsReceived(List<Event> events);
} |
<<<<<<<
.setConverter(new GsonConverter(mGson))
.setClient(new OkClient(okHttpClient))
=======
.setConverter(new GsonConverter(gson))
>>>>>>>
.setConverter(new GsonConverter(gson))
.setClient(new OkClient(okHttpClient)) |
<<<<<<<
import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
=======
import org.matrix.androidsdk.rest.model.Sync.SyncResponse;
>>>>>>>
import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
import org.matrix.androidsdk.rest.model.Sync.SyncResponse;
<<<<<<<
uploadKeys(5, new ApiCallback<Void>() {
=======
uploadDeviceKeys(new ApiCallback<KeysUploadResponse>() {
>>>>>>>
uploadDeviceKeys(new ApiCallback<KeysUploadResponse>() {
<<<<<<<
public void onSuccess(Void info) {
if (null != mNetworkConnectivityReceiver) {
mNetworkConnectivityReceiver.removeEventListener(mNetworkListener);
}
mIsStarting = false;
mIsStarted = true;
startUploadKeysTimer(true);
for (ApiCallback<Void> callback : mInitializationCallbacks) {
final ApiCallback<Void> fCallback = callback;
getUIHandler().post(new Runnable() {
@Override
public void run() {
fCallback.onSuccess(null);
}
});
}
mInitializationCallbacks.clear();
if (isInitialSync) {
Log.d(LOG_TAG, "completed first initialsync; invalidating all device list caches");
// refresh the devices list for each known room members
getDeviceList().invalidateUserDeviceList(getE2eRoomMembers());
}
}
=======
public void run() {
checkDeviceAnnounced(new ApiCallback<Void>() {
@Override
public void onSuccess(Void info) {
getEncryptingThreadHandler().post(new Runnable() {
@Override
public void run() {
// Make sure we process to-device messages before generating new one-time-keys #2782
maybeUploadOneTimeKeys(new ApiCallback<Void>() {
@Override
public void onSuccess(Void info) {
if (null != mNetworkConnectivityReceiver) {
mNetworkConnectivityReceiver.removeEventListener(mNetworkListener);
}
mIsStarting = false;
mIsStarted = true;
for (ApiCallback<Void> callback : mInitializationCallbacks) {
final ApiCallback<Void> fCallback = callback;
getUIHandler().post(new Runnable() {
@Override
public void run() {
fCallback.onSuccess(null);
}
});
}
mInitializationCallbacks.clear();
if (isInitialSync) {
// refresh the devices list for each known room members
getDeviceList().invalidateUserDeviceList(getE2eRoomMembers());
}
}
@Override
public void onNetworkError(Exception e) {
Log.e(LOG_TAG, "## start failed : " + e.getMessage());
onError();
}
@Override
public void onMatrixError(MatrixError e) {
Log.e(LOG_TAG, "## start failed : " + e.getMessage());
onError();
}
@Override
public void onUnexpectedError(Exception e) {
Log.e(LOG_TAG, "## start failed : " + e.getMessage());
onError();
}
});
}
});
}
>>>>>>>
public void run() {
checkDeviceAnnounced(new ApiCallback<Void>() {
@Override
public void onSuccess(Void info) {
getEncryptingThreadHandler().post(new Runnable() {
@Override
public void run() {
// Make sure we process to-device messages before generating new one-time-keys #2782
maybeUploadOneTimeKeys(new ApiCallback<Void>() {
@Override
public void onSuccess(Void info) {
if (null != mNetworkConnectivityReceiver) {
mNetworkConnectivityReceiver.removeEventListener(mNetworkListener);
}
mIsStarting = false;
mIsStarted = true;
for (ApiCallback<Void> callback : mInitializationCallbacks) {
final ApiCallback<Void> fCallback = callback;
getUIHandler().post(new Runnable() {
@Override
public void run() {
fCallback.onSuccess(null);
}
});
}
mInitializationCallbacks.clear();
if (isInitialSync) {
// refresh the devices list for each known room members
getDeviceList().invalidateUserDeviceList(getE2eRoomMembers());
}
}
@Override
public void onNetworkError(Exception e) {
Log.e(LOG_TAG, "## start failed : " + e.getMessage());
onError();
}
@Override
public void onMatrixError(MatrixError e) {
Log.e(LOG_TAG, "## start failed : " + e.getMessage());
onError();
}
@Override
public void onUnexpectedError(Exception e) {
Log.e(LOG_TAG, "## start failed : " + e.getMessage());
onError();
}
});
}
});
} |
<<<<<<<
=======
import org.matrix.androidsdk.api.response.Event;
import org.matrix.androidsdk.api.response.RoomMember;
import org.matrix.androidsdk.api.response.TextMessage;
import org.matrix.androidsdk.api.response.TokensChunkResponse;
>>>>>>>
<<<<<<<
mSession.getRoomsApiClient().getLatestRoomMessages(mRoomId, new ApiCallback<TokensChunkResponse<Event>>() {
=======
mSession.getRoomsApiClient().getLatestRoomMessages(mRoomId, new MXApiClient.SimpleApiCallback<TokensChunkResponse<Event>>() {
>>>>>>>
mSession.getRoomsApiClient().getLatestRoomMessages(mRoomId, new MXApiClient.SimpleApiCallback<TokensChunkResponse<Event>>() {
<<<<<<<
mSession.getRoomsApiClient().joinRoom(mRoomId, new ApiCallback<Void>() {
=======
mSession.getRoomsApiClient().joinRoom(mRoomId, new MXApiClient.SimpleApiCallback<Void>() {
>>>>>>>
mSession.getRoomsApiClient().joinRoom(mRoomId, new MXApiClient.SimpleApiCallback<Void>() {
<<<<<<<
public void requestPagination(final ApiCallback<List<Event>> callback) {
mSession.getRoomsApiClient().getEarlierMessages(mRoomId, mEarliestToken, new ApiCallback<TokensChunkResponse<Event>>() {
=======
public void requestPagination(final MXApiClient.ApiCallback<List<Event>> callback) {
mSession.getRoomsApiClient().getEarlierMessages(mRoomId, mEarliestToken, new MXApiClient.SimpleApiCallback<TokensChunkResponse<Event>>() {
>>>>>>>
public void requestPagination(final ApiCallback<List<Event>> callback) {
mSession.getRoomsApiClient().getEarlierMessages(mRoomId, mEarliestToken, new MXApiClient.SimpleApiCallback<TokensChunkResponse<Event>>() {
<<<<<<<
mSession.getRoomsApiClient().sendMessage(mRoomId, message, new ApiCallback<Event>() {
=======
mSession.getRoomsApiClient().sendMessage(mRoomId, message, new MXApiClient.SimpleApiCallback<Event>() {
>>>>>>>
mSession.getRoomsApiClient().sendMessage(mRoomId, message, new MXApiClient.SimpleApiCallback<Event>() { |
<<<<<<<
import static org.apache.commons.lang.BooleanUtils.toBooleanObject;
import static org.apache.commons.lang.math.NumberUtils.*;
import static org.asciidoctor.AttributesBuilder.attributes;
import static org.asciidoctor.OptionsBuilder.options;
import static org.asciidoctor.SafeMode.UNSAFE;
import java.io.BufferedReader;
=======
import com.petebevin.markdown.MarkdownProcessor;
import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.io.IOUtils;
import org.asciidoctor.Asciidoctor;
import org.asciidoctor.Asciidoctor.Factory;
import org.asciidoctor.Attributes;
import org.asciidoctor.AttributesBuilder;
import org.asciidoctor.DocumentHeader;
import org.asciidoctor.Options;
import org.asciidoctor.OptionsBuilder;
>>>>>>>
import static org.apache.commons.lang.BooleanUtils.toBooleanObject;
import static org.apache.commons.lang.math.NumberUtils.*;
import static org.asciidoctor.AttributesBuilder.attributes;
import static org.asciidoctor.OptionsBuilder.options;
import static org.asciidoctor.SafeMode.UNSAFE;
import com.petebevin.markdown.MarkdownProcessor;
import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.io.IOUtils;
import org.asciidoctor.Asciidoctor;
import org.asciidoctor.Asciidoctor.Factory;
import org.asciidoctor.Attributes;
import org.asciidoctor.DocumentHeader;
import org.asciidoctor.Options;
<<<<<<<
import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.asciidoctor.Asciidoctor;
import org.asciidoctor.Asciidoctor.Factory;
import org.asciidoctor.Attributes;
import org.asciidoctor.DocumentHeader;
import org.asciidoctor.Options;
import org.asciidoctor.OptionsBuilder;
import com.petebevin.markdown.MarkdownProcessor;
=======
>>>>>>>
import org.apache.commons.configuration.Configuration; |
<<<<<<<
=======
PGSubmission<?> sub = submissions.peek();
if (sub != null) {
try {
if (sub.getCompletionType() == PGSubmission.Types.CONNECT && sub.getSendConsumed().compareAndSet(false, true)) {
socketChannel.configureBlocking(false);
socketChannel.connect(new InetSocketAddress((String) properties.get(PGConnectionProperties.HOST),
(Integer) properties.get(PGConnectionProperties.PORT)));
}
if (currentState == NOT_CONNECTED && !socketChannel.finishConnect()) {
return;
} else if (currentState == NOT_CONNECTED) {
sendStartupPacket();
}
>>>>>>> |
<<<<<<<
import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.Configuration;
import org.asciidoctor.Asciidoctor;
import org.asciidoctor.Attributes;
import org.asciidoctor.AttributesBuilder;
import org.asciidoctor.ast.DocumentHeader;
import org.asciidoctor.Options;
import org.jbake.app.ConfigUtil.Keys;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
=======
>>>>>>>
import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.Configuration;
import org.asciidoctor.Asciidoctor;
import org.asciidoctor.Attributes;
import org.asciidoctor.AttributesBuilder;
import org.asciidoctor.ast.DocumentHeader;
import org.asciidoctor.Options;
import org.jbake.app.ConfigUtil.Keys;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
<<<<<<<
CompositeConfiguration config = context.getConfig();
final AttributesBuilder attributes = attributes(config.getStringArray(Keys.ASCIIDOCTOR_ATTRIBUTES));
if (config.getBoolean(Keys.ASCIIDOCTOR_ATTRIBUTES_EXPORT, false)) {
final String prefix = config.getString( Keys.ASCIIDOCTOR_ATTRIBUTES_EXPORT_PREFIX, "");
=======
Configuration config = context.getConfig();
final AttributesBuilder attributes = attributes(config.getStringArray("asciidoctor.attributes"));
if (config.getBoolean("asciidoctor.attributes.export", false)) {
final String prefix = config.getString( "asciidoctor.attributes.export.prefix", "");
>>>>>>>
Configuration config = context.getConfig();
final AttributesBuilder attributes = attributes(config.getStringArray(Keys.ASCIIDOCTOR_ATTRIBUTES));
if (config.getBoolean(Keys.ASCIIDOCTOR_ATTRIBUTES_EXPORT, false)) {
final String prefix = config.getString( Keys.ASCIIDOCTOR_ATTRIBUTES_EXPORT_PREFIX, ""); |
<<<<<<<
/*
* Copyright (C) 2012-2019 52°North Initiative for Geospatial Open Source
=======
/**
* Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source
>>>>>>>
/*
* Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source |
<<<<<<<
Item.itemsList[Item.arrow.itemID] = null; Item.itemsList[Item.arrow.itemID] = (new ItemArrow(6)).setUnlocalizedName("arrow");
Item.itemsList[63+256] = null; Item.itemsList[63+256] = new ItemTerra(63).setUnlocalizedName("porkchopRaw");
Item.itemsList[64+256] = null; Item.itemsList[64+256] = new ItemTerraFood(64, 35, 0.8F, true, 38).setFolder("").setUnlocalizedName("porkchopCooked");
Item.itemsList[93+256] = null; Item.itemsList[93+256] = new ItemTerra(93).setUnlocalizedName("fishRaw");
Item.itemsList[94+256] = null; Item.itemsList[94+256] = new ItemTerraFood(94, 30, 0.6F, true, 39).setFolder("").setUnlocalizedName("fishCooked");
Item.itemsList[107+256] = null; Item.itemsList[107+256] = new ItemTerra(107).setUnlocalizedName("beefRaw");
Item.itemsList[108+256] = null; Item.itemsList[108+256] = new ItemTerraFood(108, 40, 0.8F, true, 40).setFolder("").setUnlocalizedName("beefCooked");
Item.itemsList[109+256] = null; Item.itemsList[109+256] = new ItemTerra(109).setUnlocalizedName("chickenRaw");
Item.itemsList[110+256] = null; Item.itemsList[110+256] = new ItemTerraFood(110, 35, 0.6F, true, 41).setFolder("").setUnlocalizedName("chickenCooked");
=======
Item.itemsList[Item.porkRaw.itemID] = null; Item.itemsList[Item.porkRaw.itemID] = new ItemTerra(63).setUnlocalizedName("porkchopRaw");
Item.itemsList[Item.porkCooked.itemID] = null; Item.itemsList[Item.porkCooked.itemID] = new ItemTerraFood(64, 35, 0.8F, true, 38).setFolder("").setUnlocalizedName("porkchopCooked");
Item.itemsList[Item.fishRaw.itemID] = null; Item.itemsList[Item.fishRaw.itemID] = new ItemTerra(93).setUnlocalizedName("fishRaw");
Item.itemsList[Item.fishCooked.itemID] = null; Item.itemsList[Item.fishCooked.itemID] = new ItemTerraFood(94, 30, 0.6F, true, 39).setFolder("").setUnlocalizedName("fishCooked");
Item.itemsList[Item.beefRaw.itemID] = null; Item.itemsList[Item.beefRaw.itemID] = new ItemTerra(107).setUnlocalizedName("beefRaw");
Item.itemsList[Item.beefCooked.itemID] = null; Item.itemsList[Item.beefCooked.itemID] = new ItemTerraFood(108, 40, 0.8F, true, 40).setFolder("").setUnlocalizedName("beefCooked");
Item.itemsList[Item.chickenRaw.itemID] = null; Item.itemsList[Item.chickenRaw.itemID] = new ItemTerra(109).setUnlocalizedName("chickenRaw");
Item.itemsList[Item.chickenCooked.itemID] = null; Item.itemsList[Item.chickenCooked.itemID] = new ItemTerraFood(110, 35, 0.6F, true, 41).setFolder("").setUnlocalizedName("chickenCooked");
>>>>>>>
Item.itemsList[Item.arrow.itemID] = null; Item.itemsList[Item.arrow.itemID] = (new ItemArrow(6)).setUnlocalizedName("arrow");
Item.itemsList[Item.porkRaw.itemID] = null; Item.itemsList[Item.porkRaw.itemID] = new ItemTerra(63).setUnlocalizedName("porkchopRaw");
Item.itemsList[Item.porkCooked.itemID] = null; Item.itemsList[Item.porkCooked.itemID] = new ItemTerraFood(64, 35, 0.8F, true, 38).setFolder("").setUnlocalizedName("porkchopCooked");
Item.itemsList[Item.fishRaw.itemID] = null; Item.itemsList[Item.fishRaw.itemID] = new ItemTerra(93).setUnlocalizedName("fishRaw");
Item.itemsList[Item.fishCooked.itemID] = null; Item.itemsList[Item.fishCooked.itemID] = new ItemTerraFood(94, 30, 0.6F, true, 39).setFolder("").setUnlocalizedName("fishCooked");
Item.itemsList[Item.beefRaw.itemID] = null; Item.itemsList[Item.beefRaw.itemID] = new ItemTerra(107).setUnlocalizedName("beefRaw");
Item.itemsList[Item.beefCooked.itemID] = null; Item.itemsList[Item.beefCooked.itemID] = new ItemTerraFood(108, 40, 0.8F, true, 40).setFolder("").setUnlocalizedName("beefCooked");
Item.itemsList[Item.chickenRaw.itemID] = null; Item.itemsList[Item.chickenRaw.itemID] = new ItemTerra(109).setUnlocalizedName("chickenRaw");
Item.itemsList[Item.chickenCooked.itemID] = null; Item.itemsList[Item.chickenCooked.itemID] = new ItemTerraFood(110, 35, 0.6F, true, 41).setFolder("").setUnlocalizedName("chickenCooked");
<<<<<<<
=======
>>>>>>> |
<<<<<<<
Item.itemsList[Item.dyePowder.itemID] = null; Item.itemsList[Item.dyePowder.itemID] = new ItemDyeCustom(95).setUnlocalizedName("dyePowder").func_111206_d("dye_powder");
Item.itemsList[Item.potion.itemID] = null; Item.itemsList[Item.potion.itemID] = (new ItemCustomPotion(117)).setUnlocalizedName("potion").func_111206_d("potion");
=======
Item.itemsList[88+256] = null; Item.itemsList[88+256] = (new ItemTerra(88)).setUnlocalizedName("egg");
Item.itemsList[Item.dyePowder.itemID] = null; Item.itemsList[Item.dyePowder.itemID] = new ItemDyeCustom(95).setUnlocalizedName("dyePowder").setTextureName("dye_powder");
Item.itemsList[Item.potion.itemID] = null; Item.itemsList[Item.potion.itemID] = (new ItemCustomPotion(117)).setUnlocalizedName("potion").setTextureName("potion");
>>>>>>>
Item.itemsList[Item.dyePowder.itemID] = null; Item.itemsList[Item.dyePowder.itemID] = new ItemDyeCustom(95).setUnlocalizedName("dyePowder").setTextureName("dye_powder");
Item.itemsList[Item.potion.itemID] = null; Item.itemsList[Item.potion.itemID] = (new ItemCustomPotion(117)).setUnlocalizedName("potion").setTextureName("potion"); |
<<<<<<<
for(RenderingTool tool : ServiceLoader.load(RenderingTool.class)) {
try {
renderedCount += tool.render(renderer, db, destination, templatesPath, config);
} catch(RenderingException e) {
errors.add(e.getMessage());
}
=======
for (String docType : DocumentTypes.getDocumentTypes()) {
for (ODocument document: db.getUnrenderedContent(docType)) {
try {
renderer.render(DBUtil.documentToModel(document));
renderedCount++;
} catch (Exception e) {
errors.add(e);
}
}
}
// write index file
if (config.getBoolean(Keys.RENDER_INDEX)) {
try {
renderer.renderIndex(config.getString(Keys.INDEX_FILE));
} catch (Exception e) {
errors.add(e);
}
}
// write feed file
if (config.getBoolean(Keys.RENDER_FEED)) {
try {
renderer.renderFeed(config.getString(Keys.FEED_FILE));
} catch (Exception e) {
errors.add(e);
}
}
// write sitemap file
if (config.getBoolean(Keys.RENDER_SITEMAP)) {
try {
renderer.renderSitemap(config.getString(Keys.SITEMAP_FILE));
} catch (Exception e) {
errors.add(e);
}
}
// write master archive file
if (config.getBoolean(Keys.RENDER_ARCHIVE)) {
try {
renderer.renderArchive(config.getString(Keys.ARCHIVE_FILE));
} catch (Exception e) {
errors.add(e);
}
}
// write tag files
if (config.getBoolean(Keys.RENDER_TAGS)) {
try {
renderer.renderTags(crawler.getTags(), config.getString(Keys.TAG_PATH));
} catch (Exception e) {
errors.add(e);
}
>>>>>>>
for(RenderingTool tool : ServiceLoader.load(RenderingTool.class)) {
try {
renderedCount += tool.render(renderer, db, destination, templatesPath, config);
} catch(RenderingException e) {
errors.add(e);
} |
<<<<<<<
import TFC.Render.TileEntityChestRendererTFC;
=======
import TFC.Render.TileEntityBellowsRenderer;
>>>>>>>
import TFC.Render.TileEntityBellowsRenderer;
import TFC.Render.TileEntityChestRendererTFC; |
<<<<<<<
import com.impetus.kundera.metadata.validator.InvalidEntityDefinitionException;
import com.impetus.kundera.persistence.EntityManagerFactoryImpl.KunderaMetadata;
=======
>>>>>>>
import com.impetus.kundera.metadata.validator.InvalidEntityDefinitionException;
import com.impetus.kundera.persistence.EntityManagerFactoryImpl.KunderaMetadata; |
<<<<<<<
// if (fetchType.equals(FetchType.LAZY))
// {
// final Object entityId = PropertyAccessorHelper.getId(entity, m);
// associationBuilder.setProxyRelationObject(entity, relationsMap, m, pd, entityId, relation);
// }
// else
// {
=======
if (!lazilyloaded && fetchType.equals(FetchType.LAZY))
{
final Object entityId = PropertyAccessorHelper.getId(entity, m);
associationBuilder.setProxyRelationObject(entity, relationsMap, m, pd, entityId, relation);
}
else
{
>>>>>>>
// if (!lazilyloaded && fetchType.equals(FetchType.LAZY))
// {
// final Object entityId = PropertyAccessorHelper.getId(entity, m);
// associationBuilder.setProxyRelationObject(entity, relationsMap, m, pd, entityId, relation);
// }
// else
// {
<<<<<<<
// if (fetchType.equals(FetchType.LAZY))
// {
// final Object entityId = PropertyAccessorHelper.getId(relationEntity, metadata);
// associationBuilder.setProxyRelationObject(relationEntity, relationsMap, metadata, pd, entityId,
// relation);
// }
// else
// {
=======
if (!lazilyloaded && fetchType.equals(FetchType.LAZY))
{
final Object entityId = PropertyAccessorHelper.getId(relationEntity, metadata);
associationBuilder.setProxyRelationObject(relationEntity, relationsMap, metadata, pd, entityId,
relation);
}
else
{
>>>>>>>
// if (!lazilyloaded && fetchType.equals(FetchType.LAZY))
// {
// final Object entityId = PropertyAccessorHelper.getId(relationEntity, metadata);
// associationBuilder.setProxyRelationObject(relationEntity, relationsMap, metadata, pd, entityId,
// relation);
// }
// else
// { |
<<<<<<<
return getObject(entity, (Field) metadata.getIdAttribute().getJavaMember());
}
=======
// return getString(entity, metadata.getIdColumn().getField());
return getString(entity, (Field) metadata.getIdAttribute().getJavaMember());
}
>>>>>>>
return getObject(entity, (Field) metadata.getIdAttribute().getJavaMember());
}
<<<<<<<
// Field idField = metadata.getIdColumn().getField();
// PropertyAccessor<?> accessor =
// PropertyAccessorFactory.getPropertyAccessor(idField);
// Object obj = accessor.fromString(idField.getClass(),
// rowKey/*.toString()*/);
=======
// Field idField = metadata.getIdColumn().getField();
Field idField = (Field) metadata.getIdAttribute().getJavaMember();
PropertyAccessor<?> accessor = PropertyAccessorFactory.getPropertyAccessor(idField);
Object obj = accessor.fromString(idField.getClass(), rowKey);
>>>>>>>
// Field idField = metadata.getIdColumn().getField();
// Field idField = (Field)
// metadata.getIdAttribute().getJavaMember();
// PropertyAccessor<?> accessor =
// PropertyAccessorFactory.getPropertyAccessor(idField);
// Object obj = accessor.fromString(idField.getClass(), rowKey);
<<<<<<<
// Field idField = metadata.getIdColumn().getField();
Field idField = (Field) metadata.getIdAttribute().getJavaMember();
=======
// Field idField = metadata.getIdColumn().getField();
Field idField = (Field) metadata.getIdAttribute().getJavaMember();
>>>>>>>
Field idField = (Field) metadata.getIdAttribute().getJavaMember(); |
<<<<<<<
protected KunderaMetadata kunderaMetadata;
public AbstractEntityReader(final KunderaMetadata kunderaMetadata)
{
this.kunderaMetadata = kunderaMetadata;
}
=======
>>>>>>>
protected KunderaMetadata kunderaMetadata;
public AbstractEntityReader(final KunderaMetadata kunderaMetadata)
{
this.kunderaMetadata = kunderaMetadata;
}
<<<<<<<
String luceneQueryFromJPAQuery = KunderaCoreUtils.getLuceneQueryFromJPAQuery(kunderaQuery, kunderaMetadata);
=======
String luceneQueryFromJPAQuery = KunderaCoreUtils.getLuceneQueryFromJPAQuery(kunderaQuery);
>>>>>>>
String luceneQueryFromJPAQuery = KunderaCoreUtils.getLuceneQueryFromJPAQuery(kunderaQuery, kunderaMetadata); |
<<<<<<<
String contactNodes = (String) props.get(PersistenceProperties.KUNDERA_NODES);
String defaultPort = (String) props.get(PersistenceProperties.KUNDERA_PORT);
String keyspace = (String) props.get(PersistenceProperties.KUNDERA_KEYSPACE);
String poolName = PelopsUtils.generatePoolName(getPersistenceUnit());
=======
String contactNodes = (String) props.get("kundera.nodes");
String defaultPort = (String) props.get("kundera.port");
String keyspace = (String) props.get("kundera.keyspace");
poolName = PelopsUtils.generatePoolName(getPersistenceUnit());
>>>>>>>
String contactNodes = (String) props.get(PersistenceProperties.KUNDERA_NODES);
String defaultPort = (String) props.get(PersistenceProperties.KUNDERA_PORT);
String keyspace = (String) props.get(PersistenceProperties.KUNDERA_KEYSPACE);
poolName = PelopsUtils.generatePoolName(getPersistenceUnit()); |
<<<<<<<
import org.apache.cassandra.thrift.CqlResult;
import org.apache.cassandra.thrift.CqlRow;
=======
>>>>>>> |
<<<<<<<
@Override
public ClientPropertiesSetter getClientPropertiesSetter()
{
return new HBaseClientPropertiesSetter();
}
=======
>>>>>>> |
<<<<<<<
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.Field.TermVector;
import org.apache.lucene.index.IndexReader.FieldOption;
=======
import org.apache.lucene.util.Version;
>>>>>>>
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.Field.TermVector;
import org.apache.lucene.index.IndexReader.FieldOption;
import org.apache.lucene.util.Version;
<<<<<<<
private void addSuperColumnNameToDocument(String superColumnName, Document currentDoc)
{
Field luceneField = new Field(SUPERCOLUMN_INDEX, superColumnName, Store.YES,Field.Index.NO);
=======
private void addEmbeddedColumnNameToDocument(String superColumnName, Document currentDoc)
{
Field luceneField = getLuceneField(SUPERCOLUMN_INDEX, superColumnName);
>>>>>>>
private void addSuperColumnNameToDocument(String superColumnName, Document currentDoc)
{
Field luceneField = new Field(SUPERCOLUMN_INDEX, superColumnName, Store.YES,Field.Index.NO);
<<<<<<<
Field luceneField = new Field(getCannonicalPropertyName(indexName, colName), value,Field.Store.YES,Field.Index.ANALYZED_NO_NORMS);
=======
Field luceneField = getLuceneField(getCannonicalPropertyName(indexName, colName), value);
>>>>>>>
Field luceneField = new Field(getCannonicalPropertyName(indexName, colName), value,Field.Store.YES,Field.Index.ANALYZED_NO_NORMS); |
<<<<<<<
=======
import com.orientechnologies.orient.core.Orient;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.orientechnologies.orient.core.record.impl.ODocument;
import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.io.FilenameUtils;
import org.jbake.app.ConfigUtil.Keys;
import org.jbake.model.DocumentTypes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.bridge.SLF4JBridgeHandler;
>>>>>>>
import com.orientechnologies.orient.core.Orient;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.orientechnologies.orient.core.record.impl.ODocument;
import org.apache.commons.io.FilenameUtils;
import org.slf4j.bridge.SLF4JBridgeHandler; |
<<<<<<<
/**
* @param idString
* @return
*/
private String getNextString(String idString)
{
char lastChar = (char) idString.charAt(idString.length() - 1);
String idString2 = idString.substring(0, idString.length() - 1) + (char) ((int) lastChar + 1);
return idString2;
}
=======
>>>>>>>
/**
* @param idString
* @return
*/
private String getNextString(String idString)
{
char lastChar = (char) idString.charAt(idString.length() - 1);
String idString2 = idString.substring(0, idString.length() - 1) + (char) ((int) lastChar + 1);
return idString2;
}
<<<<<<<
private void execute(List<Operation> batch)
{
if (batch != null && !batch.isEmpty())
{
try
{
kvStore.execute(batch);
}
catch (DurabilityException e)
{
log.error(e);
throw new PersistenceException("Error while Persisting data using batch", e);
}
catch (OperationExecutionException e)
{
log.error(e);
throw new PersistenceException("Error while Persisting data using batch", e);
}
catch (FaultException e)
{
log.error(e);
throw new PersistenceException("Error while Persisting data using batch", e);
}
finally
{
batch.clear();
}
}
}
=======
>>>>>>>
private void execute(List<Operation> batch)
{
if (batch != null && !batch.isEmpty())
{
try
{
kvStore.execute(batch);
}
catch (DurabilityException e)
{
log.error(e);
throw new PersistenceException("Error while Persisting data using batch", e);
}
catch (OperationExecutionException e)
{
log.error(e);
throw new PersistenceException("Error while Persisting data using batch", e);
}
catch (FaultException e)
{
log.error(e);
throw new PersistenceException("Error while Persisting data using batch", e);
}
finally
{
batch.clear();
}
}
} |
<<<<<<<
public HBaseClient(IndexManager indexManager, HBaseConfiguration conf, HTablePool hTablePool, EntityReader reader,
String persistenceUnit, Map<String, Object> externalProperties, ClientMetadata clientMetadata,
=======
public HBaseClient(IndexManager indexManager, Configuration conf, HTablePool hTablePool, EntityReader reader,
String persistenceUnit, Map<String, Object> puProperties, ClientMetadata clientMetadata,
>>>>>>>
public HBaseClient(IndexManager indexManager, Configuration conf, HTablePool hTablePool, EntityReader reader,
String persistenceUnit, Map<String, Object> externalProperties, ClientMetadata clientMetadata, |
<<<<<<<
=======
ByteBuffer buf = ByteBuffer.wrap((byte[]) value, 0, ((byte[]) value).length);
StringBuilder hexstr = new StringBuilder("0x");
builder.append(hexstr.append(ByteBufferUtil.bytesToHex(buf)));
} else {
>>>>>>> |
<<<<<<<
import com.impetus.client.cassandra.common.CassandraUtilities;
=======
import com.impetus.client.cassandra.datahandler.CassandraDataHandler;
import com.impetus.client.cassandra.datahandler.DataHandler;
>>>>>>>
import com.impetus.client.cassandra.common.CassandraUtilities;
import com.impetus.client.cassandra.datahandler.CassandraDataHandler; |
<<<<<<<
Object fromThriftRow(Class<?> clazz, EntityMetadata m, Object rowKey, List<String> relationNames,
=======
/**
* From thrift row.
*
* @param clazz the clazz
* @param m the m
* @param rowKey the row key
* @param relationNames the relation names
* @param isWrapReq the is wrap req
* @param consistencyLevel the consistency level
* @return the object
* @throws Exception the exception
*/
Object fromThriftRow(Class<?> clazz, EntityMetadata m, String rowKey, List<String> relationNames,
>>>>>>>
/**
* From thrift row.
*
* @param clazz
* the clazz
* @param m
* the m
* @param rowKey
* the row key
* @param relationNames
* the relation names
* @param isWrapReq
* the is wrap req
* @param consistencyLevel
* the consistency level
* @return the object
* @throws Exception
* the exception
*/
Object fromThriftRow(Class<?> clazz, EntityMetadata m, Object rowKey, List<String> relationNames, |
<<<<<<<
=======
import java.io.File;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.MapConfiguration;
>>>>>>>
<<<<<<<
=======
import org.junit.Before;
import org.junit.BeforeClass;
>>>>>>>
import org.junit.Before;
import org.junit.BeforeClass;
<<<<<<<
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
=======
>>>>>>>
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat; |
<<<<<<<
import org.scale7.cassandra.pelops.Bytes;
=======
import org.scale7.cassandra.pelops.Pelops;
>>>>>>>
import org.scale7.cassandra.pelops.Bytes;
import org.scale7.cassandra.pelops.Pelops;
<<<<<<<
Object fromThriftRow(Selector selector, Class<?> clazz, EntityMetadata m, Object rowKey,
List<String> relationNames, boolean isWrapReq, ConsistencyLevel consistencyLevel) throws Exception
=======
@Override
public Object fromThriftRow(Class<?> clazz, EntityMetadata m, String rowKey, List<String> relationNames,
boolean isWrapReq, ConsistencyLevel consistencyLevel) throws Exception
>>>>>>>
@Override
public Object fromThriftRow(Class<?> clazz, EntityMetadata m, Object rowKey, List<String> relationNames,
boolean isWrapReq, ConsistencyLevel consistencyLevel) throws Exception
<<<<<<<
List<Object> entities = new ArrayList<Object>();
if (rowIds != null)
{
for (Object rowKey : rowIds)
{
Object e = fromThriftRow(selector, clazz, m, rowKey, relationNames, isWrapReq, consistencyLevel);
if (e != null)
{
entities.add(e);
}
}
}
return entities;
}
=======
return super.fromThriftRow(clazz, m, relationNames, isWrapReq, consistencyLevel, rowIds);
}
@Override
public <E> E fromThriftRow(Class<E> clazz, EntityMetadata m, DataRow<SuperColumn> tr) throws Exception
{
return super.fromThriftRow(clazz, m, tr);
}
@Override
public Object fromColumnThriftRow(Class<?> clazz, EntityMetadata m, ThriftRow thriftRow,
List<String> relationNames, boolean isWrapperReq) throws Exception
{
return super.fromColumnThriftRow(clazz, m, thriftRow, relationNames, isWrapperReq);
}
@Override
public Object fromCounterColumnThriftRow(Class<?> clazz, EntityMetadata m, ThriftRow thriftRow,
List<String> relationNames, boolean isWrapperReq) throws Exception
{
return super.fromCounterColumnThriftRow(clazz, m, thriftRow, relationNames, isWrapperReq);
}
@Override
public Object fromSuperColumnThriftRow(Class clazz, EntityMetadata m, ThriftRow tr, List<String> relationNames,
boolean isWrapReq) throws Exception
{
return super.fromSuperColumnThriftRow(clazz, m, tr, relationNames, isWrapReq);
}
@Override
public Object fromCounterSuperColumnThriftRow(Class clazz, EntityMetadata m, ThriftRow tr,
List<String> relationNames, boolean isWrapReq) throws Exception
{
return super.fromCounterSuperColumnThriftRow(clazz, m, tr, relationNames, isWrapReq);
}
>>>>>>>
return super.fromThriftRow(clazz, m, relationNames, isWrapReq, consistencyLevel, rowIds);
}
@Override
public <E> E fromThriftRow(Class<E> clazz, EntityMetadata m, DataRow<SuperColumn> tr) throws Exception
{
return super.fromThriftRow(clazz, m, tr);
}
@Override
public Object fromColumnThriftRow(Class<?> clazz, EntityMetadata m, ThriftRow thriftRow,
List<String> relationNames, boolean isWrapperReq) throws Exception
{
return super.fromColumnThriftRow(clazz, m, thriftRow, relationNames, isWrapperReq);
}
@Override
public Object fromCounterColumnThriftRow(Class<?> clazz, EntityMetadata m, ThriftRow thriftRow,
List<String> relationNames, boolean isWrapperReq) throws Exception
{
return super.fromCounterColumnThriftRow(clazz, m, thriftRow, relationNames, isWrapperReq);
}
@Override
public Object fromSuperColumnThriftRow(Class clazz, EntityMetadata m, ThriftRow tr, List<String> relationNames,
boolean isWrapReq) throws Exception
{
return super.fromSuperColumnThriftRow(clazz, m, tr, relationNames, isWrapReq);
}
@Override
public Object fromCounterSuperColumnThriftRow(Class clazz, EntityMetadata m, ThriftRow tr,
List<String> relationNames, boolean isWrapReq) throws Exception
{
return super.fromCounterSuperColumnThriftRow(clazz, m, tr, relationNames, isWrapReq);
} |
<<<<<<<
=======
import javax.persistence.FetchType;
>>>>>>>
import javax.persistence.FetchType;
<<<<<<<
import com.impetus.kundera.metadata.model.Relation.ForeignKey;
import com.impetus.kundera.persistence.context.PersistenceCacheManager;
=======
>>>>>>>
import com.impetus.kundera.metadata.model.Relation.ForeignKey;
import com.impetus.kundera.persistence.context.PersistenceCacheManager;
<<<<<<<
=======
Object entityId = PropertyAccessorHelper.getId(entity, m);
associationBuilder = new AssociationBuilder();
>>>>>>>
<<<<<<<
private boolean compareTo(Object relationalEntity, Object originalEntity)
{
if (relationalEntity != null && originalEntity != null
&& relationalEntity.getClass().isAssignableFrom(originalEntity.getClass()))
{
EntityMetadata metadata = KunderaMetadataManager.getEntityMetadata(originalEntity.getClass());
Object relationalEntityId = PropertyAccessorHelper.getId(relationalEntity, metadata);
Object originalEntityId = PropertyAccessorHelper.getId(originalEntity, metadata);
return relationalEntityId.equals(originalEntityId);
}
return false;
}
=======
>>>>>>>
private boolean compareTo(Object relationalEntity, Object originalEntity)
{
if (relationalEntity != null && originalEntity != null
&& relationalEntity.getClass().isAssignableFrom(originalEntity.getClass()))
{
EntityMetadata metadata = KunderaMetadataManager.getEntityMetadata(originalEntity.getClass());
Object relationalEntityId = PropertyAccessorHelper.getId(relationalEntity, metadata);
Object originalEntityId = PropertyAccessorHelper.getId(originalEntity, metadata);
return relationalEntityId.equals(originalEntityId);
}
return false;
} |
<<<<<<<
import com.orientechnologies.orient.core.record.impl.ODocument;
=======
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Date;
import java.util.Map;
>>>>>>>
import com.orientechnologies.orient.core.record.impl.ODocument;
<<<<<<<
private String buildURI(final File sourceFile) {
String uri = FileUtil.asPath(sourceFile).replace(FileUtil.asPath(config.getContentFolder()), "");
// On windows we have to replace the backslash
if (!File.separator.equals(URI_SEPARATOR_CHAR)) {
uri = uri.replace(File.separator, URI_SEPARATOR_CHAR);
}
=======
private String buildURI(final File sourceFile)
{
/* /jbake-web/content/path/to/file.ext -> */
String uri = FileUtil.asPath(sourceFile.getPath())
/* path/to/file.ext */
.replace(FileUtil.asPath(contentPath), "")
// On windows we have to replace the backslash
.replace(File.separator, "/");
>>>>>>>
private String buildURI(final File sourceFile) {
String uri = FileUtil.asPath(sourceFile).replace(FileUtil.asPath(config.getContentFolder()), "");
// On windows we have to replace the backslash
if (!File.separator.equals(URI_SEPARATOR_CHAR)) {
uri = uri.replace(File.separator, URI_SEPARATOR_CHAR);
}
<<<<<<<
return uri.substring(0, uri.lastIndexOf('.')) + config.getOutputExtension();
=======
///return uri.substring(0, uri.lastIndexOf('.')) + config.getString(Keys.OUTPUT_EXTENSION);
try {
return "/" + FilenameUtils.getPath(uri)
+ URLEncoder.encode(FilenameUtils.getBaseName(uri), StandardCharsets.UTF_8.name())
+ config.getString(Keys.OUTPUT_EXTENSION);
}
catch (UnsupportedEncodingException e) {
throw new RuntimeException("Missing UTF-8 encoding??", e); // Won't happen unless JDK is broken.
}
>>>>>>>
//return uri.substring(0, uri.lastIndexOf('.')) + config.getOutputExtension();
try {
return URI_SEPARATOR_CHAR + FilenameUtils.getPath(uri)
+ URLEncoder.encode(FilenameUtils.getBaseName(uri), StandardCharsets.UTF_8.name())
+ config.getOutputExtension();
}
catch (UnsupportedEncodingException e) {
throw new RuntimeException("Missing UTF-8 encoding??", e); // Won't happen unless JDK is broken.
}
<<<<<<<
return URI_SEPARATOR_CHAR
+ FilenameUtils.getPath(uri)
+ FilenameUtils.getBaseName(uri)
+ URI_SEPARATOR_CHAR
+ "index"
+ config.getOutputExtension();
=======
try {
return "/" + FilenameUtils.getPath(uri)
+ URLEncoder.encode(FilenameUtils.getBaseName(uri), StandardCharsets.UTF_8.name())
+ "/index"
+ config.getString(Keys.OUTPUT_EXTENSION);
}
catch (UnsupportedEncodingException e) {
throw new RuntimeException("Missing UTF-8 encoding??", e); // Won't happen unless JDK is broken.
}
>>>>>>>
// return URI_SEPARATOR_CHAR
// + FilenameUtils.getPath(uri)
// + FilenameUtils.getBaseName(uri)
// + URI_SEPARATOR_CHAR
// + "index"
// + config.getOutputExtension();
try {
return URI_SEPARATOR_CHAR
+ FilenameUtils.getPath(uri)
+ URLEncoder.encode(FilenameUtils.getBaseName(uri), StandardCharsets.UTF_8.name())
+ URI_SEPARATOR_CHAR
+ "index"
+ config.getOutputExtension();
}
catch (UnsupportedEncodingException e) {
throw new RuntimeException("Missing UTF-8 encoding??", e); // Won't happen unless JDK is broken.
} |
<<<<<<<
index = new RAMDirectory();/* FSDirectory.open(getIndexDirectory()) */
;
=======
index = new RAMDirectory();/* FSDirectory.open(getIndexDirectory()) */
;
// isInitialized
>>>>>>>
index = new RAMDirectory();/* FSDirectory.open(getIndexDirectory()) */
// isInitialized
<<<<<<<
try
{
reader = IndexReader.open(
/* FSDirectory.open(getIndexDirectory()) */index, true);
}
catch (CorruptIndexException e)
{
throw new IndexingException(e.getMessage());
}
catch (IOException e)
{
throw new IndexingException(e.getMessage());
}
=======
try
{
if (!isInitialized)
{
Directory sourceDir = FSDirectory.open(getIndexDirectory());
sourceDir.copy(sourceDir, index, true);
isInitialized = true;
}
reader = IndexReader.open(
/* FSDirectory.open(getIndexDirectory()) */index, true);
}
catch (CorruptIndexException e)
{
throw new IndexingException(e.getMessage());
}
catch (IOException e)
{
throw new IndexingException(e.getMessage());
}
>>>>>>>
try
{
if (!isInitialized)
{
Directory sourceDir = FSDirectory.open(getIndexDirectory());
sourceDir.copy(sourceDir, index, true);
isInitialized = true;
}
reader = IndexReader.open(
/* FSDirectory.open(getIndexDirectory()) */index, true);
}
catch (CorruptIndexException e)
{
throw new IndexingException(e.getMessage());
}
catch (IOException e)
{
throw new IndexingException(e.getMessage());
}
<<<<<<<
if (w != null)
{
w.commit();
// w.close();
// index.copy(index, FSDirectory.open(getIndexDirectory()), false);
}
=======
if (w != null)
{
w.commit();
// w.close();
index.copy(index, FSDirectory.open(getIndexDirectory()), false);
}
>>>>>>>
if (w != null)
{
w.commit();
// w.close();
// index.copy(index, FSDirectory.open(getIndexDirectory()), false);
} |
<<<<<<<
sb.append("static void subpart"+m+"(const mask_t mask, __global volatile float* parents, int row, __global float* left, __global float* right, int numRows) {\n");
// if (!subsegments[m].isEmpty()) sb.append(String.format("if (%s) return;\n", CLMaskKernels.genCheckIfMaskIsEmpty(structure, "mask", getParents(subsegments[m]))));
=======
sb.append("static void subpart"+m+"(const mask_t mask, __global volatile float* parents, __global int* parentIndex, int row, __global float* left, __global float* right, int numRows) {\n");
if (!subsegments[m].isEmpty()) sb.append(String.format("if (%s) return;\n", CLMaskKernels.genCheckIfMaskIsEmpty(structure, "mask", getParents(subsegments[m]))));
>>>>>>>
sb.append("static void subpart"+m+"(const mask_t mask, __global volatile float* parents, __global int* parentIndex, int row, __global float* left, __global float* right, int numRows) {\n");
// if (!subsegments[m].isEmpty()) sb.append(String.format("if (%s) return;\n", CLMaskKernels.genCheckIfMaskIsEmpty(structure, "mask", getParents(subsegments[m])))); |
<<<<<<<
public TemplateEngines(final CompositeConfiguration config, final ContentStore db, final File destination, final File templatesPath) {
=======
public TemplateEngines(final Configuration config, final ODatabaseDocumentTx db, final File destination, final File templatesPath) {
>>>>>>>
public TemplateEngines(final Configuration config, final ContentStore db, final File destination, final File templatesPath) {
<<<<<<<
private static AbstractTemplateEngine tryLoadEngine(final CompositeConfiguration config, final ContentStore db, final File destination, final File templatesPath, String engineClassName) {
=======
private static AbstractTemplateEngine tryLoadEngine(final Configuration config, final ODatabaseDocumentTx db, final File destination, final File templatesPath, String engineClassName) {
>>>>>>>
private static AbstractTemplateEngine tryLoadEngine(final Configuration config, final ContentStore db, final File destination, final File templatesPath, String engineClassName) {
<<<<<<<
private void loadEngines(final CompositeConfiguration config, final ContentStore db, final File destination, final File templatesPath) {
=======
private void loadEngines(final Configuration config, final ODatabaseDocumentTx db, final File destination, final File templatesPath) {
>>>>>>>
private void loadEngines(final Configuration config, final ContentStore db, final File destination, final File templatesPath) {
<<<<<<<
private void registerEngine(final CompositeConfiguration config, final ContentStore db, final File destination, final File templatesPath, String className, String... extensions) {
=======
private void registerEngine(final Configuration config, final ODatabaseDocumentTx db, final File destination, final File templatesPath, String className, String... extensions) {
>>>>>>>
private void registerEngine(final Configuration config, final ContentStore db, final File destination, final File templatesPath, String className, String... extensions) { |
<<<<<<<
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.concurrent.atomic.AtomicLong;
=======
>>>>>>>
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.concurrent.atomic.AtomicLong; |
<<<<<<<
=======
import com.opensymphony.xwork2.mock.MockResult;
>>>>>>>
import com.opensymphony.xwork2.mock.MockResult;
<<<<<<<
import java.util.concurrent.Callable;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
=======
>>>>>>>
import java.util.concurrent.Callable;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
<<<<<<<
public void testInvokeWithAsyncManager() throws Exception {
DefaultActionInvocation dai = new DefaultActionInvocation(new HashMap<String, Object>(), false);
dai.stack = container.getInstance(ValueStackFactory.class).createValueStack();
final Semaphore lock = new Semaphore(1);
lock.acquire();
dai.setAsyncManager(new AsyncManager() {
Object asyncActionResult;
@Override
public boolean hasAsyncActionResult() {
return asyncActionResult != null;
}
@Override
public Object getAsyncActionResult() {
return asyncActionResult;
}
@Override
public void invokeAsyncAction(Callable asyncAction) {
try {
asyncActionResult = asyncAction.call();
} catch (Exception e) {
asyncActionResult = e;
}
lock.release();
}
});
dai.action = new Callable<Callable<String>>() {
@Override
public Callable<String> call() throws Exception {
return new Callable<String>() {
@Override
public String call() throws Exception {
return "success";
}
};
}
};
MockActionProxy actionProxy = new MockActionProxy();
actionProxy.setMethod("call");
dai.proxy = actionProxy;
final boolean[] preResultExecuted = new boolean[1];
dai.addPreResultListener(new PreResultListener() {
@Override
public void beforeResult(ActionInvocation invocation, String resultCode) {
preResultExecuted[0] = true;
}
});
List<InterceptorMapping> interceptorMappings = new ArrayList<>();
MockInterceptor mockInterceptor1 = new MockInterceptor();
mockInterceptor1.setFoo("test1");
mockInterceptor1.setExpectedFoo("test1");
interceptorMappings.add(new InterceptorMapping("test1", mockInterceptor1));
dai.interceptors = interceptorMappings.iterator();
dai.ognlUtil = new OgnlUtil();
dai.invoke();
assertTrue("interceptor1 should be executed", mockInterceptor1.isExecuted());
assertFalse("preResultListener should no be executed", preResultExecuted[0]);
assertNotNull("an async action should be saved", dai.asyncAction);
assertFalse("invocation should not be executed", dai.executed);
assertNull("a null result should be passed to upper and wait for the async result", dai.resultCode);
if(lock.tryAcquire(1500L, TimeUnit.MILLISECONDS)) {
try {
dai.invoke();
assertTrue("preResultListener should be executed", preResultExecuted[0]);
assertNull("async action should be cleared", dai.asyncAction);
assertTrue("invocation should be executed", dai.executed);
assertEquals("success", dai.resultCode);
} finally {
lock.release();
}
} else {
lock.release();
fail("async result did not received on timeout!");
}
}
=======
public void testActionEventListener() throws Exception {
ActionProxy actionProxy = actionProxyFactory.createActionProxy("",
"ExceptionFoo", "exceptionMethod", new HashMap<String, Object>());
DefaultActionInvocation defaultActionInvocation = (DefaultActionInvocation) actionProxy.getInvocation();
SimpleActionEventListener actionEventListener = new SimpleActionEventListener("prepared", "exceptionHandled");
defaultActionInvocation.setActionEventListener(actionEventListener);
defaultActionInvocation.init(actionProxy);
SimpleAction action = (SimpleAction) defaultActionInvocation.getAction();
action.setThrowException(true);
defaultActionInvocation.unknownHandlerManager = new DefaultUnknownHandlerManager() {
@Override
public boolean hasUnknownHandlers() {
return false;
}
};
String result = defaultActionInvocation.invoke();
// then
assertEquals("prepared", action.getName());
assertEquals("exceptionHandled", result);
}
public void testActionChainResult() throws Exception {
ActionProxy actionProxy = actionProxyFactory.createActionProxy("", "Foo", null,
new HashMap<String, Object>());
DefaultActionInvocation defaultActionInvocation = (DefaultActionInvocation) actionProxy.getInvocation();
defaultActionInvocation.init(actionProxy);
SimpleAction action = (SimpleAction) defaultActionInvocation.getAction();
action.setFoo(1);
action.setBar(2);
defaultActionInvocation.invoke();
// then
assertTrue(defaultActionInvocation.result instanceof ActionChainResult);
Result result = defaultActionInvocation.getResult();
assertTrue(result instanceof MockResult);
}
public void testNoResultDefined() throws Exception {
ActionProxy actionProxy = actionProxyFactory.createActionProxy("", "Foo", null,
new HashMap<String, Object>());
DefaultActionInvocation defaultActionInvocation = (DefaultActionInvocation) actionProxy.getInvocation();
defaultActionInvocation.init(actionProxy);
try {
defaultActionInvocation.invoke();//foo==bar so returns error which is not defined
fail("should not possible when result is not defined");
} catch (Exception ignored) {
}
}
public void testNullResultPossible() throws Exception {
ActionProxy actionProxy = actionProxyFactory.createActionProxy("",
"NullFoo", "nullMethod", new HashMap<String, Object>());
DefaultActionInvocation defaultActionInvocation = (DefaultActionInvocation) actionProxy.getInvocation();
defaultActionInvocation.init(actionProxy);
String result = defaultActionInvocation.invoke();
assertNull(result);
}
>>>>>>>
public void testInvokeWithAsyncManager() throws Exception {
DefaultActionInvocation dai = new DefaultActionInvocation(new HashMap<String, Object>(), false);
dai.stack = container.getInstance(ValueStackFactory.class).createValueStack();
final Semaphore lock = new Semaphore(1);
lock.acquire();
dai.setAsyncManager(new AsyncManager() {
Object asyncActionResult;
@Override
public boolean hasAsyncActionResult() {
return asyncActionResult != null;
}
@Override
public Object getAsyncActionResult() {
return asyncActionResult;
}
@Override
public void invokeAsyncAction(Callable asyncAction) {
try {
asyncActionResult = asyncAction.call();
} catch (Exception e) {
asyncActionResult = e;
}
lock.release();
}
});
dai.action = new Callable<Callable<String>>() {
@Override
public Callable<String> call() throws Exception {
return new Callable<String>() {
@Override
public String call() throws Exception {
return "success";
}
};
}
};
MockActionProxy actionProxy = new MockActionProxy();
actionProxy.setMethod("call");
dai.proxy = actionProxy;
final boolean[] preResultExecuted = new boolean[1];
dai.addPreResultListener(new PreResultListener() {
@Override
public void beforeResult(ActionInvocation invocation, String resultCode) {
preResultExecuted[0] = true;
}
});
List<InterceptorMapping> interceptorMappings = new ArrayList<>();
MockInterceptor mockInterceptor1 = new MockInterceptor();
mockInterceptor1.setFoo("test1");
mockInterceptor1.setExpectedFoo("test1");
interceptorMappings.add(new InterceptorMapping("test1", mockInterceptor1));
dai.interceptors = interceptorMappings.iterator();
dai.ognlUtil = new OgnlUtil();
dai.invoke();
assertTrue("interceptor1 should be executed", mockInterceptor1.isExecuted());
assertFalse("preResultListener should no be executed", preResultExecuted[0]);
assertNotNull("an async action should be saved", dai.asyncAction);
assertFalse("invocation should not be executed", dai.executed);
assertNull("a null result should be passed to upper and wait for the async result", dai.resultCode);
if(lock.tryAcquire(1500L, TimeUnit.MILLISECONDS)) {
try {
dai.invoke();
assertTrue("preResultListener should be executed", preResultExecuted[0]);
assertNull("async action should be cleared", dai.asyncAction);
assertTrue("invocation should be executed", dai.executed);
assertEquals("success", dai.resultCode);
} finally {
lock.release();
}
} else {
lock.release();
fail("async result did not received on timeout!");
}
}
public void testActionEventListener() throws Exception {
ActionProxy actionProxy = actionProxyFactory.createActionProxy("",
"ExceptionFoo", "exceptionMethod", new HashMap<String, Object>());
DefaultActionInvocation defaultActionInvocation = (DefaultActionInvocation) actionProxy.getInvocation();
SimpleActionEventListener actionEventListener = new SimpleActionEventListener("prepared", "exceptionHandled");
defaultActionInvocation.setActionEventListener(actionEventListener);
defaultActionInvocation.init(actionProxy);
SimpleAction action = (SimpleAction) defaultActionInvocation.getAction();
action.setThrowException(true);
defaultActionInvocation.unknownHandlerManager = new DefaultUnknownHandlerManager() {
@Override
public boolean hasUnknownHandlers() {
return false;
}
};
String result = defaultActionInvocation.invoke();
// then
assertEquals("prepared", action.getName());
assertEquals("exceptionHandled", result);
}
public void testActionChainResult() throws Exception {
ActionProxy actionProxy = actionProxyFactory.createActionProxy("", "Foo", null,
new HashMap<String, Object>());
DefaultActionInvocation defaultActionInvocation = (DefaultActionInvocation) actionProxy.getInvocation();
defaultActionInvocation.init(actionProxy);
SimpleAction action = (SimpleAction) defaultActionInvocation.getAction();
action.setFoo(1);
action.setBar(2);
defaultActionInvocation.invoke();
// then
assertTrue(defaultActionInvocation.result instanceof ActionChainResult);
Result result = defaultActionInvocation.getResult();
assertTrue(result instanceof MockResult);
}
public void testNoResultDefined() throws Exception {
ActionProxy actionProxy = actionProxyFactory.createActionProxy("", "Foo", null,
new HashMap<String, Object>());
DefaultActionInvocation defaultActionInvocation = (DefaultActionInvocation) actionProxy.getInvocation();
defaultActionInvocation.init(actionProxy);
try {
defaultActionInvocation.invoke();//foo==bar so returns error which is not defined
fail("should not possible when result is not defined");
} catch (Exception ignored) {
}
}
public void testNullResultPossible() throws Exception {
ActionProxy actionProxy = actionProxyFactory.createActionProxy("",
"NullFoo", "nullMethod", new HashMap<String, Object>());
DefaultActionInvocation defaultActionInvocation = (DefaultActionInvocation) actionProxy.getInvocation();
defaultActionInvocation.init(actionProxy);
String result = defaultActionInvocation.invoke();
assertNull(result);
} |
<<<<<<<
import org.apache.struts2.dispatcher.HttpParameters;
=======
import org.apache.struts2.interceptor.servlet.ServletPrincipalProxy;
>>>>>>>
import org.apache.struts2.interceptor.servlet.ServletPrincipalProxy;
import org.apache.struts2.dispatcher.HttpParameters;
<<<<<<<
mock.setParameters(param);
control.setVoidCallable();
=======
mock.setParameters((Map)param);
expectLastCall().times(1);
>>>>>>>
mock.setParameters(param);
expectLastCall().times(1); |
<<<<<<<
import org.apache.struts2.dispatcher.HttpParameters;
import org.easymock.MockControl;
=======
import static org.easymock.EasyMock.*;
>>>>>>>
import org.apache.struts2.dispatcher.HttpParameters;
import org.easymock.MockControl;
import static org.easymock.EasyMock.*; |
<<<<<<<
=======
import java.util.Date;
import java.util.Map;
>>>>>>> |
<<<<<<<
JsonNode data = packet.get("d");
int heartbeatInterval = data.get("heartbeat_interval").asInt();
heartbeatTimer = startHeartbeat(websocket, heartbeatInterval);
=======
if (sessionId == null) {
sendIdentify(websocket);
} else {
sendResume(websocket);
}
>>>>>>>
JsonNode data = packet.get("d");
int heartbeatInterval = data.get("heartbeat_interval").asInt();
heartbeatTimer = startHeartbeat(websocket, heartbeatInterval);
if (sessionId == null) {
sendIdentify(websocket);
} else {
sendResume(websocket);
} |
<<<<<<<
import java.io.IOException;
import org.cactoos.text.Joined;
=======
import org.cactoos.text.JoinedText;
>>>>>>>
import org.cactoos.text.Joined; |
<<<<<<<
import nl.jqno.equalsverifier.EqualsVerifier;
import nl.jqno.equalsverifier.Warning;
import org.cactoos.text.Joined;
import org.cactoos.text.TextOf;
=======
>>>>>>>
import org.cactoos.text.Joined;
import org.cactoos.text.TextOf;
<<<<<<<
=======
import org.hamcrest.Matchers;
import org.hamcrest.core.IsEqual;
>>>>>>>
import org.hamcrest.core.IsEqual;
<<<<<<<
import org.llorllale.cactoos.matchers.StartsWith;
=======
import org.llorllale.cactoos.matchers.Assertion;
import org.takes.Request;
>>>>>>>
import org.llorllale.cactoos.matchers.Assertion;
import org.llorllale.cactoos.matchers.StartsWith;
import org.takes.Request; |
<<<<<<<
new RqHeaders.Base(
=======
new RqHeaders(
multi.part("address").iterator().next()
)
).printBody(),
Matchers.allOf(
Matchers.startsWith("40 N"),
Matchers.endsWith("CA 94085")
)
);
MatcherAssert.assertThat(
new RqPrint(
new RqHeaders(
>>>>>>>
new RqHeaders.Base(
multi.part("address").iterator().next()
)
).printBody(),
Matchers.allOf(
Matchers.startsWith("40 N"),
Matchers.endsWith("CA 94085")
)
);
MatcherAssert.assertThat(
new RqPrint(
new RqHeaders.Base( |
<<<<<<<
import org.cactoos.scalar.IoChecked;
import org.cactoos.scalar.Sticky;
=======
import org.cactoos.io.WriterTo;
import org.cactoos.text.TextOf;
>>>>>>>
import org.cactoos.io.WriterTo;
import org.cactoos.scalar.IoChecked;
import org.cactoos.scalar.Sticky;
import org.cactoos.text.TextOf;
<<<<<<<
@Override
public String value() throws Exception {
RsPrint.this.printHead(this.baos);
RsPrint.this.printBody(this.baos);
return new Utf8String(
this.baos.toByteArray()
).asString();
}
}
)
);
=======
/**
* Print it into string.
* @return Entire HTTP response
* @throws IOException If fails
*/
public String print() throws IOException {
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
this.print(baos);
return new TextOf(baos.toByteArray()).asString();
>>>>>>>
@Override
public String value() throws Exception {
RsPrint.this.printHead(this.baos);
RsPrint.this.printBody(this.baos);
return new TextOf(
this.baos.toByteArray()
).asString();
}
}
)
); |
<<<<<<<
import org.takes.rq.form.RqFormBase;
import org.takes.rq.form.RqFormSmart;
import org.takes.rs.RsJSON;
=======
import org.takes.rs.RsJson;
>>>>>>>
import org.takes.rq.form.RqFormBase;
import org.takes.rq.form.RqFormSmart;
import org.takes.rs.RsJson; |
<<<<<<<
import java.io.IOException;
import org.cactoos.text.Joined;
=======
import org.cactoos.text.JoinedText;
>>>>>>>
import org.cactoos.text.Joined; |
<<<<<<<
new RqHeaders.Base(req).header("Accept-Encoding").iterator();
final Collection<Response> list = new ArrayList<Response>(1);
=======
new RqHeaders(req).header("Accept-Encoding").iterator();
final Opt<Response> resp;
>>>>>>>
new RqHeaders.Base(req).header("Accept-Encoding").iterator();
final Opt<Response> resp; |
<<<<<<<
String age = "develop";
=======
Log.d("zp_test", name);
Log.d("zp_test", name);
>>>>>>>
String age = "develop";
Log.d("zp_test", name);
Log.d("zp_test", name); |
<<<<<<<
import com.kylinolap.job.execution.AbstractExecutable;
import com.kylinolap.metadata.model.SegmentStatusEnum;
import com.kylinolap.metadata.realization.RealizationStatusEnum;
=======
import com.kylinolap.job.impl.threadpool.AbstractExecutable;
>>>>>>>
import com.kylinolap.job.execution.AbstractExecutable; |
<<<<<<<
import org.apache.hadoop.mapreduce.Mapper;
import org.apache.hive.hcatalog.data.HCatRecord;
import org.apache.hive.hcatalog.data.schema.HCatFieldSchema;
import org.apache.hive.hcatalog.data.schema.HCatSchema;
import org.apache.hive.hcatalog.mapreduce.HCatInputFormat;
=======
>>>>>>>
import org.apache.hive.hcatalog.data.HCatRecord;
import org.apache.hive.hcatalog.data.schema.HCatFieldSchema;
import org.apache.hive.hcatalog.data.schema.HCatSchema;
import org.apache.hive.hcatalog.mapreduce.HCatInputFormat;
<<<<<<<
public class FactDistinctColumnsMapper<KEYIN> extends Mapper<KEYIN, HCatRecord, ShortWritable, Text> {
=======
public class FactDistinctColumnsMapper<KEYIN> extends KylinMapper<KEYIN, Text, ShortWritable, Text> {
>>>>>>>
public class FactDistinctColumnsMapper<KEYIN> extends KylinMapper<KEYIN, HCatRecord, ShortWritable, Text> { |
<<<<<<<
TENANT, CUSTOMER, USER, DASHBOARD, ASSET, DEVICE, ALARM, RULE_CHAIN, RULE_NODE, ENTITY_VIEW, WIDGETS_BUNDLE, WIDGET_TYPE, OAUTH2_CLIENT_REGISTRATION, OAUTH2_CLIENT_REGISTRATION_INFO, OAUTH2_CLIENT_REGISTRATION_TEMPLATE
=======
TENANT, TENANT_PROFILE, CUSTOMER, USER, DASHBOARD, ASSET, DEVICE, DEVICE_PROFILE, ALARM, RULE_CHAIN, RULE_NODE, ENTITY_VIEW, WIDGETS_BUNDLE, WIDGET_TYPE
>>>>>>>
TENANT, TENANT_PROFILE, CUSTOMER, USER, DASHBOARD, ASSET, DEVICE, DEVICE_PROFILE, ALARM, RULE_CHAIN, RULE_NODE, ENTITY_VIEW, WIDGETS_BUNDLE, WIDGET_TYPE, OAUTH2_CLIENT_REGISTRATION, OAUTH2_CLIENT_REGISTRATION_INFO, OAUTH2_CLIENT_REGISTRATION_TEMPLATE |
<<<<<<<
import com.kylinolap.job2.cube.BuildCubeJob;
import com.kylinolap.job2.cube.BuildCubeJobBuilder;
=======
import com.kylinolap.job2.cube.CubingJob;
import com.kylinolap.job2.cube.CubingJobBuilder;
>>>>>>>
import com.kylinolap.job2.cube.CubingJob;
import com.kylinolap.job2.cube.CubingJobBuilder;
<<<<<<<
=======
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Component;
import com.kylinolap.cube.CubeInstance;
import com.kylinolap.cube.CubeSegment;
import com.kylinolap.cube.exception.CubeIntegrityException;
import com.kylinolap.cube.model.CubeBuildTypeEnum;
import com.kylinolap.job.JobInstance;
import com.kylinolap.job.constant.JobStatusEnum;
import com.kylinolap.job.exception.InvalidJobInstanceException;
import com.kylinolap.job.exception.JobException;
>>>>>>> |
<<<<<<<
// public static InputStream getKylinPropertiesAsInputSteam() {
// File propFile = null;
//
// // 1st, find conf path from env
// String path = System.getProperty(KYLIN_CONF);
// if (path == null) {
// path = System.getenv(KYLIN_CONF);
// }
// propFile = getKylinPropertiesFile(path);
//
// // 2nd, find /etc/kylin
// if (propFile == null) {
// propFile = getKylinPropertiesFile(KYLIN_CONF_DEFAULT);
// }
// if (propFile != null) {
// logger.debug("Loading property file " + propFile.getAbsolutePath());
// try {
// return new FileInputStream(propFile);
// } catch (FileNotFoundException e) {
// logger.warn("Failed to read properties " + propFile.getAbsolutePath() + " and skip");
// }
// }
//
// // 3rd, find classpath
// logger.info("Search " + KYLIN_CONF_PROPERTIES_FILE + " from classpath ...");
// InputStream is = KylinConfig.class.getClassLoader().getResourceAsStream("kylin.properties");
// if (is == null) {
// logger.info("Did not find properties file " + KYLIN_CONF_PROPERTIES_FILE + " from classpath");
// }
// return is;
// }
public static String getKylinHome() {
String kylinHome = System.getenv(KYLIN_HOME);
if (StringUtils.isEmpty(kylinHome)) {
logger.warn("KYLIN_HOME has not been set");
throw new RuntimeException("KYLIN_HOME has not been set");
}
return kylinHome;
}
=======
public void printProperties() throws IOException {
try {
kylinConfig.save(System.out);
} catch (ConfigurationException ex) {
throw new IOException("Error printing KylinConfig", ex);
}
}
public static InputStream getKylinPropertiesAsInputSteam() {
File propFile = null;
>>>>>>>
public static String getKylinHome() {
String kylinHome = System.getenv(KYLIN_HOME);
if (StringUtils.isEmpty(kylinHome)) {
logger.warn("KYLIN_HOME has not been set");
throw new RuntimeException("KYLIN_HOME has not been set");
}
return kylinHome;
}
public void printProperties() throws IOException {
try {
kylinConfig.save(System.out);
} catch (ConfigurationException ex) {
throw new IOException("Error printing KylinConfig", ex);
}
} |
<<<<<<<
realizationCapacity = RealizationCapacity.valueOf(context.getConfiguration().get(BatchConstants.CUBE_CAPACITY));
switch (realizationCapacity) {
=======
super.publishConfiguration(context.getConfiguration());
cubeCapacity = CubeCapacity.valueOf(context.getConfiguration().get(BatchConstants.CUBE_CAPACITY));
switch (cubeCapacity) {
>>>>>>>
super.publishConfiguration(context.getConfiguration());
realizationCapacity = RealizationCapacity.valueOf(context.getConfiguration().get(BatchConstants.CUBE_CAPACITY));
switch (realizationCapacity) { |
<<<<<<<
public JobInstance createJob(String cubeName, String segmentName, String segmentId, RealizationBuildTypeEnum jobType) throws IOException {
=======
public JobInstance createJob(String cubeName, String segmentName, String segmentId, CubeBuildTypeEnum jobType, String submitter) throws IOException {
>>>>>>>
public JobInstance createJob(String cubeName, String segmentName, String segmentId, RealizationBuildTypeEnum jobType, String submitter) throws IOException {
<<<<<<<
private JobInstance buildJobInstance(String cubeName, String segmentName, String segmentId, RealizationBuildTypeEnum jobType) {
=======
private JobInstance buildJobInstance(String cubeName, String segmentName, String segmentId, CubeBuildTypeEnum jobType, String submitter) {
>>>>>>>
private JobInstance buildJobInstance(String cubeName, String segmentName, String segmentId, RealizationBuildTypeEnum jobType, String submitter) { |
<<<<<<<
/*
* (non-Javadoc)
*
* @see
* cc.kune.common.client.actions.ui.descrip.GuiActionDescrip#add(cc.kune.common
* .client.actions.ui.descrip.GuiAddCondition)
*/
=======
/**
* Creates a action descriptor from a previous created descriptor cloning its
* values
*
* @param descr
* the other descriptor
*/
public AbstractGuiActionDescrip(final AbstractGuiActionDescrip descr) {
this.action = descr.getAction();
putValue(Action.ENABLED, descr.getValue(Action.ENABLED));
putValue(VISIBLE, descr.getValue(VISIBLE));
position = descr.getPosition();
parent = descr.getParent();
isRTL = descr.isRTL();
location = descr.getLocation();
addConditions = descr.getAddConditions();
for (final Object keyO : descr.getKeys()) {
final String key = (String) keyO;
super.putValue(key, descr.getValue(key));
}
}
>>>>>>>
/**
* Creates a action descriptor from a previous created descriptor cloning its
* values
*
* @param descr
* the other descriptor
*/
public AbstractGuiActionDescrip(final AbstractGuiActionDescrip descr) {
this.action = descr.getAction();
putValue(Action.ENABLED, descr.getValue(Action.ENABLED));
putValue(VISIBLE, descr.getValue(VISIBLE));
position = descr.getPosition();
parent = descr.getParent();
isRTL = descr.isRTL();
location = descr.getLocation();
addConditions = descr.getAddConditions();
for (final Object keyO : descr.getKeys()) {
final String key = (String) keyO;
super.putValue(key, descr.getValue(key));
}
}
/*
* (non-Javadoc)
*
* @see
* cc.kune.common.client.actions.ui.descrip.GuiActionDescrip#add(cc.kune.common
* .client.actions.ui.descrip.GuiAddCondition)
*/
<<<<<<<
/*
* (non-Javadoc)
*
* @see
* cc.kune.common.client.actions.ui.descrip.GuiActionDescrip#getDirection()
*/
=======
public List<GuiAddCondition> getAddConditions() {
return addConditions;
}
>>>>>>>
public List<GuiAddCondition> getAddConditions() {
return addConditions;
}
/*
* (non-Javadoc)
*
* @see
* cc.kune.common.client.actions.ui.descrip.GuiActionDescrip#getDirection()
*/ |
<<<<<<<
=======
import cc.kune.common.client.log.Log;
import cc.kune.common.client.utils.WindowUtils;
>>>>>>>
import cc.kune.common.client.log.Log;
import cc.kune.common.client.utils.WindowUtils;
<<<<<<<
private boolean isEmbedded = false;
/** The languages array. */
=======
private Boolean isDev;
>>>>>>>
private boolean isEmbedded = false;
private Boolean isDev;
/** The languages array. */ |
<<<<<<<
/**
* Arrowdownsitebar small.
*
* @return the image resource
*/
@Source("arrowdownsitebar-small.gif")
ImageResource arrowdownsitebarSmall();
/**
* Arrowdownsquarewhite.
*
* @return the image resource
*/
=======
>>>>>>> |
<<<<<<<
String userName = msg.payload().userName();
String clientId = msg.payload().clientIdentifier();
if (DataConstants.PROVISION.equals(userName) || DataConstants.PROVISION.equals(clientId)) {
deviceSessionCtx.setProvisionOnly(true);
ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_ACCEPTED));
=======
X509Certificate cert;
if (sslHandler != null && (cert = getX509Certificate()) != null) {
processX509CertConnect(ctx, cert, msg);
>>>>>>>
String userName = msg.payload().userName();
String clientId = msg.payload().clientIdentifier();
if (DataConstants.PROVISION.equals(userName) || DataConstants.PROVISION.equals(clientId)) {
deviceSessionCtx.setProvisionOnly(true);
ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_ACCEPTED, msg));
<<<<<<<
TransportProtos.ValidateBasicMqttCredRequestMsg.Builder request = TransportProtos.ValidateBasicMqttCredRequestMsg.newBuilder()
.setClientId(msg.payload().clientIdentifier());
if (userName != null) {
request.setUserName(userName);
=======
if (StringUtils.isEmpty(userName)) {
ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_REFUSED_BAD_USER_NAME_OR_PASSWORD, connectMessage));
ctx.close();
} else {
transportService.process(ValidateDeviceTokenRequestMsg.newBuilder().setToken(userName).build(),
new TransportServiceCallback<ValidateDeviceCredentialsResponseMsg>() {
@Override
public void onSuccess(ValidateDeviceCredentialsResponseMsg msg) {
onValidateDeviceResponse(msg, ctx, connectMessage);
}
@Override
public void onError(Throwable e) {
log.trace("[{}] Failed to process credentials: {}", address, userName, e);
ctx.writeAndFlush(createMqttConnAckMsg(MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE, connectMessage));
ctx.close();
}
});
>>>>>>>
TransportProtos.ValidateBasicMqttCredRequestMsg.Builder request = TransportProtos.ValidateBasicMqttCredRequestMsg.newBuilder()
.setClientId(connectMessage.payload().clientIdentifier());
if (userName != null) {
request.setUserName(userName);
<<<<<<<
public void onSuccess(ValidateDeviceCredentialsResponse msg) {
onValidateDeviceResponse(msg, ctx);
=======
public void onSuccess(ValidateDeviceCredentialsResponseMsg msg) {
onValidateDeviceResponse(msg, ctx, connectMessage);
>>>>>>>
public void onSuccess(ValidateDeviceCredentialsResponse msg) {
onValidateDeviceResponse(msg, ctx, connectMessage);
<<<<<<<
private void onValidateDeviceResponse(ValidateDeviceCredentialsResponse msg, ChannelHandlerContext ctx) {
=======
private void onValidateDeviceResponse(ValidateDeviceCredentialsResponseMsg msg, ChannelHandlerContext ctx, MqttConnectMessage connectMessage) {
>>>>>>>
private void onValidateDeviceResponse(ValidateDeviceCredentialsResponse msg, ChannelHandlerContext ctx, MqttConnectMessage connectMessage) {
<<<<<<<
public void onSuccess(Void msg) {
transportService.registerAsyncSession(deviceSessionCtx.getSessionInfo(), MqttTransportHandler.this);
=======
public void onSuccess(Void response) {
transportService.registerAsyncSession(sessionInfo, MqttTransportHandler.this);
>>>>>>>
public void onSuccess(Void msg) {
transportService.registerAsyncSession(deviceSessionCtx.getSessionInfo(), MqttTransportHandler.this);
<<<<<<<
if (e instanceof TbRateLimitsException) {
log.trace("[{}] Failed to submit session event", sessionId, e);
} else {
log.warn("[{}] Failed to submit session event", sessionId, e);
}
ctx.writeAndFlush(createMqttConnAckMsg(MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE));
=======
log.warn("[{}] Failed to submit session event", sessionId, e);
ctx.writeAndFlush(createMqttConnAckMsg(MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE, connectMessage));
>>>>>>>
if (e instanceof TbRateLimitsException) {
log.trace("[{}] Failed to submit session event", sessionId, e);
} else {
log.warn("[{}] Failed to submit session event", sessionId, e);
}
ctx.writeAndFlush(createMqttConnAckMsg(MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE, connectMessage)); |
<<<<<<<
=======
import com.datastax.driver.core.*;
import com.datastax.driver.core.ProtocolOptions.Compression;
import com.datastax.driver.mapping.Mapper;
import com.datastax.driver.mapping.MappingManager;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
>>>>>>>
<<<<<<<
public class CassandraCluster extends AbstractCassandraCluster {
=======
@Slf4j
@NoSqlDao
public class CassandraCluster {
private static final String COMMA = ",";
private static final String COLON = ":";
>>>>>>>
@NoSqlDao
public class CassandraCluster extends AbstractCassandraCluster { |
<<<<<<<
private volatile ReplicationTarget replicationTarget;
=======
private RecoveryErrorHandler recoveryErrorHandler;
//
private ReplicationTarget replicationTarget;
>>>>>>>
private RecoveryErrorHandler recoveryErrorHandler;
//
private ReplicationTarget replicationTarget;
<<<<<<<
/**
* Set the Executor to use for writing new record entries.
*
* Important note: the provided Executor must be manually closed.
*
* @param writer
*/
public void setWriter(Executor writer) {
this.writer = writer;
this.managedWriter = false;
}
/**
* Set the ScheduledExecutorService to use for internal resources disposing.
*
* Important note: the provided ScheduledExecutorService must be manually
* closed.
*
* @param writer
*/
public void setDisposer(ScheduledExecutorService disposer) {
this.disposer = disposer;
this.managedDisposer = false;
}
=======
/**
* Set the RecoveryErrorHandler to invoke in case of checksum errors.
*
* @param recoveryErrorHandler
*/
public void setRecoveryErrorHandler(RecoveryErrorHandler recoveryErrorHandler) {
this.recoveryErrorHandler = recoveryErrorHandler;
}
>>>>>>>
/**
* Set the Executor to use for writing new record entries.
*
* Important note: the provided Executor must be manually closed.
*
* @param writer
*/
public void setWriter(Executor writer) {
this.writer = writer;
this.managedWriter = false;
}
/**
* Set the ScheduledExecutorService to use for internal resources disposing.
*
* Important note: the provided ScheduledExecutorService must be manually
* closed.
*
* @param writer
*/
public void setDisposer(ScheduledExecutorService disposer) {
this.disposer = disposer;
this.managedDisposer = false;
}
/**
* Set the RecoveryErrorHandler to invoke in case of checksum errors.
*
* @param recoveryErrorHandler
*/
public void setRecoveryErrorHandler(RecoveryErrorHandler recoveryErrorHandler) {
this.recoveryErrorHandler = recoveryErrorHandler;
} |
<<<<<<<
private volatile byte type = ANY_RECORD_TYPE;
=======
private volatile byte type = NO_RECORD_TYPE;
private volatile WriteCallback writeCallback = NoWriteCallback.INSTANCE;
>>>>>>>
private volatile byte type = ANY_RECORD_TYPE;
private volatile WriteCallback writeCallback = NoWriteCallback.INSTANCE; |
<<<<<<<
=======
@Test
public void testPublishByIds() throws Exception {
Map response = cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("tags", SDK_TEST_TAG, "type", "authenticated"));
String publicId = (String) response.get("public_id");
response = cloudinary.api().publishByIds(Arrays.asList(publicId), null);
List published = (List) response.get("published");
assertNotNull(published);
assertEquals(published.size(), 1);
Map resource = (Map) published.get(0);
assertEquals(resource.get("public_id"), publicId);
assertNotNull(resource.get("url"));
cloudinary.uploader().destroy(publicId, null);
}
@Test
public void testPublishByPrefix() throws Exception {
Map response = cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("tags", SDK_TEST_TAG, "type", "authenticated"));
String publicId = (String) response.get("public_id");
response = cloudinary.api().publishByPrefix(publicId.substring(0, publicId.length() - 2), null);
List published = (List) response.get("published");
assertNotNull(published);
assertEquals(published.size(), 1);
Map resource = (Map) published.get(0);
assertEquals(resource.get("public_id"), publicId);
assertNotNull(resource.get("url"));
cloudinary.uploader().destroy(publicId, null);
}
@Test
public void testPublishByTag() throws Exception {
Map response = cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("tags", Arrays.asList(SDK_TEST_TAG, SDK_TEST_TAG + "1"), "type", "authenticated"));
String publicId = (String) response.get("public_id");
response = cloudinary.api().publishByTag(SDK_TEST_TAG + "1", null);
List published = (List) response.get("published");
assertNotNull(published);
assertEquals(published.size(), 1);
Map resource = (Map) published.get(0);
assertEquals(resource.get("public_id"), publicId);
assertNotNull(resource.get("url"));
cloudinary.uploader().destroy(publicId, null);
}
private void assertContains(Object object, Collection list) {
assertTrue(list.contains(object));
}
>>>>>>>
@Test
public void testPublishByIds() throws Exception {
Map response = cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("tags", SDK_TEST_TAG, "type", "authenticated"));
String publicId = (String) response.get("public_id");
response = cloudinary.api().publishByIds(Arrays.asList(publicId), null);
List published = (List) response.get("published");
assertNotNull(published);
assertEquals(published.size(), 1);
Map resource = (Map) published.get(0);
assertEquals(resource.get("public_id"), publicId);
assertNotNull(resource.get("url"));
cloudinary.uploader().destroy(publicId, null);
}
@Test
public void testPublishByPrefix() throws Exception {
Map response = cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("tags", SDK_TEST_TAG, "type", "authenticated"));
String publicId = (String) response.get("public_id");
response = cloudinary.api().publishByPrefix(publicId.substring(0, publicId.length() - 2), null);
List published = (List) response.get("published");
assertNotNull(published);
assertEquals(published.size(), 1);
Map resource = (Map) published.get(0);
assertEquals(resource.get("public_id"), publicId);
assertNotNull(resource.get("url"));
cloudinary.uploader().destroy(publicId, null);
}
@Test
public void testPublishByTag() throws Exception {
Map response = cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("tags", Arrays.asList(SDK_TEST_TAG, SDK_TEST_TAG + "1"), "type", "authenticated"));
String publicId = (String) response.get("public_id");
response = cloudinary.api().publishByTag(SDK_TEST_TAG + "1", null);
List published = (List) response.get("published");
assertNotNull(published);
assertEquals(published.size(), 1);
Map resource = (Map) published.get(0);
assertEquals(resource.get("public_id"), publicId);
assertNotNull(resource.get("url"));
cloudinary.uploader().destroy(publicId, null);
} |
<<<<<<<
import org.streampipes.wrapper.standalone.declarer.StandaloneEventProcessorDeclarer;
import java.util.List;
import java.util.stream.Collectors;
//import de.fzi.cep.sepa.client.util.DeclarerUtils;
=======
import org.streampipes.wrapper.standalone.declarer.FlatEpDeclarer;
>>>>>>>
import org.streampipes.wrapper.standalone.declarer.StandaloneEventProcessorDeclarer;
import java.util.List;
import java.util.stream.Collectors; |
<<<<<<<
public static final String INDEX = NS + "hasIndex";
public static final String NOTIFICATION = NS + "Notification" ;
public static final String NOTIFICATIONS = NS + "notifications" ;
public static final String NOTIFICATION_TITLE = NS + "notificationTitle" ;
public static final String NOTIFICATION_DESCRIPTION = NS + "notificationDescription" ;
public static final String NOTIFICATION_ADDITIONAL_INFORMATION = NS + "notificationAdditionalInformation" ;
public static final String MESSAGE = NS + "Message" ;
public static final String MESSAGE_SUCCESS = NS + "messsageSuccess" ;
public static final String MESSAGE_ELEMENT_NAME = NS + "messageElementName" ;
public static final String ERROR_MESSAGE = NS + "ErrorMessage" ;
public static final String SUCCESS_MESSAGE = NS + "SuccessMessage" ;
=======
public static final String HAS_MODE = NS + "mode" ;
public static final String FORMAT_STRING = NS + "formatString" ;
public static final String MULTIPLIER = NS + "multiplier" ;
>>>>>>>
public static final String HAS_MODE = NS + "mode" ;
public static final String FORMAT_STRING = NS + "formatString" ;
public static final String MULTIPLIER = NS + "multiplier" ;
public static final String INDEX = NS + "hasIndex";
public static final String NOTIFICATION = NS + "Notification" ;
public static final String NOTIFICATIONS = NS + "notifications" ;
public static final String NOTIFICATION_TITLE = NS + "notificationTitle" ;
public static final String NOTIFICATION_DESCRIPTION = NS + "notificationDescription" ;
public static final String NOTIFICATION_ADDITIONAL_INFORMATION = NS + "notificationAdditionalInformation" ;
public static final String MESSAGE = NS + "Message" ;
public static final String MESSAGE_SUCCESS = NS + "messsageSuccess" ;
public static final String MESSAGE_ELEMENT_NAME = NS + "messageElementName" ;
public static final String ERROR_MESSAGE = NS + "ErrorMessage" ;
public static final String SUCCESS_MESSAGE = NS + "SuccessMessage" ; |
<<<<<<<
import org.streampipes.commons.config.ClientConfiguration;
import org.streampipes.messaging.kafka.SpKafkaProducer;
=======
import org.streampipes.messaging.kafka.StreamPipesKafkaProducer;
>>>>>>>
import org.streampipes.messaging.kafka.SpKafkaProducer;
<<<<<<<
kafkaProducer = new SpKafkaProducer(ClientConfiguration.INSTANCE.getKafkaUrl(), topic);
=======
kafkaProducer = new StreamPipesKafkaProducer(SourcesConfig.INSTANCE.getKafkaUrl(), topic);
>>>>>>>
kafkaProducer = new SpKafkaProducer(SourcesConfig.INSTANCE.getKafkaUrl(), topic); |
<<<<<<<
import org.streampipes.model.schema.*;
import org.streampipes.model.staticproperty.*;
=======
import org.streampipes.model.schema.Enumeration;
import org.streampipes.model.schema.EventPropertyList;
import org.streampipes.model.schema.EventPropertyNested;
import org.streampipes.model.schema.EventPropertyPrimitive;
import org.streampipes.model.schema.EventSchema;
import org.streampipes.model.schema.QuantitativeValue;
import org.streampipes.model.staticproperty.AnyStaticProperty;
import org.streampipes.model.staticproperty.CollectionStaticProperty;
import org.streampipes.model.staticproperty.DomainStaticProperty;
import org.streampipes.model.staticproperty.FileStaticProperty;
import org.streampipes.model.staticproperty.FreeTextStaticProperty;
import org.streampipes.model.staticproperty.MappingProperty;
import org.streampipes.model.staticproperty.MappingPropertyNary;
import org.streampipes.model.staticproperty.MappingPropertyUnary;
import org.streampipes.model.staticproperty.MatchingStaticProperty;
import org.streampipes.model.staticproperty.OneOfStaticProperty;
import org.streampipes.model.staticproperty.Option;
import org.streampipes.model.staticproperty.RemoteOneOfStaticProperty;
import org.streampipes.model.staticproperty.RuntimeResolvableAnyStaticProperty;
import org.streampipes.model.staticproperty.RuntimeResolvableOneOfStaticProperty;
import org.streampipes.model.staticproperty.StaticPropertyAlternative;
import org.streampipes.model.staticproperty.StaticPropertyAlternatives;
import org.streampipes.model.staticproperty.StaticPropertyGroup;
import org.streampipes.model.staticproperty.SupportedProperty;
>>>>>>>
import org.streampipes.model.schema.Enumeration;
import org.streampipes.model.schema.EventPropertyList;
import org.streampipes.model.schema.EventPropertyNested;
import org.streampipes.model.schema.EventPropertyPrimitive;
import org.streampipes.model.schema.EventSchema;
import org.streampipes.model.schema.QuantitativeValue;
import org.streampipes.model.staticproperty.AnyStaticProperty;
import org.streampipes.model.staticproperty.CollectionStaticProperty;
import org.streampipes.model.staticproperty.DomainStaticProperty;
import org.streampipes.model.staticproperty.FileStaticProperty;
import org.streampipes.model.staticproperty.FreeTextStaticProperty;
import org.streampipes.model.staticproperty.MappingProperty;
import org.streampipes.model.staticproperty.MappingPropertyNary;
import org.streampipes.model.staticproperty.MappingPropertyUnary;
import org.streampipes.model.staticproperty.MatchingStaticProperty;
import org.streampipes.model.staticproperty.OneOfStaticProperty;
import org.streampipes.model.staticproperty.Option;
import org.streampipes.model.staticproperty.RemoteOneOfStaticProperty;
import org.streampipes.model.staticproperty.RuntimeResolvableAnyStaticProperty;
import org.streampipes.model.staticproperty.RuntimeResolvableOneOfStaticProperty;
import org.streampipes.model.staticproperty.StaticPropertyAlternative;
import org.streampipes.model.staticproperty.StaticPropertyAlternatives;
import org.streampipes.model.staticproperty.StaticPropertyGroup;
import org.streampipes.model.staticproperty.SupportedProperty;
import org.streampipes.model.schema.*;
import org.streampipes.model.staticproperty.*;
<<<<<<<
ConnectWorkerContainer.class,
RuntimeOptionsResponse.class
=======
RuntimeOptionsResponse.class,
StaticPropertyAlternative.class,
StaticPropertyAlternatives.class,
StaticPropertyGroup.class
>>>>>>>
RuntimeOptionsResponse.class,
StaticPropertyAlternative.class,
StaticPropertyAlternatives.class,
StaticPropertyGroup.class
ConnectWorkerContainer.class,
RuntimeOptionsResponse.class |
<<<<<<<
public static final String STATIC_PROPERTY_ALTERNATIVE = NS + "StaticPropertyAlternative";
public static final String STATIC_PROPERTY_ALTERNATIVES = NS + "StaticPropertyAlternatives";
public static final String HAS_STATIC_PROPERTY_ALTERNATIVE = NS + "hasStaticPropertyAlternative";
public static final String STATIC_PROPERTY_GROUP = NS + "StaticPropertyGroup";
public static final String SHOW_LABEL = NS + "showLabel";
=======
public static final String CONNECT_WORKER_CONTAINER = NS + "ConnectWorkerContainer";
>>>>>>>
public static final String STATIC_PROPERTY_ALTERNATIVE = NS + "StaticPropertyAlternative";
public static final String STATIC_PROPERTY_ALTERNATIVES = NS + "StaticPropertyAlternatives";
public static final String HAS_STATIC_PROPERTY_ALTERNATIVE = NS + "hasStaticPropertyAlternative";
public static final String STATIC_PROPERTY_GROUP = NS + "StaticPropertyGroup";
public static final String SHOW_LABEL = NS + "showLabel";
public static final String CONNECT_WORKER_CONTAINER = NS + "ConnectWorkerContainer"; |
<<<<<<<
import org.streampipes.wrapper.esper.config.EsperConfig;
=======
import org.streampipes.model.impl.graph.SepaInvocation;
import org.streampipes.wrapper.BindingParameters;
import org.streampipes.wrapper.EPEngine;
import org.streampipes.wrapper.EngineParameters;
import org.streampipes.wrapper.OutputCollector;
import org.streampipes.wrapper.esper.config.EsperEngineConfig;
>>>>>>>
import org.streampipes.wrapper.esper.config.EsperEngineConfig; |
<<<<<<<
import org.streampipes.container.util.StandardTransportFormat;
=======
import org.streampipes.pe.processors.esper.config.EsperConfig;
>>>>>>>
import org.streampipes.pe.processors.esper.config.EsperConfig;
import org.streampipes.container.util.StandardTransportFormat; |
<<<<<<<
register(PipelineElementAsset.class);
register(DataLakeDashboard.class);
register(DataLakeWidgetResource.class);
register(DataLakeResourceV3.class);
register(DataLakeNoUserResourceV3.class);
register(PipelineElementFile.class);
register(FileServingResource.class);
register(DashboardWidget.class);
register(Dashboard.class);
=======
register(VirtualSensor.class);
register(Visualization.class);
>>>>>>>
register(PipelineElementAsset.class);
register(DataLakeDashboard.class);
register(DataLakeWidgetResource.class);
register(DataLakeResourceV3.class);
register(DataLakeNoUserResourceV3.class);
register(PipelineElementFile.class);
register(FileServingResource.class);
register(DashboardWidget.class);
register(Dashboard.class);
register(VirtualSensor.class);
register(Visualization.class); |
<<<<<<<
import org.streampipes.commons.config.ClientConfiguration;
import org.streampipes.messaging.kafka.SpKafkaProducer;
=======
import org.streampipes.messaging.kafka.StreamPipesKafkaProducer;
>>>>>>>
import org.streampipes.messaging.kafka.SpKafkaProducer;
<<<<<<<
startKafkaConsumer(ClientConfiguration.INSTANCE.getKafkaUrl(), consumerTopic,
new KafkaPublisher(new SpKafkaProducer(kafkaHost + ":" +kafkaPort, topic)));
=======
startKafkaConsumer(ActionConfig.INSTANCE.getKafkaUrl(), consumerTopic,
new KafkaPublisher(new StreamPipesKafkaProducer(kafkaHost + ":" +kafkaPort, topic)));
>>>>>>>
startKafkaConsumer(ActionConfig.INSTANCE.getKafkaUrl(), consumerTopic,
new KafkaPublisher(new SpKafkaProducer(kafkaHost + ":" +kafkaPort, topic))); |
<<<<<<<
adapterDescription.setUri(ID);
=======
adapterDescription.setName("Twitter");
adapterDescription.setDescription("Follow Hashtag");
adapterDescription.setUri("http://streampipes.org/adapter/specific/twitter");
>>>>>>>
adapterDescription.setUri(ID);
adapterDescription.setName("Twitter");
adapterDescription.setDescription("Follow Hashtag"); |
<<<<<<<
public static final String CONNECT_WORKER_CONTAINER = NS + "ConnectWorkerContainer";
=======
public static final String STATIC_PROPERTY_ALTERNATIVE = NS + "StaticPropertyAlternative";
public static final String STATIC_PROPERTY_ALTERNATIVES = NS + "StaticPropertyAlternatives";
public static final String HAS_STATIC_PROPERTY_ALTERNATIVE = NS + "hasStaticPropertyAlternative";
public static final String STATIC_PROPERTY_GROUP = NS + "StaticPropertyGroup";
public static final String SHOW_LABEL = NS + "showLabel";
>>>>>>>
public static final String CONNECT_WORKER_CONTAINER = NS + "ConnectWorkerContainer";
public static final String STATIC_PROPERTY_ALTERNATIVE = NS + "StaticPropertyAlternative";
public static final String STATIC_PROPERTY_ALTERNATIVES = NS + "StaticPropertyAlternatives";
public static final String HAS_STATIC_PROPERTY_ALTERNATIVE = NS + "hasStaticPropertyAlternative";
public static final String STATIC_PROPERTY_GROUP = NS + "StaticPropertyGroup";
public static final String SHOW_LABEL = NS + "showLabel"; |
<<<<<<<
Issues<Issue> warnings = new AnsibleLintParser().parse(openFile());
assertEquals(4, warnings.size(), WRONG_NUMBER_OF_WARNINGS_DETECTED);
=======
Issues warnings = new AnsibleLintParser().parse(openFile());
assertThat(warnings).hasSize(4);
>>>>>>>
Issues<Issue> warnings = new AnsibleLintParser().parse(openFile());
assertThat(warnings).hasSize(4); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.